Changeset 24115 in osm for applications

Timestamp:

2010-11-07T17:21:51+01:00 (14 years ago)

Author:

oliverw

Message:

Check for associated address interpolations.

Location:

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

Files:

• OSMAddress.java (modified) (8 diffs)
• OSMEntityBase.java (modified) (11 diffs)
• OsmUtils.java (modified) (1 diff)
• TagUtils.java (modified) (1 diff)

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

@@ -41 +41 @@
                 super.setOsmObject(osmObject);
                 
+                OsmUtils.getValuesFromAddressInterpolation(this);
+                
                 String streetNameViaRel = OsmUtils.getAssociatedStreet(this.osmObject);
                 if (!StringUtils.isNullOrEmpty(streetNameViaRel)) {
@@ -99 +101 @@
          */
         public boolean hasStreetName() {
-                return TagUtils.hasAddrStreetTag(osmObject);
+                return TagUtils.hasAddrStreetTag(osmObject) || hasDerivedValue(TagUtils.ADDR_STREET_TAG);
         }
         
@@ -187 +189 @@
                         String val = guessedValues.get(tag);
                         if (!StringUtils.isNullOrEmpty(val)) {
-                                setOSMTag(tag, val);
+                                setOSMTag(tag, val);                            
                         }
                 }
+                guessedValues.clear();
         }
 
@@ -206 +209 @@
          */
         public boolean hasPostCode() {
-                return TagUtils.hasAddrPostcodeTag(osmObject);
+                return hasTag(TagUtils.ADDR_POSTCODE_TAG);
         }
         
@@ -231 +234 @@
          * Checks for city tag.
          *
-         * @return true, if successful
+         * @return true, if a city tag is present or available via referrer.
          */
         public boolean hasCity() {
-                return TagUtils.hasAddrCityTag(osmObject);
+                return hasTag(TagUtils.ADDR_CITY_TAG);
         }
         
@@ -242 +245 @@
          */
         public String getState() {
-                if (!TagUtils.hasAddrStateTag(osmObject)) {
-                        return MISSING_TAG;
-                }
-                return TagUtils.getAddrStateValue(osmObject);
-        }
-
-        /**
-         * Gets the name of the state associated with this address.
+                return getTagValueWithGuess(TagUtils.ADDR_STATE_TAG);
+        }
+        
+        /**
+         * Checks for state tag.
+         *
+         * @return true, if a state tag is present or available via referrer.
+         */
+        public boolean hasState() {
+                return hasTag(TagUtils.ADDR_STATE_TAG);
+        }
+
+        /**
+         * Gets the name of the country associated with this address.
          * @return
          */
         public String getCountry() {
-                if (!TagUtils.hasAddrCountryTag(osmObject)) {
-                        return MISSING_TAG;
-                }
-                return TagUtils.getAddrCountryValue(osmObject);
-        }
-        
-        /**
-         * Removes all addresss related tags from the node or way.
+                return getTagValueWithGuess(TagUtils.ADDR_COUNTRY_TAG);
+        }
+        
+        /**
+         * Checks for country tag.
+         *
+         * @return true, if a country tag is present or available via referrer.
+         */
+        public boolean hasCountry() {
+                return hasTag(TagUtils.ADDR_COUNTRY_TAG);
+        }
+        
+        /**
+         * Removes all address-related tags from the node or way.
          */
         public void removeAllAddressTags() {
@@ -269 +284 @@
                 removeOSMTag(TagUtils.ADDR_STATE_TAG);
                 removeOSMTag(TagUtils.ADDR_STREET_TAG);
+        }
+        
+        /**
+         * Checks if the associated OSM object has the given tag or if the tag is available via a referrer.
+         *
+         * @param tag the tag to look for.
+         * @return true, if there is a value for the given tag.
+         */
+        public boolean hasTag(String tag) {
+                if (StringUtils.isNullOrEmpty(tag)) return false;
+                
+                return TagUtils.hasTag(osmObject, tag) || hasDerivedValue(tag);
         }
         
@@ -403 +430 @@
         
         /**
+         * Returns true, if this instance has derived values from any referrer.
+         * @return
+         */
+        public boolean hasDerivedValues() {
+                return derivedValues.size() > 0; 
+        }
+        
+        /**
          * Gets the derived value for the given tag.
          * @param tag The tag to get the derived value for.

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

@@ -26 +26 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
 
 /**
@@ -56 +57 @@
          */
         protected void setOsmObject(OsmPrimitive osmObject) {
+                CheckParameterUtil.ensureParameterNotNull(osmObject, "osmObject");
                 this.osmObject = osmObject;
         }
