From 453e691069a2d8b9aa727eb955882066e8d173c5 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Sun, 12 Apr 2020 10:45:11 -0700 Subject: [PATCH] Fix bridge and tunnel field types (close #7509) --- data/presets.yaml | 6 ++++++ data/presets/fields.json | 2 ++ data/presets/fields/bridge_combo.json | 5 +++++ data/presets/fields/tunnel_combo.json | 5 +++++ data/presets/presets.json | 4 ++-- data/presets/presets/man_made/bridge.json | 2 +- data/presets/presets/man_made/tunnel.json | 2 +- dist/locales/en.json | 6 ++++++ 8 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 data/presets/fields/bridge_combo.json create mode 100644 data/presets/fields/tunnel_combo.json diff --git a/data/presets.yaml b/data/presets.yaml index 508988005..ea51347fa 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -358,6 +358,9 @@ en: bridge/support: # 'bridge:support=*' label: Type + bridge_combo: + # bridge=* + label: Type building: # building=* label: Building @@ -2631,6 +2634,9 @@ en: label: Type # tunnel field placeholder placeholder: Default + tunnel_combo: + # tunnel=* + label: Type usage_rail: # usage=* label: Usage Type diff --git a/data/presets/fields.json b/data/presets/fields.json index 4f6cc42c5..29d289fd9 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -50,6 +50,7 @@ "boundary": {"key": "boundary", "type": "combo", "label": "Type"}, "brand": {"key": "brand", "type": "text", "label": "Brand"}, "brewery": {"key": "brewery", "type": "semiCombo", "label": "Draft Beers", "terms": ["on tap"]}, + "bridge_combo": {"key": "bridge", "type": "combo", "label": "Type"}, "bridge": {"key": "bridge", "type": "typeCombo", "label": "Type", "placeholder": "Default"}, "bridge/support": {"key": "bridge:support", "type": "typeCombo", "label": "Type"}, "building_area": {"key": "building", "type": "combo", "default": "yes", "geometry": ["area"], "label": "Building"}, @@ -454,6 +455,7 @@ "trees": {"key": "trees", "type": "semiCombo", "label": "Trees"}, "trench": {"key": "trench", "type": "combo", "label": "Type"}, "trolley_wire": {"key": "trolley_wire", "type": "check", "label": "Overhead Trolley Wires"}, + "tunnel_combo": {"key": "tunnel", "type": "combo", "label": "Type"}, "tunnel": {"key": "tunnel", "type": "typeCombo", "label": "Type", "placeholder": "Default"}, "usage_rail": {"key": "usage", "type": "combo", "label": "Usage Type", "strings": {"options": {"main": "Main", "branch": "Branch", "industrial": "Industrial", "military": "Military", "test": "Test", "tourism": "Tourism"}}}, "utility_semi": {"key": "utility", "type": "semiCombo", "label": "Utilities"}, diff --git a/data/presets/fields/bridge_combo.json b/data/presets/fields/bridge_combo.json new file mode 100644 index 000000000..b467c8845 --- /dev/null +++ b/data/presets/fields/bridge_combo.json @@ -0,0 +1,5 @@ +{ + "key": "bridge", + "type": "combo", + "label": "Type" +} diff --git a/data/presets/fields/tunnel_combo.json b/data/presets/fields/tunnel_combo.json new file mode 100644 index 000000000..832e5e2bd --- /dev/null +++ b/data/presets/fields/tunnel_combo.json @@ -0,0 +1,5 @@ +{ + "key": "tunnel", + "type": "combo", + "label": "Type" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index cc312383d..bbc6e67f7 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -734,7 +734,7 @@ "man_made/beacon": {"icon": "maki-communications-tower", "fields": ["name", "height"], "moreFields": ["seamark/type"], "geometry": ["point", "area"], "tags": {"man_made": "beacon"}, "name": "Beacon", "matchScore": 0.5}, "man_made/beehive": {"icon": "fas-archive", "geometry": ["point", "area"], "fields": ["ref", "operator", "seasonal", "height", "colour"], "moreFields": ["manufacturer"], "terms": ["apiary", "beekeeper", "farm", "honey", "pollination"], "tags": {"man_made": "beehive"}, "name": "Beehive"}, "man_made/breakwater": {"fields": ["material", "seamark/type"], "geometry": ["line", "area"], "tags": {"man_made": "breakwater"}, "name": "Breakwater"}, - "man_made/bridge": {"icon": "maki-bridge", "fields": ["name", "bridge", "layer", "maxweight"], "moreFields": ["gnis/feature_id", "manufacturer", "material", "seamark/type"], "geometry": ["area"], "tags": {"man_made": "bridge"}, "addTags": {"man_made": "bridge", "layer": "1"}, "removeTags": {"man_made": "bridge", "layer": "*"}, "reference": {"key": "man_made", "value": "bridge"}, "name": "Bridge Area", "matchScore": 0.85}, + "man_made/bridge": {"icon": "maki-bridge", "fields": ["name", "bridge_combo", "layer", "maxweight"], "moreFields": ["gnis/feature_id", "manufacturer", "material", "seamark/type"], "geometry": ["area"], "tags": {"man_made": "bridge"}, "addTags": {"man_made": "bridge", "layer": "1"}, "removeTags": {"man_made": "bridge", "layer": "*"}, "reference": {"key": "man_made", "value": "bridge"}, "name": "Bridge Area", "matchScore": 0.85}, "man_made/bunker_silo": {"icon": "temaki-bunker_silo", "fields": ["content"], "moreFields": ["gnis/feature_id"], "geometry": ["point", "area"], "terms": ["Silage", "Storage"], "tags": {"man_made": "bunker_silo"}, "name": "Bunker Silo"}, "man_made/cairn": {"icon": "temaki-cairn", "geometry": ["point", "area"], "terms": ["rock pile", "stone stack", "stone pile", "càrn"], "tags": {"man_made": "cairn"}, "name": "Cairn"}, "man_made/chimney": {"icon": "temaki-chimney", "fields": ["operator", "material", "height"], "geometry": ["point", "area"], "tags": {"man_made": "chimney"}, "name": "Chimney"}, @@ -785,7 +785,7 @@ "man_made/tower/defensive": {"icon": "maki-castle", "geometry": ["point", "area"], "tags": {"man_made": "tower", "tower:type": "defensive"}, "reference": {"key": "tower:type", "value": "defensive"}, "terms": ["Defensive Tower", "Castle Tower"], "name": "Fortified Tower"}, "man_made/tower/minaret": {"icon": "temaki-domed_tower", "geometry": ["point", "area"], "terms": ["Islam", "mosque", "Muezzin", "Muslim"], "tags": {"man_made": "tower", "tower:type": "minaret"}, "reference": {"key": "tower:type", "value": "minaret"}, "name": "Minaret"}, "man_made/tower/observation": {"icon": "temaki-tower", "moreFields": ["{man_made/tower}", "opening_hours"], "geometry": ["point", "area"], "terms": ["lookout tower", "fire tower"], "tags": {"man_made": "tower", "tower:type": "observation"}, "reference": {"key": "tower:type", "value": "observation"}, "name": "Observation Tower"}, - "man_made/tunnel": {"icon": "temaki-tunnel", "fields": ["name", "tunnel", "layer", "width", "length", "height"], "moreFields": ["gnis/feature_id"], "geometry": ["area"], "tags": {"man_made": "tunnel"}, "addTags": {"man_made": "tunnel", "layer": "-1"}, "removeTags": {"man_made": "tunnel", "layer": "*"}, "reference": {"key": "man_made", "value": "tunnel"}, "terms": ["bore", "dig", "shaft", "underground passage", "underpass"], "name": "Tunnel Area"}, + "man_made/tunnel": {"icon": "temaki-tunnel", "fields": ["name", "tunnel_combo", "layer", "width", "length", "height"], "moreFields": ["gnis/feature_id"], "geometry": ["area"], "tags": {"man_made": "tunnel"}, "addTags": {"man_made": "tunnel", "layer": "-1"}, "removeTags": {"man_made": "tunnel", "layer": "*"}, "reference": {"key": "man_made", "value": "tunnel"}, "terms": ["bore", "dig", "shaft", "underground passage", "underpass"], "name": "Tunnel Area"}, "man_made/utility_pole": {"icon": "temaki-utility_pole", "fields": ["ref", "operator", "utility_semi", "height", "material"], "moreFields": ["colour", "manufacturer"], "geometry": ["point", "vertex"], "tags": {"man_made": "utility_pole"}, "name": "Utility Pole"}, "man_made/wastewater_plant": {"icon": "temaki-waste", "fields": ["name", "operator", "address"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website"], "geometry": ["point", "area"], "terms": ["sewage*", "water treatment plant", "reclamation plant"], "tags": {"man_made": "wastewater_plant"}, "name": "Wastewater Plant"}, "man_made/water_tap": {"icon": "temaki-water_tap", "fields": ["ref", "operator", "drinking_water", "access_simple"], "geometry": ["point", "vertex"], "tags": {"man_made": "water_tap"}, "terms": ["drinking water", "water faucet", "water point", "water source", "water spigot"], "name": "Water Tap"}, diff --git a/data/presets/presets/man_made/bridge.json b/data/presets/presets/man_made/bridge.json index 8f25289b6..6481e9f51 100644 --- a/data/presets/presets/man_made/bridge.json +++ b/data/presets/presets/man_made/bridge.json @@ -2,7 +2,7 @@ "icon": "maki-bridge", "fields": [ "name", - "bridge", + "bridge_combo", "layer", "maxweight" ], diff --git a/data/presets/presets/man_made/tunnel.json b/data/presets/presets/man_made/tunnel.json index 17bfc9b09..33cdb7f51 100644 --- a/data/presets/presets/man_made/tunnel.json +++ b/data/presets/presets/man_made/tunnel.json @@ -2,7 +2,7 @@ "icon": "temaki-tunnel", "fields": [ "name", - "tunnel", + "tunnel_combo", "layer", "width", "length", diff --git a/dist/locales/en.json b/dist/locales/en.json index f85cdc92a..5477bbdac 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -2899,6 +2899,9 @@ "label": "Draft Beers", "terms": "on tap" }, + "bridge_combo": { + "label": "Type" + }, "bridge": { "label": "Type", "placeholder": "Default" @@ -4816,6 +4819,9 @@ "label": "Overhead Trolley Wires", "terms": "" }, + "tunnel_combo": { + "label": "Type" + }, "tunnel": { "label": "Type", "placeholder": "Default"