From 9ab525f1988bca0f1bb8f9054057f439f520a153 Mon Sep 17 00:00:00 2001
From: animesh-007 <animeshagarwal7@gmail.com>
Date: Wed, 5 Feb 2020 21:15:43 +0530
Subject: [PATCH 1/3] added new preset

---
 data/presets.yaml                             | 14 ++++++++++
 data/presets/fields.json                      |  1 +
 data/presets/fields/facility.json             | 13 ++++++++++
 data/presets/presets.json                     |  1 +
 .../presets/amenity/kneipp_water_cure.json    | 26 +++++++++++++++++++
 data/taginfo.json                             |  4 +++
 dist/locales/en.json                          | 21 ++++++++++++++-
 7 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 data/presets/fields/facility.json
 create mode 100644 data/presets/presets/amenity/kneipp_water_cure.json

diff --git a/data/presets.yaml b/data/presets.yaml
index 44436bca7..ed2e32b72 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -795,6 +795,16 @@ en:
       faces:
         # faces=*
         label: Faces
+      facility:
+        # facility=*
+        label: Facilities
+        options:
+          # facility=arm
+          arm: Arm
+          # facility=face
+          face: Face
+          # facility=foot
+          foot: Foot
       fax:
         # fax=*
         label: Fax
@@ -3175,6 +3185,10 @@ en:
         name: Preschool/Kindergarten Grounds
         # 'terms: kindergarden,pre-school'
         terms: '<translate with synonyms or related terms for ''Preschool/Kindergarten Grounds'', separated by commas>'
+      amenity/kneipp_water_cure:
+        # amenity=kneipp_water_cure
+        name: Kneipp Water Cure
+        terms: '<translate with synonyms or related terms for ''Kneipp Water Cure'', separated by commas>'
       amenity/language_school:
         # amenity=language_school
         name: Language School
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 71a71cdef..5ddb8d307 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -138,6 +138,7 @@
     "entrance": {"key": "entrance", "type": "typeCombo", "label": "Type"},
     "except": {"key": "except", "type": "combo", "label": "Exceptions"},
     "faces": {"key": "faces", "type": "number", "minValue": 0, "label": "Faces"},
+    "facility": {"key": "facility", "type": "multiCombo", "label": "Facilities", "strings": {"options": {"foot": "Foot", "arm": "Arm", "face": "Face"}}},
     "fax": {"key": "fax", "type": "tel", "label": "Fax", "placeholder": "+31 42 123 4567"},
     "fee": {"key": "fee", "type": "check", "label": "Fee"},
     "fence_type": {"key": "fence_type", "type": "combo", "label": "Type"},
