60 |
if (addr.daekningsType == DaekningsType.DAEKNING_IKKEDAEKKET) { |
if (addr.daekningsType == DaekningsType.DAEKNING_IKKEDAEKKET) { |
61 |
return new SearchResult(Status.STATUS_NOT_COVERED); |
return new SearchResult(Status.STATUS_NOT_COVERED); |
62 |
} |
} |
63 |
|
|
64 |
|
if (addr.distributor.equals("LUKKET")) { |
65 |
|
return new SearchResult(Status.STATUS_NOT_COVERED); //Skal vi have en special status til Lukkede adresser ? |
66 |
|
} |
67 |
|
|
68 |
|
|
69 |
return new SearchResult(addr); |
return new SearchResult(addr); |
103 |
gade.put(husnrSearch, a); |
gade.put(husnrSearch, a); |
104 |
} |
} |
105 |
|
|
|
System.out.println("Build -- stage 2"); |
|
106 |
|
|
107 |
List<ExtendedBean> extDao = DatabaseLayer.getExtendedAdresslistDao(); |
//////////////////////////////////////////////////////////////////////////////////////// |
108 |
|
System.out.println("Build -- stage 2 udvidet dækning"); |
109 |
|
|
110 |
|
List<ExtendedBean> extDao = DatabaseLayer.getExtendedAdresslist(); |
111 |
for (ExtendedBean eb : extDao) { |
for (ExtendedBean eb : extDao) { |
112 |
|
|
113 |
Address orgAddress = idAddressMap.get(eb.orgId); |
Address orgAddress = idAddressMap.get(eb.orgId); |
118 |
if (targetAddress == null) |
if (targetAddress == null) |
119 |
continue; |
continue; |
120 |
|
|
121 |
|
if (orgAddress.distributor != null && orgAddress.distributor.equals("LUKKET")) { |
122 |
|
continue; |
123 |
|
} |
124 |
|
|
125 |
|
if (targetAddress.distributor.equals("LUKKET")) { |
126 |
|
continue; |
127 |
|
} |
128 |
|
|
129 |
orgAddress.extTarget = targetAddress; |
orgAddress.extTarget = targetAddress; |
130 |
orgAddress.extAfstand = eb.afstand; |
orgAddress.extAfstand = eb.afstand; |
131 |
|
|
145 |
|
|
146 |
|
|
147 |
} |
} |
148 |
|
////////////////////////////////////////////////////////////////////////////////////// |
149 |
|
System.out.println("Build -- stage 3 - 100pct"); |
150 |
|
|
151 |
System.out.println("Build -- stage 3"); |
Map<Integer,HundredePctBean> hundredePct = DatabaseLayer.get100PctList(); |
152 |
|
for (Address addr : alleAdresser) { |
153 |
System.out.println("Build -- stage 4"); |
if (addr.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) { |
154 |
|
continue; |
155 |
|
} |
156 |
|
|
157 |
|
if (addr.distributor != null && addr.distributor.equals("LUKKET")) { |
158 |
|
continue; |
159 |
|
} |
160 |
|
|
161 |
|
|
162 |
|
HundredePctBean bean = hundredePct.get(addr.postnr); |
163 |
|
if (bean == null) { |
164 |
|
continue; |
165 |
|
} |
166 |
|
|
167 |
|
addr.daekningsType = DaekningsType.DAEKNING_100PCT; |
168 |
|
addr.rute = bean.rute; |
169 |
|
addr.koreliste = bean.koreliste; |
170 |
|
addr.dbkBane = bean.dbkBane; |
171 |
|
addr.distributor = bean.distributor; |
172 |
|
} |
173 |
|
|
174 |
} |
} |
175 |
|
|