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

Add RV/Marine toilet disposal presets and related fields (closes #2623)

Browse Source
This commit is contained in:
Bryan Housel
2015-05-27 17:38:12 -04:00
parent 43266a0c1f
commit f761ca1f91
13 changed files with 231 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/presets.yaml
+12
View File
@@ -431,6 +431,8 @@ en:
label: Population
power:
label: Type
power_supply:
label: Power Supply
railway:
label: Type
recycling/cans:
@@ -465,6 +467,8 @@ en:
alpine_hiking: "T4: Alpine Hiking"
demanding_alpine_hiking: "T5: Demanding Alpine Hiking"
difficult_alpine_hiking: "T6: Difficult Alpine Hiking"
sanitary_dump_station:
label: Toilet Disposal
seasonal:
label: Seasonal
service:
@@ -593,6 +597,8 @@ en:
label: Type of Goods
water:
label: Type
water_point:
label: Water Point
waterway:
label: Type
website:
@@ -847,6 +853,9 @@ en:
amenity/restaurant:
name: Restaurant
terms: "<translate with synonyms or related terms for 'Restaurant', separated by commas>"
amenity/sanitary_dump_station:
name: RV Toilet Disposal
terms: "<translate with synonyms or related terms for 'RV Toilet Disposal', separated by commas>"
amenity/school:
name: School Grounds
terms: "<translate with synonyms or related terms for 'School Grounds', separated by commas>"
@@ -2350,6 +2359,9 @@ en:
waterway/riverbank:
name: Riverbank
terms: "<translate with synonyms or related terms for 'Riverbank', separated by commas>"
waterway/sanitary_dump_station:
name: Marine Toilet Disposal
terms: "<translate with synonyms or related terms for 'Marine Toilet Disposal', separated by commas>"
waterway/stream:
name: Stream
terms: "<translate with synonyms or related terms for 'Stream', separated by commas>"
data/presets/fields.json
+15
View File
@@ -861,6 +861,11 @@
"type": "typeCombo",
"label": "Type"
},
"power_supply": {
"key": "power_supply",
"type": "check",
"label": "Power Supply"
},
"railway": {
"key": "railway",
"type": "typeCombo",
@@ -941,6 +946,11 @@
}
}
},
"sanitary_dump_station": {
"key": "sanitary_dump_station",
"type": "check",
"label": "Toilet Disposal"
},
"seasonal": {
"key": "seasonal",
"type": "check",
@@ -1246,6 +1256,11 @@
"type": "combo",
"label": "Type"
},
"water_point": {
"key": "water_point",
"type": "check",
"label": "Water Point"
},
"waterway": {
"key": "waterway",
"type": "typeCombo",
data/presets/fields/power_supply.json
+5
View File
@@ -0,0 +1,5 @@
{
"key": "power_supply",
"type": "check",
"label": "Power Supply"
}
data/presets/fields/sanitary_dump_station.json
+5
View File
@@ -0,0 +1,5 @@
{
"key": "sanitary_dump_station",
"type": "check",
"label": "Toilet Disposal"
}
data/presets/fields/water_point.json
+5
View File
@@ -0,0 +1,5 @@
{
"key": "water_point",
"type": "check",
"label": "Water Point"
}
data/presets/presets.json
+81 -2
View File
@@ -1558,6 +1558,33 @@
},
"name": "Restaurant"
},
"amenity/sanitary_dump_station": {
"fields": [
"operator",
"access_toilets",
"fee",
"water_point"
],
"geometry": [
"point",
"vertex",
"area"
],
"terms": [
"Motor Home",
"Camper",
"Sanitary",
"Dump Station",
"Elsan",
"CDP",
"CTDP",
"Chemical Toilet"
],
"tags": {
"amenity": "sanitary_dump_station"
},
"name": "RV Toilet Disposal"
},
"amenity/school": {
"icon": "school",
"fields": [
@@ -5018,6 +5045,15 @@
},
"leisure/marina": {
"icon": "harbor",
"fields": [
"operator",
"address",
"capacity",
"fee",
"sanitary_dump_station",
"power_supply",
"internet_access"
],
"geometry": [
"point",
"vertex",
@@ -9012,29 +9048,43 @@
"icon": "campsite",
"fields": [
"operator",
"address"
"address",
"capacity",
"fee"
],
"geometry": [
"point",
"vertex",
"area"
],
"terms": [
"Tent"
],
"tags": {
"tourism": "camp_site"
},
"name": "Camp Site"
},
"tourism/caravan_site": {
"icon": "bus",
"fields": [
"operator",
"address",
"smoking"
"capacity",
"fee",
"sanitary_dump_station",
"power_supply",
"internet_access"
],
"geometry": [
"point",
"vertex",
"area"
],
"terms": [
"Motor Home",
"Camper"
],
"tags": {
"tourism": "caravan_site"
},
@@ -9780,6 +9830,35 @@
},
"name": "Riverbank"
},
"waterway/sanitary_dump_station": {
"fields": [
"operator",
"access_toilets",
"fee",
"water_point"
],
"geometry": [
"point",
"vertex",
"area"
],
"terms": [
"Boat",
"Watercraft",
"Sanitary",
"Dump Station",
"Pumpout",
"Pump out",
"Elsan",
"CDP",
"CTDP",
"Chemical Toilet"
],
"tags": {
"waterway": "sanitary_dump_station"
},
"name": "Marine Toilet Disposal"
},
"waterway/stream": {
"icon": "waterway-stream",
"fields": [
data/presets/presets/amenity/sanitary_dump_station.json
+27
View File
@@ -0,0 +1,27 @@
{
"fields": [
"operator",
"access_toilets",
"fee",
"water_point"
],
"geometry": [
"point",
"vertex",
"area"
],
"terms": [
"Motor Home",
"Camper",
"Sanitary",
"Dump Station",
"Elsan",
"CDP",
"CTDP",
"Chemical Toilet"
],
"tags": {
"amenity": "sanitary_dump_station"
},
"name": "RV Toilet Disposal"
}
data/presets/presets/leisure/marina.json
+9
View File
@@ -1,5 +1,14 @@
{
"icon": "harbor",
"fields": [
"operator",
"address",
"capacity",
"fee",
"sanitary_dump_station",
"power_supply",
"internet_access"
],
"geometry": [
"point",
"vertex",
data/presets/presets/tourism/camp_site.json
+6 -1
View File
@@ -2,13 +2,18 @@
"icon": "campsite",
"fields": [
"operator",
"address"
"address",
"capacity",
"fee"
],
"geometry": [
"point",
"vertex",
"area"
],
"terms": [
"Tent"
],
"tags": {
"tourism": "camp_site"
},
data/presets/presets/tourism/caravan_site.json
+10 -1
View File
@@ -1,14 +1,23 @@
{
"icon": "bus",
"fields": [
"operator",
"address",
"smoking"
"capacity",
"fee",
"sanitary_dump_station",
"power_supply",
"internet_access"
],
"geometry": [
"point",
"vertex",
"area"
],
"terms": [
"Motor Home",
"Camper"
],
"tags": {
"tourism": "caravan_site"
},
data/presets/presets/waterway/sanitary_dump_station.json
+29
View File
@@ -0,0 +1,29 @@
{
"fields": [
"operator",
"access_toilets",
"fee",
"water_point"
],
"geometry": [
"point",
"vertex",
"area"
],
"terms": [
"Boat",
"Watercraft",
"Sanitary",
"Dump Station",
"Pumpout",
"Pump out",
"Elsan",
"CDP",
"CTDP",
"Chemical Toilet"
],
"tags": {
"waterway": "sanitary_dump_station"
},
"name": "Marine Toilet Disposal"
}
data/taginfo.json
+8
View File
@@ -328,6 +328,10 @@
"key": "amenity",
"value": "restaurant"
},
{
"key": "amenity",
"value": "sanitary_dump_station"
},
{
"key": "amenity",
"value": "school"
@@ -2298,6 +2302,10 @@
"key": "waterway",
"value": "riverbank"
},
{
"key": "waterway",
"value": "sanitary_dump_station"
},
{
"key": "waterway",
"value": "stream"
dist/locales/en.json
Vendored
+19 -2
View File
@@ -1136,6 +1136,9 @@
"power": {
"label": "Type"
},
"power_supply": {
"label": "Power Supply"
},
"railway": {
"label": "Type"
},
@@ -1184,6 +1187,9 @@
"difficult_alpine_hiking": "T6: Difficult Alpine Hiking"
}
},
"sanitary_dump_station": {
"label": "Toilet Disposal"
},
"seasonal": {
"label": "Seasonal"
},
@@ -1354,6 +1360,9 @@
"water": {
"label": "Type"
},
"water_point": {
"label": "Water Point"
},
"waterway": {
"label": "Type"
},
@@ -1695,6 +1704,10 @@
"name": "Restaurant",
"terms": "bar,breakfast,cafe,café,canteen,coffee,dine,dining,dinner,drive-in,eat,grill,lunch,table"
},
"amenity/sanitary_dump_station": {
"name": "RV Toilet Disposal",
"terms": "Motor Home,Camper,Sanitary,Dump Station,Elsan,CDP,CTDP,Chemical Toilet"
},
"amenity/school": {
"name": "School Grounds",
"terms": "academy,elementary school,middle school,high school"
@@ -3501,11 +3514,11 @@
},
"tourism/camp_site": {
"name": "Camp Site",
"terms": ""
"terms": "Tent"
},
"tourism/caravan_site": {
"name": "RV Park",
"terms": ""
"terms": "Motor Home,Camper"
},
"tourism/chalet": {
"name": "Chalet",
@@ -3699,6 +3712,10 @@
"name": "Riverbank",
"terms": ""
},
"waterway/sanitary_dump_station": {
"name": "Marine Toilet Disposal",
"terms": "Boat,Watercraft,Sanitary,Dump Station,Pumpout,Pump out,Elsan,CDP,CTDP,Chemical Toilet"
},
"waterway/stream": {
"name": "Stream",
"terms": "beck,branch,brook,burn,course,creek,current,drift,flood,flow,freshet,race,rill,rindle,rivulet,run,runnel,rush,spate,spritz,surge,tide,torrent,tributary,watercourse"