Changeset 23982 in osm for applications/editors

Timestamp:

2010-11-01T04:02:26+01:00 (14 years ago)

Author:

oliverw

Message:

Bugfix: Repaired GuessAddressDataAction (wrong items were picked, etc.)

Location:

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

Files:

• AddressFinderThread.java (modified) (5 diffs)
• AddressNode.java (modified) (1 diff)
• gui/AddressEditDialog.java (modified) (1 diff)
• gui/GuessAddressDataAction.java (modified) (1 diff)

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

@@ -34 +34 @@
 
 public class AddressFinderThread extends PleaseWaitRunnable implements Visitor {
-        private AddressEditContainer container;
+        private List<AddressNode> addressesToGuess;
         private double minDist;
         private AddressNode curAddressNode;
@@ -43 +43 @@
         
         /**
-         * @param AddressEditContainer
+         * @param nodes
          */
-        public AddressFinderThread(AddressEditContainer AddressEditContainer, String title) {
+        public AddressFinderThread(List<AddressNode> nodes, String title) {
                 super(title != null ? title : tr("Searching"));
-                setAddressEditContainer(AddressEditContainer);          
+                setAddressEditContainer(nodes);         
         }
 
-        public void setAddressEditContainer(AddressEditContainer AddressEditContainer) {
+        public void setAddressEditContainer(List<AddressNode> nodes) {
                 if (isRunning) {
                         throw new ConcurrentModificationException();
                 }
-                this.container = AddressEditContainer;          
+                this.addressesToGuess = nodes;          
         }
 
-        public AddressEditContainer getAddressEditContainer() {
-                return container;
+        public List<AddressNode> getAddressEditContainer() {
+                return addressesToGuess;
         }
         /**
@@ -140 +140 @@
         protected void realRun() throws SAXException, IOException,
                         OsmTransferException {
-                if (Main.main.getCurrentDataSet() == null || container == null) return;
+                if (Main.main.getCurrentDataSet() == null || addressesToGuess == null) return;
 
                 isRunning = true;
@@ -148 +148 @@
                 
                 try {
-                        progressMonitor.setTicksCount(container.getNumberOfUnresolvedAddresses());
+                        progressMonitor.setTicksCount(addressesToGuess.size());
                         
-                        List<AddressNode> shadowCopy = new ArrayList<AddressNode>(container.getUnresolvedAddresses());
+                        List<AddressNode> shadowCopy = new ArrayList<AddressNode>(addressesToGuess);
                         for (AddressNode aNode : shadowCopy) {                                  
                                 minDist = Double.MAX_VALUE;
                                 curAddressNode = aNode;
+                                
+                                if (aNode.hasStreetName()) {
+                                        progressMonitor.worked(1);
+                                        continue;
+                                }
                                 
                                 // check for cancel
@@ -180 +185 @@
                                 progressMonitor.worked(1);                              
                         }
-                        // request container update
-                        container.invalidate();
                 } finally {
                         isRunning = false;

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

@@ -250 +250 @@
                 if (hasGuessedStreetName()) {
                         setOSMTag(TagUtils.ADDR_STREET_TAG, guessedStreetName);
+                        guessedStreetName = null;
                 }
         }

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

@@ -299 +299 @@
                 
                 for (int i = 0; i < actions.length; i++) {
+                        actions[i].setEvent(null);
                         actions[i].setContainer(container);
                 }

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

@@ -80 +80 @@
          */
         private void internalGuessAddresses(List<AddressNode> nodes) {
-                Main.worker.submit(new AddressFinderThread(container, tr("Guess street names")));               
+                Main.worker.submit(new AddressFinderThread(nodes, tr("Guess street names")));
+                if (container != null) {
+                        container.invalidate();
+                }
         }
 }