Fix:Core:Some cleanup in the layers

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk/navit@2422 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/navit.xml b/navit/navit.xml
index 8c83505..bbf9c1a 100644 (file)
--- a/navit/navit.xml
+++ b/navit/navit.xml
@@ -413,6 +413,10 @@
                     <polyline color="#ffefb7"/>
                     <text text_size="5"/>
                 </itemgra>
+                <itemgra item_types="poly_flats,poly_scrub,poly_military_zone,poly_marine,plantation,tundra" order="9-">
+                    <polygon color="#a0a0a0"/>
+                    <text text_size="5"/>
+                </itemgra>
                 <itemgra item_types="poly_park" order="0-">
                     <polygon color="#7cc334"/>
                     <text text_size="5"/>
@@ -1170,12 +1174,6 @@
                     <polyline color="#ffff00" width="258"/>
                     <polyline color="#ff0000" width="1"/>
                 </itemgra>
-                <!-- This entry shows all unknown linear elements as blue lines -->
-                <!--
-                <itemgra item_types="street_unkn" order="0-">
-                    <polyline color="#8080ff" width="3"/>
-                </itemgra>
-                -->
                 <itemgra item_types="tracking_0" order="0-">
                     <polyline color="#000000" width="3"/>
                 </itemgra>
@@ -1384,6 +1382,113 @@
                     <circle color="#000000" radius="3" text_size="15"/>
                 </itemgra>
             </layer>
+           <layer name="Internal">
+                <itemgra item_types="track" order="7-">
+                    <polyline color="#3f3f3f" width="1"/>
+                </itemgra>
+                <itemgra item_types="track_tracked" order="7-">
+                    <polyline color="#3f3fff" width="3"/>
+                </itemgra>
+                <itemgra item_types="rg_segment" order="12-">
+                    <polyline color="#FF089C" width="1"/>
+                    <arrows color="#FF089C" width="1"/>
+                </itemgra>
+                <itemgra item_types="rg_point" order="12-">
+                    <circle color="#FF089C" 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"/>
+                </itemgra>
+                <itemgra item_types="nav_left_2" order="0-">
+                    <icon src="nav_left_2_bk.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"/>
+                </itemgra>
+                <itemgra item_types="nav_right_1" order="0-">
+                    <icon src="nav_right_1_bk.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"/>
+                </itemgra>
+                <itemgra item_types="nav_right_3" order="0-">
+                    <icon src="nav_right_3_bk.svg" w="32" h="32"/>
+                </itemgra>
+                <itemgra item_types="nav_straight" order="0-">
+                    <icon src="nav_straight_bk.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"/>
+                </itemgra>
+                <itemgra item_types="nav_turnaround_right" order="0-">
+                    <icon src="nav_turnaround_right_bk.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"/>
+                </itemgra>
+                <itemgra item_types="nav_roundabout_r1" order="0-">
+                    <icon src="nav_roundabout_r1_bk.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"/>
+                </itemgra>
+                <itemgra item_types="nav_roundabout_r2" order="0-">
+                    <icon src="nav_roundabout_r2_bk.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"/>
+                </itemgra>
+                <itemgra item_types="nav_roundabout_r3" order="0-">
+                    <icon src="nav_roundabout_r3_bk.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"/>
+                </itemgra>
+                <itemgra item_types="nav_roundabout_r4" order="0-">
+                    <icon src="nav_roundabout_r4_bk.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"/>
+                </itemgra>
+                <itemgra item_types="nav_roundabout_r5" order="0-">
+                    <icon src="nav_roundabout_r5_bk.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"/>
+                </itemgra>
+                <itemgra item_types="nav_roundabout_r6" order="0-">
+                    <icon src="nav_roundabout_r6_bk.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"/>
+                </itemgra>
+                <itemgra item_types="nav_roundabout_r7" order="0-">
+                    <icon src="nav_roundabout_r7_bk.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"/>
+                </itemgra>
+                <itemgra item_types="nav_roundabout_r8" order="0-">
+                    <icon src="nav_roundabout_r8_bk.svg" w="32" h="32"/>
+                </itemgra>
+                <itemgra item_types="nav_none" order="0-">
+                    <icon src="unknown.xpm"/>
+                </itemgra>
+                <itemgra item_types="announcement" order="7-">
+                    <icon src="gui_sound_32_32.png"/>
+                    <circle color="#FF089C" radius="10" text_size="7"/>
+                </itemgra>
+            </layer>
+           <layer name="Unknown" enabled="no">
+                <!-- This entry shows all unknow point elements as blue circles -->
+                <itemgra item_types="point_unkn" order="9-">
+                    <circle color="#8080ff" radius="3"/>
+                </itemgra>
+                <!-- This entry shows all unknown linear elements as blue lines -->
+                <itemgra item_types="street_unkn" order="0-">
+                    <polyline color="#8080ff" width="3"/>
+                </itemgra>
+           </layer>
             <layer name="POI Symbols">
                 <itemgra item_types="mini_roundabout" order="12-">
                     <icon src="mini_roundabout.xpm"/>
