From 2804ef35fe9760a94eb8b8ff925a2407786288df Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Wed, 16 Jan 2019 17:16:55 -0500 Subject: [PATCH] Added a warning and an error in build data for presets with "fields" counts over a given threshold (now 9 and 12) Reduced all "fields" counts to nine or fewer by moving fields to "moreFields" Moved maxheight, cycleway, and toll fields in highway presets from fields to moreFields Added covered and maxspeed/advisory fields to moreFields of more highway presets Added smoothness field to more path type presets Updated highway/service presets to use field inheritance Added variants of the voltage and frequency fields that require "electrified" not equal to "no" and added them to the relevant railway presets --- build_data.js | 26 +++++-- data/presets.yaml | 6 ++ data/presets/fields.json | 2 + .../presets/fields/frequency_electrified.json | 9 +++ data/presets/fields/voltage_electrified.json | 9 +++ data/presets/presets.json | 74 +++++++++---------- .../presets/emergency/fire_hydrant.json | 4 +- data/presets/presets/highway/bridleway.json | 9 ++- .../presets/presets/highway/bus_guideway.json | 4 +- data/presets/presets/highway/corridor.json | 3 + data/presets/presets/highway/cycleway.json | 10 ++- data/presets/presets/highway/elevator.json | 3 + data/presets/presets/highway/footway.json | 4 +- .../presets/highway/living_street.json | 7 +- data/presets/presets/highway/motorway.json | 6 +- .../presets/highway/motorway_link.json | 6 +- data/presets/presets/highway/path.json | 2 + data/presets/presets/highway/primary.json | 8 +- .../presets/presets/highway/primary_link.json | 9 ++- data/presets/presets/highway/residential.json | 8 +- data/presets/presets/highway/road.json | 7 +- data/presets/presets/highway/secondary.json | 8 +- .../presets/highway/secondary_link.json | 7 +- data/presets/presets/highway/service.json | 6 +- .../presets/highway/service/alley.json | 9 --- .../highway/service/drive-through.json | 10 --- .../presets/highway/service/driveway.json | 9 --- .../highway/service/emergency_access.json | 9 --- .../highway/service/parking_aisle.json | 9 --- data/presets/presets/highway/tertiary.json | 8 +- .../presets/highway/tertiary_link.json | 7 +- data/presets/presets/highway/track.json | 7 +- data/presets/presets/highway/trunk.json | 6 +- data/presets/presets/highway/trunk_link.json | 6 +- .../presets/presets/highway/unclassified.json | 8 +- data/presets/presets/power/transformer.json | 10 ++- data/presets/presets/railway/light_rail.json | 9 ++- data/presets/presets/railway/miniature.json | 17 +++-- data/presets/presets/railway/monorail.json | 9 ++- .../presets/presets/railway/narrow_gauge.json | 9 ++- data/presets/presets/railway/rail.json | 10 ++- data/presets/presets/railway/subway.json | 9 ++- data/presets/presets/railway/tram.json | 9 ++- dist/locales/en.json | 6 ++ 44 files changed, 260 insertions(+), 153 deletions(-) create mode 100644 data/presets/fields/frequency_electrified.json create mode 100644 data/presets/fields/voltage_electrified.json diff --git a/build_data.js b/build_data.js index 2632ff455..a91f1bcba 100644 --- a/build_data.js +++ b/build_data.js @@ -477,12 +477,26 @@ function validateCategoryPresets(categories, presets) { function validatePresetFields(presets, fields) { var betweenBracketsRegex = /([^{]*?)(?=\})/; - _forEach(presets, function(preset) { + var maxFieldsBeforeError = 12; + var maxFieldsBeforeWarning = 9; + for (var presetID in presets) { + var preset = presets[presetID]; + if (preset.fields) { + // since `moreFields` is available, check that `fields` doesn't get too cluttered + var fieldCount = Object.keys(preset.fields).length; + if (fieldCount > maxFieldsBeforeError) { + console.error(fieldCount + ' values in "fields" of "' + preset.name + '" (' + presetID + '). Limit: ' + maxFieldsBeforeError + '. Please move lower-priority fields to "moreFields".'); + process.exit(1); + } + else if (fieldCount > maxFieldsBeforeWarning) { + console.log('Warning: ' + fieldCount + ' values in "fields" of "' + preset.name + '" (' + presetID + '). Recommended: ' + maxFieldsBeforeWarning + ' or fewer. Consider moving lower-priority fields to "moreFields".'); + } + } // the keys for properties that contain arrays of field ids var fieldKeys = ['fields', 'moreFields']; - fieldKeys.forEach(function(fieldsKey) { + for (var fieldsKey in fieldKeys) { if (preset[fieldsKey]) { - preset[fieldsKey].forEach(function(field) { + for (var field in preset[fieldsKey]) { if (fields[field] === undefined) { var regexResult = betweenBracketsRegex.exec(field); if (regexResult) { @@ -496,10 +510,10 @@ function validatePresetFields(presets, fields) { process.exit(1); } } - }); + } } - }); - }); + } + } } function validateDefaults (defaults, categories, presets) { diff --git a/data/presets.yaml b/data/presets.yaml index cd8093d2b..0ae9ca8e2 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -650,6 +650,9 @@ en: frequency: # frequency=* label: Operating Frequency + frequency_electrified: + # frequency=* + label: Operating Frequency from: # from=* label: From @@ -2019,6 +2022,9 @@ en: voltage/tertiary: # 'voltage:tertiary=*' label: Tertiary Voltage + voltage_electrified: + # voltage=* + label: Voltage wall: # wall=* label: Type diff --git a/data/presets/fields.json b/data/presets/fields.json index 176fcf4b7..9487697a9 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -116,6 +116,7 @@ "fixme": {"key": "fixme", "type": "textarea", "label": "Fix Me", "universal": true}, "flag/type": {"key": "flag:type", "type": "combo", "label": "Flag Type"}, "ford": {"key": "ford", "type": "typeCombo", "label": "Type", "placeholder": "Default"}, + "frequency_electrified": {"key": "frequency", "type": "combo", "label": "Operating Frequency", "prerequisiteTag": {"key": "electrified", "valueNot": "no"}}, "frequency": {"key": "frequency", "type": "combo", "label": "Operating Frequency"}, "from": {"key": "from", "type": "text", "label": "From"}, "fuel_multi": {"key": "fuel:", "type": "multiCombo", "label": "Fuel Types"}, @@ -339,6 +340,7 @@ "visibility": {"key": "visibility", "type": "combo", "label": "Visibility", "strings": {"options": {"house": "Up to 5m (16ft)", "street": "5 to 20m (16 to 65ft)", "area": "Over 20m (65ft)"}}}, "volcano/status": {"key": "volcano:status", "type": "combo", "label": "Volcano Status", "strings": {"options": {"active": "Active", "dormant": "Dormant", "extinct": "Extinct"}}}, "volcano/type": {"key": "volcano:type", "type": "combo", "label": "Volcano Type", "strings": {"options": {"stratovolcano": "Stratovolcano", "shield": "Shield", "scoria": "Scoria"}}}, + "voltage_electrified": {"key": "voltage", "type": "combo", "label": "Voltage", "prerequisiteTag": {"key": "electrified", "valueNot": "no"}}, "voltage": {"key": "voltage", "type": "combo", "label": "Voltage"}, "voltage/primary": {"key": "voltage:primary", "type": "combo", "label": "Primary Voltage"}, "voltage/secondary": {"key": "voltage:secondary", "type": "combo", "label": "Secondary Voltage"}, diff --git a/data/presets/fields/frequency_electrified.json b/data/presets/fields/frequency_electrified.json new file mode 100644 index 000000000..ea5a13b8c --- /dev/null +++ b/data/presets/fields/frequency_electrified.json @@ -0,0 +1,9 @@ +{ + "key": "frequency", + "type": "combo", + "label": "Operating Frequency", + "prerequisiteTag": { + "key": "electrified", + "valueNot": "no" + } +} diff --git a/data/presets/fields/voltage_electrified.json b/data/presets/fields/voltage_electrified.json new file mode 100644 index 000000000..265272551 --- /dev/null +++ b/data/presets/fields/voltage_electrified.json @@ -0,0 +1,9 @@ +{ + "key": "voltage", + "type": "combo", + "label": "Voltage", + "prerequisiteTag": { + "key": "electrified", + "valueNot": "no" + } +} diff --git a/data/presets/presets.json b/data/presets/presets.json index da52c93f6..535139ee9 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -363,7 +363,7 @@ "emergency/defibrillator": {"icon": "maki-defibrillator", "fields": ["indoor", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["AED"], "tags": {"emergency": "defibrillator"}, "name": "Defibrillator"}, "emergency/fire_alarm": {"icon": "fas-bell", "fields": ["indoor", "ref", "operator"], "geometry": ["point", "vertex"], "tags": {"emergency": "fire_alarm_box"}, "name": "Fire Alarm Call Box"}, "emergency/fire_extinguisher": {"icon": "fas-fire-extinguisher", "fields": ["indoor", "ref", "operator"], "geometry": ["point", "vertex"], "tags": {"emergency": "fire_extinguisher"}, "name": "Fire Extinguisher"}, - "emergency/fire_hydrant": {"icon": "temaki-fire_hydrant", "fields": ["ref", "fire_hydrant/type", "colour", "water_source", "fire_hydrant/pressure", "fire_hydrant/diameter", "couplings", "water_volume", "survey/date"], "geometry": ["point", "vertex"], "terms": ["fire plug", "fire water well", "hydrant"], "tags": {"emergency": "fire_hydrant"}, "name": "Fire Hydrant"}, + "emergency/fire_hydrant": {"icon": "temaki-fire_hydrant", "fields": ["ref", "fire_hydrant/type", "colour", "water_source", "couplings"], "moreFields": ["fire_hydrant/pressure", "fire_hydrant/diameter", "water_volume", "survey/date"], "geometry": ["point", "vertex"], "terms": ["fire plug", "fire water well", "hydrant"], "tags": {"emergency": "fire_hydrant"}, "name": "Fire Hydrant"}, "emergency/first_aid_kit": {"icon": "fas-medkit", "fields": ["indoor", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["bandage", "first aid", "med", "med kit", "medic*", "medkit"], "tags": {"emergency": "first_aid_kit"}, "name": "First Aid Kit"}, "emergency/life_ring": {"icon": "fas-life-ring", "fields": ["ref", "operator"], "geometry": ["point", "vertex"], "terms": ["life buoy", "kisby ring", "kisbie ring", "perry buoy"], "tags": {"emergency": "life_ring"}, "name": "Life Ring"}, "emergency/lifeguard": {"icon": "fas-life-ring", "fields": ["ref", "operator", "building_area", "opening_hours"], "geometry": ["point", "area"], "terms": ["CPR", "rescue"], "tags": {"emergency": "lifeguard"}, "name": "Lifeguard"}, @@ -399,19 +399,19 @@ "healthcare/rehabilitation": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": ["rehab", "therapist", "therapy"], "tags": {"healthcare": "rehabilitation"}, "name": "Rehabilitation Facility"}, "healthcare/speech_therapist": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": ["speech", "therapist", "therapy", "voice"], "tags": {"healthcare": "speech_therapist"}, "name": "Speech Therapist"}, "highway/bus_stop": {"icon": "maki-bus", "fields": ["name", "network", "operator", "bench", "shelter"], "geometry": ["point", "vertex"], "tags": {"highway": "bus_stop"}, "name": "Bus Stop / Platform", "searchable": false}, - "highway/bridleway": {"fields": ["name", "surface", "width", "structure", "access"], "moreFields": ["wheelchair"], "icon": "iD-highway-bridleway", "geometry": ["line"], "tags": {"highway": "bridleway"}, "terms": ["bridleway", "equestrian", "horse", "trail"], "name": "Bridle Path"}, - "highway/bus_guideway": {"icon": "iD-highway-bus-guideway", "fields": ["name", "operator", "oneway"], "geometry": ["line"], "tags": {"highway": "bus_guideway"}, "addTags": {"highway": "bus_guideway", "access": "no", "bus": "designated"}, "removeTags": {"highway": "bus_guideway", "access": "no", "bus": "designated"}, "terms": [], "name": "Bus Guideway"}, + "highway/bridleway": {"fields": ["name", "surface", "width", "structure", "access", "incline", "horse_scale"], "moreFields": ["wheelchair", "lit", "smoothness", "covered"], "icon": "iD-highway-bridleway", "geometry": ["line"], "tags": {"highway": "bridleway"}, "terms": ["bridleway", "equestrian", "horse", "trail"], "name": "Bridle Path"}, + "highway/bus_guideway": {"icon": "iD-highway-bus-guideway", "fields": ["name", "operator", "oneway", "structure", "covered"], "geometry": ["line"], "tags": {"highway": "bus_guideway"}, "addTags": {"highway": "bus_guideway", "access": "no", "bus": "designated"}, "removeTags": {"highway": "bus_guideway", "access": "no", "bus": "designated"}, "terms": [], "name": "Bus Guideway"}, "highway/construction": {"icon": "iD-highway-construction", "fields": ["name", "opening_date", "check_date", "note", "oneway", "structure", "access"], "geometry": ["line"], "tags": {"highway": "construction", "access": "no"}, "terms": ["closed", "closure", "construction"], "name": "Road Closed"}, - "highway/corridor": {"icon": "iD-highway-footway", "fields": ["name", "width", "level", "access_simple", "wheelchair"], "geometry": ["line"], "tags": {"highway": "corridor"}, "terms": ["gallery", "hall", "hallway", "indoor", "passage", "passageway"], "name": "Indoor Corridor"}, + "highway/corridor": {"icon": "iD-highway-footway", "fields": ["name", "width", "level", "access_simple", "wheelchair"], "moreFields": ["maxheight"], "geometry": ["line"], "tags": {"highway": "corridor"}, "terms": ["gallery", "hall", "hallway", "indoor", "passage", "passageway"], "name": "Indoor Corridor"}, "highway/crossing/zebra-raised": {"icon": "temaki-pedestrian", "fields": ["crossing", "kerb", "tactile_paving"], "geometry": ["vertex"], "tags": {"highway": "crossing", "crossing": "zebra", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "terms": ["zebra crossing", "marked crossing", "crosswalk", "flat top", "hump", "speed", "slow"], "name": "Marked Crosswalk (Raised)", "searchable": false}, "highway/crossing/zebra": {"icon": "temaki-pedestrian", "fields": ["crossing", "kerb", "tactile_paving"], "geometry": ["vertex"], "tags": {"highway": "crossing", "crossing": "zebra"}, "reference": {"key": "highway", "value": "crossing"}, "terms": ["zebra crossing", "marked crossing", "crosswalk"], "name": "Marked Crosswalk", "searchable": false}, "highway/crossing/marked-raised": {"icon": "temaki-pedestrian", "fields": ["crossing", "kerb", "tactile_paving"], "geometry": ["vertex"], "tags": {"highway": "crossing", "crossing": "marked", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "terms": ["zebra crossing", "marked crossing", "crosswalk", "flat top", "hump", "speed", "slow"], "name": "Marked Crosswalk (Raised)"}, "highway/crossing/marked": {"icon": "temaki-pedestrian", "fields": ["crossing", "kerb", "tactile_paving"], "geometry": ["vertex"], "tags": {"highway": "crossing", "crossing": "marked"}, "reference": {"key": "highway", "value": "crossing"}, "terms": ["zebra crossing", "marked crossing", "crosswalk"], "name": "Marked Crosswalk"}, "highway/crossing/unmarked-raised": {"fields": ["crossing", "kerb", "tactile_paving"], "geometry": ["vertex"], "addTags": {"highway": "crossing", "crossing": "unmarked", "traffic_calming": "table"}, "removeTags": {"highway": "crossing", "crossing": "unmarked", "traffic_calming": "table"}, "tags": {"highway": "crossing", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "terms": ["flat top", "hump", "speed", "slow"], "name": "Unmarked Crossing (Raised)"}, "highway/crossing/unmarked": {"fields": ["crossing", "kerb", "tactile_paving"], "geometry": ["vertex"], "addTags": {"highway": "crossing", "crossing": "unmarked"}, "removeTags": {"highway": "crossing", "crossing": "unmarked"}, "tags": {"highway": "crossing"}, "reference": {"key": "highway", "value": "crossing"}, "terms": [], "name": "Unmarked Crossing"}, - "highway/cycleway": {"icon": "iD-highway-cycleway", "fields": ["name", "oneway", "surface", "lit", "width", "structure", "access"], "moreFields": ["wheelchair"], "geometry": ["line"], "tags": {"highway": "cycleway"}, "terms": ["bike"], "name": "Cycle Path"}, - "highway/elevator": {"icon": "temaki-elevator", "fields": ["access_simple", "opening_hours", "maxweight", "ref", "wheelchair"], "geometry": ["vertex"], "tags": {"highway": "elevator"}, "terms": ["lift"], "name": "Elevator"}, - "highway/footway": {"icon": "iD-highway-footway", "fields": ["name", "surface", "width", "structure", "access", "incline"], "moreFields": ["wheelchair", "lit"], "geometry": ["line"], "terms": ["hike", "hiking", "trackway", "trail", "walk"], "tags": {"highway": "footway"}, "name": "Foot Path"}, + "highway/cycleway": {"icon": "iD-highway-cycleway", "fields": ["name", "oneway", "surface", "width", "structure", "access", "incline"], "moreFields": ["wheelchair", "lit", "smoothness", "maxspeed", "covered"], "geometry": ["line"], "tags": {"highway": "cycleway"}, "terms": ["bike"], "name": "Cycle Path"}, + "highway/elevator": {"icon": "temaki-elevator", "fields": ["access_simple", "opening_hours", "maxweight", "ref", "wheelchair"], "moreFields": ["maxheight"], "geometry": ["vertex"], "tags": {"highway": "elevator"}, "terms": ["lift"], "name": "Elevator"}, + "highway/footway": {"icon": "iD-highway-footway", "fields": ["name", "surface", "width", "structure", "access", "incline"], "moreFields": ["wheelchair", "lit", "smoothness", "covered"], "geometry": ["line"], "terms": ["hike", "hiking", "trackway", "trail", "walk"], "tags": {"highway": "footway"}, "name": "Foot Path"}, "highway/footway/zebra-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", "marked crossing", "crosswalk", "flat top", "hump", "speed", "slow"], "name": "Marked Crosswalk (Raised)", "searchable": false}, "highway/footway/zebra": {"icon": "iD-highway-footway", "fields": ["crossing", "access", "surface", "kerb", "tactile_paving"], "geometry": ["line"], "tags": {"highway": "footway", "footway": "crossing", "crossing": "zebra"}, "reference": {"key": "footway", "value": "crossing"}, "terms": ["zebra crossing", "marked crossing", "crosswalk"], "name": "Marked Crosswalk", "searchable": false}, "highway/footway/conveying": {"icon": "iD-highway-footway", "fields": ["name", "conveying", "access_simple", "lit", "width", "wheelchair"], "geometry": ["line"], "terms": ["moving sidewalk", "autwalk", "skywalk", "travolator", "travelator", "travellator", "conveyor"], "tags": {"highway": "footway", "conveying": "*"}, "name": "Moving Walkway"}, @@ -421,46 +421,46 @@ "highway/footway/unmarked-raised": {"fields": ["crossing", "access", "surface", "kerb", "tactile_paving"], "geometry": ["line"], "addTags": {"highway": "footway", "footway": "crossing", "crossing": "unmarked", "traffic_calming": "table"}, "removeTags": {"highway": "footway", "footway": "crossing", "crossing": "unmarked", "traffic_calming": "table"}, "tags": {"highway": "footway", "footway": "crossing", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "terms": ["flat top", "hump", "speed", "slow"], "name": "Unmarked Crossing (Raised)"}, "highway/footway/unmarked": {"fields": ["crossing", "access", "surface", "kerb", "tactile_paving"], "geometry": ["line"], "addTags": {"highway": "footway", "footway": "crossing", "crossing": "unmarked"}, "removeTags": {"highway": "footway", "footway": "crossing", "crossing": "unmarked"}, "tags": {"highway": "footway", "footway": "crossing"}, "reference": {"key": "footway", "value": "crossing"}, "terms": [], "name": "Unmarked Crossing"}, "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/living_street": {"icon": "iD-highway-living-street", "fields": ["name", "oneway", "maxspeed", "lanes", "surface", "structure", "access"], "moreFields": ["cycleway", "maxheight", "covered"], "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"}, - "highway/motorway": {"icon": "iD-highway-motorway", "fields": ["name", "ref_road_number", "oneway_yes", "maxspeed", "lanes", "surface", "structure", "maxheight", "toll", "access"], "geometry": ["line"], "tags": {"highway": "motorway"}, "terms": ["autobahn", "expressway", "freeway", "highway", "interstate", "parkway", "road", "street", "thruway", "turnpike"], "name": "Motorway"}, + "highway/motorway_link": {"icon": "iD-highway-motorway-link", "fields": ["name", "ref_road_number", "oneway", "maxspeed", "maxspeed/advisory", "lanes", "surface", "structure", "access"], "moreFields": ["maxheight", "toll", "covered"], "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"}, + "highway/motorway": {"icon": "iD-highway-motorway", "fields": ["name", "ref_road_number", "oneway_yes", "maxspeed", "lanes", "surface", "structure", "access"], "moreFields": ["maxheight", "toll", "covered", "maxspeed/advisory"], "geometry": ["line"], "tags": {"highway": "motorway"}, "terms": ["autobahn", "expressway", "freeway", "highway", "interstate", "parkway", "road", "street", "thruway", "turnpike"], "name": "Motorway"}, "highway/passing_place": {"icon": "maki-circle-stroked", "geometry": ["vertex"], "tags": {"highway": "passing_place"}, "terms": ["turnout, pullout"], "name": "Passing Place"}, - "highway/path": {"icon": "iD-highway-path", "fields": ["name", "surface", "width", "structure", "access", "incline"], "moreFields": ["wheelchair", "lit", "trail_visibility", "sac_scale", "mtb/scale", "mtb/scale/uphill", "mtb/scale/imba", "horse_scale", "ref"], "geometry": ["line"], "terms": ["hike", "hiking", "trackway", "trail", "walk"], "tags": {"highway": "path"}, "name": "Path"}, + "highway/path": {"icon": "iD-highway-path", "fields": ["name", "surface", "width", "structure", "access", "incline"], "moreFields": ["wheelchair", "lit", "smoothness", "trail_visibility", "sac_scale", "mtb/scale", "mtb/scale/uphill", "mtb/scale/imba", "horse_scale", "covered", "ref"], "geometry": ["line"], "terms": ["hike", "hiking", "trackway", "trail", "walk"], "tags": {"highway": "path"}, "name": "Path"}, "highway/pedestrian_area": {"icon": "temaki-pedestrian", "fields": ["name", "surface", "lit", "width", "structure", "access"], "geometry": ["area"], "tags": {"highway": "pedestrian", "area": "yes"}, "terms": ["center", "centre", "plaza", "quad", "square", "walkway"], "name": "Pedestrian Area"}, "highway/pedestrian_line": {"icon": "iD-highway-footway", "fields": ["name", "surface", "lit", "width", "oneway", "structure", "access"], "geometry": ["line"], "tags": {"highway": "pedestrian"}, "terms": ["center", "centre", "plaza", "quad", "square", "walkway"], "name": "Pedestrian Street"}, - "highway/primary_link": {"icon": "iD-highway-primary-link", "fields": ["name", "oneway", "maxspeed", "maxspeed/advisory", "lanes", "surface", "maxheight", "ref_road_number", "cycleway", "structure", "access"], "geometry": ["line"], "tags": {"highway": "primary_link"}, "terms": ["on ramp", "off ramp", "ramp", "road", "street"], "name": "Primary Link"}, - "highway/primary": {"icon": "iD-highway-primary", "fields": ["name", "oneway", "maxspeed", "lanes", "surface", "structure", "maxheight", "ref_road_number", "cycleway", "access"], "geometry": ["line"], "tags": {"highway": "primary"}, "terms": ["road", "street"], "name": "Primary Road"}, + "highway/primary_link": {"icon": "iD-highway-primary-link", "fields": ["name", "oneway", "maxspeed", "maxspeed/advisory", "lanes", "surface", "structure", "ref_road_number", "access"], "moreFields": ["cycleway", "maxheight", "covered"], "geometry": ["line"], "tags": {"highway": "primary_link"}, "terms": ["on ramp", "off ramp", "ramp", "road", "street"], "name": "Primary Link"}, + "highway/primary": {"icon": "iD-highway-primary", "fields": ["name", "oneway", "maxspeed", "lanes", "surface", "structure", "ref_road_number", "access"], "moreFields": ["cycleway", "maxheight", "covered", "maxspeed/advisory"], "geometry": ["line"], "tags": {"highway": "primary"}, "terms": ["road", "street"], "name": "Primary Road"}, "highway/raceway": {"icon": "iD-highway-unclassified", "fields": ["name", "oneway", "surface", "sport_racing_motor", "lit", "width", "lanes", "structure"], "geometry": ["point", "line", "area"], "tags": {"highway": "raceway"}, "addTags": {"highway": "raceway", "sport": "motor"}, "terms": ["auto*", "formula one", "kart", "motocross", "nascar", "race*", "track"], "name": "Racetrack (Motorsport)"}, - "highway/residential": {"icon": "iD-highway-residential", "fields": ["name", "oneway", "maxspeed", "lanes", "surface", "structure", "maxheight", "cycleway", "access"], "geometry": ["line"], "tags": {"highway": "residential"}, "terms": ["road", "street"], "name": "Residential Road"}, + "highway/residential": {"icon": "iD-highway-residential", "fields": ["name", "oneway", "maxspeed", "lanes", "surface", "structure", "access"], "moreFields": ["cycleway", "maxheight", "covered", "maxspeed/advisory"], "geometry": ["line"], "tags": {"highway": "residential"}, "terms": ["road", "street"], "name": "Residential Road"}, "highway/rest_area": {"icon": "maki-car", "fields": ["name", "operator", "opening_hours"], "moreFields": ["address", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "vertex", "area"], "tags": {"highway": "rest_area"}, "terms": ["rest stop"], "name": "Rest Area"}, - "highway/road": {"icon": "iD-highway-road", "fields": ["name", "oneway", "maxspeed", "lanes", "surface", "structure", "maxheight", "access"], "geometry": ["line"], "tags": {"highway": "road"}, "terms": ["road", "street"], "name": "Unknown Road"}, - "highway/secondary_link": {"icon": "iD-highway-secondary-link", "fields": ["name", "oneway", "maxspeed", "maxspeed/advisory", "lanes", "surface", "structure", "maxheight", "ref_road_number", "cycleway", "access"], "geometry": ["line"], "tags": {"highway": "secondary_link"}, "terms": ["on ramp", "off ramp", "ramp", "road", "street"], "name": "Secondary Link"}, - "highway/secondary": {"icon": "iD-highway-secondary", "fields": ["name", "oneway", "maxspeed", "lanes", "surface", "structure", "maxheight", "ref_road_number", "cycleway", "access"], "geometry": ["line"], "tags": {"highway": "secondary"}, "terms": ["road", "street"], "name": "Secondary Road"}, - "highway/service": {"icon": "iD-highway-service", "fields": ["name", "service", "oneway", "maxspeed", "surface", "structure", "maxheight", "access"], "geometry": ["line"], "tags": {"highway": "service"}, "terms": ["road", "street"], "name": "Service Road"}, - "highway/service/alley": {"icon": "iD-highway-service", "fields": ["name", "oneway", "maxspeed", "structure", "access", "surface", "maxheight"], "geometry": ["line"], "tags": {"highway": "service", "service": "alley"}, "reference": {"key": "service", "value": "alley"}, "name": "Alley"}, - "highway/service/drive-through": {"icon": "iD-highway-service", "fields": ["name", "oneway", "covered", "maxheight", "maxspeed", "structure", "access", "surface"], "geometry": ["line"], "tags": {"highway": "service", "service": "drive-through"}, "reference": {"key": "service", "value": "drive-through"}, "name": "Drive-Through"}, - "highway/service/driveway": {"icon": "iD-highway-service", "fields": ["name", "oneway", "maxspeed", "structure", "access", "surface", "maxheight"], "geometry": ["line"], "tags": {"highway": "service", "service": "driveway"}, "reference": {"key": "service", "value": "driveway"}, "name": "Driveway"}, - "highway/service/emergency_access": {"icon": "iD-highway-service", "fields": ["name", "oneway", "maxspeed", "structure", "access", "surface", "maxheight"], "geometry": ["line"], "tags": {"highway": "service", "service": "emergency_access"}, "reference": {"key": "service", "value": "emergency_access"}, "name": "Emergency Access"}, - "highway/service/parking_aisle": {"icon": "iD-highway-service", "fields": ["name", "oneway", "maxspeed", "structure", "access", "surface", "maxheight"], "geometry": ["line"], "tags": {"highway": "service", "service": "parking_aisle"}, "reference": {"key": "service", "value": "parking_aisle"}, "name": "Parking Aisle"}, + "highway/road": {"icon": "iD-highway-road", "fields": ["name", "oneway", "maxspeed", "lanes", "surface", "structure", "access"], "moreFields": ["cycleway", "maxheight", "covered", "maxspeed/advisory"], "geometry": ["line"], "tags": {"highway": "road"}, "terms": ["road", "street"], "name": "Unknown Road"}, + "highway/secondary_link": {"icon": "iD-highway-secondary-link", "fields": ["name", "oneway", "maxspeed", "maxspeed/advisory", "lanes", "surface", "structure", "ref_road_number", "access"], "moreFields": ["cycleway", "maxheight", "covered"], "geometry": ["line"], "tags": {"highway": "secondary_link"}, "terms": ["on ramp", "off ramp", "ramp", "road", "street"], "name": "Secondary Link"}, + "highway/secondary": {"icon": "iD-highway-secondary", "fields": ["name", "oneway", "maxspeed", "lanes", "surface", "structure", "ref_road_number", "access"], "moreFields": ["cycleway", "maxheight", "covered", "maxspeed/advisory"], "geometry": ["line"], "tags": {"highway": "secondary"}, "terms": ["road", "street"], "name": "Secondary Road"}, + "highway/service": {"icon": "iD-highway-service", "fields": ["name", "service", "oneway", "maxspeed", "surface", "structure", "access"], "moreFields": ["maxheight", "covered", "maxspeed/advisory"], "geometry": ["line"], "tags": {"highway": "service"}, "terms": ["road", "street"], "name": "Service Road"}, + "highway/service/alley": {"icon": "iD-highway-service", "geometry": ["line"], "tags": {"highway": "service", "service": "alley"}, "reference": {"key": "service", "value": "alley"}, "name": "Alley"}, + "highway/service/drive-through": {"icon": "iD-highway-service", "geometry": ["line"], "tags": {"highway": "service", "service": "drive-through"}, "reference": {"key": "service", "value": "drive-through"}, "name": "Drive-Through"}, + "highway/service/driveway": {"icon": "iD-highway-service", "geometry": ["line"], "tags": {"highway": "service", "service": "driveway"}, "reference": {"key": "service", "value": "driveway"}, "name": "Driveway"}, + "highway/service/emergency_access": {"icon": "iD-highway-service", "geometry": ["line"], "tags": {"highway": "service", "service": "emergency_access"}, "reference": {"key": "service", "value": "emergency_access"}, "name": "Emergency Access"}, + "highway/service/parking_aisle": {"icon": "iD-highway-service", "geometry": ["line"], "tags": {"highway": "service", "service": "parking_aisle"}, "reference": {"key": "service", "value": "parking_aisle"}, "name": "Parking Aisle"}, "highway/services": {"icon": "maki-car", "fields": ["{highway/rest_area}"], "moreFields": ["{highway/rest_area}"], "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", "maxspeed"], "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": {"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"}, - "highway/tertiary": {"icon": "iD-highway-tertiary", "fields": ["name", "oneway", "maxspeed", "lanes", "surface", "structure", "maxheight", "ref_road_number", "cycleway", "access"], "geometry": ["line"], "tags": {"highway": "tertiary"}, "terms": ["road", "street"], "name": "Tertiary Road"}, - "highway/track": {"icon": "iD-highway-track", "fields": ["name", "tracktype", "surface", "width", "structure", "access", "incline", "smoothness", "mtb/scale", "mtb/scale/uphill", "mtb/scale/imba", "horse_scale"], "geometry": ["line"], "tags": {"highway": "track"}, "terms": ["woods road", "forest road", "logging road", "fire road", "farm road", "agricultural road", "ranch road", "carriage road", "primitive", "unmaintained", "rut", "offroad", "4wd", "4x4", "four wheel drive", "atv", "quad", "jeep", "double track", "two track"], "name": "Unmaintained Track Road"}, + "highway/tertiary_link": {"icon": "iD-highway-tertiary-link", "fields": ["name", "oneway", "maxspeed", "maxspeed/advisory", "lanes", "surface", "structure", "ref_road_number", "access"], "moreFields": ["cycleway", "maxheight", "covered"], "geometry": ["line"], "tags": {"highway": "tertiary_link"}, "terms": ["on ramp", "off ramp", "ramp", "road", "street"], "name": "Tertiary Link"}, + "highway/tertiary": {"icon": "iD-highway-tertiary", "fields": ["name", "oneway", "maxspeed", "lanes", "surface", "structure", "ref_road_number", "access"], "moreFields": ["cycleway", "maxheight", "covered", "maxspeed/advisory"], "geometry": ["line"], "tags": {"highway": "tertiary"}, "terms": ["road", "street"], "name": "Tertiary Road"}, + "highway/track": {"icon": "iD-highway-track", "fields": ["name", "tracktype", "surface", "width", "structure", "access", "incline", "smoothness"], "moreFields": ["mtb/scale", "mtb/scale/uphill", "mtb/scale/imba", "horse_scale", "covered"], "geometry": ["line"], "tags": {"highway": "track"}, "terms": ["woods road", "forest road", "logging road", "fire road", "farm road", "agricultural road", "ranch road", "carriage road", "primitive", "unmaintained", "rut", "offroad", "4wd", "4x4", "four wheel drive", "atv", "quad", "jeep", "double track", "two track"], "name": "Unmaintained Track Road"}, "highway/traffic_mirror": {"geometry": ["point", "vertex"], "fields": ["direction"], "tags": {"highway": "traffic_mirror"}, "terms": ["blind spot", "convex", "corner", "curved", "roadside", "round", "safety", "sphere", "visibility"], "name": "Traffic Mirror"}, "highway/traffic_signals": {"icon": "temaki-traffic_signals", "geometry": ["vertex"], "tags": {"highway": "traffic_signals"}, "fields": ["traffic_signals", "traffic_signals/direction"], "terms": ["light", "stoplight", "traffic light"], "name": "Traffic Signals"}, - "highway/trunk_link": {"icon": "iD-highway-trunk-link", "fields": ["name", "ref_road_number", "oneway", "maxspeed", "maxspeed/advisory", "lanes", "surface", "structure", "maxheight", "access"], "geometry": ["line"], "tags": {"highway": "trunk_link"}, "terms": ["on ramp", "off ramp", "ramp", "road", "street"], "name": "Trunk Link"}, - "highway/trunk": {"icon": "iD-highway-trunk", "fields": ["name", "ref_road_number", "oneway", "maxspeed", "lanes", "surface", "structure", "maxheight", "toll", "access"], "geometry": ["line"], "tags": {"highway": "trunk"}, "terms": ["road", "street"], "name": "Trunk Road"}, + "highway/trunk_link": {"icon": "iD-highway-trunk-link", "fields": ["name", "ref_road_number", "oneway", "maxspeed", "maxspeed/advisory", "lanes", "surface", "structure", "access"], "moreFields": ["maxheight", "toll", "covered"], "geometry": ["line"], "tags": {"highway": "trunk_link"}, "terms": ["on ramp", "off ramp", "ramp", "road", "street"], "name": "Trunk Link"}, + "highway/trunk": {"icon": "iD-highway-trunk", "fields": ["name", "ref_road_number", "oneway", "maxspeed", "lanes", "surface", "structure", "access"], "moreFields": ["maxheight", "toll", "covered", "maxspeed/advisory"], "geometry": ["line"], "tags": {"highway": "trunk"}, "terms": ["road", "street"], "name": "Trunk Road"}, "highway/turning_circle": {"icon": "maki-circle-stroked", "geometry": ["vertex"], "tags": {"highway": "turning_circle"}, "terms": ["cul-de-sac"], "name": "Turning Circle"}, "highway/turning_loop": {"icon": "maki-circle", "geometry": ["vertex"], "tags": {"highway": "turning_loop"}, "terms": ["cul-de-sac"], "name": "Turning Loop (Island)"}, - "highway/unclassified": {"icon": "iD-highway-unclassified", "fields": ["name", "oneway", "maxspeed", "lanes", "surface", "structure", "maxheight", "cycleway", "access"], "geometry": ["line"], "tags": {"highway": "unclassified"}, "terms": ["road", "street"], "name": "Minor/Unclassified Road"}, + "highway/unclassified": {"icon": "iD-highway-unclassified", "fields": ["name", "oneway", "maxspeed", "lanes", "surface", "structure", "access"], "moreFields": ["cycleway", "maxheight", "covered", "maxspeed/advisory"], "geometry": ["line"], "tags": {"highway": "unclassified"}, "terms": ["road", "street"], "name": "Minor/Unclassified Road"}, "historic": {"icon": "temaki-ruins", "fields": ["historic", "inscription"], "geometry": ["point", "vertex", "area"], "tags": {"historic": "*"}, "name": "Historic Site"}, "historic/archaeological_site": {"icon": "temaki-ruins", "fields": ["name", "site_type", "historic/civilization", "inscription", "access_simple"], "geometry": ["point", "vertex", "area"], "tags": {"historic": "archaeological_site"}, "name": "Archaeological Site"}, "historic/boundary_stone": {"icon": "temaki-milestone", "fields": ["name", "inscription"], "moreFields": ["material"], "geometry": ["point", "vertex"], "tags": {"historic": "boundary_stone"}, "name": "Boundary Stone"}, @@ -763,7 +763,7 @@ "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": ["design", "ref", "material"], "geometry": ["point", "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"}, + "power/transformer": {"icon": "temaki-power", "fields": ["ref", "operator", "transformer", "location", "rating", "devices", "phases"], "moreFields": ["frequency", "voltage/primary", "voltage/secondary", "voltage/tertiary", "windings", "windings/configuration"], "geometry": ["point", "vertex", "area"], "tags": {"power": "transformer"}, "name": "Transformer"}, "public_transport/linear_platform_aerialway": {"icon": "iD-highway-footway", "fields": ["{public_transport/linear_platform}"], "moreFields": ["{public_transport/linear_platform}"], "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": ["{public_transport/linear_platform}"], "moreFields": ["{public_transport/linear_platform}"], "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"}, "public_transport/linear_platform_ferry": {"icon": "iD-highway-footway", "fields": ["{public_transport/linear_platform}"], "moreFields": ["{public_transport/linear_platform}"], "geometry": ["line"], "tags": {"public_transport": "platform", "ferry": "yes"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["boat", "dock", "ferry", "pier", "platform", "public transit", "public transportation", "transit", "transportation"], "name": "Ferry Stop / Platform"}, @@ -817,18 +817,18 @@ "railway/disused": {"icon": "iD-railway-disused", "fields": ["structure", "service_rail", "usage_rail"], "geometry": ["line"], "tags": {"railway": "disused"}, "terms": [], "name": "Disused Railway"}, "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/light_rail": {"icon": "iD-railway-light-rail", "fields": ["name", "structure", "gauge", "electrified", "service_rail", "usage_rail"], "moreFields": ["maxspeed", "voltage_electrified", "frequency_electrified"], "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", "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"}, - "railway/rail": {"icon": "iD-railway-rail", "fields": ["name", "structure", "gauge", "electrified", "maxspeed", "service_rail", "usage_rail", "voltage", "frequency"], "geometry": ["line"], "tags": {"railway": "rail"}, "terms": [], "name": "Rail"}, + "railway/miniature": {"icon": "iD-railway-rail", "fields": ["name", "structure", "gauge", "electrified", "service_rail"], "moreFields": ["maxspeed", "voltage_electrified", "frequency_electrified"], "geometry": ["line"], "tags": {"railway": "miniature"}, "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"], "moreFields": ["maxspeed", "voltage_electrified", "frequency_electrified"], "geometry": ["line"], "tags": {"railway": "monorail"}, "terms": [], "name": "Monorail"}, + "railway/narrow_gauge": {"icon": "iD-railway-rail", "fields": ["name", "structure", "gauge", "electrified", "service_rail", "usage_rail"], "moreFields": ["maxspeed", "voltage_electrified", "frequency_electrified"], "geometry": ["line"], "tags": {"railway": "narrow_gauge"}, "terms": ["narrow gauge railway", "narrow gauge railroad"], "name": "Narrow Gauge Rail"}, + "railway/rail": {"icon": "iD-railway-rail", "fields": ["name", "structure", "gauge", "electrified", "service_rail", "usage_rail"], "moreFields": ["maxspeed", "voltage_electrified", "frequency_electrified"], "geometry": ["line"], "tags": {"railway": "rail"}, "terms": [], "name": "Rail"}, "railway/signal": {"icon": "temaki-railway_signals", "geometry": ["point", "vertex"], "fields": ["railway/position", "railway/signal/direction", "ref"], "tags": {"railway": "signal"}, "terms": ["signal", "lights"], "name": "Railway Signal"}, "railway/subway_entrance": {"icon": "maki-entrance", "geometry": ["point", "vertex"], "fields": ["name"], "tags": {"railway": "subway_entrance"}, "terms": ["metro", "transit"], "name": "Subway Entrance"}, - "railway/subway": {"icon": "iD-railway-subway", "fields": ["name", "structure", "gauge", "electrified", "service_rail", "usage_rail", "voltage", "frequency"], "geometry": ["line"], "tags": {"railway": "subway"}, "terms": ["metro", "transit"], "name": "Subway"}, + "railway/subway": {"icon": "iD-railway-subway", "fields": ["name", "structure", "gauge", "electrified", "service_rail", "usage_rail"], "moreFields": ["maxspeed", "voltage_electrified", "frequency_electrified"], "geometry": ["line"], "tags": {"railway": "subway"}, "terms": ["metro", "transit"], "name": "Subway"}, "railway/switch": {"icon": "temaki-junction", "geometry": ["vertex"], "tags": {"railway": "switch"}, "terms": ["switch", "points"], "name": "Railway Switch"}, "railway/train_wash": {"icon": "maki-rail", "geometry": ["point", "vertex", "area"], "fields": ["operator", "building_area"], "tags": {"railway": "wash"}, "terms": ["wash", "clean"], "name": "Train Wash"}, - "railway/tram": {"icon": "iD-railway-light-rail", "fields": ["name", "structure", "gauge", "electrified", "service_rail", "usage_rail", "voltage", "frequency"], "geometry": ["line"], "tags": {"railway": "tram"}, "terms": ["light rail", "streetcar", "tram", "trolley"], "name": "Tram"}, + "railway/tram": {"icon": "iD-railway-light-rail", "fields": ["name", "structure", "gauge", "electrified", "service_rail", "usage_rail"], "moreFields": ["maxspeed", "voltage_electrified", "frequency_electrified"], "geometry": ["line"], "tags": {"railway": "tram"}, "terms": ["light rail", "streetcar", "tram", "trolley"], "name": "Tram"}, "relation": {"icon": "iD-relation", "fields": ["name", "relation"], "geometry": ["relation"], "tags": {}, "name": "Relation"}, "route/ferry": {"icon": "iD-ferry-line", "geometry": ["line"], "fields": ["name", "operator", "duration", "access", "to", "from"], "tags": {"route": "ferry"}, "name": "Ferry Route"}, "seamark/beacon_isolated_danger": {"fields": ["ref", "operator", "seamark/beacon_isolated_danger/shape", "seamark/type"], "geometry": ["point", "vertex"], "terms": ["beacon isolated danger", "isolated danger beacon", "iala"], "tags": {"seamark:type": "beacon_isolated_danger"}, "name": "Danger Beacon"}, diff --git a/data/presets/presets/emergency/fire_hydrant.json b/data/presets/presets/emergency/fire_hydrant.json index 484713a2e..6349a8ad6 100644 --- a/data/presets/presets/emergency/fire_hydrant.json +++ b/data/presets/presets/emergency/fire_hydrant.json @@ -5,9 +5,11 @@ "fire_hydrant/type", "colour", "water_source", + "couplings" + ], + "moreFields": [ "fire_hydrant/pressure", "fire_hydrant/diameter", - "couplings", "water_volume", "survey/date" ], diff --git a/data/presets/presets/highway/bridleway.json b/data/presets/presets/highway/bridleway.json index 8679b6740..a67759747 100644 --- a/data/presets/presets/highway/bridleway.json +++ b/data/presets/presets/highway/bridleway.json @@ -4,10 +4,15 @@ "surface", "width", "structure", - "access" + "access", + "incline", + "horse_scale" ], "moreFields": [ - "wheelchair" + "wheelchair", + "lit", + "smoothness", + "covered" ], "icon": "iD-highway-bridleway", "geometry": [ diff --git a/data/presets/presets/highway/bus_guideway.json b/data/presets/presets/highway/bus_guideway.json index 492a5126f..06e07930a 100644 --- a/data/presets/presets/highway/bus_guideway.json +++ b/data/presets/presets/highway/bus_guideway.json @@ -3,7 +3,9 @@ "fields": [ "name", "operator", - "oneway" + "oneway", + "structure", + "covered" ], "geometry": [ "line" diff --git a/data/presets/presets/highway/corridor.json b/data/presets/presets/highway/corridor.json index c374e7564..7fc79c6f0 100644 --- a/data/presets/presets/highway/corridor.json +++ b/data/presets/presets/highway/corridor.json @@ -7,6 +7,9 @@ "access_simple", "wheelchair" ], + "moreFields": [ + "maxheight" + ], "geometry": [ "line" ], diff --git a/data/presets/presets/highway/cycleway.json b/data/presets/presets/highway/cycleway.json index 7d4bd930a..4bcb3ccf4 100644 --- a/data/presets/presets/highway/cycleway.json +++ b/data/presets/presets/highway/cycleway.json @@ -4,13 +4,17 @@ "name", "oneway", "surface", - "lit", "width", "structure", - "access" + "access", + "incline" ], "moreFields": [ - "wheelchair" + "wheelchair", + "lit", + "smoothness", + "maxspeed", + "covered" ], "geometry": [ "line" diff --git a/data/presets/presets/highway/elevator.json b/data/presets/presets/highway/elevator.json index 4f105a490..cfc1c6c7d 100644 --- a/data/presets/presets/highway/elevator.json +++ b/data/presets/presets/highway/elevator.json @@ -7,6 +7,9 @@ "ref", "wheelchair" ], + "moreFields": [ + "maxheight" + ], "geometry": [ "vertex" ], diff --git a/data/presets/presets/highway/footway.json b/data/presets/presets/highway/footway.json index ed2d708eb..0bee450d3 100644 --- a/data/presets/presets/highway/footway.json +++ b/data/presets/presets/highway/footway.json @@ -10,7 +10,9 @@ ], "moreFields": [ "wheelchair", - "lit" + "lit", + "smoothness", + "covered" ], "geometry": [ "line" diff --git a/data/presets/presets/highway/living_street.json b/data/presets/presets/highway/living_street.json index 22c54a9eb..20fc2e884 100644 --- a/data/presets/presets/highway/living_street.json +++ b/data/presets/presets/highway/living_street.json @@ -7,9 +7,12 @@ "lanes", "surface", "structure", + "access" + ], + "moreFields": [ + "cycleway", "maxheight", - "access", - "cycleway" + "covered" ], "geometry": [ "line" diff --git a/data/presets/presets/highway/motorway.json b/data/presets/presets/highway/motorway.json index af6573955..35cb8b4b0 100644 --- a/data/presets/presets/highway/motorway.json +++ b/data/presets/presets/highway/motorway.json @@ -8,9 +8,13 @@ "lanes", "surface", "structure", + "access" + ], + "moreFields": [ "maxheight", "toll", - "access" + "covered", + "maxspeed/advisory" ], "geometry": [ "line" diff --git a/data/presets/presets/highway/motorway_link.json b/data/presets/presets/highway/motorway_link.json index 133de12c3..f44455cb8 100644 --- a/data/presets/presets/highway/motorway_link.json +++ b/data/presets/presets/highway/motorway_link.json @@ -9,9 +9,13 @@ "lanes", "surface", "structure", - "maxheight", "access" ], + "moreFields": [ + "maxheight", + "toll", + "covered" + ], "geometry": [ "line" ], diff --git a/data/presets/presets/highway/path.json b/data/presets/presets/highway/path.json index 781785d70..bda533390 100644 --- a/data/presets/presets/highway/path.json +++ b/data/presets/presets/highway/path.json @@ -11,12 +11,14 @@ "moreFields": [ "wheelchair", "lit", + "smoothness", "trail_visibility", "sac_scale", "mtb/scale", "mtb/scale/uphill", "mtb/scale/imba", "horse_scale", + "covered", "ref" ], "geometry": [ diff --git a/data/presets/presets/highway/primary.json b/data/presets/presets/highway/primary.json index f3e8aeac6..24f7125b8 100644 --- a/data/presets/presets/highway/primary.json +++ b/data/presets/presets/highway/primary.json @@ -7,11 +7,15 @@ "lanes", "surface", "structure", - "maxheight", "ref_road_number", - "cycleway", "access" ], + "moreFields": [ + "cycleway", + "maxheight", + "covered", + "maxspeed/advisory" + ], "geometry": [ "line" ], diff --git a/data/presets/presets/highway/primary_link.json b/data/presets/presets/highway/primary_link.json index 0cc82aa01..a1c1bfa5e 100644 --- a/data/presets/presets/highway/primary_link.json +++ b/data/presets/presets/highway/primary_link.json @@ -7,12 +7,15 @@ "maxspeed/advisory", "lanes", "surface", - "maxheight", - "ref_road_number", - "cycleway", "structure", + "ref_road_number", "access" ], + "moreFields": [ + "cycleway", + "maxheight", + "covered" + ], "geometry": [ "line" ], diff --git a/data/presets/presets/highway/residential.json b/data/presets/presets/highway/residential.json index 9fe10dde2..6f8cd755a 100644 --- a/data/presets/presets/highway/residential.json +++ b/data/presets/presets/highway/residential.json @@ -7,10 +7,14 @@ "lanes", "surface", "structure", - "maxheight", - "cycleway", "access" ], + "moreFields": [ + "cycleway", + "maxheight", + "covered", + "maxspeed/advisory" + ], "geometry": [ "line" ], diff --git a/data/presets/presets/highway/road.json b/data/presets/presets/highway/road.json index ca8b94360..b7c8a901a 100644 --- a/data/presets/presets/highway/road.json +++ b/data/presets/presets/highway/road.json @@ -7,9 +7,14 @@ "lanes", "surface", "structure", - "maxheight", "access" ], + "moreFields": [ + "cycleway", + "maxheight", + "covered", + "maxspeed/advisory" + ], "geometry": [ "line" ], diff --git a/data/presets/presets/highway/secondary.json b/data/presets/presets/highway/secondary.json index 1412bebc1..42e20fe7e 100644 --- a/data/presets/presets/highway/secondary.json +++ b/data/presets/presets/highway/secondary.json @@ -7,11 +7,15 @@ "lanes", "surface", "structure", - "maxheight", "ref_road_number", - "cycleway", "access" ], + "moreFields": [ + "cycleway", + "maxheight", + "covered", + "maxspeed/advisory" + ], "geometry": [ "line" ], diff --git a/data/presets/presets/highway/secondary_link.json b/data/presets/presets/highway/secondary_link.json index 526e2e7b3..0eff61c41 100644 --- a/data/presets/presets/highway/secondary_link.json +++ b/data/presets/presets/highway/secondary_link.json @@ -8,11 +8,14 @@ "lanes", "surface", "structure", - "maxheight", "ref_road_number", - "cycleway", "access" ], + "moreFields": [ + "cycleway", + "maxheight", + "covered" + ], "geometry": [ "line" ], diff --git a/data/presets/presets/highway/service.json b/data/presets/presets/highway/service.json index 1631bb2fe..5a4421409 100644 --- a/data/presets/presets/highway/service.json +++ b/data/presets/presets/highway/service.json @@ -7,9 +7,13 @@ "maxspeed", "surface", "structure", - "maxheight", "access" ], + "moreFields": [ + "maxheight", + "covered", + "maxspeed/advisory" + ], "geometry": [ "line" ], diff --git a/data/presets/presets/highway/service/alley.json b/data/presets/presets/highway/service/alley.json index 23297a00c..ce84eeab6 100644 --- a/data/presets/presets/highway/service/alley.json +++ b/data/presets/presets/highway/service/alley.json @@ -1,14 +1,5 @@ { "icon": "iD-highway-service", - "fields": [ - "name", - "oneway", - "maxspeed", - "structure", - "access", - "surface", - "maxheight" - ], "geometry": [ "line" ], diff --git a/data/presets/presets/highway/service/drive-through.json b/data/presets/presets/highway/service/drive-through.json index f55cf5c43..1bf4c0c92 100644 --- a/data/presets/presets/highway/service/drive-through.json +++ b/data/presets/presets/highway/service/drive-through.json @@ -1,15 +1,5 @@ { "icon": "iD-highway-service", - "fields": [ - "name", - "oneway", - "covered", - "maxheight", - "maxspeed", - "structure", - "access", - "surface" - ], "geometry": [ "line" ], diff --git a/data/presets/presets/highway/service/driveway.json b/data/presets/presets/highway/service/driveway.json index 3614bcea8..26fc62fcf 100644 --- a/data/presets/presets/highway/service/driveway.json +++ b/data/presets/presets/highway/service/driveway.json @@ -1,14 +1,5 @@ { "icon": "iD-highway-service", - "fields": [ - "name", - "oneway", - "maxspeed", - "structure", - "access", - "surface", - "maxheight" - ], "geometry": [ "line" ], diff --git a/data/presets/presets/highway/service/emergency_access.json b/data/presets/presets/highway/service/emergency_access.json index 97d795e4c..1eed046c8 100644 --- a/data/presets/presets/highway/service/emergency_access.json +++ b/data/presets/presets/highway/service/emergency_access.json @@ -1,14 +1,5 @@ { "icon": "iD-highway-service", - "fields": [ - "name", - "oneway", - "maxspeed", - "structure", - "access", - "surface", - "maxheight" - ], "geometry": [ "line" ], diff --git a/data/presets/presets/highway/service/parking_aisle.json b/data/presets/presets/highway/service/parking_aisle.json index a733d3c7b..2567f06a7 100644 --- a/data/presets/presets/highway/service/parking_aisle.json +++ b/data/presets/presets/highway/service/parking_aisle.json @@ -1,14 +1,5 @@ { "icon": "iD-highway-service", - "fields": [ - "name", - "oneway", - "maxspeed", - "structure", - "access", - "surface", - "maxheight" - ], "geometry": [ "line" ], diff --git a/data/presets/presets/highway/tertiary.json b/data/presets/presets/highway/tertiary.json index 67616b542..71d2b6509 100644 --- a/data/presets/presets/highway/tertiary.json +++ b/data/presets/presets/highway/tertiary.json @@ -7,11 +7,15 @@ "lanes", "surface", "structure", - "maxheight", "ref_road_number", - "cycleway", "access" ], + "moreFields": [ + "cycleway", + "maxheight", + "covered", + "maxspeed/advisory" + ], "geometry": [ "line" ], diff --git a/data/presets/presets/highway/tertiary_link.json b/data/presets/presets/highway/tertiary_link.json index 87423a125..3553c827e 100644 --- a/data/presets/presets/highway/tertiary_link.json +++ b/data/presets/presets/highway/tertiary_link.json @@ -8,11 +8,14 @@ "lanes", "surface", "structure", - "maxheight", "ref_road_number", - "cycleway", "access" ], + "moreFields": [ + "cycleway", + "maxheight", + "covered" + ], "geometry": [ "line" ], diff --git a/data/presets/presets/highway/track.json b/data/presets/presets/highway/track.json index 016f458ca..0dec007b4 100644 --- a/data/presets/presets/highway/track.json +++ b/data/presets/presets/highway/track.json @@ -8,11 +8,14 @@ "structure", "access", "incline", - "smoothness", + "smoothness" + ], + "moreFields": [ "mtb/scale", "mtb/scale/uphill", "mtb/scale/imba", - "horse_scale" + "horse_scale", + "covered" ], "geometry": [ "line" diff --git a/data/presets/presets/highway/trunk.json b/data/presets/presets/highway/trunk.json index b93d6d18e..ea198d9cf 100644 --- a/data/presets/presets/highway/trunk.json +++ b/data/presets/presets/highway/trunk.json @@ -8,9 +8,13 @@ "lanes", "surface", "structure", + "access" + ], + "moreFields": [ "maxheight", "toll", - "access" + "covered", + "maxspeed/advisory" ], "geometry": [ "line" diff --git a/data/presets/presets/highway/trunk_link.json b/data/presets/presets/highway/trunk_link.json index ea27d76c4..6c08b1518 100644 --- a/data/presets/presets/highway/trunk_link.json +++ b/data/presets/presets/highway/trunk_link.json @@ -9,9 +9,13 @@ "lanes", "surface", "structure", - "maxheight", "access" ], + "moreFields": [ + "maxheight", + "toll", + "covered" + ], "geometry": [ "line" ], diff --git a/data/presets/presets/highway/unclassified.json b/data/presets/presets/highway/unclassified.json index 3e0f6dd5b..2dcfbd82b 100644 --- a/data/presets/presets/highway/unclassified.json +++ b/data/presets/presets/highway/unclassified.json @@ -7,10 +7,14 @@ "lanes", "surface", "structure", - "maxheight", - "cycleway", "access" ], + "moreFields": [ + "cycleway", + "maxheight", + "covered", + "maxspeed/advisory" + ], "geometry": [ "line" ], diff --git a/data/presets/presets/power/transformer.json b/data/presets/presets/power/transformer.json index 0e315f893..859d074ad 100644 --- a/data/presets/presets/power/transformer.json +++ b/data/presets/presets/power/transformer.json @@ -1,19 +1,21 @@ { "icon": "temaki-power", "fields": [ - "transformer", + "ref", "operator", + "transformer", "location", "rating", "devices", - "phases", + "phases" + ], + "moreFields": [ "frequency", "voltage/primary", "voltage/secondary", "voltage/tertiary", "windings", - "windings/configuration", - "ref" + "windings/configuration" ], "geometry": [ "point", diff --git a/data/presets/presets/railway/light_rail.json b/data/presets/presets/railway/light_rail.json index 8d6c390eb..d9de27cd1 100644 --- a/data/presets/presets/railway/light_rail.json +++ b/data/presets/presets/railway/light_rail.json @@ -6,9 +6,12 @@ "gauge", "electrified", "service_rail", - "usage_rail", - "voltage", - "frequency" + "usage_rail" + ], + "moreFields": [ + "maxspeed", + "voltage_electrified", + "frequency_electrified" ], "geometry": [ "line" diff --git a/data/presets/presets/railway/miniature.json b/data/presets/presets/railway/miniature.json index d8757b5a8..12d0939da 100644 --- a/data/presets/presets/railway/miniature.json +++ b/data/presets/presets/railway/miniature.json @@ -1,11 +1,5 @@ { "icon": "iD-railway-rail", - "geometry": [ - "line" - ], - "tags": { - "railway": "miniature" - }, "fields": [ "name", "structure", @@ -13,6 +7,17 @@ "electrified", "service_rail" ], + "moreFields": [ + "maxspeed", + "voltage_electrified", + "frequency_electrified" + ], + "geometry": [ + "line" + ], + "tags": { + "railway": "miniature" + }, "terms": [ "rideable miniature railway", "narrow gauge railway", diff --git a/data/presets/presets/railway/monorail.json b/data/presets/presets/railway/monorail.json index 3c02f7db0..588fcce2a 100644 --- a/data/presets/presets/railway/monorail.json +++ b/data/presets/presets/railway/monorail.json @@ -5,9 +5,12 @@ "structure", "electrified", "service_rail", - "usage_rail", - "voltage", - "frequency" + "usage_rail" + ], + "moreFields": [ + "maxspeed", + "voltage_electrified", + "frequency_electrified" ], "geometry": [ "line" diff --git a/data/presets/presets/railway/narrow_gauge.json b/data/presets/presets/railway/narrow_gauge.json index d9bfe70fd..b2e81367d 100644 --- a/data/presets/presets/railway/narrow_gauge.json +++ b/data/presets/presets/railway/narrow_gauge.json @@ -6,9 +6,12 @@ "gauge", "electrified", "service_rail", - "usage_rail", - "voltage", - "frequency" + "usage_rail" + ], + "moreFields": [ + "maxspeed", + "voltage_electrified", + "frequency_electrified" ], "geometry": [ "line" diff --git a/data/presets/presets/railway/rail.json b/data/presets/presets/railway/rail.json index 9382cb77c..8b2ebf579 100644 --- a/data/presets/presets/railway/rail.json +++ b/data/presets/presets/railway/rail.json @@ -5,11 +5,13 @@ "structure", "gauge", "electrified", - "maxspeed", "service_rail", - "usage_rail", - "voltage", - "frequency" + "usage_rail" + ], + "moreFields": [ + "maxspeed", + "voltage_electrified", + "frequency_electrified" ], "geometry": [ "line" diff --git a/data/presets/presets/railway/subway.json b/data/presets/presets/railway/subway.json index 155029d62..b97f4da8a 100644 --- a/data/presets/presets/railway/subway.json +++ b/data/presets/presets/railway/subway.json @@ -6,9 +6,12 @@ "gauge", "electrified", "service_rail", - "usage_rail", - "voltage", - "frequency" + "usage_rail" + ], + "moreFields": [ + "maxspeed", + "voltage_electrified", + "frequency_electrified" ], "geometry": [ "line" diff --git a/data/presets/presets/railway/tram.json b/data/presets/presets/railway/tram.json index 58a770794..2682581ab 100644 --- a/data/presets/presets/railway/tram.json +++ b/data/presets/presets/railway/tram.json @@ -6,9 +6,12 @@ "gauge", "electrified", "service_rail", - "usage_rail", - "voltage", - "frequency" + "usage_rail" + ], + "moreFields": [ + "maxspeed", + "voltage_electrified", + "frequency_electrified" ], "geometry": [ "line" diff --git a/dist/locales/en.json b/dist/locales/en.json index 3cbdf4414..533416a4f 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -2388,6 +2388,9 @@ "label": "Type", "placeholder": "Default" }, + "frequency_electrified": { + "label": "Operating Frequency" + }, "frequency": { "label": "Operating Frequency" }, @@ -3493,6 +3496,9 @@ "scoria": "Scoria" } }, + "voltage_electrified": { + "label": "Voltage" + }, "voltage": { "label": "Voltage" },