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

Several changes

Browse Source 
* Proper Case all the things
* Remove the `trailblazing_` fields, which require special knowledge to use
* Fix the icon on `trail_riding_station` preset
* Make the `horse_` checkboxes more consistent (yes/no)
* Remove `watering_place` field, remove it from `amenity=fountain` preset
* Update build script to not include "undefined" values in `taginfo.json`
This commit is contained in:
Bryan Housel
2018-04-09 16:06:58 -04:00
parent 3c5872f7be
commit ab9ba0a632
18 changed files with 267 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build_data.js
View File

@@ -359,6 +359,7 @@ function generateTaginfo(presets, fields) {
if (field.strings && field.strings.options) {
var values = Object.keys(field.strings.options);
values.forEach(function(value) {
if (value === 'undefined' || value === '*' || value === '') return;
var tag = { key: key, value: value };
if (field.label) {
tag.description = [ field.label ];

49
data/presets.yaml
View File

@@ -493,6 +493,9 @@ en:
display:
# display=*
label: Display
distance:
# distance=*
label: Total Distance
dock:
# dock=*
label: Type
@@ -669,6 +672,48 @@ en:
label: Hoops
# hoops field placeholder
placeholder: '1, 2, 4...'
horse_dressage:
# sport=*
label: Dressage Riding
options:
# sport=equestrian
equestrian: 'Yes'
# sport=undefined
undefined: 'No'
horse_riding:
# leisure=*
label: Horseback Riding
options:
# leisure=horse_riding
horse_riding: 'Yes'
# leisure=undefined
undefined: 'No'
horse_scale:
# horse_scale=*
label: Horseback Riding Difficulty
options:
# horse_scale=common
common: 'Easy: No problems or difficulties. (default)'
# horse_scale=critical
critical: 'Borderline: Passable only for experienced riders and horses. Major obstacles. Bridges should be examined carefully.'
# horse_scale=dangerous
dangerous: 'Dangerous: Passable only for very experienced riders and horses and only in good weather. Dismount.'
# horse_scale=demanding
demanding: 'Use with caution: Uneven way, occasional difficult passages.'
# horse_scale=difficult
difficult: 'Difficult: Way narrow and exposed. May contain obstacles to step over and narrow passages.'
# horse_scale=impossible
impossible: 'Impassable: Way or bridge not passable for horses. Too narrow, insuffient support, obstacles like ladders. Danger of life.'
# horse_scale field placeholder
placeholder: 'Difficult, Dangerous...'
horse_stables:
# amenity=*
label: Riding Stable
options:
# amenity=stables
stables: 'Yes'
# amenity=undefined
undefined: 'No'
iata:
# iata=*
label: IATA
@@ -5620,6 +5665,10 @@ en:
# tourism=theme_park
name: Theme Park
terms: '<translate with synonyms or related terms for ''Theme Park'', separated by commas>'
tourism/trail_riding_station:
# tourism=trail_riding_station
name: Trail Riding Station
terms: '<translate with synonyms or related terms for ''Trail Riding Station'', separated by commas>'
tourism/viewpoint:
# tourism=viewpoint
name: Viewpoint

66
data/presets/fields.json
View File

@@ -671,6 +671,11 @@
"unorthodox"
]
},
"distance": {
"key": "distance",
"type": "text",
"label": "Total Distance"
},
"dock": {
"key": "dock",
"type": "combo",
@@ -925,6 +930,67 @@
"label": "Hoops",
"placeholder": "1, 2, 4..."
},
"horse_dressage": {
"key": "sport",
"type": "check",
"label": "Dressage Riding",
"strings": {
"options": {
"undefined": "No",
"equestrian": "Yes"
}
},
"reference": {
"key": "sport",
"value": "equestrian"
}
},
"horse_riding": {
"key": "leisure",
"type": "check",
"label": "Horseback Riding",
"strings": {
"options": {
"undefined": "No",
"horse_riding": "Yes"
}
},
"reference": {
"key": "leisure",
"value": "horse_riding"
}
},
"horse_scale": {
"key": "horse_scale",
"type": "combo",
"label": "Horseback Riding Difficulty",
"placeholder": "Difficult, Dangerous...",
"strings": {
"options": {
"common": "Easy: No problems or difficulties. (default)",
"demanding": "Use with caution: Uneven way, occasional difficult passages.",
"difficult": "Difficult: Way narrow and exposed. May contain obstacles to step over and narrow passages.",
"critical": "Borderline: Passable only for experienced riders and horses. Major obstacles. Bridges should be examined carefully.",
"dangerous": "Dangerous: Passable only for very experienced riders and horses and only in good weather. Dismount.",
"impossible": "Impassable: Way or bridge not passable for horses. Too narrow, insuffient support, obstacles like ladders. Danger of life."
}
}
},
"horse_stables": {
"key": "amenity",
"type": "check",
"label": "Riding Stable",
"strings": {
"options": {
"undefined": "No",
"stables": "Yes"
}
},
"reference": {
"key": "amenity",
"value": "stables"
}
},
"iata": {
"key": "iata",
"type": "text",

3
data/presets/fields/distance.json
View File

@@ -1,6 +1,5 @@
{
"key": "distance",
"type": "text",
"label": "Total distance",
"placeholder": "0"
"label": "Total Distance"
}

8
data/presets/fields/horse_dressage.json
View File

@@ -1,11 +1,15 @@
{
"key": "sport",
"type": "check",
"label": "Dressage riding",
"label": "Dressage Riding",
"strings": {
"options": {
"undefined": "No",
"equestrian": "Offered"
"equestrian": "Yes"
}
},
"reference": {
"key": "sport",
"value": "equestrian"
}
}

8
data/presets/fields/horse_riding.json
View File

@@ -1,11 +1,15 @@
{
"key": "leisure",
"type": "check",
"label": "Horseback riding",
"label": "Horseback Riding",
"strings": {
"options": {
"undefined": "No",
"horse_riding": "Offered"
"horse_riding": "Yes"
}
},
"reference": {
"key": "leisure",
"value": "horse_riding"
}
}

10
data/presets/fields/horse_stables.json
View File

@@ -1,11 +1,15 @@
{
"key": "amenity",
"type": "check",
"label": "Riding stable",
"label": "Riding Stable",
"strings": {
"options": {
"stables": "Riding stable",
"undefined": "No"
"undefined": "No",
"stables": "Yes"
}
},
"reference": {
"key": "amenity",
"value": "stables"
}
}

5
data/presets/fields/trailblazing_osmc.json
View File

@@ -1,5 +0,0 @@
{
"key": "osmc:symbol",
"type": "text",
"label": "Machine readable trailblazing"
}

5
data/presets/fields/trailblazing_text.json
View File

@@ -1,5 +0,0 @@
{
"key": "symbol",
"type": "textarea",
"label": "Trailblazing description"
}

5
data/presets/fields/trailblazing_wiki.json
View File

@@ -1,5 +0,0 @@
{
"key": "wiki:symbol",
"type": "text",
"label": "OSM Wiki name of trailblazing graphic"
}

5
data/presets/fields/watering_place.json
View File

@@ -1,5 +0,0 @@
{
"key": "watering_place",
"type": "defaultCheck",
"label": "Accessible for horses"
}

37
data/presets/presets.json
View File

@@ -1691,6 +1691,9 @@
},
"amenity/fountain": {
"icon": "poi-fountain",
"fields": [
"name"
],
"geometry": [
"point",
"area"
@@ -7698,6 +7701,7 @@
"mtb/scale",
"mtb/scale/uphill",
"mtb/scale/imba",
"horse_scale",
"ref"
],
"geometry": [
@@ -8273,7 +8277,8 @@
"smoothness",
"mtb/scale",
"mtb/scale/uphill",
"mtb/scale/imba"
"mtb/scale/imba",
"horse_scale"
],
"geometry": [
"line"
@@ -19366,6 +19371,28 @@
},
"name": "Theme Park"
},
"tourism/trail_riding_station": {
"icon": "horse-riding",
"fields": [
"name",
"horse_stables",
"horse_riding",
"horse_dressage",
"address",
"phone",
"website",
"description"
],
"geometry": [
"point",
"area"
],
"tags": {
"tourism": "trail_riding_station"
},
"name": "Trail Riding Station",
"matchScore": 2
},
"tourism/viewpoint": {
"icon": "poi-binoculars",
"geometry": [
@@ -19910,7 +19937,9 @@
"name",
"ref_route",
"operator",
"network_foot"
"network_foot",
"description",
"distance"
],
"geometry": [
"relation"
@@ -19927,7 +19956,9 @@
"name",
"ref_route",
"operator",
"network_horse"
"network_horse",
"description",
"distance"
],
"geometry": [
"relation"

3
data/presets/presets/amenity/fountain.json
View File

@@ -1,8 +1,7 @@
{
"icon": "poi-fountain",
"fields": [
"name",
"watering_place"
"name"
],
"geometry": [
"point",

4
data/presets/presets/tourism/trail_riding_station.json
View File

@@ -1,5 +1,5 @@
{
"icon": "horse_riding",
"icon": "horse-riding",
"fields": [
"name",
"horse_stables",
@@ -17,6 +17,6 @@
"tags": {
"tourism": "trail_riding_station"
},
"name": "Trail riding station",
"name": "Trail Riding Station",
"matchScore": 2.0
}

5
data/presets/presets/type/route/hiking.json
View File

@@ -6,10 +6,7 @@
"operator",
"network_foot",
"description",
"distance",
"trailblazing_text",
"trailblazing_osmc",
"trailblazing_wiki"
"distance"
],
"geometry": [
"relation"

7
data/presets/presets/type/route/horse.json
View File

@@ -4,12 +4,9 @@
"name",
"ref_route",
"operator",
"network_horse",
"description",
"distance",
"trailblazing_text",
"trailblazing_osmc",
"trailblazing_wiki",
"network_horse"
"distance"
],
"geometry": [
"relation"

58
data/taginfo.json
View File

@@ -4308,7 +4308,7 @@
{
"key": "leisure",
"value": "horse_riding",
"description": "Horseback Riding Facility",
"description": "Horseback Riding Facility, Horseback Riding",
"object_types": [
"node",
"area"
@@ -4467,7 +4467,7 @@
{
"key": "sport",
"value": "equestrian",
"description": "Riding Arena",
"description": "Riding Arena, Dressage Riding",
"object_types": [
"node",
"area"
@@ -7806,6 +7806,16 @@
],
"icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/amusement-park-15.svg?sanitize=true"
},
{
"key": "tourism",
"value": "trail_riding_station",
"description": "Trail Riding Station",
"object_types": [
"node",
"area"
],
"icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/horse-riding-15.svg?sanitize=true"
},
{
"key": "tourism",
"value": "viewpoint",
@@ -9043,6 +9053,10 @@
"key": "display",
"description": "Display"
},
{
"key": "distance",
"description": "Total Distance"
},
{
"key": "dock",
"description": "Type"
@@ -9276,6 +9290,41 @@
"key": "hoops",
"description": "Hoops"
},
{
"key": "horse_scale",
"value": "common",
"description": "Horseback Riding Difficulty"
},
{
"key": "horse_scale",
"value": "demanding",
"description": "Horseback Riding Difficulty"
},
{
"key": "horse_scale",
"value": "difficult",
"description": "Horseback Riding Difficulty"
},
{
"key": "horse_scale",
"value": "critical",
"description": "Horseback Riding Difficulty"
},
{
"key": "horse_scale",
"value": "dangerous",
"description": "Horseback Riding Difficulty"
},
{
"key": "horse_scale",
"value": "impossible",
"description": "Horseback Riding Difficulty"
},
{
"key": "amenity",
"value": "stables",
"description": "Riding Stable"
},
{
"key": "iata",
"description": "IATA"
@@ -9634,11 +9683,6 @@
"key": "note",
"description": "Note"
},
{
"key": "oneway",
"value": "undefined",
"description": "One Way"
},
{
"key": "oneway",
"value": "yes",

40
dist/locales/en.json vendored
View File

@@ -1785,6 +1785,9 @@
"display": {
"label": "Display"
},
"distance": {
"label": "Total Distance"
},
"dock": {
"label": "Type"
},
@@ -1939,6 +1942,39 @@
"label": "Hoops",
"placeholder": "1, 2, 4..."
},
"horse_dressage": {
"label": "Dressage Riding",
"options": {
"undefined": "No",
"equestrian": "Yes"
}
},
"horse_riding": {
"label": "Horseback Riding",
"options": {
"undefined": "No",
"horse_riding": "Yes"
}
},
"horse_scale": {
"label": "Horseback Riding Difficulty",
"placeholder": "Difficult, Dangerous...",
"options": {
"common": "Easy: No problems or difficulties. (default)",
"demanding": "Use with caution: Uneven way, occasional difficult passages.",
"difficult": "Difficult: Way narrow and exposed. May contain obstacles to step over and narrow passages.",
"critical": "Borderline: Passable only for experienced riders and horses. Major obstacles. Bridges should be examined carefully.",
"dangerous": "Dangerous: Passable only for very experienced riders and horses and only in good weather. Dismount.",
"impossible": "Impassable: Way or bridge not passable for horses. Too narrow, insuffient support, obstacles like ladders. Danger of life."
}
},
"horse_stables": {
"label": "Riding Stable",
"options": {
"undefined": "No",
"stables": "Yes"
}
},
"iata": {
"label": "IATA"
},
@@ -6288,6 +6324,10 @@
"name": "Theme Park",
"terms": ""
},
"tourism/trail_riding_station": {
"name": "Trail Riding Station",
"terms": ""
},
"tourism/viewpoint": {
"name": "Viewpoint",
"terms": ""