demo: update for new layer visible -> enabled syntax

tangrams · Mar 17, 2017 · 91e2847 · 91e2847
1 parent ec985d7
commit 91e2847
Showing 1 changed file with 19 additions and 21 deletions.
diff --git a/demos/scene.yaml b/demos/scene.yaml
@@ -184,15 +184,17 @@ layers:
 
     earth:
         data: { source: mapzen }
-        visible: false
-        draw:
-            polygons:
-                order: global.feature_order
-                color: '#f0ebeb'
 
-        continents:
+        fill:
+            filter: { $geometry: polygon }
+            enabled: false
+            draw:
+                polygons:
+                    order: global.feature_order
+                    color: '#f0ebeb'
+
+        labels:
             filter: { kind: continent, $geometry: point }
-            visible: true
             draw:
                 text:
                     text_source: global.language_text_source
@@ -257,7 +259,6 @@ layers:
 
         oceans:
             filter: { kind: ocean }
-            visible: true
             draw:
                 text:
                     font:
@@ -267,7 +268,6 @@ layers:
 
         seas:
             filter: { kind: sea, $zoom: { min: 7 } }
-            visible: true
             draw:
                 text:
                     font:
@@ -626,29 +626,29 @@ layers:
 
     boundaries:
         data: { source: mapzen}
-        visible: false
         draw:
             lines:
+                visible: false
                 order: global.feature_order
                 width: 2px
                 color: wheat
 
         country:
             filter: { kind: country }
-            visible: true
             draw:
                 lines:
+                    visible: true
                     color: [0.824, 0.651, 0.329, 1.00]
             water:
                 filter: { maritime_boundary: true }
-                visible: false
+                draw: { lines: { visible: false } }
 
         region:
             filter: { kind: [region, macroregion] }
-            visible: true
+            draw: { lines: { visible: true } }
             water:
                 filter: { maritime_boundary: true }
-                visible: false
+                draw: { lines: { visible: false } }
 
     places:
         data: { source: mapzen }
@@ -659,7 +659,6 @@ layers:
                 kind: locality
                 kind_detail: city
                 $zoom: { max: 11 }
-            visible: true
             draw:
                 points:
                     size: 8px
@@ -681,6 +680,7 @@ layers:
         text-only:
             draw:
                 text:
+                    visible: false
                     text_source: global.language_text_source
                     priority: 1
                     font:
@@ -689,18 +689,16 @@ layers:
                         fill: [0, 0, 0, .8]
                         stroke: { color: white, width: 4 }
                         transform: uppercase
-            visible: false
 
             countries:
                 filter:
                     kind: country
                     any:
                         - { population: { min: 100000000 } }
                         - { $zoom: { min: 5, max: 8 }, population: { min: 1000000 } }
-                        # - population: { min: 10000000 }
-                visible: true
                 draw:
                     text:
+                        visible: true
                         buffer: 2px
                         font:
                             weight: bold
@@ -711,9 +709,9 @@ layers:
                     kind: region
                     kind_detail: [state, province]
                     $zoom: { min: 5, max: 9 }
-                visible: true
                 draw:
                     text:
+                        visible: true
                         buffer: 2px
                         font:
                             # weight: bold
@@ -731,9 +729,9 @@ layers:
                     kind: locality
                     kind_detail: city
                     $zoom: { min: 11 } # show city point labels below z11
-                visible: true
                 draw:
                     text:
+                        visible: true
                         font:
                             weight: bold
                             size: [[8, 11px], [12, 16px]]
@@ -743,9 +741,9 @@ layers:
                 filter:
                     - { kind: [neighbourhood, macrohood], $zoom: { min: 13 } }
                     - { kind: microhood, $zoom: { min: 15 } }
-                visible: true
                 draw:
                     text:
+                        visible: true
                         font:
                             size: [[13, 11px], [14, 11px], [15, 13px]]
                             style: italic