Changeset 24226 in osm for applications/editors/josm

Timestamp:

2010-11-14T18:51:45+01:00 (14 years ago)

Author:

oliverw

Message:

Validate postal codes (for some countries).

Location:

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

Files:

• FixAddressesPlugin.java (modified) (1 diff)
• OSMAddress.java (modified) (2 diffs)
• PostalCodeChecker.java (added)

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

@@ -45 +45 @@
         
         // create preferences instance
-        preferences = (FixAddressesPreferences) new FixAddressesPreferences.Factory().createPreferenceSetting();        
+        preferences = (FixAddressesPreferences) new FixAddressesPreferences.Factory().createPreferenceSetting();
         }
 

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

@@ -65 +65 @@
                 boolean isComplete =    hasCity() && 
                                                                 hasHouseNumber() &&
-                                                                hasPostCode() && 
+                                                                (hasPostCode() && PostalCodeChecker.hasValidPostalCode(this)) && 
                                                                 hasCity() && 
                                                                 hasStreetName();
@@ -229 +229 @@
          */
         public String getPostCode() {
-                return getTagValueWithGuess(TagUtils.ADDR_POSTCODE_TAG);
+                String pc = getTagValueWithGuess(TagUtils.ADDR_POSTCODE_TAG);
+                
+                
+                if (!MISSING_TAG.equals(pc) && !PostalCodeChecker.hasValidPostalCode(getCountry(), pc)) {
+                        pc = "(!)" + pc;
+                }
+                return pc;
+        }
+        
+        /**
+         * Checks if this instance has a valid postal code.
+         *
+         * @return true, if successful
+         */
+        public boolean hasValidPostalCode() {
+                return PostalCodeChecker.hasValidPostalCode(this);
         }