Merge pull request #5387 from simonbilskyrollins/bench-preset

Add fields to bench preset and create seats field

data/presets.yaml

@@ -1585,6 +1585,11 @@ en:
       seasonal:
         # seasonal=*
         label: Seasonal
+      seats:
+        # seats=*
+        label: Seats
+        # seats field placeholder
+        placeholder: '2, 4, 6...'
       second_hand:
         # second_hand=*
         label: Sells Used

data/presets/fields.json

@@ -263,6 +263,7 @@
     "seamark/type": {"key": "seamark:type", "type": "combo", "universal": true, "label": "Seamark"},
     "seamark/wreck/category": {"key": "seamark:wreck:category", "type": "combo", "label": "Category"},
     "seasonal": {"key": "seasonal", "type": "check", "label": "Seasonal"},
+    "seats": {"key": "seats", "type": "number", "minValue": 0, "label": "Seats", "placeholder": "2, 4, 6..."},
     "second_hand": {"key": "second_hand", "type": "combo", "label": "Sells Used", "placeholder": "Yes, No, Only", "strings": {"options": {"yes": "Yes", "no": "No", "only": "Only"}}},
     "service_rail": {"key": "service", "type": "combo", "label": "Service Type", "strings": {"options": {"spur": "Spur", "yard": "Yard", "siding": "Siding", "crossover": "Crossover"}}},
     "service_times": {"key": "service_times", "type": "text", "label": "Service Times"},

data/presets/fields/seats.json

@@ -0,0 +1,7 @@
+{
+    "key": "seats",
+    "type": "number",
+    "minValue": 0,
+    "label": "Seats",
+    "placeholder": "2, 4, 6..."
+}

data/presets/presets.json

@@ -51,7 +51,7 @@
     "amenity/bank": {"icon": "maki-bank", "fields": ["name", "atm", "operator", "address", "building_area", "opening_hours", "drive_through"], "geometry": ["point", "area"], "terms": ["credit union", "check", "deposit", "fund", "investment", "repository", "reserve", "safe", "savings", "stock", "treasury", "trust", "vault"], "tags": {"amenity": "bank"}, "name": "Bank"},
     "amenity/bar": {"icon": "maki-bar", "fields": ["name", "operator", "address", "building_area", "opening_hours", "smoking", "outdoor_seating", "brewery"], "geometry": ["point", "area"], "terms": ["dive", "beer", "bier", "booze"], "tags": {"amenity": "bar"}, "name": "Bar"},
     "amenity/bbq": {"icon": "maki-bbq", "fields": ["covered", "fuel", "access_simple"], "geometry": ["point"], "terms": ["bbq", "grill"], "tags": {"amenity": "bbq"}, "name": "Barbecue/Grill"},
-    "amenity/bench": {"icon": "temaki-bench", "fields": ["backrest"], "geometry": ["point", "vertex", "line"], "terms": ["seat"], "tags": {"amenity": "bench"}, "name": "Bench"},
+    "amenity/bench": {"icon": "temaki-bench", "fields": ["backrest", "material", "seats", "colour"], "geometry": ["point", "vertex", "line"], "terms": ["seat"], "tags": {"amenity": "bench"}, "name": "Bench"},
     "amenity/bicycle_parking": {"icon": "maki-bicycle", "fields": ["bicycle_parking", "capacity", "operator", "covered", "access_simple"], "geometry": ["point", "vertex", "area"], "terms": ["bike"], "tags": {"amenity": "bicycle_parking"}, "name": "Bicycle Parking"},
     "amenity/bicycle_rental": {"icon": "maki-bicycle", "fields": ["capacity", "network", "operator", "payment_multi"], "geometry": ["point", "vertex", "area"], "terms": ["bike"], "tags": {"amenity": "bicycle_rental"}, "name": "Bicycle Rental"},
     "amenity/bicycle_repair_station": {"icon": "maki-bicycle", "fields": ["operator", "brand", "opening_hours", "fee", "service/bicycle"], "geometry": ["point", "vertex"], "terms": ["bike", "repair", "chain", "pump"], "tags": {"amenity": "bicycle_repair_station"}, "name": "Bicycle Repair Tool Stand"},

data/presets/presets/amenity/bench.json

@@ -1,7 +1,10 @@
 {
     "icon": "temaki-bench",
     "fields": [
-        "backrest"
+        "backrest",
+        "material",
+        "seats",
+        "colour"
     ],
     "geometry": [
         "point",

data/taginfo.json

@@ -7381,6 +7381,7 @@
     {"key": "seamark:mooring:category", "description": "Category"},
     {"key": "seamark:wreck:category", "description": "Category"},
     {"key": "seasonal", "description": "Seasonal"},
+    {"key": "seats", "description": "Seats"},
     {"key": "second_hand", "value": "yes", "description": "Sells Used"},
     {"key": "second_hand", "value": "no", "description": "Sells Used"},
     {"key": "second_hand", "value": "only", "description": "Sells Used"},

dist/locales/en.json

@@ -2769,6 +2769,10 @@
                 "seasonal": {
                     "label": "Seasonal"
                 },
+                "seats": {
+                    "label": "Seats",
+                    "placeholder": "2, 4, 6..."
+                },
                 "second_hand": {
                     "label": "Sells Used",
                     "placeholder": "Yes, No, Only",
@@ -7384,34 +7388,6 @@
                 "description": "Orthofoto layer provided by basemap.at. \"Successor\" of geoimage.at imagery.",
                 "name": "basemap.at Orthofoto"
             },
-            "eufar-balaton": {
-                "attribution": {
-                    "text": "EUFAR Balaton ortofotó 2010"
-                },
-                "description": "1940 geo-tagged photography from Balaton Limnological Institute.",
-                "name": "EUFAR Balaton orthophotos"
-            },
-            "finds.jp_KBN_2500": {
-                "attribution": {
-                    "text": "GSI KIBAN 2500"
-                },
-                "description": "GSI Kiban 2500 via finds.jp. Good for tracing, but a bit older.",
-                "name": "Japan GSI KIBAN 2500"
-            },
-            "gsi.go.jp": {
-                "attribution": {
-                    "text": "GSI Japan"
-                },
-                "description": "Japan GSI ortho Imagery. Usually better than bing, but a bit older.",
-                "name": "Japan GSI ortho Imagery"
-            },
-            "gsi.go.jp_std_map": {
-                "attribution": {
-                    "text": "GSI Japan"
-                },
-                "description": "Japan GSI Standard Map. Widely covered.",
-                "name": "Japan GSI Standard Map"
-            },
             "hike_n_bike": {
                 "attribution": {
                     "text": "© OpenStreetMap contributors"