Icon colors

2 files changed, 42 insertions, 34 deletions

diff --git a/navit/navit_layout_car_dark_shipped.xml b/navit/navit_layout_car_dark_shipped.xml
index b4678497d..1c8ef041c 100644
--- a/navit/navit_layout_car_dark_shipped.xml
+++ b/navit/navit_layout_car_dark_shipped.xml
@@ -66,6 +66,14 @@
 			</polyline>
 		</itemgra>
 	</cursor>
+	<!--
+		After modifying the layers in navit_layout_car_shipped.xml,
+		run the navit_layout_car_generatedarkxml.sh script to
+		automatically update the layers in
+		navit_layout_car_dark_shipped.xml. Do not modify the layers in
+		navit_layout_car_dark_shipped.xml directly, as changes will be
+		lost when the script is run.
+	-->
 	<layer name="polygons">
 		<itemgra item_types="image" order="0-">
 			<image/>
@@ -1423,100 +1431,100 @@
 			<circle color="#1f0e1f" background_color="#000000" radius="10" text_size="7"/>
 		</itemgra>
 		<itemgra item_types="nav_left_1" order="0-">
-			<icon src="nav_left_1_bk.svg" w="32" h="32"/>
+			<icon src="nav_left_1_wh.svg" w="32" h="32"/>
 		</itemgra>
 		<itemgra item_types="nav_left_2" order="0-">
-			<icon src="nav_left_2_bk.svg" w="32" h="32"/>
+			<icon src="nav_left_2_wh.svg" w="32" h="32"/>
 		</itemgra>
 		<itemgra item_types="nav_left_3" order="0-">
-			<icon src="nav_left_3_bk.svg" w="32" h="32"/>
+			<icon src="nav_left_3_wh.svg" w="32" h="32"/>
 		</itemgra>
 		<itemgra item_types="nav_right_1" order="0-">
-			<icon src="nav_right_1_bk.svg" w="32" h="32"/>
+			<icon src="nav_right_1_wh.svg" w="32" h="32"/>
 		</itemgra>
 		<itemgra item_types="nav_right_2" order="0-">
-			<icon src="nav_right_2_bk.svg" w="32" h="32"/>
+			<icon src="nav_right_2_wh.svg" w="32" h="32"/>
 		</itemgra>
 		<itemgra item_types="nav_right_3" order="0-">
-			<icon src="nav_right_3_bk.svg" w="32" h="32"/>
+			<icon src="nav_right_3_wh.svg" w="32" h="32"/>
 		</itemgra>
 		<itemgra item_types="nav_straight" order="0-">
-			<icon src="nav_straight_bk.svg" w="32" h="32"/>
+			<icon src="nav_straight_wh.svg" w="32" h="32"/>
 		</itemgra>
 		<itemgra item_types="nav_turnaround_left" order="0-">
-			<icon src="nav_turnaround_left_bk.svg" w="32" h="32"/>
+			<icon src="nav_turnaround_left_wh.svg" w="32" h="32"/>
 		</itemgra>
 		<itemgra item_types="nav_turnaround_right" order="0-">
-			<icon src="nav_turnaround_right_bk.svg" w="32" h="32"/>
+			<icon src="nav_turnaround_right_wh.svg" w="32" h="32"/>
 		</itemgra>
 		<itemgra item_types="nav_roundabout_l1" order="0-">
-			<icon src="nav_roundabout_l1_bk.svg" w="32" h="32"/>
+			<icon src="nav_roundabout_l1_wh.svg" w="32" h="32"/>
 		</itemgra>
 		<itemgra item_types="nav_roundabout_r1" order="0-">
-			<icon src="nav_roundabout_r1_bk.svg" w="32" h="32"/>
+			<icon src="nav_roundabout_r1_wh.svg" w="32" h="32"/>
 		</itemgra>
 		<itemgra item_types="nav_roundabout_l2" order="0-">
-			<icon src="nav_roundabout_l2_bk.svg" w="32" h="32"/>
+			<icon src="nav_roundabout_l2_wh.svg" w="32" h="32"/>
 		</itemgra>
 		<itemgra item_types="nav_roundabout_r2" order="0-">
-			<icon src="nav_roundabout_r2_bk.svg" w="32" h="32"/>
+			<icon src="nav_roundabout_r2_wh.svg" w="32" h="32"/>
 		</itemgra>
 		<itemgra item_types="nav_roundabout_l3" order="0-">
-			<icon src="nav_roundabout_l3_bk.svg" w="32" h="32"/>
+			<icon src="nav_roundabout_l3_wh.svg" w="32" h="32"/>
 		</itemgra>
 		<itemgra item_types="nav_roundabout_r3" order="0-">
-			<icon src="nav_roundabout_r3_bk.svg" w="32" h="32"/>
+			<icon src="nav_roundabout_r3_wh.svg" w="32" h="32"/>
 		</itemgra>
 		<itemgra item_types="nav_roundabout_l4" order="0-">
-			<icon src="nav_roundabout_l4_bk.svg" w="32" h="32"/>
+			<icon src="nav_roundabout_l4_wh.svg" w="32" h="32"/>
 		</itemgra>
 		<itemgra item_types="nav_roundabout_r4" order="0-">
-			<icon src="nav_roundabout_r4_bk.svg" w="32" h="32"/>
+			<icon src="nav_roundabout_r4_wh.svg" w="32" h="32"/>
 		</itemgra>
 		<itemgra item_types="nav_roundabout_l5" order="0-">
