From be81dbef1df122adb5b78a4d20b02085738abf21 Mon Sep 17 00:00:00 2001
From: vng <viktor.govako@gmail.com>
Date: Thu, 25 Sep 2014 21:29:24 +0300
Subject: [styles] Fixed railway=halt captions.

---
 data/drules_proto-bw.txt | 3029 +++++++++++++---------------------------------
 1 file changed, 810 insertions(+), 2219 deletions(-)

(limited to 'data/drules_proto-bw.txt')

diff --git a/data/drules_proto-bw.txt b/data/drules_proto-bw.txt
index b7d57daf51..a2e92d88aa 100644
--- a/data/drules_proto-bw.txt
+++ b/data/drules_proto-bw.txt
@@ -1183,6 +1183,45 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-bbq"
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 11
+        color: 0
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15002
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 11
+        color: 0
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15002
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 11
+        color: 0
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15002
+    }
+  }
+}
 cont {
   name: "amenity-bench"
   element {
@@ -4430,6 +4469,13 @@ cont {
       color: 14535867
       priority: 1368
     }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+      }
+      priority: 15367
+    }
   }
   element {
     scale: 16
@@ -4437,6 +4483,13 @@ cont {
       color: 14535867
       priority: 1368
     }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+      }
+      priority: 15367
+    }
   }
   element {
     scale: 17
@@ -4444,6 +4497,13 @@ cont {
       color: 14535867
       priority: 1368
     }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+      }
+      priority: 15367
+    }
   }
   element {
     scale: 18
@@ -4451,6 +4511,13 @@ cont {
       color: 14535867
       priority: 1368
     }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+      }
+      priority: 15367
+    }
   }
   element {
     scale: 19
@@ -4458,6 +4525,13 @@ cont {
       color: 14535867
       priority: 1368
     }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+      }
+      priority: 15367
+    }
   }
 }
 cont {
@@ -4582,6 +4656,13 @@ cont {
       color: 12303257
       priority: 1368
     }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+      }
+      priority: 15367
+    }
   }
   element {
     scale: 16
@@ -4589,6 +4670,13 @@ cont {
       color: 12303257
       priority: 1368
     }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+      }
+      priority: 15367
+    }
   }
   element {
     scale: 17
@@ -4596,6 +4684,13 @@ cont {
       color: 12303257
       priority: 1368
     }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+      }
+      priority: 15367
+    }
   }
   element {
     scale: 18
@@ -4603,6 +4698,13 @@ cont {
       color: 12303257
       priority: 1368
     }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+      }
+      priority: 15367
+    }
   }
   element {
     scale: 19
@@ -4610,6 +4712,13 @@ cont {
       color: 12303257
       priority: 1368
     }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+      }
+      priority: 15367
+    }
   }
 }
 cont {
@@ -8210,163 +8319,6 @@ cont {
     }
   }
 }
-cont {
-  name: "highway-bridleway-private"
-  element {
-    scale: 13
-    lines {
-      width: 2.5
-      color: 6710886
-      priority: 999
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 0.9
-      color: 11197781
-      priority: 1000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 3.2
-      color: 6710886
-      priority: 999
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 1.6
-      color: 8960836
-      priority: 1000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 4.8
-      color: 6710886
-      priority: 999
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 3.2
-      color: 14535833
-      priority: 1000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16000
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 8.0
-      color: 6710886
-      priority: 999
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 6.4
-      color: 14535833
-      priority: 1000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 8.4
-      color: 6710886
-      priority: 999
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 6.8
-      color: 14535833
-      priority: 1000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 8.4
-      color: 6710886
-      priority: 999
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 6.8
-      color: 14535833
-      priority: 1000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 8.4
-      color: 6710886
-      priority: 999
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 6.8
-      color: 14535833
-      priority: 1000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16000
-    }
-  }
-}
 cont {
   name: "highway-bridleway-tunnel"
   element {
@@ -9146,104 +9098,6 @@ cont {
     }
   }
 }
