From 393065725b0536b5b4297562f2662a09896ed271 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Sun, 6 Nov 2016 22:23:58 -0500
Subject: [PATCH] Add Turning Loop preset, adjust icons (closes #3557)

For the icons:
* use open circle for traversable features (turning_circle, mini-roundabout)
* use closed circle for non-traversable features (turning_loop, island)
---
 data/presets.yaml                             |  5 +++++
 data/presets/presets.json                     | 19 ++++++++++++++++---
 data/presets/presets/craft/clockmaker.json    |  1 -
 data/presets/presets/craft/watchmaker.json    |  1 -
 .../presets/highway/mini_roundabout.json      |  3 ++-
 .../presets/highway/turning_circle.json       |  2 +-
 .../presets/presets/highway/turning_loop.json | 13 +++++++++++++
 .../presets/traffic_calming/island.json       |  1 +
 data/taginfo.json                             |  4 ++++
 dist/locales/en.json                          |  4 ++++
 10 files changed, 46 insertions(+), 7 deletions(-)
 create mode 100644 data/presets/presets/highway/turning_loop.json

diff --git a/data/presets.yaml b/data/presets.yaml
index 495d1b730..8a72eae94 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -2453,6 +2453,11 @@ en:
         name: Turning Circle
         # 'terms: cul-de-sac'
         terms: '<translate with synonyms or related terms for ''Turning Circle'', separated by commas>'
+      highway/turning_loop:
+        # highway=turning_loop
+        name: Turning Loop (Island)
+        # 'terms: cul-de-sac'
+        terms: '<translate with synonyms or related terms for ''Turning Loop (Island)'', separated by commas>'
       highway/unclassified:
         # highway=unclassified
         name: Minor/Unclassified Road
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 93325d96d..008a4845b 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -3647,7 +3647,6 @@
             "name": "Caterer"
         },
         "craft/clockmaker": {
-            "icon": "circle-stroked",
             "fields": [
                 "operator",
                 "address",
@@ -4200,7 +4199,6 @@
             "name": "Upholsterer"
         },
         "craft/watchmaker": {
-            "icon": "circle-stroked",
             "fields": [
                 "operator",
                 "address",
@@ -4817,6 +4815,7 @@
             "name": "Living Street"
         },
         "highway/mini_roundabout": {
+            "icon": "circle-stroked",
             "geometry": [
                 "vertex"
             ],
@@ -5433,7 +5432,7 @@
             "name": "Trunk Road"
         },
         "highway/turning_circle": {
-            "icon": "circle",
+            "icon": "circle-stroked",
             "geometry": [
                 "vertex"
             ],
@@ -5445,6 +5444,19 @@
             ],
             "name": "Turning Circle"
         },
+        "highway/turning_loop": {
+            "icon": "circle",
+            "geometry": [
+                "vertex"
+            ],
+            "tags": {
+                "highway": "turning_loop"
+            },
+            "terms": [
+                "cul-de-sac"
+            ],
+            "name": "Turning Loop (Island)"
+        },
         "highway/unclassified": {
             "icon": "highway-unclassified",
             "fields": [
@@ -11124,6 +11136,7 @@
             "name": "Speed Hump"
         },
         "traffic_calming/island": {
+            "icon": "circle",
             "geometry": [
                 "vertex"
             ],
diff --git a/data/presets/presets/craft/clockmaker.json b/data/presets/presets/craft/clockmaker.json
index f9fb3ce43..20cc83ec0 100644
--- a/data/presets/presets/craft/clockmaker.json
+++ b/data/presets/presets/craft/clockmaker.json
@@ -1,5 +1,4 @@
 {
-    "icon": "circle-stroked",
     "fields": [
         "operator",
         "address",
diff --git a/data/presets/presets/craft/watchmaker.json b/data/presets/presets/craft/watchmaker.json
index 8985c5995..706d00574 100644
--- a/data/presets/presets/craft/watchmaker.json
+++ b/data/presets/presets/craft/watchmaker.json
@@ -1,5 +1,4 @@
 {
-    "icon": "circle-stroked",
     "fields": [
         "operator",
         "address",
diff --git a/data/presets/presets/highway/mini_roundabout.json b/data/presets/presets/highway/mini_roundabout.json
index 25dabe09c..f6ec98f34 100644
--- a/data/presets/presets/highway/mini_roundabout.json
+++ b/data/presets/presets/highway/mini_roundabout.json
@@ -1,4 +1,5 @@
 {
+    "icon": "circle-stroked",
     "geometry": [
         "vertex"
     ],
@@ -9,4 +10,4 @@
         "clock_direction"
     ],
     "name": "Mini-Roundabout"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/highway/turning_circle.json b/data/presets/presets/highway/turning_circle.json
index e0a50e4d0..6dc2fbbb1 100644
--- a/data/presets/presets/highway/turning_circle.json
+++ b/data/presets/presets/highway/turning_circle.json
@@ -1,5 +1,5 @@
 {
-    "icon": "circle",
+    "icon": "circle-stroked",
     "geometry": [
         "vertex"
     ],
diff --git a/data/presets/presets/highway/turning_loop.json b/data/presets/presets/highway/turning_loop.json
new file mode 100644
index 000000000..cf283b62c
--- /dev/null
+++ b/data/presets/presets/highway/turning_loop.json
@@ -0,0 +1,13 @@
+{
+    "icon": "circle",
+    "geometry": [
+        "vertex"
+    ],
+    "tags": {
+        "highway": "turning_loop"
+    },
+    "terms": [
+        "cul-de-sac"
+    ],
+    "name": "Turning Loop (Island)"
+}
diff --git a/data/presets/presets/traffic_calming/island.json b/data/presets/presets/traffic_calming/island.json
index bc337e00a..44cb98883 100644
--- a/data/presets/presets/traffic_calming/island.json
+++ b/data/presets/presets/traffic_calming/island.json
@@ -1,4 +1,5 @@
 {
+    "icon": "circle",
     "geometry": [
         "vertex"
     ],
diff --git a/data/taginfo.json b/data/taginfo.json
index 2e8eba395..6c167eb39 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1194,6 +1194,10 @@
             "key": "highway",
             "value": "turning_circle"
         },
+        {
+            "key": "highway",
+            "value": "turning_loop"
+        },
         {
             "key": "highway",
             "value": "unclassified"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index e06eae95f..006554a92 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -2805,6 +2805,10 @@
                     "name": "Turning Circle",
                     "terms": "cul-de-sac"
                 },
+                "highway/turning_loop": {
+                    "name": "Turning Loop (Island)",
+                    "terms": "cul-de-sac"
+                },
                 "highway/unclassified": {
                     "name": "Minor/Unclassified Road",
                     "terms": ""