From 594932533a3da2b5ea811ac300214185a9dec77b Mon Sep 17 00:00:00 2001 From: Quincy Morgan <2046746+quincylvania@users.noreply.github.com> Date: Mon, 19 Oct 2020 10:29:54 -0400 Subject: [PATCH] Add man_made=windpump preset (close #7709) --- data/presets.yaml | 5 +++++ data/presets/presets.json | 1 + data/presets/presets/man_made/windpump.json | 24 +++++++++++++++++++++ data/taginfo.json | 1 + dist/locales/en.json | 4 ++++ 5 files changed, 35 insertions(+) create mode 100644 data/presets/presets/man_made/windpump.json diff --git a/data/presets.yaml b/data/presets.yaml index b22c9cf1d..2d9254d76 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -6726,6 +6726,11 @@ en: name: Windmill # 'terms: wind,wheel,mill' terms: '' + man_made/windpump: + # man_made=windpump + name: Windpump + # 'terms: aerorotor,water pump,windmill,wind pump' + terms: '' man_made/works: # man_made=works name: Factory diff --git a/data/presets/presets.json b/data/presets/presets.json index f6d770932..7a0bd479b 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -821,6 +821,7 @@ "man_made/water_works": {"icon": "temaki-powered_pump", "fields": ["name", "operator", "address"], "moreFields": ["gnis/feature_id"], "geometry": ["point", "area"], "tags": {"man_made": "water_works"}, "name": "Water Works"}, "man_made/watermill": {"icon": "maki-watermill", "fields": ["building_area"], "moreFields": ["gnis/feature_id"], "geometry": ["point", "area"], "terms": ["water", "wheel", "mill"], "tags": {"man_made": "watermill"}, "name": "Watermill"}, "man_made/windmill": {"icon": "maki-windmill", "fields": ["building_area"], "moreFields": ["gnis/feature_id"], "geometry": ["point", "area"], "terms": ["wind", "wheel", "mill"], "tags": {"man_made": "windmill"}, "name": "Windmill"}, + "man_made/windpump": {"icon": "temaki-windpump", "fields": ["ref", "operator", "height", "material", "manufacturer", "lit"], "geometry": ["point"], "terms": ["aerorotor", "water pump", "windmill", "wind pump"], "tags": {"man_made": "windpump"}, "name": "Windpump"}, "man_made/works": {"icon": "maki-industry", "fields": ["name", "operator", "address", "building_area", "product"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website"], "geometry": ["point", "area"], "terms": ["assembly", "build", "brewery", "car", "plant", "plastic", "processing", "manufacture", "refinery"], "tags": {"man_made": "works"}, "name": "Factory"}, "marker": {"icon": "temaki-silo", "fields": ["ref", "operator", "marker", "utility", "inscription", "colour"], "moreFields": ["height", "location", "manufacturer", "material"], "geometry": ["point"], "terms": ["identifier", "marking", "plate", "pole", "post", "sign"], "tags": {"marker": "*"}, "name": "Marker"}, "marker/utility": {"icon": "temaki-silo", "fields": ["ref", "operator", "marker", "utility", "{marker}"], "geometry": ["point"], "terms": ["gas line marker", "identifier", "marking", "oil marker", "pipline marker", "plate", "pole", "post", "sign"], "tags": {"marker": "*", "utility": "*"}, "name": "Utility Marker"}, diff --git a/data/presets/presets/man_made/windpump.json b/data/presets/presets/man_made/windpump.json new file mode 100644 index 000000000..dd32b4acc --- /dev/null +++ b/data/presets/presets/man_made/windpump.json @@ -0,0 +1,24 @@ +{ + "icon": "temaki-windpump", + "fields": [ + "ref", + "operator", + "height", + "material", + "manufacturer", + "lit" + ], + "geometry": [ + "point" + ], + "terms": [ + "aerorotor", + "water pump", + "windmill", + "wind pump" + ], + "tags": { + "man_made": "windpump" + }, + "name": "Windpump" +} diff --git a/data/taginfo.json b/data/taginfo.json index e8270da77..dd08e8d0b 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -799,6 +799,7 @@ {"key": "man_made", "value": "water_works", "description": "🄿 Water Works", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/powered_pump.svg"}, {"key": "man_made", "value": "watermill", "description": "🄿 Watermill", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/watermill-15.svg"}, {"key": "man_made", "value": "windmill", "description": "🄿 Windmill", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/windmill-15.svg"}, + {"key": "man_made", "value": "windpump", "description": "🄿 Windpump", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/windpump.svg"}, {"key": "man_made", "value": "works", "description": "🄿 Factory", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/industry-15.svg"}, {"key": "marker", "description": "🄿 Marker, 🄵 Type", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/silo.svg"}, {"key": "utility", "description": "🄿 Utility Marker, 🄵 Utilities, 🄵 Utility", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/silo.svg"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 5245b7c9a..cc576b64c 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -8617,6 +8617,10 @@ "name": "Windmill", "terms": "wind,wheel,mill" }, + "man_made/windpump": { + "name": "Windpump", + "terms": "aerorotor,water pump,windmill,wind pump" + }, "man_made/works": { "name": "Factory", "terms": "assembly,build,brewery,car,plant,plastic,processing,manufacture,refinery"