From 2ddb011d099e87359fe20bf782bd139af30fae45 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Sat, 15 Sep 2018 16:34:36 -0700 Subject: [PATCH] Adds Sculpture, Statue, and Mural presets Adds a universal Material field --- data/presets.yaml | 18 ++++++++++++++ data/presets/fields.json | 1 + data/presets/fields/material.json | 6 +++++ data/presets/presets.json | 3 +++ .../presets/tourism/artwork/mural.json | 22 +++++++++++++++++ .../presets/tourism/artwork/sculpture.json | 24 +++++++++++++++++++ .../presets/tourism/artwork/statue.json | 24 +++++++++++++++++++ data/taginfo.json | 22 +++++++++++++++++ dist/locales/en.json | 15 ++++++++++++ 9 files changed, 135 insertions(+) create mode 100644 data/presets/fields/material.json create mode 100644 data/presets/presets/tourism/artwork/mural.json create mode 100644 data/presets/presets/tourism/artwork/sculpture.json create mode 100644 data/presets/presets/tourism/artwork/statue.json diff --git a/data/presets.yaml b/data/presets.yaml index e26d7c53f..fecb332d4 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -895,6 +895,9 @@ en: map_type: # map_type=* label: Type + material: + # material=* + label: Material maxheight: # maxheight=* label: Max Height @@ -5896,6 +5899,21 @@ en: name: Artwork # 'terms: mural,sculpture,statue' terms: '' + tourism/artwork/mural: + # 'tourism=artwork, artwork_type=mural' + name: Mural + # 'terms: fresco,wall painting' + terms: '' + tourism/artwork/sculpture: + # 'tourism=artwork, artwork_type=sculpture' + name: Sculpture + # 'terms: statue,figure,carving' + terms: '' + tourism/artwork/statue: + # 'tourism=artwork, artwork_type=statue' + name: Statue + # 'terms: sculpture,figure,carving' + terms: '' tourism/attraction: # tourism=attraction name: Tourist Attraction diff --git a/data/presets/fields.json b/data/presets/fields.json index dbba6487e..f5adb4fa5 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -162,6 +162,7 @@ "manhole": {"key": "manhole", "type": "typeCombo", "label": "Type"}, "map_size": {"key": "map_size", "type": "typeCombo", "label": "Coverage"}, "map_type": {"key": "map_type", "type": "typeCombo", "label": "Type"}, + "material": {"key": "material", "type": "combo", "universal": true, "label": "Material"}, "maxheight": {"key": "maxheight", "type": "combo", "label": "Max Height", "placeholder": "4, 4.5, 5, 14'0\", 14'6\", 15'0\"", "snake_case": false}, "maxspeed": {"key": "maxspeed", "type": "maxspeed", "label": "Speed Limit", "placeholder": "40, 50, 60..."}, "maxspeed/advisory": {"key": "maxspeed:advisory", "type": "maxspeed", "label": "Advisory Speed Limit", "placeholder": "40, 50, 60..."}, diff --git a/data/presets/fields/material.json b/data/presets/fields/material.json new file mode 100644 index 000000000..d51fa1aac --- /dev/null +++ b/data/presets/fields/material.json @@ -0,0 +1,6 @@ +{ + "key": "material", + "type": "combo", + "universal": true, + "label": "Material" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index 303469479..75e11c328 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -891,6 +891,9 @@ "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", "line", "area"], "tags": {"tourism": "artwork"}, "terms": ["mural", "sculpture", "statue"], "name": "Artwork"}, + "tourism/artwork/mural": {"icon": "maki-art-gallery", "fields": ["name", "artist"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork", "artwork_type": "mural"}, "terms": ["fresco", "wall painting"], "name": "Mural"}, + "tourism/artwork/sculpture": {"icon": "maki-art-gallery", "fields": ["name", "artist", "material"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork", "artwork_type": "sculpture"}, "terms": ["statue", "figure", "carving"], "name": "Sculpture"}, + "tourism/artwork/statue": {"icon": "maki-art-gallery", "fields": ["name", "artist", "material"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork", "artwork_type": "statue"}, "terms": ["sculpture", "figure", "carving"], "name": "Statue"}, "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", "access_simple", "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/mural.json b/data/presets/presets/tourism/artwork/mural.json new file mode 100644 index 000000000..c22482776 --- /dev/null +++ b/data/presets/presets/tourism/artwork/mural.json @@ -0,0 +1,22 @@ +{ + "icon": "maki-art-gallery", + "fields": [ + "name", + "artist" + ], + "geometry": [ + "point", + "vertex", + "line", + "area" + ], + "tags": { + "tourism": "artwork", + "artwork_type": "mural" + }, + "terms": [ + "fresco", + "wall painting" + ], + "name": "Mural" +} diff --git a/data/presets/presets/tourism/artwork/sculpture.json b/data/presets/presets/tourism/artwork/sculpture.json new file mode 100644 index 000000000..fbad11c4a --- /dev/null +++ b/data/presets/presets/tourism/artwork/sculpture.json @@ -0,0 +1,24 @@ +{ + "icon": "maki-art-gallery", + "fields": [ + "name", + "artist", + "material" + ], + "geometry": [ + "point", + "vertex", + "line", + "area" + ], + "tags": { + "tourism": "artwork", + "artwork_type": "sculpture" + }, + "terms": [ + "statue", + "figure", + "carving" + ], + "name": "Sculpture" +} diff --git a/data/presets/presets/tourism/artwork/statue.json b/data/presets/presets/tourism/artwork/statue.json new file mode 100644 index 000000000..9ae8f2d97 --- /dev/null +++ b/data/presets/presets/tourism/artwork/statue.json @@ -0,0 +1,24 @@ +{ + "icon": "maki-art-gallery", + "fields": [ + "name", + "artist", + "material" + ], + "geometry": [ + "point", + "vertex", + "line", + "area" + ], + "tags": { + "tourism": "artwork", + "artwork_type": "statue" + }, + "terms": [ + "sculpture", + "figure", + "carving" + ], + "name": "Statue" +} diff --git a/data/taginfo.json b/data/taginfo.json index 166e9e314..13fbcd418 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -5836,6 +5836,27 @@ "object_types": ["node", "way", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/art-gallery-15.svg?sanitize=true" }, + { + "key": "artwork_type", + "value": "mural", + "description": "Mural", + "object_types": ["node", "way", "area"], + "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/art-gallery-15.svg?sanitize=true" + }, + { + "key": "artwork_type", + "value": "sculpture", + "description": "Sculpture", + "object_types": ["node", "way", "area"], + "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/art-gallery-15.svg?sanitize=true" + }, + { + "key": "artwork_type", + "value": "statue", + "description": "Statue", + "object_types": ["node", "way", "area"], + "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/art-gallery-15.svg?sanitize=true" + }, { "key": "tourism", "value": "attraction", @@ -6766,6 +6787,7 @@ {"key": "location", "description": "Location"}, {"key": "map_size", "description": "Coverage"}, {"key": "map_type", "description": "Type"}, + {"key": "material", "description": "Material"}, {"key": "maxheight", "description": "Max Height"}, {"key": "maxspeed", "description": "Speed Limit"}, {"key": "maxspeed:advisory", "description": "Advisory Speed Limit"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 61a0c74ed..e20f6e26a 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -2227,6 +2227,9 @@ "map_type": { "label": "Type" }, + "material": { + "label": "Material" + }, "maxheight": { "label": "Max Height", "placeholder": "4, 4.5, 5, 14'0\", 14'6\", 15'0\"" @@ -6591,6 +6594,18 @@ "name": "Artwork", "terms": "mural,sculpture,statue" }, + "tourism/artwork/mural": { + "name": "Mural", + "terms": "fresco,wall painting" + }, + "tourism/artwork/sculpture": { + "name": "Sculpture", + "terms": "statue,figure,carving" + }, + "tourism/artwork/statue": { + "name": "Statue", + "terms": "sculpture,figure,carving" + }, "tourism/attraction": { "name": "Tourist Attraction", "terms": ""