Merge pull request #21 from pkolmann/suburb-fix

Update address handling to use addr:suburb for ambiguous municipalities

Author: stoecker

src/org/openstreetmap/josm/plugins/austriaaddresshelper/AustriaAddressHelperAction.java

@@ -130,18 +130,15 @@ public static Map<String, String> loadAddress(OsmPrimitive selectedObject){
                 final Map<String, String> newObject = new TreeMap<>();
 
                 newObject.put("addr:country", country);
+                newObject.put("addr:city", municipality);
 
                 // Some municipalities have a specific combination of postcode and street multiple times in several
                 // localities. For example, the street "Feldgasse" in the municipality of Großebersdorf with the
                 // the postcode 2203 exists four times, namely in the localities Eibesbrunn, Großebersdorf,
-                // Manhartsbrunn, and Putzing. If this is the case, we need to set the "addr:city" tag to the value of
-                // the locality and not the municipality so that the address is unique. If there is one such case in a
-                // municipality, all addresses in the municipality have the locality in the addr:city tag (such
-                // municipalities get the attribute "municipality_has_ambiguous_addresses").
+                // Manhartsbrunn, and Putzing. If this is the case, we need to add the "addr:suburb" tag to the value of
+                // the locality.
                 if (firstAddress.getBoolean("municipality_has_ambiguous_addresses")) {
-                    newObject.put("addr:city", locality);
-                } else {
-                    newObject.put("addr:city", municipality);
+                    newObject.put("addr:suburb", locality);
                 }
 
                 newObject.put("addr:postcode", postcode);