From 32774136cbfbfd6ba80955e5a2bf7ea586af884e Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Tue, 2 Oct 2018 14:37:22 -0400 Subject: [PATCH] Adjust icon for moving walkway --- data/presets/presets.json | 4 ++-- .../presets/footway/conveying/moving-walkway.json | 12 ++++++++---- .../presets/highway/steps/conveying/escalator.json | 13 ++++++++++--- data/taginfo.json | 2 +- 4 files changed, 21 insertions(+), 10 deletions(-) diff --git a/data/presets/presets.json b/data/presets/presets.json index 9ad1bb3f3..500c02e46 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -335,7 +335,7 @@ "emergency/siren": {"icon": "fas-volume-up", "fields": ["siren/purpose", "siren/type", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["air raid", "loud", "noise", "storm", "tornado", "warning"], "tags": {"emergency": "siren"}, "name": "Siren"}, "emergency/water_tank": {"icon": "maki-water", "fields": ["name", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["water tank", "cistern", "reservoir"], "tags": {"emergency": "water_tank"}, "name": "Emergency Water Tank"}, "entrance": {"icon": "maki-entrance-alt1", "geometry": ["vertex"], "terms": ["entrance", "exit", "door"], "tags": {"entrance": "*"}, "fields": ["entrance", "access_simple", "address"], "name": "Entrance/Exit"}, - "footway/conveying/moving-walkway": {"icon": "temaki-pedestrian", "fields": ["name", "conveying", "access_simple", "lit", "surface", "width"], "geometry": ["line"], "terms": ["moving sidewalk", "autwalk", "skywalk", "travolator", "travelator", "travellator", "conveyor"], "tags": {"highway": "footway", "conveying": "*"}, "name": "Moving Walkway"}, + "footway/conveying/moving-walkway": {"icon": "iD-highway-footway", "fields": ["name", "conveying", "access_simple", "lit", "width"], "geometry": ["line"], "terms": ["moving sidewalk", "autwalk", "skywalk", "travolator", "travelator", "travellator", "conveyor"], "tags": {"highway": "footway", "conveying": "*"}, "name": "Moving Walkway"}, "footway/crossing-raised": {"fields": ["crossing", "access", "surface", "kerb", "tactile_paving"], "geometry": ["line"], "tags": {"highway": "footway", "footway": "crossing", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "terms": ["flat top", "hump", "speed", "slow"], "name": "Raised Street Crossing"}, "footway/crossing": {"fields": ["crossing", "access", "surface", "kerb", "tactile_paving"], "geometry": ["line"], "tags": {"highway": "footway", "footway": "crossing"}, "reference": {"key": "footway", "value": "crossing"}, "terms": [], "name": "Street Crossing"}, "footway/crosswalk-raised": {"icon": "iD-highway-footway", "fields": ["crossing", "access", "surface", "kerb", "tactile_paving"], "geometry": ["line"], "tags": {"highway": "footway", "footway": "crossing", "crossing": "zebra", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "terms": ["zebra crossing", "flat top", "hump", "speed", "slow"], "name": "Raised Pedestrian Crosswalk"}, @@ -407,7 +407,7 @@ "highway/services": {"icon": "maki-car", "fields": ["name"], "geometry": ["point", "vertex", "area"], "tags": {"highway": "services"}, "terms": ["services", "travel plaza", "service station"], "name": "Service Area"}, "highway/speed_camera": {"icon": "maki-attraction", "geometry": ["point", "vertex"], "fields": ["direction", "ref"], "tags": {"highway": "speed_camera"}, "terms": [], "name": "Speed Camera"}, "highway/steps": {"icon": "iD-highway-steps", "fields": ["surface", "lit", "width", "incline_steps", "handrail", "step_count"], "geometry": ["line"], "tags": {"highway": "steps"}, "terms": ["stairs", "staircase"], "name": "Steps"}, - "highway/steps/conveying/escalator": {"icon": "maki-entrance", "fields": ["name", "incline_steps", "conveying", "access_simple", "lit", "surface", "width", "handrail", "step_count"], "geometry": ["line"], "terms": ["moving staircase", "moving stairway", "people mover"], "tags": {"highway": "steps", "conveying": "*"}, "name": "Escalator"}, + "highway/steps/conveying/escalator": {"icon": "maki-entrance", "fields": ["name", "incline_steps", "conveying", "access_simple", "lit", "width", "handrail", "step_count"], "geometry": ["line"], "terms": ["moving staircase", "moving stairway", "people mover"], "tags": {"highway": "steps", "conveying": "*"}, "name": "Escalator"}, "highway/stop": {"icon": "temaki-stop", "fields": ["stop", "direction_vertex"], "geometry": ["vertex"], "tags": {"highway": "stop"}, "terms": ["stop", "halt", "sign"], "name": "Stop Sign"}, "highway/street_lamp": {"icon": "temaki-bulb", "geometry": ["point", "vertex"], "tags": {"highway": "street_lamp"}, "fields": ["lamp_type", "direction", "ref"], "terms": ["streetlight", "street light", "lamp", "light", "gaslight"], "name": "Street Lamp"}, "highway/tertiary_link": {"icon": "iD-highway-tertiary-link", "fields": ["name", "oneway", "maxspeed", "maxspeed/advisory", "lanes", "surface", "structure", "maxheight", "ref_road_number", "cycleway", "access"], "geometry": ["line"], "tags": {"highway": "tertiary_link"}, "terms": ["on ramp", "off ramp", "ramp", "road", "street"], "name": "Tertiary Link"}, diff --git a/data/presets/presets/footway/conveying/moving-walkway.json b/data/presets/presets/footway/conveying/moving-walkway.json index b9b3d4684..508fc2f3d 100644 --- a/data/presets/presets/footway/conveying/moving-walkway.json +++ b/data/presets/presets/footway/conveying/moving-walkway.json @@ -1,13 +1,17 @@ { - "icon": "temaki-pedestrian", + "icon": "iD-highway-footway", "fields": [ - "name", "conveying", "access_simple", "lit", "surface", "width" + "name", + "conveying", + "access_simple", + "lit", + "width" ], "geometry": [ "line" ], "terms": [ - "moving sidewalk", + "moving sidewalk", "autwalk", "skywalk", "travolator", @@ -20,4 +24,4 @@ "conveying": "*" }, "name": "Moving Walkway" -} \ No newline at end of file +} diff --git a/data/presets/presets/highway/steps/conveying/escalator.json b/data/presets/presets/highway/steps/conveying/escalator.json index 327f824db..e138240f0 100644 --- a/data/presets/presets/highway/steps/conveying/escalator.json +++ b/data/presets/presets/highway/steps/conveying/escalator.json @@ -1,13 +1,20 @@ { "icon": "maki-entrance", "fields": [ - "name", "incline_steps", "conveying", "access_simple", "lit", "surface", "width", "handrail", "step_count" + "name", + "incline_steps", + "conveying", + "access_simple", + "lit", + "width", + "handrail", + "step_count" ], "geometry": [ "line" ], "terms": [ - "moving staircase", + "moving staircase", "moving stairway", "people mover" ], @@ -16,4 +23,4 @@ "conveying": "*" }, "name": "Escalator" -} \ No newline at end of file +} diff --git a/data/taginfo.json b/data/taginfo.json index c632cb502..b7b7adf34 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -2294,7 +2294,7 @@ "key": "conveying", "description": "Moving Walkway, Escalator", "object_types": ["way"], - "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/pedestrian.svg?sanitize=true" + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-footway.svg?sanitize=true" }, { "key": "traffic_calming",