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

Add presets for Pit Latrine and Flush Toilets

Browse Source 
Add Handwashing and Positions fields to the toilet presets
Deprecate alternative, less-common tags for toilets:disposal=pitlatrine
Correct Pit Latrine option string in the Disposal field
This commit is contained in:
Quincy Morgan
2019-04-17 12:40:31 -07:00
parent db3f634df4
commit 1bd66c3d9e
15 changed files with 140 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/deprecated.json
+8
View File
@@ -575,6 +575,14 @@
"old": {"sloped_curb": "yes"},
"replace": {"kerb": "lowered"}
},
{
"old": {"toilets:disposal": "longdrop"},
"replace": {"toilets:disposal": "pitlatrine"}
},
{
"old": {"toilets:disposal": "pit_latrine"},
"replace": {"toilets:disposal": "pitlatrine"}
},
{
"old": {"tourism": "bed_and_breakfast"},
"replace": {"tourism": "guest_house"}
data/presets.yaml
+17 -1
View File
@@ -1990,7 +1990,13 @@ en:
# 'toilets:disposal=flush'
flush: Flush
# 'toilets:disposal=pitlatrine'
pitlatrine: Pit/Latrine
pitlatrine: Pit Latrine
toilets/handwashing:
# 'toilets:handwashing=*'
label: Handwashing
toilets/position:
# 'toilets:position=*'
label: Positions
toll:
# toll=*
label: Toll
@@ -3076,6 +3082,16 @@ en:
name: Toilets
# 'terms: bathroom,restroom,outhouse,privy,head,lavatory,latrine,water closet,WC,W.C.'
terms: '<translate with synonyms or related terms for ''Toilets'', separated by commas>'
amenity/toilets/disposal/flush:
# 'amenity=toilets, toilets:disposal=flush'
name: Flush Toilets
# 'terms: bathroom,head,lavatory,privy,restroom,water closet,WC,W.C.'
terms: '<translate with synonyms or related terms for ''Flush Toilets'', separated by commas>'
amenity/toilets/disposal/pitlatrine:
# 'amenity=toilets, toilets:disposal=pitlatrine'
name: Pit Latrine
# 'terms: head,lavatory,long drop,outhouse,pit toilet,privy'
terms: '<translate with synonyms or related terms for ''Pit Latrine'', separated by commas>'
amenity/townhall:
# amenity=townhall
name: Town Hall
data/presets/fields.json
+3 -1
View File
@@ -356,7 +356,9 @@
"target": {"key": "target", "type": "combo", "label": "Target"},
"tidal": {"key": "tidal", "type": "check", "label": "Tidal"},
"to": {"key": "to", "type": "text", "label": "To"},
"toilets/disposal": {"key": "toilets:disposal", "type": "combo", "label": "Disposal", "strings": {"options": {"flush": "Flush", "pitlatrine": "Pit/Latrine", "chemical": "Chemical", "bucket": "Bucket"}}},
"toilets/disposal": {"key": "toilets:disposal", "type": "combo", "label": "Disposal", "strings": {"options": {"flush": "Flush", "pitlatrine": "Pit Latrine", "chemical": "Chemical", "bucket": "Bucket"}}},
"toilets/handwashing": {"key": "toilets:handwashing", "type": "check", "label": "Handwashing"},
"toilets/position": {"key": "toilets:position", "type": "semiCombo", "label": "Positions"},
"toll": {"key": "toll", "type": "check", "label": "Toll"},
"tomb": {"key": "tomb", "type": "typeCombo", "label": "Type"},
"tourism": {"key": "tourism", "type": "typeCombo", "label": "Type"},
data/presets/fields/toilets/disposal.json
+1 -1
View File
@@ -5,7 +5,7 @@
"strings": {
"options": {
"flush": "Flush",
"pitlatrine": "Pit/Latrine",
"pitlatrine": "Pit Latrine",
"chemical": "Chemical",
"bucket": "Bucket"
}
data/presets/fields/toilets/handwashing.json
+5
View File
@@ -0,0 +1,5 @@
{
"key": "toilets:handwashing",
"type": "check",
"label": "Handwashing"
}
data/presets/fields/toilets/position.json
+5
View File
@@ -0,0 +1,5 @@
{
"key": "toilets:position",
"type": "semiCombo",
"label": "Positions"
}
data/presets/presets.json
+3 -1
View File
@@ -198,7 +198,9 @@
"amenity/telephone": {"icon": "maki-telephone", "fields": ["operator", "phone", "fee", "payment_multi", "booth"], "moreFields": ["covered", "indoor", "lit", "wheelchair"], "geometry": ["point", "vertex"], "tags": {"amenity": "telephone"}, "terms": ["phone"], "name": "Telephone"},
"amenity/theatre": {"icon": "maki-theatre", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["air_conditioning", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["theatre", "performance", "play", "musical"], "tags": {"amenity": "theatre"}, "name": "Theater"},
"amenity/theatre/type/amphi": {"icon": "maki-theatre", "fields": ["name", "operator", "address", "lit"], "geometry": ["point", "area"], "terms": ["open air", "outdoor", "greek", "ampi"], "tags": {"amenity": "theatre", "theatre:type": "amphi"}, "name": "Amphitheatre"},
"amenity/toilets": {"icon": "maki-toilet", "fields": ["toilets/disposal", "building_area", "access_simple", "gender", "diaper", "wheelchair"], "moreFields": ["fee", "opening_hours", "operator", "payment_multi"], "geometry": ["point", "vertex", "area"], "terms": ["bathroom", "restroom", "outhouse", "privy", "head", "lavatory", "latrine", "water closet", "WC", "W.C."], "tags": {"amenity": "toilets"}, "name": "Toilets"},
"amenity/toilets": {"icon": "maki-toilet", "fields": ["toilets/disposal", "access_simple", "gender", "toilets/handwashing", "diaper", "wheelchair", "building_area"], "moreFields": ["fee", "opening_hours", "operator", "payment_multi", "toilets/position"], "geometry": ["point", "vertex", "area"], "terms": ["bathroom", "restroom", "outhouse", "privy", "head", "lavatory", "latrine", "water closet", "WC", "W.C."], "tags": {"amenity": "toilets"}, "name": "Toilets"},
"amenity/toilets/disposal/flush": {"icon": "fas-toilet", "fields": ["toilets/disposal", "{amenity/toilets}"], "moreFields": ["{amenity/toilets}"], "geometry": ["point", "vertex", "area"], "terms": ["bathroom", "head", "lavatory", "privy", "restroom", "water closet", "WC", "W.C."], "tags": {"amenity": "toilets", "toilets:disposal": "flush"}, "name": "Flush Toilets"},
"amenity/toilets/disposal/pitlatrine": {"icon": "tnp-2009541", "fields": ["toilets/disposal", "{amenity/toilets}"], "moreFields": ["{amenity/toilets}"], "geometry": ["point", "vertex", "area"], "terms": ["head", "lavatory", "long drop", "outhouse", "pit toilet", "privy"], "tags": {"amenity": "toilets", "toilets:disposal": "pitlatrine"}, "name": "Pit Latrine"},
"amenity/townhall": {"icon": "maki-town-hall", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["village", "city", "government", "courthouse", "municipal"], "tags": {"amenity": "townhall"}, "name": "Town Hall"},
"amenity/toy_library": {"icon": "fas-chess-knight", "fields": ["operator", "address", "building_area", "opening_hours"], "moreFields": ["website", "wheelchair"], "geometry": ["point", "area"], "terms": ["game", "toy"], "tags": {"amenity": "toy_library"}, "name": "Toy Library"},
"amenity/university": {"icon": "maki-college", "fields": ["{amenity/college}"], "moreFields": ["{amenity/college}"], "geometry": ["point", "area"], "terms": ["college", "graduate school", "PhD program", "master's degree program"], "tags": {"amenity": "university"}, "name": "University Grounds"},
data/presets/presets/amenity/toilets.json
+5 -3
View File
@@ -2,17 +2,19 @@
"icon": "maki-toilet",
"fields": [
"toilets/disposal",
"building_area",
"access_simple",
"gender",
"toilets/handwashing",
"diaper",
"wheelchair"
"wheelchair",
"building_area"
],
"moreFields": [
"fee",
"opening_hours",
"operator",
"payment_multi"
"payment_multi",
"toilets/position"
],
"geometry": [
"point",
data/presets/presets/amenity/toilets/disposal/flush.json
+30
View File
@@ -0,0 +1,30 @@
{
"icon": "fas-toilet",
"fields": [
"toilets/disposal",
"{amenity/toilets}"
],
"moreFields": [
"{amenity/toilets}"
],
"geometry": [
"point",
"vertex",
"area"
],
"terms": [
"bathroom",
"head",
"lavatory",
"privy",
"restroom",
"water closet",
"WC",
"W.C."
],
"tags": {
"amenity": "toilets",
"toilets:disposal": "flush"
},
"name": "Flush Toilets"
}
data/presets/presets/amenity/toilets/disposal/pitlatrine.json
+28
View File
@@ -0,0 +1,28 @@
{
"icon": "tnp-2009541",
"fields": [
"toilets/disposal",
"{amenity/toilets}"
],
"moreFields": [
"{amenity/toilets}"
],
"geometry": [
"point",
"vertex",
"area"
],
"terms": [
"head",
"lavatory",
"long drop",
"outhouse",
"pit toilet",
"privy"
],
"tags": {
"amenity": "toilets",
"toilets:disposal": "pitlatrine"
},
"name": "Pit Latrine"
}
data/taginfo.json
+6 -2
View File
@@ -196,6 +196,8 @@
{"key": "amenity", "value": "theatre", "description": "🄿 Theater", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/theatre-15.svg?sanitize=true"},
{"key": "theatre:type", "value": "amphi", "description": "🄿 Amphitheatre", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/theatre-15.svg?sanitize=true"},
{"key": "amenity", "value": "toilets", "description": "🄿 Toilets", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/toilet-15.svg?sanitize=true"},
{"key": "toilets:disposal", "value": "flush", "description": "🄿 Flush Toilets, 🄵 Disposal", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-toilet.svg?sanitize=true"},
{"key": "toilets:disposal", "value": "pitlatrine", "description": "🄿 Pit Latrine, 🄵 Disposal", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/the-noun-project/2009541.svg?sanitize=true"},
{"key": "amenity", "value": "townhall", "description": "🄿 Town Hall", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/town-hall-15.svg?sanitize=true"},
{"key": "amenity", "value": "toy_library", "description": "🄿 Toy Library", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-chess-knight.svg?sanitize=true"},
{"key": "amenity", "value": "university", "description": "🄿 University Grounds", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/college-15.svg?sanitize=true"},
@@ -1613,10 +1615,10 @@
{"key": "target", "description": "🄵 Target"},
{"key": "tidal", "description": "🄵 Tidal"},
{"key": "to", "description": "🄵 To"},
{"key": "toilets:disposal", "value": "flush", "description": "🄵 Disposal"},
{"key": "toilets:disposal", "value": "pitlatrine", "description": "🄵 Disposal"},
{"key": "toilets:disposal", "value": "chemical", "description": "🄵 Disposal"},
{"key": "toilets:disposal", "value": "bucket", "description": "🄵 Disposal"},
{"key": "toilets:handwashing", "description": "🄵 Handwashing"},
{"key": "toilets:position", "description": "🄵 Positions"},
{"key": "toll", "description": "🄵 Toll"},
{"key": "tomb", "description": "🄵 Type"},
{"key": "tower:construction", "description": "🄵 Construction"},
@@ -1812,6 +1814,8 @@
{"key": "sloped_curb", "value": "low", "description": "🄳 ➜ kerb=lowered"},
{"key": "sloped_curb", "value": "no", "description": "🄳 ➜ kerb=raised"},
{"key": "sloped_curb", "value": "yes", "description": "🄳 ➜ kerb=lowered"},
{"key": "toilets:disposal", "value": "longdrop", "description": "🄳 ➜ toilets:disposal=pitlatrine"},
{"key": "toilets:disposal", "value": "pit_latrine", "description": "🄳 ➜ toilets:disposal=pitlatrine"},
{"key": "tourism", "value": "bed_and_breakfast", "description": "🄳 ➜ tourism=guest_house"},
{"key": "type", "value": "broad_leaved", "description": "🄳 ➜ leaf_type=broadleaved"},
{"key": "type", "value": "conifer", "description": "🄳 ➜ leaf_type=needleleaved"},
dist/locales/en.json
Vendored
+15 -1
View File
@@ -3859,11 +3859,17 @@
"label": "Disposal",
"options": {
"flush": "Flush",
"pitlatrine": "Pit/Latrine",
"pitlatrine": "Pit Latrine",
"chemical": "Chemical",
"bucket": "Bucket"
}
},
"toilets/handwashing": {
"label": "Handwashing"
},
"toilets/position": {
"label": "Positions"
},
"toll": {
"label": "Toll"
},
@@ -4858,6 +4864,14 @@
"name": "Toilets",
"terms": "bathroom,restroom,outhouse,privy,head,lavatory,latrine,water closet,WC,W.C."
},
"amenity/toilets/disposal/flush": {
"name": "Flush Toilets",
"terms": "bathroom,head,lavatory,privy,restroom,water closet,WC,W.C."
},
"amenity/toilets/disposal/pitlatrine": {
"name": "Pit Latrine",
"terms": "head,lavatory,long drop,outhouse,pit toilet,privy"
},
"amenity/townhall": {
"name": "Town Hall",
"terms": "village,city,government,courthouse,municipal"
package.json
+12 -12
View File
@@ -54,10 +54,10 @@
"wmf-sitematrix": "0.1.4"
},
"devDependencies": {
"@fortawesome/fontawesome-svg-core": "~1.2.16",
"@fortawesome/free-brands-svg-icons": "~5.8.0",
"@fortawesome/free-regular-svg-icons": "~5.8.0",
"@fortawesome/free-solid-svg-icons": "~5.8.0",
"@fortawesome/fontawesome-svg-core": "^1.2.17",
"@fortawesome/free-brands-svg-icons": "^5.8.1",
"@fortawesome/free-regular-svg-icons": "^5.8.1",
"@fortawesome/free-solid-svg-icons": "^5.8.1",
"@mapbox/maki": "^6.0.0",
"chai": "^4.1.0",
"colors": "^1.1.2",
@@ -65,17 +65,17 @@
"d3": "4.13.0",
"ecstatic": "^3.0.0",
"editor-layer-index": "github:osmlab/editor-layer-index#gh-pages",
"eslint": "^5.15.3",
"eslint": "^5.16.0",
"gaze": "^1.1.1",
"glob": "^7.1.0",
"happen": "^0.3.1",
"js-yaml": "^3.9.0",
"js-yaml": "^3.13.1",
"json-stringify-pretty-compact": "^1.1.0",
"jsonschema": "^1.1.0",
"mapillary-js": "2.18.0",
"mapillary_sprite_source": "^1.7.0",
"mapillary_sprite_source": "^1.8.0",
"minimist": "^1.2.0",
"mocha": "^6.0.0",
"mocha": "^6.1.3",
"mocha-phantomjs-core": "^2.1.0",
"name-suggestion-index": "2.0.1",
"npm-run-all": "^4.0.0",
@@ -83,11 +83,11 @@
"phantomjs-prebuilt": "~2.1.11",
"request": "^2.88.0",
"rollup": "~1.9.0",
"rollup-plugin-commonjs": "^9.0.0",
"rollup-plugin-commonjs": "^9.3.4",
"rollup-plugin-includepaths": "~0.2.3",
"rollup-plugin-json": "^4.0.0",
"rollup-plugin-node-resolve": "^4.0.0",
"rollup-plugin-visualizer": "^1.1.0",
"rollup-plugin-node-resolve": "^4.2.3",
"rollup-plugin-visualizer": "^1.1.1",
"shelljs": "^0.8.0",
"shx": "^0.3.0",
"sinon": "7.3.1",
@@ -95,7 +95,7 @@
"smash": "0.0",
"svg-sprite": "1.5.0",
"temaki": "1.2.0",
"uglify-js": "^3.4.10"
"uglify-js": "^3.5.4"
},
"greenkeeper": {
"label": "chore-greenkeeper",
svg/fontawesome/fas-toilet.svg
+1
View File
@@ -0,0 +1 @@
<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="toilet" class="svg-inline--fa fa-toilet fa-w-12" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512"><path fill="currentColor" d="M368 48c8.8 0 16-7.2 16-16V16c0-8.8-7.2-16-16-16H16C7.2 0 0 7.2 0 16v16c0 8.8 7.2 16 16 16h16v156.7C11.8 214.8 0 226.9 0 240c0 67.2 34.6 126.2 86.8 160.5l-21.4 70.2C59.1 491.2 74.5 512 96 512h192c21.5 0 36.9-20.8 30.6-41.3l-21.4-70.2C349.4 366.2 384 307.2 384 240c0-13.1-11.8-25.2-32-35.3V48h16zM80 72c0-4.4 3.6-8 8-8h48c4.4 0 8 3.6 8 8v16c0 4.4-3.6 8-8 8H88c-4.4 0-8-3.6-8-8V72zm112 200c-77.1 0-139.6-14.3-139.6-32s62.5-32 139.6-32 139.6 14.3 139.6 32-62.5 32-139.6 32z"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 702 B

svg/the-noun-project/2009541.svg
+1
View File
@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 48" x="0px" y="0px"><title>Asset 490</title><g data-name="Layer 2"><g><path d="M0,42.9541V46.5a1.5,1.5,0,0,0,3,0V45H19v1.5a1.5,1.5,0,0,0,3,0V8H0ZM17,25a1,1,0,0,1,2,0v3a1,1,0,0,1-2,0Z"></path><path d="M16,0H6A6,6,0,0,0,0,6H22A6,6,0,0,0,16,0Z"></path></g></g></svg>
Side by Side

After

Width:  |  Height:  |  Size: 319 B