diff --git a/assets/layers/drinking_water/drips.svg b/assets/layers/drinking_water/drips.svg
index a2d002ec5a..b267e1b444 100644
--- a/assets/layers/drinking_water/drips.svg
+++ b/assets/layers/drinking_water/drips.svg
@@ -1,30 +1,27 @@
-
-
diff --git a/assets/themes/cyclestreets/F113.svg b/assets/themes/cyclestreets/F113.svg
index a3f117caaa..bfdca7cdad 100644
--- a/assets/themes/cyclestreets/F113.svg
+++ b/assets/themes/cyclestreets/F113.svg
@@ -2,2448 +2,844 @@
image/svg+xml
+ xml:space="preserve"
+ height="274.30603"
+ width="182.23647"
+ version="1.1"
+ id="svg2"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:dc="http://purl.org/dc/elements/1.1/">image/svg+xml
+ id="defs6">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath20">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath30">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath36">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath42">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath48">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath52">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath56">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath60">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath64">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath68">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath72">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath76">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath80">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath122">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath128">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath134">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath140">
-
-
-
-
-
-
-
-
-
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath150">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath578">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath584">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath590">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath596">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath600">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath604">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath608">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath612">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath616">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath620">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath624">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath628">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath670">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath676">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath682">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath688">
-
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath698">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath720">
-
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath752">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath822">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath836">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath842">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath848">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath854">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath858">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath862">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath866">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath870">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath874">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath878">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath882">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath886">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath928">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath934">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath940">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath946">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath956">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath978">
+ x1="739"
+ y1="325"
+ x2="739"
+ y2="342"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,-1,0,1442)"
+ id="linearGradient990">
+ style="stop-opacity:1;stop-color:#000000"
+ offset="1"
+ id="stop994" />
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath1002">
+ x1="739"
+ y1="325"
+ x2="739"
+ y2="333.5"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,-1,0,1442)"
+ id="linearGradient1014">
+ style="stop-opacity:1;stop-color:#ffffff"
+ offset="1"
+ id="stop1018" />
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath1026">
+ x1="744"
+ y1="333.5"
+ x2="744"
+ y2="342"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,-1,0,1442)"
+ id="linearGradient1038">
+ style="stop-opacity:1;stop-color:#ffffff"
+ offset="1"
+ id="stop1042" />
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath1050">
+ x1="739"
+ y1="325"
+ x2="744"
+ y2="325"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,-1,0,1442)"
+ id="linearGradient1062">
+ style="stop-opacity:1;stop-color:#000000"
+ offset="1"
+ id="stop1066" />
+ x1="927"
+ y1="325"
+ x2="922"
+ y2="325"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,-1,0,1442)"
+ id="linearGradient1072">
+ style="stop-opacity:1;stop-color:#000000"
+ offset="1"
+ id="stop1076" />
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath1084">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath1106">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath1112">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath1126">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath1132">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath1138">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath1144">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath1148">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath1152">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath1156">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath1160">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath1164">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath1168">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath1172">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath1176">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath1218">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath1224">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath1230">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath1236">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath1246">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath1262">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath1854">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath1860">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath1866">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath1872">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath1876">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath1880">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath1884">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath1888">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath1892">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath1896">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath1900">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath1904">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath1946">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath1952">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath1958">
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath1964">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath1974">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+ y="0"
+ x="0"
+ height="6"
+ width="6"
+ patternUnits="userSpaceOnUse"
+ id="EMFhbasepattern" />
+
+ id="path144" />
+ id="path5255"
+ d="m -553.89265,417.08192 h 111.79768 c 9.3186,0 16.89994,-7.60913 16.89994,-17.02872 V 214.47254 c 0,-9.35088 -7.58134,-16.83544 -16.89994,-16.83544 h -111.92542 c -9.38034,0 -16.96381,7.61342 -16.96381,16.96644 l 0.066,185.44966 c 0,9.41745 7.64521,17.02872 17.02555,17.02872 z"
+ style="fill:#0071b3;fill-opacity:1;stroke-width:1.04179811" />
+ id="path5257"
+ d="m -553.89264,417.08191 h 111.79767 c 9.3186,0 16.89994,-7.61127 16.89994,-17.02872 V 214.47252 c 0,-9.35087 -7.58134,-16.83543 -16.89994,-16.83543 h -111.92541 c -9.38034,0 -16.96382,7.61342 -16.96382,16.96645 l 0.066,185.44965 c 0,9.41745 7.64522,17.02872 17.02556,17.02872 z"
+ stroke-miterlimit="3.863"
+ style="opacity:0;fill:none;stroke:#0071b3;stroke-width:0;stroke-miterlimit:3.86299992" />
+ id="path5263"
+ d="m -430.65802,214.27924 c 0,-6.12724 -4.94352,-11.09261 -10.92173,-11.09261 h -112.95372 c -6.03995,0 -10.92174,4.96751 -10.92174,11.09261 v 186.22497 c 0,6.06282 4.88179,11.09476 10.92174,11.09476 35.40302,0 77.48682,0 112.95372,0 5.97821,0 10.92173,-4.96752 10.92173,-11.15704 z"
+ style="fill:#ffffff;stroke-width:1.04179811" />
+ id="path5265"
+ d="m -430.65802,214.27924 c 0,-6.12724 -4.94352,-11.09262 -10.92173,-11.09262 h -112.95372 c -6.03995,0 -10.92174,4.96752 -10.92174,11.09262 v 186.22495 c 0,6.06283 4.88179,11.09477 10.92174,11.09477 35.40302,0 77.48683,0 112.95372,0 5.97821,0 10.92173,-4.96752 10.92173,-11.15704 z"
+ stroke-miterlimit="3.863"
+ style="fill:none;stroke:#ffffff;stroke-width:0;stroke-miterlimit:3.86299992" />
+ id="path5267"
+ d="m -436.05715,214.21696 c 0,-3.09476 -2.56757,-5.54737 -5.5886,-5.54737 h -112.95372 c -3.01891,0 -5.46087,2.45261 -5.46087,5.54737 v 186.35167 c 0,3.03249 2.43983,5.54739 5.46087,5.54739 32.57572,0 80.50787,0 113.08358,0 3.01891,0 5.45874,-2.45048 5.45874,-5.54739 z"
+ style="fill:#0071b3;fill-opacity:1;stroke-width:1.04179811" />
+ id="path5269"
+ d="m -436.05715,214.21696 c 0,-3.09476 -2.56756,-5.54738 -5.5886,-5.54738 h -112.95371 c -3.01891,0 -5.46087,2.45262 -5.46087,5.54738 v 186.35167 c 0,3.03248 2.43982,5.54738 5.46087,5.54738 32.57571,0 80.50786,0 113.08358,0 3.01891,0 5.45873,-2.45047 5.45873,-5.54738 z"
+ stroke-miterlimit="3.863"
+ style="fill:none;stroke:#0071b3;stroke-width:0;stroke-miterlimit:3.86299992" />
+ style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.83451968;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1302"
+ width="18.539501"
+ height="19.155836"
+ x="-544.87085"
+ y="-276.52475"
+ transform="scale(1,-1)" />
+ style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.83451968;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1302-3"
+ width="18.539501"
+ height="19.155836"
+ x="-473.12518"
+ y="-275.46426"
+ transform="scale(1,-1)" />
+ id="path5" />
+ transform="matrix(0.02,0,0,-0.02,-748.27595,429.58555)"
+ id="layer103"
+ style="fill:#ffffff;stroke:none">
+ d="m 12955.029,9410.4139 c -0.91,-2012.611 0.911,-2522.5939 8.197,-2540.8076 17.302,-44.6235 72.855,-80.1402 125.674,-80.1402 48.267,0 94.711,27.3206 118.389,69.2121 l 20.946,35.5166 V 8290.273 9685.4405 h 127.496 127.495 v 113.836 113.835 h -264.098 -264.099 z"
+ id="path16"
+ style="stroke-width:0.91068375" />
+ d="m 11798.461,8501.5516 v -109.2821 h 122.943 122.942 v -744.9393 -745.8499 l 20.946,-39.1595 c 50.087,-94.7111 170.297,-97.4431 237.688,-6.3748 19.124,25.4992 19.124,29.1419 21.856,890.6488 l 1.821,864.2388 h -264.097 -264.099 z"
+ id="path18"
+ style="stroke-width:0.91068375" />
+ id="path1349"
+ d="m -551.26083,386.46189 h 0.32 0.064 0.128 0.512 0.31999 0.576 0.128 0.192 0.128 0.128 0.12799 0.768 0.70399 0.128 0.448 0.512 0.12799 0.704 0.32 0.25599 0.448 0.192 0.512 0.128 0.70399 0.128 0.448 v -3.77597 h -0.128 -0.768 -0.256 -0.31999 -0.128 -0.192 -0.512 -0.192 -0.63999 -0.128 -0.448 -0.192 -0.12799 -0.128 -0.704 -0.51199 -0.192 -0.64 -0.128 -0.44799 v -3.90397 h 0.25599 0.768 0.256 0.128 0.12799 0.128 0.192 0.128 0.128 0.128 0.83199 0.128 0.192 0.064 0.704 0.51199 0.192 0.64 0.12799 0.512 v -3.64798 h -0.576 -0.12799 -0.192 -0.128 -0.128 -0.128 -0.76799 -0.512 -0.32 -0.51199 -0.128 -0.704 -0.51199 -0.192 -0.64 -0.128 -0.44799 v -7.93594 h -0.064 0.064 -0.128 0.064 -0.064 v 0 h -0.064 0.064 -0.064 v 0 h -0.064 0.064 -0.128 0.064 -0.064 v 0 h -0.064 0.064 -0.128 0.064 -0.064 v 0 h -0.064 0.064 -0.064 v 0 h -0.064 0.064 -0.128 0.064 -0.064 v 0 h -0.064 0.064 -0.064 v 0 h -0.064 0.064 -0.128 0.064 -0.064 v 0 h -0.064 0.064 -0.128 0.064 -0.064 v 0 h -0.064 0.064 -0.064 v 0 h -0.064 0.064 -0.128 0.064 -0.064 v 0 h -0.064 0.064 -0.064 v 0 h -0.064 0.064 -0.128 0.064 -0.064 v 0 h -0.064 0.064 -0.128 0.064 -0.064 v 0 h -0.064 0.064 -0.064 v 0 h -0.064 0.064 -0.128 0.064 -0.064 v 0 h -0.064 0.064 -0.064 v 0 h -0.064 0.064 -0.128 0.064 -0.064 v 0 h -0.064 0.064 -0.128 0.064 -0.064 v 0 h -0.064 0.064 -0.064 v 0 h -0.064 0.064 -0.128 0.064 -0.064 v 0 h -0.064 0.064 -0.064 v 0 h -0.064 0.064 -0.128 0.064 -0.064 v 0 h -0.064 0.064 -0.128 0.064 -0.064 v 0 h -0.064 0.064 -0.064 v 0 h -0.064 0.064 -0.12799 0.064 -0.064 v 0 h -0.064 0.064 -0.064 v 0 h -0.064 0.064 -0.128 0.064 -0.064 v 0 h -0.064 0.064 -0.128 0.064 -0.064 v 0 h -0.064 0.064 -0.064 v 0 h -0.064 0.064 -0.064 v 0.192 0.896 0.44799 0.384 0.128 0.256 0.89599 0.128 1.02399 0.384 0.192 0.89599 0.192 0.128 1.59999 0.31999 0.128 0.256 0.89599 0.704 0.128 0.256 0.128 0.19199 0.192 1.02399 0.832 0.128 0.63999 0.64 0.192 0.83199 0.192 0.576 0.57599 0.256 0.63999 0.192 0.896 0.128 0.57599 z"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001" />
+ id="path1351"
+ d="m -538.97292,386.58989 c 1.08799,0 1.72799,-0.576 1.98399,-1.79199 0,-0.95999 -0.256,-1.72798 -0.768,-2.23998 -1.15199,-0.576 -1.98398,-0.256 -2.49598,1.08799 -0.256,1.53599 0.128,2.49598 1.27999,2.94398 z m -0.51199,-5.63196 h 0.192 0.19199 0.512 0.128 0.70399 0.32 0.256 v -13.7599 h -0.576 -0.38399 -0.192 -0.128 -0.192 -0.128 -0.76799 -0.128 -0.448 v 0.192 0.192 0.192 0.192 0.128 1.02399 0.384 0.19199 0.256 0.192 0.256 0.64 0.19199 0.832 0.192 0.57599 0.384 0.32 0.31999 0.384 0.256 0.384 0.25599 0.896 0.32 0.19199 0.32 0.192 0.89599 0.576 0.192 0.192 0.25599 0.192 0.832 0.128 0.63999 z"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001" />
+ id="path1353"
+ d="m -530.46098,381.27793 c 3.19998,0.064 5.05596,-1.91999 5.50396,-5.95196 l 0.128,-0.63999 v -0.384 c 0,-0.57599 0.064,-1.08799 0,-1.47199 l -0.128,0.064 h -0.128 -0.76799 -0.128 -0.128 -1.21599 -0.256 -0.256 -0.256 -0.256 -0.19199 -0.192 -0.192 -0.704 -0.44799 -0.128 -0.192 -0.128 -0.128 -0.70399 -0.128 -0.448 c 0.128,-1.47199 0.704,-2.30398 1.72799,-2.62398 1.34399,-0.256 2.43198,0.192 3.26397,1.27999 l 0.32,-0.448 c 0.128,-0.12799 0.192,-0.25599 0.256,-0.38399 l 0.064,-0.064 0.064,-0.064 c 0.128,-0.128 0.256,-0.256 0.32,-0.384 l 0.064,-0.128 c 0.064,-0.064 0.064,-0.064 0.064,-0.128 h 0.128 l 0.064,-0.128 v -0.064 l 0.128,-0.064 v -0.128 c 0.12799,-0.12799 0.25599,-0.25599 0.31999,-0.31999 -1.21599,-2.04799 -2.94398,-2.81598 -5.11996,-2.30399 -2.62398,0.576 -4.15997,2.68799 -4.47997,6.20796 -0.256,4.47997 1.15199,7.23195 4.28797,8.12794 z m 0.70399,-3.07198 c -1.21599,-0.256 -1.91998,-1.08799 -2.17598,-2.49598 h 0.256 0.256 0.51199 1.21599 0.576 0.128 0.192 0.128 0.128 0.12799 0.768 c -0.256,1.53599 -0.95999,2.36798 -2.11199,2.49598 z"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001" />
+ id="path1355"
+ d="m -518.62107,386.46189 c 0.064,-0.064 0.128,-0.128 0.128,-0.256 v -5.11996 h 0.128 0.448 0.192 0.51199 0.128 0.704 0.31999 0.256 v -3.13598 h -0.128 -0.44799 -0.192 -0.512 -0.192 -0.63999 -0.128 -0.448 V 371.102 l 0.064,-0.31999 c 0.512,-0.64 1.27999,-0.704 2.36798,-0.192 l 0.064,-0.192 0.192,-0.83199 0.064,-0.128 v -0.448 l 0.128,-0.32 v -0.128 c 0.064,-0.25599 0.128,-0.44799 0.128,-0.57599 l 0.128,-0.512 c -1.66399,-0.63999 -3.19998,-0.76799 -4.67197,-0.384 -0.44799,0.256 -0.76799,0.64 -1.02399,1.024 -0.192,0.38399 -0.32,0.76799 -0.448,1.08799 v 0.32 c 0,0.19199 0,0.38399 0,0.51199 v 0.192 0.256 0.128 0.89599 0.64 0.192 0.89599 0.128 0.63999 0.64 0.192 0.89599 0.192 0.192 0.256 0.83199 0.128 0.63999 h -0.192 -0.12799 -0.192 -0.64 -0.128 -0.44799 v 0.256 0.192 0.256 0.63999 0.192 0.832 0.192 0.57599 h 0.128 0.19199 0.128 0.704 0.32 0.25599 v 0.89599 0.192 0.832 0.57599 0.192 0.83199 0.192 0.576 l 0.128,0.064 0.128,0.064 0.32,0.064 c 0.128,0.128 0.32,0.128 0.384,0.192 l 0.51199,0.19199 0.192,0.064 0.384,0.192 c 0.384,0.064 0.63999,0.192 0.83199,0.256 z"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001" />
+ id="path1357"
+ d="m -510.04513,381.40593 c 1.98398,0.128 3.64797,-0.512 4.99196,-2.04799 l -0.128,-0.192 -0.128,-0.12799 c -0.064,-0.128 -0.128,-0.256 -0.192,-0.32 l -0.19199,-0.256 -0.128,-0.128 c -0.064,-0.192 -0.192,-0.384 -0.32,-0.448 l -0.064,-0.12799 -0.064,-0.128 -0.064,-0.064 -0.512,-0.768 c -1.72798,1.85599 -3.07197,2.04799 -3.96797,0.576 0,-0.384 0.064,-0.704 0.192,-1.02399 h 0.128 l 0.128,-0.128 h 0.128 l 0.128,-0.064 0.32,-0.064 0.57599,-0.192 c 1.47199,0 2.62398,-0.576 3.51998,-1.66399 0.76799,-1.47199 0.89599,-2.87998 0.51199,-4.35197 -0.44799,-1.27999 -1.15199,-2.11198 -2.04798,-2.49598 -2.94398,-1.08799 -5.37596,-0.448 -7.35995,1.98399 0.064,0.192 0.192,0.38399 0.32,0.51199 l 0.192,0.064 c 0.128,0.32 0.32,0.512 0.51199,0.704 l 0.128,0.192 0.064,0.064 0.064,0.128 0.128,0.128 h 0.064 l 0.064,0.064 c 0.192,0.31999 0.384,0.57599 0.576,0.70399 1.27999,-1.66399 2.62398,-2.23998 3.96797,-1.72799 l 0.064,0.128 c 0.128,0.128 0.32,0.32 0.384,0.576 0.064,0.51199 -0.064,0.89599 -0.384,1.15199 h -0.128 l -0.064,0.064 h -0.128 l -0.128,0.064 -0.064,0.128 c -0.38399,0.064 -0.70399,0.128 -0.95999,0.256 -2.30398,0.128 -3.64797,1.47199 -3.90397,3.96797 0,2.94398 1.27999,4.60796 3.77597,4.86396 z"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001" />
+ id="path1359"
+ d="m -499.35721,381.40593 c 1.98398,0.128 3.64797,-0.512 4.99196,-2.04799 l -0.128,-0.192 -0.128,-0.12799 c -0.064,-0.128 -0.12799,-0.256 -0.25599,-0.32 l -0.128,-0.256 -0.128,-0.128 c -0.128,-0.192 -0.256,-0.384 -0.32,-0.448 l -0.064,-0.12799 -0.064,-0.128 -0.128,-0.064 -0.51199,-0.768 c -1.66399,1.85599 -3.00798,2.04799 -3.96797,0.576 0,-0.384 0.064,-0.704 0.19199,-1.02399 h 0.192 l 0.128,-0.128 h 0.128 l 0.064,-0.064 0.32,-0.064 0.63999,-0.192 c 1.47199,0 2.62398,-0.576 3.51998,-1.66399 0.76799,-1.47199 0.89599,-2.87998 0.44799,-4.35197 -0.38399,-1.27999 -1.08799,-2.11198 -1.98398,-2.49598 -2.94398,-1.08799 -5.43996,-0.448 -7.42395,1.98399 0.128,0.192 0.256,0.38399 0.384,0.51199 l 0.128,0.064 c 0.192,0.32 0.384,0.512 0.576,0.704 l 0.128,0.192 0.064,0.064 0.064,0.128 0.064,0.128 h 0.12799 l 0.064,0.064 c 0.192,0.31999 0.384,0.57599 0.576,0.70399 1.27999,-1.66399 2.62398,-2.23998 3.96797,-1.72799 v 0.128 c 0.192,0.128 0.32,0.32 0.448,0.576 0,0.51199 -0.128,0.89599 -0.384,1.15199 h -0.128 l -0.064,0.064 h -0.128 l -0.128,0.064 -0.064,0.128 c -0.384,0.064 -0.70399,0.128 -0.95999,0.256 -2.36798,0.128 -3.64797,1.47199 -3.90397,3.96797 0,2.94398 1.27999,4.60796 3.77597,4.86396 z"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001" />
+ id="path1361"
+ d="m -488.28529,386.46189 c 0.064,-0.064 0.064,-0.128 0.064,-0.256 v -5.11996 h 0.192 0.44799 0.192 0.512 0.128 0.70399 0.32 0.256 v -3.13598 h -0.192 -0.384 -0.192 -0.51199 -0.192 -0.64 -0.128 -0.51199 V 371.102 l 0.128,-0.31999 c 0.51199,-0.64 1.27999,-0.704 2.36798,-0.192 l 0.064,-0.192 0.192,-0.83199 v -0.128 l 0.064,-0.448 0.128,-0.32 v -0.128 c 0.064,-0.25599 0.064,-0.44799 0.128,-0.57599 l 0.128,-0.512 c -1.66399,-0.63999 -3.19998,-0.76799 -4.67197,-0.384 -0.448,0.256 -0.76799,0.64 -1.08799,1.024 -0.192,0.38399 -0.32,0.76799 -0.384,1.08799 v 0.32 c 0,0.19199 -0.064,0.38399 0,0.51199 v 0.192 0.256 0.128 0.89599 0.64 0.192 0.89599 0.128 0.63999 0.64 0.192 0.89599 0.192 0.192 0.256 0.83199 0.128 0.63999 h -0.192 -0.128 -0.192 -0.63999 -0.128 -0.448 v 0.256 0.192 0.256 0.63999 0.192 0.832 0.192 0.57599 h 0.128 0.128 0.192 0.63999 0.32 0.32 v 0.89599 0.192 0.832 0.57599 0.192 0.83199 0.192 0.576 l 0.128,0.064 0.064,0.064 0.38399,0.064 c 0.128,0.128 0.256,0.128 0.384,0.192 l 0.512,0.19199 0.192,0.064 0.38399,0.192 c 0.32,0.064 0.64,0.192 0.832,0.256 z"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001" />
+ id="path1363"
+ d="m -477.66137,381.21393 h 0.128 0.76799 v -3.64797 c -1.53599,0.25599 -2.62398,-0.384 -3.26397,-1.85599 v -0.128 c -0.128,-0.384 -0.192,-0.76799 -0.192,-1.15199 v -7.16795 h -0.64 -0.192 -0.19199 -0.512 -0.128 -0.70399 -0.064 -0.512 v 0.128 0.256 0.192 0.192 0.128 1.02399 0.32 1.02399 0.384 0.44799 0.384 0.384 1.02399 0.128 0.192 1.53599 0.38399 0.256 0.384 0.32 0.19199 0.32 0.192 0.89599 0.576 0.192 0.192 0.25599 0.192 0.832 0.128 0.63999 h 0.70399 0.128 0.192 0.512 0.192 0.63999 0.128 0.448 v -1.34399 c 0.70399,0.896 1.47199,1.47199 2.36798,1.59999 z"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001" />
+ id="path1365"
+ d="m -470.49342,381.53393 c 1.79198,0.192 3.26397,-0.384 4.47996,-1.66399 v -0.128 c 0.128,-0.192 0.192,-0.32 0.256,-0.512 0.128,-0.25599 0.256,-0.51199 0.256,-0.70399 v -0.192 c 0.128,-0.32 0.128,-0.63999 0.128,-0.83199 v -4.92797 c 0,-0.83199 0,-1.53598 0.128,-2.11198 0.31999,-0.384 0.63999,-0.704 1.08799,-0.768 l -0.064,-0.19199 -0.128,-0.256 -0.064,-0.192 -0.064,-0.128 v -0.128 l -0.064,-0.192 -0.192,-0.51199 -0.064,-0.128 -0.064,-0.128 v -0.192 l -0.064,-0.064 -0.25599,-0.76799 c -1.21599,0 -2.04799,0.44799 -2.62398,1.40799 -1.152,-1.40799 -2.55999,-1.79199 -4.22397,-1.088 -1.53599,0.576 -2.43198,1.72799 -2.68798,3.58398 0.064,2.75198 1.02399,4.28796 3.00798,4.73596 0.128,0.064 0.19199,0.128 0.31999,0.192 h 0.128 c 0.064,0 0.064,0 0.128,0 l 0.128,0.064 0.70399,0.128 0.32,0.064 0.128,0.064 0.63999,0.064 c 0.384,0.064 0.64,0.064 0.896,0.064 0.064,1.85599 -0.704,2.49598 -2.43198,1.85599 h -0.128 l -0.32,-0.064 -0.256,-0.128 -0.12799,-0.064 -0.384,-0.192 c -0.192,-0.128 -0.384,-0.256 -0.576,-0.32 -0.192,-0.256 -0.448,-0.384 -0.63999,-0.448 l -0.256,0.64 -0.128,0.064 v 0.128 l -0.128,0.128 v 0.12799 c -0.192,0.256 -0.32,0.512 -0.384,0.704 -0.064,0.128 -0.128,0.256 -0.192,0.384 -0.128,0.25599 -0.25599,0.44799 -0.31999,0.70399 h 0.128 l 0.064,0.128 0.12799,0.064 c 0.128,0.128 0.32,0.256 0.448,0.32 0.128,0.128 0.192,0.192 0.32,0.192 l 0.064,0.064 c 0.256,0.12799 0.448,0.25599 0.63999,0.31999 l 0.064,0.128 h 0.128 c 0.128,0.064 0.256,0.128 0.32,0.192 h 0.128 c 0.192,0.128 0.32,0.192 0.512,0.192 0.31999,0.192 0.70399,0.256 1.02399,0.32 z m 1.85598,-8.25594 h -0.128 c -0.128,-0.064 -0.256,-0.128 -0.384,-0.128 h -0.128 c 0,-0.064 -0.064,-0.064 -0.064,-0.064 l -0.19199,-0.064 h -0.128 -0.128 l -0.256,-0.064 c -0.064,-0.064 -0.064,-0.064 -0.128,-0.064 l -0.128,-0.064 -0.128,-0.064 c -0.38399,-0.064 -0.63999,-0.192 -0.89599,-0.32 -0.25599,-0.448 -0.31999,-0.95999 -0.192,-1.47199 0.64,-1.15199 1.59999,-1.34399 2.81598,-0.57599 l 0.32,0.57599 0.064,0.192 v 0.192 0.192 0.256 0.128 0.19199 0.192 0.96 h -0.12799 z"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001" />
+ id="path1367"
+ d="m -458.65351,381.53393 c 1.79199,0.192 3.26398,-0.384 4.47996,-1.66399 l 0.064,-0.128 c 0.064,-0.192 0.192,-0.32 0.192,-0.512 0.128,-0.25599 0.256,-0.51199 0.32,-0.70399 v -0.192 c 0.064,-0.32 0.064,-0.63999 0.064,-0.83199 v -4.92797 c 0,-0.83199 0,-1.53598 0.128,-2.11198 0.31999,-0.384 0.63999,-0.704 1.08799,-0.768 l -0.064,-0.19199 -0.128,-0.256 -0.064,-0.192 v -0.128 l -0.064,-0.128 -0.064,-0.192 -0.192,-0.51199 -0.064,-0.128 -0.064,-0.128 v -0.192 l -0.064,-0.064 -0.25599,-0.76799 c -1.15199,0 -2.04798,0.44799 -2.62398,1.40799 -1.15199,-1.40799 -2.55999,-1.79199 -4.22397,-1.088 -1.47199,0.576 -2.36798,1.72799 -2.62398,3.58398 0,2.75198 0.96,4.28796 2.94398,4.73596 0.128,0.064 0.25599,0.128 0.31999,0.192 h 0.128 c 0.064,0 0.064,0 0.128,0 l 0.128,0.064 0.70399,0.128 0.32,0.064 0.128,0.064 0.64,0.064 c 0.384,0.064 0.64,0.064 0.896,0.064 0.064,1.85599 -0.704,2.49598 -2.43199,1.85599 h -0.128 l -0.32,-0.064 -0.256,-0.128 -0.12799,-0.064 -0.384,-0.192 c -0.192,-0.128 -0.384,-0.256 -0.576,-0.32 -0.19199,-0.256 -0.38399,-0.384 -0.63999,-0.448 l -0.256,0.64 -0.128,0.064 v 0.128 l -0.064,0.128 -0.064,0.128 c -0.192,0.25599 -0.256,0.51199 -0.32,0.70399 -0.128,0.128 -0.192,0.256 -0.256,0.384 -0.128,0.256 -0.256,0.44799 -0.256,0.70399 h 0.064 l 0.128,0.128 0.064,0.064 c 0.192,0.128 0.32,0.256 0.448,0.32 0.128,0.128 0.19199,0.192 0.31999,0.192 l 0.064,0.064 c 0.256,0.128 0.448,0.25599 0.64,0.31999 l 0.064,0.128 h 0.12799 c 0.128,0.064 0.256,0.128 0.32,0.192 h 0.128 c 0.192,0.128 0.32,0.192 0.512,0.192 0.38399,0.192 0.70399,0.256 1.02399,0.32 z m 1.85599,-8.25594 h -0.064 c -0.192,-0.064 -0.32,-0.128 -0.448,-0.128 h -0.064 c -0.064,-0.064 -0.128,-0.064 -0.128,-0.064 l -0.192,-0.064 h -0.128 -0.128 l -0.256,-0.064 c 0,-0.064 -0.064,-0.064 -0.128,-0.064 l -0.128,-0.064 -0.128,-0.064 c -0.38399,-0.064 -0.63999,-0.192 -0.83199,-0.32 -0.31999,-0.448 -0.38399,-0.95999 -0.256,-1.47199 0.64,-1.15199 1.59999,-1.34399 2.81599,-0.57599 l 0.32,0.57599 0.064,0.192 v 0.192 0.192 0.256 0.128 0.19199 0.192 0.96 h -0.128 z"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001" />
+ id="path1369"
+ d="m -446.5576,386.46189 c 0.064,-0.064 0.128,-0.128 0.128,-0.256 v -5.11996 h 0.128 0.448 0.192 0.51199 0.128 0.70399 0.32 0.256 v -3.13598 h -0.128 -0.448 -0.192 -0.51199 -0.192 -0.63999 -0.128 -0.448 V 371.102 l 0.064,-0.31999 c 0.512,-0.64 1.27999,-0.704 2.36798,-0.192 l 0.064,-0.192 0.192,-0.83199 0.064,-0.128 v -0.448 l 0.128,-0.32 v -0.128 c 0.064,-0.25599 0.12799,-0.44799 0.12799,-0.57599 l 0.128,-0.512 c -1.66398,-0.63999 -3.19997,-0.76799 -4.67196,-0.384 -0.448,0.256 -0.768,0.64 -1.02399,1.024 -0.192,0.38399 -0.32,0.76799 -0.448,1.08799 v 0.32 c 0,0.19199 0,0.38399 0,0.51199 v 0.192 0.256 0.128 0.89599 0.64 0.192 0.89599 0.128 0.63999 0.64 0.192 0.89599 0.192 0.192 0.256 0.83199 0.128 0.63999 h -0.192 -0.128 -0.192 -0.63999 -0.128 -0.44799 v 0.256 0.192 0.256 0.63999 0.192 0.832 0.192 0.57599 h 0.12799 0.192 0.128 0.704 0.31999 0.256 v 0.89599 0.192 0.832 0.57599 0.192 0.83199 0.192 0.576 l 0.128,0.064 0.128,0.064 0.31999,0.064 c 0.128,0.128 0.256,0.128 0.384,0.192 l 0.512,0.19199 0.19199,0.064 0.384,0.192 c 0.384,0.064 0.64,0.192 0.832,0.256 z"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001" />
+ id="path9913"
+ d="m -556.49212,208.85498 c -2.11924,1.75815 -3.7258,4.82187 -3.7258,7.35927 v 9.66249 l 108.05906,180.41302 11.7495,-0.2922 c 5.80007,0.12455 3.92214,-4.94793 4.46526,-10.56004 l 0.096,-10.24937 -102.88427,-176.52825 h -14.15708"
+ style="fill:#ed1c24;stroke-width:1.04074001" />
\ No newline at end of file
+ type="text/css"
+ id="igtranslator-color" />
diff --git a/assets/themes/drinking_water/logo.svg b/assets/themes/drinking_water/logo.svg
index 775c51b43c..bf53b78120 100644
--- a/assets/themes/drinking_water/logo.svg
+++ b/assets/themes/drinking_water/logo.svg
@@ -1,10 +1,119 @@
-
-
diff --git a/scripts/generateLayerOverview.ts b/scripts/generateLayerOverview.ts
index ed2bbedd6d..7756d9bdd3 100644
--- a/scripts/generateLayerOverview.ts
+++ b/scripts/generateLayerOverview.ts
@@ -96,6 +96,26 @@ class LayerOverviewUtils {
return dict;
}
+ checkAllSvgs(){
+ const allSvgs = ScriptUtils.readDirRecSync("./assets")
+ .filter(path => path.endsWith(".svg"))
+ .filter(path => !path.startsWith("./assets/generated"))
+ let errCount = 0;
+ for (const path of allSvgs) {
+ const contents = readFileSync(path, "UTF8")
+ if (contents.indexOf("data:image/png;") < 0) {
+ continue;
+ }
+ console.warn("The SVG at " + path + " is a fake SVG: it contains PNG data!")
+ errCount++;
+ if(path.startsWith("./assets/svg")){
+ throw "A core SVG is actually a PNG. Don't do this!"
+ }
+ }
+ console.log("There are "+errCount+" fake svgs")
+ }
+
+
main(_: string[]) {
const licensePaths = new Set()
@@ -126,8 +146,9 @@ class LayerOverviewUtils {
const rendering = (protolayer.mapRendering[0])
rendering.icon["mappings"] = iconsPerTheme
writeFileSync('./assets/themes/mapcomplete-changes/mapcomplete-changes.json', JSON.stringify(proto, null, " "))
-
}
+
+ this.checkAllSvgs()
}
private buildLayerIndex(knownImagePaths: Set): Map {
diff --git a/scripts/generateLayouts.ts b/scripts/generateLayouts.ts
index b3564d82b9..5b2f2b12d0 100644
--- a/scripts/generateLayouts.ts
+++ b/scripts/generateLayouts.ts
@@ -7,6 +7,7 @@ import * as all_known_layouts from "../assets/generated/known_layers_and_themes.
import {LayoutConfigJson} from "../Models/ThemeConfig/Json/LayoutConfigJson";
import LayoutConfig from "../Models/ThemeConfig/LayoutConfig";
import xml2js from 'xml2js';
+import ScriptUtils from "./ScriptUtils";
const sharp = require('sharp');
const template = readFileSync("theme.html", "utf8");
@@ -282,7 +283,6 @@ async function main(): Promise{
const manif = JSON.stringify(manifObj, undefined, 2);
writeFileSync("index.manifest", manif)
})
-
}
main().then(() => {