diff --git a/data/presets.yaml b/data/presets.yaml index 48b9047d8..3d330c6c9 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -2056,6 +2056,10 @@ en: name: Ambulance Station # 'terms: EMS,EMT,rescue' terms: '' + emergency/defibrillator: + # emergency=defibrillator + name: Defibrillator + terms: '' emergency/fire_hydrant: # emergency=fire_hydrant name: Fire Hydrant diff --git a/data/presets/fields.json b/data/presets/fields.json index 1c41e98aa..ae9cfedae 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -1,27 +1,4 @@ { - "access_simple": { - "key": "access", - "type": "combo", - "label": "Allowed Access", - "placeholder": "yes", - "options": [ - "permissive", - "private", - "customers", - "no" - ] - }, - "access_toilets": { - "key": "access", - "type": "combo", - "label": "Access", - "options": [ - "yes", - "permissive", - "private", - "customers" - ] - }, "access": { "keys": [ "access", @@ -76,6 +53,29 @@ } } }, + "access_simple": { + "key": "access", + "type": "combo", + "label": "Allowed Access", + "placeholder": "yes", + "options": [ + "permissive", + "private", + "customers", + "no" + ] + }, + "access_toilets": { + "key": "access", + "type": "combo", + "label": "Access", + "options": [ + "yes", + "permissive", + "private", + "customers" + ] + }, "address": { "type": "address", "keys": [ @@ -246,6 +246,11 @@ "type": "text", "label": "Brand" }, + "building": { + "key": "building", + "type": "combo", + "label": "Building" + }, "building_area": { "key": "building", "type": "combo", @@ -253,11 +258,6 @@ "geometry": "area", "label": "Building" }, - "building": { - "key": "building", - "type": "combo", - "label": "Building" - }, "capacity": { "key": "capacity", "type": "number", @@ -510,16 +510,16 @@ "label": "Fix Me", "universal": true }, - "fuel_multi": { - "key": "fuel:", - "type": "multiCombo", - "label": "Fuel Types" - }, "fuel": { "key": "fuel", "type": "combo", "label": "Fuel" }, + "fuel_multi": { + "key": "fuel:", + "type": "multiCombo", + "label": "Fuel Types" + }, "gauge": { "key": "gauge", "type": "combo", @@ -600,6 +600,11 @@ "type": "text", "label": "ICAO" }, + "incline": { + "key": "incline", + "type": "combo", + "label": "Incline" + }, "incline_steps": { "key": "incline", "type": "combo", @@ -611,11 +616,6 @@ } } }, - "incline": { - "key": "incline", - "type": "combo", - "label": "Incline" - }, "information": { "key": "information", "type": "typeCombo", @@ -666,19 +666,6 @@ "type": "combo", "label": "Layer" }, - "leaf_cycle_singular": { - "key": "leaf_cycle", - "type": "combo", - "label": "Leaf Cycle", - "strings": { - "options": { - "evergreen": "Evergreen", - "deciduous": "Deciduous", - "semi_evergreen": "Semi-Evergreen", - "semi_deciduous": "Semi-Deciduous" - } - } - }, "leaf_cycle": { "key": "leaf_cycle", "type": "combo", @@ -693,15 +680,16 @@ } } }, - "leaf_type_singular": { - "key": "leaf_type", + "leaf_cycle_singular": { + "key": "leaf_cycle", "type": "combo", - "label": "Leaf Type", + "label": "Leaf Cycle", "strings": { "options": { - "broadleaved": "Broadleaved", - "needleleaved": "Needleleaved", - "leafless": "Leafless" + "evergreen": "Evergreen", + "deciduous": "Deciduous", + "semi_evergreen": "Semi-Evergreen", + "semi_deciduous": "Semi-Deciduous" } } }, @@ -718,6 +706,18 @@ } } }, + "leaf_type_singular": { + "key": "leaf_type", + "type": "combo", + "label": "Leaf Type", + "strings": { + "options": { + "broadleaved": "Broadleaved", + "needleleaved": "Needleleaved", + "leafless": "Leafless" + } + } + }, "leisure": { "key": "leisure", "type": "typeCombo", @@ -856,18 +856,6 @@ "type": "typeCombo", "label": "Type" }, - "oneway_yes": { - "key": "oneway", - "type": "check", - "label": "One Way", - "strings": { - "options": { - "undefined": "Assumed to be Yes", - "yes": "Yes", - "no": "No" - } - } - }, "oneway": { "key": "oneway", "type": "check", @@ -880,6 +868,18 @@ } } }, + "oneway_yes": { + "key": "oneway", + "type": "check", + "label": "One Way", + "strings": { + "options": { + "undefined": "Assumed to be Yes", + "yes": "Yes", + "no": "No" + } + } + }, "opening_hours": { "key": "opening_hours", "type": "text", @@ -1001,16 +1001,16 @@ "type": "text", "label": "Population" }, - "power_supply": { - "key": "power_supply", - "type": "check", - "label": "Power Supply" - }, "power": { "key": "power", "type": "typeCombo", "label": "Type" }, + "power_supply": { + "key": "power_supply", + "type": "check", + "label": "Power Supply" + }, "railway": { "key": "railway", "type": "typeCombo", @@ -1055,13 +1055,13 @@ "type": "number", "label": "Rooms" }, - "route_master": { - "key": "route_master", + "route": { + "key": "route", "type": "combo", "label": "Type" }, - "route": { - "key": "route", + "route_master": { + "key": "route_master", "type": "combo", "label": "Type" }, @@ -1091,19 +1091,6 @@ "type": "check", "label": "Seasonal" }, - "service_rail": { - "key": "service", - "type": "combo", - "label": "Service Type", - "strings": { - "options": { - "spur": "Spur", - "yard": "Yard", - "siding": "Siding", - "crossover": "Crossover" - } - } - }, "service": { "key": "service", "type": "combo", @@ -1140,16 +1127,29 @@ } } }, - "shelter_type": { - "key": "shelter_type", + "service_rail": { + "key": "service", "type": "combo", - "label": "Type" + "label": "Service Type", + "strings": { + "options": { + "spur": "Spur", + "yard": "Yard", + "siding": "Siding", + "crossover": "Crossover" + } + } }, "shelter": { "key": "shelter", "type": "check", "label": "Shelter" }, + "shelter_type": { + "key": "shelter_type", + "type": "combo", + "label": "Type" + }, "shop": { "key": "shop", "type": "typeCombo", @@ -1223,6 +1223,11 @@ "universal": true, "label": "Source" }, + "sport": { + "key": "sport", + "type": "combo", + "label": "Sport" + }, "sport_ice": { "key": "sport", "type": "combo", @@ -1249,11 +1254,6 @@ "running" ] }, - "sport": { - "key": "sport", - "type": "combo", - "label": "Sport" - }, "stars": { "key": "stars", "type": "number", @@ -1404,16 +1404,16 @@ "type": "combo", "label": "Type of Goods" }, - "water_point": { - "key": "water_point", - "type": "check", - "label": "Water Point" - }, "water": { "key": "water", "type": "combo", "label": "Type" }, + "water_point": { + "key": "water_point", + "type": "check", + "label": "Water Point" + }, "waterway": { "key": "waterway", "type": "typeCombo", diff --git a/data/presets/presets.json b/data/presets/presets.json index 57cecac1f..ecec0436e 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -1218,6 +1218,31 @@ ], "name": "Nightclub" }, + "amenity/parking": { + "icon": "parking", + "fields": [ + "operator", + "parking", + "capacity", + "fee", + "access_simple", + "supervised", + "park_ride", + "surface", + "maxstay", + "address" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "amenity": "parking" + }, + "terms": [], + "name": "Car Parking" + }, "amenity/parking_entrance": { "icon": "entrance", "fields": [ @@ -1247,31 +1272,6 @@ }, "name": "Parking Space" }, - "amenity/parking": { - "icon": "parking", - "fields": [ - "operator", - "parking", - "capacity", - "fee", - "access_simple", - "supervised", - "park_ride", - "surface", - "maxstay", - "address" - ], - "geometry": [ - "point", - "vertex", - "area" - ], - "tags": { - "amenity": "parking" - }, - "terms": [], - "name": "Car Parking" - }, "amenity/pharmacy": { "icon": "pharmacy", "fields": [ @@ -3994,6 +3994,20 @@ }, "name": "Ambulance Station" }, + "emergency/defibrillator": { + "fields": [ + "access", + "opening_hours", + "phone" + ], + "geometry": [ + "point" + ], + "tags": { + "emergency": "defibrillator" + }, + "name": "Defibrillator" + }, "emergency/fire_hydrant": { "fields": [ "fire_hydrant/type" @@ -4412,6 +4426,26 @@ ], "name": "Mini-Roundabout" }, + "highway/motorway": { + "icon": "highway-motorway", + "fields": [ + "oneway_yes", + "maxspeed", + "structure", + "access", + "lanes", + "surface", + "ref" + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "motorway" + }, + "terms": [], + "name": "Motorway" + }, "highway/motorway_junction": { "geometry": [ "vertex" @@ -4455,26 +4489,6 @@ ], "name": "Motorway Link" }, - "highway/motorway": { - "icon": "highway-motorway", - "fields": [ - "oneway_yes", - "maxspeed", - "structure", - "access", - "lanes", - "surface", - "ref" - ], - "geometry": [ - "line" - ], - "tags": { - "highway": "motorway" - }, - "terms": [], - "name": "Motorway" - }, "highway/path": { "icon": "highway-path", "fields": [ @@ -4525,6 +4539,27 @@ "terms": [], "name": "Pedestrian Street" }, + "highway/primary": { + "icon": "highway-primary", + "fields": [ + "oneway", + "maxspeed", + "structure", + "access", + "lanes", + "surface", + "ref", + "cycleway" + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "primary" + }, + "terms": [], + "name": "Primary Road" + }, "highway/primary_link": { "icon": "highway-primary-link", "fields": [ @@ -4549,27 +4584,6 @@ ], "name": "Primary Link" }, - "highway/primary": { - "icon": "highway-primary", - "fields": [ - "oneway", - "maxspeed", - "structure", - "access", - "lanes", - "surface", - "ref", - "cycleway" - ], - "geometry": [ - "line" - ], - "tags": { - "highway": "primary" - }, - "terms": [], - "name": "Primary Road" - }, "highway/raceway": { "icon": "highway-unclassified", "fields": [ @@ -4646,6 +4660,27 @@ "terms": [], "name": "Unknown Road" }, + "highway/secondary": { + "icon": "highway-secondary", + "fields": [ + "oneway", + "maxspeed", + "structure", + "access", + "lanes", + "surface", + "ref", + "cycleway" + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "secondary" + }, + "terms": [], + "name": "Secondary Road" + }, "highway/secondary_link": { "icon": "highway-secondary-link", "fields": [ @@ -4670,27 +4705,6 @@ ], "name": "Secondary Link" }, - "highway/secondary": { - "icon": "highway-secondary", - "fields": [ - "oneway", - "maxspeed", - "structure", - "access", - "lanes", - "surface", - "ref", - "cycleway" - ], - "geometry": [ - "line" - ], - "tags": { - "highway": "secondary" - }, - "terms": [], - "name": "Secondary Road" - }, "highway/service": { "icon": "highway-service", "fields": [ @@ -4867,6 +4881,27 @@ ], "name": "Street Lamp" }, + "highway/tertiary": { + "icon": "highway-tertiary", + "fields": [ + "oneway", + "maxspeed", + "structure", + "access", + "lanes", + "surface", + "ref", + "cycleway" + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "tertiary" + }, + "terms": [], + "name": "Tertiary Road" + }, "highway/tertiary_link": { "icon": "highway-tertiary-link", "fields": [ @@ -4891,27 +4926,6 @@ ], "name": "Tertiary Link" }, - "highway/tertiary": { - "icon": "highway-tertiary", - "fields": [ - "oneway", - "maxspeed", - "structure", - "access", - "lanes", - "surface", - "ref", - "cycleway" - ], - "geometry": [ - "line" - ], - "tags": { - "highway": "tertiary" - }, - "terms": [], - "name": "Tertiary Road" - }, "highway/track": { "icon": "highway-track", "fields": [ @@ -4973,6 +4987,26 @@ ], "name": "Traffic Signals" }, + "highway/trunk": { + "icon": "highway-trunk", + "fields": [ + "oneway", + "maxspeed", + "structure", + "access", + "lanes", + "surface", + "ref" + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "trunk" + }, + "terms": [], + "name": "Trunk Road" + }, "highway/trunk_link": { "icon": "highway-trunk-link", "fields": [ @@ -4996,26 +5030,6 @@ ], "name": "Trunk Link" }, - "highway/trunk": { - "icon": "highway-trunk", - "fields": [ - "oneway", - "maxspeed", - "structure", - "access", - "lanes", - "surface", - "ref" - ], - "geometry": [ - "line" - ], - "tags": { - "highway": "trunk" - }, - "terms": [], - "name": "Trunk Road" - }, "highway/turning_circle": { "icon": "circle", "geometry": [ @@ -6722,22 +6736,6 @@ }, "name": "Spring" }, - "natural/tree_row": { - "fields": [ - "leaf_type", - "leaf_cycle", - "denotation" - ], - "icon": "park", - "geometry": [ - "line" - ], - "terms": [], - "tags": { - "natural": "tree_row" - }, - "name": "Tree row" - }, "natural/tree": { "fields": [ "leaf_type_singular", @@ -6755,6 +6753,22 @@ }, "name": "Tree" }, + "natural/tree_row": { + "fields": [ + "leaf_type", + "leaf_cycle", + "denotation" + ], + "icon": "park", + "geometry": [ + "line" + ], + "terms": [], + "tags": { + "natural": "tree_row" + }, + "name": "Tree row" + }, "natural/volcano": { "icon": "triangle", "fields": [ @@ -7783,17 +7797,6 @@ ], "name": "Railway Station" }, - "railway/subway_entrance": { - "icon": "rail-metro", - "geometry": [ - "point" - ], - "tags": { - "railway": "subway_entrance" - }, - "terms": [], - "name": "Subway Entrance" - }, "railway/subway": { "icon": "railway-subway", "geometry": [ @@ -7811,6 +7814,17 @@ "terms": [], "name": "Subway" }, + "railway/subway_entrance": { + "icon": "rail-metro", + "geometry": [ + "point" + ], + "tags": { + "railway": "subway_entrance" + }, + "terms": [], + "name": "Subway Entrance" + }, "railway/tram": { "icon": "railway-light-rail", "geometry": [ @@ -8200,6 +8214,26 @@ }, "name": "Candle Shop" }, + "shop/car": { + "icon": "car", + "fields": [ + "operator", + "address", + "building_area", + "opening_hours" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "auto" + ], + "tags": { + "shop": "car" + }, + "name": "Car Dealership" + }, "shop/car_parts": { "icon": "car", "fields": [ @@ -8240,26 +8274,6 @@ }, "name": "Car Repair Shop" }, - "shop/car": { - "icon": "car", - "fields": [ - "operator", - "address", - "building_area", - "opening_hours" - ], - "geometry": [ - "point", - "area" - ], - "terms": [ - "auto" - ], - "tags": { - "shop": "car" - }, - "name": "Car Dealership" - }, "shop/carpet": { "icon": "shop", "fields": [ @@ -9848,23 +9862,6 @@ }, "name": "Variety Store" }, - "shop/video_games": { - "icon": "shop", - "fields": [ - "operator", - "address", - "building_area", - "opening_hours" - ], - "geometry": [ - "point", - "area" - ], - "tags": { - "shop": "video_games" - }, - "name": "Video Game Store" - }, "shop/video": { "icon": "shop", "fields": [ @@ -9885,6 +9882,23 @@ }, "name": "Video Store" }, + "shop/video_games": { + "icon": "shop", + "fields": [ + "operator", + "address", + "building_area", + "opening_hours" + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "shop": "video_games" + }, + "name": "Video Game Store" + }, "shop/water_sports": { "icon": "shop", "fields": [ @@ -10519,22 +10533,6 @@ ], "icon": "restriction-only-straight-on" }, - "type/route_master": { - "geometry": [ - "relation" - ], - "tags": { - "type": "route_master" - }, - "name": "Route Master", - "icon": "route-master", - "fields": [ - "route_master", - "ref", - "operator", - "network" - ] - }, "type/route": { "geometry": [ "relation" @@ -10732,6 +10730,22 @@ "operator" ] }, + "type/route_master": { + "geometry": [ + "relation" + ], + "tags": { + "type": "route_master" + }, + "name": "Route Master", + "icon": "route-master", + "fields": [ + "route_master", + "ref", + "operator", + "network" + ] + }, "type/site": { "geometry": [ "relation" diff --git a/data/presets/presets/emergency/defibrillator.json b/data/presets/presets/emergency/defibrillator.json new file mode 100644 index 000000000..cacbbe12f --- /dev/null +++ b/data/presets/presets/emergency/defibrillator.json @@ -0,0 +1,15 @@ +{ + "fields": [ + "access", + "opening_hours", + "phone" + ], + "geometry": [ + "point" + + ], + "tags": { + "emergency": "defibrillator" + }, + "name": "Defibrillator" +} diff --git a/data/taginfo.json b/data/taginfo.json index 067b0f596..1438203c1 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -276,6 +276,10 @@ "key": "amenity", "value": "nightclub" }, + { + "key": "amenity", + "value": "parking" + }, { "key": "amenity", "value": "parking_entrance" @@ -284,10 +288,6 @@ "key": "amenity", "value": "parking_space" }, - { - "key": "amenity", - "value": "parking" - }, { "key": "amenity", "value": "pharmacy" @@ -884,6 +884,10 @@ "key": "emergency", "value": "ambulance_station" }, + { + "key": "emergency", + "value": "defibrillator" + }, { "key": "emergency", "value": "fire_hydrant" @@ -986,6 +990,10 @@ "key": "highway", "value": "mini_roundabout" }, + { + "key": "highway", + "value": "motorway" + }, { "key": "highway", "value": "motorway_junction" @@ -994,10 +1002,6 @@ "key": "highway", "value": "motorway_link" }, - { - "key": "highway", - "value": "motorway" - }, { "key": "highway", "value": "path" @@ -1008,11 +1012,11 @@ }, { "key": "highway", - "value": "primary_link" + "value": "primary" }, { "key": "highway", - "value": "primary" + "value": "primary_link" }, { "key": "highway", @@ -1032,11 +1036,11 @@ }, { "key": "highway", - "value": "secondary_link" + "value": "secondary" }, { "key": "highway", - "value": "secondary" + "value": "secondary_link" }, { "key": "highway", @@ -1080,11 +1084,11 @@ }, { "key": "highway", - "value": "tertiary_link" + "value": "tertiary" }, { "key": "highway", - "value": "tertiary" + "value": "tertiary_link" }, { "key": "highway", @@ -1096,11 +1100,11 @@ }, { "key": "highway", - "value": "trunk_link" + "value": "trunk" }, { "key": "highway", - "value": "trunk" + "value": "trunk_link" }, { "key": "highway", @@ -1571,11 +1575,11 @@ }, { "key": "natural", - "value": "tree_row" + "value": "tree" }, { "key": "natural", - "value": "tree" + "value": "tree_row" }, { "key": "natural", @@ -1822,11 +1826,11 @@ }, { "key": "railway", - "value": "subway_entrance" + "value": "subway" }, { "key": "railway", - "value": "subway" + "value": "subway_entrance" }, { "key": "railway", @@ -1911,6 +1915,10 @@ "key": "shop", "value": "candles" }, + { + "key": "shop", + "value": "car" + }, { "key": "shop", "value": "car_parts" @@ -1919,10 +1927,6 @@ "key": "shop", "value": "car_repair" }, - { - "key": "shop", - "value": "car" - }, { "key": "shop", "value": "carpet" @@ -2265,11 +2269,11 @@ }, { "key": "shop", - "value": "video_games" + "value": "video" }, { "key": "shop", - "value": "video" + "value": "video_games" }, { "key": "shop", @@ -2418,10 +2422,6 @@ "key": "restriction", "value": "only_straight_on" }, - { - "key": "type", - "value": "route_master" - }, { "key": "type", "value": "route" @@ -2474,6 +2474,10 @@ "key": "route", "value": "tram" }, + { + "key": "type", + "value": "route_master" + }, { "key": "type", "value": "site" diff --git a/dist/locales/en.json b/dist/locales/en.json index 10357050a..0c776b4db 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -648,13 +648,6 @@ } }, "fields": { - "access_simple": { - "label": "Allowed Access", - "placeholder": "yes" - }, - "access_toilets": { - "label": "Access" - }, "access": { "label": "Allowed Access", "placeholder": "Not Specified", @@ -696,6 +689,13 @@ } } }, + "access_simple": { + "label": "Allowed Access", + "placeholder": "yes" + }, + "access_toilets": { + "label": "Access" + }, "address": { "label": "Address", "placeholders": { @@ -794,10 +794,10 @@ "brand": { "label": "Brand" }, - "building_area": { + "building": { "label": "Building" }, - "building": { + "building_area": { "label": "Building" }, "capacity": { @@ -962,12 +962,12 @@ "fixme": { "label": "Fix Me" }, - "fuel_multi": { - "label": "Fuel Types" - }, "fuel": { "label": "Fuel" }, + "fuel_multi": { + "label": "Fuel Types" + }, "gauge": { "label": "Gauge" }, @@ -1016,6 +1016,9 @@ "icao": { "label": "ICAO" }, + "incline": { + "label": "Incline" + }, "incline_steps": { "label": "Incline", "options": { @@ -1023,9 +1026,6 @@ "down": "Down" } }, - "incline": { - "label": "Incline" - }, "information": { "label": "Type" }, @@ -1058,15 +1058,6 @@ "layer": { "label": "Layer" }, - "leaf_cycle_singular": { - "label": "Leaf Cycle", - "options": { - "evergreen": "Evergreen", - "deciduous": "Deciduous", - "semi_evergreen": "Semi-Evergreen", - "semi_deciduous": "Semi-Deciduous" - } - }, "leaf_cycle": { "label": "Leaf Cycle", "options": { @@ -1077,12 +1068,13 @@ "mixed": "Mixed" } }, - "leaf_type_singular": { - "label": "Leaf Type", + "leaf_cycle_singular": { + "label": "Leaf Cycle", "options": { - "broadleaved": "Broadleaved", - "needleleaved": "Needleleaved", - "leafless": "Leafless" + "evergreen": "Evergreen", + "deciduous": "Deciduous", + "semi_evergreen": "Semi-Evergreen", + "semi_deciduous": "Semi-Deciduous" } }, "leaf_type": { @@ -1094,6 +1086,14 @@ "leafless": "Leafless" } }, + "leaf_type_singular": { + "label": "Leaf Type", + "options": { + "broadleaved": "Broadleaved", + "needleleaved": "Needleleaved", + "leafless": "Leafless" + } + }, "leisure": { "label": "Type" }, @@ -1175,14 +1175,6 @@ "office": { "label": "Type" }, - "oneway_yes": { - "label": "One Way", - "options": { - "undefined": "Assumed to be Yes", - "yes": "Yes", - "no": "No" - } - }, "oneway": { "label": "One Way", "options": { @@ -1191,6 +1183,14 @@ "no": "No" } }, + "oneway_yes": { + "label": "One Way", + "options": { + "undefined": "Assumed to be Yes", + "yes": "Yes", + "no": "No" + } + }, "opening_hours": { "label": "Hours" }, @@ -1274,12 +1274,12 @@ "population": { "label": "Population" }, - "power_supply": { - "label": "Power Supply" - }, "power": { "label": "Type" }, + "power_supply": { + "label": "Power Supply" + }, "railway": { "label": "Type" }, @@ -1304,10 +1304,10 @@ "rooms": { "label": "Rooms" }, - "route_master": { + "route": { "label": "Type" }, - "route": { + "route_master": { "label": "Type" }, "sac_scale": { @@ -1328,15 +1328,6 @@ "seasonal": { "label": "Seasonal" }, - "service_rail": { - "label": "Service Type", - "options": { - "spur": "Spur", - "yard": "Yard", - "siding": "Siding", - "crossover": "Crossover" - } - }, "service": { "label": "Type" }, @@ -1356,12 +1347,21 @@ "no": "No" } }, - "shelter_type": { - "label": "Type" + "service_rail": { + "label": "Service Type", + "options": { + "spur": "Spur", + "yard": "Yard", + "siding": "Siding", + "crossover": "Crossover" + } }, "shelter": { "label": "Shelter" }, + "shelter_type": { + "label": "Type" + }, "shop": { "label": "Type" }, @@ -1401,15 +1401,15 @@ "source": { "label": "Source" }, + "sport": { + "label": "Sport" + }, "sport_ice": { "label": "Sport" }, "sport_racing": { "label": "Sport" }, - "sport": { - "label": "Sport" - }, "stars": { "label": "Stars" }, @@ -1505,12 +1505,12 @@ "vending": { "label": "Type of Goods" }, - "water_point": { - "label": "Water Point" - }, "water": { "label": "Type" }, + "water_point": { + "label": "Water Point" + }, "waterway": { "label": "Type" }, @@ -1800,6 +1800,10 @@ "name": "Nightclub", "terms": "disco*,night club,dancing,dance club" }, + "amenity/parking": { + "name": "Car Parking", + "terms": "" + }, "amenity/parking_entrance": { "name": "Parking Garage Entrance/Exit", "terms": "" @@ -1808,10 +1812,6 @@ "name": "Parking Space", "terms": "" }, - "amenity/parking": { - "name": "Car Parking", - "terms": "" - }, "amenity/pharmacy": { "name": "Pharmacy", "terms": "drug*,med*,prescription" @@ -2412,6 +2412,10 @@ "name": "Ambulance Station", "terms": "EMS,EMT,rescue" }, + "emergency/defibrillator": { + "name": "Defibrillator", + "terms": "" + }, "emergency/fire_hydrant": { "name": "Fire Hydrant", "terms": "" @@ -2516,6 +2520,10 @@ "name": "Mini-Roundabout", "terms": "" }, + "highway/motorway": { + "name": "Motorway", + "terms": "" + }, "highway/motorway_junction": { "name": "Motorway Junction / Exit", "terms": "" @@ -2524,10 +2532,6 @@ "name": "Motorway Link", "terms": "ramp,on ramp,off ramp" }, - "highway/motorway": { - "name": "Motorway", - "terms": "" - }, "highway/path": { "name": "Path", "terms": "hike,hiking,trackway,trail,walk" @@ -2536,14 +2540,14 @@ "name": "Pedestrian Street", "terms": "" }, - "highway/primary_link": { - "name": "Primary Link", - "terms": "ramp,on ramp,off ramp" - }, "highway/primary": { "name": "Primary Road", "terms": "" }, + "highway/primary_link": { + "name": "Primary Link", + "terms": "ramp,on ramp,off ramp" + }, "highway/raceway": { "name": "Motor Raceway", "terms": "auto*,race*,nascar" @@ -2560,14 +2564,14 @@ "name": "Unknown Road", "terms": "" }, - "highway/secondary_link": { - "name": "Secondary Link", - "terms": "ramp,on ramp,off ramp" - }, "highway/secondary": { "name": "Secondary Road", "terms": "" }, + "highway/secondary_link": { + "name": "Secondary Link", + "terms": "ramp,on ramp,off ramp" + }, "highway/service": { "name": "Service Road", "terms": "" @@ -2608,14 +2612,14 @@ "name": "Street Lamp", "terms": "streetlight,street light,lamp,light,gaslight" }, - "highway/tertiary_link": { - "name": "Tertiary Link", - "terms": "ramp,on ramp,off ramp" - }, "highway/tertiary": { "name": "Tertiary Road", "terms": "" }, + "highway/tertiary_link": { + "name": "Tertiary Link", + "terms": "ramp,on ramp,off ramp" + }, "highway/track": { "name": "Unmaintained Track Road", "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" @@ -2624,14 +2628,14 @@ "name": "Traffic Signals", "terms": "light,stoplight,traffic light" }, - "highway/trunk_link": { - "name": "Trunk Link", - "terms": "ramp,on ramp,off ramp" - }, "highway/trunk": { "name": "Trunk Road", "terms": "" }, + "highway/trunk_link": { + "name": "Trunk Link", + "terms": "ramp,on ramp,off ramp" + }, "highway/turning_circle": { "name": "Turning Circle", "terms": "cul-de-sac" @@ -3108,14 +3112,14 @@ "name": "Spring", "terms": "" }, - "natural/tree_row": { - "name": "Tree row", - "terms": "" - }, "natural/tree": { "name": "Tree", "terms": "" }, + "natural/tree_row": { + "name": "Tree row", + "terms": "" + }, "natural/volcano": { "name": "Volcano", "terms": "mountain,crater" @@ -3368,14 +3372,14 @@ "name": "Railway Station", "terms": "train station,station" }, - "railway/subway_entrance": { - "name": "Subway Entrance", - "terms": "" - }, "railway/subway": { "name": "Subway", "terms": "" }, + "railway/subway_entrance": { + "name": "Subway Entrance", + "terms": "" + }, "railway/tram": { "name": "Tram", "terms": "streetcar" @@ -3464,6 +3468,10 @@ "name": "Candle Shop", "terms": "" }, + "shop/car": { + "name": "Car Dealership", + "terms": "auto" + }, "shop/car_parts": { "name": "Car Parts Store", "terms": "auto" @@ -3472,10 +3480,6 @@ "name": "Car Repair Shop", "terms": "auto" }, - "shop/car": { - "name": "Car Dealership", - "terms": "auto" - }, "shop/carpet": { "name": "Carpet Store", "terms": "rug" @@ -3816,14 +3820,14 @@ "name": "Variety Store", "terms": "" }, - "shop/video_games": { - "name": "Video Game Store", - "terms": "" - }, "shop/video": { "name": "Video Store", "terms": "DVD" }, + "shop/video_games": { + "name": "Video Game Store", + "terms": "" + }, "shop/water_sports": { "name": "Watersport/Swim Shop", "terms": "" @@ -3972,10 +3976,6 @@ "name": "No Turns", "terms": "" }, - "type/route_master": { - "name": "Route Master", - "terms": "" - }, "type/route": { "name": "Route", "terms": "" @@ -4028,6 +4028,10 @@ "name": "Tram Route", "terms": "" }, + "type/route_master": { + "name": "Route Master", + "terms": "" + }, "type/site": { "name": "Site", "terms": ""