[styles] Regenerate for footway-bicycle

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>

data/colors.txt

@@ -591,9 +591,11 @@
 2570486556
 2571723081
 2571847235
+2572571903
 2572580182
 2573200174
 2573352319
+2574138695
 2575126307
 2576111654
 2576201856

data/drules_proto.txt

@@ -23525,93 +23525,125 @@ cont {
   element {
     scale: 11
     lines {
-      width: 1.1
-      color: 2153141503
+      width: 1.2
+      color: 2572571903
       priority: 170
       cap: BUTTCAP
     }
     lines {
-      width: 1.1
-      color: 1308162296
+      width: 1.5
+      color: 1090058488
       dashdot {
-        dd: 4.0
-        dd: 3.2
+        dd: 5.0
+        dd: 2.0
       }
       priority: 180
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2950
+    }
   }
   element {
     scale: 12
     lines {
-      width: 1.1
-      color: 2153141503
+      width: 1.2
+      color: 2572571903
       priority: 170
       cap: BUTTCAP
     }
     lines {
-      width: 1.1
-      color: 1308162296
+      width: 1.5
+      color: 1090058488
       dashdot {
-        dd: 4.0
-        dd: 3.2
+        dd: 5.0
+        dd: 2.0
       }
       priority: 180
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2950
+    }
   }
   element {
     scale: 13
     lines {
-      width: 1.1
-      color: 2153141503
+      width: 1.2
+      color: 2572571903
       priority: 170
       cap: BUTTCAP
     }
     lines {
-      width: 1.1
-      color: 1308162296
+      width: 1.5
+      color: 1090058488
       dashdot {
-        dd: 4.0
-        dd: 3.2
+        dd: 5.0
+        dd: 2.0
       }
       priority: 180
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2950
+    }
   }
   element {
     scale: 14
     lines {
-      width: 1.1
-      color: 2153141503
+      width: 1.2
+      color: 2572571903
       priority: 170
       cap: BUTTCAP
     }
     lines {
-      width: 1.1
-      color: 1308162296
+      width: 1.5
+      color: 1090058488
       dashdot {
-        dd: 4.0
-        dd: 3.2
+        dd: 5.0
+        dd: 2.0
       }
       priority: 180
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2950
+    }
   }
   element {
     scale: 15
     lines {
       width: 1.2
-      color: 2153141503
+      color: 2572571903
       priority: 170
       cap: BUTTCAP
     }
     lines {
       width: 1.5
-      color: 670628088
+      color: 1090058488
       dashdot {
         dd: 5.0
-        dd: 3.5
+        dd: 2.0
       }
       priority: 180
       cap: BUTTCAP
@@ -23629,15 +23661,15 @@ cont {
     scale: 16
     lines {
       width: 1.3
-      color: 1716933887
+      color: 2572571903
       priority: 170
     }
     lines {
       width: 2.0
-      color: 670628088
+      color: 1090058488
       dashdot {
         dd: 5.0
-        dd: 3.5
+        dd: 2.0
       }
       priority: 180
     }
@@ -23654,15 +23686,15 @@ cont {
     scale: 17
     lines {
       width: 1.4
-      color: 1716933887
+      color: 2153141503
       priority: 170
     }
     lines {
       width: 2.4
-      color: 16316664
+      color: 1090058488
       dashdot {
         dd: 6.0
-        dd: 4.2
+        dd: 2.5
       }
       priority: 180
     }
@@ -23679,7 +23711,7 @@ cont {
     scale: 18
     lines {
       width: 1.6
-      color: 861295871
+      color: 2153141503
       priority: 170
     }
     lines {
@@ -23687,7 +23719,7 @@ cont {
       color: 16316664
       dashdot {
         dd: 8.0
-        dd: 5.5
+        dd: 3.0
       }
       priority: 180
     }
@@ -23704,7 +23736,7 @@ cont {
     scale: 19
     lines {
       width: 1.8
-      color: 861295871
+      color: 2153141503
       priority: 170
     }
     lines {
@@ -23712,7 +23744,7 @@ cont {
       color: 16316664
       dashdot {
         dd: 10.0
-        dd: 6.7
+        dd: 3.5
       }
       priority: 180
     }
@@ -23729,7 +23761,7 @@ cont {
     scale: 20
     lines {
       width: 1.8
-      color: 861295871
+      color: 2153141503
       priority: 170
     }
     lines {
@@ -23737,7 +23769,7 @@ cont {
       color: 16316664
       dashdot {
         dd: 10.0
-        dd: 6.7
+        dd: 3.5
       }
       priority: 180
     }

data/drules_proto_clear.txt

@@ -22142,39 +22142,20 @@ cont {
 }
 cont {
   name: "highway-footway-bicycle"
-  element {
-    scale: 14
-    lines {
-      width: 1.1
-      color: 2153141503
-      priority: 170
-      cap: BUTTCAP
-    }
-    lines {
-      width: 1.1
-      color: 1308162296
-      dashdot {
-        dd: 4.0
-        dd: 3.2
-      }
-      priority: 180
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 15
     lines {
       width: 1.2
-      color: 2153141503
+      color: 2572571903
       priority: 170
       cap: BUTTCAP
     }
     lines {
       width: 1.5
-      color: 670628088
+      color: 1090058488
       dashdot {
         dd: 5.0
-        dd: 3.5
+        dd: 2.0
       }
       priority: 180
       cap: BUTTCAP
@@ -22192,15 +22173,15 @@ cont {
     scale: 16
     lines {
       width: 1.3
-      color: 1716933887
+      color: 2572571903
       priority: 170
     }
     lines {
       width: 2.0
-      color: 670628088
+      color: 1090058488
       dashdot {
         dd: 5.0
-        dd: 3.5
+        dd: 2.0
       }
       priority: 180
     }
@@ -22217,15 +22198,15 @@ cont {
     scale: 17
     lines {
       width: 1.4
-      color: 1716933887
+      color: 2153141503
       priority: 170
     }
     lines {
       width: 2.4
-      color: 16316664
+      color: 1090058488
       dashdot {
         dd: 6.0
-        dd: 4.2
+        dd: 2.5
       }
       priority: 180
     }
@@ -22242,7 +22223,7 @@ cont {
     scale: 18
     lines {
       width: 1.6
-      color: 861295871
+      color: 2153141503
       priority: 170
     }
     lines {
@@ -22250,7 +22231,7 @@ cont {
       color: 16316664
       dashdot {
         dd: 8.0
-        dd: 5.5
+        dd: 3.0
       }
       priority: 180
     }
@@ -22267,7 +22248,7 @@ cont {
     scale: 19
     lines {
       width: 1.8
-      color: 861295871
+      color: 2153141503
       priority: 170
     }
     lines {
@@ -22275,7 +22256,7 @@ cont {
       color: 16316664
       dashdot {
         dd: 10.0
-        dd: 6.7
+        dd: 3.5
       }
       priority: 180
     }
@@ -22292,7 +22273,7 @@ cont {
     scale: 20
     lines {
       width: 1.8
-      color: 861295871
+      color: 2153141503
       priority: 170
     }
     lines {
@@ -22300,7 +22281,7 @@ cont {
       color: 16316664
       dashdot {
         dd: 10.0
-        dd: 6.7
+        dd: 3.5
       }
       priority: 180
     }

data/drules_proto_dark.txt

@@ -22142,39 +22142,20 @@ cont {
 }
 cont {
   name: "highway-footway-bicycle"
-  element {
-    scale: 14
-    lines {
-      width: 1.1
-      color: 2154708295
-      priority: 170
-      cap: BUTTCAP
-    }
-    lines {
-      width: 1.1
-      color: 1296778819
-      dashdot {
-        dd: 4.0
-        dd: 3.2
-      }
-      priority: 180
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 15
     lines {
       width: 1.2
-      color: 2154708295
+      color: 2574138695
       priority: 170
       cap: BUTTCAP
     }
     lines {
       width: 1.5
-      color: 659244611
+      color: 1078675011
       dashdot {
         dd: 5.0
-        dd: 3.5
+        dd: 2.0
       }
       priority: 180
       cap: BUTTCAP
@@ -22192,15 +22173,15 @@ cont {
     scale: 16
     lines {
       width: 1.3
-      color: 1718500679
+      color: 2574138695
       priority: 170
     }
     lines {
       width: 2.0
-      color: 659244611
+      color: 1078675011
       dashdot {
         dd: 5.0
-        dd: 3.5
+        dd: 2.0
       }
       priority: 180
     }
@@ -22217,15 +22198,15 @@ cont {
     scale: 17
     lines {
       width: 1.4
-      color: 1718500679
+      color: 2154708295
       priority: 170
     }
     lines {
       width: 2.4
-      color: 4933187
+      color: 1078675011
       dashdot {
         dd: 6.0
-        dd: 4.2
+        dd: 2.5
       }
       priority: 180
     }
@@ -22242,7 +22223,7 @@ cont {
     scale: 18
     lines {
       width: 1.6
-      color: 862862663
+      color: 2154708295
       priority: 170
     }
     lines {
@@ -22250,7 +22231,7 @@ cont {
       color: 4933187
       dashdot {
         dd: 8.0
-        dd: 5.5
+        dd: 3.0
       }
       priority: 180
     }
@@ -22267,7 +22248,7 @@ cont {
     scale: 19
     lines {
       width: 1.8
-      color: 862862663
+      color: 2154708295
       priority: 170
     }
     lines {
@@ -22275,7 +22256,7 @@ cont {
       color: 4933187
       dashdot {
         dd: 10.0
-        dd: 6.7
+        dd: 3.5
       }
       priority: 180
     }
@@ -22292,7 +22273,7 @@ cont {
     scale: 20
     lines {
       width: 1.8
-      color: 862862663
+      color: 2154708295
       priority: 170
     }
     lines {
@@ -22300,7 +22281,7 @@ cont {
       color: 4933187
       dashdot {
         dd: 10.0
-        dd: 6.7
+        dd: 3.5
       }
       priority: 180
     }

data/patterns.txt

@@ -28,11 +28,6 @@
 6.0 2.5
 8.0 3.0
 10.0 3.5
-4.0 3.2
-5.0 3.5
-6.0 4.2
-8.0 5.5
-10.0 6.7
 2.0 1.0
 3.6 1.6
 5.0 2.2
@@ -46,6 +41,7 @@
 6.0 3.5
 8.0 4.5
 3.5 2.7
+4.0 3.2
 6.0 4.7
 8.0 6.2
 1.0 2.0

data/styles/clear/include/Roads.mapcss

@@ -639,8 +639,8 @@ line|z13-[highway=pedestrian],
 line|z13-[highway=ford]
 {color: @pedestrian;opacity: 0.85;}
 line|z13-[highway=cycleway],
-line|z14-[highway=footway][bicycle=designated]::cycleline,
 line|z14-[highway=path][bicycle=designated]::cycleline,
+line|z15-[highway=footway][bicycle=designated]::cycleline,
 {color: @cycleway; opacity: 0.5;}
 line|z13-[highway=construction],
 {color: @construction;opacity: 0.7;}
@@ -674,8 +674,6 @@ line|z14-[highway=bridleway]
 {color: @bridleway;opacity: 0.6;}
 line|z15-[highway=footway],
 {color: @footway;opacity: 0.75;}
-line|z14-[highway=footway][bicycle=designated],
-{color: @footway; opacity: 0.85;}
 line|z15-[highway=steps],
 {color: @footway;opacity: 0.85;}
 line|z14-[highway=path],
@@ -755,7 +753,6 @@ line|z16-[highway=pedestrian][bridge?]::bridgeblack,
 line|z13[highway=cycleway]
 {width: 0.9;}
 line|z14[highway=cycleway],
-line|z14[highway=footway][bicycle=designated]::cycleline,
 line|z14[highway=path][bicycle=designated]::cycleline,
 {width: 1.1;}
 line|z15[highway=cycleway]
@@ -779,6 +776,11 @@ line|z19-[highway=footway][bicycle=designated]::cycleline,
 line|z19-[highway=path][bicycle=designated]::cycleline,
 {width: 1.8; opacity: 0.8;}
 
+line|z15-16[highway=footway][bicycle=designated]::cycleline,
+{opacity: 0.4;}
+line|z17-[highway=footway][bicycle=designated]::cycleline,
+{opacity: 0.5;}
+
 line|z17[highway=cycleway][tunnel?]::tunnelBackground
 {casing-width-add: 1;}
 line|z18[highway=cycleway][tunnel?]::tunnelBackground
@@ -940,19 +942,6 @@ line|z18[highway=footway]
 line|z19-[highway=footway],
 {width: 4.2; dashes: 10,3.5; opacity: 1;}
 
-line|z14[highway=footway][bicycle=designated],
-{width: 1.1; dashes: 4,3.2; opacity: 0.7;}
-line|z15[highway=footway][bicycle=designated],
-{width: 1.5; dashes: 5,3.5;}
-line|z16[highway=footway][bicycle=designated],
-{width: 2; dashes: 5,3.5;}
-line|z17[highway=footway][bicycle=designated],
-{width: 2.4; dashes: 6,4.2; opacity: 1;}
-line|z18[highway=footway][bicycle=designated],
-{width: 3.2; dashes: 8,5.5; opacity: 1;}
-line|z19-[highway=footway][bicycle=designated],
-{width: 4.2; dashes: 10,6.7; opacity: 1;}
-
 /* Don't display sidewalks and pedestrian crossings on z15. */
 line|z15[highway=footway][footway=sidewalk],
 line|z15[highway=footway][footway=crossing],

data/styles/clear/include/priorities_3_FG.prio.txt

@@ -269,7 +269,7 @@ highway-bridleway-bridge                            # line z14- (also has line::
 highway-bridleway-tunnel                            # line z14- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
 highway-footway                                     # line z15- (also has pathtext z15-)
 highway-footway-area                                # line z15- and area z14- (also has pathtext z15-)
-highway-footway-bicycle                             # line z14- (also has line::cycleline z14-, pathtext z15-)
+highway-footway-bicycle                             # line z15- (also has line::cycleline z15-, pathtext z15-)
 highway-path                                        # line z14- (also has pathtext z15-)
 highway-path-bicycle                                # line z14- (also has line::cycleline z14-, pathtext z15-)
 highway-path-difficult                              # line z14- (also has pathtext z15-)
@@ -282,7 +282,7 @@ highway-track-no-access                             # line z14- (also has pathte
 highway-track-tunnel                                # line z14- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
 === 180
 
-highway-footway-bicycle::cycleline                  # line::cycleline z14- (also has line z14-, pathtext z15-)
+highway-footway-bicycle::cycleline                  # line::cycleline z15- (also has line z15-, pathtext z15-)
 highway-path-bicycle::cycleline                     # line::cycleline z14- (also has line z14-, pathtext z15-)
 === 170
 

data/styles/clear/include/priorities_4_overlays.prio.txt

@@ -663,7 +663,7 @@ highway-cycleway-tunnel                             # pathtext z15- (also has li
 area:highway-footway                                # caption z15- (also has area z14-)
 highway-footway                                     # pathtext z15- (also has line z15-)
 highway-footway-area                                # pathtext z15- (also has line z15-, area z14-)
-highway-footway-bicycle                             # pathtext z15- (also has line z14-, line::cycleline z14-)
+highway-footway-bicycle                             # pathtext z15- (also has line z15-, line::cycleline z15-)
 highway-footway-bridge                              # pathtext z15- (also has line z15-, line::bridgeblack z17-, line::bridgewhite z15-)
 highway-footway-tunnel                              # pathtext z15- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
 highway-tertiary_link                               # pathtext z18- (also has line z14-)