From 83b29b116be991d5a128f230563fee6648653e9f Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Wed, 6 Dec 2023 21:31:17 +0200
Subject: [PATCH] [styles] Regenerate for sidewalks and crosswalks

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 data/classificator.txt               |   5 +-
 data/drules_proto.bin                | Bin 424066 -> 424144 bytes
 data/drules_proto.txt                | 126 ++++++++++-----------
 data/drules_proto_clear.bin          | Bin 416037 -> 416115 bytes
 data/drules_proto_clear.txt          | 126 ++++++++++-----------
 data/drules_proto_dark.bin           | Bin 414779 -> 414857 bytes
 data/drules_proto_dark.txt           | 126 ++++++++++-----------
 data/drules_proto_outdoors_clear.bin | Bin 427976 -> 428054 bytes
 data/drules_proto_outdoors_clear.txt | 126 ++++++++++-----------
 data/drules_proto_outdoors_dark.bin  | Bin 426603 -> 426681 bytes
 data/drules_proto_outdoors_dark.txt  | 126 ++++++++++-----------
 data/drules_proto_vehicle_clear.bin  | Bin 291653 -> 291767 bytes
 data/drules_proto_vehicle_clear.txt  | 161 ++++++++++++++++-----------
 data/drules_proto_vehicle_dark.bin   | Bin 291865 -> 291979 bytes
 data/drules_proto_vehicle_dark.txt   | 161 ++++++++++++++++-----------
 data/types.txt                       |   6 +-
 data/visibility.txt                  |   5 +-
 17 files changed, 515 insertions(+), 453 deletions(-)

diff --git a/data/classificator.txt b/data/classificator.txt
index f4cee2114e..bf8c3aa5e9 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -422,12 +422,13 @@ world  +
             alpine_hiking  -
             area  -
             bridge  -
+            crossing  -
             demanding_alpine_hiking  -
             demanding_mountain_hiking  -
             difficult_alpine_hiking  -
             hiking  -
             mountain_hiking  -
-            permissive  -
+            sidewalk  -
             tunnel  -
             {}
         ford  -
@@ -757,7 +758,6 @@ world  +
         scrub  -
         spring  -
         strait  -
-        tree  -
         tree_row  -
         volcano  -
         water  +
@@ -857,7 +857,6 @@ world  +
             solar  -
             wind  -
             {}
-        pole  -
         station  -
         substation  -
         tower  -
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 44cc509bb70a44ba5c6f6578af1fe3cf6d8b14a5..3fbdd56407c0d3236601978356d47efd7a0a87de 100644
GIT binary patch
delta 199
zcmZqrD0$(dWWyH5m)dfl8M!1fGSf546DxJo^7BhTbaGLCadBo|x{%iNyXuS@ET@=&
zEPV|KOLKao2BSI~P)w6Uc=}pxMpcl!=5$3%Ms=oBOw%_QFp6#er_Fen8>`vHnJKB|
ti8<L2v$dcm18K0ink+C=)uCo;w#QjA0x=U1GXpUT5VLNNvt(1T2LMLwJEH&q

delta 136
zcmcccQL^cyWWyH5m)hI!>oDHnmYdDYC6$qxo>87yshgIcUjm{FQj2mki;FYMQl~d4
zGdfI9C}ZTG&Y{I<INdLfk#qV610ca~$tW|uK#x&ndcOvv^z`*0)=q6k-D&!aLenp(
eFzPb3h_$b=WCUU+AZ7+)79eKbzQ&SG#U21CRxR-W

diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 0bf3027cc4..d88df50914 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -23182,6 +23182,69 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-footway-crossing"
+  element {
+    scale: 16
+    lines {
+      width: 2.0
+      color: 1090058488
+      dashdot {
+        dd: 5.0
+        dd: 2.0
+      }
+      priority: 330
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.4
+      color: 1090058488
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 330
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.2
+      color: 16316664
+      dashdot {
+        dd: 8.0
+        dd: 3.0
+      }
+      priority: 330
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.2
+      color: 16316664
+      dashdot {
+        dd: 10.0
+        dd: 3.5
+      }
+      priority: 330
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.2
+      color: 16316664
+      dashdot {
+        dd: 10.0
+        dd: 3.5
+      }
+      priority: 330
+    }
+  }
+}
 cont {
   name: "highway-footway-demanding_alpine_hiking"
   element {
@@ -24063,28 +24126,7 @@ cont {
   }
 }
 cont {
-  name: "highway-footway-permissive"
-  element {
-    scale: 15
-    lines {
-      width: 1.5
-      color: 1090058488
-      dashdot {
-        dd: 5.0
-        dd: 2.0
-      }
-      priority: 180
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 8
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
+  name: "highway-footway-sidewalk"
   element {
     scale: 16
     lines {
@@ -24096,14 +24138,6 @@ cont {
       }
       priority: 180
     }
-    path_text {
-      primary {
-        height: 9
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
   }
   element {
     scale: 17
@@ -24116,14 +24150,6 @@ cont {
       }
       priority: 180
     }
-    path_text {
-      primary {
-        height: 9
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
   }
   element {
     scale: 18
@@ -24136,14 +24162,6 @@ cont {
       }
       priority: 180
     }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
   }
   element {
     scale: 19
@@ -24156,14 +24174,6 @@ cont {
       }
       priority: 180
     }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
   }
   element {
     scale: 20
@@ -24176,14 +24186,6 @@ cont {
       }
       priority: 180
     }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
   }
 }
 cont {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 067f4d96ebe58cdfe85d939db741eb1bd595a77a..b64b34ee5aabe48640b0c86ee3ec0bb6669ccbda 100644
GIT binary patch
delta 190
zcmZ3wN%He1$%ZYA>}qnK8M!1fGSf546DxJo^7BhTbaGLCadBo|x{%iNetkv_mQzeX
z)_EvPbNYNGMs<*w=JXG6mZLJGI@2kp?QCj{>YP{&EzV3yEl<qJh8U^^H4;dJ4b+4h
e2d06BX||s-U<6_&AZ7+)79eKbe#(F?S_1&53_B43

delta 144
zcmeyoNpk5X$%ZYA>}u0DYB7pVf33mDxm{YFk%LoiHZzx0MrL|Od19q*T7G^Bh%QJi
z%FQe;&MZrvt|7<hFg+oTk$<|60i*nM2VF*$>G5ieQq%qQ8P%q*RbrH$K0zNS_7B85
f4`TT%Ls%m15{8UG%ml>DK+FQftlK3F*`hT77X~V(

diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index 5792aa0531..a8cf0894b0 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -22732,6 +22732,69 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-footway-crossing"
+  element {
+    scale: 16
+    lines {
+      width: 2.0
+      color: 1090058488
+      dashdot {
+        dd: 5.0
+        dd: 2.0
+      }
+      priority: 330
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.4
+      color: 1090058488
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 330
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.2
+      color: 16316664
+      dashdot {
+        dd: 8.0
+        dd: 3.0
+      }
+      priority: 330
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.2
+      color: 16316664
+      dashdot {
+        dd: 10.0
+        dd: 3.5
+      }
+      priority: 330
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.2
+      color: 16316664
+      dashdot {
+        dd: 10.0
+        dd: 3.5
+      }
+      priority: 330
+    }
+  }
+}
 cont {
   name: "highway-footway-demanding_alpine_hiking"
   element {
@@ -23418,28 +23481,7 @@ cont {
   }
 }
 cont {
-  name: "highway-footway-permissive"
-  element {
-    scale: 15
-    lines {
-      width: 1.5
-      color: 1090058488
-      dashdot {
-        dd: 5.0
-        dd: 2.0
-      }
-      priority: 180
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 8
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
+  name: "highway-footway-sidewalk"
   element {
     scale: 16
     lines {
@@ -23451,14 +23493,6 @@ cont {
       }
       priority: 180
     }
-    path_text {
-      primary {
-        height: 9
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
   }
   element {
     scale: 17
@@ -23471,14 +23505,6 @@ cont {
       }
       priority: 180
     }
-    path_text {
-      primary {
-        height: 9
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
   }
   element {
     scale: 18
@@ -23491,14 +23517,6 @@ cont {
       }
       priority: 180
     }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
   }
   element {
     scale: 19
@@ -23511,14 +23529,6 @@ cont {
       }
       priority: 180
     }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
   }
   element {
     scale: 20
@@ -23531,14 +23541,6 @@ cont {
       }
       priority: 180
     }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
   }
 }
 cont {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index ee36108fa0e84d84df00d858559216e1e8c73bdc..ad09598d6cec0da99cbd7fed90f346ee46771deb 100644
GIT binary patch
delta 197
zcmdnJLb7wEWWyH5MXGY28M!1fGSf546DxJo^7BhTbaGLCadBo|x{%g%Eqz7}mQzeX
zRu+)O24rb+2u+`$!l()o)tvs{kWn2XDl(nXh*6d46w~&Fs*LKKSPd@DOi3+I%*lor
rtOYeziv?z=I@CxlW=#&TdFt({28=+=1jNih%mT!$+fxnLt|<cmHiS5Q

delta 154
zcmeBNDY<)vWWyH5MXK9ps4=Q>%FSlxlFG<T&nQo<)J@CJF9Fd7sYSV&#l@LrsngFH
zFgi>xh-T!UE^EkWIDJDjBj<EIZ6NVWl~HPXz8s^-^nZGcLeuXVGD=V1AO~c9PzMsZ
m20*TW4p6pEpHTqL6>Z;QzzD=lK+FupEI`b<eTxCxRb>FiPBKXV

diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index 40ccf003f1..38e841bb80 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -22732,6 +22732,69 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-footway-crossing"
+  element {
+    scale: 16
+    lines {
+      width: 2.0
+      color: 1078675011
+      dashdot {
+        dd: 5.0
+        dd: 2.0
+      }
+      priority: 330
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.4
+      color: 1078675011
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 330
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.2
+      color: 4933187
+      dashdot {
+        dd: 8.0
+        dd: 3.0
+      }
+      priority: 330
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.2
+      color: 4933187
+      dashdot {
+        dd: 10.0
+        dd: 3.5
+      }
+      priority: 330
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.2
+      color: 4933187
+      dashdot {
+        dd: 10.0
+        dd: 3.5
+      }
+      priority: 330
+    }
+  }
+}
 cont {
   name: "highway-footway-demanding_alpine_hiking"
   element {
@@ -23418,28 +23481,7 @@ cont {
   }
 }
 cont {
-  name: "highway-footway-permissive"
-  element {
-    scale: 15
-    lines {
-      width: 1.5
-      color: 1078675011
-      dashdot {
-        dd: 5.0
-        dd: 2.0
-      }
-      priority: 180
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 8
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 2820
-    }
-  }
+  name: "highway-footway-sidewalk"
   element {
     scale: 16
     lines {
@@ -23451,14 +23493,6 @@ cont {
       }
       priority: 180
     }
-    path_text {
-      primary {
-        height: 9
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 2820
-    }
   }
   element {
     scale: 17
@@ -23471,14 +23505,6 @@ cont {
       }
       priority: 180
     }
-    path_text {
-      primary {
-        height: 9
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 2820
-    }
   }
   element {
     scale: 18
@@ -23491,14 +23517,6 @@ cont {
       }
       priority: 180
     }
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 2820
-    }
   }
   element {
     scale: 19
@@ -23511,14 +23529,6 @@ cont {
       }
       priority: 180
     }
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 2820
-    }
   }
   element {
     scale: 20
@@ -23531,14 +23541,6 @@ cont {
       }
       priority: 180
     }
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 2820
-    }
   }
 }
 cont {
diff --git a/data/drules_proto_outdoors_clear.bin b/data/drules_proto_outdoors_clear.bin
index 25598d37ddde7081f0b137eb5f856f25a77178ce..8a9188216adff07601540628675cd972c17852cd 100644
GIT binary patch
delta 204
zcmX@nFEwp~RKpfV4Q;v4j9d~KnduqjiIuu(`S~RvI=LvnxHvN}T}W$stU03w%PA%x
zD^DH5(wu%kolzYmra4_ugHfFg#NrT{-l)Z>%6^K8>plyY`t&|sMyc&?+KgMdv06}^
wnUY$bn3D~$KnrR-kOmvB2{l@i1!k~%`wR<4AZ7w$W*}w(V%F_5EZ7YE0k;M_SpWb4

delta 147
zcmbO>LFz=mRKpfV4ejl6I*gaO<z_Q;No8cFXOt&a>ZaxAmw@Pk)S}$X;^NG*)ai_t
zj1DX<VnTM)`7Ic=rsrES3PHGe>OgLuGNaJ+1G<cy(~qh%s!U%C;ue?#xhIqv&8B~d
i2C~>y7|obk#M+-(Faj|X5HkZY3lOtze`djE;12+wMlVDF

diff --git a/data/drules_proto_outdoors_clear.txt b/data/drules_proto_outdoors_clear.txt
index 71c6946210..0a7df9e5d7 100644
--- a/data/drules_proto_outdoors_clear.txt
+++ b/data/drules_proto_outdoors_clear.txt
@@ -23155,6 +23155,69 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-footway-crossing"
+  element {
+    scale: 16
+    lines {
+      width: 2.0
+      color: 1090058488
+      dashdot {
+        dd: 5.0
+        dd: 2.0
+      }
+      priority: 330
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.4
+      color: 1090058488
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 330
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.2
+      color: 16316664
+      dashdot {
+        dd: 8.0
+        dd: 3.0
+      }
+      priority: 330
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.2
+      color: 16316664
+      dashdot {
+        dd: 10.0
+        dd: 3.5
+      }
+      priority: 330
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.2
+      color: 16316664
+      dashdot {
+        dd: 10.0
+        dd: 3.5
+      }
+      priority: 330
+    }
+  }
+}
 cont {
   name: "highway-footway-demanding_alpine_hiking"
   element {
@@ -24046,28 +24109,7 @@ cont {
   }
 }
 cont {
-  name: "highway-footway-permissive"
-  element {
-    scale: 15
-    lines {
-      width: 1.5
-      color: 1090058488
-      dashdot {
-        dd: 5.0
-        dd: 2.0
-      }
-      priority: 180
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 8
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
+  name: "highway-footway-sidewalk"
   element {
     scale: 16
     lines {
@@ -24079,14 +24121,6 @@ cont {
       }
       priority: 180
     }
-    path_text {
-      primary {
-        height: 9
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
   }
   element {
     scale: 17
@@ -24099,14 +24133,6 @@ cont {
       }
       priority: 180
     }
-    path_text {
-      primary {
-        height: 9
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
   }
   element {
     scale: 18
@@ -24119,14 +24145,6 @@ cont {
       }
       priority: 180
     }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
   }
   element {
     scale: 19
@@ -24139,14 +24157,6 @@ cont {
       }
       priority: 180
     }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
   }
   element {
     scale: 20
@@ -24159,14 +24169,6 @@ cont {
       }
       priority: 180
     }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
   }
 }
 cont {
diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin
index 794f2eea3c0c822e0b2d53228861476f354592a3..b99da7591a98657265f751ffcec8b631aa573e86 100644
GIT binary patch
delta 193
zcmaFeBDJ$ss$mP`VJ*4Oj9d~KnduqjiIuu(`S~RvI=LvnxHvN}T}W&Cd?iK=mQzeX
z)_o{Tb9#U!qdG`Tb9$UIqdFUi#UV01L77pN=@irULt2bixUm{roSBkZo|uyjF;)v|
mD3Aslsl^C3Pm={^ntHpj1tSnM0WmWWvj8#cc4G@R3oig$emHgj

delta 171
zcmdnlD)qWWs$mP`VXf))28^Q94fGf}w_n$0+{&#qo0&^0BQrgtJh4(YEkC~mL>HtM
z<z^NaXO^W3IdJe#Z`5G4VQCQ)vYY-;i&10xe+@<v2v@<9QEPgxCZo{w27N}>=?S`w
zEYnq#8O^3A7%_5ApQ6pEG<}U0qsa6RCdgc-7P0n53q~Mj0%B$$W&vW>?Tr>}7G3~=
CZ8UBG

diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt
index 05df43632b..6fba8e96b4 100644
--- a/data/drules_proto_outdoors_dark.txt
+++ b/data/drules_proto_outdoors_dark.txt
@@ -23155,6 +23155,69 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-footway-crossing"
+  element {
+    scale: 16
+    lines {
+      width: 2.0
+      color: 1078675011
+      dashdot {
+        dd: 5.0
+        dd: 2.0
+      }
+      priority: 330
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.4
+      color: 1078675011
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 330
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.2
+      color: 4933187
+      dashdot {
+        dd: 8.0
+        dd: 3.0
+      }
+      priority: 330
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.2
+      color: 4933187
+      dashdot {
+        dd: 10.0
+        dd: 3.5
+      }
+      priority: 330
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.2
+      color: 4933187
+      dashdot {
+        dd: 10.0
+        dd: 3.5
+      }
+      priority: 330
+    }
+  }
+}
 cont {
   name: "highway-footway-demanding_alpine_hiking"
   element {
@@ -24046,28 +24109,7 @@ cont {
   }
 }
 cont {
-  name: "highway-footway-permissive"
-  element {
-    scale: 15
-    lines {
-      width: 1.5
-      color: 1078675011
-      dashdot {
-        dd: 5.0
-        dd: 2.0
-      }
-      priority: 180
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 8
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 2820
-    }
-  }
+  name: "highway-footway-sidewalk"
   element {
     scale: 16
     lines {
@@ -24079,14 +24121,6 @@ cont {
       }
       priority: 180
     }
-    path_text {
-      primary {
-        height: 9
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 2820
-    }
   }
   element {
     scale: 17
@@ -24099,14 +24133,6 @@ cont {
       }
       priority: 180
     }
-    path_text {
-      primary {
-        height: 9
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 2820
-    }
   }
   element {
     scale: 18
@@ -24119,14 +24145,6 @@ cont {
       }
       priority: 180
     }
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 2820
-    }
   }
   element {
     scale: 19
@@ -24139,14 +24157,6 @@ cont {
       }
       priority: 180
     }
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 2820
-    }
   }
   element {
     scale: 20
@@ -24159,14 +24169,6 @@ cont {
       }
       priority: 180
     }
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 2820
-    }
   }
 }
 cont {
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index f3fdc0d6374b78b027fe3bf0d40b4f672fdd1799..61887e49979ac98ff7962db6c64e55047c698c47 100644
GIT binary patch
delta 154
zcmX^5OmO>i!3}xkljRrJZGKa3!zeS4kxL>YGd-g`u~IiJKfeS-Cl}=x7iZ?BPp+@j
zV*EP!K$$j>oKOuSA5@7?wypF8>7UF}l>nw6RmFknebv5Ty0az>L`xT8np~Wjl3Jda
XlRf!hS!7dPTODIt9n-ctX4kI(QlUbG

delta 146
zcmdn~T=3{K!3}xklfRUyPBy5B-2A58hH-Lpwdmw~m7Xxc$xEve;Oyq=I5<1L#uv`k
zsttp&l@>5^No8cFXOt&a>ZaxAmw@Pk)S}$X;^NG*R3R-6p~)Z1G(h$>7uB^F)iDAw
L)Aph|X4kI(P2xY3

diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt
index 97863ea45d..bd65ad2003 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -9003,10 +9003,10 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.5
-      color: 1308425468
+      width: 1.1
+      color: 1721782290
       dashdot {
-        dd: 5.0
+        dd: 3.5
         dd: 2.0
       }
       priority: 130
@@ -9016,10 +9016,10 @@ cont {
     scale: 19
     lines {
       width: 1.5
-      color: 1308425468
+      color: 1721782290
       dashdot {
-        dd: 5.0
-        dd: 2.0
+        dd: 4.0
+        dd: 2.5
       }
       priority: 130
     }
@@ -9028,10 +9028,10 @@ cont {
     scale: 20
     lines {
       width: 1.5
-      color: 1308425468
+      color: 1721782290
       dashdot {
-        dd: 5.0
-        dd: 2.0
+        dd: 4.0
+        dd: 2.5
       }
       priority: 130
     }
@@ -9115,6 +9115,45 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-footway-crossing"
+  element {
+    scale: 18
+    lines {
+      width: 1.5
+      color: 1308425468
+      dashdot {
+        dd: 5.0
+        dd: 2.0
+      }
+      priority: 245
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.5
+      color: 1308425468
+      dashdot {
+        dd: 5.0
+        dd: 2.0
+      }
+      priority: 245
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 1.5
+      color: 1308425468
+      dashdot {
+        dd: 5.0
+        dd: 2.0
+      }
+      priority: 245
+    }
+  }
+}
 cont {
   name: "highway-footway-demanding_alpine_hiking"
   element {
@@ -9132,10 +9171,10 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.5
-      color: 1308425468
+      width: 1.1
+      color: 1721782290
       dashdot {
-        dd: 5.0
+        dd: 3.5
         dd: 2.0
       }
       priority: 130
@@ -9145,10 +9184,10 @@ cont {
     scale: 19
     lines {
       width: 1.5
-      color: 1308425468
+      color: 1721782290
       dashdot {
-        dd: 5.0
-        dd: 2.0
+        dd: 4.0
+        dd: 2.5
       }
       priority: 130
     }
@@ -9157,10 +9196,10 @@ cont {
     scale: 20
     lines {
       width: 1.5
-      color: 1308425468
+      color: 1721782290
       dashdot {
-        dd: 5.0
-        dd: 2.0
+        dd: 4.0
+        dd: 2.5
       }
       priority: 130
     }
@@ -9183,10 +9222,10 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.5
-      color: 1308425468
+      width: 1.1
+      color: 1721782290
       dashdot {
-        dd: 5.0
+        dd: 3.5
         dd: 2.0
       }
       priority: 130
@@ -9196,10 +9235,10 @@ cont {
     scale: 19
     lines {
       width: 1.5
-      color: 1308425468
+      color: 1721782290
       dashdot {
-        dd: 5.0
-        dd: 2.0
+        dd: 4.0
+        dd: 2.5
       }
       priority: 130
     }
@@ -9208,10 +9247,10 @@ cont {
     scale: 20
     lines {
       width: 1.5
-      color: 1308425468
+      color: 1721782290
       dashdot {
-        dd: 5.0
-        dd: 2.0
+        dd: 4.0
+        dd: 2.5
       }
       priority: 130
     }
@@ -9234,10 +9273,10 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.5
-      color: 1308425468
+      width: 1.1
+      color: 1721782290
       dashdot {
-        dd: 5.0
+        dd: 3.5
         dd: 2.0
       }
       priority: 130
@@ -9247,10 +9286,10 @@ cont {
     scale: 19
     lines {
       width: 1.5
-      color: 1308425468
+      color: 1721782290
       dashdot {
-        dd: 5.0
-        dd: 2.0
+        dd: 4.0
+        dd: 2.5
       }
       priority: 130
     }
@@ -9259,10 +9298,10 @@ cont {
     scale: 20
     lines {
       width: 1.5
-      color: 1308425468
+      color: 1721782290
       dashdot {
-        dd: 5.0
-        dd: 2.0
+        dd: 4.0
+        dd: 2.5
       }
       priority: 130
     }
@@ -9285,10 +9324,10 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.5
-      color: 1308425468
+      width: 1.1
+      color: 1721782290
       dashdot {
-        dd: 5.0
+        dd: 3.5
         dd: 2.0
       }
       priority: 130
@@ -9298,10 +9337,10 @@ cont {
     scale: 19
     lines {
       width: 1.5
-      color: 1308425468
+      color: 1721782290
       dashdot {
-        dd: 5.0
-        dd: 2.0
+        dd: 4.0
+        dd: 2.5
       }
       priority: 130
     }
@@ -9310,10 +9349,10 @@ cont {
     scale: 20
     lines {
       width: 1.5
-      color: 1308425468
+      color: 1721782290
       dashdot {
-        dd: 5.0
-        dd: 2.0
+        dd: 4.0
+        dd: 2.5
       }
       priority: 130
     }
@@ -9336,10 +9375,10 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.5
-      color: 1308425468
+      width: 1.1
+      color: 1721782290
       dashdot {
-        dd: 5.0
+        dd: 3.5
         dd: 2.0
       }
       priority: 130
@@ -9349,10 +9388,10 @@ cont {
     scale: 19
     lines {
       width: 1.5
-      color: 1308425468
+      color: 1721782290
       dashdot {
-        dd: 5.0
-        dd: 2.0
+        dd: 4.0
+        dd: 2.5
       }
       priority: 130
     }
@@ -9361,29 +9400,17 @@ cont {
     scale: 20
     lines {
       width: 1.5
-      color: 1308425468
+      color: 1721782290
       dashdot {
-        dd: 5.0
-        dd: 2.0
+        dd: 4.0
+        dd: 2.5
       }
       priority: 130
     }
   }
 }
 cont {
-  name: "highway-footway-permissive"
-  element {
-    scale: 18
-    lines {
-      width: 1.5
-      color: 1308425468
-      dashdot {
-        dd: 5.0
-        dd: 2.0
-      }
-      priority: 130
-    }
-  }
+  name: "highway-footway-sidewalk"
   element {
     scale: 19
     lines {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index ef4f90eb5b183765709a9ca9d8bf04963e772790..94d0d048f59a3806d3bb37344980abc5cbbd29f8 100644
GIT binary patch
delta 158
zcmbRFLa_U#;D)nhlLO}0ZT2p=VU(H2$R&}HnVwOeSgD(qpI-u^lZ*0;i!<}mC*P~k
zV*EP!W0^LPG^_=Y_EqAO=Tvxt^iNK%OaRl4RdHZiw%Qj=zo-ra(b7ejCKqR>q?RY<
aWKUKoi)@asZI7>I1Y)M`@wLpmz5xI(Z9}yH

delta 128
zcmeBvDLC_m;D)nhlY`4tCo7aiZuTy>VVwM^N_4Vqr6){qGD}qgoc*XO4$j_J?F(mj
y)`Y>>0t*<qq%tzoGs+Vyb<^_mOD1nD5}nLhQP+I2w*6u)BM>ufzgWw>>l*-<hc;*c

diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt
index 2d05d17929..36516eb91e 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -9003,10 +9003,10 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.5
-      color: 1294673959
+      width: 1.1
+      color: 1720994322
       dashdot {
-        dd: 5.0
+        dd: 3.5
         dd: 2.0
       }
       priority: 130
@@ -9016,10 +9016,10 @@ cont {
     scale: 19
     lines {
       width: 1.5
-      color: 1294673959
+      color: 1720994322
       dashdot {
-        dd: 5.0
-        dd: 2.0
+        dd: 4.0
+        dd: 2.5
       }
       priority: 130
     }
@@ -9028,10 +9028,10 @@ cont {
     scale: 20
     lines {
       width: 1.5
-      color: 1294673959
+      color: 1720994322
       dashdot {
-        dd: 5.0
-        dd: 2.0
+        dd: 4.0
+        dd: 2.5
       }
       priority: 130
     }
@@ -9115,6 +9115,45 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-footway-crossing"
+  element {
+    scale: 18
+    lines {
+      width: 1.5
+      color: 1294673959
+      dashdot {
+        dd: 5.0
+        dd: 2.0
+      }
+      priority: 245
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.5
+      color: 1294673959
+      dashdot {
+        dd: 5.0
+        dd: 2.0
+      }
+      priority: 245
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 1.5
+      color: 1294673959
+      dashdot {
+        dd: 5.0
+        dd: 2.0
+      }
+      priority: 245
+    }
+  }
+}
 cont {
   name: "highway-footway-demanding_alpine_hiking"
   element {
@@ -9132,10 +9171,10 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.5
-      color: 1294673959
+      width: 1.1
+      color: 1720994322
       dashdot {
-        dd: 5.0
+        dd: 3.5
         dd: 2.0
       }
       priority: 130
@@ -9145,10 +9184,10 @@ cont {
     scale: 19
     lines {
       width: 1.5
-      color: 1294673959
+      color: 1720994322
       dashdot {
-        dd: 5.0
-        dd: 2.0
+        dd: 4.0
+        dd: 2.5
       }
       priority: 130
     }
@@ -9157,10 +9196,10 @@ cont {
     scale: 20
     lines {
       width: 1.5
-      color: 1294673959
+      color: 1720994322
       dashdot {
-        dd: 5.0
-        dd: 2.0
+        dd: 4.0
+        dd: 2.5
       }
       priority: 130
     }
@@ -9183,10 +9222,10 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.5
-      color: 1294673959
+      width: 1.1
+      color: 1720994322
       dashdot {
-        dd: 5.0
+        dd: 3.5
         dd: 2.0
       }
       priority: 130
@@ -9196,10 +9235,10 @@ cont {
     scale: 19
     lines {
       width: 1.5
-      color: 1294673959
+      color: 1720994322
       dashdot {
-        dd: 5.0
-        dd: 2.0
+        dd: 4.0
+        dd: 2.5
       }
       priority: 130
     }
@@ -9208,10 +9247,10 @@ cont {
     scale: 20
     lines {
       width: 1.5
-      color: 1294673959
+      color: 1720994322
       dashdot {
-        dd: 5.0
-        dd: 2.0
+        dd: 4.0
+        dd: 2.5
       }
       priority: 130
     }
@@ -9234,10 +9273,10 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.5
-      color: 1294673959
+      width: 1.1
+      color: 1720994322
       dashdot {
-        dd: 5.0
+        dd: 3.5
         dd: 2.0
       }
       priority: 130
@@ -9247,10 +9286,10 @@ cont {
     scale: 19
     lines {
       width: 1.5
-      color: 1294673959
+      color: 1720994322
       dashdot {
-        dd: 5.0
-        dd: 2.0
+        dd: 4.0
+        dd: 2.5
       }
       priority: 130
     }
@@ -9259,10 +9298,10 @@ cont {
     scale: 20
     lines {
       width: 1.5
-      color: 1294673959
+      color: 1720994322
       dashdot {
-        dd: 5.0
-        dd: 2.0
+        dd: 4.0
+        dd: 2.5
       }
       priority: 130
     }
@@ -9285,10 +9324,10 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.5
-      color: 1294673959
+      width: 1.1
+      color: 1720994322
       dashdot {
-        dd: 5.0
+        dd: 3.5
         dd: 2.0
       }
       priority: 130
@@ -9298,10 +9337,10 @@ cont {
     scale: 19
     lines {
       width: 1.5
-      color: 1294673959
+      color: 1720994322
       dashdot {
-        dd: 5.0
-        dd: 2.0
+        dd: 4.0
+        dd: 2.5
       }
       priority: 130
     }
@@ -9310,10 +9349,10 @@ cont {
     scale: 20
     lines {
       width: 1.5
-      color: 1294673959
+      color: 1720994322
       dashdot {
-        dd: 5.0
-        dd: 2.0
+        dd: 4.0
+        dd: 2.5
       }
       priority: 130
     }
@@ -9336,10 +9375,10 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.5
-      color: 1294673959
+      width: 1.1
+      color: 1720994322
       dashdot {
-        dd: 5.0
+        dd: 3.5
         dd: 2.0
       }
       priority: 130
@@ -9349,10 +9388,10 @@ cont {
     scale: 19
     lines {
       width: 1.5
-      color: 1294673959
+      color: 1720994322
       dashdot {
-        dd: 5.0
-        dd: 2.0
+        dd: 4.0
+        dd: 2.5
       }
       priority: 130
     }
@@ -9361,29 +9400,17 @@ cont {
     scale: 20
     lines {
       width: 1.5
-      color: 1294673959
+      color: 1720994322
       dashdot {
-        dd: 5.0
-        dd: 2.0
+        dd: 4.0
+        dd: 2.5
       }
       priority: 130
     }
   }
 }
 cont {
-  name: "highway-footway-permissive"
-  element {
-    scale: 18
-    lines {
-      width: 1.5
-      color: 1294673959
-      dashdot {
-        dd: 5.0
-        dd: 2.0
-      }
-      priority: 130
-    }
-  }
+  name: "highway-footway-sidewalk"
   element {
     scale: 19
     lines {
diff --git a/data/types.txt b/data/types.txt
index 5ccbca1812..9f66624a4a 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -15,7 +15,7 @@
 *landuse|residential
 *highway|path
 *highway|bus_stop
-*natural|tree
+*highway|footway|sidewalk
 *place|locality
 *natural|coastline
 *place|village
@@ -48,7 +48,7 @@
 *landuse|farmland
 *barrier|fence
 *natural|water|lake
-*power|pole
+*highway|footway|crossing
 *waterway|riverbank
 *highway|path|bicycle
 *landuse|meadow
@@ -150,7 +150,7 @@ leisure|pitch
 *railway|tram
 *amenity|toilets
 *natural|water|basin
-*highway|footway|permissive
+highway|footway
 *leisure|picnic_table
 *landuse|construction
 *tourism|viewpoint
diff --git a/data/visibility.txt b/data/visibility.txt
index bb2e6a4eee..88bad4616f 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -422,12 +422,13 @@ world  000000000000000000000  +
             alpine_hiking  000000000000000001111  -
             area  000000000000000000111  -
             bridge  000000000000000000111  -
+            crossing  000000000000000000111  -
             demanding_alpine_hiking  000000000000000001111  -
             demanding_mountain_hiking  000000000000000001111  -
             difficult_alpine_hiking  000000000000000001111  -
             hiking  000000000000000001111  -
             mountain_hiking  000000000000000001111  -
-            permissive  000000000000000000111  -
+            sidewalk  000000000000000000011  -
             tunnel  000000000000000000000  -
             {}
         ford  000000000000001111111  -
@@ -757,7 +758,6 @@ world  000000000000000000000  +
         scrub  000000000000001111111  -
         spring  000000000000000000000  -
         strait  000000000000000000000  -
-        tree  000000000000000000000  -
         tree_row  000000000000000000000  -
         volcano  000000000000000000000  -
         water  111111111111111111111  +
@@ -857,7 +857,6 @@ world  000000000000000000000  +
             solar  000000000000000000000  -
             wind  000000000000000000000  -
             {}
-        pole  000000000000000000000  -
         station  000000000000000000000  -
         substation  000000000000000000000  -
         tower  000000000000000000000  -