From 31d165332b02abb914ba7d2b281167f65485092e Mon Sep 17 00:00:00 2001
From: Simon Bilsky-Rollins <simonbr73@gmail.com>
Date: Sun, 26 Aug 2018 11:22:23 -0400
Subject: [PATCH] add preset for wi-fi hotspots

---
 data/presets.yaml                             |  5 +++++
 data/presets/presets.json                     |  1 +
 .../presets/presets/internet_access/wlan.json | 20 +++++++++++++++++++
 data/taginfo.json                             | 12 ++++++-----
 dist/locales/en.json                          |  4 ++++
 svg/fontawesome/fas-wifi.svg                  |  1 +
 6 files changed, 38 insertions(+), 5 deletions(-)
 create mode 100644 data/presets/presets/internet_access/wlan.json
 create mode 100644 svg/fontawesome/fas-wifi.svg

diff --git a/data/presets.yaml b/data/presets.yaml
index 60c5b5d0a..3d207fa6e 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -3585,6 +3585,11 @@ en:
         # historic=wayside_shrine
         name: Wayside Shrine
         terms: '<translate with synonyms or related terms for ''Wayside Shrine'', separated by commas>'
+      internet_access/wlan:
+        # internet_access=wlan
+        name: Wi-Fi Hotspot
+        # 'terms: wi-fi,wifi,hotspot'
+        terms: '<translate with synonyms or related terms for ''Wi-Fi Hotspot'', separated by commas>'
       junction:
         # junction=yes
         name: Junction
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 453609b97..afdc567ea 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -414,6 +414,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"},
+    "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"},
     "landuse/farm": {"icon": "maki-farm", "fields": ["name", "operator", "crop"], "geometry": ["point", "area"], "tags": {"landuse": "farm"}, "terms": [], "name": "Farmland", "searchable": false},
diff --git a/data/presets/presets/internet_access/wlan.json b/data/presets/presets/internet_access/wlan.json
new file mode 100644
index 000000000..317e50596
--- /dev/null
+++ b/data/presets/presets/internet_access/wlan.json
@@ -0,0 +1,20 @@
+{
+    "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"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index c9f9ec2a8..e128a08a5 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -2779,6 +2779,13 @@
       "object_types": ["node", "area"],
       "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/landmark-15.svg?sanitize=true"
     },
+    {
+      "key": "internet_access",
+      "value": "wlan",
+      "description": "Wi-Fi Hotspot, Internet Access",
+      "object_types": ["node", "area"],
+      "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-wifi.svg?sanitize=true"
+    },
     {
       "key": "junction",
       "value": "yes",
@@ -6611,11 +6618,6 @@
       "description": "Internet Access"
     },
     {"key": "internet_access", "value": "no", "description": "Internet Access"},
-    {
-      "key": "internet_access",
-      "value": "wlan",
-      "description": "Internet Access"
-    },
     {
       "key": "internet_access",
       "value": "wired",
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 4b8c46cb2..5398ff08e 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -4585,6 +4585,10 @@
                     "name": "Wayside Shrine",
                     "terms": ""
                 },
+                "internet_access/wlan": {
+                    "name": "Wi-Fi Hotspot",
+                    "terms": "wi-fi,wifi,hotspot"
+                },
                 "junction": {
                     "name": "Junction",
                     "terms": ""
diff --git a/svg/fontawesome/fas-wifi.svg b/svg/fontawesome/fas-wifi.svg
new file mode 100644
index 000000000..364b5060a
--- /dev/null
+++ b/svg/fontawesome/fas-wifi.svg
@@ -0,0 +1 @@
+<svg aria-hidden="true" data-prefix="fas" data-icon="wifi" class="svg-inline--fa fa-wifi fa-w-20" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512"><path fill="currentColor" d="M384 416c0 35.346-28.654 64-64 64s-64-28.654-64-64c0-35.346 28.654-64 64-64s64 28.654 64 64zm136.659-124.443c6.465-6.465 6.245-17.065-.564-23.167-113.793-101.985-286.526-101.869-400.19 0-6.809 6.102-7.029 16.702-.564 23.167l34.006 34.006c5.927 5.927 15.464 6.32 21.769.796 82.88-72.609 207.074-72.447 289.768 0 6.305 5.524 15.842 5.132 21.769-.796l34.006-34.006zm112.11-113.718c6.385-6.385 6.254-16.816-.35-22.973-175.768-163.86-449.134-163.8-624.837 0-6.604 6.157-6.735 16.589-.35 22.973l33.966 33.966c6.095 6.095 15.891 6.231 22.224.383 144.763-133.668 368.356-133.702 513.156 0 6.333 5.848 16.129 5.712 22.224-.383l33.967-33.966z"></path></svg>
\ No newline at end of file