Changeset 27321 in osm for applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap

Timestamp:

2011-12-27T19:27:27+01:00 (13 years ago)

Author:

oliverw

Message:

Removed obsolete Visitor impl.

File:

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

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

@@ -40 +40 @@
  * adds the guessed value to a shadowed field by calling {@link OSMAddress#setGuessedValue(String, String)}.
  */
-public class GuessAddressRunnable extends PleaseWaitRunnable implements Visitor {
+public class GuessAddressRunnable extends PleaseWaitRunnable {
         private List<OSMAddress> addressesToGuess;
         private List<IProgressMonitorFinishedListener> finishListeners = new ArrayList<IProgressMonitorFinishedListener>();
@@ -115 +115 @@
                 finishListeners.clear();
         }
-
-        /* (non-Javadoc)
-         * @see org.openstreetmap.josm.data.osm.visitor.Visitor#visit(org.openstreetmap.josm.data.osm.Node)
-         */
-        @Override
-        public void visit(Node n) {
-                if (n == null) return;
-                if (curAddressNode == null) return;
-
-                // If the coordinates are null, we are screwed anyway
-                LatLon ll = curAddressNode.getCoor();
-                if (ll == null) return;
-
-                double dist = ll.greatCircleDistance(n.getCoor());
-
-                if (dist < minDist) {
-                        minDist = dist;
-                }
-        }
-
-        /* (non-Javadoc)
-         * @see org.openstreetmap.josm.data.osm.visitor.Visitor#visit(org.openstreetmap.josm.data.osm.Way)
-         */
-        @Override
-        public void visit(Way w) {
-                // skip non-streets and streets without name
-                if (!TagUtils.hasHighwayTag(w)) return;
-                if (!TagUtils.hasNameTag(w)) return;
-
-                for (Node node : w.getNodes()) {
-                        visit(node);
-                }
-        }
-
-        /* (non-Javadoc)
-         * @see org.openstreetmap.josm.data.osm.visitor.Visitor#visit(org.openstreetmap.josm.data.osm.Relation)
-         */
-        @Override
-        public void visit(Relation e) {
-                // nothing to do yet
-        }
-
-        /* (non-Javadoc)
-         * @see org.openstreetmap.josm.data.osm.visitor.Visitor#visit(org.openstreetmap.josm.data.osm.Changeset)
-         */
-        @Override
-        public void visit(Changeset cs) {
-                // nothing to do yet
-        }
-
+        
         /* (non-Javadoc)
          * @see org.openstreetmap.josm.gui.PleaseWaitRunnable#cancel()
@@ -187 +138 @@
         protected void realRun() throws SAXException, IOException,
                         OsmTransferException {
+                
                 if (Main.main.getCurrentDataSet() == null || addressesToGuess == null) return;
 
@@ -276 +228 @@
 
                                 if (dist < minDist && dist < getMaxDistance()) {
-                                        //System.out.println(String.format("New guess %s: %4.2f m", TagUtils.getNameValue(w), dist));
+                                        System.out.println(String.format("New guess %s: %4.2f m", TagUtils.getNameValue(w), dist));
                                         minDist = dist;
                                         currentValue = TagUtils.getNameValue(w);