From f7992d88e5128ffb4c6567e89195d691da41ff76 Mon Sep 17 00:00:00 2001 From: humanforklift Date: Wed, 11 Oct 2017 16:45:33 +1300 Subject: [PATCH 1/2] Added plot preset --- data/presets/presets.json | 164 +++++++++++++++++---------- data/presets/presets/place/plot.json | 17 +++ dist/locales/en.json | 15 +-- 3 files changed, 123 insertions(+), 73 deletions(-) create mode 100644 data/presets/presets/place/plot.json diff --git a/data/presets/presets.json b/data/presets/presets.json index 58a2ac2cb0..ccbd4be6e8 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -41258,13 +41258,13 @@ ], "suggestion": true }, - "amenity/pharmacy/Adler-Apotheke": { + "amenity/pharmacy/Adler Apotheke": { "tags": { - "name": "Adler-Apotheke", + "name": "Adler Apotheke", "healthcare": "pharmacy", "amenity": "pharmacy" }, - "name": "Adler-Apotheke", + "name": "Adler Apotheke", "icon": "pharmacy", "geometry": [ "point", @@ -59310,12 +59310,12 @@ ], "suggestion": true }, - "shop/beverages/Rewe Getränkemarkt": { + "shop/beverages/REWE Getränkemarkt": { "tags": { - "name": "Rewe Getränkemarkt", + "name": "REWE Getränkemarkt", "shop": "beverages" }, - "name": "Rewe Getränkemarkt", + "name": "REWE Getränkemarkt", "icon": "shop", "geometry": [ "point", @@ -59899,12 +59899,12 @@ ], "suggestion": true }, - "shop/car/Citroën": { + "shop/car/Citroen": { "tags": { - "name": "Citroën", + "name": "Citroen", "shop": "car" }, - "name": "Citroën", + "name": "Citroen", "icon": "car", "geometry": [ "point", @@ -66620,6 +66620,26 @@ ], "suggestion": true }, + "shop/convenience/Boutique": { + "tags": { + "name": "Boutique", + "shop": "convenience" + }, + "name": "Boutique", + "icon": "shop", + "geometry": [ + "point", + "area" + ], + "fields": [ + "name", + "operator", + "address", + "building_area", + "opening_hours" + ], + "suggestion": true + }, "shop/convenience/CBA": { "tags": { "name": "CBA", @@ -67260,12 +67280,12 @@ ], "suggestion": true }, - "shop/convenience/Lawson": { + "shop/convenience/LAWSON": { "tags": { - "name": "Lawson", + "name": "LAWSON", "shop": "convenience" }, - "name": "Lawson", + "name": "LAWSON", "icon": "shop", "geometry": [ "point", @@ -75549,6 +75569,26 @@ ], "suggestion": true }, + "shop/kiosk/Kiosk": { + "tags": { + "name": "Kiosk", + "shop": "kiosk" + }, + "name": "Kiosk", + "icon": "shop", + "geometry": [ + "point", + "area" + ], + "fields": [ + "name", + "operator", + "address", + "building_area", + "opening_hours" + ], + "suggestion": true + }, "shop/kiosk/Kiosko": { "tags": { "name": "Kiosko", @@ -79952,12 +79992,12 @@ ], "suggestion": true }, - "shop/supermarket/Ahorramás": { + "shop/supermarket/ALDI": { "tags": { - "name": "Ahorramás", + "name": "ALDI", "shop": "supermarket" }, - "name": "Ahorramás", + "name": "ALDI", "icon": "grocery", "geometry": [ "point", @@ -79972,12 +80012,12 @@ ], "suggestion": true }, - "shop/supermarket/Albert": { + "shop/supermarket/Ahorramás": { "tags": { - "name": "Albert", + "name": "Ahorramás", "shop": "supermarket" }, - "name": "Albert", + "name": "Ahorramás", "icon": "grocery", "geometry": [ "point", @@ -79992,12 +80032,12 @@ ], "suggestion": true }, - "shop/supermarket/Albert Heijn": { + "shop/supermarket/Albert": { "tags": { - "name": "Albert Heijn", + "name": "Albert", "shop": "supermarket" }, - "name": "Albert Heijn", + "name": "Albert", "icon": "grocery", "geometry": [ "point", @@ -80012,12 +80052,12 @@ ], "suggestion": true }, - "shop/supermarket/Albertsons": { + "shop/supermarket/Albert Heijn": { "tags": { - "name": "Albertsons", + "name": "Albert Heijn", "shop": "supermarket" }, - "name": "Albertsons", + "name": "Albert Heijn", "icon": "grocery", "geometry": [ "point", @@ -80032,12 +80072,12 @@ ], "suggestion": true }, - "shop/supermarket/Aldi": { + "shop/supermarket/Albertsons": { "tags": { - "name": "Aldi", + "name": "Albertsons", "shop": "supermarket" }, - "name": "Aldi", + "name": "Albertsons", "icon": "grocery", "geometry": [ "point", @@ -83392,12 +83432,12 @@ ], "suggestion": true }, - "shop/supermarket/NORMA": { + "shop/supermarket/NETTO": { "tags": { - "name": "NORMA", + "name": "NETTO", "shop": "supermarket" }, - "name": "NORMA", + "name": "NETTO", "icon": "grocery", "geometry": [ "point", @@ -83412,12 +83452,12 @@ ], "suggestion": true }, - "shop/supermarket/NP": { + "shop/supermarket/NORMA": { "tags": { - "name": "NP", + "name": "NORMA", "shop": "supermarket" }, - "name": "NP", + "name": "NORMA", "icon": "grocery", "geometry": [ "point", @@ -83432,12 +83472,12 @@ ], "suggestion": true }, - "shop/supermarket/Nah & Frisch": { + "shop/supermarket/NP": { "tags": { - "name": "Nah & Frisch", + "name": "NP", "shop": "supermarket" }, - "name": "Nah & Frisch", + "name": "NP", "icon": "grocery", "geometry": [ "point", @@ -83452,12 +83492,12 @@ ], "suggestion": true }, - "shop/supermarket/Nahkauf": { + "shop/supermarket/Nah & Frisch": { "tags": { - "name": "Nahkauf", + "name": "Nah & Frisch", "shop": "supermarket" }, - "name": "Nahkauf", + "name": "Nah & Frisch", "icon": "grocery", "geometry": [ "point", @@ -83472,12 +83512,12 @@ ], "suggestion": true }, - "shop/supermarket/Netto": { + "shop/supermarket/Nahkauf": { "tags": { - "name": "Netto", + "name": "Nahkauf", "shop": "supermarket" }, - "name": "Netto", + "name": "Nahkauf", "icon": "grocery", "geometry": [ "point", @@ -84072,6 +84112,26 @@ ], "suggestion": true }, + "shop/supermarket/REWE City": { + "tags": { + "name": "REWE City", + "shop": "supermarket" + }, + "name": "REWE City", + "icon": "grocery", + "geometry": [ + "point", + "area" + ], + "fields": [ + "name", + "operator", + "address", + "building_area", + "opening_hours" + ], + "suggestion": true + }, "shop/supermarket/Ralphs": { "tags": { "name": "Ralphs", @@ -84192,26 +84252,6 @@ ], "suggestion": true }, - "shop/supermarket/Rewe City": { - "tags": { - "name": "Rewe City", - "shop": "supermarket" - }, - "name": "Rewe City", - "icon": "grocery", - "geometry": [ - "point", - "area" - ], - "fields": [ - "name", - "operator", - "address", - "building_area", - "opening_hours" - ], - "suggestion": true - }, "shop/supermarket/Rimi": { "tags": { "name": "Rimi", diff --git a/data/presets/presets/place/plot.json b/data/presets/presets/place/plot.json new file mode 100644 index 0000000000..fa81c6d773 --- /dev/null +++ b/data/presets/presets/place/plot.json @@ -0,0 +1,17 @@ +{ + "icon": "triangle-stroked", + "fields": [ + "name" + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "place": "plot" + }, + "terms": [ + "plot" + ], + "name": "Plot" +} diff --git a/dist/locales/en.json b/dist/locales/en.json index 989cbd4ba4..214a6baf41 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -5643,6 +5643,10 @@ "description": "Satellite and aerial imagery.", "name": "Mapbox Satellite" }, + "New_and_Misaligned_TIGER_Roads-2013": { + "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": "New & Misaligned TIGER Roads" + }, "OSM_Inspector-Addresses": { "attribution": { "text": "© Geofabrik GmbH, OpenStreetMap contributors, CC-BY-SA" @@ -5685,17 +5689,6 @@ }, "name": "OSM Inspector: Tagging" }, - "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" - }, - "US-TIGER-Roads-2017": { - "description": "Yellow = Public domain map data from the US Census. Red = Data not found in OpenStreetMap", - "name": "TIGER Roads 2017" - }, "Waymarked_Trails-Cycling": { "attribution": { "text": "© Sarah Hoffmann, CC by-SA 3.0, map data OpenStreetMap contributors, ODbL 1.0" From 523bb224d8f46c89d08b7df4e6a918713d4d79e2 Mon Sep 17 00:00:00 2001 From: Michael Forde Date: Wed, 11 Oct 2017 19:58:13 +1300 Subject: [PATCH 2/2] Amending search terms array --- data/presets/presets/place/plot.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/data/presets/presets/place/plot.json b/data/presets/presets/place/plot.json index fa81c6d773..76f0f3cfde 100644 --- a/data/presets/presets/place/plot.json +++ b/data/presets/presets/place/plot.json @@ -11,7 +11,10 @@ "place": "plot" }, "terms": [ - "plot" + "tract", + "land", + "lot", + "parcel" ], "name": "Plot" }