Changeset 23957 in osm

Timestamp:

2010-10-31T12:55:31+01:00 (14 years ago)

Author:

oliverw

Message:

Consider also guessed name in comparison.

File:

• applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressNode.java (modified) (1 diff)

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

@@ -171 +171 @@
                                         cc = this.getStreet().compareTo(other.getStreet());                                     
                                         if (cc  == 0) {
-                                                cc = this.getHouseNumber().compareTo(other.getHouseNumber());
+                                                if (hasGuessedStreetName()) {                                                   
+                                                        if (other.hasStreetName()) {
+                                                                // Compare guessed name with the real name
+                                                                cc = this.getGuessedStreetName().compareTo(other.getStreet());
+                                                                if (cc == 0) {
+                                                                        cc = this.getHouseNumber().compareTo(other.getHouseNumber());
+                                                                }
+                                                        } else if (other.hasGuessedStreetName()){
+                                                                // Compare guessed name with the guessed name
+                                                                cc = this.getGuessedStreetName().compareTo(other.getGuessedStreetName());
+                                                                if (cc == 0) {
+                                                                        cc = this.getHouseNumber().compareTo(other.getHouseNumber());
+                                                                }
+                                                        } // else: give up
+                                                // No guessed name at all -> just compare the number
+                                                } else {
+                                                        cc = this.getHouseNumber().compareTo(other.getHouseNumber());
+                                                }
                                         }
                                 }