CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-15 21:48:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6120 from prateeklal/flood-prone

Browse Source 
Added checkbox for flood_prone key #6117
This commit is contained in:
Quincy Morgan
2019-03-27 13:14:51 -04:00
committed by GitHub
parent 4afd29a50a ee20d579c1
commit bf31d86868
10 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/presets.yaml
+3
View File
@@ -691,6 +691,9 @@ en:
floating:
# floating=*
label: Floating
flood_prone:
# flood_prone=*
label: Flood Prone
ford:
# ford=*
label: Type
data/presets/fields.json
+1
View File
@@ -126,6 +126,7 @@
"fixme": {"key": "fixme", "type": "textarea", "label": "Fix Me", "universal": true},
"flag/type": {"key": "flag:type", "type": "combo", "label": "Flag Type"},
"floating": {"key": "floating", "type": "check", "label": "Floating"},
"flood_prone": {"key": "flood_prone", "type": "check", "label": "Flood Prone"},
"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"},
data/presets/fields/flood_prone.json
+5
View File
@@ -0,0 +1,5 @@
{
"key": "flood_prone",
"type": "check",
"label": "Flood Prone"
}
data/presets/presets.json
+4 -4
View File
@@ -444,7 +444,7 @@
"highway/footway/unmarked-raised": {"fields": ["crossing", "access", "surface", "tactile_paving"], "geometry": ["line"], "tags": {"footway": "crossing", "traffic_calming": "table"}, "addTags": {"highway": "footway", "footway": "crossing", "crossing": "unmarked", "traffic_calming": "table"}, "removeTags": {"highway": "footway", "footway": "crossing", "crossing": "unmarked", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "terms": ["flat top", "hump", "speed", "slow"], "matchScore": 0.95, "name": "Unmarked Crossing (Raised)"},
"highway/footway/unmarked": {"fields": ["crossing", "access", "surface", "tactile_paving"], "geometry": ["line"], "tags": {"footway": "crossing"}, "addTags": {"highway": "footway", "footway": "crossing", "crossing": "unmarked"}, "removeTags": {"highway": "footway", "footway": "crossing", "crossing": "unmarked"}, "reference": {"key": "footway", "value": "crossing"}, "terms": ["unmarked foot path crossing", "unmarked crosswalk", "unmarked pedestrian crossing"], "matchScore": 0.95, "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", "access"], "moreFields": ["cycleway", "maxheight", "covered", "junction_line", "lit", "smoothness", "oneway/bicycle"], "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", "junction_line", "lit", "smoothness", "oneway/bicycle", "flood_prone"], "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"], "terms": ["traffic circle"], "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"},
@@ -457,12 +457,12 @@
"highway/primary_link": {"icon": "iD-highway-primary-link", "fields": ["destination_oneway", "destination/ref_oneway", "oneway", "maxspeed", "lanes", "surface", "structure", "access"], "moreFields": ["covered", "cycleway", "destination/symbol_oneway", "incline", "junction/ref_oneway", "junction_line", "lit", "maxheight", "maxspeed/advisory", "name", "oneway/bicycle", "ref_road_number", "smoothness", "toll"], "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": ["covered", "cycleway", "incline", "junction_line", "lit", "maxheight", "maxspeed/advisory", "oneway/bicycle", "smoothness", "toll"], "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", "access"], "moreFields": ["covered", "cycleway", "incline", "junction_line", "lit", "oneway/bicycle", "maxheight", "maxspeed/advisory", "smoothness"], "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": ["covered", "cycleway", "incline", "junction_line", "lit", "oneway/bicycle", "maxheight", "maxspeed/advisory", "smoothness", "flood_prone"], "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-other-line", "fields": ["highway", "{highway/residential}"], "moreFields": ["{highway/residential}"], "geometry": ["line"], "tags": {"highway": "road"}, "terms": ["road", "street"], "name": "Unknown Road"},
"highway/secondary_link": {"icon": "iD-highway-secondary-link", "fields": ["{highway/primary_link}"], "moreFields": ["{highway/primary_link}"], "geometry": ["line"], "tags": {"highway": "secondary_link"}, "terms": ["on ramp", "off ramp", "ramp", "road", "street"], "name": "Secondary Link"},
"highway/secondary": {"icon": "iD-highway-secondary", "fields": ["{highway/primary}"], "moreFields": ["{highway/primary}"], "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": ["covered", "incline", "lanes", "lit", "maxheight", "maxspeed/advisory", "oneway/bicycle"], "geometry": ["line"], "tags": {"highway": "service"}, "terms": ["road", "street"], "matchScore": 0.9, "name": "Service Road"},
"highway/service": {"icon": "iD-highway-service", "fields": ["name", "service", "oneway", "maxspeed", "surface", "structure", "access"], "moreFields": ["covered", "incline", "lanes", "lit", "maxheight", "maxspeed/advisory", "oneway/bicycle", "flood_prone"], "geometry": ["line"], "tags": {"highway": "service"}, "terms": ["road", "street"], "matchScore": 0.9, "name": "Service Road"},
"highway/service/alley": {"icon": "iD-highway-service", "geometry": ["line"], "tags": {"service": "alley"}, "addTags": {"highway": "service", "service": "alley"}, "removeTags": {"highway": "service", "service": "alley"}, "reference": {"key": "service", "value": "alley"}, "name": "Alley"},
"highway/service/drive-through": {"icon": "iD-highway-service", "fields": ["{highway/service}", "covered"], "geometry": ["line"], "tags": {"service": "drive-through"}, "addTags": {"highway": "service", "service": "drive-through"}, "removeTags": {"highway": "service", "service": "drive-through"}, "reference": {"key": "service", "value": "drive-through"}, "name": "Drive-Through"},
"highway/service/driveway": {"icon": "iD-highway-service", "geometry": ["line"], "tags": {"service": "driveway"}, "addTags": {"highway": "service", "service": "driveway"}, "removeTags": {"highway": "service", "service": "driveway"}, "reference": {"key": "service", "value": "driveway"}, "name": "Driveway"},
@@ -476,7 +476,7 @@
"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": ["{highway/primary_link}"], "moreFields": ["{highway/primary_link}"], "geometry": ["line"], "tags": {"highway": "tertiary_link"}, "terms": ["on ramp", "off ramp", "ramp", "road", "street"], "name": "Tertiary Link"},
"highway/tertiary": {"icon": "iD-highway-tertiary", "fields": ["{highway/primary}"], "moreFields": ["{highway/primary}"], "geometry": ["line"], "tags": {"highway": "tertiary"}, "terms": ["road", "street"], "name": "Tertiary Road"},
"highway/track": {"icon": "fas-truck-monster", "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/track": {"icon": "fas-truck-monster", "fields": ["name", "tracktype", "surface", "width", "structure", "access", "incline", "smoothness"], "moreFields": ["mtb/scale", "mtb/scale/uphill", "mtb/scale/imba", "horse_scale", "covered", "flood_prone"], "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": ["{highway/motorway_link}"], "moreFields": ["{highway/motorway_link}"], "geometry": ["line"], "tags": {"highway": "trunk_link"}, "terms": ["on ramp", "off ramp", "ramp", "road", "street"], "name": "Trunk Link"},
data/presets/presets/highway/living_street.json
+2 -1
View File
@@ -16,7 +16,8 @@
"junction_line",
"lit",
"smoothness",
"oneway/bicycle"
"oneway/bicycle",
"flood_prone"
],
"geometry": [
"line"
data/presets/presets/highway/residential.json
+2 -1
View File
@@ -18,7 +18,8 @@
"oneway/bicycle",
"maxheight",
"maxspeed/advisory",
"smoothness"
"smoothness",
"flood_prone"
],
"geometry": [
"line"
data/presets/presets/highway/service.json
+2 -1
View File
@@ -16,7 +16,8 @@
"lit",
"maxheight",
"maxspeed/advisory",
"oneway/bicycle"
"oneway/bicycle",
"flood_prone"
],
"geometry": [
"line"
data/presets/presets/highway/track.json
+2 -1
View File
@@ -15,7 +15,8 @@
"mtb/scale/uphill",
"mtb/scale/imba",
"horse_scale",
"covered"
"covered",
"flood_prone"
],
"geometry": [
"line"
data/taginfo.json
+1
View File
@@ -1279,6 +1279,7 @@
{"key": "fixme", "description": "🄵 Fix Me"},
{"key": "flag:type", "description": "🄵 Flag Type"},
{"key": "floating", "description": "🄵 Floating"},
{"key": "flood_prone", "description": "🄵 Flood Prone"},
{"key": "ford", "description": "🄵 Type, 🄵 Structure"},
{"key": "frequency", "description": "🄵 Operating Frequency"},
{"key": "from", "description": "🄵 From"},
dist/locales/en.json
Vendored
+3
View File
@@ -2742,6 +2742,9 @@
"floating": {
"label": "Floating"
},
"flood_prone": {
"label": "Flood Prone"
},
"ford": {
"label": "Type",
"placeholder": "Default"