Merge pull request #130 from tangrams/sensescape/shields

Added shields
tangrams · Nov 15, 2016 · 17c2d49 · 17c2d49
2 parents 079abfc + 1dc63b5
commit 17c2d49
Show file tree

Hide file tree

Showing 6 changed files with 640 additions and 69 deletions.
diff --git a/components/globals.yaml b/components/globals.yaml
@@ -193,3 +193,4 @@ global:
     icon_visible_pois_landuse: true        # default false, all true
     text_visible_landuse_generic: true     # default false, all true
     text_visible_island: true
+    text_visible_shields: true
diff --git a/components/images/poi_icons_18@2x.png b/components/images/poi_icons_18@2x.png
diff --git a/index.html b/index.html
@@ -20,7 +20,7 @@
         <!-- bog-standard leaflet URL hash -->
         <script type="text/javascript" src="https://cdn.rawgit.com/mlevans/leaflet-hash/master/leaflet-hash.js"></script>
         <!-- Main tangram library -->
-        <script type="text/javascript" src="https://mapzen.com/tangram/0.10/tangram.min.js"></script>
+        <script type="text/javascript" src="https://mapzen.com/tangram/0.11/tangram.min.js"></script>
         <!-- <script src="http://localhost:8000/dist/tangram.debug.js"></script> -->
 
         <!-- A lightweight graphical user interface for changing variables in JavaScript.  -->

diff --git a/layers/pois.yaml b/layers/pois.yaml
@@ -26,6 +26,7 @@ layers:
                     repeat_group: abc
                     repeat_distance: 100px
                     buffer: 7px
+                    priority: 66
                     text_source: global.ux_language_text_source
                     visible: false    # labels are enabled by each layer below
                     move_into_tile: false # preserves text alignment w/icons in JS