Changeset 23965 in osm for applications/editors/josm/plugins

Timestamp:

2010-10-31T15:27:32+01:00 (14 years ago)

Author:

oliverw

Message:

Bugfix: Addresses were not resolved corectly.

File:

• applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressEditContainer.java (modified) (4 diffs)

applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressEditContainer.java

@@ -359 +359 @@
                 String streetName = aNode.getStreet();
                 
-                if (streetName != null && streetDict.containsKey(streetName)) {
-                        StreetNode sNode = streetDict.get(streetName);
+                if (streetName != null && shadowStreetDict.containsKey(streetName)) {
+                        StreetNode sNode = shadowStreetDict.get(streetName);
                         sNode.addAddress(aNode);
                         return true;
@@ -373 +373 @@
         public void resolveAddresses() {
                 List<AddressNode> resolvedAddresses = new ArrayList<AddressNode>();
-                for (AddressNode node : unresolvedAddresses) {
+                for (AddressNode node : shadowUnresolvedAddresses) {
                         if (assignAddressToStreet(node)) {
                                 resolvedAddresses.add(node);
@@ -381 +381 @@
                 /* Remove all resolves nodes from unresolved list */
                 for (AddressNode resolved : resolvedAddresses) {
-                        unresolvedAddresses.remove(resolved);
+                        shadowUnresolvedAddresses.remove(resolved);
                 }
         }
@@ -405 +405 @@
                         // sort lists
                         Collections.sort(shadowIncompleteAddresses);
-                        Collections.sort(shadowIncompleteAddresses);
+                        Collections.sort(shadowUnresolvedAddresses);
 
                         // put results from shadow copy into real lists