-			<icon src="nav_roundabout_l5_bk.svg" w="32" h="32"/>
+			<icon src="nav_roundabout_l5_wh.svg" w="32" h="32"/>
 		</itemgra>
 		<itemgra item_types="nav_roundabout_r5" order="0-">
-			<icon src="nav_roundabout_r5_bk.svg" w="32" h="32"/>
+			<icon src="nav_roundabout_r5_wh.svg" w="32" h="32"/>
 		</itemgra>
 		<itemgra item_types="nav_roundabout_l6" order="0-">
-			<icon src="nav_roundabout_l6_bk.svg" w="32" h="32"/>
+			<icon src="nav_roundabout_l6_wh.svg" w="32" h="32"/>
 		</itemgra>
 		<itemgra item_types="nav_roundabout_r6" order="0-">
-			<icon src="nav_roundabout_r6_bk.svg" w="32" h="32"/>
+			<icon src="nav_roundabout_r6_wh.svg" w="32" h="32"/>
 		</itemgra>
 		<itemgra item_types="nav_roundabout_l7" order="0-">
-			<icon src="nav_roundabout_l7_bk.svg" w="32" h="32"/>
+			<icon src="nav_roundabout_l7_wh.svg" w="32" h="32"/>
 		</itemgra>
 		<itemgra item_types="nav_roundabout_r7" order="0-">
-			<icon src="nav_roundabout_r7_bk.svg" w="32" h="32"/>
+			<icon src="nav_roundabout_r7_wh.svg" w="32" h="32"/>
 		</itemgra>
 		<itemgra item_types="nav_roundabout_l8" order="0-">
-			<icon src="nav_roundabout_l8_bk.svg" w="32" h="32"/>
+			<icon src="nav_roundabout_l8_wh.svg" w="32" h="32"/>
 		</itemgra>
 		<itemgra item_types="nav_roundabout_r8" order="0-">
-			<icon src="nav_roundabout_r8_bk.svg" w="32" h="32"/>
+			<icon src="nav_roundabout_r8_wh.svg" w="32" h="32"/>
 		</itemgra>
 		<itemgra item_types="nav_keep_left" order="0-">
-			<icon src="nav_keep_left_bk.svg" w="32" h="32"/>
+			<icon src="nav_keep_left_wh.svg" w="32" h="32"/>
 		</itemgra>
 		<itemgra item_types="nav_merge_left" order="0-">
-			<icon src="nav_merge_left_bk.svg" w="32" h="32"/>
+			<icon src="nav_merge_left_wh.svg" w="32" h="32"/>
 		</itemgra>
 		<itemgra item_types="nav_keep_right" order="0-">
-			<icon src="nav_keep_right_bk.svg" w="32" h="32"/>
+			<icon src="nav_keep_right_wh.svg" w="32" h="32"/>
 		</itemgra>
 		<itemgra item_types="nav_merge_right" order="0-">
-			<icon src="nav_merge_right_bk.svg" w="32" h="32"/>
+			<icon src="nav_merge_right_wh.svg" w="32" h="32"/>
 		</itemgra>
 		<itemgra item_types="nav_exit_left" order="0-">
-			<icon src="nav_exit_left_bk.svg" w="32" h="32"/>
+			<icon src="nav_exit_left_wh.svg" w="32" h="32"/>
 		</itemgra>
 		<itemgra item_types="nav_exit_right" order="0-">
-			<icon src="nav_exit_right_bk.svg" w="32" h="32"/>
+			<icon src="nav_exit_right_wh.svg" w="32" h="32"/>
 		</itemgra>
 		<itemgra item_types="route_end" order="0-">
-			<icon src="nav_destination_bk.svg" w="32" h="32" x="4" y="30"/>
+			<icon src="nav_destination_wh.svg" w="32" h="32" x="4" y="30"/>
 		</itemgra>
 		<itemgra item_types="nav_none" order="0-">
 			<icon src="unknown.svg"/>
diff --git a/navit/navit_layout_car_generatedarkxml.sh b/navit/navit_layout_car_generatedarkxml.sh
index 3acd49249..b7b454895 100755
--- a/navit/navit_layout_car_generatedarkxml.sh
+++ b/navit/navit_layout_car_generatedarkxml.sh
@@ -15,7 +15,7 @@ ifd=navit_layout_car_dark_shipped.xml
 ofd=$ifd.new
 
 # Iterate over all layers in dark input file
-cat $ifd | grep \<layer | cut -d\" -f2 | while read layer
+cat $ifd | grep \<layer\ name=\" | cut -d\" -f2 | while read -r layer
 do
 
  echo $layer
@@ -34,7 +34,6 @@ do
 
   # Check to see if inside layer - open tag
   if [[ $l =~ .*\<layer\ name=\"$layer\"\>.* ]]; then
-
    inlayer=true
    getlayer=true
   fi
@@ -77,6 +76,7 @@ do
      fi
 
      # Misc. modifications
+     l=$(echo $l | sed -r "s/_bk\./_wh\./") # Black to white icons
      l=$(echo $l | sed -r "s/(<text )/\1color=\"#55c4bd\" background_color=\"#000000\" /") # Add text color
      l=$(echo $l | sed -r "s/(<circle color=\"#[0-9a-fA-F]{6,8}\" )/\1background_color=\"#000000\" /") # Add circle bg color