Changeset 24129 in osm

Timestamp:

2010-11-07T19:28:18+01:00 (14 years ago)

Author:

oliverw

Message:

• Added some convenience methods to AddressEditSelectionEvent
• Several bugfixes in actions, predominately regarding address selection
• Added remove address/apply guesses action to toggle dialog

Location:

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

Files:

• AddressEditContainer.java (modified) (1 diff)
• OSMAddress.java (modified) (4 diffs)
• OsmUtils.java (modified) (1 diff)
• gui/AddressEditSelectionEvent.java (modified) (4 diffs)
• gui/IncompleteAddressesDialog.java (modified) (3 diffs)
• gui/actions/ApplyAllGuessesAction.java (modified) (2 diffs)
• gui/actions/AssignAddressToStreetAction.java (modified) (1 diff)
• gui/actions/GuessAddressDataAction.java (modified) (3 diffs)
• gui/actions/RemoveAddressTagsAction.java (modified) (2 diffs)
• gui/actions/SelectAddressesInMapAction.java (modified) (3 diffs)

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

@@ -422 +422 @@
         public int getNumberOfUnresolvedAddresses() {
                 return unresolvedAddresses != null ? unresolvedAddresses.size() : 0;
+        }
+        
+        /**
+         * Gets the number of invalid (unresolved and/or incomplete) addresses.
+         *
+         * @return the number of invalid addresses
+         */
+        public int getNumberOfInvalidAddresses() {
+                return getNumberOfIncompleteAddresses() + getNumberOfUnresolvedAddresses();
         }
         

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

