Remove the workaround for swimming pools, add colors to the light sty…

…le and revert step dash style

layers/land.yaml

@@ -33,11 +33,6 @@ layers:
                     order: 220
                     width: [[16,20px],[18,10m]] # actually visually 1/3
                     color: global.water_color
-            pool:
-                filter: { kind: [swimming_pool] }
-                draw:
-                    lines-coast:
-                        width: [[16,5px],[18,5m]]
 
         river_lines:
             filter: { kind: [river, canal] }

layers/roads.yaml

@@ -71,10 +71,8 @@ layers:
         steps:
             filter: { kind_detail: steps }
             draw:
-                lines:
+                step_dashes:
                     cap: butt
-                    dash: [0.6,0.4]
-                    dash_background_color: global.path_outline_color
 
         road-outline:
             filter: { $zoom: { min: 15 }, not: { kind: [path, portage_way] } }
@@ -101,6 +99,10 @@ layers:
                         width: function () { return 1/4 * Math.log($zoom); }
                         order: 200
 styles:
+    step_dashes:
+        base: lines
+        dash: [0.6,0.4]
+        dash_background_color: global.path_outline_color
     lines-railway-style:
         base: lines
         blend: opaque

streetcomplete-light-style.yaml

@@ -13,9 +13,22 @@ import:
 #    - layers/roads.yaml
 
 global:
+    railway_color: '#99a'
+    road_color: '#fff'
+    road_outline_color: '#cc9999'
+    path_color: global.road_color
+    path_outline_color: '#e0c9b3'
+    tunnel_color: '#ccdee0'
+
+    earth_color: '#f3eacc'
+    water_color: '#68d'
+    landuse_color: '#c6ddaa'
+
     building_color: rgba(204, 214, 238, .75)
     building_outline_color: rgba(185, 195, 217, .75)
 
+    boundary_color: '#e66'
+
 styles:
     buildings-style:
         base: polygons