diff --git a/data/presets/presets.json b/data/presets/presets.json index 62e881f36..3383688be 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -873,7 +873,7 @@ "tourism/alpine_hut": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "terms": ["climbing hut"], "tags": {"tourism": "alpine_hut"}, "name": "Alpine Hut"}, "tourism/apartment": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "smoking", "rooms", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"tourism": "apartment"}, "name": "Guest Apartment / Condo"}, "tourism/aquarium": {"icon": "maki-aquarium", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "terms": ["fish", "sea", "water"], "tags": {"tourism": "aquarium"}, "name": "Aquarium"}, - "tourism/artwork": {"icon": "maki-art-gallery", "fields": ["name", "artwork_type", "artist"], "geometry": ["point", "vertex", "area"], "tags": {"tourism": "artwork"}, "terms": ["mural", "sculpture", "statue"], "name": "Artwork"}, + "tourism/artwork": {"icon": "maki-art-gallery", "fields": ["name", "artwork_type", "artist"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork"}, "terms": ["mural", "sculpture", "statue"], "name": "Artwork"}, "tourism/attraction": {"icon": "maki-star", "fields": ["name", "operator", "address"], "geometry": ["point", "vertex", "area"], "tags": {"tourism": "attraction"}, "name": "Tourist Attraction"}, "tourism/camp_site": {"icon": "maki-campsite", "fields": ["name", "operator", "address", "capacity", "fee", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "vertex", "area"], "terms": ["tent", "rv"], "tags": {"tourism": "camp_site"}, "name": "Campground"}, "tourism/caravan_site": {"icon": "maki-bus", "fields": ["name", "operator", "address", "capacity", "fee", "sanitary_dump_station", "power_supply", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "vertex", "area"], "terms": ["Motor Home", "Camper"], "tags": {"tourism": "caravan_site"}, "name": "RV Park"}, diff --git a/data/presets/presets/tourism/artwork.json b/data/presets/presets/tourism/artwork.json index 996acdb58..324da79fb 100644 --- a/data/presets/presets/tourism/artwork.json +++ b/data/presets/presets/tourism/artwork.json @@ -8,6 +8,7 @@ "geometry": [ "point", "vertex", + "line", "area" ], "tags": { diff --git a/data/taginfo.json b/data/taginfo.json index 50d522098..00b2208d5 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -5717,7 +5717,7 @@ "key": "tourism", "value": "artwork", "description": "Artwork", - "object_types": ["node", "area"], + "object_types": ["node", "way", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/art-gallery-15.svg?sanitize=true" }, { diff --git a/dist/locales/en.json b/dist/locales/en.json index ea2058f79..8da3b8df6 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -6931,6 +6931,27 @@ }, "name": "Hike & Bike" }, + "kelkkareitit": { + "attribution": { + "text": "© Kelkkareitit.fi" + }, + "description": "Kelkkareitit.fi snowmobile trails from OSM (Nordic coverage)", + "name": "Nordic snowmobile overlay" + }, + "lantmateriet-orto1960": { + "attribution": { + "text": "© Lantmäteriet, CC0" + }, + "description": "Mosaic of Swedish orthophotos from the period 1949-1970.", + "name": "Lantmäteriet Historic Orthophoto 1960" + }, + "lantmateriet-orto1975": { + "attribution": { + "text": "© Lantmäteriet, CC0" + }, + "description": "Mosaic of Swedish orthophotos from the period 1970-1980. To be expanded.", + "name": "Lantmäteriet Historic Orthophoto 1975" + }, "mapbox_locator_overlay": { "attribution": { "text": "Terms & Feedback" @@ -6968,7 +6989,7 @@ "text": "© Lantmäteriet" }, "description": "Scan of ´Economic maps´ ca 1950-1980", - "name": "Lantmäteriet Economic Map (historic)" + "name": "Lantmäteriet Economic Map ca 1950-1980" }, "qa_no_address": { "attribution": { @@ -6982,6 +7003,13 @@ }, "name": "skobbler" }, + "skoterleder": { + "attribution": { + "text": "© Skoterleder.org" + }, + "description": "Snowmobile trails", + "name": "Snowmobile map Sweden" + }, "stamen-terrain-background": { "attribution": { "text": "Map tiles by Stamen Design, under CC BY 3.0. Data by OpenStreetMap, under ODbL" diff --git a/modules/validations/tag_suggests_area.js b/modules/validations/tag_suggests_area.js index 20b4a402c..a631f4a79 100644 --- a/modules/validations/tag_suggests_area.js +++ b/modules/validations/tag_suggests_area.js @@ -12,7 +12,11 @@ export function validationTagSuggestsArea() { var presence = ['landuse', 'amenities', 'tourism', 'shop']; for (var i = 0; i < presence.length; i++) { if (tags[presence[i]] !== undefined) { - return presence[i] + '=' + tags[presence[i]]; + if (presence[i] === 'tourism' && tags[presence[i]] === 'artwork') { + continue; // exception for tourism=artwork - #5206 + } else { + return presence[i] + '=' + tags[presence[i]]; + } } }