summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan FitiƩ <jfitie@gmail.com>2020-06-18 10:18:43 +0000
committerJohan FitiƩ <jfitie@gmail.com>2020-06-18 10:18:43 +0000
commitf8bed0462fc48083cb76a21b6b6866d0888ad5e5 (patch)
tree0785aca7a309bcacaf72cb66fa1e5753b0b72f39
parentef725cd89c4fe8932a6bad5336d55afb61042f90 (diff)
downloadnavit-f8bed0462fc48083cb76a21b6b6866d0888ad5e5.tar.gz
Comments
-rw-r--r--navit/navit_layout_car_dark_shipped.xml6
-rwxr-xr-xnavit/navit_layout_car_generatedarkxml.sh8
-rw-r--r--navit/navit_layout_car_shipped.xml6
3 files changed, 16 insertions, 4 deletions
diff --git a/navit/navit_layout_car_dark_shipped.xml b/navit/navit_layout_car_dark_shipped.xml
index 8c8014afb..7be838b95 100644
--- a/navit/navit_layout_car_dark_shipped.xml
+++ b/navit/navit_layout_car_dark_shipped.xml
@@ -67,6 +67,12 @@
</itemgra>
</cursor>
<layer name="polygons">
+ <!--
+ After modifying the polygons layer in this file, run the
+ navit_layout_car_generatedarkxml.sh script to
+ automatically update the layer in
+ navit_layout_car_dark_shipped.xml.
+ -->
<itemgra item_types="image" order="0-">
<image/>
</itemgra>
diff --git a/navit/navit_layout_car_generatedarkxml.sh b/navit/navit_layout_car_generatedarkxml.sh
index 113fd0d0b..57f2485e7 100755
--- a/navit/navit_layout_car_generatedarkxml.sh
+++ b/navit/navit_layout_car_generatedarkxml.sh
@@ -59,11 +59,11 @@ do
# Inside polygons layer
if [ $inpolygons == true ]; then
- if [[ $l =~ .*color=\"#[0-9a-fA-F]{6}.* ]]; then # Line contains rgb(a) color
+ if [[ $l =~ .*color=\"#[0-9a-fA-F]{6}.* ]]; then # Contains rgb(a) color
coll=$(echo $l | cut -d# -f2 | cut -c-6) # Get rgb color and convert
- cold=$(printf '%02x' $(echo $(printf "%d" 0x${coll:0:2})/16+16 | bc)) # rr
- cold=$cold$(printf '%02x' $(echo $(printf "%d" 0x${coll:2:2})/10+14 | bc)) # gg
- cold=$cold$(printf '%02x' $(echo $(printf "%d" 0x${coll:4:2})/8+12 | bc)) # bb
+ cold=$(printf '%02x' $(echo $(printf "%d" 0x${coll:0:2})/16+16 | bc))
+ cold=$cold$(printf '%02x' $(echo $(printf "%d" 0x${coll:2:2})/10+14 | bc))
+ cold=$cold$(printf '%02x' $(echo $(printf "%d" 0x${coll:4:2})/8+12 | bc))
l=$(echo $l | sed "s/#$coll/#$cold/") # Replace color
fi
diff --git a/navit/navit_layout_car_shipped.xml b/navit/navit_layout_car_shipped.xml
index 053dfbb56..399609f5d 100644
--- a/navit/navit_layout_car_shipped.xml
+++ b/navit/navit_layout_car_shipped.xml
@@ -67,6 +67,12 @@
</itemgra>
</cursor>
<layer name="polygons">
+ <!--
+ After modifying the polygons layer in this file, run the
+ navit_layout_car_generatedarkxml.sh script to
+ automatically update the layer in
+ navit_layout_car_dark_shipped.xml.
+ -->
<itemgra item_types="image" order="0-">
<image/>
</itemgra>