From 46fc0174f4e8ea683dfdcde78d819db0744b3dbc Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Tue, 4 Sep 2018 12:08:45 -0400 Subject: [PATCH] Add presets for `highway=milestone` and `waterway=milestone` (closes #5284) --- data/presets.yaml | 12 +++++++++++- data/presets/fields.json | 2 +- data/presets/fields/distance.json | 2 +- data/presets/presets.json | 4 +++- data/presets/presets/highway/milestone.json | 19 +++++++++++++++++++ data/presets/presets/railway/milestone.json | 3 ++- data/presets/presets/waterway/milestone.json | 19 +++++++++++++++++++ data/taginfo.json | 16 +++++++++++++++- dist/locales/en.json | 10 +++++++++- 9 files changed, 80 insertions(+), 7 deletions(-) create mode 100644 data/presets/presets/highway/milestone.json create mode 100644 data/presets/presets/waterway/milestone.json diff --git a/data/presets.yaml b/data/presets.yaml index c0ddc84a2..16965e039 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -506,7 +506,7 @@ en: label: Display distance: # distance=* - label: Total Distance + label: Distance dock: # dock=* label: Type @@ -3366,6 +3366,11 @@ en: # highway=living_street name: Living Street terms: '' + highway/milestone: + # highway=milestone + name: Highway Milestone + # 'terms: milestone,marker' + terms: '' highway/mini_roundabout: # highway=mini_roundabout name: Mini-Roundabout @@ -6004,6 +6009,11 @@ en: name: Marine Fuel Station # 'terms: petrol,gas,diesel,boat' terms: '' + waterway/milestone: + # waterway=milestone + name: Waterway Milestone + # 'terms: milestone,marker' + terms: '' waterway/river: # waterway=river name: River diff --git a/data/presets/fields.json b/data/presets/fields.json index 8698d74ff..f82ff44b8 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -82,7 +82,7 @@ "direction": {"key": "direction", "type": "number", "label": "Direction (Degrees Clockwise)", "placeholder": "45, 90, 180, 270"}, "dispensing": {"key": "dispensing", "type": "check", "label": "Dispenses Prescriptions", "default": "yes"}, "display": {"key": "display", "type": "combo", "label": "Display", "options": ["analog", "digital", "sundial", "unorthodox"]}, - "distance": {"key": "distance", "type": "text", "label": "Total Distance"}, + "distance": {"key": "distance", "type": "text", "label": "Distance"}, "dock": {"key": "dock", "type": "combo", "label": "Type"}, "drive_through": {"key": "drive_through", "type": "check", "label": "Drive-Through"}, "duration": {"key": "duration", "type": "text", "label": "Duration", "placeholder": "00:00"}, diff --git a/data/presets/fields/distance.json b/data/presets/fields/distance.json index 4619784a6..40ffbcf87 100644 --- a/data/presets/fields/distance.json +++ b/data/presets/fields/distance.json @@ -1,5 +1,5 @@ { "key": "distance", "type": "text", - "label": "Total Distance" + "label": "Distance" } diff --git a/data/presets/presets.json b/data/presets/presets.json index 7eee32062..f8917c739 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -367,6 +367,7 @@ "highway/footway": {"icon": "iD-highway-footway", "fields": ["name", "surface", "lit", "width", "structure", "access"], "geometry": ["line"], "terms": ["hike", "hiking", "trackway", "trail", "walk"], "tags": {"highway": "footway"}, "name": "Foot Path"}, "highway/give_way": {"icon": "temaki-yield", "fields": ["direction_vertex"], "geometry": ["vertex"], "tags": {"highway": "give_way"}, "terms": ["give way", "yield", "sign"], "name": "Yield Sign"}, "highway/living_street": {"icon": "iD-highway-living-street", "fields": ["name", "oneway", "maxspeed", "lanes", "surface", "structure", "maxheight", "access", "cycleway"], "geometry": ["line"], "tags": {"highway": "living_street"}, "name": "Living Street"}, + "highway/milestone": {"icon": "temaki-milestone", "geometry": ["point", "vertex"], "fields": ["distance", "direction_vertex"], "tags": {"highway": "milestone"}, "terms": ["milestone", "marker"], "name": "Highway Milestone"}, "highway/mini_roundabout": {"icon": "maki-circle-stroked", "geometry": ["vertex"], "tags": {"highway": "mini_roundabout"}, "fields": ["direction_clock"], "name": "Mini-Roundabout"}, "highway/motorway_junction": {"icon": "temaki-junction", "fields": ["ref_highway_junction", "name"], "geometry": ["vertex"], "tags": {"highway": "motorway_junction"}, "terms": ["exit"], "name": "Motorway Junction / Exit"}, "highway/motorway_link": {"icon": "iD-highway-motorway-link", "fields": ["name", "ref_road_number", "oneway", "maxspeed", "maxspeed/advisory", "lanes", "surface", "structure", "maxheight", "access"], "geometry": ["line"], "tags": {"highway": "motorway_link"}, "addTags": {"highway": "motorway_link", "oneway": "yes"}, "removeTags": {"highway": "motorway_link", "oneway": "yes"}, "terms": ["exit", "ramp", "road", "street", "on ramp", "off ramp"], "name": "Motorway Link"}, @@ -731,7 +732,7 @@ "railway/funicular": {"icon": "iD-railway-rail", "geometry": ["line"], "terms": ["venicular", "cliff railway", "cable car", "cable railway", "funicular railway"], "fields": ["structure", "gauge", "service_rail"], "tags": {"railway": "funicular"}, "name": "Funicular"}, "railway/level_crossing": {"icon": "maki-cross", "geometry": ["vertex"], "tags": {"railway": "level_crossing"}, "terms": ["crossing", "railroad crossing", "level crossing", "grade crossing", "road through railroad", "train crossing"], "name": "Railway Crossing (Road)"}, "railway/light_rail": {"icon": "iD-railway-light-rail", "fields": ["name", "structure", "gauge", "electrified", "service_rail", "usage_rail", "voltage", "frequency"], "geometry": ["line"], "tags": {"railway": "light_rail"}, "terms": ["light rail", "streetcar", "trolley"], "name": "Light Rail"}, - "railway/milestone": {"icon": "temaki-milestone", "geometry": ["point", "vertex"], "fields": ["railway/position"], "tags": {"railway": "milestone"}, "terms": ["milestone", "marker"], "name": "Railway Milestone"}, + "railway/milestone": {"icon": "temaki-milestone", "geometry": ["point", "vertex"], "fields": ["railway/position", "direction_vertex"], "tags": {"railway": "milestone"}, "terms": ["milestone", "marker"], "name": "Railway Milestone"}, "railway/miniature": {"icon": "iD-railway-rail", "geometry": ["line"], "tags": {"railway": "miniature"}, "fields": ["name", "structure", "gauge", "electrified", "service_rail"], "terms": ["rideable miniature railway", "narrow gauge railway", "minimum gauge railway"], "name": "Miniature Railway"}, "railway/monorail": {"icon": "iD-railway-monorail", "fields": ["name", "structure", "electrified", "service_rail", "usage_rail", "voltage", "frequency"], "geometry": ["line"], "tags": {"railway": "monorail"}, "terms": [], "name": "Monorail"}, "railway/narrow_gauge": {"icon": "iD-railway-rail", "fields": ["name", "structure", "gauge", "electrified", "service_rail", "usage_rail", "voltage", "frequency"], "geometry": ["line"], "tags": {"railway": "narrow_gauge"}, "terms": ["narrow gauge railway", "narrow gauge railroad"], "name": "Narrow Gauge Rail"}, @@ -947,6 +948,7 @@ "waterway/dock": {"icon": "maki-harbor", "fields": ["name", "dock", "operator"], "geometry": ["area", "vertex", "point"], "terms": ["boat", "ship", "vessel", "marine"], "tags": {"waterway": "dock"}, "name": "Wet Dock / Dry Dock"}, "waterway/drain": {"icon": "iD-waterway-ditch", "fields": ["structure_waterway", "intermittent"], "geometry": ["line"], "tags": {"waterway": "drain"}, "name": "Drain"}, "waterway/fuel": {"icon": "maki-fuel", "fields": ["name", "operator", "address", "opening_hours", "fuel_multi"], "geometry": ["point", "area"], "terms": ["petrol", "gas", "diesel", "boat"], "tags": {"waterway": "fuel"}, "name": "Marine Fuel Station"}, + "waterway/milestone": {"icon": "temaki-milestone", "geometry": ["point", "vertex"], "fields": ["distance", "direction_vertex"], "tags": {"waterway": "milestone"}, "terms": ["milestone", "marker"], "name": "Waterway Milestone"}, "waterway/river": {"icon": "iD-waterway-river", "fields": ["name", "structure_waterway", "width", "intermittent"], "geometry": ["line"], "terms": ["beck", "branch", "brook", "course", "creek", "estuary", "rill", "rivulet", "run", "runnel", "stream", "tributary", "watercourse"], "tags": {"waterway": "river"}, "name": "River"}, "waterway/riverbank": {"icon": "maki-water", "geometry": ["area"], "tags": {"waterway": "riverbank"}, "name": "Riverbank"}, "waterway/sanitary_dump_station": {"icon": "temaki-storage_tank", "fields": ["name", "operator", "access_simple", "fee", "water_point"], "geometry": ["point", "vertex", "area"], "terms": ["Boat", "Watercraft", "Sanitary", "Dump Station", "Pumpout", "Pump out", "Elsan", "CDP", "CTDP", "Chemical Toilet"], "tags": {"waterway": "sanitary_dump_station"}, "name": "Marine Toilet Disposal"}, diff --git a/data/presets/presets/highway/milestone.json b/data/presets/presets/highway/milestone.json new file mode 100644 index 000000000..543071790 --- /dev/null +++ b/data/presets/presets/highway/milestone.json @@ -0,0 +1,19 @@ +{ + "icon": "temaki-milestone", + "geometry": [ + "point", + "vertex" + ], + "fields": [ + "distance", + "direction_vertex" + ], + "tags": { + "highway": "milestone" + }, + "terms": [ + "milestone", + "marker" + ], + "name": "Highway Milestone" +} diff --git a/data/presets/presets/railway/milestone.json b/data/presets/presets/railway/milestone.json index 50b846d24..17b64377a 100644 --- a/data/presets/presets/railway/milestone.json +++ b/data/presets/presets/railway/milestone.json @@ -5,7 +5,8 @@ "vertex" ], "fields": [ - "railway/position" + "railway/position", + "direction_vertex" ], "tags": { "railway": "milestone" diff --git a/data/presets/presets/waterway/milestone.json b/data/presets/presets/waterway/milestone.json new file mode 100644 index 000000000..1988511ee --- /dev/null +++ b/data/presets/presets/waterway/milestone.json @@ -0,0 +1,19 @@ +{ + "icon": "temaki-milestone", + "geometry": [ + "point", + "vertex" + ], + "fields": [ + "distance", + "direction_vertex" + ], + "tags": { + "waterway": "milestone" + }, + "terms": [ + "milestone", + "marker" + ], + "name": "Waterway Milestone" +} diff --git a/data/taginfo.json b/data/taginfo.json index e128a08a5..0e5e37b10 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -2459,6 +2459,13 @@ "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-living-street.svg?sanitize=true" }, + { + "key": "highway", + "value": "milestone", + "description": "Highway Milestone", + "object_types": ["node"], + "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/milestone.svg?sanitize=true" + }, { "key": "highway", "value": "mini_roundabout", @@ -6202,6 +6209,13 @@ "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/fuel-15.svg?sanitize=true" }, + { + "key": "waterway", + "value": "milestone", + "description": "Waterway Milestone", + "object_types": ["node"], + "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/milestone.svg?sanitize=true" + }, { "key": "waterway", "value": "river", @@ -6497,7 +6511,7 @@ {"key": "direction", "description": "Direction (Degrees Clockwise)"}, {"key": "dispensing", "description": "Dispenses Prescriptions"}, {"key": "display", "description": "Display"}, - {"key": "distance", "description": "Total Distance"}, + {"key": "distance", "description": "Distance"}, {"key": "dock", "description": "Type"}, {"key": "drive_through", "description": "Drive-Through"}, {"key": "duration", "description": "Duration"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 67c18e69e..3a3474937 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -1890,7 +1890,7 @@ "label": "Display" }, "distance": { - "label": "Total Distance" + "label": "Distance" }, "dock": { "label": "Type" @@ -4397,6 +4397,10 @@ "name": "Living Street", "terms": "" }, + "highway/milestone": { + "name": "Highway Milestone", + "terms": "milestone,marker" + }, "highway/mini_roundabout": { "name": "Mini-Roundabout", "terms": "" @@ -6717,6 +6721,10 @@ "name": "Marine Fuel Station", "terms": "petrol,gas,diesel,boat" }, + "waterway/milestone": { + "name": "Waterway Milestone", + "terms": "milestone,marker" + }, "waterway/river": { "name": "River", "terms": "beck,branch,brook,course,creek,estuary,rill,rivulet,run,runnel,stream,tributary,watercourse"