/[projects]/dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/fileupload/AddressManager.java

Diff of /dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/fileupload/AddressManager.java

Parent Directory | Revision Log | View Patch Patch

-revision 2850 by torben,
Tue Jan 26 16:50:22 2016 UTC
+revision 2873 by torben,
Thu Jan 28 17:04:34 2016 UTC
 Line 33 
 public class AddressManager {
          Map<Integer, TreeMap<Short, ArrayList<Address>> > searchStructure;
-         ArrayList<AddressSourceEntry> afvisteEntries = new ArrayList<AddressSourceEntry>();
+         ArrayList<AddressSourceEntry> rejectedEntries = new ArrayList<AddressSourceEntry>();
+         Map<Integer,String> unknownStreets = new TreeMap<Integer, String>();
          Map<Short,Short> dbkBaneMap = new TreeMap<Short,Short>();
-Line 224 
 public class AddressManager {
+Line 226 
 public class AddressManager {
          private void visitSingle(AddressSourceEntry entry) {
                  TreeMap<Short, ArrayList<Address>> gade = searchStructure.get( entry.gadeid );
                  if (gade == null) {
+                         unknownStreets.putIfAbsent(entry.gadeid, entry.vejnavn);
                          createFromEntry(entry); // if we get here there was no match - so we need to create it
                          return;
                  }
-Line 233 
 public class AddressManager {
+Line 236 
 public class AddressManager {
                          createFromEntry(entry); // if we get here there was no match - so we need to create it
                          return;
                  }
+                 boolean found = false;
                  for (Address addr : litraList) {
                          if (addr.husnrbogstav.equals(entry.litra) ) {
                                  updateAddress(addr, entry);
-                                 return; //Done for now - no need to look at the rest of the list
+                                 found = true; // 1 visit should be enough but as long as there's duplicates on gadeid+husnr+litra we will visit them all
+                                 //when the issue with duplicates is resolved this should be reverted to a return or break
                          }
                  }
+                 if (found == false) {
-                 createFromEntry(entry); // if we get here there was no match - so we need to create it
+                         createFromEntry(entry); // if we get here there was no match - so we need to create it
+                 }
          }
          private void visitRange(AddressSourceEntry entry) {
                  TreeMap<Short, ArrayList<Address>> gade = searchStructure.get( entry.gadeid );
                  if (gade == null) {
+                         unknownStreets.putIfAbsent(entry.gadeid, entry.vejnavn);
                          System.out.println("[Range] Ukendt gadeID " + entry);
                          return;
                  }
-Line 287 
 public class AddressManager {
+Line 293 
 public class AddressManager {
          private void updateAddress(Address addr, AddressSourceEntry entry) {
                  if ( addr.distributor != null && addr.distributor.equals(entry.distributor) == false) {
-                         afvisteEntries.add(entry);
+                         rejectedEntries.add(entry);
                          System.out.println("Afviser " + entry);
                          return;
                  }
-Line 444 
 public class AddressManager {
+Line 450 
 public class AddressManager {
-                 addr.visited = true;
+                 //addr.visited = true;
                  if (addr.state == AddressState.NOT_CHANGED) {
                          if (addr.distributor == null) {
                                  addr.state = AddressState.OPENED;
-Line 472 
 public class AddressManager {
+Line 478 
 public class AddressManager {
                  if (entry.kommunekode == 0 || entry.vejkode == 0) {
                          return;
                  }
+                 if (entry.kommunekode < 100) {
+                         return;
+                 }
+                 if (Short.parseShort(Integer.toString(entry.gadeid).substring(0, 4)) != entry.postnr) {
+                         return; //gadeid / postnr mismatch
+                 }
                  System.out.println("Opretter adresse ud fra " + entry);
-Line 487 
 public class AddressManager {
+Line 500 
 public class AddressManager {
                  a.husnr = entry.husnr;
                  a.husnrbogstav = entry.litra;
                  a.postnr = entry.postnr;
-                 a.visited = true;
+                 //a.visited = true;
                  if (entry.ugedage.mandag) {
                          a.ruteMandag = entry.rute;
-Line 586 
 public class AddressManager {
+Line 599 
 public class AddressManager {
                          break;
                  case "NS":
                          bane = 204;
                          break;
+                 default:
+                         throw new RuntimeException("Ukendt distributor" + a.distributor); //Silence findBugs
                  }
                  if (bane == null) {
-Line 605 
 public class AddressManager {
+Line 620 
 public class AddressManager {
                  return Collections.unmodifiableList(addressList);
          }
+         public Map<Integer,String> getUnknownStreets() {
+                 return Collections.unmodifiableMap( unknownStreets );
+         }
-         public int getAfvistAntal() {
+         public int getRejectedCount() {
-                 return afvisteEntries.size();
+                 return rejectedEntries.size();
          }
  }

 Legend:



Removed from v.2850
 


changed lines


 
Added in v.2873
 Legend:



Removed from v.2850
 


changed lines


 
Added in v.2873
-Removed from v.2850
+Added in v.2873

	ViewVC Help
Powered by ViewVC 1.1.20