From e7c57f9e6f69c0d55e5f9fd4ac5c4bea00170906 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Sat, 8 Sep 2018 10:38:09 -0700 Subject: [PATCH 01/11] Adds a Shipwreck preset for the historic=wreck tag Adds wreck Category, Date Sunk, and Visible at High/Low Tide fields --- data/presets.yaml | 17 +++++++++ data/presets/fields.json | 4 +++ .../fields/historic/wreck/date_sunk.json | 5 +++ .../historic/wreck/visible_at_high_tide.json | 5 +++ .../historic/wreck/visible_at_low_tide.json | 5 +++ .../fields/seamark/wreck/category.json | 5 +++ data/presets/presets.json | 1 + data/presets/presets/historic/wreck.json | 35 +++++++++++++++++++ data/taginfo.json | 14 ++++++++ dist/locales/en.json | 16 +++++++++ 10 files changed, 107 insertions(+) create mode 100644 data/presets/fields/historic/wreck/date_sunk.json create mode 100644 data/presets/fields/historic/wreck/visible_at_high_tide.json create mode 100644 data/presets/fields/historic/wreck/visible_at_low_tide.json create mode 100644 data/presets/fields/seamark/wreck/category.json create mode 100644 data/presets/presets/historic/wreck.json diff --git a/data/presets.yaml b/data/presets.yaml index e26d7c53f..20a74d3cd 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -681,6 +681,15 @@ en: historic/civilization: # 'historic:civilization=*' label: Historic Civilization + historic/wreck/date_sunk: + # 'wreck:date_sunk=*' + label: Date Sunk + historic/wreck/visible_at_high_tide: + # 'wreck:visible_at_high_tide=*' + label: Visible At High Tide + historic/wreck/visible_at_low_tide: + # 'wreck:visible_at_low_tide=*' + label: Visible At Low Tide hoops: # hoops=* label: Hoops @@ -1425,6 +1434,9 @@ en: seamark/type: # 'seamark:type=*' label: Seamark + seamark/wreck/category: + # 'seamark:wreck:category=*' + label: Category seasonal: # seasonal=* label: Seasonal @@ -3738,6 +3750,11 @@ en: # historic=wayside_shrine name: Wayside Shrine terms: '' + historic/wreck: + # historic=wreck + name: Shipwreck + # 'terms: hull,mast,maritime,remains,ship,boat' + terms: '' internet_access/wlan: # internet_access=wlan name: Wi-Fi Hotspot diff --git a/data/presets/fields.json b/data/presets/fields.json index dbba6487e..4935a015a 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -123,6 +123,9 @@ "highway": {"key": "highway", "type": "typeCombo", "label": "Type"}, "historic": {"key": "historic", "type": "typeCombo", "label": "Type"}, "historic/civilization": {"key": "historic:civilization", "type": "combo", "label": "Historic Civilization"}, + "historic/wreck/date_sunk": {"key": "wreck:date_sunk", "type": "text", "label": "Date Sunk"}, + "historic/wreck/visible_at_high_tide": {"key": "wreck:visible_at_high_tide", "type": "check", "label": "Visible At High Tide"}, + "historic/wreck/visible_at_low_tide": {"key": "wreck:visible_at_low_tide", "type": "check", "label": "Visible At Low Tide"}, "hoops": {"key": "hoops", "type": "number", "minValue": 0, "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"}}, @@ -243,6 +246,7 @@ "seamark/buoy_lateral/system": {"key": "seamark:buoy_lateral:system", "type": "combo", "label": "System", "strings": {"options": {"iala-a": "IALA A", "iala-b": "IALA B", "cevni": "CEVNI", "other": "Other"}}}, "seamark/mooring/category": {"key": "seamark:mooring:category", "type": "combo", "label": "Category"}, "seamark/type": {"key": "seamark:type", "type": "combo", "universal": true, "label": "Seamark"}, + "seamark/wreck/category": {"key": "seamark:wreck:category", "type": "combo", "label": "Category"}, "seasonal": {"key": "seasonal", "type": "check", "label": "Seasonal"}, "second_hand": {"key": "second_hand", "type": "combo", "label": "Sells Used", "placeholder": "Yes, No, Only", "strings": {"options": {"yes": "Yes", "no": "No", "only": "Only"}}}, "service_rail": {"key": "service", "type": "combo", "label": "Service Type", "strings": {"options": {"spur": "Spur", "yard": "Yard", "siding": "Siding", "crossover": "Crossover"}}}, diff --git a/data/presets/fields/historic/wreck/date_sunk.json b/data/presets/fields/historic/wreck/date_sunk.json new file mode 100644 index 000000000..6c923c9b0 --- /dev/null +++ b/data/presets/fields/historic/wreck/date_sunk.json @@ -0,0 +1,5 @@ +{ + "key": "wreck:date_sunk", + "type": "text", + "label": "Date Sunk" +} diff --git a/data/presets/fields/historic/wreck/visible_at_high_tide.json b/data/presets/fields/historic/wreck/visible_at_high_tide.json new file mode 100644 index 000000000..c08287fef --- /dev/null +++ b/data/presets/fields/historic/wreck/visible_at_high_tide.json @@ -0,0 +1,5 @@ +{ + "key": "wreck:visible_at_high_tide", + "type": "check", + "label": "Visible At High Tide" +} diff --git a/data/presets/fields/historic/wreck/visible_at_low_tide.json b/data/presets/fields/historic/wreck/visible_at_low_tide.json new file mode 100644 index 000000000..2013fe6e3 --- /dev/null +++ b/data/presets/fields/historic/wreck/visible_at_low_tide.json @@ -0,0 +1,5 @@ +{ + "key": "wreck:visible_at_low_tide", + "type": "check", + "label": "Visible At Low Tide" +} diff --git a/data/presets/fields/seamark/wreck/category.json b/data/presets/fields/seamark/wreck/category.json new file mode 100644 index 000000000..6977bfa4d --- /dev/null +++ b/data/presets/fields/seamark/wreck/category.json @@ -0,0 +1,5 @@ +{ + "key": "seamark:wreck:category", + "type": "combo", + "label": "Category" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index 303469479..4d8497406 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -420,6 +420,7 @@ "historic/tomb": {"icon": "maki-cemetery", "fields": ["name", "tomb", "building_area", "inscription"], "geometry": ["point", "area"], "tags": {"historic": "tomb"}, "name": "Tomb"}, "historic/wayside_cross": {"icon": "maki-religious-christian", "fields": ["name", "inscription"], "geometry": ["point", "vertex", "area"], "tags": {"historic": "wayside_cross"}, "name": "Wayside Cross"}, "historic/wayside_shrine": {"icon": "maki-landmark", "fields": ["name", "religion", "denomination", "inscription"], "geometry": ["point", "vertex", "area"], "tags": {"historic": "wayside_shrine"}, "name": "Wayside Shrine"}, + "historic/wreck": {"icon": "temaki-ruins", "fields": ["name", "access_simple", "seamark/wreck/category", "historic/wreck/date_sunk", "historic/wreck/visible_at_low_tide", "historic/wreck/visible_at_high_tide"], "geometry": ["point", "area"], "tags": {"historic": "wreck"}, "addTags": {"historic": "wreck", "seamark:type": "wreck"}, "removeTags": {"historic": "wreck", "seamark:type": "wreck"}, "terms": ["hull", "mast", "maritime", "remains", "ship", "boat"], "name": "Shipwreck"}, "internet_access/wlan": {"icon": "fas-wifi", "geometry": ["point", "area"], "fields": ["internet_access/fee", "internet_access/ssid"], "terms": ["wi-fi", "wifi", "hotspot"], "tags": {"internet_access": "wlan"}, "name": "Wi-Fi Hotspot"}, "junction": {"icon": "temaki-junction", "fields": ["name"], "geometry": ["vertex", "area"], "tags": {"junction": "yes"}, "name": "Junction"}, "landuse": {"fields": ["name", "landuse"], "geometry": ["area"], "tags": {"landuse": "*"}, "matchScore": 0.9, "name": "Land Use"}, diff --git a/data/presets/presets/historic/wreck.json b/data/presets/presets/historic/wreck.json new file mode 100644 index 000000000..3038b2a94 --- /dev/null +++ b/data/presets/presets/historic/wreck.json @@ -0,0 +1,35 @@ +{ + "icon": "temaki-ruins", + "fields": [ + "name", + "access_simple", + "seamark/wreck/category", + "historic/wreck/date_sunk", + "historic/wreck/visible_at_low_tide", + "historic/wreck/visible_at_high_tide" + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "historic": "wreck" + }, + "addTags": { + "historic": "wreck", + "seamark:type": "wreck" + }, + "removeTags": { + "historic": "wreck", + "seamark:type": "wreck" + }, + "terms": [ + "hull", + "mast", + "maritime", + "remains", + "ship", + "boat" + ], + "name": "Shipwreck" +} diff --git a/data/taginfo.json b/data/taginfo.json index 166e9e314..8bb8e44c2 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -2823,6 +2823,13 @@ "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/landmark-15.svg?sanitize=true" }, + { + "key": "historic", + "value": "wreck", + "description": "Shipwreck", + "object_types": ["node", "area"], + "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/ruins.svg?sanitize=true" + }, { "key": "internet_access", "value": "wlan", @@ -6673,6 +6680,12 @@ {"key": "healthcare:speciality", "description": "Specialties"}, {"key": "height", "description": "Height (Meters)"}, {"key": "historic:civilization", "description": "Historic Civilization"}, + {"key": "wreck:date_sunk", "description": "Date Sunk"}, + { + "key": "wreck:visible_at_high_tide", + "description": "Visible At High Tide" + }, + {"key": "wreck:visible_at_low_tide", "description": "Visible At Low Tide"}, {"key": "hoops", "description": "Hoops"}, { "key": "horse_scale", @@ -7182,6 +7195,7 @@ "description": "System" }, {"key": "seamark:mooring:category", "description": "Category"}, + {"key": "seamark:wreck:category", "description": "Category"}, {"key": "seasonal", "description": "Seasonal"}, {"key": "second_hand", "value": "yes", "description": "Sells Used"}, {"key": "second_hand", "value": "no", "description": "Sells Used"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 61a0c74ed..e88194a78 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -2045,6 +2045,15 @@ "historic/civilization": { "label": "Historic Civilization" }, + "historic/wreck/date_sunk": { + "label": "Date Sunk" + }, + "historic/wreck/visible_at_high_tide": { + "label": "Visible At High Tide" + }, + "historic/wreck/visible_at_low_tide": { + "label": "Visible At Low Tide" + }, "hoops": { "label": "Hoops", "placeholder": "1, 2, 4..." @@ -2644,6 +2653,9 @@ "seamark/type": { "label": "Seamark" }, + "seamark/wreck/category": { + "label": "Category" + }, "seasonal": { "label": "Seasonal" }, @@ -4707,6 +4719,10 @@ "name": "Wayside Shrine", "terms": "" }, + "historic/wreck": { + "name": "Shipwreck", + "terms": "hull,mast,maritime,remains,ship,boat" + }, "internet_access/wlan": { "name": "Wi-Fi Hotspot", "terms": "wi-fi,wifi,hotspot" From 2ddb011d099e87359fe20bf782bd139af30fae45 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Sat, 15 Sep 2018 16:34:36 -0700 Subject: [PATCH 02/11] 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": "" From 6e7b34d39ab594c13bd4cddbf878c462ff9ef538 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Sun, 16 Sep 2018 20:26:41 -0700 Subject: [PATCH 03/11] Adds the Operator, Country, Lit, Height, and new Flag Type fields to the Flagpole preset --- data/presets.yaml | 3 +++ data/presets/fields.json | 1 + data/presets/fields/flag_type.json | 5 +++++ data/presets/presets.json | 2 +- data/presets/presets/man_made/flagpole.json | 7 +++++++ data/taginfo.json | 1 + dist/locales/en.json | 3 +++ 7 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 data/presets/fields/flag_type.json diff --git a/data/presets.yaml b/data/presets.yaml index e26d7c53f..59be78908 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -601,6 +601,9 @@ en: fixme: # fixme=* label: Fix Me + flag_type: + # 'flag:type=*' + label: Flag Type ford: # ford=* label: Type diff --git a/data/presets/fields.json b/data/presets/fields.json index dbba6487e..2295f12f5 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -102,6 +102,7 @@ "fireplace": {"key": "fireplace", "type": "check", "label": "Fireplace"}, "fitness_station": {"key": "fitness_station", "type": "typeCombo", "label": "Equipment Type"}, "fixme": {"key": "fixme", "type": "textarea", "label": "Fix Me", "universal": true}, + "flag_type": {"key": "flag:type", "type": "combo", "label": "Flag Type"}, "ford": {"key": "ford", "type": "typeCombo", "label": "Type", "placeholder": "Default"}, "frequency": {"key": "frequency", "type": "combo", "label": "Operating Frequency"}, "fuel_multi": {"key": "fuel:", "type": "multiCombo", "label": "Fuel Types"}, diff --git a/data/presets/fields/flag_type.json b/data/presets/fields/flag_type.json new file mode 100644 index 000000000..9f9978a49 --- /dev/null +++ b/data/presets/fields/flag_type.json @@ -0,0 +1,5 @@ +{ + "key": "flag:type", + "type": "combo", + "label": "Flag Type" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index 303469479..ad053bc94 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -544,7 +544,7 @@ "man_made/clearcut": {"icon": "maki-logging", "geometry": ["area"], "tags": {"man_made": "clearcut"}, "terms": ["cut", "forest", "lumber", "tree", "wood"], "name": "Clearcut Forest"}, "man_made/crane": {"icon": "temaki-crane", "fields": ["operator", "height", "crane/type"], "geometry": ["point", "line", "vertex", "area"], "tags": {"man_made": "crane"}, "name": "Crane"}, "man_made/cutline": {"icon": "maki-logging", "geometry": ["line"], "tags": {"man_made": "cutline"}, "name": "Cut line"}, - "man_made/flagpole": {"icon": "maki-embassy", "geometry": ["point"], "tags": {"man_made": "flagpole"}, "name": "Flagpole"}, + "man_made/flagpole": {"icon": "maki-embassy", "fields": ["operator", "flag_type", "country", "lit", "height"], "geometry": ["point"], "tags": {"man_made": "flagpole"}, "name": "Flagpole"}, "man_made/gasometer": {"icon": "temaki-storage_tank", "fields": ["content", "building_area"], "geometry": ["point", "area"], "terms": ["gas holder"], "tags": {"man_made": "gasometer"}, "name": "Gasometer"}, "man_made/groyne": {"geometry": ["line", "area"], "tags": {"man_made": "groyne"}, "name": "Groyne"}, "man_made/lighthouse": {"icon": "maki-lighthouse", "fields": ["building_area"], "geometry": ["point", "area"], "tags": {"man_made": "lighthouse"}, "name": "Lighthouse"}, diff --git a/data/presets/presets/man_made/flagpole.json b/data/presets/presets/man_made/flagpole.json index 19472e84d..f625581df 100644 --- a/data/presets/presets/man_made/flagpole.json +++ b/data/presets/presets/man_made/flagpole.json @@ -1,5 +1,12 @@ { "icon": "maki-embassy", + "fields": [ + "operator", + "flag_type", + "country", + "lit", + "height" + ], "geometry": [ "point" ], diff --git a/data/taginfo.json b/data/taginfo.json index 166e9e314..0aa2a0afb 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -6647,6 +6647,7 @@ {"key": "fireplace", "description": "Fireplace"}, {"key": "fitness_station", "description": "Equipment Type"}, {"key": "fixme", "description": "Fix Me"}, + {"key": "flag:type", "description": "Flag Type"}, {"key": "ford", "description": "Type"}, {"key": "frequency", "description": "Operating Frequency"}, {"key": "fuel:", "description": "Fuel Types"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 61a0c74ed..aaebd403d 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -1972,6 +1972,9 @@ "fixme": { "label": "Fix Me" }, + "flag_type": { + "label": "Flag Type" + }, "ford": { "label": "Type", "placeholder": "Default" From abdcf19773c7dbdcd24abd36e5b12e4da9b79a97 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Sun, 16 Sep 2018 20:32:43 -0700 Subject: [PATCH 04/11] Adds the vertex geometry type to the Flagpole preset --- data/presets/presets.json | 2 +- data/presets/presets/man_made/flagpole.json | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/data/presets/presets.json b/data/presets/presets.json index ad053bc94..16da6a61d 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -544,7 +544,7 @@ "man_made/clearcut": {"icon": "maki-logging", "geometry": ["area"], "tags": {"man_made": "clearcut"}, "terms": ["cut", "forest", "lumber", "tree", "wood"], "name": "Clearcut Forest"}, "man_made/crane": {"icon": "temaki-crane", "fields": ["operator", "height", "crane/type"], "geometry": ["point", "line", "vertex", "area"], "tags": {"man_made": "crane"}, "name": "Crane"}, "man_made/cutline": {"icon": "maki-logging", "geometry": ["line"], "tags": {"man_made": "cutline"}, "name": "Cut line"}, - "man_made/flagpole": {"icon": "maki-embassy", "fields": ["operator", "flag_type", "country", "lit", "height"], "geometry": ["point"], "tags": {"man_made": "flagpole"}, "name": "Flagpole"}, + "man_made/flagpole": {"icon": "maki-embassy", "fields": ["operator", "flag_type", "country", "lit", "height"], "geometry": ["point", "vertex"], "tags": {"man_made": "flagpole"}, "name": "Flagpole"}, "man_made/gasometer": {"icon": "temaki-storage_tank", "fields": ["content", "building_area"], "geometry": ["point", "area"], "terms": ["gas holder"], "tags": {"man_made": "gasometer"}, "name": "Gasometer"}, "man_made/groyne": {"geometry": ["line", "area"], "tags": {"man_made": "groyne"}, "name": "Groyne"}, "man_made/lighthouse": {"icon": "maki-lighthouse", "fields": ["building_area"], "geometry": ["point", "area"], "tags": {"man_made": "lighthouse"}, "name": "Lighthouse"}, diff --git a/data/presets/presets/man_made/flagpole.json b/data/presets/presets/man_made/flagpole.json index f625581df..06aaac079 100644 --- a/data/presets/presets/man_made/flagpole.json +++ b/data/presets/presets/man_made/flagpole.json @@ -8,7 +8,8 @@ "height" ], "geometry": [ - "point" + "point", + "vertex" ], "tags": { "man_made": "flagpole" From f8d6a302602f1730fbad5b94db3c02bf8ec6d19c Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Sun, 16 Sep 2018 08:06:51 +0000 Subject: [PATCH 05/11] chore(package): update rollup to version 0.66.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4ff210e6b..72409cb2c 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "osm-community-index": "0.4.7", "phantomjs-prebuilt": "~2.1.11", "request": "^2.85.0", - "rollup": "~0.65.0", + "rollup": "~0.66.0", "rollup-plugin-commonjs": "^9.0.0", "rollup-plugin-includepaths": "~0.2.3", "rollup-plugin-json": "^3.0.0", From 73e70ef6f4877601ed2b6e7d45728d1520769625 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Wed, 12 Sep 2018 20:48:40 +0000 Subject: [PATCH 06/11] fix(package): update lodash-es to version 4.17.11 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 72409cb2c..3f900b44d 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "@turf/bbox-clip": "^6.0.0", "diacritics": "1.3.0", "fast-json-stable-stringify": "2.0.0", - "lodash-es": "4.17.10", + "lodash-es": "4.17.11", "marked": "0.5.0", "martinez-polygon-clipping": "0.5.0", "node-diff3": "1.0.0", From 5b482d1ad45f9bcd0e796c3cefd4b5d0030af0fe Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Mon, 17 Sep 2018 16:44:21 -0700 Subject: [PATCH 07/11] Renames and moves flag_type.json preset field file to flag/type.json --- data/presets.yaml | 2 +- data/presets/fields.json | 2 +- data/presets/fields/{flag_type.json => flag/type.json} | 0 data/presets/presets.json | 2 +- data/presets/presets/man_made/flagpole.json | 2 +- dist/locales/en.json | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) rename data/presets/fields/{flag_type.json => flag/type.json} (100%) diff --git a/data/presets.yaml b/data/presets.yaml index ab91773a9..b53699769 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -601,7 +601,7 @@ en: fixme: # fixme=* label: Fix Me - flag_type: + flag/type: # 'flag:type=*' label: Flag Type ford: diff --git a/data/presets/fields.json b/data/presets/fields.json index db79b5b4d..4abeb8afc 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -102,7 +102,7 @@ "fireplace": {"key": "fireplace", "type": "check", "label": "Fireplace"}, "fitness_station": {"key": "fitness_station", "type": "typeCombo", "label": "Equipment Type"}, "fixme": {"key": "fixme", "type": "textarea", "label": "Fix Me", "universal": true}, - "flag_type": {"key": "flag:type", "type": "combo", "label": "Flag Type"}, + "flag/type": {"key": "flag:type", "type": "combo", "label": "Flag Type"}, "ford": {"key": "ford", "type": "typeCombo", "label": "Type", "placeholder": "Default"}, "frequency": {"key": "frequency", "type": "combo", "label": "Operating Frequency"}, "fuel_multi": {"key": "fuel:", "type": "multiCombo", "label": "Fuel Types"}, diff --git a/data/presets/fields/flag_type.json b/data/presets/fields/flag/type.json similarity index 100% rename from data/presets/fields/flag_type.json rename to data/presets/fields/flag/type.json diff --git a/data/presets/presets.json b/data/presets/presets.json index 4365dd31e..9e2d1cb92 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -545,7 +545,7 @@ "man_made/clearcut": {"icon": "maki-logging", "geometry": ["area"], "tags": {"man_made": "clearcut"}, "terms": ["cut", "forest", "lumber", "tree", "wood"], "name": "Clearcut Forest"}, "man_made/crane": {"icon": "temaki-crane", "fields": ["operator", "height", "crane/type"], "geometry": ["point", "line", "vertex", "area"], "tags": {"man_made": "crane"}, "name": "Crane"}, "man_made/cutline": {"icon": "maki-logging", "geometry": ["line"], "tags": {"man_made": "cutline"}, "name": "Cut line"}, - "man_made/flagpole": {"icon": "maki-embassy", "fields": ["operator", "flag_type", "country", "lit", "height"], "geometry": ["point", "vertex"], "tags": {"man_made": "flagpole"}, "name": "Flagpole"}, + "man_made/flagpole": {"icon": "maki-embassy", "fields": ["operator", "flag/type", "country", "lit", "height"], "geometry": ["point", "vertex"], "tags": {"man_made": "flagpole"}, "name": "Flagpole"}, "man_made/gasometer": {"icon": "temaki-storage_tank", "fields": ["content", "building_area"], "geometry": ["point", "area"], "terms": ["gas holder"], "tags": {"man_made": "gasometer"}, "name": "Gasometer"}, "man_made/groyne": {"geometry": ["line", "area"], "tags": {"man_made": "groyne"}, "name": "Groyne"}, "man_made/lighthouse": {"icon": "maki-lighthouse", "fields": ["building_area"], "geometry": ["point", "area"], "tags": {"man_made": "lighthouse"}, "name": "Lighthouse"}, diff --git a/data/presets/presets/man_made/flagpole.json b/data/presets/presets/man_made/flagpole.json index 06aaac079..8cac99475 100644 --- a/data/presets/presets/man_made/flagpole.json +++ b/data/presets/presets/man_made/flagpole.json @@ -2,7 +2,7 @@ "icon": "maki-embassy", "fields": [ "operator", - "flag_type", + "flag/type", "country", "lit", "height" diff --git a/dist/locales/en.json b/dist/locales/en.json index 31c5467b1..9583a6727 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -1972,7 +1972,7 @@ "fixme": { "label": "Fix Me" }, - "flag_type": { + "flag/type": { "label": "Flag Type" }, "ford": { From 053c24eca7c9fd18c69171fe644df85252c8eff7 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Mon, 17 Sep 2018 16:53:30 -0700 Subject: [PATCH 08/11] Adds the reference property to the Sculpture, Statue, and Mural presets --- data/presets/presets.json | 6 +++--- data/presets/presets/tourism/artwork/mural.json | 4 ++++ data/presets/presets/tourism/artwork/sculpture.json | 4 ++++ data/presets/presets/tourism/artwork/statue.json | 4 ++++ 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/data/presets/presets.json b/data/presets/presets.json index 75e11c328..c28ca3880 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -891,9 +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/artwork/mural": {"icon": "maki-art-gallery", "fields": ["name", "artist"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork", "artwork_type": "mural"}, "reference": {"key": "artwork_type", "value": "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"}, "reference": {"key": "artwork_type", "value": "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"}, "reference": {"key": "artwork_type", "value": "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 index c22482776..311f84674 100644 --- a/data/presets/presets/tourism/artwork/mural.json +++ b/data/presets/presets/tourism/artwork/mural.json @@ -14,6 +14,10 @@ "tourism": "artwork", "artwork_type": "mural" }, + "reference": { + "key": "artwork_type", + "value": "mural" + }, "terms": [ "fresco", "wall painting" diff --git a/data/presets/presets/tourism/artwork/sculpture.json b/data/presets/presets/tourism/artwork/sculpture.json index fbad11c4a..7bb073958 100644 --- a/data/presets/presets/tourism/artwork/sculpture.json +++ b/data/presets/presets/tourism/artwork/sculpture.json @@ -15,6 +15,10 @@ "tourism": "artwork", "artwork_type": "sculpture" }, + "reference": { + "key": "artwork_type", + "value": "sculpture" + }, "terms": [ "statue", "figure", diff --git a/data/presets/presets/tourism/artwork/statue.json b/data/presets/presets/tourism/artwork/statue.json index 9ae8f2d97..ed875c493 100644 --- a/data/presets/presets/tourism/artwork/statue.json +++ b/data/presets/presets/tourism/artwork/statue.json @@ -15,6 +15,10 @@ "tourism": "artwork", "artwork_type": "statue" }, + "reference": { + "key": "artwork_type", + "value": "statue" + }, "terms": [ "sculpture", "figure", From 6dde807c5c730846924da4d92ac1723ab43b3b7a Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Wed, 19 Sep 2018 01:39:37 -0400 Subject: [PATCH 09/11] Update to svg-sprite v1.5.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3f900b44d..2771e9fcd 100644 --- a/package.json +++ b/package.json @@ -88,7 +88,7 @@ "sinon": "^6.0.0", "sinon-chai": "^3.1.0", "smash": "0.0", - "svg-sprite": "1.4.0", + "svg-sprite": "1.5.0", "temaki": "1.0.0", "uglify-js": "~3.4.0", "xml2js": "^0.4.17", From c39876208f842b4d25f99364ae14a26e4b0226af Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Thu, 20 Sep 2018 13:35:59 +0000 Subject: [PATCH 10/11] chore(package): update mapillary-js to version 2.13.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2771e9fcd..97fe96919 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "js-yaml": "^3.9.0", "json-stringify-pretty-compact": "^1.1.0", "jsonschema": "^1.1.0", - "mapillary-js": "2.12.1", + "mapillary-js": "2.13.0", "mapillary_sprite_source": "^1.5.0", "minimist": "^1.2.0", "mocha": "^5.0.0", From 85383c314d1c500268851d6de8da9b93e556edcd Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Sun, 23 Sep 2018 11:13:41 -0400 Subject: [PATCH 11/11] Change "Pavilion" from an `amenity=shelter` to a `building=pavilion` (closes #5325) https://wiki.openstreetmap.org/wiki/Tag:building%3Dpavilion --- data/presets.yaml | 9 ++++---- data/presets/presets.json | 2 +- .../presets/amenity/shelter/pavilion.json | 19 ----------------- data/presets/presets/building/pavilion.json | 21 +++++++++++++++++++ data/taginfo.json | 14 ++++++------- dist/locales/en.json | 8 +++---- 6 files changed, 38 insertions(+), 35 deletions(-) delete mode 100644 data/presets/presets/amenity/shelter/pavilion.json create mode 100644 data/presets/presets/building/pavilion.json diff --git a/data/presets.yaml b/data/presets.yaml index de51982fd..f9649c76e 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -2459,10 +2459,6 @@ en: # 'amenity=shelter, shelter_type=lean_to' name: Lean-To terms: '' - amenity/shelter/pavilion: - # 'amenity=shelter, shelter_type=pavilion' - name: Pavilion - terms: '' amenity/shower: # amenity=shower name: Shower @@ -2944,6 +2940,11 @@ en: # building=mosque name: Mosque Building terms: '' + building/pavilion: + # building=pavilion + name: Pavilion Building + # 'terms: sports' + terms: '' building/public: # building=public name: Public Building diff --git a/data/presets/presets.json b/data/presets/presets.json index 0abf2e2f7..1279817ff 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -131,7 +131,6 @@ "amenity/shelter": {"icon": "maki-shelter", "fields": ["name", "shelter_type", "building_area", "bench", "bin"], "geometry": ["point", "vertex", "area"], "terms": ["lean-to", "gazebo", "picnic"], "tags": {"amenity": "shelter"}, "name": "Shelter"}, "amenity/shelter/gazebo": {"icon": "maki-shelter", "fields": ["name", "building_area", "bench", "lit"], "geometry": ["point", "area"], "tags": {"amenity": "shelter", "shelter_type": "gazebo"}, "name": "Gazebo"}, "amenity/shelter/lean_to": {"icon": "maki-shelter", "fields": ["name", "operator", "building_area"], "geometry": ["point", "area"], "tags": {"amenity": "shelter", "shelter_type": "lean_to"}, "name": "Lean-To"}, - "amenity/shelter/pavilion": {"icon": "maki-shelter", "fields": ["name", "building_area", "bench", "bin"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "shelter", "shelter_type": "pavilion"}, "name": "Pavilion"}, "amenity/shower": {"icon": "temaki-shower", "fields": ["operator", "opening_hours", "fee", "supervised", "building_area", "access_simple"], "geometry": ["point", "vertex", "area"], "terms": ["rain closet"], "tags": {"amenity": "shower"}, "name": "Shower"}, "amenity/smoking_area": {"icon": "fas-smoking", "fields": ["name", "shelter", "bin", "bench", "opening_hours"], "geometry": ["point", "vertex", "area"], "terms": [], "tags": {"amenity": "smoking_area"}, "name": "Smoking Area"}, "amenity/social_facility": {"icon": "temaki-social_facility", "fields": ["name", "operator", "address", "building_area", "social_facility", "social_facility_for", "opening_hours", "wheelchair"], "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "social_facility"}, "name": "Social Facility"}, @@ -240,6 +239,7 @@ "building/industrial": {"icon": "maki-industry", "fields": ["name", "address", "levels", "height"], "geometry": ["area"], "tags": {"building": "industrial"}, "matchScore": 0.5, "name": "Industrial Building"}, "building/kindergarten": {"icon": "maki-building", "fields": ["name", "address", "levels", "height"], "geometry": ["area"], "terms": ["kindergarden", "pre-school"], "tags": {"building": "kindergarten"}, "matchScore": 0.5, "name": "Preschool/Kindergarten Building"}, "building/mosque": {"icon": "maki-place-of-worship", "fields": ["name", "address", "levels", "height"], "geometry": ["area"], "tags": {"building": "mosque"}, "matchScore": 0.5, "name": "Mosque Building"}, + "building/pavilion": {"icon": "maki-building", "fields": ["name", "address", "levels", "height", "smoking"], "geometry": ["area"], "terms": ["sports"], "tags": {"building": "pavilion"}, "matchScore": 0.5, "name": "Pavilion Building"}, "building/public": {"icon": "maki-building", "fields": ["name", "address", "levels", "height", "smoking"], "geometry": ["area"], "tags": {"building": "public"}, "matchScore": 0.5, "name": "Public Building"}, "building/residential": {"icon": "maki-residential-community", "fields": ["name", "address", "levels", "height"], "geometry": ["area"], "tags": {"building": "residential"}, "matchScore": 0.5, "name": "Residential Building"}, "building/retail": {"icon": "maki-commercial", "fields": ["name", "address", "levels", "height", "smoking"], "geometry": ["area"], "tags": {"building": "retail"}, "matchScore": 0.5, "name": "Retail Building"}, diff --git a/data/presets/presets/amenity/shelter/pavilion.json b/data/presets/presets/amenity/shelter/pavilion.json deleted file mode 100644 index ad8474d34..000000000 --- a/data/presets/presets/amenity/shelter/pavilion.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "icon": "maki-shelter", - "fields": [ - "name", - "building_area", - "bench", - "bin" - ], - "geometry": [ - "point", - "vertex", - "area" - ], - "tags": { - "amenity": "shelter", - "shelter_type": "pavilion" - }, - "name": "Pavilion" -} diff --git a/data/presets/presets/building/pavilion.json b/data/presets/presets/building/pavilion.json new file mode 100644 index 000000000..b2fcf810d --- /dev/null +++ b/data/presets/presets/building/pavilion.json @@ -0,0 +1,21 @@ +{ + "icon": "maki-building", + "fields": [ + "name", + "address", + "levels", + "height", + "smoking" + ], + "geometry": [ + "area" + ], + "terms": [ + "sports" + ], + "tags": { + "building": "pavilion" + }, + "matchScore": 0.5, + "name": "Pavilion Building" +} diff --git a/data/taginfo.json b/data/taginfo.json index 431b11e5d..82ac1505c 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -889,13 +889,6 @@ "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shelter-15.svg?sanitize=true" }, - { - "key": "shelter_type", - "value": "pavilion", - "description": "Pavilion", - "object_types": ["node", "area"], - "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shelter-15.svg?sanitize=true" - }, { "key": "amenity", "value": "shower", @@ -1636,6 +1629,13 @@ "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/place-of-worship-15.svg?sanitize=true" }, + { + "key": "building", + "value": "pavilion", + "description": "Pavilion Building", + "object_types": ["area"], + "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/building-15.svg?sanitize=true" + }, { "key": "building", "value": "public", diff --git a/dist/locales/en.json b/dist/locales/en.json index 1dab04fda..568d3977e 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -3569,10 +3569,6 @@ "name": "Lean-To", "terms": "" }, - "amenity/shelter/pavilion": { - "name": "Pavilion", - "terms": "" - }, "amenity/shower": { "name": "Shower", "terms": "rain closet" @@ -4005,6 +4001,10 @@ "name": "Mosque Building", "terms": "" }, + "building/pavilion": { + "name": "Pavilion Building", + "terms": "sports" + }, "building/public": { "name": "Public Building", "terms": ""