Merge branch '2.15'

facebook · Aug 15, 2019 · f0bc877 · f0bc877
2 parents 5f3aaa8 + e4c6b4c
commit f0bc877
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 0 deletions.
diff --git a/data/deprecated.json b/data/deprecated.json
@@ -451,6 +451,10 @@
       "old": {"landuse": "field"},
       "replace": {"landuse": "farmland"}
     },
+    {
+      "old": {"landuse": "garden"},
+      "replace": {"leisure": "garden"}
+    },
     {
       "old": {"landuse": "pond"},
       "replace": {"natural": "water", "water": "pond"}

diff --git a/data/presets.yaml b/data/presets.yaml
@@ -5082,6 +5082,11 @@ en:
         name: Farmyard
         # 'terms: crop,grow,plant'
         terms: '<translate with synonyms or related terms for ''Farmyard'', separated by commas>'
+      landuse/flowerbed:
+        # landuse=flowerbed
+        name: Flowerbed
+        # 'terms: floral garden,flower garden'
+        terms: '<translate with synonyms or related terms for ''Flowerbed'', separated by commas>'
       landuse/forest:
         # landuse=forest
         name: Managed Forest

diff --git a/data/presets/presets.json b/data/presets/presets.json
@@ -573,6 +573,7 @@
     "landuse/construction": {"icon": "temaki-tools", "fields": ["name", "construction", "operator", "opening_date", "check_date", "note"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "construction"}, "terms": [], "name": "Construction"},
     "landuse/farmland": {"icon": "fas-tractor", "fields": ["name", "operator", "crop", "produce"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "farmland"}, "terms": ["crop", "grow", "plant"], "name": "Farmland"},
     "landuse/farmyard": {"icon": "maki-farm", "fields": ["name", "operator", "crop"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "farmyard"}, "terms": ["crop", "grow", "plant"], "name": "Farmyard"},
+    "landuse/flowerbed": {"icon": "maki-garden", "fields": ["operator"], "moreFields": ["address", "name"], "geometry": ["area"], "tags": {"landuse": "flowerbed"}, "terms": ["floral garden", "flower garden"], "name": "Flowerbed"},
     "landuse/forest": {"icon": "maki-park-alt1", "fields": ["name", "leaf_type", "leaf_cycle", "produce"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "forest"}, "terms": ["cut", "forest", "forestry", "lumber", "silviculture", "tree"], "name": "Managed Forest"},
     "landuse/garages": {"icon": "fas-warehouse", "geometry": ["area"], "fields": ["name"], "moreFields": ["address", "website", "phone", "email", "fax"], "tags": {"landuse": "garages"}, "terms": [], "name": "Garage Landuse"},
     "landuse/grass": {"geometry": ["area"], "tags": {"landuse": "grass"}, "terms": [], "name": "Grass"},

diff --git a/data/presets/presets/landuse/flowerbed.json b/data/presets/presets/landuse/flowerbed.json
@@ -0,0 +1,21 @@
+{
+    "icon": "maki-garden",
+    "fields": [
+        "operator"
+    ],
+    "moreFields": [
+        "address",
+        "name"
+    ],
+    "geometry": [
+        "area"
+    ],
+    "tags": {
+        "landuse": "flowerbed"
+    },
+    "terms": [
+        "floral garden",
+        "flower garden"
+    ],
+    "name": "Flowerbed"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
@@ -552,6 +552,7 @@
     {"key": "landuse", "value": "construction", "description": "🄿 Construction", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/tools.svg"},
     {"key": "landuse", "value": "farmland", "description": "🄿 Farmland", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-tractor.svg"},
     {"key": "landuse", "value": "farmyard", "description": "🄿 Farmyard", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/farm-15.svg"},
+    {"key": "landuse", "value": "flowerbed", "description": "🄿 Flowerbed", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/garden-15.svg"},
     {"key": "landuse", "value": "forest", "description": "🄿 Managed Forest", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/park-alt1-15.svg"},
     {"key": "landuse", "value": "garages", "description": "🄿 Garage Landuse", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-warehouse.svg"},
     {"key": "landuse", "value": "greenfield", "description": "🄿 Greenfield", "object_types": ["area"]},
@@ -1915,6 +1916,7 @@
     {"key": "kerb", "value": "flat", "description": "🄳 ➜ kerb=flush"},
     {"key": "landuse", "value": "conservation", "description": "🄳 ➜ boundary=protected_area"},
     {"key": "landuse", "value": "field", "description": "🄳 ➜ landuse=farmland"},
+    {"key": "landuse", "value": "garden", "description": "🄳 ➜ leisure=garden"},
     {"key": "landuse", "value": "port", "description": "🄳 ➜ landuse=industrial + industrial=port"},
     {"key": "landuse", "value": "wood", "description": "🄳 ➜ natural=wood"},
     {"key": "leisure", "value": "beach", "description": "🄳 ➜ natural=beach"},

diff --git a/dist/locales/en.json b/dist/locales/en.json
@@ -7218,6 +7218,10 @@
                     "name": "Farmyard",
                     "terms": "crop,grow,plant"
                 },
+                "landuse/flowerbed": {
+                    "name": "Flowerbed",
+                    "terms": "floral garden,flower garden"
+                },
                 "landuse/forest": {
                     "name": "Managed Forest",
                     "terms": "cut,forest,forestry,lumber,silviculture,tree"