From 64d313beeab7f3dca90831dfd8dc0cbca240d83f Mon Sep 17 00:00:00 2001
From: Nicki Dlugash <nicki@mapbox.com>
Date: Tue, 27 May 2014 20:06:06 -0400
Subject: [PATCH] more poi labels and icons

---
 bin/style.js | 188 +++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 169 insertions(+), 19 deletions(-)

diff --git a/bin/style.js b/bin/style.js
index 1dbe2b2cf..d32390436 100644
--- a/bin/style.js
+++ b/bin/style.js
@@ -800,10 +800,29 @@ module.exports = {
             "layer": "poi_label",
             "icon": "maki",
             "field": "scalerank",
-            "value": [1, 2, 3],
+            "value": [1, 2],
             "size": 12,
             "type": "point"
         },
+        "poi_3": {
+            "source": "outdoors",
+            "layer": "poi_label",
+            "icon": "maki",
+            "field": "scalerank",
+            "value": 3,
+            "size": 12,
+            "type": "point"
+        },
+        "poi_4": {
+            "source": "outdoors",
+            "layer": "poi_label",
+            "icon": "maki",
+            "field": "scalerank",
+            "value": 4,
+            "size": 12,
+            "type": "point"
+        },
+  
         "poi_aerodrome": {
             "source": "outdoors",
             "layer": "poi_label",
@@ -813,7 +832,7 @@ module.exports = {
             "size": 24,
             "type": "point"
         },
-        "poi_label": {
+        "poi_label_1-2": {
             "source": "outdoors",
             "layer": "poi_label",
             "field": "scalerank",
@@ -827,7 +846,33 @@ module.exports = {
             "fontSize": 12,
             "feature_type": "point",
             "type": "text",
-            "alwaysVisible": true
+            //"alwaysVisible": true
+        },
+        "poi_label_3": {
+            "source": "outdoors",
+            "layer": "poi_label",
+            "field": "scalerank",
+            "value": 3,
+            "text_field": "name",
+            "path": "horizontal",
+            "padding": 2,
+            "fontSize": 12,
+            "feature_type": "point",
+            "type": "text",
+            //"alwaysVisible": true
+        },
+        "poi_label_4": {
+            "source": "outdoors",
+            "layer": "poi_label",
+            "field": "scalerank",
+            "value": 4,
+            "text_field": "name",
+            "path": "horizontal",
+            "padding": 2,
+            "fontSize": 12,
+            "feature_type": "point",
+            "type": "text",
+            //"alwaysVisible": true
         }
     },
     "structure": [
@@ -1299,10 +1344,6 @@ module.exports = {
             "name": "place_label_other",
             "bucket": "place_label_other"
         },
-        {
-            "name": "poi_label",
-            "bucket": "poi_label"
-        },
         {
             "name": "road_label",
             "bucket": "road_label"
@@ -1319,14 +1360,35 @@ module.exports = {
             "name": "waterway_label",
             "bucket": "waterway_label"
         },
+        {
+            "name": "poi_aerodrome",
+            "bucket": "poi_aerodrome"
+        },
         {
             "name": "poi",
             "bucket": "poi"
         },
         {
-            "name": "poi_aerodrome",
-            "bucket": "poi_aerodrome"
-        }
+            "name": "poi_label_1-2",
+            "bucket": "poi_label_1-2"
+        },
+        {
+            "name": "poi_3",
+            "bucket": "poi_3"
+        },
+        {
+            "name": "poi_label_3",
+            "bucket": "poi_label_3"
+        },
+        {
+            "name": "poi_4",
+            "bucket": "poi_4"
+        },
+        {
+            "name": "poi_label_4",
+            "bucket": "poi_label_4"
+        },
+
     ],
     "constants": {
         "land": "rgb(244,239,225)",
@@ -2129,7 +2191,7 @@ module.exports = {
                     "stroke": "rgba(255,255,255,0.5)",
                     "size": [
                         "stops",
-                        {"z": 6, "val": 14},
+                        {"z": 2, "val": 14},
                         {"z": 12, "val": 24}
                     ]
                 },
@@ -2275,14 +2337,58 @@ module.exports = {
                 //"strokeWidth": 0.4,
                 //"strokeBlur": 2
                 },
-                "poi_label": {
+                "poi_3": {
+                "antialias": false,
+                "opacity": [
+                            "stops",
+                            {"z": 0, "val": 0},
+                            {"z": 16.5, "val": 0},
+                            {"z": 16.75, "val": 1}
+                            ]
+                },
+                "poi_4": {
+                "antialias": false,
+                "opacity": [
+                         "stops",
+                         {"z": 18.5, "val": 0},
+                         {"z": 18.75, "val": 1}
+                         ]
+                },
+                "poi_label_1-2": {
                     "color": "#444",
-                    "size": 10,
+                    "size": 11,
                     "stroke": "land",
-                    "strokeWidth": 0.6,
-                    "strokeBlur": 2,
+                    "strokeWidth": 0.3,
+                    "strokeBlur": 1,
                     "translate": [0, 14]
                 },
+                "poi_label_3": {
+                "color": "#444",
+                "size": 10,
+                "stroke": "land",
+                "strokeWidth": 0.3,
+                "strokeBlur": 1,
+                "translate": [0, 14],
+                "opacity": [
+                            "stops",
+                            {"z": 0, "val": 0},
+                            {"z": 16.5, "val": 0},
+                            {"z": 16.75, "val": 1}
+                            ]
+                },
+                "poi_label_4": {
+                "color": "#444",
+                "size": 10,
+                "opacity": [
+                            "stops",
+                            {"z": 18.5, "val": 0},
+                            {"z": 18.75, "val": 1}
+                            ],
+                "stroke": "land",
+                "strokeWidth": 0.3,
+                "strokeBlur": 1,
+                "translate": [0, 14]
+                },
                 "poi_aerodrome": {
                     "opacity": ["stops",
                         {"z": 13, "val": 0},
@@ -2838,7 +2944,7 @@ module.exports = {
                     "stroke": "text_stroke_night",
                     "size": [
                         "stops",
-                        {"z": 6, "val": 14},
+                        {"z": 1, "val": 14},
                         {"z": 12, "val": 24}
                     ]
                 },
@@ -2982,14 +3088,58 @@ module.exports = {
                     "color": "white",
                     "antialias": false
                 },
-                "poi_label": {
+                "poi_3": {
+                "antialias": false,
+                "opacity": [
+                            "stops",
+                            {"z": 0, "val": 0},
+                            {"z": 16.5, "val": 0},
+                            {"z": 16.75, "val": 1}
+                            ]
+                },
+                "poi_4": {
+                "antialias": false,
+                "opacity": [
+                            "stops",
+                            {"z": 18.5, "val": 0},
+                            {"z": 18.75, "val": 1}
+                            ]
+                },
+                "poi_label_1-2": {
                     "color": "#fff",
-                    "size": 10,
+                    "size": 11,
                     "stroke": "text2_stroke_night",
                     "strokeWidth": 0.3,
-                    "strokeBlur": 2,
+                    "strokeBlur": 1,
                     "translate": [0, 14]
                 },
+                "poi_label_3": {
+                "color": "#fff",
+                "size": 10,
+                "stroke": "text2_stroke_night",
+                "strokeWidth": 0.3,
+                "strokeBlur": 1,
+                "translate": [0, 14],
+                "opacity": [
+                            "stops",
+                            {"z": 0, "val": 0},
+                            {"z": 16.5, "val": 0},
+                            {"z": 16.75, "val": 1}
+                            ]
+                },
+                "poi_label_4": {
+                "color": "#fff",
+                "size": 10,
+                "opacity": [
+                            "stops",
+                            {"z": 18.5, "val": 0},
+                            {"z": 18.75, "val": 1}
+                            ],
+                "stroke": "text2_stroke_night",
+                "strokeWidth": 0.3,
+                "strokeBlur": 1,
+                "translate": [0, 14]
+                },
                 "poi_aerodrome": {
                     "opacity": ["stops",
                         {"z": 13, "val": 0},