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

Add Canal Lock and Lock Gate presets

Browse Source
This commit is contained in:
Quincy Morgan
2019-04-10 16:52:19 -07:00
parent c9a579bea6
commit 33f4ec2b35
10 changed files with 92 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/presets.yaml
+12
View File
@@ -1034,6 +1034,9 @@ en:
outdoor: Outdoor
# location=roof
roof: Rooftop
lock:
# lock=*
label: Lock
man_made:
# man_made=*
label: Type
@@ -7255,6 +7258,10 @@ en:
# waterway=canal
name: Canal
terms: '<translate with synonyms or related terms for ''Canal'', separated by commas>'
waterway/canal/lock:
# 'waterway=canal, lock=yes'
name: Canal Lock
terms: '<translate with synonyms or related terms for ''Canal Lock'', separated by commas>'
waterway/dam:
# waterway=dam
name: Dam
@@ -7277,6 +7284,11 @@ en:
name: Marine Fuel Station
# 'terms: petrol,gas,diesel,boat'
terms: '<translate with synonyms or related terms for ''Marine Fuel Station'', separated by commas>'
waterway/lock_gate:
# waterway=lock_gate
name: Lock Gate
# 'terms: canal'
terms: '<translate with synonyms or related terms for ''Lock Gate'', separated by commas>'
waterway/milestone:
# waterway=milestone
name: Waterway Milestone
data/presets/fields.json
+1
View File
@@ -200,6 +200,7 @@
"lit": {"key": "lit", "type": "check", "label": "Lit"},
"location_pool": {"key": "location", "type": "typeCombo", "label": "Location", "strings": {"options": {"outdoor": "Outdoor", "indoor": "Indoor", "roof": "Rooftop"}}},
"location": {"key": "location", "type": "combo", "label": "Location"},
"lock": {"key": "lock", "type": "check", "label": "Lock"},
"man_made": {"key": "man_made", "type": "typeCombo", "label": "Type"},
"manhole": {"key": "manhole", "type": "typeCombo", "label": "Type"},
"map_size": {"key": "map_size", "type": "typeCombo", "label": "Coverage"},
data/presets/fields/lock.json
+5
View File
@@ -0,0 +1,5 @@
{
"key": "lock",
"type": "check",
"label": "Lock"
}
data/presets/presets.json
+4 -2
View File
@@ -1112,12 +1112,14 @@
"type/waterway": {"icon": "iD-waterway-stream", "fields": ["name", "waterway", "ref"], "geometry": ["relation"], "tags": {"type": "waterway"}, "name": "Waterway"},
"waterway/riverbank": {"icon": "maki-water", "geometry": ["area"], "tags": {"waterway": "riverbank"}, "name": "Riverbank", "searchable": false},
"waterway/boatyard": {"icon": "maki-harbor", "fields": ["name", "operator"], "moreFields": ["address", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["area", "vertex", "point"], "tags": {"waterway": "boatyard"}, "name": "Boatyard"},
"waterway/canal": {"icon": "iD-waterway-canal", "fields": ["name", "width", "intermittent"], "moreFields": ["salt"], "geometry": ["line"], "tags": {"waterway": "canal"}, "name": "Canal"},
"waterway/dam": {"icon": "maki-dam", "geometry": ["point", "vertex", "line", "area"], "moreFields": ["website"], "fields": ["name"], "tags": {"waterway": "dam"}, "name": "Dam"},
"waterway/canal": {"icon": "iD-waterway-canal", "fields": ["name", "width", "intermittent", "lock"], "moreFields": ["salt", "tidal"], "geometry": ["line"], "tags": {"waterway": "canal"}, "name": "Canal"},
"waterway/canal/lock": {"icon": "iD-waterway-canal", "fields": ["name", "width", "lock"], "moreFields": ["intermittent", "salt", "tidal"], "geometry": ["line"], "tags": {"waterway": "canal", "lock": "yes"}, "name": "Canal Lock"},
"waterway/dam": {"icon": "maki-dam", "geometry": ["point", "vertex", "line", "area"], "fields": ["name"], "moreFields": ["website"], "tags": {"waterway": "dam"}, "name": "Dam"},
"waterway/ditch": {"icon": "iD-waterway-ditch", "fields": ["{waterway/drain}"], "moreFields": ["{waterway/drain}"], "geometry": ["line"], "tags": {"waterway": "ditch"}, "name": "Ditch"},
"waterway/dock": {"icon": "maki-harbor", "fields": ["name", "dock", "operator"], "geometry": ["area", "vertex", "point"], "terms": ["boat", "ship", "vessel", "marine"], "tags": {"waterway": "dock"}, "name": "Wet Dock / Dry Dock"},
"waterway/drain": {"icon": "iD-waterway-ditch", "fields": ["structure_waterway", "intermittent"], "moreFields": ["covered"], "geometry": ["line"], "tags": {"waterway": "drain"}, "name": "Drain"},
"waterway/fuel": {"icon": "maki-fuel", "fields": ["name", "operator", "address", "opening_hours", "fuel_multi"], "moreFields": ["payment_multi", "brand", "seamark/type", "building", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["petrol", "gas", "diesel", "boat"], "tags": {"waterway": "fuel"}, "name": "Marine Fuel Station"},
"waterway/lock_gate": {"icon": "maki-dam", "geometry": ["vertex", "line"], "fields": ["name", "ref", "height", "material"], "tags": {"waterway": "lock_gate"}, "addTags": {"waterway": "lock_gate", "seamark:type": "gate"}, "removeTags": {"waterway": "lock_gate", "seamark:type": "gate"}, "terms": ["canal"], "name": "Lock Gate"},
"waterway/milestone": {"icon": "temaki-milestone", "fields": ["distance", "direction_vertex"], "moreFields": ["seamark/type"], "geometry": ["point", "vertex"], "tags": {"waterway": "milestone"}, "terms": ["milestone", "marker"], "name": "Waterway Milestone"},
"waterway/river": {"icon": "iD-waterway-river", "fields": ["name", "structure_waterway", "width", "intermittent", "tidal"], "moreFields": ["covered", "salt"], "geometry": ["line"], "terms": ["beck", "branch", "brook", "course", "creek", "estuary", "rill", "rivulet", "run", "runnel", "stream", "tributary", "watercourse"], "tags": {"waterway": "river"}, "name": "River"},
"waterway/sanitary_dump_station": {"icon": "temaki-storage_tank", "fields": ["name", "operator", "access_simple", "fee", "water_point"], "moreFields": ["opening_hours", "payment_multi", "seamark/type"], "geometry": ["point", "vertex", "area"], "terms": ["Boat", "Watercraft", "Sanitary", "Dump Station", "Pumpout", "Pump out", "Elsan", "CDP", "CTDP", "Chemical Toilet"], "tags": {"waterway": "sanitary_dump_station"}, "name": "Marine Toilet Disposal"},
data/presets/presets/waterway/canal.json
+4 -2
View File
@@ -3,10 +3,12 @@
"fields": [
"name",
"width",
"intermittent"
"intermittent",
"lock"
],
"moreFields": [
"salt"
"salt",
"tidal"
],
"geometry": [
"line"
data/presets/presets/waterway/canal/lock.json
+21
View File
@@ -0,0 +1,21 @@
{
"icon": "iD-waterway-canal",
"fields": [
"name",
"width",
"lock"
],
"moreFields": [
"intermittent",
"salt",
"tidal"
],
"geometry": [
"line"
],
"tags": {
"waterway": "canal",
"lock": "yes"
},
"name": "Canal Lock"
}
data/presets/presets/waterway/dam.json
+3 -3
View File
@@ -6,12 +6,12 @@
"line",
"area"
],
"moreFields": [
"website"
],
"fields": [
"name"
],
"moreFields": [
"website"
],
"tags": {
"waterway": "dam"
},
data/presets/presets/waterway/lock_gate.json
+28
View File
@@ -0,0 +1,28 @@
{
"icon": "maki-dam",
"geometry": [
"vertex",
"line"
],
"fields": [
"name",
"ref",
"height",
"material"
],
"tags": {
"waterway": "lock_gate"
},
"addTags": {
"waterway": "lock_gate",
"seamark:type": "gate"
},
"removeTags": {
"waterway": "lock_gate",
"seamark:type": "gate"
},
"terms": [
"canal"
],
"name": "Lock Gate"
}
data/taginfo.json
+3
View File
@@ -1050,11 +1050,13 @@
{"key": "waterway", "value": "riverbank", "description": "🄿 Riverbank (unsearchable), 🄳 ➜ natural=water + water=river", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/water-15.svg?sanitize=true"},
{"key": "waterway", "value": "boatyard", "description": "🄿 Boatyard", "object_types": ["area", "node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/harbor-15.svg?sanitize=true"},
{"key": "waterway", "value": "canal", "description": "🄿 Canal", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/waterway-canal.svg?sanitize=true"},
{"key": "lock", "value": "yes", "description": "🄿 Canal Lock", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/waterway-canal.svg?sanitize=true"},
{"key": "waterway", "value": "dam", "description": "🄿 Dam", "object_types": ["node", "way", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/dam-15.svg?sanitize=true"},
{"key": "waterway", "value": "ditch", "description": "🄿 Ditch", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/waterway-ditch.svg?sanitize=true"},
{"key": "waterway", "value": "dock", "description": "🄿 Wet Dock / Dry Dock", "object_types": ["area", "node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/harbor-15.svg?sanitize=true"},
{"key": "waterway", "value": "drain", "description": "🄿 Drain", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/waterway-ditch.svg?sanitize=true"},
{"key": "waterway", "value": "fuel", "description": "🄿 Marine Fuel Station", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/fuel-15.svg?sanitize=true"},
{"key": "waterway", "value": "lock_gate", "description": "🄿 Lock Gate", "object_types": ["node", "way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/dam-15.svg?sanitize=true"},
{"key": "waterway", "value": "milestone", "description": "🄿 Waterway Milestone", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/milestone.svg?sanitize=true"},
{"key": "waterway", "value": "river", "description": "🄿 River", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/waterway-river.svg?sanitize=true"},
{"key": "waterway", "value": "sanitary_dump_station", "description": "🄿 Marine Toilet Disposal", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/storage_tank.svg?sanitize=true"},
@@ -1375,6 +1377,7 @@
{"key": "location", "value": "indoor", "description": "🄵 Location"},
{"key": "location", "value": "roof", "description": "🄵 Location"},
{"key": "location", "description": "🄵 Location"},
{"key": "lock", "description": "🄵 Lock"},
{"key": "map_size", "description": "🄵 Coverage"},
{"key": "map_type", "description": "🄵 Type"},
{"key": "material", "description": "🄵 Material"},
dist/locales/en.json
Vendored
+11
View File
@@ -3091,6 +3091,9 @@
"location": {
"label": "Location"
},
"lock": {
"label": "Lock"
},
"man_made": {
"label": "Type"
},
@@ -8505,6 +8508,10 @@
"name": "Canal",
"terms": ""
},
"waterway/canal/lock": {
"name": "Canal Lock",
"terms": ""
},
"waterway/dam": {
"name": "Dam",
"terms": ""
@@ -8525,6 +8532,10 @@
"name": "Marine Fuel Station",
"terms": "petrol,gas,diesel,boat"
},
"waterway/lock_gate": {
"name": "Lock Gate",
"terms": "canal"
},
"waterway/milestone": {
"name": "Waterway Milestone",
"terms": "milestone,marker"