From 8a6fa241df1b32a4fe32ebd33dfa256b04483c18 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Tue, 24 Sep 2019 18:57:42 +0200 Subject: [PATCH] Add field for `playground:theme` to playground presets (re: #6351) --- data/presets.yaml | 3 +++ data/presets/fields.json | 1 + data/presets/fields/playground/theme.json | 5 +++++ data/presets/presets.json | 4 ++-- data/presets/presets/_playground.json | 6 ++++++ data/presets/presets/leisure/playground.json | 10 ++++++++-- data/taginfo.json | 1 + dist/locales/en.json | 4 ++++ 8 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 data/presets/fields/playground/theme.json diff --git a/data/presets.yaml b/data/presets.yaml index 0036b7b7b..fb3fe21d3 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -1663,6 +1663,9 @@ en: playground: # playground=* label: Type + playground/theme: + # 'playground:theme=*' + label: Theme polling_station: # polling_station=* label: Polling Place diff --git a/data/presets/fields.json b/data/presets/fields.json index 78b882099..30c3a969a 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -277,6 +277,7 @@ "plant": {"key": "plant", "type": "combo", "label": "Plant"}, "plant/output/electricity": {"key": "plant:output:electricity", "type": "text", "label": "Power Output", "placeholder": "500 MW, 1000 MW, 2000 MW..."}, "playground": {"key": "playground", "type": "combo", "label": "Type"}, + "playground/theme": {"key": "playground:theme", "type": "combo", "label": "Theme"}, "polling_station": {"key": "polling_station", "type": "check", "label": "Polling Place", "terms": ["voting place"]}, "population": {"key": "population", "type": "text", "label": "Population"}, "post": {"type": "address", "key": "post", "keys": ["post:block_number", "post:city", "post:block_number", "post:conscriptionnumber", "post:county", "post:country", "post:county", "post:district", "post:floor", "post:hamlet", "post:housename", "post:housenumber", "post:neighbourhood", "post:place", "post:postcode", "post:province", "post:quarter", "post:state", "post:street", "post:subdistrict", "post:suburb", "post:unit"], "label": "Delivery Address"}, diff --git a/data/presets/fields/playground/theme.json b/data/presets/fields/playground/theme.json new file mode 100644 index 000000000..4d2d6eb2a --- /dev/null +++ b/data/presets/fields/playground/theme.json @@ -0,0 +1,5 @@ +{ + "key": "playground:theme", + "type": "combo", + "label": "Theme" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index f486ad602..f80b35b3e 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -16,7 +16,7 @@ "man_made": {"icon": "temaki-storage_tank", "fields": ["name", "man_made"], "moreFields": ["material"], "geometry": ["point", "vertex", "line", "area"], "tags": {"man_made": "*"}, "matchScore": 0.95, "searchable": false, "name": "Man Made"}, "natural": {"icon": "maki-natural", "fields": ["name", "natural"], "geometry": ["point", "vertex", "line", "area"], "tags": {"natural": "*"}, "searchable": false, "name": "Natural"}, "place": {"fields": ["name", "place"], "geometry": ["point", "vertex", "area"], "tags": {"place": "*"}, "searchable": false, "name": "Place"}, - "playground": {"icon": "maki-playground", "fields": ["playground", "min_age", "max_age", "wheelchair", "blind", "height"], "geometry": ["point", "vertex", "line", "area"], "tags": {"playground": "*"}, "searchable": false, "name": "Playground Equipment"}, + "playground": {"icon": "maki-playground", "fields": ["playground", "playground/theme", "min_age", "max_age", "wheelchair", "blind", "height"], "moreFields": ["access_simple", "colour", "ref"], "geometry": ["point", "vertex", "line", "area"], "tags": {"playground": "*"}, "searchable": false, "name": "Playground Equipment"}, "power": {"geometry": ["point", "vertex", "line", "area"], "tags": {"power": "*"}, "fields": ["power"], "moreFields": ["material"], "searchable": false, "name": "Power"}, "railway": {"fields": ["railway"], "geometry": ["point", "vertex", "line", "area"], "tags": {"railway": "*"}, "searchable": false, "name": "Railway"}, "seamark": {"icon": "maki-harbor", "fields": ["seamark/type"], "geometry": ["point", "vertex", "line", "area"], "tags": {"seamark:type": "*"}, "searchable": false, "name": "Seamark"}, @@ -677,7 +677,7 @@ "leisure/pitch/table_tennis": {"icon": "maki-tennis", "fields": ["name", "lit", "access_simple"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "table_tennis"}, "reference": {"key": "sport", "value": "table_tennis"}, "terms": ["table tennis", "ping pong"], "name": "Ping Pong Table"}, "leisure/pitch/tennis": {"icon": "maki-tennis", "fields": ["{leisure/pitch}", "access_simple"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "tennis"}, "reference": {"key": "sport", "value": "tennis"}, "terms": [], "name": "Tennis Court"}, "leisure/pitch/volleyball": {"icon": "maki-volleyball", "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "volleyball"}, "reference": {"key": "sport", "value": "volleyball"}, "terms": [], "name": "Volleyball Court"}, - "leisure/playground": {"icon": "maki-playground", "fields": ["name", "operator", "surface", "min_age", "max_age", "access_simple"], "geometry": ["point", "area"], "terms": ["jungle gym", "play area"], "tags": {"leisure": "playground"}, "name": "Playground"}, + "leisure/playground": {"icon": "maki-playground", "fields": ["name", "operator", "playground/theme", "surface", "access_simple", "min_age", "max_age"], "moreFields": ["blind", "dog", "wheelchair"], "geometry": ["point", "area"], "terms": ["jungle gym", "play area"], "tags": {"leisure": "playground"}, "name": "Playground"}, "leisure/resort": {"icon": "maki-lodging", "fields": ["name", "operator", "resort", "address", "opening_hours"], "moreFields": ["access_simple", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "phone", "website"], "geometry": ["point", "area"], "tags": {"leisure": "resort"}, "terms": ["recreation center", "sanatorium", "ski and snowboard resort", "vacation resort", "winter sports resort"], "name": "Resort"}, "leisure/sauna": {"icon": "fas-thermometer-three-quarters", "fields": ["name", "operator", "address", "opening_hours", "access_simple", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["level", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"leisure": "sauna"}, "name": "Sauna"}, "leisure/slipway_point": {"icon": "maki-slipway", "fields": ["{leisure/slipway}"], "moreFields": ["{leisure/slipway}"], "geometry": ["point", "vertex"], "terms": ["boat launch", "boat ramp", "boat landing"], "tags": {"leisure": "slipway"}, "name": "Slipway"}, diff --git a/data/presets/presets/_playground.json b/data/presets/presets/_playground.json index 101857639..b5fe6555b 100644 --- a/data/presets/presets/_playground.json +++ b/data/presets/presets/_playground.json @@ -2,12 +2,18 @@ "icon": "maki-playground", "fields": [ "playground", + "playground/theme", "min_age", "max_age", "wheelchair", "blind", "height" ], + "moreFields": [ + "access_simple", + "colour", + "ref" + ], "geometry": [ "point", "vertex", diff --git a/data/presets/presets/leisure/playground.json b/data/presets/presets/leisure/playground.json index 17e58c840..a4c666bb1 100644 --- a/data/presets/presets/leisure/playground.json +++ b/data/presets/presets/leisure/playground.json @@ -3,10 +3,16 @@ "fields": [ "name", "operator", + "playground/theme", "surface", + "access_simple", "min_age", - "max_age", - "access_simple" + "max_age" + ], + "moreFields": [ + "blind", + "dog", + "wheelchair" ], "geometry": [ "point", diff --git a/data/taginfo.json b/data/taginfo.json index 365f45f9b..b07ca859a 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1591,6 +1591,7 @@ {"key": "piste:type", "value": "connection", "description": "🄵 Type"}, {"key": "plant", "description": "🄵 Plant"}, {"key": "plant:output:electricity", "description": "🄵 Power Output"}, + {"key": "playground:theme", "description": "🄵 Theme"}, {"key": "population", "description": "🄵 Population"}, {"key": "post:block_number", "description": "🄵 Delivery Address"}, {"key": "post:city", "description": "🄵 Delivery Address"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index ad35670a8..fd32e03ec 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -4009,6 +4009,10 @@ "label": "Type", "terms": "" }, + "playground/theme": { + "label": "Theme", + "terms": "" + }, "polling_station": { "label": "Polling Place", "terms": "voting place"