@@ -1391,12 +1496,6 @@
                 <itemgra item_types="turning_circle" order="12-">
                     <icon src="mini_roundabout.xpm"/>
                 </itemgra>
-                <itemgra item_types="track" order="7-">
-                    <polyline color="#3f3f3f" width="1"/>
-                </itemgra>
-                <itemgra item_types="track_tracked" order="7-">
-                    <polyline color="#3f3fff" width="3"/>
-                </itemgra>
                 <itemgra item_types="poi_airport" order="5-">
                     <icon src="airport.png"/>
                 </itemgra>
@@ -1442,12 +1541,6 @@
                 <itemgra item_types="poi_hospital" order="12-">
                     <icon src="hospital.png"/>
                 </itemgra>
-                <!-- Sorry but I really dislike all those blue dots in osm maps - and they will be more in the future! -->
-                <!--
-                <itemgra item_types="point_unkn" order="9-">
-                    <circle color="#8080ff" radius="3"/>
-                </itemgra>
-                -->
                 <itemgra item_types="poi_dining" order="12-">
                     <icon src="dining.xpm"/>
                 </itemgra>
@@ -1805,102 +1898,9 @@
                 <itemgra item_types="poi_wifi" order="13-">
                     <icon src="wifi.xpm"/>
                 </itemgra>
-                <itemgra item_types="poly_flats,poly_scrub,poly_military_zone,poly_marine,plantation,tundra" order="9-">
-                    <polygon color="#a0a0a0"/>
-                    <text text_size="5"/>
-                </itemgra>
                 <itemgra item_types="poi_image" order="12-">
                     <image/>
                 </itemgra>
-                <itemgra item_types="rg_segment" order="12-">
-                    <polyline color="#FF089C" width="1"/>
-                    <arrows color="#FF089C" width="1"/>
-                </itemgra>
-                <itemgra item_types="rg_point" order="12-">
-                    <circle color="#FF089C" 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"/>
-                </itemgra>
-                <itemgra item_types="nav_left_2" order="0-">
-                    <icon src="nav_left_2_bk.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"/>
-                </itemgra>
-                <itemgra item_types="nav_right_1" order="0-">
-                    <icon src="nav_right_1_bk.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"/>
-                </itemgra>
-                <itemgra item_types="nav_right_3" order="0-">
-                    <icon src="nav_right_3_bk.svg" w="32" h="32"/>
-                </itemgra>
-                <itemgra item_types="nav_straight" order="0-">
-                    <icon src="nav_straight_bk.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"/>
-                </itemgra>
-                <itemgra item_types="nav_turnaround_right" order="0-">
-                    <icon src="nav_turnaround_right_bk.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"/>
-                </itemgra>
-                <itemgra item_types="nav_roundabout_r1" order="0-">
-                    <icon src="nav_roundabout_r1_bk.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"/>
-                </itemgra>
-                <itemgra item_types="nav_roundabout_r2" order="0-">
-                    <icon src="nav_roundabout_r2_bk.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"/>
-                </itemgra>
-                <itemgra item_types="nav_roundabout_r3" order="0-">
-                    <icon src="nav_roundabout_r3_bk.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"/>
-                </itemgra>
-                <itemgra item_types="nav_roundabout_r4" order="0-">
-                    <icon src="nav_roundabout_r4_bk.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"/>
-                </itemgra>
-                <itemgra item_types="nav_roundabout_r5" order="0-">
-                    <icon src="nav_roundabout_r5_bk.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"/>
-                </itemgra>
-                <itemgra item_types="nav_roundabout_r6" order="0-">
-                    <icon src="nav_roundabout_r6_bk.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"/>
-                </itemgra>
-                <itemgra item_types="nav_roundabout_r7" order="0-">
-                    <icon src="nav_roundabout_r7_bk.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"/>
-                </itemgra>
-                <itemgra item_types="nav_roundabout_r8" order="0-">
-                    <icon src="nav_roundabout_r8_bk.svg" w="32" h="32"/>
-                </itemgra>
-                <itemgra item_types="nav_none" order="0-">
-                    <icon src="unknown.xpm"/>
-                </itemgra>
-                <itemgra item_types="announcement" order="7-">
-                    <icon src="gui_sound_32_32.png"/>
-                    <circle color="#FF089C" radius="10" text_size="7"/>
-                </itemgra>
                 <!-- I'm not sure if the following stuff should appear in any layout. Maybe portions should only apply to the bicyle layout. -->
                 <itemgra item_types="poi_bench" order="13-">
                     <icon src="bench.xpm"/>