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

Timestamp:

2010-11-01T03:38:44+01:00 (14 years ago)

Author:

oliverw

Message:

Bugfix: Selection was not considered.

Location:

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

Files:

• AddressEditContainer.java (modified) (10 diffs)
• FixUnresolvedStreetsAction.java (modified) (1 diff)

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

@@ -72 +72 @@
 public class AddressEditContainer implements Visitor, DataSetListener, IAddressEditContainerListener {
         
+        private Collection<? extends OsmPrimitive> workingSet;
         /** The street dictionary collecting all streets to a set of unique street names. */
         private HashMap<String, StreetNode> streetDict = new HashMap<String, StreetNode>(100);
@@ -106 +107 @@
 
         /**
+         * Gets the working set used by the container. This can by either the complete or just
+         * a subset of the current data layer.
+         *
+         * @return the workingSet
+         */
+        protected Collection<? extends OsmPrimitive> getWorkingSet() {
+                return workingSet;
+        }
+
+
+        /**
          * Adds a change listener.
          * @param listener
@@ -146 +158 @@
          *
          * @param n the n
-         * @return true, if successful
+         * @return true, if node has been visited
          */
         private boolean hasBeenVisited(Node n) {
@@ -161 +173 @@
         }
         
+        /**
+         * Checks a way for been visited.
+         *
+         * @param w the w to check
+         * @return true, if way has been visited
+         */
         private boolean hasBeenVisited(Way w) {
                 return visitedWays.contains(w);
@@ -180 +198 @@
                 if (aNode != null) {
                         addAndClassifyAddress(aNode);
-                } /*else {
-                        // check, if node is referred by a way
-                        for (OsmPrimitive osm : n.getReferrers()) {
-                                if (osm instanceof Way) {
-                                        Way w = (Way) osm;
-                                        if (!hasBeenVisited(w)) {
-                                                createNodeFromWay(w);
-                                        }
-                                }
-                        }
-                        
-                }*/
+                } 
                 markNodeAsVisited(n);
         }
@@ -234 +241 @@
         private void createNodeFromWay(Way w) {
                 INodeEntity ne = NodeFactory.createNodeFromWay(w);
-
                 
                 if (!processNode(ne, w)) {
-
                         // Look also into nodes for addresses (unlikely, but at least they
                         // get marked as visited).
@@ -249 +254 @@
                                 }
                         }
-                }
+                } // else: node has been processed, no need to look deeper
         }
 
@@ -456 +461 @@
         
         /**
-         * Rebuilds the street and address lists using the current data set. 
+         * Rebuilds the street and address lists using the data set given
+         * in  {@link AddressEditContainer#attachToDataSet(Collection)} or the 
+         * full data set of the current data layer {@link Main#getCurrentDataSet()}. 
          */
         public void invalidate() {
-                invalidate(Main.main.getCurrentDataSet().allPrimitives());
+                if (workingSet != null) {
+                        invalidate(workingSet);
+                } else {
+                        invalidate(Main.main.getCurrentDataSet().allPrimitives());
+                }
         }
         
@@ -507 +518 @@
         
         /**
-         * Connects the listener to the data set and revisits the data. This method should
+         * Connects the listener to the given data set and revisits the data. This method should
          * be called immediately after an edit session finished.
          * 
+         * If the given data set is not null, calls of {@link AddressEditContainer#invalidate()} will
+         * only consider the data given within this set. This can be useful to keep out unimportant
+         * areas. However, a side-effect could be that some streets are not included and leads to
+         * false alarms regarding unresolved addresses.
+         * 
+         * Calling {@link AddressEditContainer#detachFromDataSet()} drops the explicit data set and uses
+         * the full data set on subsequent updates.<p>
+         * 
+         * <b>Example</b><br>
          * <code>
+         * attachToDataSet(osmDataSetToWorkOn); // osmDataSetToWorkOn = selected items<br>
+         * //... launch dialog or whatever<br>
          * detachFromDataSet();
-         * //... launch dialog or whatever
-         * attachToDataSet();
          * </code>
-         */
-        public void attachToDataSet(Collection<? extends OsmPrimitive> dataToExamine) {         
-                Main.main.getCurrentDataSet().addDataSetListener(this);
-                if (dataToExamine != null && dataToExamine.size() > 0) {
-                        invalidate(dataToExamine); // use given data set (usually the current selection)
+         *
+         * @param osmDataToWorkOn the data to examine
+         */
+        public void attachToDataSet(Collection<? extends OsmPrimitive> osmDataToWorkOn) {
+                if (osmDataToWorkOn != null && !osmDataToWorkOn.isEmpty()) {                    
+                        workingSet = new ArrayList<OsmPrimitive>(osmDataToWorkOn);
                 } else {
-                        invalidate(); // use current data set
-                }
+                        detachFromDataSet(); // drop old stuff, if present
+                }
+                invalidate(); // start our investigation...
         }
         
@@ -531 +553 @@
          */
         public void detachFromDataSet() {
-                Main.main.getCurrentDataSet().removeDataSetListener(this);
+                //Main.main.getCurrentDataSet().removeDataSetListener(this);            
+                if (workingSet != null) {
+                        workingSet.clear();
+                        workingSet = null;
+                }
         }
 

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

@@ -48 +48 @@
         @Override
         public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
-                /* this changes the dialog contents, so we do nothing here
+                /* remember new selection for actionPerformed */
                 this.newSelection = newSelection;
-                if (addressEditContainer != null) {
-                        addressEditContainer.invalidate(newSelection);
-                }*/
         }