Scenes tweak: prefer road labels over common poi labels

Change-Id: I683ec6d9c0853c1fe27a16c02d925ec6fc2c250e

diff --git a/scenes/bubble-wrap/bubble-wrap.yaml b/scenes/bubble-wrap/bubble-wrap.yaml
index 0fcffcd..101ad3d 100644 (file)
--- a/scenes/bubble-wrap/bubble-wrap.yaml
+++ b/scenes/bubble-wrap/bubble-wrap.yaml
@@ -5042,11 +5042,11 @@ layers:
                         visible: false
 
         # set special priority, sprite, and text styles per kind
-        has-area:
-            filter: { area: true }
-            draw:
-                icons:
-                    priority: 41
+        # has-area:
+        #     filter: { area: true }
+        #     draw:
+        #         icons:
+        #             priority: 41
 
         national-park-protected-areas:
             filter:
@@ -5158,12 +5158,12 @@ layers:
                             style: italic
                             fill: '#4ba3c5'
 
-        landuse-labels-not-any-above:
-            filter:
-                not: { kind: [aerodrome, airport, allotments, aquarium, attraction, battlefield, beach, cemetery, college, conservation, forest, garden, glacier, golf_course, grass, kindergarten, landmark, maze, national_park, nature_reserve, park, playground, protected_area, resort, school, stadium, station, theme_park, university, winery, winter_sports, zoo] }
-            draw:
-                icons:
-                    priority: 43
+        # landuse-labels-not-any-above:
+        #     filter:
+        #         not: { kind: [aerodrome, airport, allotments, aquarium, attraction, battlefield, beach, cemetery, college, conservation, forest, garden, glacier, golf_course, grass, kindergarten, landmark, maze, national_park, nature_reserve, park, playground, protected_area, resort, school, stadium, station, theme_park, university, winery, winter_sports, zoo] }
+        #     draw:
+        #         icons:
+        #             priority: 43
 
         building-like:
             filter: { kind: [commercial,residential,warehouse,public,dormitory], osm_relation: false }

diff --git a/scenes/walkabout-style/walkabout-style.yaml b/scenes/walkabout-style/walkabout-style.yaml
index d067b24..ee6a536 100644 (file)
--- a/scenes/walkabout-style/walkabout-style.yaml
+++ b/scenes/walkabout-style/walkabout-style.yaml
@@ -4724,11 +4724,11 @@ layers:
 
 
         # set special priority, sprite, and text styles per kind
-        has-area:
-            filter: { area: true }
-            draw:
-                icons:
-                    priority: 41
+        # has-area:
+        #     filter: { area: true }
+        #     draw:
+        #         icons:
+        #             priority: 41
 
         national-park-protected-areas:
             filter:
@@ -4862,12 +4862,12 @@ layers:
                             style: italic
                             fill: global.text_fill_park
 
-        landuse-labels-not-any-above:
-            filter:
-                not: { kind: [aerodrome, airport, allotments, aquarium, attraction, battlefield, beach, cemetery, college, conservation, forest, garden, glacier, golf_course, grass, kindergarten, landmark, maze, national_park, nature_reserve, park, playground, protected_area, resort, school, stadium, station, theme_park, university, winery, winter_sports, zoo] }
-            draw:
-                icons:
-                    priority: 43
+        # landuse-labels-not-any-above:
+        #     filter:
+        #         not: { kind: [aerodrome, airport, allotments, aquarium, attraction, battlefield, beach, cemetery, college, conservation, forest, garden, glacier, golf_course, grass, kindergarten, landmark, maze, national_park, nature_reserve, park, playground, protected_area, resort, school, stadium, station, theme_park, university, winery, winter_sports, zoo] }
+        #     draw:
+        #         icons:
+        #             priority: 43
 
         building-like:
             filter: { kind: [commercial,residential,warehouse,public,dormitory], osm_relation: false }