From 67153dc51832f088b93588cc7bb586be96a9e209 Mon Sep 17 00:00:00 2001 From: Henry Ho Date: Sun, 30 Sep 2018 17:32:27 -0700 Subject: [PATCH 1/2] - Add design tag values preset to high-voltage tower - Add power term to tower - Add design to fields for tower --- data/presets/fields/design.json | 5 +++++ data/presets/presets/power/tower.json | 4 ++++ 2 files changed, 9 insertions(+) create mode 100644 data/presets/fields/design.json diff --git a/data/presets/fields/design.json b/data/presets/fields/design.json new file mode 100644 index 000000000..921ca575d --- /dev/null +++ b/data/presets/fields/design.json @@ -0,0 +1,5 @@ +{ + "key": "design", + "type": "combo", + "label": "Design" +} \ No newline at end of file diff --git a/data/presets/presets/power/tower.json b/data/presets/presets/power/tower.json index 09ce2afe4..77c5277fe 100644 --- a/data/presets/presets/power/tower.json +++ b/data/presets/presets/power/tower.json @@ -1,10 +1,14 @@ { "fields": [ + "design", "ref" ], "geometry": [ "vertex" ], + "terms": [ + "power" + ], "tags": { "power": "tower" }, From 08d330f2dfe7624a8d818f19b6174ceefdb25b56 Mon Sep 17 00:00:00 2001 From: Henry Ho Date: Sun, 30 Sep 2018 21:44:14 -0700 Subject: [PATCH 2/2] Added build generated files --- data/presets.yaml | 4 ++++ data/presets/fields.json | 1 + data/presets/presets.json | 2 +- data/taginfo.json | 1 + dist/locales/en.json | 33 ++++++++++++++++++++++++++++++++- 5 files changed, 39 insertions(+), 2 deletions(-) diff --git a/data/presets.yaml b/data/presets.yaml index e7875d38c..f75c15cc9 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -431,6 +431,9 @@ en: description: # description=* label: Description + design: + # design=* + label: Design devices: # devices=* label: Devices @@ -4978,6 +4981,7 @@ en: power/tower: # power=tower name: High-Voltage Tower + # 'terms: power' terms: '' power/transformer: # power=transformer diff --git a/data/presets/fields.json b/data/presets/fields.json index aeb7fc9da..8216e6f17 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -74,6 +74,7 @@ "denomination": {"key": "denomination", "type": "combo", "label": "Denomination"}, "denotation": {"key": "denotation", "type": "combo", "label": "Denotation"}, "description": {"key": "description", "type": "textarea", "label": "Description", "universal": true}, + "design": {"key": "design", "type": "combo", "label": "Design"}, "devices": {"key": "devices", "type": "number", "minValue": 0, "label": "Devices", "placeholder": "1, 2, 3..."}, "diaper": {"key": "diaper", "type": "combo", "label": "Diaper Changing Available", "options": ["yes", "no", "room", "1", "2", "3", "4", "5"]}, "direction_cardinal": {"key": "direction", "type": "combo", "label": "Direction", "strings": {"options": {"N": "North", "E": "East", "S": "South", "W": "West", "NE": "Northeast", "SE": "Southeast", "SW": "Southwest", "NW": "Northwest", "NNE": "North-northeast", "ENE": "East-northeast", "ESE": "East-southeast", "SSE": "South-southeast", "SSW": "South-southwest", "WSW": "West-southwest", "WNW": "West-northwest", "NNW": "North-northwest"}}}, diff --git a/data/presets/presets.json b/data/presets/presets.json index f027b0342..04d29d04c 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -684,7 +684,7 @@ "power/pole": {"fields": ["ref"], "geometry": ["point", "vertex"], "tags": {"power": "pole"}, "name": "Power Pole"}, "power/substation": {"icon": "temaki-power", "fields": ["substation", "operator", "building", "ref"], "geometry": ["point", "area"], "tags": {"power": "substation"}, "name": "Substation"}, "power/switch": {"icon": "temaki-power", "fields": ["switch", "operator", "location", "cables", "voltage", "ref"], "geometry": ["point", "vertex", "area"], "tags": {"power": "switch"}, "name": "Power Switch"}, - "power/tower": {"fields": ["ref"], "geometry": ["vertex"], "tags": {"power": "tower"}, "name": "High-Voltage Tower"}, + "power/tower": {"fields": ["design", "ref"], "geometry": ["vertex"], "terms": ["power"], "tags": {"power": "tower"}, "name": "High-Voltage Tower"}, "power/transformer": {"icon": "temaki-power", "fields": ["transformer", "operator", "location", "rating", "devices", "phases", "frequency", "voltage/primary", "voltage/secondary", "voltage/tertiary", "windings", "windings/configuration", "ref"], "geometry": ["point", "vertex", "area"], "tags": {"power": "transformer"}, "name": "Transformer"}, "public_transport/linear_platform_aerialway": {"icon": "iD-highway-footway", "fields": ["name", "ref_platform", "network", "operator", "surface", "lit", "bench", "shelter"], "geometry": ["line"], "tags": {"public_transport": "platform", "aerialway": "yes"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["aerialway", "cable car", "platform", "public transit", "public transportation", "transit", "transportation"], "name": "Aerialway Stop / Platform"}, "public_transport/linear_platform_bus": {"icon": "iD-highway-footway", "fields": ["name", "ref_platform", "network", "operator", "surface", "lit", "bench", "shelter", "passenger_information_display"], "geometry": ["line"], "tags": {"public_transport": "platform", "bus": "yes"}, "addTags": {"public_transport": "platform", "bus": "yes", "highway": "bus_stop"}, "removeTags": {"public_transport": "platform", "bus": "yes", "highway": "bus_stop"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["bus", "platform", "public transit", "public transportation", "transit", "transportation"], "name": "Bus Stop / Platform"}, diff --git a/data/taginfo.json b/data/taginfo.json index 3190e9d4e..8a78e477b 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -6628,6 +6628,7 @@ {"key": "denomination", "description": "Denomination"}, {"key": "denotation", "description": "Denotation"}, {"key": "description", "description": "Description"}, + {"key": "design", "description": "Design"}, {"key": "devices", "description": "Devices"}, {"key": "diaper", "description": "Diaper Changing Available"}, {"key": "direction", "value": "N", "description": "Direction"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index c8c1b2ff3..be9c75ea2 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -1836,6 +1836,9 @@ "description": { "label": "Description" }, + "design": { + "label": "Design" + }, "devices": { "label": "Devices", "placeholder": "1, 2, 3..." @@ -5794,7 +5797,7 @@ }, "power/tower": { "name": "High-Voltage Tower", - "terms": "" + "terms": "power" }, "power/transformer": { "name": "Transformer", @@ -7192,6 +7195,34 @@ "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"