diff --git a/data/presets/fields/facility.json b/data/presets/fields/facility.json
new file mode 100644
index 000000000..9f7902f4c
--- /dev/null
+++ b/data/presets/fields/facility.json
@@ -0,0 +1,13 @@
+{
+    "key": "facility",
+    "type": "multiCombo",
+    "label": "Facilities",
+    "strings": {
+        "options": {
+            "foot": "Foot",
+            "arm": "Arm",
+            "face": "Face"
+            
+        }
+    }
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index e4af98196..9df54f6c7 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -136,6 +136,7 @@
     "amenity/internet_cafe": {"icon": "temaki-antenna", "fields": ["name", "operator", "operator/type", "address", "building_area", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "level", "min_age", "opening_hours", "outdoor_seating", "payment_multi", "phone", "ref/vatin", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["cybercafe", "taxiphone", "teleboutique", "coffee", "cafe", "net", "lanhouse"], "tags": {"amenity": "internet_cafe"}, "name": "Internet Cafe"},
     "amenity/karaoke_box": {"icon": "maki-karaoke", "fields": ["name", "operator", "address", "building_area", "opening_hours", "website"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "level", "min_age", "payment_multi", "phone", "ref/vatin", "smoking", "wheelchair"], "geometry": ["point", "area"], "terms": ["karaoke club", "karaoke room", "karaoke television", "KTV"], "tags": {"amenity": "karaoke_box"}, "name": "Karaoke Box"},
     "amenity/kindergarten": {"icon": "temaki-school", "fields": ["name", "operator", "address", "phone", "preschool"], "moreFields": ["email", "fax", "gnis/feature_id", "level", "max_age", "min_age", "opening_hours", "payment_multi", "website", "wheelchair"], "geometry": ["area", "point"], "terms": ["kindergarden", "pre-school"], "tags": {"amenity": "kindergarten"}, "name": "Preschool/Kindergarten Grounds"},
+    "amenity/kneipp_water_cure": {"icon": "maki-hospital", "fields": ["facility", "opening_hours", "fee"], "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "kneipp_water_cure"}, "reference": {"key": "amenity", "value": "kneipp_water_cure"}, "name": "Kneipp Water Cure"},
     "amenity/language_school": {"icon": "temaki-school", "fields": ["name", "operator", "operator/type", "address", "building_area", "opening_hours", "language_multi"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["esl"], "tags": {"amenity": "language_school"}, "name": "Language School"},
     "amenity/letter_box": {"icon": "temaki-letter_box", "fields": ["post", "access_simple", "collection_times", "height"], "moreFields": ["covered", "indoor", "level", "lit", "lockable", "manufacturer", "material", "operator", "wheelchair"], "geometry": ["point", "vertex"], "tags": {"amenity": "letter_box"}, "terms": ["curbside delivery box", "home delivery box", "direct-to-door delivery box", "letter hole", "letter plate", "letter slot", "letterbox", "letterhole", "letterplate", "letterslot", "mail box", "mail hole", "mail slot", "mailbox", "mailhole", "mailslot", "through-door delivery box"], "name": "Letter Box"},
     "amenity/library": {"icon": "maki-library", "fields": ["name", "operator", "operator/type", "building_area", "address", "ref/isil", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["access_simple", "air_conditioning", "email", "fax", "gnis/feature_id", "level", "opening_hours", "payment_multi", "phone", "polling_station", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["book"], "tags": {"amenity": "library"}, "name": "Library"},
diff --git a/data/presets/presets/amenity/kneipp_water_cure.json b/data/presets/presets/amenity/kneipp_water_cure.json
new file mode 100644
index 000000000..e413f26d5
--- /dev/null
+++ b/data/presets/presets/amenity/kneipp_water_cure.json
@@ -0,0 +1,26 @@
+{
+    "icon": "maki-hospital",
+    "fields": [ 
+        "facility",       
+        "opening_hours",
+        "fee"
+                                      
+        
+        
+        
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [],
+    "tags": {
+        "amenity": "kneipp_water_cure"
+        
+    },
+    "reference": {
+        "key": "amenity",
+        "value": "kneipp_water_cure"
+    },
+    "name": "Kneipp Water Cure"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index a9aafa0d6..219d3abb0 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -138,6 +138,7 @@
     {"key": "amenity", "value": "internet_cafe", "description": "🄿 Internet Cafe", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/antenna.svg"},
     {"key": "amenity", "value": "karaoke_box", "description": "🄿 Karaoke Box", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/karaoke-15.svg"},
     {"key": "amenity", "value": "kindergarten", "description": "🄿 Preschool/Kindergarten Grounds", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/school.svg"},
+    {"key": "amenity", "value": "kneipp_water_cure", "description": "🄿 Kneipp Water Cure", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/hospital-15.svg"},
     {"key": "amenity", "value": "language_school", "description": "🄿 Language School", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/school.svg"},
     {"key": "amenity", "value": "letter_box", "description": "🄿 Letter Box", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/letter_box.svg"},
     {"key": "amenity", "value": "library", "description": "🄿 Library", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/library-15.svg"},
@@ -1458,6 +1459,9 @@
     {"key": "enforcement", "description": "🄵 Type"},
     {"key": "except", "description": "🄵 Exceptions"},
     {"key": "faces", "description": "🄵 Faces"},
+    {"key": "facility", "value": "foot", "description": "🄵 Facilities"},
+    {"key": "facility", "value": "arm", "description": "🄵 Facilities"},
+    {"key": "facility", "value": "face", "description": "🄵 Facilities"},
     {"key": "fax", "description": "🄵 Fax"},
     {"key": "fee", "description": "🄵 Fee"},
     {"key": "fence_type", "description": "🄵 Type"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 97f7c0eea..8946c9f0e 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -3249,6 +3249,14 @@
                 "faces": {
                     "label": "Faces"
                 },
+                "facility": {
+                    "label": "Facilities",
+                    "options": {
+                        "foot": "Foot",
+                        "arm": "Arm",
+                        "face": "Face"
+                    }
+                },
                 "fax": {
                     "label": "Fax",
                     "terms": "",
@@ -5321,6 +5329,10 @@
                     "name": "Preschool/Kindergarten Grounds",
                     "terms": "kindergarden,pre-school"
                 },
+                "amenity/kneipp_water_cure": {
+                    "name": "Kneipp Water Cure",
+                    "terms": ""
+                },
                 "amenity/language_school": {
                     "name": "Language School",
                     "terms": "esl"
@@ -9919,7 +9931,7 @@
             },
             "MAPNIK": {
                 "attribution": {
-                    "text": "© OpenStreetMap contributors, CC-BY-SA"
+                    "text": "© OpenStreetMap contributors, CC-BY-SA 2.0"
                 },
                 "description": "The default OpenStreetMap layer.",
                 "name": "OpenStreetMap (Standard)"
@@ -10118,6 +10130,13 @@
                 "description": "GSI Kiban 2500 via finds.jp. Good for tracing, but a bit older.",
                 "name": "Japan GSI KIBAN 2500"
             },
+            "gothenburg-citymap": {
+                "attribution": {
+                    "text": "© Gothenburg municipality, CC0"
+                },
+                "description": "The city map is an overview map that describes Gothenburg. It contains general information about land, communications, hydrography, buildings, address numbers and street names, administrative division and other orientation text.",
+                "name": "Gothenburg City map"
+            },
             "gsi.go.jp": {
                 "attribution": {
                     "text": "GSI Japan"

From 76033a77a258b51122eaf00e1746a2fadeefb55e Mon Sep 17 00:00:00 2001
From: animesh-007 <animeshagarwal7@gmail.com>
Date: Thu, 6 Feb 2020 13:42:13 +0530
Subject: [PATCH 2/3] changed file name

---
 data/presets.yaml                                   | 3 +++
 data/presets/fields.json                            | 1 +
 data/presets/fields/kneipp_water_cure_multi.json    | 5 +++++
 data/presets/presets.json                           | 2 +-
 data/presets/presets/amenity/kneipp_water_cure.json | 2 +-
 data/taginfo.json                                   | 1 +
 dist/locales/en.json                                | 3 +++
 7 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 data/presets/fields/kneipp_water_cure_multi.json

diff --git a/data/presets.yaml b/data/presets.yaml
index ed2e32b72..68532daa2 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1128,6 +1128,9 @@ en:
       kerb/height:
         # 'kerb:height=*'
         label: Height
+      kneipp_water_cure_multi:
+        # 'kneipp_water_cure:=*'
+        label: Basin Types
       label:
         # label=*
         label: Label
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 5ddb8d307..6b22bd0b0 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -208,6 +208,7 @@
     "junction/ref_oneway": {"key": "junction:ref", "type": "text", "label": "Junction Number", "prerequisiteTag": {"key": "oneway", "value": "yes"}},
     "kerb": {"key": "kerb", "type": "combo", "label": "Curb"},
     "kerb/height": {"key": "kerb:height", "type": "combo", "snake_case": false, "label": "Height"},
+    "kneipp_water_cure_multi": {"key": "kneipp_water_cure:", "type": "multiCombo", "label": "Basin Types"},
     "label": {"key": "label", "type": "textarea", "label": "Label"},
     "lamp_type": {"key": "lamp_type", "type": "combo", "label": "Type"},
     "landuse": {"key": "landuse", "type": "typeCombo", "label": "Type"},
diff --git a/data/presets/fields/kneipp_water_cure_multi.json b/data/presets/fields/kneipp_water_cure_multi.json
new file mode 100644
index 000000000..5844dd997
--- /dev/null
+++ b/data/presets/fields/kneipp_water_cure_multi.json
@@ -0,0 +1,5 @@
+{
+    "key": "kneipp_water_cure:",
+    "type": "multiCombo",
+    "label": "Basin Types"                 
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 9df54f6c7..85386d0ea 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -136,7 +136,7 @@
     "amenity/internet_cafe": {"icon": "temaki-antenna", "fields": ["name", "operator", "operator/type", "address", "building_area", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "level", "min_age", "opening_hours", "outdoor_seating", "payment_multi", "phone", "ref/vatin", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["cybercafe", "taxiphone", "teleboutique", "coffee", "cafe", "net", "lanhouse"], "tags": {"amenity": "internet_cafe"}, "name": "Internet Cafe"},
     "amenity/karaoke_box": {"icon": "maki-karaoke", "fields": ["name", "operator", "address", "building_area", "opening_hours", "website"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "level", "min_age", "payment_multi", "phone", "ref/vatin", "smoking", "wheelchair"], "geometry": ["point", "area"], "terms": ["karaoke club", "karaoke room", "karaoke television", "KTV"], "tags": {"amenity": "karaoke_box"}, "name": "Karaoke Box"},
     "amenity/kindergarten": {"icon": "temaki-school", "fields": ["name", "operator", "address", "phone", "preschool"], "moreFields": ["email", "fax", "gnis/feature_id", "level", "max_age", "min_age", "opening_hours", "payment_multi", "website", "wheelchair"], "geometry": ["area", "point"], "terms": ["kindergarden", "pre-school"], "tags": {"amenity": "kindergarten"}, "name": "Preschool/Kindergarten Grounds"},
-    "amenity/kneipp_water_cure": {"icon": "maki-hospital", "fields": ["facility", "opening_hours", "fee"], "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "kneipp_water_cure"}, "reference": {"key": "amenity", "value": "kneipp_water_cure"}, "name": "Kneipp Water Cure"},
+    "amenity/kneipp_water_cure": {"icon": "maki-hospital", "fields": ["kneipp_water_cure_multi", "opening_hours", "fee"], "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "kneipp_water_cure"}, "reference": {"key": "amenity", "value": "kneipp_water_cure"}, "name": "Kneipp Water Cure"},
     "amenity/language_school": {"icon": "temaki-school", "fields": ["name", "operator", "operator/type", "address", "building_area", "opening_hours", "language_multi"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["esl"], "tags": {"amenity": "language_school"}, "name": "Language School"},
     "amenity/letter_box": {"icon": "temaki-letter_box", "fields": ["post", "access_simple", "collection_times", "height"], "moreFields": ["covered", "indoor", "level", "lit", "lockable", "manufacturer", "material", "operator", "wheelchair"], "geometry": ["point", "vertex"], "tags": {"amenity": "letter_box"}, "terms": ["curbside delivery box", "home delivery box", "direct-to-door delivery box", "letter hole", "letter plate", "letter slot", "letterbox", "letterhole", "letterplate", "letterslot", "mail box", "mail hole", "mail slot", "mailbox", "mailhole", "mailslot", "through-door delivery box"], "name": "Letter Box"},
     "amenity/library": {"icon": "maki-library", "fields": ["name", "operator", "operator/type", "building_area", "address", "ref/isil", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["access_simple", "air_conditioning", "email", "fax", "gnis/feature_id", "level", "opening_hours", "payment_multi", "phone", "polling_station", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["book"], "tags": {"amenity": "library"}, "name": "Library"},
diff --git a/data/presets/presets/amenity/kneipp_water_cure.json b/data/presets/presets/amenity/kneipp_water_cure.json
index e413f26d5..c7d42e21b 100644
--- a/data/presets/presets/amenity/kneipp_water_cure.json
+++ b/data/presets/presets/amenity/kneipp_water_cure.json
@@ -1,7 +1,7 @@
 {
     "icon": "maki-hospital",
     "fields": [ 
-        "facility",       
+        "kneipp_water_cure_multi",       
         "opening_hours",
         "fee"
                                       
diff --git a/data/taginfo.json b/data/taginfo.json
index 219d3abb0..b621dc984 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1536,6 +1536,7 @@
     {"key": "junction:ref", "description": "🄵 Junction Number"},
     {"key": "kerb", "description": "🄵 Curb"},
     {"key": "kerb:height", "description": "🄵 Height"},
+    {"key": "kneipp_water_cure:", "description": "🄵 Basin Types"},
     {"key": "label", "description": "🄵 Label"},
     {"key": "lamp_type", "description": "🄵 Type"},
     {"key": "lanes", "description": "🄵 Lanes"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 8946c9f0e..2a0de3a6d 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -3546,6 +3546,9 @@
                 "kerb/height": {
                     "label": "Height"
                 },
+                "kneipp_water_cure_multi": {
+                    "label": "Basin Types"
+                },
                 "label": {
                     "label": "Label"
                 },

From 7d4c513446f21cab0df8b54613cd2cc3500edb6f Mon Sep 17 00:00:00 2001
From: animesh-007 <animeshagarwal7@gmail.com>
Date: Thu, 6 Feb 2020 21:30:04 +0530
Subject: [PATCH 3/3] removed facility.json

---
 data/presets/fields/facility.json | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 data/presets/fields/facility.json

diff --git a/data/presets/fields/facility.json b/data/presets/fields/facility.json
deleted file mode 100644
index 9f7902f4c..000000000
--- a/data/presets/fields/facility.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "key": "facility",
-    "type": "multiCombo",
-    "label": "Facilities",
-    "strings": {
-        "options": {
-            "foot": "Foot",
-            "arm": "Arm",
-            "face": "Face"
-            
-        }
-    }
-}