From ad126d8c6463ea6fea1384a884b063485239bc06 Mon Sep 17 00:00:00 2001
From: Eden Halperin <eden@mapbox.com>
Date: Tue, 20 May 2014 10:25:08 -0700
Subject: [PATCH] contour line adjustments

---
 bin/style.js | 72 +++++++++-------------------------------------------
 1 file changed, 12 insertions(+), 60 deletions(-)

diff --git a/bin/style.js b/bin/style.js
index 859331b50..6ba98714f 100644
--- a/bin/style.js
+++ b/bin/style.js
@@ -197,6 +197,7 @@ module.exports = {
             "source": "outdoors",
             "layer": "contour",
             "field": "index",
+            "join": "round",
             "value": 5,
             "type": "line"
         },
@@ -204,12 +205,14 @@ module.exports = {
             "source": "outdoors",
             "layer": "contour",
             "field": "index",
+            "join": "round",
             "value": 10,
             "type": "line"
         },
         "contour_line_other": {
             "source": "outdoors",
             "layer": "contour",
+            "join": "round",
             "type": "line"
         },
         "contour_label": {
@@ -884,15 +887,15 @@ module.exports = {
             "bucket": "hillshade_full_highlight"
         },
         {
-            "name": "contour_line_10",
+            "name": "contour_line_loud",
             "bucket": "contour_line_10"
         },
         {
-            "name": "contour_line_5",
+            "name": "contour_line_loud",
             "bucket": "contour_line_5"
         },
         {
-            "name": "contour_line_other",
+            "name": "contour_line_regular",
             "bucket": "contour_line_other"
         },
         {
@@ -1610,73 +1613,22 @@ module.exports = {
                         }
                     ]
                 },
-                "contour_line_5": {
+                "contour_line_loud": {
                     "color": "#008",
                     "width": 0.9,
                     "opacity": [
                         "stops",
-                        {
-                            "z": 0,
-                            "val": 0.05
-                        },
-                        {
-                            "z": 12,
-                            "val": 0.05
-                        },
-                        {
-                            "z": 13,
-                            "val": 0.11
-                        },
-                        {
-                            "z": 22,
-                            "val": 0.11
-                        }
+                        {"z": 12, "val": 0.05},
+                        {"z": 13, "val": 0.11}
                     ]
                 },
-                "contour_line_10": {
-                    "color": "#008",
-                    "width": 0.9,
-                    "opacity": [
-                        "stops",
-                        {
-                            "z": 0,
-                            "val": 0.05
-                        },
-                        {
-                            "z": 12,
-                            "val": 0.05
-                        },
-                        {
-                            "z": 13,
-                            "val": 0.11
-                        },
-                        {
-                            "z": 22,
-                            "val": 0.11
-                        }
-                    ]
-                },
-                "contour_line_other": {
+                "contour_line_regular": {
                     "color": "#008",
                     "width": 0.5,
                     "opacity": [
                         "stops",
-                        {
-                            "z": 0,
-                            "val": 0.05
-                        },
-                        {
-                            "z": 12,
-                            "val": 0.05
-                        },
-                        {
-                            "z": 13,
-                            "val": 0.11
-                        },
-                        {
-                            "z": 22,
-                            "val": 0.11
-                        }
+                        {"z": 12, "val": 0.05},
+                        {"z": 13, "val": 0.11}
                     ]
                 },
                 "water": {