lighten small roads in zoom levels < 16

diff --git a/project.yml b/project.yml
index c330d7d9592dee07eccdb005c02c4915f6f28d24..ae0489d6dd094e917e1e4bfe04970d24355215d5 100644 (file)
--- a/project.yml
+++ b/project.yml
@@ -354,9 +354,9 @@ Layer:
             CASE
               WHEN type IN ('motorway', 'trunk', 'trunk_link') THEN 'motorway'
               WHEN type ~ E'\\w+_link$' THEN regexp_replace(type, '_link', '')
             CASE
               WHEN type IN ('motorway', 'trunk', 'trunk_link') THEN 'motorway'
               WHEN type ~ E'\\w+_link$' THEN regexp_replace(type, '_link', '')

-              WHEN type IN ('unclassified', 'road', 'service') THEN 'standard'
+              WHEN type IN ('unclassified', 'road') THEN 'standard'

               WHEN type IN ('residential', 'living_street') THEN 'urban'
               WHEN type IN ('residential', 'living_street') THEN 'urban'

-              WHEN type IN ('path', 'cycleway', 'footway', 'pedestrian', 'steps', 'bridleway') THEN 'noauto'
+              WHEN type IN ('track', 'service', 'path', 'cycleway', 'footway', 'pedestrian', 'steps', 'bridleway') THEN 'noauto'

               ELSE type
             END AS style
           FROM
               ELSE type
             END AS style
           FROM

diff --git a/roads.mss b/roads.mss
index 92c87eb07e84803fad6057f5b12d216b1b33087a..64bfddc89ab85e1a1b95412c59499930583d25ae 100644 (file)
--- a/roads.mss
+++ b/roads.mss
@@ -59,10 +59,10 @@ as well. */
 /* Road width variables that are used in road & bridge styles */
 @r11_motorway: 3;   @r11_main: 3;   @r11_inter: 1.5;  @r11_minor: 0;   @r11_narrow: 0;   @r11_noauto: 0;
 @r12_motorway: 4;   @r12_main: 3.5; @r12_inter: 2;    @r12_minor: 0;   @r12_narrow: 0;   @r12_noauto: 0;
 /* Road width variables that are used in road & bridge styles */
 @r11_motorway: 3;   @r11_main: 3;   @r11_inter: 1.5;  @r11_minor: 0;   @r11_narrow: 0;   @r11_noauto: 0;
 @r12_motorway: 4;   @r12_main: 3.5; @r12_inter: 2;    @r12_minor: 0;   @r12_narrow: 0;   @r12_noauto: 0;

-@r13_motorway: 5;   @r13_main: 4.5; @r13_inter: 3.5;  @r13_minor: 2.5; @r13_narrow: 1.5; @r13_noauto: 0;
-@r14_motorway: 5;   @r14_main: 4.5; @r14_inter: 3.5;  @r14_minor: 2;   @r14_narrow: 2;   @r14_noauto: 1.2;
-@r15_motorway: 6;   @r15_main: 5;   @r15_inter: 4;    @r15_minor: 3;   @r15_narrow: 2.5; @r15_noauto: 1.5;
-@r16_motorway: 8;   @r16_main: 8;   @r16_inter: 6;    @r16_minor: 4;   @r16_narrow: 1.7;   @r16_noauto: 1.7;
+@r13_motorway: 5;   @r13_main: 4.5; @r13_inter: 3.5;  @r13_minor: 2.5; @r13_narrow: 1;   @r13_noauto: 0;
+@r14_motorway: 5;   @r14_main: 4.5; @r14_inter: 3.5;  @r14_minor: 2;   @r14_narrow: 1;   @r14_noauto: 1;
+@r15_motorway: 6;   @r15_main: 5;   @r15_inter: 4;    @r15_minor: 3;   @r15_narrow: 1; @r15_noauto: 1;
+@r16_motorway: 8;   @r16_main: 8;   @r16_inter: 6;    @r16_minor: 4;   @r16_narrow: 1.2;   @r16_noauto: 1.2;

 @r17_motorway: 10;  @r17_main: 10;  @r17_inter: 8;    @r17_minor: 6;   @r17_narrow: 2;   @r17_noauto: 2;
 @r18_motorway: 16;  @r18_main: 14;  @r18_inter: 12;   @r18_minor: 8;   @r18_narrow: 3;   @r18_noauto: 3;
 
 @r17_motorway: 10;  @r17_main: 10;  @r17_inter: 8;    @r17_minor: 6;   @r17_narrow: 2;   @r17_noauto: 2;
 @r18_motorway: 16;  @r18_main: 14;  @r18_inter: 12;   @r18_minor: 8;   @r18_narrow: 3;   @r18_noauto: 3;
 


