From f8bed0462fc48083cb76a21b6b6866d0888ad5e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Fiti=C3=A9?= Date: Thu, 18 Jun 2020 10:18:43 +0000 Subject: Comments --- navit/navit_layout_car_dark_shipped.xml | 6 ++++++ navit/navit_layout_car_generatedarkxml.sh | 8 ++++---- navit/navit_layout_car_shipped.xml | 6 ++++++ 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 @@ + 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 @@ + -- cgit v1.2.1