Changeset 24119 in osm for applications/editors

Timestamp:

2010-11-07T18:04:10+01:00 (14 years ago)

Author:

oliverw

Message:

Bugfix: Poor guessing quality, removed line "if (!guessers[i].needsGuess()) continue;"

Location:

applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses

Files:

• GuessAddressRunnable.java (modified) (4 diffs)
• OsmUtils.java (modified) (1 diff)
• TagUtils.java (modified) (1 diff)

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

@@ -207 +207 @@
 
                                 // visit osm data
-                                for (OsmPrimitive osmPrimitive : Main.main.getCurrentDataSet().getWays()) {
+                                for (OsmPrimitive osmPrimitive : Main.main.getCurrentDataSet().allPrimitives()) {
                                         if (cancelled) {
                                                 break;
@@ -214 +214 @@
                                         // guess values 
                                         for (int i = 0; i < guessers.length; i++) {
-                                                if (!guessers[i].needsGuess()) continue;
-                                                
                                                 osmPrimitive.visit(guessers[i]);
                                                 
                                                 if (guessers[i].currentValue == null && i == 0) {
-                                                        System.err.println("Guess #" + i + " failed for " + aNode);
+                                                        //System.err.println("Guess #" + i + " failed for " + aNode);
                                                 }
                                         }
@@ -236 +234 @@
 
                 public GuessStreetValueHandler(String tag, OSMAddress aNode) {
-                        super(tag, aNode);
+                        super(tag, aNode, 200.0);
                 }
 
@@ -255 +253 @@
                                 OSMAddress aNode = getAddressNode();
                                 double dist = OsmUtils.getMinimumDistanceToWay(aNode.getCoor(), w);
+                                
                                 if (dist < minDist && dist < getMaxDistance()) {
+                                        //System.out.println(String.format("New guess %s: %4.2f m", TagUtils.getNameValue(w), dist));
                                         minDist = dist;
                                         currentValue = TagUtils.getNameValue(w);                                
                                         aNode.setGuessedValue(getTag(), currentValue);
+                                } else {
+                                        //System.out.println(String.format("Skipped %s: %4.2f m", TagUtils.getNameValue(w), dist));
                                 }
                         }

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

@@ -138 +138 @@
                                         applyDerivedValue(address, w, TagUtils.ADDR_COUNTRY_TAG);
                                         applyDerivedValue(address, w, TagUtils.ADDR_STREET_TAG);
+                                        applyDerivedValue(address, w, TagUtils.ADDR_STATE_TAG);
                                         return true;
                                 }

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

@@ -1907 +1907 @@
                 String hwType = getHighwayValue(w);
                                 
-                return  HIGHWAY_RESIDENTIAL_VALUE.equals(hwType) ||
-                                HIGHWAY_SECONDARY_VALUE.equals(hwType) ||
-                                HIGHWAY_TERTIARY_VALUE.equals(hwType) ||
-                                HIGHWAY_SERVICE_VALUE.equals(hwType) ||
-                                HIGHWAY_LIVING_STREET_VALUE.equals(hwType) ||
-                                HIGHWAY_UNCLASSIFIED_VALUE.equals(hwType);
+                return  !(TagUtils.HIGHWAY_MOTORWAY_LINK_VALUE.equals(hwType) ||
+                                TagUtils.HIGHWAY_MOTORWAY_VALUE.equals(hwType) ||
+                                TagUtils.HIGHWAY_FOOTWAY_VALUE.equals(hwType) ||
+                                TagUtils.HIGHWAY_TRACK_VALUE.equals(hwType) 
+                                );
         }