[styles] Fixed railway=halt captions.

1 files changed, 155 insertions, 1564 deletions

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
@@ -1184,6 +1184,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 {
     scale: 16
@@ -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 {
@@ -8211,163 +8320,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 {
     scale: 13
@@ -9147,104 +9099,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 {
     scale: 14
@@ -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
     }
   }
 }
@@ -11019,159 +10840,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 {
     scale: 13
@@ -16145,142 +15813,6 @@ cont {
   }
 }
 cont {
-  name: "highway-path-private"
-  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
-    }
-    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
-    }
-    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
-    }
-    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
@@ -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,176 +19149,6 @@ cont {
   }
 }
 cont {
-  name: "highway-residential-private"
-  element {
-    scale: 13
-    lines {
-      width: 2.6
-      color: 6710886
-      priority: 1033
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 1.0
-      color: 16777215
-      priority: 1034
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 3.6
-      color: 6710886
-      priority: 1033
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 2.0
-      color: 16777215
-      priority: 1034
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 0
-        stroke_color: 16777215
-      }
-      priority: 16034
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 5.6
-      color: 6710886
-      priority: 1033
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 4.0
-      color: 16777215
-      priority: 1034
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 0
-        stroke_color: 16777215
-      }
-      priority: 16034
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 7.6
-      color: 6710886
-      priority: 1033
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 6.0
-      color: 16777215
-      priority: 1034
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 0
-        stroke_color: 16777215
-      }
-      priority: 16034
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 9.6
-      color: 6710886
-      priority: 1033
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 8.0
-      color: 16777215
-      priority: 1034
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 0
-        stroke_color: 16777215
-      }
-      priority: 16034
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 24.6
-      color: 6710886
-      priority: 1033
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 23.0
-      color: 16777215
-      priority: 1034
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 0
-        stroke_color: 16777215
-      }
-      priority: 16034
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 42.6
-      color: 6710886
-      priority: 1033
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 41.0
-      color: 16777215
-      priority: 1034
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 0
-        stroke_color: 16777215
-      }
-      priority: 16034
-    }
-  }
-}
-cont {
   name: "highway-residential-tunnel"
   element {
     scale: 13
@@ -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 {
@@ -26156,13 +25340,6 @@ cont {
       color: 13412983
       priority: 1029
     }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16028
-    }
   }
   element {
     scale: 16
@@ -26170,13 +25347,6 @@ cont {
       color: 13412983
       priority: 1029
     }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16028
-    }
   }
   element {
     scale: 17
@@ -26184,13 +25354,6 @@ cont {
       color: 13412983
       priority: 1029
     }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16028
-    }
   }
   element {
     scale: 18
@@ -26198,13 +25361,6 @@ cont {
       color: 13412983
       priority: 1029
     }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16028
-    }
   }
   element {
     scale: 19
@@ -26212,13 +25368,6 @@ cont {
       color: 13412983
       priority: 1029
     }
-    path_text {
-      primary {
-        height: 10
-        color: 0
-      }
-      priority: 16028
-    }
   }
 }
 cont {
@@ -26940,114 +26089,6 @@ cont {
   }
 }
 cont {
-  name: "highway-track-grade3-private"
-  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-grade4"
   element {
     scale: 13
@@ -27372,114 +26413,6 @@ cont {
   }
 }
 cont {
-  name: "highway-track-grade4-private"
-  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-grade5"
   element {
     scale: 13
@@ -27804,114 +26737,6 @@ cont {
   }
 }
 cont {
-  name: "highway-track-grade5-private"
-  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-no-access"
   element {
     scale: 13
@@ -28128,114 +26953,6 @@ cont {
   }
 }
 cont {
-  name: "highway-track-private"
-  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-tunnel"
   element {
     scale: 13
@@ -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 {
@@ -33330,29 +31999,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 {
     scale: 15
@@ -36588,61 +35234,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 {
     scale: 14
@@ -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
     }
   }
 }