@@ -94,7 +94,6 @@ as well. */
   }
   [style='noauto'] {
     line-color: @pedestrian_case;
   }
   [style='noauto'] {
     line-color: @pedestrian_case;

-    line-comp-op: darken;

     [structure='bridge'] { line-color: darken(@pedestrian_case, 10%); }
   }
 
     [structure='bridge'] { line-color: darken(@pedestrian_case, 10%); }
   }
 


@@ -202,34 +201,33 @@ as well. */
       [structure='tunnel'] { line-color: lighten(@secondary_fill, 10%); }
     }
   }
       [structure='tunnel'] { line-color: lighten(@secondary_fill, 10%); }
     }
   }

+  [style="urban"],

   [style='standard'] {
     [zoom>=15][structure='bridge'] { bridge/line-color: darken(@standard_case, 15%); }
     [zoom>=11] {
   [style='standard'] {
     [zoom>=15][structure='bridge'] { bridge/line-color: darken(@standard_case, 15%); }
     [zoom>=11] {

-      line-color: @standard_fill;
-    }
-  }
-  [style="urban"] {
-    [zoom>=15][structure='bridge'] { bridge/line-color: darken(@urban_case, 15%); }
-    [zoom>=11][surface='unpaved'] {
-      line-color: @unpaved_case;
+      line-color: lighten(@standard_fill, 50%);

     }
     }

-    [zoom>=11][surface='paved'],
-    [zoom>=15][surface='unpaved'] {
-      line-color: @urban_fill;
+    [zoom>=16] {
+      line-color: @standard_fill;

     }
   }
   [zoom>=11][surface='unpaved'] {
     }
   }
   [zoom>=11][surface='unpaved'] {

-    line-color: @unpaved;
+    line-color: lighten(@unpaved, 50%);
+    [zoom>=16] {
+      line-color: @unpaved;
+    }

   }
   [style="track"] {
     [zoom>=15][structure='bridge'] { bridge/line-color: darken(@track_case, 10%); }
     [zoom>=11] {
   }
   [style="track"] {
     [zoom>=15][structure='bridge'] { bridge/line-color: darken(@track_case, 10%); }
     [zoom>=11] {

-      line-color: @track_fill;
-      line-dasharray: 4,2;
+      line-color: lighten(@standard_fill, 50%);

       line-cap: butt;
       line-join: round;
     }
       line-cap: butt;
       line-join: round;
     }

-    [zoom>=16] {line-dasharray: 8,2;}
+    [zoom>=16] {
+      line-dasharray: 8,2;
+      line-color: @standard_fill;
+    }

     [zoom>=18] {line-dasharray: 10,2;}
   }
   [structure='ford'] {
     [zoom>=18] {line-dasharray: 10,2;}
   }
   [structure='ford'] {


@@ -240,10 +238,13 @@ as well. */
   [style='noauto'] {
     [zoom>=15][structure='bridge'] { bridge/line-color: darken(@pedestrian_case, 15%); }
     [zoom>=11] {
   [style='noauto'] {
     [zoom>=15][structure='bridge'] { bridge/line-color: darken(@pedestrian_case, 15%); }
     [zoom>=11] {

-      line-color: @pedestrian_fill;
+      line-color: lighten(@standard_fill, 50%);

       line-cap: round;
       line-width: 0.4;
     }
       line-cap: round;
       line-width: 0.4;
     }

+    [zoom>=16] {
+      line-color: @standard_fill;
+    }

   }
   [zoom>=11][condition='bad'][style!='noauto'] {
     line-dasharray: 5,0.5;
   }
   [zoom>=11][condition='bad'][style!='noauto'] {
     line-dasharray: 5,0.5;


@@ -463,13 +464,20 @@ as well. */
 
 /* ---- Turning Circles --------------------------------------------- */
 #turning_circle_case[zoom>=14] {
 
 /* ---- Turning Circles --------------------------------------------- */
 #turning_circle_case[zoom>=14] {

-  marker-fill:@standard_fill;
-  marker-line-color:@standard_case;
+  marker-fill: lighten(@standard_fill, 50%);
+  marker-line-color: lighten(@standard_case, 50%);
+  [zoom>=16] {
+    marker-fill: @standard_fill;
+    marker-line-color: @standard_case;
+  }

   marker-line-width:2;
   marker-allow-overlap: true;
 }
 #turning_circle_fill[zoom>=14] {
   marker-line-width:2;
   marker-allow-overlap: true;
 }
 #turning_circle_fill[zoom>=14] {

-  marker-fill: @standard_fill;
+  marker-fill: lighten(@standard_fill, 50%);
+  [zoom>=16] {
+    marker-fill: @standard_fill;
+  }

   marker-line-width: 0;
   marker-line-opacity: 0;
   marker-allow-overlap: true;
   marker-line-width: 0;
   marker-line-opacity: 0;
   marker-allow-overlap: true;