CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-24 17:14:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add scuba_diving: services multiselect field, update terms

Browse Source 
This updates both the `shop=scuba_diving` and `amenity=dive_centre` presets
This commit is contained in:
Bryan Housel
2018-10-31 11:57:43 -04:00
parent 98ac14383d
commit 1b0d7636d3
8 changed files with 40 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/presets.yaml
+5 -1
View File
@@ -1453,6 +1453,9 @@ en:
sanitary_dump_station:
# sanitary_dump_station=*
label: Toilet Disposal
scuba_diving:
# 'scuba_diving:=*'
label: Services
seamark/beacon_isolated_danger/shape:
# 'seamark:beacon_isolated_danger:shape=*'
label: Shape
@@ -2331,7 +2334,7 @@ en:
amenity/dive_centre:
# amenity=dive_centre
name: Dive Center
# 'terms: diving'
# 'terms: diving,scuba'
terms: '<translate with synonyms or related terms for ''Dive Center'', separated by commas>'
amenity/doctors:
# amenity=doctors
@@ -6045,6 +6048,7 @@ en:
shop/scuba_diving:
# shop=scuba_diving
name: Scuba Diving Shop
# 'terms: diving,scuba'
terms: '<translate with synonyms or related terms for ''Scuba Diving Shop'', separated by commas>'
shop/seafood:
# shop=seafood
data/presets/fields.json
+1
View File
@@ -249,6 +249,7 @@
"route": {"key": "route", "type": "combo", "label": "Type"},
"sac_scale": {"key": "sac_scale", "type": "combo", "label": "Hiking Difficulty", "placeholder": "Mountain Hiking, Alpine Hiking...", "strings": {"options": {"hiking": "T1: Hiking", "mountain_hiking": "T2: Mountain Hiking", "demanding_mountain_hiking": "T3: Demanding Mountain Hiking", "alpine_hiking": "T4: Alpine Hiking", "demanding_alpine_hiking": "T5: Demanding Alpine Hiking", "difficult_alpine_hiking": "T6: Difficult Alpine Hiking"}}},
"sanitary_dump_station": {"key": "sanitary_dump_station", "type": "check", "label": "Toilet Disposal"},
"scuba_diving": {"key": "scuba_diving:", "type": "multiCombo", "label": "Services", "options": ["repair", "courses", "rental", "filling", "air_filling", "nitrox_filling", "trimix_filling", "oxygen_filling"]},
"seamark/beacon_isolated_danger/shape": {"key": "seamark:beacon_isolated_danger:shape", "type": "combo", "label": "Shape"},
"seamark/beacon_lateral/category": {"key": "seamark:beacon_lateral:category", "type": "combo", "label": "Category", "strings": {"options": {"port": "Port", "starboard": "Starboard", "waterway_left": "Waterway Left", "waterway_right": "Waterway Right", "danger_left": "Danger Left", "danger_right": "Danger Right"}}},
"seamark/beacon_lateral/colour": {"key": "seamark:beacon_lateral:colour", "type": "combo", "label": "Color", "strings": {"options": {"red": "Red", "green": "Green", "grey": "Grey"}}},
data/presets/fields/scuba_diving.json
+15
View File
@@ -0,0 +1,15 @@
{
"key": "scuba_diving:",
"type": "multiCombo",
"label": "Services",
"options": [
"repair",
"courses",
"rental",
"filling",
"air_filling",
"nitrox_filling",
"trimix_filling",
"oxygen_filling"
]
}
data/presets/presets.json
+2 -2
View File
@@ -77,7 +77,7 @@
"amenity/courthouse": {"icon": "maki-town-hall", "fields": ["name", "operator", "address", "building_area"], "geometry": ["point", "area"], "tags": {"amenity": "courthouse"}, "name": "Courthouse"},
"amenity/crematorium": {"icon": "maki-cemetery", "fields": ["name", "website", "phone", "opening_hours", "wheelchair"], "geometry": ["area", "point"], "tags": {"amenity": "crematorium"}, "terms": ["cemetery", "funeral"], "name": "Crematorium"},
"amenity/dentist": {"icon": "maki-dentist", "fields": ["name", "operator", "healthcare/speciality", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "terms": ["tooth", "teeth"], "tags": {"amenity": "dentist"}, "addTags": {"amenity": "dentist", "healthcare": "dentist"}, "removeTags": {"amenity": "dentist", "healthcare": "dentist"}, "reference": {"key": "amenity", "value": "dentist"}, "name": "Dentist"},
"amenity/dive_centre": {"icon": "maki-swimming", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "terms": ["diving"], "tags": {"amenity": "dive_centre"}, "name": "Dive Center"},
"amenity/dive_centre": {"icon": "maki-swimming", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi", "scuba_diving"], "geometry": ["point", "area"], "terms": ["diving", "scuba"], "tags": {"amenity": "dive_centre"}, "name": "Dive Center"},
"amenity/doctors": {"icon": "maki-doctor", "fields": ["name", "operator", "healthcare/speciality", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "terms": ["medic*", "physician"], "tags": {"amenity": "doctors"}, "addTags": {"amenity": "doctors", "healthcare": "doctor"}, "removeTags": {"amenity": "doctors", "healthcare": "doctor"}, "reference": {"key": "amenity", "value": "doctors"}, "name": "Doctor"},
"amenity/dojo": {"icon": "maki-pitch", "fields": ["name", "sport", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "terms": ["martial arts", "dojang"], "tags": {"amenity": "dojo"}, "name": "Dojo / Martial Arts Academy"},
"amenity/drinking_water": {"icon": "maki-drinking-water", "geometry": ["point"], "tags": {"amenity": "drinking_water"}, "terms": ["fountain", "potable"], "name": "Drinking Water"},
@@ -886,7 +886,7 @@
"shop/pyrotechnics": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "pyrotechnics"}, "name": "Fireworks Store"},
"shop/radiotechnics": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "radiotechnics"}, "name": "Radio/Electronic Component Store"},
"shop/religion": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "religion", "denomination", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "religion"}, "name": "Religious Store"},
"shop/scuba_diving": {"icon": "maki-swimming", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "scuba_diving"}, "name": "Scuba Diving Shop"},
"shop/scuba_diving": {"icon": "maki-swimming", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi", "scuba_diving"], "geometry": ["point", "area"], "terms": ["diving", "scuba"], "tags": {"shop": "scuba_diving"}, "name": "Scuba Diving Shop"},
"shop/seafood": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["fishmonger"], "tags": {"shop": "seafood"}, "name": "Seafood Shop"},
"shop/second_hand": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "second_hand", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["secondhand", "second hand", "resale", "thrift", "used"], "tags": {"shop": "second_hand"}, "name": "Consignment/Thrift Store"},
"shop/sewing": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["haberdashery"], "tags": {"shop": "sewing"}, "name": "Sewing Supply Shop"},
data/presets/presets/amenity/dive_centre.json
+5 -2
View File
@@ -5,14 +5,17 @@
"operator",
"address",
"building_area",
"opening_hours"
"opening_hours",
"payment_multi",
"scuba_diving"
],
"geometry": [
"point",
"area"
],
"terms": [
"diving"
"diving",
"scuba"
],
"tags": {
"amenity": "dive_centre"
data/presets/presets/shop/scuba_diving.json
+6 -1
View File
@@ -6,12 +6,17 @@
"address",
"building_area",
"opening_hours",
"payment_multi"
"payment_multi",
"scuba_diving"
],
"geometry": [
"point",
"area"
],
"terms": [
"diving",
"scuba"
],
"tags": {
"shop": "scuba_diving"
},
data/taginfo.json
+1
View File
@@ -7244,6 +7244,7 @@
"description": "Hiking Difficulty"
},
{"key": "sanitary_dump_station", "description": "Toilet Disposal"},
{"key": "scuba_diving:", "description": "Services"},
{"key": "seamark:beacon_isolated_danger:shape", "description": "Shape"},
{
"key": "seamark:beacon_lateral:category",
dist/locales/en.json
Vendored
+5 -2
View File
@@ -2674,6 +2674,9 @@
"sanitary_dump_station": {
"label": "Toilet Disposal"
},
"scuba_diving": {
"label": "Services"
},
"seamark/beacon_isolated_danger/shape": {
"label": "Shape"
},
@@ -3468,7 +3471,7 @@
},
"amenity/dive_centre": {
"name": "Dive Center",
"terms": "diving"
"terms": "diving,scuba"
},
"amenity/doctors": {
"name": "Doctor",
@@ -6704,7 +6707,7 @@
},
"shop/scuba_diving": {
"name": "Scuba Diving Shop",
"terms": ""
"terms": "diving,scuba"
},
"shop/seafood": {
"name": "Seafood Shop",