From e06ba3d1d765e280a894e968d33bc4c8c5b99a68 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Sat, 22 Dec 2018 12:27:49 -0500 Subject: [PATCH] Move racetracks to presets/leisure/track - add horse_racing.json (closes #5620) --- data/presets.yaml | 15 ++-- data/presets/presets.json | 3 +- .../presets/leisure/track/horse_racing.json | 25 +++++++ .../running.json} | 0 data/taginfo.json | 21 ++++-- dist/locales/en.json | 74 ++++++++++++++++--- 6 files changed, 115 insertions(+), 23 deletions(-) create mode 100644 data/presets/presets/leisure/track/horse_racing.json rename data/presets/presets/leisure/{running_track.json => track/running.json} (100%) diff --git a/data/presets.yaml b/data/presets.yaml index f6b2138d0..6a033d252 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -4674,11 +4674,6 @@ en: # leisure=resort name: Resort terms: '' - leisure/running_track: - # 'leisure=track, sport=running' - name: Racetrack (Running) - # 'terms: race*,running,sprint,track' - terms: '' leisure/sauna: # leisure=sauna name: Sauna @@ -4711,6 +4706,16 @@ en: name: Racetrack (Non-Motorsport) # 'terms: cycle,dog,greyhound,horse,race*,track' terms: '' + leisure/track/horse_racing: + # 'leisure=track, sport=horse_racing' + name: Racetrack (Horse Racing) + # 'terms: race*,horse,track' + terms: '' + leisure/track/running: + # 'leisure=track, sport=running' + name: Racetrack (Running) + # 'terms: race*,running,sprint,track' + terms: '' leisure/water_park: # leisure=water_park name: Water Park diff --git a/data/presets/presets.json b/data/presets/presets.json index a46eff7b5..166265ca9 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -578,7 +578,6 @@ "leisure/pitch/volleyball": {"icon": "maki-volleyball", "fields": ["name", "surface", "lit"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "volleyball"}, "reference": {"key": "sport", "value": "volleyball"}, "terms": [], "name": "Volleyball Court"}, "leisure/playground": {"icon": "maki-playground", "fields": ["name", "operator", "surface", "playground/max_age", "playground/min_age", "access_simple"], "geometry": ["point", "area"], "terms": ["jungle gym", "play area"], "tags": {"leisure": "playground"}, "name": "Playground"}, "leisure/resort": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "opening_hours"], "geometry": ["point", "area"], "tags": {"leisure": "resort"}, "name": "Resort"}, - "leisure/running_track": {"icon": "maki-pitch", "fields": ["surface", "sport_racing_nonmotor", "lit", "width", "lanes"], "geometry": ["point", "line", "area"], "tags": {"leisure": "track", "sport": "running"}, "terms": ["race*", "running", "sprint", "track"], "name": "Racetrack (Running)"}, "leisure/sauna": {"icon": "fas-thermometer-three-quarters", "fields": ["name", "operator", "address", "opening_hours", "access_simple", "fee"], "geometry": ["point", "area"], "tags": {"leisure": "sauna"}, "name": "Sauna"}, "leisure/slipway": {"icon": "maki-slipway", "fields": ["name", "access_simple", "fee"], "geometry": ["point", "vertex", "line"], "terms": ["boat launch", "boat ramp", "boat landing"], "tags": {"leisure": "slipway"}, "name": "Slipway"}, "leisure/sports_centre": {"icon": "maki-pitch", "fields": ["name", "sport", "building", "address", "opening_hours"], "geometry": ["point", "area"], "tags": {"leisure": "sports_centre"}, "terms": [], "name": "Sports Center / Complex"}, @@ -586,6 +585,8 @@ "leisure/stadium": {"icon": "maki-pitch", "fields": ["name", "sport", "address"], "geometry": ["point", "area"], "tags": {"leisure": "stadium"}, "name": "Stadium"}, "leisure/swimming_pool": {"icon": "maki-swimming", "fields": ["name", "access_simple", "operator", "address", "lit", "location_pool", "length", "swimming_pool"], "geometry": ["point", "area"], "terms": ["dive", "water", "aquatics"], "tags": {"leisure": "swimming_pool"}, "name": "Swimming Pool"}, "leisure/track": {"icon": "iD-highway-road", "fields": ["surface", "sport_racing_nonmotor", "lit", "width", "lanes"], "geometry": ["point", "line", "area"], "tags": {"leisure": "track"}, "terms": ["cycle", "dog", "greyhound", "horse", "race*", "track"], "name": "Racetrack (Non-Motorsport)"}, + "leisure/track/horse_racing": {"icon": "maki-horse-riding", "fields": ["surface", "sport_racing_nonmotor", "lit", "width", "lanes"], "geometry": ["point", "line", "area"], "tags": {"leisure": "track", "sport": "horse_racing"}, "terms": ["race*", "horse", "track"], "name": "Racetrack (Horse Racing)"}, + "leisure/track/running": {"icon": "maki-pitch", "fields": ["surface", "sport_racing_nonmotor", "lit", "width", "lanes"], "geometry": ["point", "line", "area"], "tags": {"leisure": "track", "sport": "running"}, "terms": ["race*", "running", "sprint", "track"], "name": "Racetrack (Running)"}, "leisure/water_park": {"icon": "maki-swimming", "fields": ["name", "operator", "address"], "geometry": ["point", "area"], "terms": ["swim", "pool", "dive"], "tags": {"leisure": "water_park"}, "name": "Water Park"}, "line": {"fields": ["name"], "geometry": ["line"], "tags": {}, "name": "Line", "matchScore": 0.1}, "man_made": {"icon": "temaki-storage_tank", "fields": ["name", "man_made"], "geometry": ["point", "vertex", "line", "area"], "tags": {"man_made": "*"}, "name": "Man Made"}, diff --git a/data/presets/presets/leisure/track/horse_racing.json b/data/presets/presets/leisure/track/horse_racing.json new file mode 100644 index 000000000..6801993c8 --- /dev/null +++ b/data/presets/presets/leisure/track/horse_racing.json @@ -0,0 +1,25 @@ +{ + "icon": "maki-horse-riding", + "fields": [ + "surface", + "sport_racing_nonmotor", + "lit", + "width", + "lanes" + ], + "geometry": [ + "point", + "line", + "area" + ], + "tags": { + "leisure": "track", + "sport": "horse_racing" + }, + "terms": [ + "race*", + "horse", + "track" + ], + "name": "Racetrack (Horse Racing)" +} diff --git a/data/presets/presets/leisure/running_track.json b/data/presets/presets/leisure/track/running.json similarity index 100% rename from data/presets/presets/leisure/running_track.json rename to data/presets/presets/leisure/track/running.json diff --git a/data/taginfo.json b/data/taginfo.json index c76bf847f..22e6bf284 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -3876,13 +3876,6 @@ "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/lodging-15.svg?sanitize=true" }, - { - "key": "sport", - "value": "running", - "description": "🄿 Racetrack (Running)", - "object_types": ["node", "way", "area"], - "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/pitch-15.svg?sanitize=true" - }, { "key": "leisure", "value": "sauna", @@ -3932,6 +3925,20 @@ "object_types": ["node", "way", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-road.svg?sanitize=true" }, + { + "key": "sport", + "value": "horse_racing", + "description": "🄿 Racetrack (Horse Racing)", + "object_types": ["node", "way", "area"], + "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/horse-riding-15.svg?sanitize=true" + }, + { + "key": "sport", + "value": "running", + "description": "🄿 Racetrack (Running)", + "object_types": ["node", "way", "area"], + "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/pitch-15.svg?sanitize=true" + }, { "key": "leisure", "value": "water_park", diff --git a/dist/locales/en.json b/dist/locales/en.json index da3671d75..193b3ff19 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -5531,10 +5531,6 @@ "name": "Resort", "terms": "" }, - "leisure/running_track": { - "name": "Racetrack (Running)", - "terms": "race*,running,sprint,track" - }, "leisure/sauna": { "name": "Sauna", "terms": "" @@ -5563,6 +5559,14 @@ "name": "Racetrack (Non-Motorsport)", "terms": "cycle,dog,greyhound,horse,race*,track" }, + "leisure/track/horse_racing": { + "name": "Racetrack (Horse Racing)", + "terms": "race*,horse,track" + }, + "leisure/track/running": { + "name": "Racetrack (Running)", + "terms": "race*,running,sprint,track" + }, "leisure/water_park": { "name": "Water Park", "terms": "swim,pool,dive" @@ -7568,9 +7572,6 @@ "SPW_PICC": { "name": "SPW(allonie) PICC numerical imagery" }, - "US-TIGER-Roads-2012": { - "name": "TIGER Roads 2012" - }, "US-TIGER-Roads-2014": { "description": "At zoom level 16+, public domain map data from the US Census. At lower zooms, only changes since 2006 minus changes already incorporated into OpenStreetMap", "name": "TIGER Roads 2014" @@ -7579,6 +7580,10 @@ "description": "Yellow = Public domain map data from the US Census. Red = Data not found in OpenStreetMap", "name": "TIGER Roads 2017" }, + "US-TIGER-Roads-2018": { + "description": "Yellow = Public domain map data from the US Census. Red = Data not found in OpenStreetMap", + "name": "TIGER Roads 2018" + }, "US_Forest_Service_roads_overlay": { "description": "Highway: Green casing = unclassified. Brown casing = track. Surface: gravel = light brown fill, Asphalt = black, paved = gray, ground =white, concrete = blue, grass = green. Seasonal = white bars", "name": "U.S. Forest Roads Overlay" @@ -7595,6 +7600,12 @@ }, "name": "UrbIS-Ortho 2017" }, + "UrbISOrtho2018": { + "attribution": { + "text": "Realized by means of Brussels UrbIS®© - Distribution & Copyright CIRB" + }, + "name": "UrbIS-Ortho 2018" + }, "UrbisAdmFR": { "attribution": { "text": "Realized by means of Brussels UrbIS®© - Distribution & Copyright CIRB" @@ -7679,11 +7690,33 @@ "description": "Japan GSI Standard Map. Widely covered.", "name": "Japan GSI Standard Map" }, - "hike_n_bike": { + "helsingborg-orto": { "attribution": { - "text": "© OpenStreetMap contributors" + "text": "© Helsingborg municipality" }, - "name": "Hike & Bike" + "description": "Orthophotos from the municipality of Helsingborg 2016, public domain", + "name": "Helsingborg Orthophoto" + }, + "kalmar-orto-2014": { + "attribution": { + "text": "© Kalmar municipality" + }, + "description": "Orthophotos for the north coast of the municipality of Kalmar 2014", + "name": "Kalmar North Orthophoto 2014" + }, + "kalmar-orto-2016": { + "attribution": { + "text": "© Kalmar municipality" + }, + "description": "Orthophotos for the south coast of the municipality of Kalmar 2016", + "name": "Kalmar South Orthophoto 2016" + }, + "kalmar-orto-2018": { + "attribution": { + "text": "© Kalmar municipality" + }, + "description": "Orthophotos for urban areas of the municipality of Kalmar 2018", + "name": "Kalmar Urban Orthophoto 2018" }, "kelkkareitit": { "attribution": { @@ -7706,6 +7739,20 @@ "description": "Mosaic of Swedish orthophotos from the period 1970–1980. Is under construction.", "name": "Lantmäteriet Historic Orthophoto 1975" }, + "lantmateriet-topowebb": { + "attribution": { + "text": "© Lantmäteriet, CC0" + }, + "description": "Topographic map of Sweden 1:50 000", + "name": "Lantmäteriet Topographic Map" + }, + "linkoping-orto": { + "attribution": { + "text": "© Linköping municipality" + }, + "description": "Orthophotos from the municipality of Linköping 2010, open data", + "name": "Linköping Orthophoto" + }, "mapbox_locator_overlay": { "attribution": { "text": "Terms & Feedback" @@ -7770,6 +7817,13 @@ }, "name": "Stamen Terrain" }, + "stockholm-orto": { + "attribution": { + "text": "© Stockholm municipality, CC0" + }, + "description": "Orthophotos from the municipality of Stockholm 2015, CC0 license", + "name": "Stockholm Orthophoto" + }, "tf-cycle": { "attribution": { "text": "Maps © Thunderforest, Data © OpenStreetMap contributors"