From fb5d1ff74f46054f072e021e30d5f4571cf83cf3 Mon Sep 17 00:00:00 2001
From: Andreas Viglakis <Andreas@Mapbox.com>
Date: Wed, 25 Feb 2015 14:29:10 -0800
Subject: [PATCH] update Highway Shields

---
 labels.mss  | 34 +++++++++++++++++++++-------------
 project.xml |  4 ++--
 project.yml |  2 +-
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/labels.mss b/labels.mss
index b3bc9b9..4cdb628 100644
--- a/labels.mss
+++ b/labels.mss
@@ -234,23 +234,31 @@
 // ---------------------------------------------------------------------
 // Roads
 
-#road_label[reflen>=1][reflen<=6]::shield {
-  // Motorways with a 'ref' tag that is 1-6 characters long have a
-  // [ref] value for shield-style labels.
-  // Custom shield png files can be created using make_shields.sh
-  // in _src folder
-  shield-name: [ref];
-  shield-face-name: @sans_bd;
-  shield-fill: #765;
-  shield-min-distance: 60;
-  shield-min-padding: 8;  // prevents clipped shields at tile edges
+#road_label::shield-pt[class='motorway'][zoom>=7][zoom<=10][localrank=1][reflen<=6],
+#road_label::shield-pt[class='motorway'][zoom>=9][zoom<=10][localrank=1][reflen<=6],
+#road_label::shield-ln[zoom>=11][reflen<=6] {
+  shield-name: "[ref].replace('·', '\n')";
   shield-size: 9;
-  shield-file: url('shield/motorway_sm_[reflen].png');
-  [zoom>=15] {
+  shield-line-spacing: -4;
+  shield-file: url('shield/[shield]-[reflen].svg');
+  shield-face-name: @sans;
+  shield-fill: #333;
+  [zoom>=14] {
+    shield-transform: scale(1.25,1.25);
     shield-size: 11;
-    shield-file: url('shield/motorway_lg_[reflen].png');
   }
 }
+#road_label::shield-pt[class='motorway'][zoom>=7][zoom<=10][localrank=1][reflen<=6],
+#road_label::shield-pt[class='motorway'][zoom>=9][zoom<=10][localrank=1][reflen<=6] {
+  shield-placement: point;
+  shield-avoid-edges: false;
+}
+#road_label::shield-ln[zoom>=11][reflen<=6] {
+  shield-placement: line;
+  shield-spacing: 400;
+  shield-min-distance: 100;
+  shield-avoid-edges: true;
+}
 
 #road_label {
   text-name: @name;
diff --git a/project.xml b/project.xml
index edb166e..85fa5df 100644
--- a/project.xml
+++ b/project.xml
@@ -5,12 +5,12 @@
 <Parameters>
   <Parameter name="attribution"><![CDATA[<a href='https://www.mapbox.com/about/maps/' target='_blank'>&copy; Mapbox &copy; OpenStreetMap</a> <a class='mapbox-improve-map' href='https://www.mapbox.com/map-feedback/' target='_blank'>Improve this map</a>]]></Parameter>
   <Parameter name="bounds">-180,-85.0511,180,85.0511</Parameter>
-  <Parameter name="center">0,20,2</Parameter>
+  <Parameter name="center">-121.2439,37.8027,13</Parameter>
   <Parameter name="format">png8:m=h</Parameter>
   <Parameter name="maxzoom">22</Parameter>
   <Parameter name="minzoom">0</Parameter>
   <Parameter name="name"><![CDATA[OSM Bright 2]]></Parameter>
-  <Parameter name="source"><![CDATA[mapbox:///mapbox.mapbox-streets-v5]]></Parameter>
+  <Parameter name="source"><![CDATA[mapbox:///mapbox.mapbox-streets-v6]]></Parameter>
 </Parameters>
 
 <FontSet name="fontset-0">
diff --git a/project.yml b/project.yml
index 856f302..2e51b93 100644
--- a/project.yml
+++ b/project.yml
@@ -20,7 +20,7 @@ layers: null
 maxzoom: 22
 minzoom: 0
 name: OSM Bright 2
-source: "mapbox:///mapbox.mapbox-streets-v5"
+source: "mapbox:///mapbox.mapbox-streets-v6"
 styles: 
   - style.mss
   - road.mss