From 5cd65efd6ea7c43ca5e0d9d6e1c18bc59c95a977 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Fri, 31 Jan 2020 10:07:55 -0500 Subject: [PATCH] Update generic aerialway and aeroway preset names to include "Feature" Add icon to generic power preset --- data/presets.yaml | 4 ++-- data/presets/presets.json | 6 +++--- data/presets/presets/_aerialway.json | 2 +- data/presets/presets/_aeroway.json | 2 +- data/presets/presets/_power.json | 1 + data/taginfo.json | 6 +++--- dist/locales/en.json | 6 +++--- 7 files changed, 14 insertions(+), 13 deletions(-) diff --git a/data/presets.yaml b/data/presets.yaml index fad3328f5..3ff021938 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -2767,7 +2767,7 @@ en: terms: '' aerialway: # aerialway=* - name: Aerialway + name: Aerialway Feature aerialway/cable_car: # aerialway=cable_car name: Cable Car @@ -2835,7 +2835,7 @@ en: terms: '' aeroway: # aeroway=* - name: Aeroway + name: Aeroway Feature aeroway/aerodrome: # aeroway=aerodrome name: Airport diff --git a/data/presets/presets.json b/data/presets/presets.json index d10e6205e..faa6d8563 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -1,7 +1,7 @@ { "presets": { - "aerialway": {"fields": ["name", "aerialway"], "moreFields": ["layer"], "geometry": ["point", "vertex", "line"], "tags": {"aerialway": "*"}, "searchable": false, "name": "Aerialway"}, - "aeroway": {"icon": "maki-airport", "fields": ["aeroway"], "geometry": ["point", "vertex", "line", "area"], "tags": {"aeroway": "*"}, "searchable": false, "name": "Aeroway"}, + "aerialway": {"fields": ["name", "aerialway"], "moreFields": ["layer"], "geometry": ["point", "vertex", "line"], "tags": {"aerialway": "*"}, "searchable": false, "name": "Aerialway Feature"}, + "aeroway": {"icon": "maki-airport", "fields": ["aeroway"], "geometry": ["point", "vertex", "line", "area"], "tags": {"aeroway": "*"}, "searchable": false, "name": "Aeroway Feature"}, "amenity": {"fields": ["amenity"], "geometry": ["point", "vertex", "line", "area"], "tags": {"amenity": "*"}, "searchable": false, "name": "Amenity"}, "attraction": {"icon": "maki-star", "fields": ["name", "attraction", "operator", "opening_hours", "fee", "charge_fee"], "moreFields": ["address", "email", "fax", "opening_hours", "payment_multi", "phone", "website"], "geometry": ["point", "vertex", "line", "area"], "tags": {"attraction": "*"}, "searchable": false, "name": "Attraction"}, "boundary": {"fields": ["boundary"], "geometry": ["line"], "tags": {"boundary": "*"}, "searchable": false, "name": "Boundary", "matchScore": 0.45}, @@ -17,7 +17,7 @@ "natural": {"icon": "maki-natural", "fields": ["name", "natural"], "moreFields": ["gnis/feature_id"], "geometry": ["point", "vertex", "line", "area"], "tags": {"natural": "*"}, "searchable": false, "name": "Natural Feature"}, "place": {"fields": ["name", "place"], "moreFields": ["gnis/feature_id"], "geometry": ["point", "vertex", "area"], "tags": {"place": "*"}, "searchable": false, "name": "Place"}, "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 Feature"}, + "power": {"icon": "temaki-power", "geometry": ["point", "vertex", "line", "area"], "tags": {"power": "*"}, "fields": ["power"], "moreFields": ["material"], "searchable": false, "name": "Power Feature"}, "railway": {"icon": "temaki-rail_profile", "fields": ["railway"], "geometry": ["point", "vertex", "line", "area"], "tags": {"railway": "*"}, "searchable": false, "name": "Railway Feature"}, "seamark": {"icon": "maki-harbor", "fields": ["seamark/type"], "geometry": ["point", "vertex", "line", "area"], "tags": {"seamark:type": "*"}, "searchable": false, "name": "Seamark"}, "tourism": {"icon": "maki-attraction", "fields": ["name", "tourism"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "*"}, "searchable": false, "name": "Tourism Feature"}, diff --git a/data/presets/presets/_aerialway.json b/data/presets/presets/_aerialway.json index de6d9f74b..758a5b233 100644 --- a/data/presets/presets/_aerialway.json +++ b/data/presets/presets/_aerialway.json @@ -15,5 +15,5 @@ "aerialway": "*" }, "searchable": false, - "name": "Aerialway" + "name": "Aerialway Feature" } diff --git a/data/presets/presets/_aeroway.json b/data/presets/presets/_aeroway.json index 30a4e3bb2..dfbc06a16 100644 --- a/data/presets/presets/_aeroway.json +++ b/data/presets/presets/_aeroway.json @@ -13,5 +13,5 @@ "aeroway": "*" }, "searchable": false, - "name": "Aeroway" + "name": "Aeroway Feature" } diff --git a/data/presets/presets/_power.json b/data/presets/presets/_power.json index d2a20e061..8804d576a 100644 --- a/data/presets/presets/_power.json +++ b/data/presets/presets/_power.json @@ -1,4 +1,5 @@ { + "icon": "temaki-power", "geometry": [ "point", "vertex", diff --git a/data/taginfo.json b/data/taginfo.json index ef145451b..7e9e6494a 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -3,8 +3,8 @@ "data_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/data/taginfo.json", "project": {"name": "iD Editor", "description": "Online editor for OSM data.", "project_url": "https://github.com/openstreetmap/iD", "doc_url": "https://github.com/openstreetmap/iD/blob/master/data/presets/README.md", "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@release/dist/img/logo.png", "keywords": ["editor"]}, "tags": [ - {"key": "aerialway", "description": "🄿 Aerialway (unsearchable), 🄵 Type", "object_types": ["node", "way"]}, - {"key": "aeroway", "description": "🄿 Aeroway (unsearchable), 🄵 Type", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/airport-15.svg"}, + {"key": "aerialway", "description": "🄿 Aerialway Feature (unsearchable), 🄵 Type", "object_types": ["node", "way"]}, + {"key": "aeroway", "description": "🄿 Aeroway Feature (unsearchable), 🄵 Type", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/airport-15.svg"}, {"key": "amenity", "description": "🄿 Amenity (unsearchable), 🄵 Type", "object_types": ["node", "way", "area"]}, {"key": "attraction", "description": "🄿 Attraction (unsearchable), 🄵 Type", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/star-15.svg"}, {"key": "boundary", "description": "🄿 Boundary (unsearchable), 🄵 Type", "object_types": ["way"]}, @@ -20,7 +20,7 @@ {"key": "natural", "description": "🄿 Natural Feature (unsearchable), 🄵 Natural", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/natural-15.svg"}, {"key": "place", "description": "🄿 Place (unsearchable), 🄵 Type", "object_types": ["node", "area"]}, {"key": "playground", "description": "🄿 Playground Equipment (unsearchable), 🄵 Type", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/playground-15.svg"}, - {"key": "power", "description": "🄿 Power Feature (unsearchable), 🄵 Type", "object_types": ["node", "way", "area"]}, + {"key": "power", "description": "🄿 Power Feature (unsearchable), 🄵 Type", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/power.svg"}, {"key": "railway", "description": "🄿 Railway Feature (unsearchable), 🄵 Type", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/rail_profile.svg"}, {"key": "seamark:type", "description": "🄿 Seamark (unsearchable), 🄵 Seamark", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/harbor-15.svg"}, {"key": "tourism", "description": "🄿 Tourism Feature (unsearchable), 🄵 Type", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/attraction-15.svg"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 0509bce1c..37b816405 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -4875,10 +4875,10 @@ }, "presets": { "aerialway": { - "name": "Aerialway" + "name": "Aerialway Feature" }, "aeroway": { - "name": "Aeroway" + "name": "Aeroway Feature" }, "amenity": { "name": "Amenity" @@ -10075,7 +10075,7 @@ }, "MAPNIK": { "attribution": { - "text": "© OpenStreetMap contributors, CC-BY-SA 2.0" + "text": "© OpenStreetMap contributors, CC-BY-SA" }, "description": "The default OpenStreetMap layer.", "name": "OpenStreetMap (Standard)"