adjust road styles

diff --git a/labels.mss b/labels.mss
index 33259c3cb15d1faedf328d51487fdfa1a5c11376..b2eb65d7c97a26ef6a9c7aa8047ec832f63d75b0 100644 (file)
--- a/labels.mss
+++ b/labels.mss
@@ -415,7 +415,7 @@
 #mainroad_label[type='secondary'][zoom>13],
 #mainroad_label[type='tertiary'][zoom>13] {
   text-name: '[name]';
-  text-face-name: @medium;
+  text-face-name: @bold;
   text-placement: line;
   text-fill: @road_text;
   text-halo-fill: @road_halo;
@@ -428,7 +428,7 @@
 
 #minorroad_label[zoom>14] {
   text-name: '[name]';
-  text-face-name: @medium;
+  text-face-name: @bold;
   text-placement: line;
   text-fill: @road_text;
   text-halo-fill: @road_halo;

diff --git a/palette.mss b/palette.mss
index 294a8d0ab832b621ff38638616f8e04e4a341e28..deaace27d100c2c8702b33defb05aee2f1b8c2f0 100644 (file)
--- a/palette.mss
+++ b/palette.mss
@@ -118,40 +118,40 @@ Map { font-directory: url(./fonts); }
 /* ================================================================== */
 
 // @unpaved: darken(@residential, 15%); //#e2d8c3; //#ede7da;
-@unpaved: @residential; //#e2d8c3; //#ede7da;
+@unpaved: #000000; // @residential; //#e2d8c3; //#ede7da;
 @paved: #aea1a0;
 
-@unpaved_case: darken(@unpaved, 15%);
+@unpaved_case: #FFFFFF;
 
-@motorway_line:     #a098b0; //#44366e;
+@motorway_line:     #000000;
 @motorway_fill:     @motorway_line;
 @motorway_case:     darken(@motorway_fill, 10%);
 
-@primary_line:      #d2938e;
+@primary_line:      #000000;
 @primary_fill:      @primary_line;
 @primary_case:      @primary_fill * 0.9;
 
-@secondary_line:    #e9cbb0;
-@secondary_fill:    @secondary_line;
-@secondary_case:    @secondary_fill * 0.9;
+@secondary_line:    @primary_line;
+@secondary_fill:    @primary_fill;
+@secondary_case:    @primary_case;
 
-@tertiary_line:    #dbde99;
+@tertiary_line:    @primary_line;
 @tertiary_fill:    @tertiary_line;
 @tertiary_case:    @tertiary_fill * 0.9;
 
-@standard_line:     #d2938e;
-@standard_fill:     #e4e1d1;
-@standard_case:     @standard_fill * 0.9;
+@standard_line:     #000000;
+@standard_fill:     #000000;
+@standard_case:     @standard_fill;
 
-@urban_fill:        #f7f6f1;
+@urban_fill:        @primary_fill;
 @urban_case:        @urban_fill * 0.9;
 
 @track_line:        #BFA286;
 @track_fill:        @unpaved;
 @track_case:        darken(@unpaved, 20%);
 
-@pedestrian_line:   #CBC5BF;
-@pedestrian_fill:   #BFA286;
+@pedestrian_line:   #f4f4f4;
+@pedestrian_fill:   #FFFFFF;
 @pedestrian_case:   @land;
 
 @cycle_line:        @standard_line;
@@ -202,8 +202,8 @@ Map { font-directory: url(./fonts); }
 @poi_text2:         #868E90;
 @poi_halo:          @place_halo;
 
-@road_text:         #525252;
-@road_halo:         rgba(255,255,255,0.8);
+@road_text:         #000000;
+@road_halo:         #FFFFFF;
 
 @housenumber_text:  #797979;
 

diff --git a/roads.mss b/roads.mss
index d74982fb94b6f8a54f23180ac0ef295be8adfe58..92c87eb07e84803fad6057f5b12d216b1b33087a 100644 (file)
--- a/roads.mss
+++ b/roads.mss
@@ -62,9 +62,9 @@ as well. */
 @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: 5;   @r16_narrow: 4;   @r16_noauto: 1.7;
-@r17_motorway: 10;  @r17_main: 10;  @r17_inter: 8;    @r17_minor: 6;   @r17_narrow: 5;   @r17_noauto: 2;
-@r18_motorway: 16;  @r18_main: 14;  @r18_inter: 12;   @r18_minor: 8;   @r18_narrow: 8;   @r18_noauto: 3;
+@r16_motorway: 8;   @r16_main: 8;   @r16_inter: 6;    @r16_minor: 4;   @r16_narrow: 1.7;   @r16_noauto: 1.7;
+@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;
 
 @c11_motorway: 1;   @c11_main: 1;   @c11_inter: 0;    @c11_minor: 0;   @c11_narrow: 0;   @c11_noauto: 0;
 @c12_motorway: 1.5; @c12_main: 1.5; @c12_inter: 1;    @c12_minor: 0;   @c12_narrow: 0;   @c12_noauto: 0;
@@ -242,8 +242,7 @@ as well. */
     [zoom>=11] {
       line-color: @pedestrian_fill;
       line-cap: round;
-      line-dasharray: 0.1,2;
-      line-comp-op: darken;
+      line-width: 0.4;
     }
   }
   [zoom>=11][condition='bad'][style!='noauto'] {
@@ -385,7 +384,6 @@ as well. */
     [style='noauto']   {
       [structure='bridge'] {bridge/line-width: @r16_noauto + 1;}
       line-width: @r16_noauto;
-      line-dasharray: 0.1,4;
     }
     [construction!=null] { line-dasharray: 10,10; }
   }
@@ -417,7 +415,6 @@ as well. */
     [style='noauto']   {
       [structure='bridge'] {bridge/line-width: @r17_noauto + @c17_noauto;}
       line-width: @r17_noauto;
-      line-dasharray: 0.1,6;
       [type='steps'] {
         line-cap: butt;
         line-width: @r17_noauto + @c17_noauto;
@@ -454,7 +451,6 @@ as well. */
     [style='noauto']   {
       [structure='bridge'] {bridge/line-width: @r18_noauto + @c18_noauto;}
       line-width: @r18_noauto;
-      line-dasharray: 0.1,6;
       [type='steps'] {
         line-cap: butt;
         line-width: @r18_noauto + @c18_noauto;