Adding unit field to USA

openstreetmap · Aug 13, 2017 · f352783 · f352783 · tohaklim · Nov 18, 2017
1 parent d1cfc02
commit f352783
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 9 deletions.
diff --git a/data/address-formats.json b/data/address-formats.json
@@ -63,7 +63,7 @@
         {
             "countryCodes": ["us"],
             "format": [
-                ["housenumber", "street"],
+                ["housenumber", "street", "unit"],
                 ["city", "state", "postcode"]
             ]
         },

diff --git a/data/presets.yaml b/data/presets.yaml
@@ -84,7 +84,7 @@ en:
         # access=*
         label: Access
       address:
-        # 'addr:block_number=*, addr:city=*, addr:block_number=*, addr:conscriptionnumber=*, addr:county=*, addr:country=*, addr:county=*, addr:district=*, addr:floor=*, addr:hamlet=*, addr:housename=*, addr:housenumber=*, addr:neighbourhood=*, addr:place=*, addr:postcode=*, addr:province=*, addr:quarter=*, addr:state=*, addr:street=*, addr:subdistrict=*, addr:suburb=*'
+        # 'addr:block_number=*, addr:city=*, addr:block_number=*, addr:conscriptionnumber=*, addr:county=*, addr:country=*, addr:county=*, addr:district=*, addr:floor=*, addr:hamlet=*, addr:housename=*, addr:housenumber=*, addr:neighbourhood=*, addr:place=*, addr:postcode=*, addr:province=*, addr:quarter=*, addr:state=*, addr:street=*, addr:subdistrict=*, addr:suburb=*, addr:unit=*'
         label: Address
         placeholders:
           block_number: Block Number
@@ -117,6 +117,7 @@ en:
           subdistrict!vn: Ward/Commune/Townlet
           suburb: Suburb
           suburb!jp: Ward
+          unit: Unit
       admin_level:
         # admin_level=*
         label: Admin Level
@@ -3556,6 +3557,7 @@ en:
       natural/wetland:
         # natural=wetland
         name: Wetland
+        # 'terms: bog,marsh,reedbed,swamp,tidalflat'
         terms: '<translate with synonyms or related terms for ''Wetland'', separated by commas>'
       natural/wood:
         # natural=wood

diff --git a/data/presets/fields.json b/data/presets/fields.json
@@ -99,7 +99,8 @@
                 "addr:state",
                 "addr:street",
                 "addr:subdistrict",
-                "addr:suburb"
+                "addr:suburb",
+                "addr:unit"
             ],
             "reference": {
                 "key": "addr"
@@ -138,7 +139,8 @@
                     "subdistrict": "Subdistrict",
                     "subdistrict!vn": "Ward/Commune/Townlet",
                     "suburb": "Suburb",
-                    "suburb!jp": "Ward"
+                    "suburb!jp": "Ward",
+                    "unit": "Unit"
                 }
             }
         },

diff --git a/data/presets/fields/address.json b/data/presets/fields/address.json
@@ -21,7 +21,8 @@
         "addr:state",
         "addr:street",
         "addr:subdistrict",
-        "addr:suburb"
+        "addr:suburb",
+        "addr:unit"
     ],
     "reference": {"key": "addr"},
     "icon": "address",
@@ -58,7 +59,8 @@
           "subdistrict": "Subdistrict",
           "subdistrict!vn": "Ward/Commune/Townlet",
           "suburb": "Suburb",
-          "suburb!jp": "Ward"
+          "suburb!jp": "Ward",
+          "unit": "Unit"
         }
     }
 }
diff --git a/data/presets/presets.json b/data/presets/presets.json
@@ -9694,7 +9694,13 @@
             "tags": {
                 "natural": "wetland"
             },
-            "terms": [],
+            "terms": [
+                "bog",
+                "marsh",
+                "reedbed",
+                "swamp",
+                "tidalflat"
+            ],
             "name": "Wetland"
         },
         "natural/wood": {

diff --git a/dist/locales/en.json b/dist/locales/en.json
@@ -1162,7 +1162,8 @@
                         "subdistrict": "Subdistrict",
                         "subdistrict!vn": "Ward/Commune/Townlet",
                         "suburb": "Suburb",
-                        "suburb!jp": "Ward"
+                        "suburb!jp": "Ward",
+                        "unit": "Unit"
                     }
                 },
                 "admin_level": {
@@ -4211,7 +4212,7 @@
                 },
                 "natural/wetland": {
                     "name": "Wetland",
-                    "terms": ""
+                    "terms": "bog,marsh,reedbed,swamp,tidalflat"
                 },
                 "natural/wood": {
                     "name": "Wood",