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

Timestamp:

2010-11-14T19:09:50+01:00 (14 years ago)

Author:

oliverw

Message:

• Bugfix: PostalCodeChecker returned wrong results
• Added support for CA and extended US pattern

Location:

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

Files:

• OSMAddress.java (modified) (1 diff)
• PostalCodeChecker.java (modified) (3 diffs)

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

@@ -65 +65 @@
                 boolean isComplete =    hasCity() && 
                                                                 hasHouseNumber() &&
-                                                                (hasPostalCode() && PostalCodeChecker.hasValidPostalCode(this)) && 
+                                                                (hasPostalCode() && 
+                                                                PostalCodeChecker.hasValidPostalCode(this)) && 
                                                                 hasCity() && 
                                                                 hasStreetName();

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

@@ -39 +39 @@
                 CheckParameterUtil.ensureParameterNotNull(address, "address");
                 
-                if (address.hasPostalCode()) {
+                if (!address.hasPostalCode()) {
                         return false; // no postal code available
                 }
@@ -197 +197 @@
                 //postalCodePatternMap.put("BY", "[0-9]{5}");
                 //postalCodePatternMap.put("BZ", "[0-9]{5}");
-                //postalCodePatternMap.put("CA", "[0-9]{5}");
+                postalCodePatternMap.put("CA", "[A-Z][0-9][A-Z] [0-9][A-Z][0-9]"); // Canada A9A 9A9
                 //postalCodePatternMap.put("CC", "[0-9]{5}");
                 //postalCodePatternMap.put("CD", "[0-9]{5}");
@@ -398 +398 @@
                 //postalCodePatternMap.put("UG", "[0-9]{5}");
                 //postalCodePatternMap.put("UM", "[0-9]{5}");
-                postalCodePatternMap.put("US", "[0-9]{5}");
+                postalCodePatternMap.put("US", "([A-Z]{2} )?[0-9]{5}"); // support "99999" and "IL 99999"
                 //postalCodePatternMap.put("UY", "[0-9]{5}");
                 //postalCodePatternMap.put("UZ", "[0-9]{5}");