@@ -24 +24 @@
 public class OSMAddress extends OSMEntityBase {
         public static final String MISSING_TAG = "?";
+        public static final String INTERPOLATION_TAG = "...";
+        
+        private boolean isPartOfInterpolation;
         
         /** The dictionary containing guessed values. */
@@ -41 +44 @@
                 super.setOsmObject(osmObject);
                 
-                OsmUtils.getValuesFromAddressInterpolation(this);
+                isPartOfInterpolation = OsmUtils.getValuesFromAddressInterpolation(this);
                 
                 String streetNameViaRel = OsmUtils.getAssociatedStreet(this.osmObject);
@@ -54 +57 @@
          */
         public boolean isComplete() {
-                return  TagUtils.hasAddrCityTag(osmObject) && TagUtils.hasAddrCountryTag(osmObject) &&
-                                TagUtils.hasAddrHousenumberTag(osmObject) && TagUtils.hasAddrPostcodeTag(osmObject) &&
-                                TagUtils.hasAddrStateTag(osmObject) && 
-                                (TagUtils.hasAddrStreetTag(osmObject) || hasDerivedValue(TagUtils.ADDR_STREET_TAG));
+                return  hasCity() && 
+                                hasHouseNumber() &&
+                                hasPostCode() && 
+                                hasCity() && 
+                                hasState() &&
+                                hasStreetName();
         }
         
@@ -218 +223 @@
         public String getHouseNumber() {
                 if (!TagUtils.hasAddrHousenumberTag(osmObject)) {
-                        return MISSING_TAG;
+                        if (!isPartOfInterpolation) {
+                                return MISSING_TAG;
+                        } else {
+                                return INTERPOLATION_TAG;
+                        }
                 }
                 return TagUtils.getAddrHousenumberValue(osmObject);
         }
         
+        /**
+         * Checks for house number.
+         *
+         * @return true, if successful
+         */
+        public boolean hasHouseNumber() {
+                return TagUtils.hasAddrHousenumberTag(osmObject) || isPartOfInterpolation;
+        }
+                
+        /**
+         * Checks if this address is part of a address interpolation.
+         *
+         * @return true, if is part of interpolation
+         */
+        protected boolean isPartOfInterpolation() {
+                return isPartOfInterpolation;
+        }
+
         /**
          * Gets the name of the city associated with this address.

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

@@ -133 +133 @@
                         if (osm instanceof Way) {
                                 Way w = (Way) osm;
-                                if (TagUtils.hasAddrInterpolationTag(w)) {                                      
+                                if (TagUtils.hasAddrInterpolationTag(w)) {
+                                        System.out.println("Found interpolation for " + address);
                                         applyDerivedValue(address, w, TagUtils.ADDR_POSTCODE_TAG);
                                         applyDerivedValue(address, w, TagUtils.ADDR_CITY_TAG);

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

@@ -34 +34 @@
         private AddressEditContainer addressContainer;
         
+        private List<OSMAddress> unresolvedCache;
+        private List<OSMAddress> incompleteCache;
+        
         /**
          * Creates a new 'AddressEditSelectionEvent'.
@@ -100 +103 @@
         
         /**
+         * Checks for addresses.
+         *
+         * @return true, if successful
+         */
+        public boolean hasAddresses() {
+                return hasIncompleteAddresses() || hasUnresolvedAddresses();
+        }
+        
+        /**
+         * Checks for incomplete addresses.
+         *
+         * @return true, if successful
+         */
+        public boolean hasIncompleteAddresses() {
+                return getSelectedIncompleteAddresses() != null;
+        }
+        
+        /**
+         * Checks for unresolved addresses.
+         *
+         * @return true, if successful
+         */
+        public boolean hasUnresolvedAddresses() {
+                return getSelectedUnresolvedAddresses() != null;
+        }
+        
+        /**
+         * Checks for addresses with guesses.
+         *
+         * @return true, if successful
+         */
+        public boolean hasAddressesWithGuesses() {
+                if (hasIncompleteAddresses()) {
+                        for (OSMAddress addr : getSelectedIncompleteAddresses()) {
+                                if (addr.hasGuesses()) {
+                                        return true;
+                                }
+                        }
+                }
+                
+                if (hasUnresolvedAddresses()) {
+                        for (OSMAddress addr : getSelectedUnresolvedAddresses()) {
+                                if (addr.hasGuesses()) {
+                                        return true;
+                                }
+                        }
+                }
+                
+                return false;
+        }
+        
+        /**
          * Gets the list containing the selected items of the 'unresolved addresses ' table.
          * @return
@@ -106 +161 @@
                 if (unresolvedAddressTable != null && 
                                 addressContainer != null && 
-                                addressContainer.getUnresolvedAddresses() != null) {
+                                unresolvedCache == null) {
                         
                         int[] selRows = unresolvedAddressTable.getSelectedRows();
                         
-                        List<OSMAddress> nodes = new ArrayList<OSMAddress>();
+                        unresolvedCache = new ArrayList<OSMAddress>();
                         for (int i = 0; i < selRows.length; i++) {
                                 if (selRows[i] >= 0 && selRows[i] < addressContainer.getNumberOfUnresolvedAddresses()) {
-                                        nodes.add(addressContainer.getUnresolvedAddresses().get(selRows[i]));
-                                }
-                        }
-                        return nodes;
-                }
-                return null;
+                                        unresolvedCache.add(addressContainer.getUnresolvedAddresses().get(selRows[i]));
+                                }
+                        }
+                        return unresolvedCache;
+                } else {
+                        return unresolvedCache;
+                }
         }
         
@@ -129 +185 @@
                 if (incompleteAddressTable != null && 
                                 addressContainer != null && 
-                                addressContainer.getUnresolvedAddresses() != null) {
+                                incompleteCache == null) {
                         
                         int[] selRows = incompleteAddressTable.getSelectedRows();
                         
-                        List<OSMAddress> nodes = new ArrayList<OSMAddress>();
+                        incompleteCache = new ArrayList<OSMAddress>();
                         for (int i = 0; i < selRows.length; i++) {
                                 if (selRows[i] >= 0 && selRows[i] < addressContainer.getNumberOfIncompleteAddresses()) {
-                                        nodes.add(addressContainer.getIncompleteAddresses().get(selRows[i]));
-                                }
-                        }
-                        return nodes;
-                }
-                return null;
+                                        incompleteCache.add(addressContainer.getIncompleteAddresses().get(selRows[i]));
+                                }
+                        }
+                        return incompleteCache;
+                } else {
+                        return incompleteCache; // equals null, if no data is present
+                }
         }
 }

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

@@ -41 +41 @@
 import org.openstreetmap.josm.plugins.fixAddresses.IOSMEntity;
 import org.openstreetmap.josm.plugins.fixAddresses.gui.actions.AbstractAddressEditAction;
+import org.openstreetmap.josm.plugins.fixAddresses.gui.actions.ApplyAllGuessesAction;
+import org.openstreetmap.josm.plugins.fixAddresses.gui.actions.RemoveAddressTagsAction;
 import org.openstreetmap.josm.plugins.fixAddresses.gui.actions.SelectAddressesInMapAction;
 
@@ -47 +49 @@
         private static final String FIXED_DIALOG_TITLE = tr("Incomplete Addresses");
 
-
         private AddressEditContainer container;
 
-        
         private SelectAddressesInMapAction selectAction = new SelectAddressesInMapAction();
+        private ApplyAllGuessesAction applyGuessesAction = new ApplyAllGuessesAction();
+        private RemoveAddressTagsAction removeTagsAction = new RemoveAddressTagsAction();
         
         private AbstractAddressEditAction[] actions = new AbstractAddressEditAction[]{
-                        selectAction
+                        selectAction,
+                        applyGuessesAction,
+                        removeTagsAction
         };
 
@@ -79 +83 @@
                 this.add(p);
                 
-                JPanel buttonPanel = getButtonPanel(5);
+                JPanel buttonPanel = getButtonPanel(actions.length);
                 
-                SideButton sb = new SideButton(selectAction);
-                buttonPanel.add(sb);
+                for (int i = 0; i < actions.length; i++) {
+                        SideButton sb = new SideButton(actions[i]);
+                        buttonPanel.add(sb);
+                }
                 
                 this.add(buttonPanel, BorderLayout.SOUTH);

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

@@ -93 +93 @@
         @Override
         protected void updateEnabledState(AddressEditSelectionEvent event) {
-                setEnabled(event.getSelectedIncompleteAddresses() != null ||
-                                event.getSelectedIncompleteAddresses() != null);
+                setEnabled(event.hasAddressesWithGuesses());
         }
 
@@ -102 +101 @@
         @Override
         public void addressEditActionPerformed(AddressEditContainer container) {
-                if (container == null || container.getUnresolvedAddresses() == null) return;
+                if (container == null || container.getNumberOfIncompleteAddresses() == 0) return;
                 
                 List<OSMAddress> addrToFix = container.getUnresolvedAddresses();

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

@@ -62 +62 @@
         @Override
         public void updateEnabledState(AddressEditSelectionEvent ev) {
-                setEnabled(ev.getSelectedStreet() != null && ev.getSelectedUnresolvedAddresses() != null);
+                setEnabled(ev.getSelectedStreet() != null && ev.hasUnresolvedAddresses());
         }
 

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

@@ -61 +61 @@
         public void addressEditActionPerformed(AddressEditContainer container) {
                 if (container == null) return;
-                if (container.getUnresolvedAddresses() == null) return;
+                if (container.getNumberOfUnresolvedAddresses() == 0) return;
                                 
-                internalGuessAddresses(container.getIncompleteAddresses());
+                internalGuessAddresses(container.getAllAddressesToFix());
         }
 
@@ -73 +73 @@
                 if (ev == null || ev.getSelectedUnresolvedAddresses() == null) return;
                 
-                // guess tags for selected addresses only
-                internalGuessAddresses(ev.getSelectedUnresolvedAddresses());            
+                // guess tags for selected addresses only                               
+                internalGuessAddresses(ev.getSelectedIncompleteAddresses());
+                internalGuessAddresses(ev.getSelectedUnresolvedAddresses());
         }
         
@@ -82 +83 @@
          */
         private void internalGuessAddresses(List<OSMAddress> nodes) {
+                if (nodes == null) return;
+                
                 GuessAddressRunnable aft = new GuessAddressRunnable(nodes, tr("Guess street names"));
                 aft.addFinishListener(this);

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

@@ -30 +30 @@
         public void addressEditActionPerformed(AddressEditSelectionEvent ev) {
                 beginTransaction(tr("Remove address tags"));
-                for (OSMAddress aNode : ev.getSelectedUnresolvedAddresses()) {
-                        beginObjectTransaction(aNode);
-                        aNode.removeAllAddressTags();
-                        finishObjectTransaction(aNode);
+                if (ev.hasUnresolvedAddresses()) {
+                        for (OSMAddress aNode : ev.getSelectedUnresolvedAddresses()) {
+                                beginObjectTransaction(aNode);
+                                aNode.removeAllAddressTags();
+                                finishObjectTransaction(aNode);
+                        }
                 }
-                finishTransaction();            
+
+                if (ev.hasIncompleteAddresses()) {
+                        for (OSMAddress aNode : ev.getSelectedIncompleteAddresses()) {
+                                beginObjectTransaction(aNode);
+                                aNode.removeAllAddressTags();
+                                finishObjectTransaction(aNode);
+                        }
+                        finishTransaction();            
+                }
         }
 
@@ -54 +64 @@
                 }
                 
-                setEnabled(event.getSelectedUnresolvedAddresses() != null);
+                setEnabled(event.hasAddresses());
         }
 

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

@@ -50 +50 @@
         public SelectAddressesInMapAction() {
                 // we simply use the existing icon :-|
-                super(tr("Select in map"), "selectall", "Selects selected addresses in the map");
+                super(tr("Select"), "selectall", "Selects selected addresses in the map");
         }
 
@@ -60 +60 @@
                 if (ev == null) return;
                 
-                if (ev.getSelectedUnresolvedAddresses() != null) {
+                if (ev.hasUnresolvedAddresses()) {
                         internalSelectAddresses(ev.getSelectedUnresolvedAddresses());
-                } else if (ev.getSelectedIncompleteAddresses() != null) {
+                } else if (ev.hasIncompleteAddresses()) {
                         internalSelectAddresses(ev.getSelectedIncompleteAddresses());
                 }
@@ -85 +85 @@
         @Override
         protected void updateEnabledState(AddressEditSelectionEvent event) {
-                setEnabled(event != null && (event.getSelectedUnresolvedAddresses() != null || event.getSelectedIncompleteAddresses() != null));
+                setEnabled(event != null && event.hasAddresses());
         }