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

Make racetrack presets more coherent, update racing sport fields

Browse Source
This commit is contained in:
Bryan Housel
2017-03-17 13:52:13 -04:00
parent ea2a1e10b1
commit c7764c1c11
10 changed files with 117 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/presets.yaml
+13 -8
View File
@@ -1144,10 +1144,13 @@ en:
label: Sports
sport_ice:
# sport=*
label: Sport
sport_racing:
label: Sports
sport_racing_motor:
# sport=*
label: Sport
label: Sports
sport_racing_nonmotor:
# sport=*
label: Sports
stars:
# stars=*
label: Stars
@@ -2601,9 +2604,9 @@ en:
terms: '<translate with synonyms or related terms for ''Primary Link'', separated by commas>'
highway/raceway:
# highway=raceway
name: Motor Raceway
# 'terms: auto*,race*,nascar'
terms: '<translate with synonyms or related terms for ''Motor Raceway'', separated by commas>'
name: Racetrack (Motorsport)
# 'terms: auto*,formula one,kart,motocross,nascar,race*,track'
terms: '<translate with synonyms or related terms for ''Racetrack (Motorsport)'', separated by commas>'
highway/residential:
# highway=residential
name: Residential Road
@@ -3105,8 +3108,9 @@ en:
terms: '<translate with synonyms or related terms for ''Resort'', separated by commas>'
leisure/running_track:
# 'leisure=track, sport=running'
name: Running Track
terms: '<translate with synonyms or related terms for ''Running Track'', separated by commas>'
name: Racetrack (Running)
# 'terms: race*,running,sprint,track'
terms: '<translate with synonyms or related terms for ''Racetrack (Running)'', separated by commas>'
leisure/slipway:
# leisure=slipway
name: Slipway
@@ -3133,6 +3137,7 @@ en:
leisure/track:
# leisure=track
name: Racetrack (Non-Motorsport)
# 'terms: cycle,dog,greyhound,horse,race*,track'
terms: '<translate with synonyms or related terms for ''Racetrack (Non-Motorsport)'', separated by commas>'
leisure/water_park:
# leisure=water_park
data/presets/fields.json
+16 -8
View File
@@ -1518,8 +1518,8 @@
},
"sport_ice": {
"key": "sport",
"type": "combo",
"label": "Sport",
"type": "semiCombo",
"label": "Sports",
"options": [
"skating",
"hockey",
@@ -1528,17 +1528,25 @@
"ice_stock"
]
},
"sport_racing": {
"sport_racing_motor": {
"key": "sport",
"type": "combo",
"label": "Sport",
"type": "semiCombo",
"label": "Sports",
"options": [
"motor",
"karting",
"motocross"
]
},
"sport_racing_nonmotor": {
"key": "sport",
"type": "semiCombo",
"label": "Sports",
"options": [
"bmx",
"cycling",
"dog_racing",
"horse_racing",
"karting",
"motor",
"motocross",
"running"
]
},
data/presets/fields/sport_ice.json
+2 -2
View File
@@ -1,7 +1,7 @@
{
"key": "sport",
"type": "combo",
"label": "Sport",
"type": "semiCombo",
"label": "Sports",
"options": [
"skating",
"hockey",
data/presets/fields/sport_racing_motor.json
+10
View File
@@ -0,0 +1,10 @@
{
"key": "sport",
"type": "semiCombo",
"label": "Sports",
"options": [
"motor",
"karting",
"motocross"
]
}
data/presets/fields/sport_racing.json → data/presets/fields/sport_racing_nonmotor.json
+3 -5
View File
@@ -1,14 +1,12 @@
{
"key": "sport",
"type": "combo",
"label": "Sport",
"type": "semiCombo",
"label": "Sports",
"options": [
"bmx",
"cycling",
"dog_racing",
"horse_racing",
"karting",
"motor",
"motocross",
"running"
]
}
data/presets/presets.json
+31 -8
View File
@@ -5437,11 +5437,16 @@
"fields": [
"oneway",
"surface",
"sport_racing",
"structure"
"sport_racing_motor",
"structure",
"lit",
"width",
"lanes"
],
"geometry": [
"line"
"point",
"line",
"area"
],
"tags": {
"highway": "raceway"
@@ -5452,10 +5457,14 @@
},
"terms": [
"auto*",
"formula one",
"kart",
"motocross",
"nascar",
"race*",
"nascar"
"track"
],
"name": "Motor Raceway"
"name": "Racetrack (Motorsport)"
},
"highway/residential": {
"icon": "highway-residential",
@@ -7590,7 +7599,7 @@
"icon": "pitch",
"fields": [
"surface",
"sport_racing",
"sport_racing_nonmotor",
"lit",
"width",
"lanes"
@@ -7604,7 +7613,13 @@
"leisure": "track",
"sport": "running"
},
"name": "Running Track"
"terms": [
"race*",
"running",
"sprint",
"track"
],
"name": "Racetrack (Running)"
},
"leisure/slipway": {
"icon": "poi-beach",
@@ -7700,7 +7715,7 @@
"icon": "highway-road",
"fields": [
"surface",
"sport_racing",
"sport_racing_nonmotor",
"lit",
"width",
"lanes"
@@ -7713,6 +7728,14 @@
"tags": {
"leisure": "track"
},
"terms": [
"cycle",
"dog",
"greyhound",
"horse",
"race*",
"track"
],
"name": "Racetrack (Non-Motorsport)"
},
"leisure/water_park": {
data/presets/presets/highway/raceway.json
+14 -5
View File
@@ -3,11 +3,16 @@
"fields": [
"oneway",
"surface",
"sport_racing",
"structure"
"sport_racing_motor",
"structure",
"lit",
"width",
"lanes"
],
"geometry": [
"line"
"point",
"line",
"area"
],
"tags": {
"highway": "raceway"
@@ -18,8 +23,12 @@
},
"terms": [
"auto*",
"formula one",
"kart",
"motocross",
"nascar",
"race*",
"nascar"
"track"
],
"name": "Motor Raceway"
"name": "Racetrack (Motorsport)"
}
data/presets/presets/leisure/running_track.json
+8 -2
View File
@@ -2,7 +2,7 @@
"icon": "pitch",
"fields": [
"surface",
"sport_racing",
"sport_racing_nonmotor",
"lit",
"width",
"lanes"
@@ -16,5 +16,11 @@
"leisure": "track",
"sport": "running"
},
"name": "Running Track"
"terms": [
"race*",
"running",
"sprint",
"track"
],
"name": "Racetrack (Running)"
}
data/presets/presets/leisure/track.json
+9 -1
View File
@@ -2,7 +2,7 @@
"icon": "highway-road",
"fields": [
"surface",
"sport_racing",
"sport_racing_nonmotor",
"lit",
"width",
"lanes"
@@ -15,5 +15,13 @@
"tags": {
"leisure": "track"
},
"terms": [
"cycle",
"dog",
"greyhound",
"horse",
"race*",
"track"
],
"name": "Racetrack (Non-Motorsport)"
}
dist/locales/en.json
Vendored
+11 -8
View File
@@ -1698,10 +1698,13 @@
"label": "Source"
},
"sport_ice": {
"label": "Sport"
"label": "Sports"
},
"sport_racing": {
"label": "Sport"
"sport_racing_motor": {
"label": "Sports"
},
"sport_racing_nonmotor": {
"label": "Sports"
},
"sport": {
"label": "Sports"
@@ -3040,8 +3043,8 @@
"terms": ""
},
"highway/raceway": {
"name": "Motor Raceway",
"terms": "auto*,race*,nascar"
"name": "Racetrack (Motorsport)",
"terms": "auto*,formula one,kart,motocross,nascar,race*,track"
},
"highway/residential": {
"name": "Residential Road",
@@ -3488,8 +3491,8 @@
"terms": ""
},
"leisure/running_track": {
"name": "Running Track",
"terms": ""
"name": "Racetrack (Running)",
"terms": "race*,running,sprint,track"
},
"leisure/slipway": {
"name": "Slipway",
@@ -3513,7 +3516,7 @@
},
"leisure/track": {
"name": "Racetrack (Non-Motorsport)",
"terms": ""
"terms": "cycle,dog,greyhound,horse,race*,track"
},
"leisure/water_park": {
"name": "Water Park",