@@ -64 +66 @@
          */
         public static void addChangedListener(IAddressEditContainerListener listener) {
+                CheckParameterUtil.ensureParameterNotNull(listener, "listener");
                 containerListeners.add(listener);
         }
@@ -72 +75 @@
          */
         public static void removeChangedListener(IAddressEditContainerListener listener) {
+                CheckParameterUtil.ensureParameterNotNull(listener, "listener");
                 containerListeners.remove(listener);
         }
@@ -79 +83 @@
          */
         protected static void fireEntityChanged(IOSMEntity entity) {
+                CheckParameterUtil.ensureParameterNotNull(entity, "entity");
                 for (IAddressEditContainerListener listener : containerListeners) {
                         listener.entityChanged(entity);
@@ -89 +94 @@
          */
         public void addCommandListener(ICommandListener listener) {
+                CheckParameterUtil.ensureParameterNotNull(listener, "listener");
                 cmdListeners.add(listener);
         }
@@ -97 +103 @@
          */
         public void removeCommandListener(ICommandListener listener) {
+                CheckParameterUtil.ensureParameterNotNull(listener, "listener");
                 cmdListeners.remove(listener);
         }
@@ -104 +111 @@
          *
          * @param source the entity that issued the command.
-         * @param cmd the command to execute.
-         */
-        protected void fireCommandIssued(Command cmd) {
+         * @param command the command to execute.
+         */
+        protected void fireCommandIssued(Command command) {
+                CheckParameterUtil.ensureParameterNotNull(command, "command");
                 if (cmdListeners.size() == 0) {
                         throw new RuntimeException("Object has no TX context: " + this);
@@ -112 +120 @@
                 
                 for (ICommandListener l : cmdListeners) {
-                        l.commandIssued(this, cmd);
+                        l.commandIssued(this, command);
                 }
         }       
@@ -154 +162 @@
          */
         protected void setOSMTag(String tag, String newValue) {
+                CheckParameterUtil.ensureParameterNotNull(tag, "tag");          
                 if (StringUtils.isNullOrEmpty(tag)) return;
                 
@@ -170 +179 @@
          */
         protected void removeOSMTag(String tag) {
+                CheckParameterUtil.ensureParameterNotNull(tag, "tag");
                 setOSMTag(tag, null); // a value of null removes the tag
         }

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

@@ -118 +118 @@
                 return null;
         }
+        
+        /**
+         * Gets the tag values from an address interpolation ref, if present.
+         *
+         * @param address the address
+         * @return the values from address interpolation
+         */
+        public static boolean getValuesFromAddressInterpolation(OSMAddress address) {
+                if (address == null) return false;
+                
+                OsmPrimitive osmAddr = address.getOsmObject();
+                
+                for (OsmPrimitive osm : osmAddr.getReferrers()) {
+                        if (osm instanceof Way) {
+                                Way w = (Way) osm;
+                                if (TagUtils.hasAddrInterpolationTag(w)) {                                      
+                                        applyDerivedValue(address, w, TagUtils.ADDR_POSTCODE_TAG);
+                                        applyDerivedValue(address, w, TagUtils.ADDR_CITY_TAG);
+                                        applyDerivedValue(address, w, TagUtils.ADDR_COUNTRY_TAG);
+                                        applyDerivedValue(address, w, TagUtils.ADDR_STREET_TAG);
+                                        return true;
+                                }
+                        }
+                }
+                
+                return false;
+        }
+
+        private static void applyDerivedValue(OSMAddress address, Way w, String tag) {
+                if (!address.hasTag(tag) && TagUtils.hasTag(w, tag)) {                                          
+                        address.setDerivedValue(tag, w.get(tag));
+                }
+        }
 }

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

@@ -27 +27 @@
  */
 public final class TagUtils {
+        
+        /**
+         * Checks if the given OSM object has a (non-empty) value for the given tag.
+         *
+         * @param osm the osm object to inspect.
+         * @param tag the tag to look for.
+         * @return true, if osm object has a non-empty value for this tag 
+         */
+        public static boolean hasTag(OsmPrimitive osm, String tag) {
+                return osm != null && !StringUtils.isNullOrEmpty(osm.get(tag));
+        }
         
         /**