-cont {
-  name: "highway-cycleway-private"
-  element {
-    scale: 14
-    lines {
-      width: 1.0
-      color: 4504388
-      priority: 1028
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.0
-      color: 10075033
-      priority: 1028
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16028
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 2.0
-      color: 10075033
-      priority: 1028
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16028
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 3.0
-      color: 10075033
-      priority: 1028
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16028
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 3.0
-      color: 10075033
-      priority: 1028
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16028
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 3.0
-      color: 10075033
-      priority: 1028
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16028
-    }
-  }
-}
 cont {
   name: "highway-cycleway-tunnel"
   element {
@@ -9727,12 +9581,12 @@ cont {
       color: 14535867
       priority: 1027
     }
-    path_text {
+    caption {
       primary {
-        height: 10
+        height: 11
         color: 0
       }
-      priority: 16026
+      priority: 15026
     }
   }
   element {
@@ -9741,87 +9595,54 @@ cont {
       color: 14535867
       priority: 1027
     }
-    path_text {
+    caption {
       primary {
-        height: 10
+        height: 11
         color: 0
       }
-      priority: 16026
+      priority: 15026
     }
   }
   element {
     scale: 17
-    lines {
-      width: 4.0
-      color: 14535867
-      dashdot {
-        dd: 1.0
-        dd: 3.0
-      }
-      priority: 1736
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
     area {
-      color: 14535867
+      color: 16777198
       priority: 1027
     }
-    path_text {
+    caption {
       primary {
-        height: 10
+        height: 11
         color: 0
       }
-      priority: 16026
+      priority: 15026
     }
   }
   element {
     scale: 18
-    lines {
-      width: 8.0
-      color: 14535867
-      dashdot {
-        dd: 1.0
-        dd: 3.0
-      }
-      priority: 1736
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
     area {
-      color: 14535867
+      color: 16777198
       priority: 1027
     }
-    path_text {
+    caption {
       primary {
-        height: 10
+        height: 11
         color: 0
       }
-      priority: 16026
+      priority: 15026
     }
   }
   element {
     scale: 19
-    lines {
-      width: 16.0
-      color: 14535867
-      dashdot {
-        dd: 1.0
-        dd: 4.0
-      }
-      priority: 1736
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
     area {
-      color: 14535867
+      color: 16777198
       priority: 1027
     }
-    path_text {
+    caption {
       primary {
-        height: 10
+        height: 11
         color: 0
       }
-      priority: 16026
+      priority: 15026
     }
   }
 }
@@ -11018,159 +10839,6 @@ cont {
     }
   }
 }
-cont {
-  name: "highway-footway-private"
-  element {
-    scale: 13
-    lines {
-      width: 1.0
-      color: 14535867
-      dashdot {
-        dd: 4.0
-        dd: 4.0
-      }
-      priority: 1026
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.0
-      color: 14535867
-      dashdot {
-        dd: 4.0
-        dd: 4.0
-      }
-      priority: 1026
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.0
-      color: 14535867
-      dashdot {
-        dd: 4.0
-        dd: 4.0
-      }
-      priority: 1026
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16026
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 2.0
-      color: 14535867
-      priority: 1026
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16026
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 5.0
-      color: 14535867
-      priority: 1026
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 4.0
-      color: 14535867
-      dashdot {
-        dd: 1.0
-        dd: 3.0
-      }
-      priority: 1736
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16026
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 9.0
-      color: 14535867
-      priority: 1026
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 8.0
-      color: 14535867
-      dashdot {
-        dd: 1.0
-        dd: 3.0
-      }
-      priority: 1736
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16026
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 17.0
-      color: 14535867
-      priority: 1026
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 16.0
-      color: 14535867
-      dashdot {
-        dd: 1.0
-        dd: 4.0
-      }
-      priority: 1736
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16026
-    }
-  }
-}
 cont {
   name: "highway-footway-tunnel"
   element {
@@ -16145,7 +15813,7 @@ cont {
   }
 }
 cont {
-  name: "highway-path-private"
+  name: "highway-path-tunnel"
   element {
     scale: 13
     lines {
@@ -16187,6 +15855,24 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
+    lines {
+      width: 9.0
+      color: 16777215
+      priority: 1007
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
+      width: 11.0
+      color: 7829367
+      dashdot {
+        dd: 5.0
+        dd: 5.0
+      }
+      priority: 1004
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -16208,6 +15894,24 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
+    lines {
+      width: 9.0
+      color: 16777215
+      priority: 1007
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
+      width: 11.0
+      color: 7829367
+      dashdot {
+        dd: 5.0
+        dd: 5.0
+      }
+      priority: 1004
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -16228,196 +15932,24 @@ cont {
       priority: 1026
       join: ROUNDJOIN
       cap: ROUNDCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16026
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.0
-      color: 14522675
-      dashdot {
-        dd: 4.0
-        dd: 4.0
-      }
-      priority: 1026
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16026
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.0
-      color: 14522675
-      dashdot {
-        dd: 4.0
-        dd: 4.0
-      }
-      priority: 1026
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16026
-    }
-  }
-}
-cont {
-  name: "highway-path-tunnel"
-  element {
-    scale: 13
-    lines {
-      width: 1.0
-      color: 14522675
-      dashdot {
-        dd: 4.0
-        dd: 4.0
-      }
-      priority: 1026
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.0
-      color: 14522675
-      dashdot {
-        dd: 4.0
-        dd: 4.0
-      }
-      priority: 1026
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.0
-      color: 14522675
-      dashdot {
-        dd: 4.0
-        dd: 4.0
-      }
-      priority: 1026
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 9.0
-      color: 16777215
-      priority: 1007
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 11.0
-      color: 7829367
-      dashdot {
-        dd: 5.0
-        dd: 5.0
-      }
-      priority: 1004
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16026
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 1.0
-      color: 14522675
-      dashdot {
-        dd: 4.0
-        dd: 4.0
-      }
-      priority: 1026
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 9.0
-      color: 16777215
-      priority: 1007
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 11.0
-      color: 7829367
-      dashdot {
-        dd: 5.0
-        dd: 5.0
-      }
-      priority: 1004
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16026
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 1.0
-      color: 14522675
-      dashdot {
-        dd: 4.0
-        dd: 4.0
-      }
-      priority: 1026
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 9.0
-      color: 16777215
-      priority: 1007
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 11.0
-      color: 7829367
-      dashdot {
-        dd: 5.0
-        dd: 5.0
-      }
-      priority: 1004
-      join: ROUNDJOIN
-      cap: BUTTCAP
+    }
+    lines {
+      width: 9.0
+      color: 16777215
+      priority: 1007
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
+      width: 11.0
+      color: 7829367
+      dashdot {
+        dd: 5.0
+        dd: 5.0
+      }
+      priority: 1004
+      join: ROUNDJOIN
+      cap: BUTTCAP
     }
     path_text {
       primary {
@@ -16517,10 +16049,6 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    area {
-      color: 12303257
-      priority: 1027
-    }
     path_text {
       primary {
         height: 10
@@ -16538,10 +16066,6 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    area {
-      color: 12303257
-      priority: 1027
-    }
     path_text {
       primary {
         height: 10
@@ -16559,10 +16083,6 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    area {
-      color: 12303257
-      priority: 1027
-    }
     path_text {
       primary {
         height: 10
@@ -16580,10 +16100,6 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    area {
-      color: 12303257
-      priority: 1027
-    }
     path_text {
       primary {
         height: 10
@@ -16601,10 +16117,6 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    area {
-      color: 12303257
-      priority: 1027
-    }
     path_text {
       primary {
         height: 10
@@ -16622,12 +16134,12 @@ cont {
       color: 12303257
       priority: 1027
     }
-    path_text {
+    caption {
       primary {
-        height: 10
+        height: 11
         color: 0
       }
-      priority: 16026
+      priority: 15026
     }
   }
   element {
@@ -16636,12 +16148,12 @@ cont {
       color: 12303257
       priority: 1027
     }
-    path_text {
+    caption {
       primary {
-        height: 10
+        height: 11
         color: 0
       }
-      priority: 16026
+      priority: 15026
     }
   }
   element {
@@ -16650,12 +16162,12 @@ cont {
       color: 12303257
       priority: 1027
     }
-    path_text {
+    caption {
       primary {
-        height: 10
+        height: 11
         color: 0
       }
-      priority: 16026
+      priority: 15026
     }
   }
   element {
@@ -16664,12 +16176,12 @@ cont {
       color: 12303257
       priority: 1027
     }
-    path_text {
+    caption {
       primary {
-        height: 10
+        height: 11
         color: 0
       }
-      priority: 16026
+      priority: 15026
     }
   }
   element {
@@ -16678,12 +16190,12 @@ cont {
       color: 12303257
       priority: 1027
     }
-    path_text {
+    caption {
       primary {
-        height: 10
+        height: 11
         color: 0
       }
-      priority: 16026
+      priority: 15026
     }
   }
 }
@@ -16712,10 +16224,6 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-    area {
-      color: 12303257
-      priority: 1027
-    }
     path_text {
       primary {
         height: 10
@@ -16747,10 +16255,6 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-    area {
-      color: 12303257
-      priority: 1027
-    }
     path_text {
       primary {
         height: 10
@@ -16782,10 +16286,6 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-    area {
-      color: 12303257
-      priority: 1027
-    }
     path_text {
       primary {
         height: 10
@@ -16817,10 +16317,6 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-    area {
-      color: 12303257
-      priority: 1027
-    }
     path_text {
       primary {
         height: 10
@@ -16852,10 +16348,6 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-    area {
-      color: 12303257
-      priority: 1027
-    }
     path_text {
       primary {
         height: 10
@@ -16894,10 +16386,6 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-    area {
-      color: 12303257
-      priority: 1027
-    }
     path_text {
       primary {
         height: 10
@@ -16933,10 +16421,6 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-    area {
-      color: 12303257
-      priority: 1027
-    }
     path_text {
       primary {
         height: 10
@@ -16972,10 +16456,6 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-    area {
-      color: 12303257
-      priority: 1027
-    }
     path_text {
       primary {
         height: 10
@@ -17011,10 +16491,6 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-    area {
-      color: 12303257
-      priority: 1027
-    }
     path_text {
       primary {
         height: 10
@@ -17050,10 +16526,6 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-    area {
-      color: 12303257
-      priority: 1027
-    }
     path_text {
       primary {
         height: 10
@@ -19399,14 +18871,6 @@ cont {
       color: 16777215
       priority: 1035
     }
-    path_text {
-      primary {
-        height: 12
-        color: 0
-        stroke_color: 16777215
-      }
-      priority: 16034
-    }
   }
   element {
     scale: 15
@@ -19414,14 +18878,6 @@ cont {
       color: 16777215
       priority: 1035
     }
-    path_text {
-      primary {
-        height: 12
-        color: 0
-        stroke_color: 16777215
-      }
-      priority: 16034
-    }
   }
   element {
     scale: 16
@@ -19429,14 +18885,6 @@ cont {
       color: 16777215
       priority: 1035
     }
-    path_text {
-      primary {
-        height: 12
-        color: 0
-        stroke_color: 16777215
-      }
-      priority: 16034
-    }
   }
   element {
     scale: 17
@@ -19444,14 +18892,6 @@ cont {
       color: 16777215
       priority: 1035
     }
-    path_text {
-      primary {
-        height: 12
-        color: 0
-        stroke_color: 16777215
-      }
-      priority: 16034
-    }
   }
   element {
     scale: 18
@@ -19459,14 +18899,6 @@ cont {
       color: 16777215
       priority: 1035
     }
-    path_text {
-      primary {
-        height: 12
-        color: 0
-        stroke_color: 16777215
-      }
-      priority: 16034
-    }
   }
   element {
     scale: 19
@@ -19474,14 +18906,6 @@ cont {
       color: 16777215
       priority: 1035
     }
-    path_text {
-      primary {
-        height: 12
-        color: 0
-        stroke_color: 16777215
-      }
-      priority: 16034
-    }
   }
 }
 cont {
@@ -19725,7 +19149,7 @@ cont {
   }
 }
 cont {
-  name: "highway-residential-private"
+  name: "highway-residential-tunnel"
   element {
     scale: 13
     lines {
@@ -19784,6 +19208,24 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
+    lines {
+      width: 12.0
+      color: 16777215
+      priority: 1007
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
+      width: 14.0
+      color: 7829367
+      dashdot {
+        dd: 5.0
+        dd: 5.0
+      }
+      priority: 1004
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 12
@@ -19809,6 +19251,24 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
+    lines {
+      width: 14.0
+      color: 16777215
+      priority: 1007
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
+      width: 16.0
+      color: 7829367
+      dashdot {
+        dd: 5.0
+        dd: 5.0
+      }
+      priority: 1004
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 12
@@ -19834,6 +19294,24 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
+    lines {
+      width: 16.0
+      color: 16777215
+      priority: 1007
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
+      width: 18.0
+      color: 7829367
+      dashdot {
+        dd: 5.0
+        dd: 5.0
+      }
+      priority: 1004
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 12
@@ -19859,6 +19337,24 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
+    lines {
+      width: 31.0
+      color: 16777215
+      priority: 1007
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
+      width: 33.0
+      color: 7829367
+      dashdot {
+        dd: 5.0
+        dd: 5.0
+      }
+      priority: 1004
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 12
@@ -19884,6 +19380,24 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
+    lines {
+      width: 49.0
+      color: 16777215
+      priority: 1007
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
+      width: 51.0
+      color: 7829367
+      dashdot {
+        dd: 5.0
+        dd: 5.0
+      }
+      priority: 1004
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 12
@@ -19895,20 +19409,20 @@ cont {
   }
 }
 cont {
-  name: "highway-residential-tunnel"
+  name: "highway-road"
   element {
     scale: 13
     lines {
       width: 2.6
       color: 6710886
-      priority: 1033
+      priority: 999
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
-      color: 16777215
-      priority: 1034
+      color: 14540253
+      priority: 1000
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -19916,16 +19430,16 @@ cont {
   element {
     scale: 14
     lines {
-      width: 3.6
+      width: 5.1
       color: 6710886
-      priority: 1033
+      priority: 999
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.0
-      color: 16777215
-      priority: 1034
+      width: 3.5
+      color: 14540253
+      priority: 1000
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -19933,229 +19447,135 @@ cont {
       primary {
         height: 12
         color: 0
-        stroke_color: 16777215
+        stroke_color: 14540253
       }
-      priority: 16034
+      priority: 16000
     }
   }
   element {
     scale: 15
     lines {
-      width: 5.6
+      width: 8.6
       color: 6710886
-      priority: 1033
+      priority: 999
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 4.0
-      color: 16777215
-      priority: 1034
+      width: 7.0
+      color: 14540253
+      priority: 1000
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    lines {
-      width: 12.0
-      color: 16777215
-      priority: 1007
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 14.0
-      color: 7829367
-      dashdot {
-        dd: 5.0
-        dd: 5.0
-      }
-      priority: 1004
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
     path_text {
       primary {
-        height: 12
+        height: 10
         color: 0
-        stroke_color: 16777215
+        stroke_color: 14540253
       }
-      priority: 16034
+      priority: 16000
     }
   }
   element {
     scale: 16
     lines {
-      width: 7.6
+      width: 10.6
       color: 6710886
-      priority: 1033
+      priority: 999
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 6.0
-      color: 16777215
-      priority: 1034
+      width: 9.0
+      color: 14540253
+      priority: 1000
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    lines {
-      width: 14.0
-      color: 16777215
-      priority: 1007
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 16.0
-      color: 7829367
-      dashdot {
-        dd: 5.0
-        dd: 5.0
-      }
-      priority: 1004
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
     path_text {
       primary {
-        height: 12
+        height: 10
         color: 0
-        stroke_color: 16777215
       }
-      priority: 16034
+      priority: 16000
     }
   }
   element {
     scale: 17
     lines {
-      width: 9.6
+      width: 11.6
       color: 6710886
-      priority: 1033
+      priority: 999
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 8.0
-      color: 16777215
-      priority: 1034
+      width: 10.0
+      color: 14540253
+      priority: 1000
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    lines {
-      width: 16.0
-      color: 16777215
-      priority: 1007
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 18.0
-      color: 7829367
-      dashdot {
-        dd: 5.0
-        dd: 5.0
-      }
-      priority: 1004
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
     path_text {
       primary {
-        height: 12
+        height: 10
         color: 0
-        stroke_color: 16777215
       }
-      priority: 16034
+      priority: 16000
     }
   }
   element {
     scale: 18
     lines {
-      width: 24.6
+      width: 11.6
       color: 6710886
-      priority: 1033
+      priority: 999
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 23.0
-      color: 16777215
-      priority: 1034
+      width: 10.0
+      color: 14540253
+      priority: 1000
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    lines {
-      width: 31.0
-      color: 16777215
-      priority: 1007
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 33.0
-      color: 7829367
-      dashdot {
-        dd: 5.0
-        dd: 5.0
-      }
-      priority: 1004
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
     path_text {
       primary {
-        height: 12
+        height: 10
         color: 0
-        stroke_color: 16777215
       }
-      priority: 16034
+      priority: 16000
     }
   }
   element {
     scale: 19
     lines {
-      width: 42.6
+      width: 11.6
       color: 6710886
-      priority: 1033
+      priority: 999
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 41.0
-      color: 16777215
-      priority: 1034
+      width: 10.0
+      color: 14540253
+      priority: 1000
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    lines {
-      width: 49.0
-      color: 16777215
-      priority: 1007
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 51.0
-      color: 7829367
-      dashdot {
-        dd: 5.0
-        dd: 5.0
-      }
-      priority: 1004
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
     path_text {
       primary {
-        height: 12
+        height: 10
         color: 0
-        stroke_color: 16777215
       }
-      priority: 16034
+      priority: 16000
     }
   }
 }
 cont {
-  name: "highway-road"
+  name: "highway-road-bridge"
   element {
     scale: 13
     lines {
@@ -20214,6 +19634,20 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
+    lines {
+      width: 15.0
+      color: 16777215
+      priority: 1007
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
+      width: 17.0
+      color: 7829367
+      priority: 1004
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -20239,6 +19673,20 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
+    lines {
+      width: 17.0
+      color: 16777215
+      priority: 1007
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
+      width: 19.0
+      color: 7829367
+      priority: 1004
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -20263,6 +19711,20 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
+    lines {
+      width: 18.0
+      color: 16777215
+      priority: 1007
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
+      width: 20.0
+      color: 7829367
+      priority: 1004
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -20287,6 +19749,20 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
+    lines {
+      width: 18.0
+      color: 16777215
+      priority: 1007
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
+      width: 20.0
+      color: 7829367
+      priority: 1004
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -20311,6 +19787,20 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
+    lines {
+      width: 18.0
+      color: 16777215
+      priority: 1007
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
+      width: 20.0
+      color: 7829367
+      priority: 1004
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -20321,7 +19811,7 @@ cont {
   }
 }
 cont {
-  name: "highway-road-bridge"
+  name: "highway-road-tunnel"
   element {
     scale: 13
     lines {
@@ -20390,6 +19880,10 @@ cont {
     lines {
       width: 17.0
       color: 7829367
+      dashdot {
+        dd: 5.0
+        dd: 5.0
+      }
       priority: 1004
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -20429,6 +19923,10 @@ cont {
     lines {
       width: 19.0
       color: 7829367
+      dashdot {
+        dd: 5.0
+        dd: 5.0
+      }
       priority: 1004
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -20467,6 +19965,10 @@ cont {
     lines {
       width: 20.0
       color: 7829367
+      dashdot {
+        dd: 5.0
+        dd: 5.0
+      }
       priority: 1004
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -20505,6 +20007,10 @@ cont {
     lines {
       width: 20.0
       color: 7829367
+      dashdot {
+        dd: 5.0
+        dd: 5.0
+      }
       priority: 1004
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -20543,6 +20049,10 @@ cont {
     lines {
       width: 20.0
       color: 7829367
+      dashdot {
+        dd: 5.0
+        dd: 5.0
+      }
       priority: 1004
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -20557,263 +20067,253 @@ cont {
   }
 }
 cont {
-  name: "highway-road-tunnel"
+  name: "highway-secondary"
   element {
-    scale: 13
+    scale: 9
     lines {
       width: 2.6
       color: 6710886
-      priority: 999
+      priority: 1039
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 14540253
-      priority: 1000
+      priority: 1040
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
   }
   element {
-    scale: 14
+    scale: 10
     lines {
-      width: 5.1
+      width: 2.6
       color: 6710886
-      priority: 999
+      priority: 1039
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 3.5
+      width: 1.0
       color: 14540253
-      priority: 1000
+      priority: 1040
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 12
-        color: 0
-        stroke_color: 14540253
-      }
-      priority: 16000
-    }
   }
   element {
-    scale: 15
+    scale: 11
     lines {
-      width: 8.6
+      width: 3.6
       color: 6710886
-      priority: 999
+      priority: 1039
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 7.0
+      width: 2.0
       color: 14540253
-      priority: 1000
+      priority: 1040
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
+  }
+  element {
+    scale: 12
     lines {
-      width: 15.0
-      color: 16777215
-      priority: 1007
+      width: 4.6
+      color: 6710886
+      priority: 1039
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 17.0
-      color: 7829367
-      dashdot {
-        dd: 5.0
-        dd: 5.0
-      }
-      priority: 1004
+      width: 3.0
+      color: 14540253
+      priority: 1040
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 5.6
+      color: 6710886
+      priority: 1039
       join: ROUNDJOIN
       cap: BUTTCAP
     }
+    lines {
+      width: 4.0
+      color: 14540253
+      priority: 1040
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 0
         stroke_color: 14540253
       }
-      priority: 16000
+      priority: 16040
     }
   }
   element {
-    scale: 16
+    scale: 14
     lines {
-      width: 10.6
+      width: 6.6
       color: 6710886
-      priority: 999
+      priority: 1039
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 9.0
+      width: 5.0
       color: 14540253
-      priority: 1000
+      priority: 1040
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
+    path_text {
+      primary {
+        height: 12
+        color: 0
+        stroke_color: 14540253
+      }
+      priority: 16040
+    }
+  }
+  element {
+    scale: 15
     lines {
-      width: 17.0
-      color: 16777215
-      priority: 1007
+      width: 8.6
+      color: 6710886
+      priority: 1039
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 19.0
-      color: 7829367
-      dashdot {
-        dd: 5.0
-        dd: 5.0
-      }
-      priority: 1004
+      width: 7.0
+      color: 14540253
+      priority: 1040
       join: ROUNDJOIN
-      cap: BUTTCAP
+      cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 0
+        stroke_color: 14540253
       }
-      priority: 16000
+      priority: 16040
     }
   }
   element {
-    scale: 17
+    scale: 16
     lines {
-      width: 11.6
+      width: 12.6
       color: 6710886
-      priority: 999
+      priority: 1039
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 10.0
+      width: 11.0
       color: 14540253
-      priority: 1000
+      priority: 1040
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
+    path_text {
+      primary {
+        height: 14
+        color: 0
+        stroke_color: 14540253
+      }
+      priority: 16040
+    }
+  }
+  element {
+    scale: 17
     lines {
-      width: 18.0
-      color: 16777215
-      priority: 1007
+      width: 15.6
+      color: 6710886
+      priority: 1039
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 20.0
-      color: 7829367
-      dashdot {
-        dd: 5.0
-        dd: 5.0
-      }
-      priority: 1004
+      width: 14.0
+      color: 14540253
+      priority: 1040
       join: ROUNDJOIN
-      cap: BUTTCAP
+      cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 16
         color: 0
+        stroke_color: 14540253
       }
-      priority: 16000
+      priority: 16040
     }
   }
   element {
     scale: 18
     lines {
-      width: 11.6
+      width: 24.6
       color: 6710886
-      priority: 999
+      priority: 1039
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 10.0
+      width: 23.0
       color: 14540253
-      priority: 1000
+      priority: 1040
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    lines {
-      width: 18.0
-      color: 16777215
-      priority: 1007
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 20.0
-      color: 7829367
-      dashdot {
-        dd: 5.0
-        dd: 5.0
-      }
-      priority: 1004
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
     path_text {
       primary {
-        height: 10
+        height: 16
         color: 0
+        stroke_color: 14540253
       }
-      priority: 16000
+      priority: 16040
     }
   }
   element {
     scale: 19
     lines {
-      width: 11.6
+      width: 42.6
       color: 6710886
-      priority: 999
+      priority: 1039
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 10.0
+      width: 41.0
       color: 14540253
-      priority: 1000
+      priority: 1040
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    lines {
-      width: 18.0
-      color: 16777215
-      priority: 1007
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 20.0
-      color: 7829367
-      dashdot {
-        dd: 5.0
-        dd: 5.0
-      }
-      priority: 1004
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
     path_text {
       primary {
-        height: 10
+        height: 16
         color: 0
+        stroke_color: 14540253
       }
-      priority: 16000
+      priority: 16040
     }
   }
 }
 cont {
-  name: "highway-secondary"
+  name: "highway-secondary-bridge"
   element {
     scale: 9
     lines {
@@ -20948,6 +20448,20 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
+    lines {
+      width: 15.0
+      color: 16777215
+      priority: 1007
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
+      width: 17.0
+      color: 7829367
+      priority: 1004
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 12
@@ -20973,6 +20487,20 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
+    lines {
+      width: 19.0
+      color: 16777215
+      priority: 1007
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
+      width: 21.0
+      color: 7829367
+      priority: 1004
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 14
@@ -20998,6 +20526,20 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
+    lines {
+      width: 22.0
+      color: 16777215
+      priority: 1007
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
+      width: 24.0
+      color: 7829367
+      priority: 1004
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 16
@@ -21023,6 +20565,20 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
+    lines {
+      width: 31.0
+      color: 16777215
+      priority: 1007
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
+      width: 33.0
+      color: 7829367
+      priority: 1004
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 16
@@ -21048,6 +20604,20 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
+    lines {
+      width: 49.0
+      color: 16777215
+      priority: 1007
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
+      width: 51.0
+      color: 7829367
+      priority: 1004
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 16
@@ -21059,7 +20629,7 @@ cont {
   }
 }
 cont {
-  name: "highway-secondary-bridge"
+  name: "highway-secondary-tunnel"
   element {
     scale: 9
     lines {
@@ -21204,6 +20774,10 @@ cont {
     lines {
       width: 17.0
       color: 7829367
+      dashdot {
+        dd: 5.0
+        dd: 5.0
+      }
       priority: 1004
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -21243,6 +20817,10 @@ cont {
     lines {
       width: 21.0
       color: 7829367
+      dashdot {
+        dd: 5.0
+        dd: 5.0
+      }
       priority: 1004
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -21282,6 +20860,10 @@ cont {
     lines {
       width: 24.0
       color: 7829367
+      dashdot {
+        dd: 5.0
+        dd: 5.0
+      }
       priority: 1004
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -21321,6 +20903,10 @@ cont {
     lines {
       width: 33.0
       color: 7829367
+      dashdot {
+        dd: 5.0
+        dd: 5.0
+      }
       priority: 1004
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -21360,6 +20946,10 @@ cont {
     lines {
       width: 51.0
       color: 7829367
+      dashdot {
+        dd: 5.0
+        dd: 5.0
+      }
       priority: 1004
       join: ROUNDJOIN
       cap: BUTTCAP
@@ -21375,24 +20965,7 @@ cont {
   }
 }
 cont {
-  name: "highway-secondary-tunnel"
-  element {
-    scale: 9
-    lines {
-      width: 2.6
-      color: 6710886
-      priority: 1039
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 1.0
-      color: 14540253
-      priority: 1040
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
+  name: "highway-secondary_link"
   element {
     scale: 10
     lines {
@@ -21413,14 +20986,14 @@ cont {
   element {
     scale: 11
     lines {
-      width: 3.6
+      width: 2.6
       color: 6710886
       priority: 1039
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.0
+      width: 1.0
       color: 14540253
       priority: 1040
       join: ROUNDJOIN
@@ -21430,14 +21003,14 @@ cont {
   element {
     scale: 12
     lines {
-      width: 4.6
+      width: 2.6
       color: 6710886
       priority: 1039
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 3.0
+      width: 1.0
       color: 14540253
       priority: 1040
       join: ROUNDJOIN
@@ -21447,39 +21020,31 @@ cont {
   element {
     scale: 13
     lines {
-      width: 5.6
+      width: 3.6
       color: 6710886
       priority: 1039
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 4.0
+      width: 2.0
       color: 14540253
       priority: 1040
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 12
-        color: 0
-        stroke_color: 14540253
-      }
-      priority: 16040
-    }
   }
   element {
     scale: 14
     lines {
-      width: 6.6
+      width: 6.1
       color: 6710886
       priority: 1039
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 5.0
+      width: 4.5
       color: 14540253
       priority: 1040
       join: ROUNDJOIN
@@ -21497,37 +21062,19 @@ cont {
   element {
     scale: 15
     lines {
-      width: 8.6
+      width: 10.6
       color: 6710886
       priority: 1039
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 7.0
+      width: 9.0
       color: 14540253
       priority: 1040
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    lines {
-      width: 15.0
-      color: 16777215
-      priority: 1007
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 17.0
-      color: 7829367
-      dashdot {
-        dd: 5.0
-        dd: 5.0
-      }
-      priority: 1004
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
     path_text {
       primary {
         height: 12
@@ -21540,40 +21087,22 @@ cont {
   element {
     scale: 16
     lines {
-      width: 12.6
+      width: 13.6
       color: 6710886
       priority: 1039
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 11.0
+      width: 12.0
       color: 14540253
       priority: 1040
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    lines {
-      width: 19.0
-      color: 16777215
-      priority: 1007
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 21.0
-      color: 7829367
-      dashdot {
-        dd: 5.0
-        dd: 5.0
-      }
-      priority: 1004
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
     path_text {
       primary {
-        height: 14
+        height: 12
         color: 0
         stroke_color: 14540253
       }
@@ -21583,40 +21112,22 @@ cont {
   element {
     scale: 17
     lines {
-      width: 15.6
+      width: 13.6
       color: 6710886
       priority: 1039
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 14.0
+      width: 12.0
       color: 14540253
       priority: 1040
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    lines {
-      width: 22.0
-      color: 16777215
-      priority: 1007
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 24.0
-      color: 7829367
-      dashdot {
-        dd: 5.0
-        dd: 5.0
-      }
-      priority: 1004
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
     path_text {
       primary {
-        height: 16
+        height: 12
         color: 0
         stroke_color: 14540253
       }
@@ -21639,27 +21150,9 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    lines {
-      width: 31.0
-      color: 16777215
-      priority: 1007
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 33.0
-      color: 7829367
-      dashdot {
-        dd: 5.0
-        dd: 5.0
-      }
-      priority: 1004
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
     path_text {
       primary {
-        height: 16
+        height: 12
         color: 0
         stroke_color: 14540253
       }
@@ -21682,27 +21175,9 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    lines {
-      width: 49.0
-      color: 16777215
-      priority: 1007
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 51.0
-      color: 7829367
-      dashdot {
-        dd: 5.0
-        dd: 5.0
-      }
-      priority: 1004
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
     path_text {
       primary {
-        height: 16
+        height: 12
         color: 0
         stroke_color: 14540253
       }
@@ -21711,7 +21186,7 @@ cont {
   }
 }
 cont {
-  name: "highway-secondary_link"
+  name: "highway-secondary_link-bridge"
   element {
     scale: 10
     lines {
@@ -21820,241 +21295,20 @@ cont {
       priority: 1040
       join: ROUNDJOIN
       cap: ROUNDCAP
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 0
-        stroke_color: 14540253
-      }
-      priority: 16040
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 13.6
-      color: 6710886
-      priority: 1039
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 12.0
-      color: 14540253
-      priority: 1040
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 0
-        stroke_color: 14540253
-      }
-      priority: 16040
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 13.6
-      color: 6710886
-      priority: 1039
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 12.0
-      color: 14540253
-      priority: 1040
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 0
-        stroke_color: 14540253
-      }
-      priority: 16040
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 24.6
-      color: 6710886
-      priority: 1039
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 23.0
-      color: 14540253
-      priority: 1040
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 0
-        stroke_color: 14540253
-      }
-      priority: 16040
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 42.6
-      color: 6710886
-      priority: 1039
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 41.0
-      color: 14540253
-      priority: 1040
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 0
-        stroke_color: 14540253
-      }
-      priority: 16040
-    }
-  }
-}
-cont {
-  name: "highway-secondary_link-bridge"
-  element {
-    scale: 10
-    lines {
-      width: 2.6
-      color: 6710886
-      priority: 1039
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 1.0
-      color: 14540253
-      priority: 1040
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 11
-    lines {
-      width: 2.6
-      color: 6710886
-      priority: 1039
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 1.0
-      color: 14540253
-      priority: 1040
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 2.6
-      color: 6710886
-      priority: 1039
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 1.0
-      color: 14540253
-      priority: 1040
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 3.6
-      color: 6710886
-      priority: 1039
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 2.0
-      color: 14540253
-      priority: 1040
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 6.1
-      color: 6710886
-      priority: 1039
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 4.5
-      color: 14540253
-      priority: 1040
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 0
-        stroke_color: 14540253
-      }
-      priority: 16040
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 10.6
-      color: 6710886
-      priority: 1039
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 9.0
-      color: 14540253
-      priority: 1040
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 17.0
-      color: 16777215
-      priority: 1007
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 19.0
-      color: 7829367
-      priority: 1004
-      join: ROUNDJOIN
-      cap: BUTTCAP
+    }
+    lines {
+      width: 17.0
+      color: 16777215
+      priority: 1007
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
+      width: 19.0
+      color: 7829367
+      priority: 1004
+      join: ROUNDJOIN
+      cap: BUTTCAP
     }
     path_text {
       primary {
@@ -22712,13 +21966,6 @@ cont {
       color: 16777215
       priority: 1035
     }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16034
-    }
   }
   element {
     scale: 16
@@ -22726,13 +21973,6 @@ cont {
       color: 16777215
       priority: 1035
     }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16034
-    }
   }
   element {
     scale: 17
@@ -22740,13 +21980,6 @@ cont {
       color: 16777215
       priority: 1035
     }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16034
-    }
   }
   element {
     scale: 18
@@ -22754,13 +21987,6 @@ cont {
       color: 16777215
       priority: 1035
     }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16034
-    }
   }
   element {
     scale: 19
@@ -22768,13 +21994,6 @@ cont {
       color: 16777215
       priority: 1035
     }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16034
-    }
   }
 }
 cont {
@@ -23183,13 +22402,6 @@ cont {
       color: 16777215
       priority: 1035
     }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16034
-    }
   }
   element {
     scale: 16
@@ -23197,13 +22409,6 @@ cont {
       color: 16777215
       priority: 1035
     }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16034
-    }
   }
   element {
     scale: 17
@@ -23211,13 +22416,6 @@ cont {
       color: 16777215
       priority: 1035
     }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16034
-    }
   }
   element {
     scale: 18
@@ -23225,13 +22423,6 @@ cont {
       color: 16777215
       priority: 1035
     }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16034
-    }
   }
   element {
     scale: 19
@@ -23239,13 +22430,6 @@ cont {
       color: 16777215
       priority: 1035
     }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16034
-    }
   }
 }
 cont {
@@ -26135,596 +25319,59 @@ cont {
   }
 }
 cont {
-  name: "highway-track-area"
-  element {
-    scale: 13
-    area {
-      color: 14522675
-      priority: 1029
-    }
-  }
-  element {
-    scale: 14
-    area {
-      color: 14522675
-      priority: 1029
-    }
-  }
-  element {
-    scale: 15
-    area {
-      color: 13412983
-      priority: 1029
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16028
-    }
-  }
-  element {
-    scale: 16
-    area {
-      color: 13412983
-      priority: 1029
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16028
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 13412983
-      priority: 1029
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16028
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 13412983
-      priority: 1029
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16028
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 13412983
-      priority: 1029
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16028
-    }
-  }
-}
-cont {
-  name: "highway-track-bridge"
-  element {
-    scale: 13
-    lines {
-      width: 1.0
-      color: 14522675
-      priority: 1028
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.0
-      color: 14522675
-      priority: 1028
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 2.0
-      color: 13412983
-      priority: 1028
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 10.0
-      color: 16777215
-      priority: 1007
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 12.0
-      color: 7829367
-      priority: 1004
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16028
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 4.0
-      color: 13412983
-      priority: 1028
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 12.0
-      color: 16777215
-      priority: 1007
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 14.0
-      color: 7829367
-      priority: 1004
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16028
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 6.0
-      color: 13412983
-      priority: 1028
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 14.0
-      color: 16777215
-      priority: 1007
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 16.0
-      color: 7829367
-      priority: 1004
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16028
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 6.0
-      color: 13412983
-      priority: 1028
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 14.0
-      color: 16777215
-      priority: 1007
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 16.0
-      color: 7829367
-      priority: 1004
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16028
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 6.0
-      color: 13412983
-      priority: 1028
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 14.0
-      color: 16777215
-      priority: 1007
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 16.0
-      color: 7829367
-      priority: 1004
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16028
-    }
-  }
-}
-cont {
-  name: "highway-track-grade1"
-  element {
-    scale: 13
-    lines {
-      width: 1.0
-      color: 14522675
-      priority: 1028
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.0
-      color: 14522675
-      priority: 1028
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 2.0
-      color: 13412983
-      priority: 1028
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16028
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 4.0
-      color: 13412983
-      priority: 1028
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16028
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 6.0
-      color: 13412983
-      priority: 1028
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16028
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 6.0
-      color: 13412983
-      priority: 1028
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16028
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 6.0
-      color: 13412983
-      priority: 1028
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16028
-    }
-  }
-}
-cont {
-  name: "highway-track-grade2"
-  element {
-    scale: 13
-    lines {
-      width: 1.0
-      color: 14522675
-      priority: 1028
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.0
-      color: 14522675
-      priority: 1028
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 2.0
-      color: 13412983
-      priority: 1028
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16028
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 4.0
-      color: 13412983
-      priority: 1028
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16028
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 6.0
-      color: 13412983
-      priority: 1028
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16028
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 6.0
-      color: 13412983
-      priority: 1028
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16028
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 6.0
-      color: 13412983
-      priority: 1028
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16028
-    }
-  }
-}
-cont {
-  name: "highway-track-grade3"
-  element {
-    scale: 13
-    lines {
-      width: 1.0
-      color: 14522675
-      priority: 1028
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.0
-      color: 14522675
-      priority: 1028
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 2.0
-      color: 13412983
-      priority: 1028
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16028
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 4.0
-      color: 13412983
-      priority: 1028
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16028
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 6.0
-      color: 13412983
-      priority: 1028
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16028
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 6.0
-      color: 13412983
-      priority: 1028
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16028
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 6.0
-      color: 13412983
-      priority: 1028
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16028
-    }
-  }
-}
-cont {
-  name: "highway-track-grade3-no-access"
+  name: "highway-track-area"
+  element {
+    scale: 13
+    area {
+      color: 14522675
+      priority: 1029
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 14522675
+      priority: 1029
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 13412983
+      priority: 1029
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 13412983
+      priority: 1029
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 13412983
+      priority: 1029
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 13412983
+      priority: 1029
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 13412983
+      priority: 1029
+    }
+  }
+}
+cont {
+  name: "highway-track-bridge"
   element {
     scale: 13
     lines {
@@ -26754,6 +25401,20 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
+    lines {
+      width: 10.0
+      color: 16777215
+      priority: 1007
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
+      width: 12.0
+      color: 7829367
+      priority: 1004
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -26771,6 +25432,20 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
+    lines {
+      width: 12.0
+      color: 16777215
+      priority: 1007
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
+      width: 14.0
+      color: 7829367
+      priority: 1004
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -26788,6 +25463,20 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
+    lines {
+      width: 14.0
+      color: 16777215
+      priority: 1007
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
+      width: 16.0
+      color: 7829367
+      priority: 1004
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -26805,6 +25494,20 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
+    lines {
+      width: 14.0
+      color: 16777215
+      priority: 1007
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
+      width: 16.0
+      color: 7829367
+      priority: 1004
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -26822,6 +25525,20 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
+    lines {
+      width: 14.0
+      color: 16777215
+      priority: 1007
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
+      width: 16.0
+      color: 7829367
+      priority: 1004
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -26832,7 +25549,7 @@ cont {
   }
 }
 cont {
-  name: "highway-track-grade3-permissive"
+  name: "highway-track-grade1"
   element {
     scale: 13
     lines {
@@ -26940,7 +25657,7 @@ cont {
   }
 }
 cont {
-  name: "highway-track-grade3-private"
+  name: "highway-track-grade2"
   element {
     scale: 13
     lines {
@@ -27048,7 +25765,7 @@ cont {
   }
 }
 cont {
-  name: "highway-track-grade4"
+  name: "highway-track-grade3"
   element {
     scale: 13
     lines {
@@ -27156,7 +25873,7 @@ cont {
   }
 }
 cont {
-  name: "highway-track-grade4-no-access"
+  name: "highway-track-grade3-no-access"
   element {
     scale: 13
     lines {
@@ -27264,7 +25981,7 @@ cont {
   }
 }
 cont {
-  name: "highway-track-grade4-permissive"
+  name: "highway-track-grade3-permissive"
   element {
     scale: 13
     lines {
@@ -27372,7 +26089,7 @@ cont {
   }
 }
 cont {
-  name: "highway-track-grade4-private"
+  name: "highway-track-grade4"
   element {
     scale: 13
     lines {
@@ -27480,7 +26197,7 @@ cont {
   }
 }
 cont {
-  name: "highway-track-grade5"
+  name: "highway-track-grade4-no-access"
   element {
     scale: 13
     lines {
@@ -27588,7 +26305,7 @@ cont {
   }
 }
 cont {
-  name: "highway-track-grade5-no-access"
+  name: "highway-track-grade4-permissive"
   element {
     scale: 13
     lines {
@@ -27696,7 +26413,7 @@ cont {
   }
 }
 cont {
-  name: "highway-track-grade5-permissive"
+  name: "highway-track-grade5"
   element {
     scale: 13
     lines {
@@ -27804,7 +26521,7 @@ cont {
   }
 }
 cont {
-  name: "highway-track-grade5-private"
+  name: "highway-track-grade5-no-access"
   element {
     scale: 13
     lines {
@@ -27912,7 +26629,7 @@ cont {
   }
 }
 cont {
-  name: "highway-track-no-access"
+  name: "highway-track-grade5-permissive"
   element {
     scale: 13
     lines {
@@ -28020,7 +26737,7 @@ cont {
   }
 }
 cont {
-  name: "highway-track-permissive"
+  name: "highway-track-no-access"
   element {
     scale: 13
     lines {
@@ -28128,7 +26845,7 @@ cont {
   }
 }
 cont {
-  name: "highway-track-private"
+  name: "highway-track-permissive"
   element {
     scale: 13
     lines {
@@ -30489,14 +29206,6 @@ cont {
       color: 16777215
       priority: 1035
     }
-    path_text {
-      primary {
-        height: 12
-        color: 0
-        stroke_color: 16777215
-      }
-      priority: 16034
-    }
   }
   element {
     scale: 15
@@ -30504,14 +29213,6 @@ cont {
       color: 16777215
       priority: 1035
     }
-    path_text {
-      primary {
-        height: 12
-        color: 0
-        stroke_color: 16777215
-      }
-      priority: 16034
-    }
   }
   element {
     scale: 16
@@ -30519,14 +29220,6 @@ cont {
       color: 16777215
       priority: 1035
     }
-    path_text {
-      primary {
-        height: 12
-        color: 0
-        stroke_color: 16777215
-      }
-      priority: 16034
-    }
   }
   element {
     scale: 17
@@ -30534,14 +29227,6 @@ cont {
       color: 16777215
       priority: 1035
     }
-    path_text {
-      primary {
-        height: 12
-        color: 0
-        stroke_color: 16777215
-      }
-      priority: 16034
-    }
   }
   element {
     scale: 18
@@ -30549,14 +29234,6 @@ cont {
       color: 16777215
       priority: 1035
     }
-    path_text {
-      primary {
-        height: 12
-        color: 0
-        stroke_color: 16777215
-      }
-      priority: 16034
-    }
   }
   element {
     scale: 19
@@ -30564,14 +29241,6 @@ cont {
       color: 16777215
       priority: 1035
     }
-    path_text {
-      primary {
-        height: 12
-        color: 0
-        stroke_color: 16777215
-      }
-      priority: 16034
-    }
   }
 }
 cont {
@@ -33329,29 +31998,6 @@ cont {
     }
   }
 }
-cont {
-  name: "lit"
-  element {
-    scale: 18
-    lines {
-      width: 0.3
-      color: 16776960
-      priority: 1000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 0.3
-      color: 16776960
-      priority: 1000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-}
 cont {
   name: "man_made-breakwater"
   element {
@@ -36587,61 +35233,6 @@ cont {
     }
   }
 }
-cont {
-  name: "oneway"
-  element {
-    scale: 16
-    lines {
-      width: 0
-      color: 0
-      priority: 1988
-      pathsym {
-        name: "arrow"
-        step: 218.0
-        offset: 200.0
-      }
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 0
-      color: 0
-      priority: 1988
-      pathsym {
-        name: "arrow"
-        step: 218.0
-        offset: 200.0
-      }
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 0
-      color: 0
-      priority: 1988
-      pathsym {
-        name: "arrow"
-        step: 218.0
-        offset: 200.0
-      }
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 0
-      color: 0
-      priority: 1988
-      pathsym {
-        name: "arrow"
-        step: 218.0
-        offset: 200.0
-      }
-    }
-  }
-}
 cont {
   name: "piste:lift-j-bar"
   element {
@@ -41828,14 +40419,14 @@ cont {
       name: "railway-station-mini"
       priority: 16161
     }
-    path_text {
+    caption {
       primary {
         height: 12
         color: 0
         stroke_color: 16777215
         offset_y: 10
       }
-      priority: 16161
+      priority: 15161
     }
   }
   element {
@@ -41844,62 +40435,62 @@ cont {
       name: "railway-station-mini"
       priority: 16161
     }
-    path_text {
+    caption {
       primary {
         height: 12
         color: 0
         stroke_color: 16777215
         offset_y: 10
       }
-      priority: 16161
+      priority: 15161
     }
   }
   element {
     scale: 17
     symbol {
       name: "railway-station"
-      priority: 16000
+      priority: 16173
     }
-    path_text {
+    caption {
       primary {
         height: 12
         color: 0
         stroke_color: 16777215
         offset_y: 10
       }
-      priority: 16000
+      priority: 15173
     }
   }
   element {
     scale: 18
     symbol {
       name: "railway-station"
-      priority: 16000
+      priority: 16173
     }
-    path_text {
+    caption {
       primary {
         height: 12
         color: 0
         stroke_color: 16777215
         offset_y: 10
       }
-      priority: 16000
+      priority: 15173
     }
   }
   element {
     scale: 19
     symbol {
       name: "railway-station"
-      priority: 16000
+      priority: 16173
     }
-    path_text {
+    caption {
       primary {
         height: 12
         color: 0
         stroke_color: 16777215
         offset_y: 10
       }
-      priority: 16000
+      priority: 15173
     }
   }
 }
-- 
cgit v1.2.3