From: <mar...@us...> - 2009-08-25 17:49:05
|
Revision: 2523 http://navit.svn.sourceforge.net/navit/?rev=2523&view=rev Author: martin-s Date: 2009-08-25 17:48:58 +0000 (Tue, 25 Aug 2009) Log Message: ----------- Fix:Core:Removed obsolete cursor flag Modified Paths: -------------- trunk/navit/navit/navit_shipped.xml Modified: trunk/navit/navit/navit_shipped.xml =================================================================== --- trunk/navit/navit/navit_shipped.xml 2009-08-25 17:48:06 UTC (rev 2522) +++ trunk/navit/navit/navit_shipped.xml 2009-08-25 17:48:58 UTC (rev 2523) @@ -26,7 +26,7 @@ [-][D]D.d[d]... [-][D][D]D.d[d]... [-]0xX [-]0xX --> - <navit center="4808 N 1134 E" zoom="256" tracking="1" cursor="1" orientation="-1" recent_dest="10"> + <navit center="4808 N 1134 E" zoom="256" tracking="1" orientation="-1" recent_dest="10"> <!-- Use one of gtk_drawing_area, qt_qpainter or sdl. For cegui, use opengl --> <graphics type="gtk_drawing_area"/> <!-- The following line let you select which graphical user interface you'd like to use. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2009-08-25 18:40:23
|
Revision: 2524 http://navit.svn.sourceforge.net/navit/?rev=2524&view=rev Author: martin-s Date: 2009-08-25 18:40:16 +0000 (Tue, 25 Aug 2009) Log Message: ----------- Fix:Core:Improved town label rendering Modified Paths: -------------- trunk/navit/navit/navit_shipped.xml Modified: trunk/navit/navit/navit_shipped.xml =================================================================== --- trunk/navit/navit/navit_shipped.xml 2009-08-25 17:48:58 UTC (rev 2523) +++ trunk/navit/navit/navit_shipped.xml 2009-08-25 18:40:16 UTC (rev 2524) @@ -1351,36 +1351,57 @@ <itemgra item_types="house_number" order="15-"> <circle color="#000000" radius="3" text_size="7"/> </itemgra> - <itemgra item_types="town_label,district_label,town_label_0e0,town_label_1e0,town_label_2e0,town_label_5e0,town_label_1e1,town_label_2e1,town_label_5e1,town_label_1e2,town_label_2e2,town_label_5e2,district_label_0e0,district_label_1e0,district_label_2e0,district_label_5e0,district_label_1e1,district_label_2e1,district_label_5e1,district_label_1e2,district_label_2e2,district_label_5e2" order="12-"> + <itemgra item_types="town_label,district_label,town_label_0e0,town_label_1e0,town_label_2e0,town_label_5e0,town_label_1e1,town_label_2e1,town_label_5e1,town_label_1e2,town_label_2e2,town_label_5e2,district_label_0e0,district_label_1e0,district_label_2e0,district_label_5e0,district_label_1e1,district_label_2e1,district_label_5e1,district_label_1e2,district_label_2e2,district_label_5e2" order="11-"> <circle color="#000000" radius="3" text_size="7"/> </itemgra> - <itemgra item_types="district_label_1e3,district_label_2e3,district_label_5e3" order="11-"> + <itemgra item_types="district_label_1e3,district_label_2e3,district_label_5e3" order="10-"> <circle color="#000000" radius="3" text_size="7"/> </itemgra> - <itemgra item_types="town_label_1e3,town_label_2e3,town_label_5e3" order="10-"> - <circle color="#000000" radius="3" text_size="7"/> + <itemgra item_types="town_label_1e3" order="10-"> + <circle color="#000000" radius="3" text_size="10"/> </itemgra> <itemgra item_types="district_label_1e4,district_label_2e4,district_label_5e4" order="9-"> <circle color="#000000" radius="3" text_size="7"/> </itemgra> - <itemgra item_types="town_label_1e4,town_label_2e4,town_label_5e4" order="8-"> + <itemgra item_types="town_label_2e3" order="9-"> + <circle color="#000000" radius="3" text_size="10"/> + </itemgra> + <itemgra item_types="town_label_5e3,town_label_1e4,town_label_2e4,town_label_5e4" order="9-"> + <circle color="#000000" radius="3" text_size="15"/> + </itemgra> + <itemgra item_types="district_label_1e5,district_label_2e5,district_label_5e5" order="8-"> <circle color="#000000" radius="3" text_size="7"/> </itemgra> - <itemgra item_types="district_label_1e5,district_label_2e5,district_label_5e5" order="6-"> + <itemgra item_types="town_label_2e3" order="8"> + <circle color="#000000" radius="3" text_size="7"/> + </itemgra> + <itemgra item_types="district_label_1e6,district_label_2e6,district_label_5e6,district_label_1e7" order="7-"> + <circle color="#000000" radius="3" text_size="7"/> + </itemgra> + <itemgra item_types="town_label_5e3" order="7-8"> <circle color="#000000" radius="3" text_size="10"/> </itemgra> - <itemgra item_types="town_label_1e5,town_label_2e5,town_label_5e5" order="4-"> + <itemgra item_types="town_label_1e4" order="6-8"> <circle color="#000000" radius="3" text_size="10"/> </itemgra> - <itemgra item_types="district_label_1e6,district_label_2e6,district_label_5e6" order="3-"> - <circle color="#000000" radius="3" text_size="15"/> + <itemgra item_types="town_label_2e4,town_label_5e4" order="5-8"> + <circle color="#000000" radius="3" text_size="10"/> </itemgra> - <itemgra item_types="town_label_1e6,town_label_2e6,town_label_5e6" order="2-"> + <itemgra item_types="town_label_1e5,town_label_2e5,town_label_5e5" order="5-"> <circle color="#000000" radius="3" text_size="15"/> </itemgra> - <itemgra item_types="town_label_1e7,district_label_1e7" order="1-"> + <itemgra item_types="town_label_1e6,town_label_2e6,town_label_5e6,town_label_1e7" order="5-"> + <circle color="#000000" radius="3" text_size="20"/> + </itemgra> + <itemgra item_types="town_label_1e5,town_label_2e5,town_label_5e5" order="3-4"> + <circle color="#000000" radius="3" text_size="10"/> + </itemgra> + <itemgra item_types="town_label_1e6,town_label_2e6,town_label_5e6,town_label_1e7" order="3-4"> <circle color="#000000" radius="3" text_size="15"/> </itemgra> + <itemgra item_types="town_label_1e6,town_label_2e6,town_label_5e6,town_label_1e7" order="0-2"> + <circle color="#000000" radius="3" text_size="10"/> + </itemgra> </layer> <layer name="Internal"> <itemgra item_types="track" order="7-"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2009-09-06 20:17:02
|
Revision: 2559 http://navit.svn.sourceforge.net/navit/?rev=2559&view=rev Author: martin-s Date: 2009-09-06 20:16:52 +0000 (Sun, 06 Sep 2009) Log Message: ----------- Fix:Core:Correct flag values for horse and pedestrian Modified Paths: -------------- trunk/navit/navit/navit_shipped.xml Modified: trunk/navit/navit/navit_shipped.xml =================================================================== --- trunk/navit/navit/navit_shipped.xml 2009-09-04 17:45:21 UTC (rev 2558) +++ trunk/navit/navit/navit_shipped.xml 2009-09-06 20:16:52 UTC (rev 2559) @@ -237,7 +237,7 @@ <roadprofile item_types="ferry" speed="40" route_weight="40"/> </vehicleprofile> - <vehicleprofile name="pedestrian" flags="0x20000000" flags_forward_mask="0x20000000" flags_reverse_mask="0x20000000" maxspeed_handling="1" route_mode="0"> + <vehicleprofile name="pedestrian" flags="0x80000000" flags_forward_mask="0x80000000" flags_reverse_mask="0x80000000" maxspeed_handling="1" route_mode="0"> <roadprofile item_types="footway,bridleway,path" speed="5" route_weight="5"> <announcement level="0" distance_metric="25"/> <announcement level="1" distance_metric="100"/> @@ -286,7 +286,7 @@ <roadprofile item_types="roundabout" speed="5" route_weight="5"/> <roadprofile item_types="ferry" speed="40" route_weight="40"/> </vehicleprofile> - <vehicleprofile name="horse" flags="0x80000000" flags_forward_mask="0x80000000" flags_reverse_mask="0x80000000" maxspeed_handling="1" route_mode="0"> + <vehicleprofile name="horse" flags="0x20000000" flags_forward_mask="0x20000000" flags_reverse_mask="0x20000000" maxspeed_handling="1" route_mode="0"> <roadprofile item_types="bridleway" speed="10" route_weight="10"> <announcement level="0" distance_metric="25"/> <announcement level="1" distance_metric="100"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2009-10-11 23:07:39
|
Revision: 2663 http://navit.svn.sourceforge.net/navit/?rev=2663&view=rev Author: christeck Date: 2009-10-11 23:07:29 +0000 (Sun, 11 Oct 2009) Log Message: ----------- improved formattink Modified Paths: -------------- trunk/navit/navit/navit_shipped.xml Modified: trunk/navit/navit/navit_shipped.xml =================================================================== --- trunk/navit/navit/navit_shipped.xml 2009-10-11 14:03:15 UTC (rev 2662) +++ trunk/navit/navit/navit_shipped.xml 2009-10-11 23:07:29 UTC (rev 2663) @@ -34,12 +34,12 @@ In case of the internal GUI, you can even influence the size of the text and of the icons in the toolbar and the viewport. Here's an example for a freerunner: --> <!-- <gui type="internal" font_size="350" icon_xs="32" icon_s="96" icon_l="96"/> --> - <!-- Normally it is sufficient to use --> + <!-- Normally it is sufficient to use --> <!-- <gui type="internal" /> --> <gui type="gtk" menubar="1" toolbar="1" statusbar="1"/> - <!-- for a debug log --> + <!-- for a debug log --> <log enabled="no" type="textfile_debug" data="debug_%Y%m%d-%i.txt" flush_size="1000" flush_time="30"/> <!-- osd items allow to position display and control items directly on top of the map: --> <osd enabled="no" type="compass"/> @@ -108,238 +108,238 @@ </cursor> </vehicle> - <!-- For the cumulative displacement filter to be enabled, set cdf_histsize="x" here, with x being an integer somewhere around 4 --> + <!-- For the cumulative displacement filter to be enabled, set cdf_histsize="x" here, with x being an integer somewhere around 4 --> <tracking cdf_histsize="0"/> - <vehicleprofile name="car" flags="0x4000000" flags_forward_mask="0x4000002" flags_reverse_mask="0x4000001" maxspeed_handling="0" route_mode="0"> - <roadprofile item_types="street_0,street_1_city,living_street,street_service,track_gravelled,track_unpaved" speed="10" route_weight="10"> - <announcement level="0" distance_metric="25"/> - <announcement level="1" distance_metric="100"/> - <announcement level="2" distance_metric="200"/> - </roadprofile> + <vehicleprofile name="car" flags="0x4000000" flags_forward_mask="0x4000002" flags_reverse_mask="0x4000001" maxspeed_handling="0" route_mode="0"> + <roadprofile item_types="street_0,street_1_city,living_street,street_service,track_gravelled,track_unpaved" speed="10" route_weight="10"> + <announcement level="0" distance_metric="25"/> + <announcement level="1" distance_metric="100"/> + <announcement level="2" distance_metric="200"/> + </roadprofile> <roadprofile item_types="street_2_city,track_paved" speed="30" route_weight="30"> - <announcement level="0" distance_metric="50"/> - <announcement level="1" distance_metric="200"/> - <announcement level="2" distance_metric="500"/> - </roadprofile> + <announcement level="0" distance_metric="50"/> + <announcement level="1" distance_metric="200"/> + <announcement level="2" distance_metric="500"/> + </roadprofile> <roadprofile item_types="street_3_city" speed="40" route_weight="40"> - <announcement level="0" distance_metric="50"/> - <announcement level="1" distance_metric="200"/> - <announcement level="2" distance_metric="500"/> - </roadprofile> + <announcement level="0" distance_metric="50"/> + <announcement level="1" distance_metric="200"/> + <announcement level="2" distance_metric="500"/> + </roadprofile> <roadprofile item_types="street_4_city" speed="50" route_weight="50"> - <announcement level="0" distance_metric="50"/> - <announcement level="1" distance_metric="200"/> - <announcement level="2" distance_metric="500"/> - </roadprofile> + <announcement level="0" distance_metric="50"/> + <announcement level="1" distance_metric="200"/> + <announcement level="2" distance_metric="500"/> + </roadprofile> <roadprofile item_types="highway_city" speed="80" route_weight="80"> - <announcement level="0" distance_metric="100"/> - <announcement level="1" distance_metric="400"/> - <announcement level="2" distance_metric="1000"/> - </roadprofile> + <announcement level="0" distance_metric="100"/> + <announcement level="1" distance_metric="400"/> + <announcement level="2" distance_metric="1000"/> + </roadprofile> <roadprofile item_types="street_1_land" speed="60" route_weight="60"> - <announcement level="0" distance_metric="100"/> - <announcement level="1" distance_metric="400"/> - <announcement level="2" distance_metric="1000"/> - </roadprofile> + <announcement level="0" distance_metric="100"/> + <announcement level="1" distance_metric="400"/> + <announcement level="2" distance_metric="1000"/> + </roadprofile> <roadprofile item_types="street_2_land" speed="65" route_weight="65"> - <announcement level="0" distance_metric="100"/> - <announcement level="1" distance_metric="400"/> - <announcement level="2" distance_metric="1000"/> - </roadprofile> + <announcement level="0" distance_metric="100"/> + <announcement level="1" distance_metric="400"/> + <announcement level="2" distance_metric="1000"/> + </roadprofile> <roadprofile item_types="street_3_land" speed="70" route_weight="70"> - <announcement level="0" distance_metric="100"/> - <announcement level="1" distance_metric="400"/> - <announcement level="2" distance_metric="1000"/> - </roadprofile> + <announcement level="0" distance_metric="100"/> + <announcement level="1" distance_metric="400"/> + <announcement level="2" distance_metric="1000"/> + </roadprofile> <roadprofile item_types="street_4_land" speed="80" route_weight="80"> - <announcement level="0" distance_metric="100"/> - <announcement level="1" distance_metric="400"/> - <announcement level="2" distance_metric="1000"/> - </roadprofile> + <announcement level="0" distance_metric="100"/> + <announcement level="1" distance_metric="400"/> + <announcement level="2" distance_metric="1000"/> + </roadprofile> <roadprofile item_types="street_n_lanes" speed="120" route_weight="120"> - <announcement level="0" distance_metric="300"/> - <announcement level="1" distance_metric="1000"/> - <announcement level="2" distance_metric="2000"/> - </roadprofile> + <announcement level="0" distance_metric="300"/> + <announcement level="1" distance_metric="1000"/> + <announcement level="2" distance_metric="2000"/> + </roadprofile> <roadprofile item_types="highway_land" speed="120" route_weight="120"> - <announcement level="0" distance_metric="300"/> - <announcement level="1" distance_metric="1000"/> - <announcement level="2" distance_metric="2000"/> - </roadprofile> + <announcement level="0" distance_metric="300"/> + <announcement level="1" distance_metric="1000"/> + <announcement level="2" distance_metric="2000"/> + </roadprofile> <roadprofile item_types="ramp" speed="40" route_weight="40"> - <announcement level="0" distance_metric="50"/> - <announcement level="1" distance_metric="200"/> - <announcement level="2" distance_metric="500"/> - </roadprofile> + <announcement level="0" distance_metric="50"/> + <announcement level="1" distance_metric="200"/> + <announcement level="2" distance_metric="500"/> + </roadprofile> <roadprofile item_types="roundabout" speed="10" route_weight="10"/> <roadprofile item_types="ferry" speed="40" route_weight="40"/> - </vehicleprofile> + </vehicleprofile> - <vehicleprofile name="bike" flags="0x40000000" flags_forward_mask="0x40000000" flags_reverse_mask="0x40000000" maxspeed_handling="1" route_mode="0"> - <roadprofile item_types="steps" speed="2" route_weight="5"> - <announcement level="0" distance_metric="25"/> - <announcement level="1" distance_metric="100"/> - <announcement level="2" distance_metric="200"/> - </roadprofile> - <roadprofile item_types="street_pedestrian,footway" speed="5" route_weight="10"> - <announcement level="0" distance_metric="25"/> - <announcement level="1" distance_metric="100"/> - <announcement level="2" distance_metric="200"/> - </roadprofile> - <roadprofile item_types="path,track_ground" speed="12" route_weight="12"> - <announcement level="0" distance_metric="25"/> - <announcement level="1" distance_metric="100"/> - <announcement level="2" distance_metric="200"/> - </roadprofile> - <roadprofile item_types="track_gravelled" speed="17" route_weight="15"> - <announcement level="0" distance_metric="25"/> - <announcement level="1" distance_metric="100"/> - <announcement level="2" distance_metric="200"/> - </roadprofile> - <!-- cycleways, paved tracks, serviceways etc. are the favourite ways --> - <roadprofile item_types="track_paved,cycleway,street_service,street_parking_lane" speed="22" route_weight="20"> - <announcement level="0" distance_metric="25"/> - <announcement level="1" distance_metric="100"/> - <announcement level="2" distance_metric="200"/> - </roadprofile> - <!-- residential, unclassified, living street etc. --> - <roadprofile item_types="street_0,street_1_city,living_street" speed="20" route_weight="15"> - <announcement level="0" distance_metric="25"/> - <announcement level="1" distance_metric="100"/> - <announcement level="2" distance_metric="200"/> - </roadprofile> - <!-- tertiary and minor roads are acceptable, but should be avoided in favour of tracks and cycleways --> - <roadprofile item_types="street_2_city,street_1_land,street_2_land" speed="22" route_weight="12"> - <announcement level="0" distance_metric="25"/> - <announcement level="1" distance_metric="100"/> - <announcement level="2" distance_metric="200"/> - </roadprofile> - <!-- secondary etc. are acceptable when necessary --> - <roadprofile item_types="street_3_city" speed="22" route_weight="10"> - <announcement level="0" distance_metric="25"/> - <announcement level="1" distance_metric="100"/> - <announcement level="2" distance_metric="200"/> - </roadprofile> - <!-- primary, trunk etc. should be avoided --> - <roadprofile item_types="street_4_city,ramp" speed="22" route_weight="7"> - <announcement level="0" distance_metric="25"/> - <announcement level="1" distance_metric="100"/> - <announcement level="2" distance_metric="200"/> - </roadprofile> - <!-- Those types do not appear in osm2navit.c and therefore are not used ATM --> + <vehicleprofile name="bike" flags="0x40000000" flags_forward_mask="0x40000000" flags_reverse_mask="0x40000000" maxspeed_handling="1" route_mode="0"> + <roadprofile item_types="steps" speed="2" route_weight="5"> + <announcement level="0" distance_metric="25"/> + <announcement level="1" distance_metric="100"/> + <announcement level="2" distance_metric="200"/> + </roadprofile> + <roadprofile item_types="street_pedestrian,footway" speed="5" route_weight="10"> + <announcement level="0" distance_metric="25"/> + <announcement level="1" distance_metric="100"/> + <announcement level="2" distance_metric="200"/> + </roadprofile> + <roadprofile item_types="path,track_ground" speed="12" route_weight="12"> + <announcement level="0" distance_metric="25"/> + <announcement level="1" distance_metric="100"/> + <announcement level="2" distance_metric="200"/> + </roadprofile> + <roadprofile item_types="track_gravelled" speed="17" route_weight="15"> + <announcement level="0" distance_metric="25"/> + <announcement level="1" distance_metric="100"/> + <announcement level="2" distance_metric="200"/> + </roadprofile> + <!-- cycleways, paved tracks, serviceways etc. are the favourite ways --> + <roadprofile item_types="track_paved,cycleway,street_service,street_parking_lane" speed="22" route_weight="20"> + <announcement level="0" distance_metric="25"/> + <announcement level="1" distance_metric="100"/> + <announcement level="2" distance_metric="200"/> + </roadprofile> + <!-- residential, unclassified, living street etc. --> + <roadprofile item_types="street_0,street_1_city,living_street" speed="20" route_weight="15"> + <announcement level="0" distance_metric="25"/> + <announcement level="1" distance_metric="100"/> + <announcement level="2" distance_metric="200"/> + </roadprofile> + <!-- tertiary and minor roads are acceptable, but should be avoided in favour of tracks and cycleways --> + <roadprofile item_types="street_2_city,street_1_land,street_2_land" speed="22" route_weight="12"> + <announcement level="0" distance_metric="25"/> + <announcement level="1" distance_metric="100"/> + <announcement level="2" distance_metric="200"/> + </roadprofile> + <!-- secondary etc. are acceptable when necessary --> + <roadprofile item_types="street_3_city" speed="22" route_weight="10"> + <announcement level="0" distance_metric="25"/> + <announcement level="1" distance_metric="100"/> + <announcement level="2" distance_metric="200"/> + </roadprofile> + <!-- primary, trunk etc. should be avoided --> + <roadprofile item_types="street_4_city,ramp" speed="22" route_weight="7"> + <announcement level="0" distance_metric="25"/> + <announcement level="1" distance_metric="100"/> + <announcement level="2" distance_metric="200"/> + </roadprofile> + <!-- Those types do not appear in osm2navit.c and therefore are not used ATM --> <roadprofile item_types="street_3_land,street_4_land" speed="20" route_weight="7"> - <announcement level="0" distance_metric="100"/> - <announcement level="1" distance_metric="400"/> - <announcement level="2" distance_metric="1000"/> - </roadprofile> + <announcement level="0" distance_metric="100"/> + <announcement level="1" distance_metric="400"/> + <announcement level="2" distance_metric="1000"/> + </roadprofile> <roadprofile item_types="roundabout" speed="20" route_weight="10"/> <roadprofile item_types="ferry" speed="40" route_weight="40"/> - </vehicleprofile> + </vehicleprofile> - <vehicleprofile name="pedestrian" flags="0x80000000" flags_forward_mask="0x80000000" flags_reverse_mask="0x80000000" maxspeed_handling="1" route_mode="0"> - <roadprofile item_types="footway,bridleway,path" speed="5" route_weight="5"> - <announcement level="0" distance_metric="25"/> - <announcement level="1" distance_metric="100"/> - <announcement level="2" distance_metric="200"/> - </roadprofile> - <roadprofile item_types="living_street,street_pedestrian" speed="5" route_weight="5"> - <announcement level="0" distance_metric="25"/> - <announcement level="1" distance_metric="100"/> - <announcement level="2" distance_metric="200"/> - </roadprofile> - <roadprofile item_types="track_gravelled" speed="5" route_weight="5"> - <announcement level="0" distance_metric="25"/> - <announcement level="1" distance_metric="100"/> - <announcement level="2" distance_metric="200"/> - </roadprofile> - <roadprofile item_types="track_paved" speed="5" route_weight="5"> - <announcement level="0" distance_metric="25"/> - <announcement level="1" distance_metric="100"/> - <announcement level="2" distance_metric="200"/> - </roadprofile> - <roadprofile item_types="cycleway" speed="5" route_weight="5"> - <announcement level="0" distance_metric="25"/> - <announcement level="1" distance_metric="100"/> - <announcement level="2" distance_metric="200"/> - </roadprofile> - <roadprofile item_types="street_0,street_1_city,street_2_city" speed="5" route_weight="5"> - <announcement level="0" distance_metric="25"/> - <announcement level="1" distance_metric="100"/> - <announcement level="2" distance_metric="200"/> - </roadprofile> - <roadprofile item_types="street_3_city,street_4_city,street_service" speed="5" route_weight="5"> - <announcement level="0" distance_metric="25"/> - <announcement level="1" distance_metric="100"/> - <announcement level="2" distance_metric="200"/> - </roadprofile> + <vehicleprofile name="pedestrian" flags="0x80000000" flags_forward_mask="0x80000000" flags_reverse_mask="0x80000000" maxspeed_handling="1" route_mode="0"> + <roadprofile item_types="footway,bridleway,path" speed="5" route_weight="5"> + <announcement level="0" distance_metric="25"/> + <announcement level="1" distance_metric="100"/> + <announcement level="2" distance_metric="200"/> + </roadprofile> + <roadprofile item_types="living_street,street_pedestrian" speed="5" route_weight="5"> + <announcement level="0" distance_metric="25"/> + <announcement level="1" distance_metric="100"/> + <announcement level="2" distance_metric="200"/> + </roadprofile> + <roadprofile item_types="track_gravelled" speed="5" route_weight="5"> + <announcement level="0" distance_metric="25"/> + <announcement level="1" distance_metric="100"/> + <announcement level="2" distance_metric="200"/> + </roadprofile> + <roadprofile item_types="track_paved" speed="5" route_weight="5"> + <announcement level="0" distance_metric="25"/> + <announcement level="1" distance_metric="100"/> + <announcement level="2" distance_metric="200"/> + </roadprofile> + <roadprofile item_types="cycleway" speed="5" route_weight="5"> + <announcement level="0" distance_metric="25"/> + <announcement level="1" distance_metric="100"/> + <announcement level="2" distance_metric="200"/> + </roadprofile> + <roadprofile item_types="street_0,street_1_city,street_2_city" speed="5" route_weight="5"> + <announcement level="0" distance_metric="25"/> + <announcement level="1" distance_metric="100"/> + <announcement level="2" distance_metric="200"/> + </roadprofile> + <roadprofile item_types="street_3_city,street_4_city,street_service" speed="5" route_weight="5"> + <announcement level="0" distance_metric="25"/> + <announcement level="1" distance_metric="100"/> + <announcement level="2" distance_metric="200"/> + </roadprofile> <roadprofile item_types="street_1_land,street_2_land" speed="5" route_weight="5"> - <announcement level="0" distance_metric="100"/> - <announcement level="1" distance_metric="400"/> - <announcement level="2" distance_metric="1000"/> - </roadprofile> + <announcement level="0" distance_metric="100"/> + <announcement level="1" distance_metric="400"/> + <announcement level="2" distance_metric="1000"/> + </roadprofile> <roadprofile item_types="street_3_land,street_4_land" speed="5" route_weight="5"> - <announcement level="0" distance_metric="100"/> - <announcement level="1" distance_metric="400"/> - <announcement level="2" distance_metric="1000"/> - </roadprofile> + <announcement level="0" distance_metric="100"/> + <announcement level="1" distance_metric="400"/> + <announcement level="2" distance_metric="1000"/> + </roadprofile> <roadprofile item_types="roundabout" speed="5" route_weight="5"/> <roadprofile item_types="ferry" speed="40" route_weight="40"/> - </vehicleprofile> - <vehicleprofile name="horse" flags="0x20000000" flags_forward_mask="0x20000000" flags_reverse_mask="0x20000000" maxspeed_handling="1" route_mode="0"> - <roadprofile item_types="bridleway" speed="10" route_weight="10"> - <announcement level="0" distance_metric="25"/> - <announcement level="1" distance_metric="100"/> - <announcement level="2" distance_metric="200"/> - </roadprofile> - <roadprofile item_types="footway,path" speed="5" route_weight="5"> - <announcement level="0" distance_metric="25"/> - <announcement level="1" distance_metric="100"/> - <announcement level="2" distance_metric="200"/> - </roadprofile> - <roadprofile item_types="living_street,street_pedestrian" speed="5" route_weight="4"> - <announcement level="0" distance_metric="25"/> - <announcement level="1" distance_metric="100"/> - <announcement level="2" distance_metric="200"/> - </roadprofile> - <roadprofile item_types="track_gravelled" speed="5" route_weight="5"> - <announcement level="0" distance_metric="25"/> - <announcement level="1" distance_metric="100"/> - <announcement level="2" distance_metric="200"/> - </roadprofile> - <roadprofile item_types="track_paved" speed="5" route_weight="5"> - <announcement level="0" distance_metric="25"/> - <announcement level="1" distance_metric="100"/> - <announcement level="2" distance_metric="200"/> - </roadprofile> - <roadprofile item_types="cycleway" speed="5" route_weight="5"> - <announcement level="0" distance_metric="25"/> - <announcement level="1" distance_metric="100"/> - <announcement level="2" distance_metric="200"/> - </roadprofile> - <roadprofile item_types="street_0,street_1_city,street_2_city" speed="5" route_weight="2"> - <announcement level="0" distance_metric="25"/> - <announcement level="1" distance_metric="100"/> - <announcement level="2" distance_metric="200"/> - </roadprofile> - <roadprofile item_types="street_3_city,street_4_city,street_service" speed="5" route_weight="4"> - <announcement level="0" distance_metric="25"/> - <announcement level="1" distance_metric="100"/> - <announcement level="2" distance_metric="200"/> - </roadprofile> + </vehicleprofile> + <vehicleprofile name="horse" flags="0x20000000" flags_forward_mask="0x20000000" flags_reverse_mask="0x20000000" maxspeed_handling="1" route_mode="0"> + <roadprofile item_types="bridleway" speed="10" route_weight="10"> + <announcement level="0" distance_metric="25"/> + <announcement level="1" distance_metric="100"/> + <announcement level="2" distance_metric="200"/> + </roadprofile> + <roadprofile item_types="footway,path" speed="5" route_weight="5"> + <announcement level="0" distance_metric="25"/> + <announcement level="1" distance_metric="100"/> + <announcement level="2" distance_metric="200"/> + </roadprofile> + <roadprofile item_types="living_street,street_pedestrian" speed="5" route_weight="4"> + <announcement level="0" distance_metric="25"/> + <announcement level="1" distance_metric="100"/> + <announcement level="2" distance_metric="200"/> + </roadprofile> + <roadprofile item_types="track_gravelled" speed="5" route_weight="5"> + <announcement level="0" distance_metric="25"/> + <announcement level="1" distance_metric="100"/> + <announcement level="2" distance_metric="200"/> + </roadprofile> + <roadprofile item_types="track_paved" speed="5" route_weight="5"> + <announcement level="0" distance_metric="25"/> + <announcement level="1" distance_metric="100"/> + <announcement level="2" distance_metric="200"/> + </roadprofile> + <roadprofile item_types="cycleway" speed="5" route_weight="5"> + <announcement level="0" distance_metric="25"/> + <announcement level="1" distance_metric="100"/> + <announcement level="2" distance_metric="200"/> + </roadprofile> + <roadprofile item_types="street_0,street_1_city,street_2_city" speed="5" route_weight="2"> + <announcement level="0" distance_metric="25"/> + <announcement level="1" distance_metric="100"/> + <announcement level="2" distance_metric="200"/> + </roadprofile> + <roadprofile item_types="street_3_city,street_4_city,street_service" speed="5" route_weight="4"> + <announcement level="0" distance_metric="25"/> + <announcement level="1" distance_metric="100"/> + <announcement level="2" distance_metric="200"/> + </roadprofile> <roadprofile item_types="street_1_land,street_2_land" speed="5" route_weight="2"> - <announcement level="0" distance_metric="100"/> - <announcement level="1" distance_metric="400"/> - <announcement level="2" distance_metric="1000"/> - </roadprofile> + <announcement level="0" distance_metric="100"/> + <announcement level="1" distance_metric="400"/> + <announcement level="2" distance_metric="1000"/> + </roadprofile> <roadprofile item_types="street_3_land,street_4_land" speed="5" route_weight="4"> - <announcement level="0" distance_metric="100"/> - <announcement level="1" distance_metric="400"/> - <announcement level="2" distance_metric="1000"/> - </roadprofile> + <announcement level="0" distance_metric="100"/> + <announcement level="1" distance_metric="400"/> + <announcement level="2" distance_metric="1000"/> + </roadprofile> <roadprofile item_types="roundabout" speed="5" route_weight="2"/> <roadprofile item_types="ferry" speed="40" route_weight="40"/> - </vehicleprofile> + </vehicleprofile> <route destination_distance="50"/> @@ -371,12 +371,12 @@ <xi:include href="$NAVIT_SHAREDIR/maps/*.xml"/> </mapset> - <!-- Mapset template for openstreetmaps --> - <mapset enabled="no"> - <map type="binfile" enabled="yes" data="/media/mmc2/MapsNavit/osm_europe.bin"/> + <!-- Mapset template for openstreetmaps --> + <mapset enabled="no"> + <map type="binfile" enabled="yes" data="/media/mmc2/MapsNavit/osm_europe.bin"/> </mapset> - <!-- Mapset template for garmin maps --> + <!-- Mapset template for garmin maps --> <mapset enabled="no"> <map type="garmin" enabled="yes" data="/path/to/img" debug="4"/> </mapset> @@ -644,7 +644,7 @@ <itemgra item_types="street_route" order="18"> <polyline color="#0000a0" width="530"/> </itemgra> - <itemgra item_types="selected_line" order="2"> + <itemgra item_types="selected_line" order="2"> <polyline color="#ba00b8" width="4"/> </itemgra> <itemgra item_types="selected_line" order="3-5"> @@ -1351,9 +1351,9 @@ </itemgra> </layer> <layer name="labels"> - <itemgra item_types="house_number" order="15-"> - <circle color="#000000" radius="3" text_size="7"/> - </itemgra> + <itemgra item_types="house_number" order="15-"> + <circle color="#000000" radius="3" text_size="7"/> + </itemgra> <itemgra item_types="town_label,district_label,town_label_0e0,town_label_1e0,town_label_2e0,town_label_5e0,town_label_1e1,town_label_2e1,town_label_5e1,town_label_1e2,town_label_2e2,town_label_5e2,district_label_0e0,district_label_1e0,district_label_2e0,district_label_5e0,district_label_1e1,district_label_2e1,district_label_5e1,district_label_1e2,district_label_2e2,district_label_5e2" order="11-"> <circle color="#000000" radius="3" text_size="7"/> </itemgra> @@ -1377,7 +1377,7 @@ </itemgra> <itemgra item_types="town_label_2e3" order="8"> <circle color="#000000" radius="3" text_size="7"/> - </itemgra> + </itemgra> <itemgra item_types="district_label_1e6,district_label_2e6,district_label_5e6,district_label_1e7" order="7-"> <circle color="#000000" radius="3" text_size="7"/> </itemgra> @@ -1406,7 +1406,7 @@ <circle color="#000000" radius="3" text_size="10"/> </itemgra> </layer> - <layer name="Internal"> + <layer name="Internal"> <itemgra item_types="track" order="7-"> <polyline color="#3f3f3f" width="1"/> </itemgra> @@ -1503,7 +1503,7 @@ <circle color="#FF089C" radius="10" text_size="7"/> </itemgra> </layer> - <layer name="Unknown" enabled="no"> + <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"/> @@ -1512,7 +1512,7 @@ <itemgra item_types="street_unkn" order="0-"> <polyline color="#8080ff" width="3"/> </itemgra> - </layer> + </layer> <layer name="POI Symbols"> <itemgra item_types="mini_roundabout" order="12-"> <icon src="mini_roundabout.xpm"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <se...@us...> - 2009-10-15 11:03:46
|
Revision: 2668 http://navit.svn.sourceforge.net/navit/?rev=2668&view=rev Author: seralph Date: 2009-10-15 11:03:39 +0000 (Thu, 15 Oct 2009) Log Message: ----------- Fix:Core:Move cursor into layout definition (navit.xml) Modified Paths: -------------- trunk/navit/navit/navit_shipped.xml Modified: trunk/navit/navit/navit_shipped.xml =================================================================== --- trunk/navit/navit/navit_shipped.xml 2009-10-14 12:05:48 UTC (rev 2667) +++ trunk/navit/navit/navit_shipped.xml 2009-10-15 11:03:39 UTC (rev 2668) @@ -60,53 +60,12 @@ <vehicle name="Local GPS" profilename="car" enabled="yes" active="1" source="gpsd://localhost" gpsd_query="w+xj"> <!-- Navit can write a tracklog in several formats (gpx, nmea or textfile): --> <!-- <log type="gpx" attr_types="position_time_iso8601,position_direction,position_speed,profilename,position_radius" data="track_%Y%m%d-%i.gpx" flush_size="1000" flush_time="30"/> --> - <cursor w="26" h="26"> - <itemgra> - <circle color="#0000ff" radius="24" width="2"> - <coord x="0" y="0"/> - </circle> - </itemgra> - <itemgra speed_range="-2"> - <polyline color="#0000ff" width="2"> - <coord x="0" y="0"/> - <coord x="0" y="0"/> - </polyline> - </itemgra> - <itemgra speed_range="3-"> - <polyline color="#0000ff" width="2"> - <coord x="-7" y="-10"/> - <coord x="0" y="12"/> - <coord x="7" y="-10"/> - </polyline> - </itemgra> - </cursor> </vehicle> <!-- For SDL, you should add follow="1" to have the view centered on your position --> <!-- <vehicle name="Meins" enabled="yes" source="gpsd://localhost" color="#0000ff" follow="1"/> --> - <vehicle name="Demo" profilename="car" enabled="no" active="yes" source="demo://"> - <cursor w="26" h="26"> - <itemgra> - <circle color="#0000ff" radius="24" width="2"> - <coord x="0" y="0"/> - </circle> - </itemgra> - <itemgra speed_range="-2"> - <polyline color="#0000ff" width="2"> - <coord x="0" y="0"/> - <coord x="0" y="0"/> - </polyline> - </itemgra> - <itemgra speed_range="3-"> - <polyline color="#0000ff" width="2"> - <coord x="-7" y="-10"/> - <coord x="0" y="12"/> - <coord x="7" y="-10"/> - </polyline> - </itemgra> - </cursor> - </vehicle> + <vehicle name="Demo" profilename="car" enabled="no" active="yes" source="demo://" /> <!-- For the cumulative displacement filter to be enabled, set cdf_histsize="x" here, with x being an integer somewhere around 4 --> <tracking cdf_histsize="0"/> @@ -382,6 +341,28 @@ </mapset> <layout name="Car" color="#ffefb7" font="Liberation Sans"> + + <cursor w="26" h="26"> + <itemgra> + <circle color="#0000ff" radius="24" width="2"> + <coord x="0" y="0"/> + </circle> + </itemgra> + <itemgra speed_range="-2"> + <polyline color="#0000ff" width="2"> + <coord x="0" y="0"/> + <coord x="0" y="0"/> + </polyline> + </itemgra> + <itemgra speed_range="3-"> + <polyline color="#0000ff" width="2"> + <coord x="-7" y="-10"/> + <coord x="0" y="12"/> + <coord x="7" y="-10"/> + </polyline> + </itemgra> + </cursor> + <layer name="polygons"> <itemgra item_types="image" order="0-"> <image/> @@ -1977,6 +1958,28 @@ </layout> <layout name="Car-dark" color="#011001"> + + <cursor w="26" h="26"> + <itemgra> + <circle color="#00ff00" radius="24" width="2"> + <coord x="0" y="0"/> + </circle> + </itemgra> + <itemgra speed_range="-2"> + <polyline color="#00ff00" width="2"> + <coord x="0" y="0"/> + <coord x="0" y="0"/> + </polyline> + </itemgra> + <itemgra speed_range="3-"> + <polyline color="#00ff00" width="2"> + <coord x="-7" y="-10"/> + <coord x="0" y="12"/> + <coord x="7" y="-10"/> + </polyline> + </itemgra> + </cursor> + <layer name="polygons"> <itemgra item_types="image" order="0-"> <image/> @@ -3222,6 +3225,28 @@ </layer> </layout> <layout name="Bike" color="#ffefb7" font="Liberation Sans"> + + <cursor w="26" h="26"> + <itemgra> + <circle color="#0000ff" radius="24" width="2"> + <coord x="0" y="0"/> + </circle> + </itemgra> + <itemgra speed_range="-2"> + <polyline color="#0000ff" width="2"> + <coord x="0" y="0"/> + <coord x="0" y="0"/> + </polyline> + </itemgra> + <itemgra speed_range="3-"> + <polyline color="#0000ff" width="2"> + <coord x="-7" y="-10"/> + <coord x="0" y="12"/> + <coord x="7" y="-10"/> + </polyline> + </itemgra> + </cursor> + <layer name="Landuse"> <itemgra item_types="image" order="0-"> <image/> @@ -4067,6 +4092,28 @@ </layer> </layout> <layout name="T@H" font="Liberation Sans"> + + <cursor w="26" h="26"> + <itemgra> + <circle color="#0000ff" radius="24" width="2"> + <coord x="0" y="0"/> + </circle> + </itemgra> + <itemgra speed_range="-2"> + <polyline color="#0000ff" width="2"> + <coord x="0" y="0"/> + <coord x="0" y="0"/> + </polyline> + </itemgra> + <itemgra speed_range="3-"> + <polyline color="#0000ff" width="2"> + <coord x="-7" y="-10"/> + <coord x="0" y="12"/> + <coord x="7" y="-10"/> + </polyline> + </itemgra> + </cursor> + <layer name="sea" details="0"> <!-- landuse=forest --> <itemgra item_types="poly_wood" order="0-"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ri...@us...> - 2009-10-15 15:21:18
|
Revision: 2669 http://navit.svn.sourceforge.net/navit/?rev=2669&view=rev Author: rikky Date: 2009-10-15 15:21:07 +0000 (Thu, 15 Oct 2009) Log Message: ----------- Fix:Core:Added living_street to layouts for car, car-dark and T@H Modified Paths: -------------- trunk/navit/navit/navit_shipped.xml Modified: trunk/navit/navit/navit_shipped.xml =================================================================== --- trunk/navit/navit/navit_shipped.xml 2009-10-15 11:03:39 UTC (rev 2668) +++ trunk/navit/navit/navit_shipped.xml 2009-10-15 15:21:07 UTC (rev 2669) @@ -827,39 +827,39 @@ <itemgra item_types="steps" order="10-"> <polyline color="#000000" width="1"/> </itemgra> - <itemgra item_types="street_pedestrian" order="10"> + <itemgra item_types="street_pedestrian,living_street" order="10"> <polyline color="#d2d2d2" width="3"/> <polyline color="#dddddd" width="1"/> </itemgra> - <itemgra item_types="street_pedestrian" order="11"> + <itemgra item_types="street_pedestrian,living_street" order="11"> <polyline color="#d2d2d2" width="5"/> <polyline color="#dddddd" width="3"/> </itemgra> - <itemgra item_types="street_pedestrian" order="12"> + <itemgra item_types="street_pedestrian,living_street" order="12"> <polyline color="#d2d2d2" width="8"/> <polyline color="#dddddd" width="6"/> </itemgra> - <itemgra item_types="street_pedestrian" order="13"> + <itemgra item_types="street_pedestrian,living_street" order="13"> <polyline color="#d2d2d2" width="9"/> <polyline color="#dddddd" width="7"/> </itemgra> - <itemgra item_types="street_pedestrian" order="14"> + <itemgra item_types="street_pedestrian,living_street" order="14"> <polyline color="#d2d2d2" width="13"/> <polyline color="#dddddd" width="9"/> </itemgra> - <itemgra item_types="street_pedestrian" order="15"> + <itemgra item_types="street_pedestrian,living_street" order="15"> <polyline color="#d2d2d2" width="18"/> <polyline color="#dddddd" width="14"/> </itemgra> - <itemgra item_types="street_pedestrian" order="16"> + <itemgra item_types="street_pedestrian,living_street" order="16"> <polyline color="#d2d2d2" width="21"/> <polyline color="#dddddd" width="17"/> </itemgra> - <itemgra item_types="street_pedestrian" order="17"> + <itemgra item_types="street_pedestrian,living_street" order="17"> <polyline color="#d2d2d2" width="25"/> <polyline color="#dddddd" width="21"/> </itemgra> - <itemgra item_types="street_pedestrian" order="18"> + <itemgra item_types="street_pedestrian,living_street" order="18"> <polyline color="#d2d2d2" width="40"/> <polyline color="#dddddd" width="34"/> </itemgra> @@ -2362,38 +2362,38 @@ <itemgra item_types="steps" order="17-18"> <polyline color="#4d4e11" width="3"/> </itemgra> - <itemgra item_types="street_pedestrian" order="10"> + <itemgra item_types="street_pedestrian,living_street" order="10"> <polyline color="#1e0728" width="1"/> </itemgra> - <itemgra item_types="street_pedestrian" order="11"> + <itemgra item_types="street_pedestrian,living_street" order="11"> <polyline color="#1e0728" width="5"/> <polyline color="#202020" width="2"/> </itemgra> - <itemgra item_types="street_pedestrian" order="12"> + <itemgra item_types="street_pedestrian,living_street" order="12"> <polyline color="#1e0728" width="8"/> <polyline color="#202020" width="3"/> </itemgra> - <itemgra item_types="street_pedestrian" order="13"> + <itemgra item_types="street_pedestrian,living_street" order="13"> <polyline color="#1e0728" width="9"/> <polyline color="#202020" width="4"/> </itemgra> - <itemgra item_types="street_pedestrian" order="14"> + <itemgra item_types="street_pedestrian,living_street" order="14"> <polyline color="#1e0728" width="13"/> <polyline color="#202020" width="7"/> </itemgra> - <itemgra item_types="street_pedestrian" order="15"> + <itemgra item_types="street_pedestrian,living_street" order="15"> <polyline color="#1e0728" width="18"/> <polyline color="#202020" width="10"/> </itemgra> - <itemgra item_types="street_pedestrian" order="16"> + <itemgra item_types="street_pedestrian,living_street" order="16"> <polyline color="#1e0728" width="21"/> <polyline color="#202020" width="13"/> </itemgra> - <itemgra item_types="street_pedestrian" order="17"> + <itemgra item_types="street_pedestrian,living_street" order="17"> <polyline color="#1e0728" width="25"/> <polyline color="#202020" width="17"/> </itemgra> - <itemgra item_types="street_pedestrian" order="18"> + <itemgra item_types="street_pedestrian,living_street" order="18"> <polyline color="#1e0728" width="40"/> <polyline color="#202020" width="30"/> </itemgra> @@ -3224,6 +3224,7 @@ </itemgra> </layer> </layout> + <layout name="Bike" color="#ffefb7" font="Liberation Sans"> <cursor w="26" h="26"> @@ -4091,6 +4092,7 @@ </itemgra> </layer> </layout> + <layout name="T@H" font="Liberation Sans"> <cursor w="26" h="26"> @@ -4216,6 +4218,42 @@ <polyline color="#0000a0" width="530"/> </itemgra> <!-- highway=service,footway, ,... --> + <itemgra item_types="street_pedestrian,living_street" order="10"> + <polyline color="#d2d2d2" width="3"/> + <polyline color="#dddddd" width="1"/> + </itemgra> + <itemgra item_types="street_pedestrian,living_street" order="11"> + <polyline color="#d2d2d2" width="5"/> + <polyline color="#dddddd" width="3"/> + </itemgra> + <itemgra item_types="street_pedestrian,living_street" order="12"> + <polyline color="#d2d2d2" width="8"/> + <polyline color="#dddddd" width="6"/> + </itemgra> + <itemgra item_types="street_pedestrian,living_street" order="13"> + <polyline color="#d2d2d2" width="9"/> + <polyline color="#dddddd" width="7"/> + </itemgra> + <itemgra item_types="street_pedestrian,living_street" order="14"> + <polyline color="#d2d2d2" width="13"/> + <polyline color="#dddddd" width="9"/> + </itemgra> + <itemgra item_types="street_pedestrian,living_street" order="15"> + <polyline color="#d2d2d2" width="18"/> + <polyline color="#dddddd" width="14"/> + </itemgra> + <itemgra item_types="street_pedestrian,living_street" order="16"> + <polyline color="#d2d2d2" width="21"/> + <polyline color="#dddddd" width="17"/> + </itemgra> + <itemgra item_types="street_pedestrian,living_street" order="17"> + <polyline color="#d2d2d2" width="25"/> + <polyline color="#dddddd" width="21"/> + </itemgra> + <itemgra item_types="street_pedestrian,living_street" order="18"> + <polyline color="#d2d2d2" width="40"/> + <polyline color="#dddddd" width="34"/> + </itemgra> <itemgra item_types="street_nopass" order="10"> <polyline color="#efeaa0" width="1"/> </itemgra> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2009-10-25 12:43:27
|
Revision: 2688 http://navit.svn.sourceforge.net/navit/?rev=2688&view=rev Author: martin-s Date: 2009-10-25 12:43:19 +0000 (Sun, 25 Oct 2009) Log Message: ----------- Fix:Core:Cleaned up navit.xml Modified Paths: -------------- trunk/navit/navit/navit_shipped.xml Modified: trunk/navit/navit/navit_shipped.xml =================================================================== --- trunk/navit/navit/navit_shipped.xml 2009-10-25 12:43:09 UTC (rev 2687) +++ trunk/navit/navit/navit_shipped.xml 2009-10-25 12:43:19 UTC (rev 2688) @@ -1422,12 +1422,9 @@ <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-"> + <itemgra item_types="nav_turnaround" 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> @@ -1585,7 +1582,7 @@ <itemgra item_types="poi_bus_stop" order="12-"> <icon src="bus.png"/> </itemgra> - <itemgra item_types="poi_bussines_service" order="12-"> + <itemgra item_types="poi_business_service" order="12-"> <icon src="bussines_service.xpm"/> </itemgra> <itemgra item_types="poi_car_rent" order="12-"> @@ -1606,9 +1603,6 @@ <itemgra item_types="poi_cinema" order="12-"> <icon src="cinema.png"/> </itemgra> - <itemgra item_types="poi_civil" order="12-"> - <icon src="civil.xpm"/> - </itemgra> <itemgra item_types="poi_communication" order="12-"> <icon src="communication.xpm"/> </itemgra> @@ -1627,7 +1621,7 @@ <itemgra item_types="poi_danger_area" order="12-"> <icon src="danger_area.xpm"/> </itemgra> - <itemgra item_types="poi_dangerous" order="12-"> + <itemgra item_types="poi_danger_sea_wreck" order="12-"> <icon src="dangerous.xpm"/> </itemgra> <itemgra item_types="poi_daymark" order="12-"> @@ -1651,16 +1645,16 @@ <itemgra item_types="poi_fish" order="9-"> <icon src="fish.xpm"/> </itemgra> - <itemgra item_types="poi_forbiden_area" order="12-"> + <itemgra item_types="poi_forbidden_area" order="12-"> <icon src="forbiden_area.xpm"/> </itemgra> - <itemgra item_types="poi_garmin" order="15-"> + <itemgra item_types="poi_shop_gps" order="15-"> <icon src="garmin.xpm"/> </itemgra> <itemgra item_types="poi_golf" order="12-"> <icon src="golf.xpm"/> </itemgra> - <itemgra item_types="poi_goverment_building" order="12-"> + <itemgra item_types="poi_government_building" order="12-"> <icon src="goverment_building.xpm"/> </itemgra> <itemgra item_types="poi_height" order="12-"> @@ -1735,7 +1729,7 @@ <itemgra item_types="poi_pharmacy" order="12-"> <icon src="pharmacy.xpm"/> </itemgra> - <itemgra item_types="poi_post" order="13-"> + <itemgra item_types="poi_post_office,poi_post_box" order="13-"> <icon src="post.png"/> </itemgra> <itemgra item_types="poi_public_office" order="12-"> @@ -1768,9 +1762,6 @@ <itemgra item_types="poi_restricted_area" order="12-"> <icon src="restricted_area.xpm"/> </itemgra> - <itemgra item_types="poi_rest_room" order="13-"> - <icon src="rest_room.xpm"/> - </itemgra> <itemgra item_types="poi_restroom" order="13-"> <icon src="restroom.xpm"/> </itemgra> @@ -1795,7 +1786,7 @@ <itemgra item_types="poi_shop_department" order="12-"> <icon src="shop_department.xpm"/> </itemgra> - <itemgra item_types="poi_shop_furnish" order="12-"> + <itemgra item_types="poi_shop_furniture" order="12-"> <icon src="shop_furnish.xpm"/> </itemgra> <itemgra item_types="poi_shop_grocery" order="12-"> @@ -1828,9 +1819,6 @@ <itemgra item_types="poi_stadium" order="11-"> <icon src="stadium.xpm"/> </itemgra> - <itemgra item_types="poi_subdivision" order="12-"> - <icon src="subdivision.xpm"/> - </itemgra> <itemgra item_types="poi_swimming" order="12-"> <icon src="swimming.xpm"/> </itemgra> @@ -1951,7 +1939,7 @@ </itemgra> </layer> <layer name="POI Labels"> - <itemgra item_types="poi_airport,town_ghost,poi_hotel,poi_car_parking,poi_car_dealer_parts,poi_fuel,poi_shopping,poi_attraction,poi_cafe,poi_bar,highway_exit,poi_camp_rv,poi_museum_history,poi_hospital,poi_dining,poi_fastfood,poi_police,poi_autoservice,poi_bank,poi_bus_station,poi_bus_stop,poi_bussines_service,poi_car_rent,poi_church,poi_cinema,poi_concert,poi_drinkingwater,poi_emergency,poi_fair,poi_fish,poi_goverment_building,poi_hotspring,poi_information,poi_justice,poi_landmark,poi_library,poi_mall,poi_manmade_feature,poi_marine,poimarine_type,poi_mark,poi_oil_field,poi_peak,poi_personal_service,poi_pharmacy,poi_post,poi_public_office,poi_rail_halt,poi_rail_station,poi_rail_tram_stop,poi_repair_service,poi_resort,poi_restaurant,poi_restricted_area,poi_sailing,poi_scenic_area,poi_school,poi_service,poi_shop_retail,poi_skiing,poi_social_service,poi_sport,poi_stadium,poi_swimming,poi_theater,poi_townhall,poi_trail,poi_truck_stop,poi_tunnel,poi_worship,poi_wrecker,poi_zoo,poi_biergarten,poi_castle,poi_ruins,poi_memorial,poi_monument,poi_shelter,poi_fountain,poi_viewpoint" order="14-"> + <itemgra item_types="poi_airport,town_ghost,poi_hotel,poi_car_parking,poi_car_dealer_parts,poi_fuel,poi_shopping,poi_attraction,poi_cafe,poi_bar,highway_exit,poi_camp_rv,poi_museum_history,poi_hospital,poi_dining,poi_fastfood,poi_police,poi_autoservice,poi_bank,poi_bus_station,poi_bus_stop,poi_business_service,poi_car_rent,poi_church,poi_cinema,poi_concert,poi_drinking_water,poi_emergency,poi_fair,poi_fish,poi_government_building,poi_hotspring,poi_information,poi_justice,poi_landmark,poi_library,poi_mall,poi_manmade_feature,poi_marine,poi_marine_type,poi_mark,poi_oil_field,poi_peak,poi_personal_service,poi_pharmacy,poi_post_office,poi_public_office,poi_rail_halt,poi_rail_station,poi_rail_tram_stop,poi_repair_service,poi_resort,poi_restaurant,poi_restricted_area,poi_sailing,poi_scenic_area,poi_school,poi_service,poi_shop_retail,poi_skiing,poi_social_service,poi_sport,poi_stadium,poi_swimming,poi_theater,poi_townhall,poi_trail,poi_truck_stop,poi_tunnel,poi_worship,poi_wrecker,poi_zoo,poi_biergarten,poi_castle,poi_ruins,poi_memorial,poi_monument,poi_shelter,poi_fountain,poi_viewpoint" order="14-"> <circle color="#606060" radius="0" width="0" text_size="10"/> </itemgra> </layer> @@ -2845,7 +2833,7 @@ <itemgra item_types="poi_bus_stop" order="12-"> <icon src="bus.png"/> </itemgra> - <itemgra item_types="poi_bussines_service" order="0-"> + <itemgra item_types="poi_business_service" order="0-"> <icon src="bussines_service.xpm"/> </itemgra> <itemgra item_types="poi_car_rent" order="11-"> @@ -2866,9 +2854,6 @@ <itemgra item_types="poi_cinema" order="12-"> <icon src="cinema.png"/> </itemgra> - <itemgra item_types="poi_civil" order="0-"> - <icon src="civil.xpm"/> - </itemgra> <itemgra item_types="poi_communication" order="0-"> <icon src="communication.xpm"/> </itemgra> @@ -2887,7 +2872,7 @@ <itemgra item_types="poi_danger_area" order="0-"> <icon src="danger_area.xpm"/> </itemgra> - <itemgra item_types="poi_dangerous" order="0-"> + <itemgra item_types="poi_danger_sea_wreck" order="0-"> <icon src="dangerous.xpm"/> </itemgra> <itemgra item_types="poi_daymark" order="0-"> @@ -2911,16 +2896,16 @@ <itemgra item_types="poi_fish" order="0-"> <icon src="fish.xpm"/> </itemgra> - <itemgra item_types="poi_forbiden_area" order="0-"> + <itemgra item_types="poi_forbidden_area" order="0-"> <icon src="forbiden_area.xpm"/> </itemgra> - <itemgra item_types="poi_garmin" order="0-"> + <itemgra item_types="poi_shop_gps" order="0-"> <icon src="garmin.xpm"/> </itemgra> <itemgra item_types="poi_golf" order="12-"> <icon src="golf.xpm"/> </itemgra> - <itemgra item_types="poi_goverment_building" order="0-"> + <itemgra item_types="poi_government_building" order="0-"> <icon src="goverment_building.xpm"/> </itemgra> <itemgra item_types="poi_height" order="0-"> @@ -2995,7 +2980,7 @@ <itemgra item_types="poi_pharmacy" order="12-"> <icon src="pharmacy.xpm"/> </itemgra> - <itemgra item_types="poi_post" order="13-"> + <itemgra item_types="poi_post_office,poi_post_box" order="13-"> <icon src="post.png"/> </itemgra> <itemgra item_types="poi_public_office" order="0-"> @@ -3022,9 +3007,6 @@ <itemgra item_types="poi_resort" order="0-"> <icon src="resort.xpm"/> </itemgra> - <itemgra item_types="poi_rest_room" order="13-"> - <icon src="rest_room.xpm"/> - </itemgra> <itemgra item_types="poi_restaurant" order="12-"> <icon src="restaurant.xpm"/> </itemgra> @@ -3055,7 +3037,7 @@ <itemgra item_types="poi_shop_department" order="0-"> <icon src="shop_department.xpm"/> </itemgra> - <itemgra item_types="poi_shop_furnish" order="0-"> + <itemgra item_types="poi_shop_furniture" order="0-"> <icon src="shop_furnish.xpm"/> </itemgra> <itemgra item_types="poi_shop_grocery" order="0-"> @@ -3088,9 +3070,6 @@ <itemgra item_types="poi_stadium" order="0-"> <icon src="stadium.xpm"/> </itemgra> - <itemgra item_types="poi_subdivision" order="0-"> - <icon src="subdivision.xpm"/> - </itemgra> <itemgra item_types="poi_swimming" order="12-"> <icon src="swimming.xpm"/> </itemgra> @@ -3219,7 +3198,7 @@ </itemgra> </layer> <layer name="POI Labels"> - <itemgra item_types="poi_airport,town_ghost,poi_hotel,poi_car_parking,poi_car_dealer_parts,poi_fuel,poi_shopping,poi_attraction,poi_cafe,poi_bar,highway_exit,poi_camp_rv,poi_museum_history,poi_hospital,poi_dining,poi_fastfood,poi_police,poi_autoservice,poi_bank,poi_bus_station,poi_bus_stop,poi_bussines_service,poi_car_rent,poi_church,poi_cinema,poi_concert,poi_drinkingwater,poi_emergency,poi_fair,poi_fish,poi_goverment_building,poi_hotspring,poi_information,poi_justice,poi_landmark,poi_library,poi_mall,poi_manmade_feature,poi_marine,poimarine_type,poi_mark,poi_oil_field,poi_peak,poi_personal_service,poi_pharmacy,poi_post,poi_public_office,poi_rail_halt,poi_rail_station,poi_rail_tram_stop,poi_repair_service,poi_resort,poi_restaurant,poi_restricted_area,poi_sailing,poi_scenic_area,poi_school,poi_service,poi_shop_retail,poi_skiing,poi_social_service,poi_sport,poi_stadium,poi_swimming,poi_theater,poi_townhall,poi_trail,poi_truck_stop,poi_tunnel,poi_worship,poi_wrecker,poi_zoo,poi_biergarten,poi_castle,poi_ruins,poi_memorial,poi_monument,poi_shelter,poi_fountain,poi_viewpoint" order="14-"> + <itemgra item_types="poi_airport,town_ghost,poi_hotel,poi_car_parking,poi_car_dealer_parts,poi_fuel,poi_shopping,poi_attraction,poi_cafe,poi_bar,highway_exit,poi_camp_rv,poi_museum_history,poi_hospital,poi_dining,poi_fastfood,poi_police,poi_autoservice,poi_bank,poi_bus_station,poi_bus_stop,poi_business_service,poi_car_rent,poi_church,poi_cinema,poi_concert,poi_drinking_water,poi_emergency,poi_fair,poi_fish,poi_government_building,poi_hotspring,poi_information,poi_justice,poi_landmark,poi_library,poi_mall,poi_manmade_feature,poi_marine,poi_marine_type,poi_mark,poi_oil_field,poi_peak,poi_personal_service,poi_pharmacy,poi_post_office,poi_public_office,poi_rail_halt,poi_rail_station,poi_rail_tram_stop,poi_repair_service,poi_resort,poi_restaurant,poi_restricted_area,poi_sailing,poi_scenic_area,poi_school,poi_service,poi_shop_retail,poi_skiing,poi_social_service,poi_sport,poi_stadium,poi_swimming,poi_theater,poi_townhall,poi_trail,poi_truck_stop,poi_tunnel,poi_worship,poi_wrecker,poi_zoo,poi_biergarten,poi_castle,poi_ruins,poi_memorial,poi_monument,poi_shelter,poi_fountain,poi_viewpoint" order="14-"> <circle color="#606060" radius="0" width="0" text_size="10"/> </itemgra> </layer> @@ -3276,7 +3255,7 @@ <itemgra item_types="poly_airport" order="0-"> <polygon color="#a0a0a0"/> </itemgra> - <itemgra item_types="sport_poly,poly_sport" order="0-"> + <itemgra item_types="poly_sport" order="0-"> <polygon color="#ff8c00"/> </itemgra> <itemgra item_types="poly_industry,poly_place,poly_railway" order="0-"> @@ -3285,7 +3264,7 @@ <itemgra item_types="poly_commercial" order="0-"> <polygon color="#fff8dc"/> </itemgra> - <itemgra item_types="industry_poly,building_poly,place_poly,poly_brownfield,poly_greenfield,poly_construction,poly_railway" order="0-"> + <itemgra item_types="poly_industry,poly_building,poly_place,poly_brownfield,poly_greenfield,poly_construction,poly_railway" order="0-"> <polygon color="#ecd8ff"/> </itemgra> <itemgra item_types="poly_farm" order="0-"> @@ -4122,29 +4101,29 @@ <polygon color="#72bf81"/> </itemgra> <!-- landuse=residential --> - <itemgra item_types="town_poly" order="0-"> + <itemgra item_types="poly_town" order="0-"> <polygon color="#f2f2f2"/> </itemgra> <!-- natural=water --> - <itemgra item_types="water_poly" order="0-"> + <itemgra item_types="poly_water" order="0-"> <polygon color="#b5d6f1"/> <polyline color="#b5d6f1"/> <text text_size="8"/> </itemgra> <!-- leisure=park --> - <itemgra item_types="park_poly" order="0-"> + <itemgra item_types="poly_park" order="0-"> <polygon color="#c7f1a3"/> <polyline color="#79c691"/> <text text_size="5"/> </itemgra> - <itemgra item_types="airport_poly" order="0-"> + <itemgra item_types="poly_airport" order="0-"> <polygon color="#a0a0a0"/> </itemgra> - <itemgra item_types="sport_poly" order="0-"> + <itemgra item_types="poly_sport" order="0-"> <polygon color="#4af04f"/> </itemgra> <!-- landuse=industrial --> - <itemgra item_types="industry_poly,building_poly,place_poly" order="0-"> + <itemgra item_types="poly_industry,poly_building,poly_place" order="0-"> <polygon color="#ecd8ff"/> </itemgra> <!-- waterway=stream --> @@ -4546,7 +4525,7 @@ <itemgra item_types="town_label_1e7,district_label_1e7" order="1-"> <circle color="#000000" radius="3" text_size="15"/> </itemgra> - <itemgra item_types="flats,scrub,military_zone,marine_poly,plantation,tundra" order="0-"> + <itemgra item_types="poly_flats,poly_scrub,poly_military_zone,poly_marine,plantation,tundra" order="0-"> <polygon color="#a0a0a0"/> <text text_size="5"/> </itemgra> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2009-11-20 07:09:23
|
Revision: 2766 http://navit.svn.sourceforge.net/navit/?rev=2766&view=rev Author: martin-s Date: 2009-11-20 07:09:09 +0000 (Fri, 20 Nov 2009) Log Message: ----------- Fix:core:Reformatted navit.xml Modified Paths: -------------- trunk/navit/navit/navit_shipped.xml Modified: trunk/navit/navit/navit_shipped.xml =================================================================== --- trunk/navit/navit/navit_shipped.xml 2009-11-20 06:58:40 UTC (rev 2765) +++ trunk/navit/navit/navit_shipped.xml 2009-11-20 07:09:09 UTC (rev 2766) @@ -1,54 +1,55 @@ -<?xml version="1.0"?> -<!DOCTYPE config SYSTEM "navit.dtd"> -<!-- For configuration options used in this file, please read - http://wiki.navit-project.org/index.php/Configuring_NavIt - Do not edit /usr/share/navit/navit.xml : changes would be lost - on upgrade. Rather copy it to ~/.navit/. Please read wiki --> +<?xml version="1.0" encoding="UTF-8"?><!-- + For configuration options used in this file, please read + http://wiki.navit-project.org/index.php/Configuring_NavIt + Do not edit /usr/share/navit/navit.xml : changes would be lost + on upgrade. Rather copy it to ~/.navit/. Please read wiki +--> +<!DOCTYPE config + SYSTEM "navit.dtd"> <config xmlns:xi="http://www.w3.org/2001/XInclude"> - <plugins> - <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}lib*.so" ondemand="yes"/> - <plugin path="$NAVIT_LIBDIR/autoload/${NAVIT_LIBPREFIX}lib*.so"/> - <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libbinding_dbus.so" active="no"/> - <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libgraphics_null.so" active="no"/> - </plugins> + <plugins> + <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}lib*.so" ondemand="yes"/> + <plugin path="$NAVIT_LIBDIR/autoload/${NAVIT_LIBPREFIX}lib*.so"/> + <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libbinding_dbus.so" active="no"/> + <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libgraphics_null.so" active="no"/> + </plugins> - <debug name="navit:do_draw" level="0"/> - <!-- This is here so one can copy&paste the contents of popup menus --> - <debug name="navit:popup_printf_cb" level="0"/> - <!-- segv: 1 - show backtrace with gdb and exit, 2 - stay in gdb --> - <debug name="segv" level="1"/> - <!-- timestamps 0/1 - prefix log messages with a timestamp --> - <debug name="timestamps" level="0"/> - <!-- This line defines which location on the map navit will show after startup. - It makes sense to set it to your home coordinates. - Center coordinates format: - [D][D]DMM.ss[S][S]... N/S [D][D]DMM.ss[S][S]... E/W - [-][D]D.d[d]... [-][D][D]D.d[d]... - [-]0xX [-]0xX --> + <debug name="navit:do_draw" level="0"/> + <!-- This is here so one can copy&paste the contents of popup menus --> + <debug name="navit:popup_printf_cb" level="0"/> + <!-- segv: 1 - show backtrace with gdb and exit, 2 - stay in gdb --> + <debug name="segv" level="1"/> + <!-- timestamps 0/1 - prefix log messages with a timestamp --> + <debug name="timestamps" level="0"/> + <!-- This line defines which location on the map navit will show after startup. + It makes sense to set it to your home coordinates. + Center coordinates format: + [D][D]DMM.ss[S][S]... N/S [D][D]DMM.ss[S][S]... E/W + [-][D]D.d[d]... [-][D][D]D.d[d]... + [-]0xX [-]0xX --> - <navit center="4808 N 1134 E" zoom="256" tracking="1" orientation="-1" recent_dest="10"> - <!-- Use one of gtk_drawing_area, qt_qpainter or sdl. For cegui, use opengl --> - <graphics type="gtk_drawing_area"/> - <!-- The following line let you select which graphical user interface you'd like to use. - Options include internal (optimized for touch screen devices), gtk (useful for desktop computers) and cegui. - If you don't like the internal gui, set enabled=yes for the following tag and enabled=no for the gui internal tag --> - <gui type="gtk" enabled="no" menubar="1" toolbar="1" statusbar="1"/> + <navit center="4808 N 1134 E" zoom="256" tracking="1" orientation="-1" recent_dest="10"> + <!-- Use one of gtk_drawing_area, qt_qpainter or sdl. For cegui, use opengl --> + <graphics type="gtk_drawing_area"/> + <!-- The following line let you select which graphical user interface you'd like to use. + Options include internal (optimized for touch screen devices), gtk (useful for desktop computers) and cegui. + If you don't like the internal gui, set enabled=yes for the following tag and enabled=no for the gui internal tag --> + <gui type="gtk" enabled="no" menubar="1" toolbar="1" statusbar="1"/> <!-- - In case of the internal GUI, you can even influence the size of the text and of the icons in the toolbar and the viewport. - Here's an example for a freerunner: --> - <!-- <gui type="internal" font_size="350" icon_xs="32" icon_s="96" icon_l="96"/> --> + In case of the internal GUI, you can even influence the size of the text and of the icons in the toolbar and the viewport. + Here's an example for a freerunner: --> + <!-- <gui type="internal" font_size="350" icon_xs="32" icon_s="96" icon_l="96"/> --> - <gui type="internal" enabled="yes"> - <![CDATA[ - <html> - <a name='Main Menu'>Main menu - <a href='#Actions'><img src='gui_actions'>Actions</img></a> - <img cond='flags&2' src='gui_map' onclick='back_to_map()'><text>Show + <gui type="internal" enabled="yes"><![CDATA[ + <html> + <a name='Main Menu'>Main menu + <a href='#Actions'><img src='gui_actions'>Actions</img></a> + <img cond='flags&2' src='gui_map' onclick='back_to_map()'><text>Show Map</text></img> - <a href='#Settings'><img src='gui_settings'><text>Settings</text></img></a> + <a href='#Settings'><img src='gui_settings'><text>Settings</text></img></a> <a href='#Tools'><img src='gui_tools'><text>Tools</text></img></a> <a href='#Route'><img src='gui_settings'><text>Route</text></img></a> - </a> + </a> <a name='Actions'><text>Actions</text> <img src='gui_bookmark' onclick='bookmarks()'><text>Bookmarks</text></img> <img cond='click_coord_geo' src='gui_map' onclick='position(click_coord_geo,_("Map Point"),8|16|32|64|256)'><script>write(click_coord_geo)</script></img> @@ -71,4543 +72,4542 @@ <img src='gui_actions' onclick='route_description()'><text>Description</text></img> <img src='gui_actions' onclick='route_height_profile()'><text>Height Profile</text></img> </a> - </html> - ]]> - </gui> - <!-- for a debug log --> - <log enabled="no" type="textfile_debug" data="debug_%Y%m%d-%i.txt" flush_size="1000" flush_time="30"/> - <!-- osd items allow to position display and control items directly on top of the map: --> - <osd enabled="no" type="compass"/> - <osd enabled="no" type="eta"/> - <osd enabled="no" type="navigation_distance_to_target"/> - <osd enabled="no" type="navigation"/> - <osd enabled="no" type="navigation_distance_to_next"/> - <osd enabled="no" type="navigation_next_turn"/> + </html> + ]]></gui> + <!-- for a debug log --> + <log enabled="no" type="textfile_debug" data="debug_%Y%m%d-%i.txt" flush_size="1000" flush_time="30"/> + <!-- osd items allow to position display and control items directly on top of the map: --> + <osd enabled="no" type="compass"/> + <osd enabled="no" type="eta"/> + <osd enabled="no" type="navigation_distance_to_target"/> + <osd enabled="no" type="navigation"/> + <osd enabled="no" type="navigation_distance_to_next"/> + <osd enabled="no" type="navigation_next_turn"/> - <!-- Commands include gui_internal_menu, gui_internal_fullscreen, zoom_in and zoom_out. - Usage of negative values change the button origins. x="0" y="0" specifies the top left, x="-0" y="-0" the bottom right corner. - It's always the top left corner of the icon, so you need to consider the icon's size when you enter the values. --> - <osd enabled="no" type="button" x="0" y="0" command="gui.fullscreen()" src="toggle_fullscreen.xpm"/> - <osd enabled="no" type="button" x="-96" y="0" command="gui.menu()" src="menu.xpm"/> - <osd enabled="no" type="button" x="-96" y="-96" command="zoom_in()" src="zoom_in.xpm"/> - <osd enabled="no" type="button" x="0" y="-96" command="zoom_out()" src="zoom_out.xpm"/> + <!-- Commands include gui_internal_menu, gui_internal_fullscreen, zoom_in and zoom_out. + Usage of negative values change the button origins. x="0" y="0" specifies the top left, x="-0" y="-0" the bottom right corner. + It's always the top left corner of the icon, so you need to consider the icon's size when you enter the values. --> + <osd enabled="no" type="button" x="0" y="0" command="gui.fullscreen()" src="toggle_fullscreen.xpm"/> + <osd enabled="no" type="button" x="-96" y="0" command="gui.menu()" src="menu.xpm"/> + <osd enabled="no" type="button" x="-96" y="-96" command="zoom_in()" src="zoom_in.xpm"/> + <osd enabled="no" type="button" x="0" y="-96" command="zoom_out()" src="zoom_out.xpm"/> - <vehicle name="Local GPS" profilename="car" enabled="yes" active="1" source="gpsd://localhost" gpsd_query="w+xj"> - <!-- Navit can write a tracklog in several formats (gpx, nmea or textfile): --> - <!-- <log type="gpx" attr_types="position_time_iso8601,position_direction,position_speed,profilename,position_radius" data="track_%Y%m%d-%i.gpx" flush_size="1000" flush_time="30"/> --> - </vehicle> + <vehicle name="Local GPS" profilename="car" enabled="yes" active="1" source="gpsd://localhost" gpsd_query="w+xj"> + <!-- Navit can write a tracklog in several formats (gpx, nmea or textfile): --> + <!-- <log type="gpx" attr_types="position_time_iso8601,position_direction,position_speed,profilename,position_radius" data="track_%Y%m%d-%i.gpx" flush_size="1000" flush_time="30"/> --> + </vehicle> - <!-- For SDL, you should add follow="1" to have the view centered on your position --> - <!-- <vehicle name="Meins" enabled="yes" source="gpsd://localhost" color="#0000ff" follow="1"/> --> + <!-- For SDL, you should add follow="1" to have the view centered on your position --> + <!-- <vehicle name="Meins" enabled="yes" source="gpsd://localhost" color="#0000ff" follow="1"/> --> - <vehicle name="Demo" profilename="car" enabled="no" active="yes" source="demo://" /> + <vehicle name="Demo" profilename="car" enabled="no" active="yes" source="demo://"/> - <!-- For the cumulative displacement filter to be enabled, set cdf_histsize="x" here, with x being an integer somewhere around 4 --> - <tracking cdf_histsize="0"/> + <!-- For the cumulative displacement filter to be enabled, set cdf_histsize="x" here, with x being an integer somewhere around 4 --> + <tracking cdf_histsize="0"/> - <vehicleprofile name="car" flags="0x4000000" flags_forward_mask="0x4000002" flags_reverse_mask="0x4000001" maxspeed_handling="0" route_mode="0"> - <roadprofile item_types="street_0,street_1_city,living_street,street_service,track_gravelled,track_unpaved" speed="10" route_weight="10"> - <announcement level="0" distance_metric="25"/> - <announcement level="1" distance_metric="100"/> - <announcement level="2" distance_metric="200"/> - </roadprofile> - <roadprofile item_types="street_2_city,track_paved" speed="30" route_weight="30"> - <announcement level="0" distance_metric="50"/> - <announcement level="1" distance_metric="200"/> - <announcement level="2" distance_metric="500"/> - </roadprofile> - <roadprofile item_types="street_3_city" speed="40" route_weight="40"> - <announcement level="0" distance_metric="50"/> - <announcement level="1" distance_metric="200"/> - <announcement level="2" distance_metric="500"/> - </roadprofile> - <roadprofile item_types="street_4_city" speed="50" route_weight="50"> - <announcement level="0" distance_metric="50"/> - <announcement level="1" distance_metric="200"/> - <announcement level="2" distance_metric="500"/> - </roadprofile> - <roadprofile item_types="highway_city" speed="80" route_weight="80"> - <announcement level="0" distance_metric="100"/> - <announcement level="1" distance_metric="400"/> - <announcement level="2" distance_metric="1000"/> - </roadprofile> - <roadprofile item_types="street_1_land" speed="60" route_weight="60"> - <announcement level="0" distance_metric="100"/> - <announcement level="1" distance_metric="400"/> - <announcement level="2" distance_metric="1000"/> - </roadprofile> - <roadprofile item_types="street_2_land" speed="65" route_weight="65"> - <announcement level="0" distance_metric="100"/> - <announcement level="1" distance_metric="400"/> - <announcement level="2" distance_metric="1000"/> - </roadprofile> - <roadprofile item_types="street_3_land" speed="70" route_weight="70"> - <announcement level="0" distance_metric="100"/> - <announcement level="1" distance_metric="400"/> - <announcement level="2" distance_metric="1000"/> - </roadprofile> - <roadprofile item_types="street_4_land" speed="80" route_weight="80"> - <announcement level="0" distance_metric="100"/> - <announcement level="1" distance_metric="400"/> - <announcement level="2" distance_metric="1000"/> - </roadprofile> - <roadprofile item_types="street_n_lanes" speed="120" route_weight="120"> - <announcement level="0" distance_metric="300"/> - <announcement level="1" distance_metric="1000"/> - <announcement level="2" distance_metric="2000"/> - </roadprofile> - <roadprofile item_types="highway_land" speed="120" route_weight="120"> - <announcement level="0" distance_metric="300"/> - <announcement level="1" distance_metric="1000"/> - <announcement level="2" distance_metric="2000"/> - </roadprofile> - <roadprofile item_types="ramp" speed="40" route_weight="40"> - <announcement level="0" distance_metric="50"/> - <announcement level="1" distance_metric="200"/> - <announcement level="2" distance_metric="500"/> - </roadprofile> - <roadprofile item_types="roundabout" speed="10" route_weight="10"/> - <roadprofile item_types="ferry" speed="40" route_weight="40"/> - </vehicleprofile> + <vehicleprofile name="car" flags="0x4000000" flags_forward_mask="0x4000002" flags_reverse_mask="0x4000001" maxspeed_handling="0" route_mode="0"> + <roadprofile item_types="street_0,street_1_city,living_street,street_service,track_gravelled,track_unpaved" speed="10" route_weight="10"> + <announcement level="0" distance_metric="25"/> + <announcement level="1" distance_metric="100"/> + <announcement level="2" distance_metric="200"/> + </roadprofile> + <roadprofile item_types="street_2_city,track_paved" speed="30" route_weight="30"> + <announcement level="0" distance_metric="50"/> + <announcement level="1" distance_metric="200"/> + <announcement level="2" distance_metric="500"/> + </roadprofile> + <roadprofile item_types="street_3_city" speed="40" route_weight="40"> + <announcement level="0" distance_metric="50"/> + <announcement level="1" distance_metric="200"/> + <announcement level="2" distance_metric="500"/> + </roadprofile> + <roadprofile item_types="street_4_city" speed="50" route_weight="50"> + <announcement level="0" distance_metric="50"/> + <announcement level="1" distance_metric="200"/> + <announcement level="2" distance_metric="500"/> + </roadprofile> + <roadprofile item_types="highway_city" speed="80" route_weight="80"> + <announcement level="0" distance_metric="100"/> + <announcement level="1" distance_metric="400"/> + <announcement level="2" distance_metric="1000"/> + </roadprofile> + <roadprofile item_types="street_1_land" speed="60" route_weight="60"> + <announcement level="0" distance_metric="100"/> + <announcement level="1" distance_metric="400"/> + <announcement level="2" distance_metric="1000"/> + </roadprofile> + <roadprofile item_types="street_2_land" speed="65" route_weight="65"> + <announcement level="0" distance_metric="100"/> + <announcement level="1" distance_metric="400"/> + <announcement level="2" distance_metric="1000"/> + </roadprofile> + <roadprofile item_types="street_3_land" speed="70" route_weight="70"> + <announcement level="0" distance_metric="100"/> + <announcement level="1" distance_metric="400"/> + <announcement level="2" distance_metric="1000"/> + </roadprofile> + <roadprofile item_types="street_4_land" speed="80" route_weight="80"> + <announcement level="0" distance_metric="100"/> + <announcement level="1" distance_metric="400"/> + <announcement level="2" distance_metric="1000"/> + </roadprofile> + <roadprofile item_types="street_n_lanes" speed="120" route_weight="120"> + <announcement level="0" distance_metric="300"/> + <announcement level="1" distance_metric="1000"/> + <announcement level="2" distance_metric="2000"/> + </roadprofile> + <roadprofile item_types="highway_land" speed="120" route_weight="120"> + <announcement level="0" distance_metric="300"/> + <announcement level="1" distance_metric="1000"/> + <announcement level="2" distance_metric="2000"/> + </roadprofile> + <roadprofile item_types="ramp" speed="40" route_weight="40"> + <announcement level="0" distance_metric="50"/> + <announcement level="1" distance_metric="200"/> + <announcement level="2" distance_metric="500"/> + </roadprofile> + <roadprofile item_types="roundabout" speed="10" route_weight="10"/> + <roadprofile item_types="ferry" speed="40" route_weight="40"/> + </vehicleprofile> - <vehicleprofile name="bike" flags="0x40000000" flags_forward_mask="0x40000000" flags_reverse_mask="0x40000000" maxspeed_handling="1" route_mode="0"> - <roadprofile item_types="steps" speed="2" route_weight="5"> - <announcement level="0" distance_metric="25"/> - <announcement level="1" distance_metric="100"/> - <announcement level="2" distance_metric="200"/> - </roadprofile> - <roadprofile item_types="street_pedestrian,footway" speed="5" route_weight="10"> - <announcement level="0" distance_metric="25"/> - <announcement level="1" distance_metric="100"/> - <announcement level="2" distance_metric="200"/> - </roadprofile> - <roadprofile item_types="path,track_ground" speed="12" route_weight="12"> - <announcement level="0" distance_metric="25"/> - <announcement level="1" distance_metric="100"/> - <announcement level="2" distance_metric="200"/> - </roadprofile> - <roadprofile item_types="track_gravelled" speed="17" route_weight="15"> - <announcement level="0" distance_metric="25"/> - <announcement level="1" distance_metric="100"/> - <announcement level="2" distance_metric="200"/> - </roadprofile> - <!-- cycleways, paved tracks, serviceways etc. are the favourite ways --> - <roadprofile item_types="track_paved,cycleway,street_service,street_parking_lane" speed="22" route_weight="20"> - <announcement level="0" distance_metric="25"/> - <announcement level="1" distance_metric="100"/> - <announcement level="2" distance_metric="200"/> - </roadprofile> - <!-- residential, unclassified, living street etc. --> - <roadprofile item_types="street_0,street_1_city,living_street" speed="20" route_weight="15"> - <announcement level="0" distance_metric="25"/> - <announcement level="1" distance_metric="100"/> - <announcement level="2" distance_metric="200"/> - </roadprofile> - <!-- tertiary and minor roads are acceptable, but should be avoided in favour of tracks and cycleways --> - <roadprofile item_types="street_2_city,street_1_land,street_2_land" speed="22" route_weight="12"> - <announcement level="0" distance_metric="25"/> - <announcement level="1" distance_metric="100"/> - <announcement level="2" distance_metric="200"/> - </roadprofile> - <!-- secondary etc. are acceptable when necessary --> - <roadprofile item_types="street_3_city" speed="22" route_weight="10"> - <announcement level="0" distance_metric="25"/> - <announcement level="1" distance_metric="100"/> - <announcement level="2" distance_metric="200"/> - </roadprofile> - <!-- primary, trunk etc. should be avoided --> - <roadprofile item_types="street_4_city,ramp" speed="22" route_weight="7"> - <announcement level="0" distance_metric="25"/> - <announcement level="1" distance_metric="100"/> - <announcement level="2" distance_metric="200"/> - </roadprofile> - <!-- Those types do not appear in osm2navit.c and therefore are not used ATM --> - <roadprofile item_types="street_3_land,street_4_land" speed="20" route_weight="7"> - <announcement level="0" distance_metric="100"/> - <announcement level="1" distance_metric="400"/> - <announcement level="2" distance_metric="1000"/> - </roadprofile> - <roadprofile item_types="roundabout" speed="20" route_weight="10"/> - <roadprofile item_types="ferry" speed="40" route_weight="40"/> - </vehicleprofile> + <vehicleprofile name="bike" flags="0x40000000" flags_forward_mask="0x40000000" flags_reverse_mask="0x40000000" maxspeed_handling="1" route_mode="0"> + <roadprofile item_types="steps" speed="2" route_weight="5"> + <announcement level="0" distance_metric="25"/> + <announcement level="1" distance_metric="100"/> + <announcement level="2" distance_metric="200"/> + </roadprofile> + <roadprofile item_types="street_pedestrian,footway" speed="5" route_weight="10"> + <announcement level="0" distance_metric="25"/> + <announcement level="1" distance_metric="100"/> + <announcement level="2" distance_metric="200"/> + </roadprofile> + <roadprofile item_types="path,track_ground" speed="12" route_weight="12"> + <announcement level="0" distance_metric="25"/> + <announcement level="1" distance_metric="100"/> + <announcement level="2" distance_metric="200"/> + </roadprofile> + <roadprofile item_types="track_gravelled" speed="17" route_weight="15"> + <announcement level="0" distance_metric="25"/> + <announcement level="1" distance_metric="100"/> + <announcement level="2" distance_metric="200"/> + </roadprofile> + <!-- cycleways, paved tracks, serviceways etc. are the favourite ways --> + <roadprofile item_types="track_paved,cycleway,street_service,street_parking_lane" speed="22" route_weight="20"> + <announcement level="0" distance_metric="25"/> + <announcement level="1" distance_metric="100"/> + <announcement level="2" distance_metric="200"/> + </roadprofile> + <!-- residential, unclassified, living street etc. --> + <roadprofile item_types="street_0,street_1_city,living_street" speed="20" route_weight="15"> + <announcement level="0" distance_metric="25"/> + <announcement level="1" distance_metric="100"/> + <announcement level="2" distance_metric="200"/> + </roadprofile> + <!-- tertiary and minor roads are acceptable, but should be avoided in favour of tracks and cycleways --> + <roadprofile item_types="street_2_city,street_1_land,street_2_land" speed="22" route_weight="12"> + <announcement level="0" distance_metric="25"/> + <announcement level="1" distance_metric="100"/> + <announcement level="2" distance_metric="200"/> + </roadprofile> + <!-- secondary etc. are acceptable when necessary --> + <roadprofile item_types="street_3_city" speed="22" route_weight="10"> + <announcement level="0" distance_metric="25"/> + <announcement level="1" distance_metric="100"/> + <announcement level="2" distance_metric="200"/> + </roadprofile> + <!-- primary, trunk etc. should be avoided --> + <roadprofile item_types="street_4_city,ramp" speed="22" route_weight="7"> + <announcement level="0" distance_metric="25"/> + <announcement level="1" distance_metric="100"/> + <announcement level="2" distance_metric="200"/> + </roadprofile> + <!-- Those types do not appear in osm2navit.c and therefore are not used ATM --> + <roadprofile item_types="street_3_land,street_4_land" speed="20" route_weight="7"> + <announcement level="0" distance_metric="100"/> + <announcement level="1" distance_metric="400"/> + <announcement level="2" distance_metric="1000"/> + </roadprofile> + <roadprofile item_types="roundabout" speed="20" route_weight="10"/> + <roadprofile item_types="ferry" speed="40" route_weight="40"/> + </vehicleprofile> - <vehicleprofile name="pedestrian" flags="0x80000000" flags_forward_mask="0x80000000" flags_reverse_mask="0x80000000" maxspeed_handling="1" route_mode="0"> - <roadprofile item_types="footway,bridleway,path" speed="5" route_weight="5"> - <announcement level="0" distance_metric="25"/> - <announcement level="1" distance_metric="100"/> - <announcement level="2" distance_metric="200"/> - </roadprofile> - <roadprofile item_types="living_street,street_pedestrian" speed="5" route_weight="5"> - <announcement level="0" distance_metric="25"/> - <announcement level="1" distance_metric="100"/> - <announcement level="2" distance_metric="200"/> - </roadprofile> - <roadprofile item_types="track_gravelled" speed="5" route_weight="5"> - <announcement level="0" distance_metric="25"/> - <announcement level="1" distance_metric="100"/> - <announcement level="2" distance_metric="200"/> - </roadprofile> - <roadprofile item_types="track_paved" speed="5" route_weight="5"> - <announcement level="0" distance_metric="25"/> - <announcement level="1" distance_metric="100"/> - <announcement level="2" distance_metric="200"/> - </roadprofile> - <roadprofile item_types="cycleway" speed="5" route_weight="5"> - <announcement level="0" distance_metric="25"/> - <announcement level="1" distance_metric="100"/> - <announcement level="2" distance_metric="200"/> - </roadprofile> - <roadprofile item_types="street_0,street_1_city,street_2_city" speed="5" route_weight="5"> - <announcement level="0" distance_metric="25"/> - <announcement level="1" distance_metric="100"/> - <announcement level="2" distance_metric="200"/> - </roadprofile> - <roadprofile item_types="street_3_city,street_4_city,street_service" speed="5" route_weight="5"> - <announcement level="0" distance_metric="25"/> - <announcement level="1" distance_metric="100"/> - <announcement level="2" distance_metric="200"/> - </roadprofile> - <roadprofile item_types="street_1_land,street_2_land" speed="5" route_weight="5"> - <announcement level="0" distance_metric="100"/> - <announcement level="1" distance_metric="400"/> - <announcement level="2" distance_metric="1000"/> - </roadprofile> - <roadprofile item_types="street_3_land,street_4_land" speed="5" route_weight="5"> - <announcement level="0" distance_metric="100"/> - <announcement level="1" distance_metric="400"/> - <announcement level="2" distance_metric="1000"/> - </roadprofile> - <roadprofile item_types="roundabout" speed="5" route_weight="5"/> - <roadprofile item_types="ferry" speed="40" route_weight="40"/> - </vehicleprofile> - <vehicleprofile name="horse" flags="0x20000000" flags_forward_mask="0x20000000" flags_reverse_mask="0x20000000" maxspeed_handling="1" route_mode="0"> - <roadprofile item_types="bridleway" speed="10" route_weight="10"> - <announcement level="0" distance_metric="25"/> - <announcement level="1" distance_metric="100"/> - <announcement level="2" distance_metric="200"/> - </roadprofile> - <roadprofile item_types="footway,path" speed="5" route_weight="5"> - <announcement level="0" distance_metric="25"/> - <announcement level="1" distance_metric="100"/> - <announcement level="2" distance_metric="200"/> - </roadprofile> - <roadprofile item_types="living_street,street_pedestrian" speed="5" route_weight="4"> - <announcement level="0" distance_metric="25"/> - <announcement level="1" distance_metric="100"/> - <announcement level="2" distance_metric="200"/> - </roadprofile> - <roadprofile item_types="track_gravelled" speed="5" route_weight="5"> - <announcement level="0" distance_metric="25"/> - <announcement level="1" distance_metric="100"/> - <announcement level="2" distance_metric="200"/> - </roadprofile> - <roadprofile item_types="track_paved" speed="5" route_weight="5"> - <announcement level="0" distance_metric="25"/> - <announcement level="1" distance_metric="100"/> - <announcement level="2" distance_metric="200"/> - </roadprofile> - <roadprofile item_types="cycleway" speed="5" route_weight="5"> - <announcement level="0" distance_metric="25"/> - <announcement level="1" distance_metric="100"/> - <announcement level="2" distance_metric="200"/> - </roadprofile> - <roadprofile item_types="street_0,street_1_city,street_2_city" speed="5" route_weight="2"> - <announcement level="0" distance_metric="25"/> - <announcement level="1" distance_metric="100"/> - <announcement level="2" distance_metric="200"/> - </roadprofile> - <roadprofile item_types="street_3_city,street_4_city,street_service" speed="5" route_weight="4"> - <announcement level="0" distance_metric="25"/> - <announcement level="1" distance_metric="100"/> - <announcement level="2" distance_metric="200"/> - </roadprofile> - <roadprofile item_types="street_1_land,street_2_land" speed="5" route_weight="2"> - <announcement level="0" distance_metric="100"/> - <announcement level="1" distance_metric="400"/> - <announcement level="2" distance_metric="1000"/> - </roadprofile> - <roadprofile item_types="street_3_land,street_4_land" speed="5" route_weight="4"> - <announcement level="0" distance_metric="100"/> - <announcement level="1" distance_metric="400"/> - <announcement level="2" distance_metric="1000"/> - </roadprofile> - <roadprofile item_types="roundabout" speed="5" route_weight="2"/> - <roadprofile item_types="ferry" speed="40" route_weight="40"/> - </vehicleprofile> + <vehicleprofile name="pedestrian" flags="0x80000000" flags_forward_mask="0x80000000" flags_reverse_mask="0x80000000" maxspeed_handling="1" route_mode="0"> + <roadprofile item_types="footway,bridleway,path" speed="5" route_weight="5"> + <announcement level="0" distance_metric="25"/> + <announcement level="1" distance_metric="100"/> + <announcement level="2" distance_metric="200"/> + </roadprofile> + <roadprofile item_types="living_street,street_pedestrian" speed="5" route_weight="5"> + <announcement level="0" distance_metric="25"/> + <announcement level="1" distance_metric="100"/> + <announcement level="2" distance_metric="200"/> + </roadprofile> + <roadprofile item_types="track_gravelled" speed="5" route_weight="5"> + <announcement level="0" distance_metric="25"/> + <announcement level="1" distance_metric="100"/> + <announcement level="2" distance_metric="200"/> + </roadprofile> + <roadprofile item_types="track_paved" speed="5" route_weight="5"> + <announcement level="0" distance_metric="25"/> + <announcement level="1" distance_metric="100"/> + <announcement level="2" distance_metric="200"/> + </roadprofile> + <roadprofile item_types="cycleway" speed="5" route_weight="5"> + <announcement level="0" distance_metric="25"/> + <announcement level="1" distance_metric="100"/> + <announcement level="2" distance_metric="200"/> + </roadprofile> + <roadprofile item_types="street_0,street_1_city,street_2_city" speed="5" route_weight="5"> + <announcement level="0" distance_metric="25"/> + <announcement level="1" distance_metric="100"/> + <announcement level="2" distance_metric="200"/> + </roadprofile> + <roadprofile item_types="street_3_city,street_4_city,street_service" speed="5" route_weight="5"> + <announcement level="0" distance_metric="25"/> + <announcement level="1" distance_metric="100"/> + <announcement level="2" distance_metric="200"/> + </roadprofile> + <roadprofile item_types="street_1_land,street_2_land" speed="5" route_weight="5"> + <announcement level="0" distance_metric="100"/> + <announcement level="1" distance_metric="400"/> + <announcement level="2" distance_metric="1000"/> + </roadprofile> + <roadprofile item_types="street_3_land,street_4_land" speed="5" route_weight="5"> + <announcement level="0" distance_metric="100"/> + <announcement level="1" distance_metric="400"/> + <announcement level="2" distance_metric="1000"/> + </roadprofile> + <roadprofile item_types="roundabout" speed="5" route_weight="5"/> + <roadprofile item_types="ferry" speed="40" route_weight="40"/> + </vehicleprofile> + <vehicleprofile name="horse" flags="0x20000000" flags_forward_mask="0x20000000" flags_reverse_mask="0x20000000" maxspeed_handling="1" route_mode="0"> + <roadprofile item_types="bridleway" speed="10" route_weight="10"> + <announcement level="0" distance_metric="25"/> + <announcement level="1" distance_metric="100"/> + <announcement level="2" distance_metric="200"/> + </roadprofile> + <roadprofile item_types="footway,path" speed="5" route_weight="5"> + <announcement level="0" distance_metric="25"/> + <announcement level="1" distance_metric="100"/> + <announcement level="2" distance_metric="200"/> + </roadprofile> + <roadprofile item_types="living_street,street_pedestrian" speed="5" route_weight="4"> + <announcement level="0" distance_metric="25"/> + <announcement level="1" distance_metric="100"/> + <announcement level="2" distance_metric="200"/> + </roadprofile> + <roadprofile item_types="track_gravelled" speed="5" route_weight="5"> + <announcement level="0" distance_metric="25"/> + <announcement level="1" distance_metric="100"/> + <announcement level="2" distance_metric="200"/> + </roadprofile> + <roadprofile item_types="track_paved" speed="5" route_weight="5"> + <announcement level="0" distance_metric="25"/> + <announcement level="1" distance_metric="100"/> + <announcement level="2" distance_metric="200"/> + </roadprofile> + <roadprofile item_types="cycleway" speed="5" route_weight="5"> + <announcement level="0" distance_metric="25"/> + <announcement level="1" distance_metric="100"/> + <announcement level="2" distance_metric="200"/> + </roadprofile> + <roadprofile item_types="street_0,street_1_city,street_2_city" speed="5" route_weight="2"> + <announcement level="0" distance_metric="25"/> + <announcement level="1" distance_metric="100"/> + <announcement level="2" distance_metric="200"/> + </roadprofile> + <roadprofile item_types="street_3_city,street_4_city,street_service" speed="5" route_weight="4"> + <announcement level="0" distance_metric="25"/> + <announcement level="1" distance_metric="100"/> + <announcement level="2" distance_metric="200"/> + </roadprofile> + <roadprofile item_types="street_1_land,street_2_land" speed="5" route_weight="2"> + <announcement level="0" distance_metric="100"/> + <announcement level="1" distance_metric="400"/> + <announcement level="2" distance_metric="1000"/> + </roadprofile> + <roadprofile item_types="street_3_land,street_4_land" speed="5" route_weight="4"> + <announcement level="0" distance_metric="100"/> + <announcement level="1" distance_metric="400"/> + <announcement level="2" distance_metric="1000"/> + </roadprofile> + <roadprofile item_types="roundabout" speed="5" route_weight="2"/> + <roadprofile item_types="ferry" speed="40" route_weight="40"/> + </vehicleprofile> - <route destination_distance="50"/> + <route destination_distance="50"/> - <navigation> - <announce type="street_0,street_1_city" level0="25" level1="100" level2="200" unit="m"/> - <announce type="street_2_city,street_3_city,street_4_city,ramp" level0="50" level1="200" level2="500" unit="m"/> - <announce type="highway_city,street_1_land,street_2_land,street_3_land,street_4_land" level0="100" level1="400" level2="1000" unit="m"/> - <announce type="street_n_lanes,highway_land" level0="300" level1="1000" level2="2000" unit="m"/> - </navigation> + <navigation> + <announce type="street_0,street_1_city" level0="25" level1="100" level2="200" unit="m"/> + <announce type="street_2_city,street_3_city,street_4_city,ramp" level0="50" level1="200" level2="500" unit="m"/> + <announce type="highway_city,street_1_land,street_2_land,street_3_land,street_4_land" level0="100" level1="400" level2="1000" unit="m"/> + <announce type="street_n_lanes,highway_land" level0="300" level1="1000" level2="2000" unit="m"/> + </navigation> - <!-- Navit provides speech output in text format. - If you have a speech synthesizer like festival lite installed, you can get turn by turn directions out of navit. Please set the "cps"-value to how many characters your tts engine approximately speaks per second. - The default is text output to the shell --> - <speech type="cmdline" data="echo 'Fix the speech tag in navit.xml to let navit say:' '%s'" cps="15"/> - <!-- <speech type="cmdline" data="flite -t '%s'"/> --> + <!-- Navit provides speech output in text format. + If you have a speech synthesizer like festival lite installed, you can get turn by turn directions out of navit. Please set the "cps"-value to how many characters your tts engine approximately speaks per second. + The default is text output to the shell --> + <speech type="cmdline" data="echo 'Fix the speech tag in navit.xml to let navit say:' '%s'" cps="15"/> + <!-- <speech type="cmdline" data="flite -t '%s'"/> --> - <!-- If you have the reiseplaner maps installed, set enabled="yes" in the next line and set the path correctly --> - <mapset enabled="no"> - <map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map"/> - <map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map/smp1.smp"/> - <map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map/smp2.smp"/> - <map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map/smp3.smp"/> - <map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map/smp4.smp"/> - <map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map/smp5.smp"/> - </mapset> + <!-- If you have the reiseplaner maps installed, set enabled="yes" in the next line and set the path correctly --> + <mapset enabled="no"> + <map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map"/> + <map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map/smp1.smp"/> + <map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map/smp2.smp"/> + <map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map/smp3.smp"/> + <map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map/smp4.smp"/> + <map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map/smp5.smp"/> + </mapset> - <!-- If you dont want to use the sample map, either set enabled="no" in the next line or remove the xml file from the maps directory --> - <mapset enabled="yes"> - <xi:include href="$NAVIT_SHAREDIR/maps/*.xml"/> - </mapset> + <!-- If you dont want to use the sample map, either set enabled="no" in the next line or remove the xml file from the maps directory --> + <mapset enabled="yes"> + <xi:include href="$NAVIT_SHAREDIR/maps/*.xml"/> + </mapset> - <!-- Mapset template for openstreetmaps --> - <mapset enabled="no"> - <map type="binfile" enabled="yes" data="/media/mmc2/MapsNavit/osm_europe.bin"/> - </mapset> + <!-- Mapset template for openstreetmaps --> + <mapset enabled="no"> + <map type="binfile" enabled="yes" data="/media/mmc2/MapsNavit/osm_europe.bin"/> + </mapset> - <!-- Mapset template for garmin maps --> - <mapset enabled="no"> - <map type="garmin" enabled="yes" data="/path/to/img" debug="4"/> - </mapset> + <!-- Mapset template for garmin maps --> + <mapset enabled="no"> + <map type="garmin" enabled="yes" data="/path/to/img" debug="4"/> + </mapset> - <layout name="Car" nightlayout="Car-dark" color="#ffefb7" font="Liberation Sans"> + <layout name="Car" nightlayout="Car-dark" color="#ffefb7" font="Liberation Sans"> - <cursor w="26" h="26"> - <itemgra> - <circle color="#0000ff" radius="24" width="2"> - <coord x="0" y="0"/> - </circle> - </itemgra> - <itemgra speed_range="-2"> - <polyline color="#0000ff" width="2"> - <coord x="0" y="0"/> - <coord x="0" y="0"/> - </polyline> - </itemgra> - <itemgra speed_range="3-"> - <polyline color="#0000ff" width="2"> - <coord x="-7" y="-10"/> - <coord x="0" y="12"/> - <coord x="7" y="-10"/> - </polyline> - </itemgra> - </cursor> + <cursor w="26" h="26"> + <itemgra> + <circle color="#0000ff" radius="24" width="2"> + <coord x="0" y="0"/> + </circle> + </itemgra> + <itemgra speed_range="-2"> + <polyline color="#0000ff" width="2"> + <coord x="0" y="0"/> + <coord x="0" y="0"/> + </polyline> + </itemgra> + <itemgra speed_range="3-"> + <polyline color="#0000ff" width="2"> + <coord x="-7" y="-10"/> + <coord x="0" y="12"/> + <coord x="7" y="-10"/> + </polyline> + </itemgra> + </cursor> - <layer name="polygons"> - <itemgra item_types="image" order="0-"> - <image/> - </itemgra> - <itemgra item_types="poly_wood" order="0-"> - <polygon color="#8ec78d"/> - <text text_size="5"/> - </itemgra> - <itemgra item_types="poly_farm" order="0-"> - <polygon color="#c7f1a3"/> - <polyline color="#79c691"/> - <text text_size="5"/> - </itemgra> - <itemgra item_types="poly_town" order="0-"> - <polygon color="#ffc895"/> - <polyline color="#ebb481"/> - </itemgra> - <itemgra item_types="poly_university" order="8-"> - <polygon color="#d68fb8"/> - <polyline color="#881155"/> - </itemgra> - <itemgra item_types="poly_water_tiled" order="0-"> - <polygon color="#82c8ea"/> - </itemgra> - <itemgra item_types="poly_water" order="0-"> - <polygon color="#82c8ea"/> - <polyline color="#5096b8"/> - <text text_size="5"/> - </itemgra> - <itemgra item_types="poly_land" order="0-"> - <polygon color="#ffefb7"/> - <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"/> - </itemgra> - <itemgra item_types="poly_pedestrian" order="10"> - <polyline color="#d2d2d2" width="3"/> - <polyline color="#dddddd" width="1"/> - <polygon color="#dddddd"/> - </itemgra> - <itemgra item_types="poly_pedestrian" order="11"> - <polyline color="#d2d2d2" width="5"/> - <polyline color="#dddddd" width="3"/> - <polygon color="#dddddd"/> - </itemgra> - <itemgra item_types="poly_pedestrian" order="12"> - <polyline color="#d2d2d2" width="8"/> - <polyline color="#dddddd" width="6"/> - <polygon color="#dddddd"/> - </itemgra> - <itemgra item_types="poly_pedestrian" order="13"> - <polyline color="#d2d2d2" width="9"/> - <polyline color="#dddddd" width="7"/> - <polygon color="#dddddd"/> - </itemgra> - <itemgra item_types="poly_pedestrian" order="14"> - <polyline color="#d2d2d2" width="13"/> - <polyline color="#dddddd" width="9"/> - <polygon color="#dddddd"/> - </itemgra> - <itemgra item_types="poly_pedestrian" order="15"> - <polyline color="#d2d2d2" width="18"/> - <polyline color="#dddddd" width="14"/> - <polygon color="#dddddd"/> - </itemgra> - <itemgra item_types="poly_pedestrian" order="16"> - <polyline color="#d2d2d2" width="21"/> - <polyline color="#dddddd" width="17"/> - <polygon color="#dddddd"/> - </itemgra> - <itemgra item_types="poly_pedestrian" order="17"> - <polyline color="#d2d2d2" width="25"/> - <polyline color="#dddddd" width="21"/> - <polygon color="#dddddd"/> - </itemgra> - <itemgra item_types="poly_pedestrian" order="18"> - <polyline color="#d2d2d2" width="40"/> - <polyline color="#dddddd" width="34"/> - <polygon color="#dddddd"/> - </itemgra> - <itemgra item_types="poly_airport" order="0-"> - <polygon color="#a0a0a0"/> - </itemgra> - <itemgra item_types="poly_sport,poly_sports_pitch" order="0-"> - <polygon color="#4af04f"/> - </itemgra> - <itemgra item_types="poly_industry,poly_place" order="0-"> - <polygon color="#e6e6e6"/> - </itemgra> - <itemgra item_types="poly_service" order="8-18"> - <polygon color="#fefefe"/> - <polyline color="#d2d2d2" width="1"/> - </itemgra> - <itemgra item_types="poly_street_1" order="8-13"> - <polygon color="#ffffff"/> - <polyline color="#d2d2d2" width="1"/> - </itemgra> - <itemgra item_types="poly_street_1" order="14-16"> - <polygon color="#ffffff"/> - <polyline color="#d2d2d2" width="2"/> - </itemgra> - <itemgra item_types="poly_street_1" order="17-18"> - <polygon color="#ffffff"/> - <polyline color="#d2d2d2" width="3"/> - </itemgra> - <itemgra item_types="poly_street_2" order="7-12"> - <polygon color="#ffff00"/> - <polyline color="#c0c0c0" width="1"/> - </itemgra> - <itemgra item_types="poly_street_2" order="13-16"> - <polygon color="#ffff00"/> - <polyline color="#c0c0c0" width="2"/> - </itemgra> - <itemgra item_types="poly_street_2" order="17-18"> - <polygon color="#ffff00"/> - <polyline color="#c0c0c0" width="3"/> - </itemgra> - <itemgra item_types="poly_street_3" order="7-11"> - <polygon color="#ffff00"/> - <polyline color="#a0a0a0" width="1"/> - </itemgra> - <itemgra item_types="poly_street_3" order="12-15"> - <polygon color="#ffff00"/> - <polyline color="#a0a0a0" width="2"/> - </itemgra> - <itemgra item_types="poly_street_3" order="16-18"> - <polygon color="#ffff00"/> - <polyline color="#a0a0a0" width="3"/> - </itemgra> - <itemgra item_types="water_line" order="0-"> - <polyline color="#5096b8" width="1"/> - <text text_size="5"/> - </itemgra> - <itemgra item_types="water_river" order="4-5"> - <polyline color="#82c8ea" width="1"/> - </itemgra> - <itemgra item_types="water_river" order="6"> - <polyline color="#82c8ea" width="2"/> - </itemgra> - <itemgra item_types="water_river" order="7"> - <polyline color="#82c8ea" width="3"/> - <text text_size="5"/> - </itemgra> - <itemgra item_types="water_river" order="8-9"> - <polyline color="#82c8ea" width="4"/> - <text text_size="7"/> - </itemgra> - <itemgra item_types="water_river" order="10-"> - <polyline color="#82c8ea" width="4"/> - <text text_size="10"/> - </itemgra> - <itemgra item_types="water_canal" order="6"> - <polyline color="#82c8ea" width="1"/> - </itemgra> - <itemgra item_types="water_canal" order="7"> - <polyline color="#82c8ea" width="2"/> - <text text_size="5"/> - </itemgra> - <itemgra item_types="water_canal" order="8-9"> - <polyline color="#82c8ea" width="3"/> - <text text_size="7"/> - </itemgra> - <itemgra item_types="water_canal" order="10-"> - <polyline color="#82c8ea" width="3"/> - <text text_size="10"/> - </itemgra> - <itemgra item_types="water_stream" order="8-9"> - <polyline color="#82c8ea" width="1"/> - </itemgra> - <itemgra item_types="water_stream" order="10-"> - <polyline color="#82c8ea" width="2"/> - <text text_size="7"/> - </itemgra> - <itemgra item_types="water_drain" order="10-"> - <polyline color="#82c8ea" width="1"/> - <text text_size="5"/> - </itemgra> - <itemgra item_types="poly_apron" order="0-"> - <polygon color="#d0d0d0"/> - </itemgra> - <itemgra item_types="poly_terminal" order="7-"> - <polygon color="#e3c6a6"/> - </itemgra> - <itemgra item_types="poly_cemetery" order="1-"> - <polygon color="#bde3cb"/> - </itemgra> - <itemgra item_types="poly_car_parking" order="1-"> - <polygon color="#e7cf87"/> - </itemgra> - <itemgra item_types="poly_building" order="0-"> - <polygon color="#b6a6a6"/> - </itemgra> - <itemgra item_types="rail" order="6-"> - <polyline color="#696969" width="3"/> - <polyline color="#ffffff" width="1" dash="5,5"/> - </itemgra> - <itemgra item_types="ferry" order="5-"> - <polyline color="#000000" width="1" dash="10"/> - </itemgra> - <itemgra item_types="border_country" order="0-"> - <polyline color="#b8434e" width="1" dash="10,5,2,5"/> - </itemgra> - <itemgra item_types="border_state" order="0-"> - <polyline color="#808080" width="1"/> - </itemgra> - <itemgra item_types="height_line_1" order="0-"> - <polyline color="#000000" width="4"/> - </itemgra> - <itemgra item_types="height_line_2" order="0-"> - <polyline color="#000000" width="2"/> - </itemgra> - <itemgra item_types="height_line_3" order="0-"> - <polyline color="#000000" width="1"/> - </itemgra> - </layer> - <layer name="streets"> - <itemgra item_types="street_route" order="2"> - <polyline color="#0000a0" width="4"/> - </itemgra> - <itemgra item_types="street_route" order="3-5"> - <polyline color="#0000a0" width="8"/> - </itemgra> - <itemgra item_types="street_route" order="6"> - <polyline color="#0000a0" width="10"/> - </itemgra> - <itemgra item_types="street_route" order="7-8"> - <polyline color="#0000a0" width="16"/> - </itemgra> - <itemgra item_types="street_route" order="9-10"> - <polyline color="#0000a0" width="20"/> - </itemgra> - <itemgra item_types="street_route" order="11"> - <polyline color="#0000a0" width="28"/> - </itemgra> - <itemgra item_types="street_route" order="12"> - <polyline color="#0000a0" width="32"/> - </itemgra> - <itemgra item_types="street_route" order="13"> - <polyline color="#0000a0" width="52"/> - </itemgra> - <itemgra item_types="street_route" order="14"> - <polyline color="#0000a0" width="64"/> - </itemgra> - <itemgra item_types="street_route" order="15"> - <polyline color="#0000a0" width="68"/> - </itemgra> - <itemgra item_types="street_route" order="16"> - <polyline color="#0000a0" width="132"/> - </itemgra> - <itemgra item_types="street_route" order="17"> - <polyline color="#0000a0" width="268"/> - </itemgra> - <itemgra item_types="street_route" order="18"> - <polyline color="#0000a0" width="530"/> - </itemgra> - <itemgra item_types="selected_line" order="2"> - <polyline color="#ba00b8" width="4"/> - </itemgra> - <itemgra item_types="selected_line" order="3-5"> - <polyline color="#ba00b8" width="8"/> - </itemgra> - <itemgra item_types="selected_line" order="6"> - <polyline color="#ba00b8" width="10"/> - </itemgra> - <itemgra item_types="selected_line" order="7-8"> - <polyline color="#ba00b8" width="16"/> - </itemgra> - <itemgra item_types="selected_line" order="9-10"> - <polyline color="#ba00b8" width="20"/> - </itemgra> - <itemgra item_types="selected_line" order="11"> - <polyline color="#ba00b8" width="28"/> - </itemgra> - <itemgra item_types="selected_line" order="12"> - <polyline color="#ba00b8" width="32"/> - </itemgra> - <itemgra item_types="selected_line" order="13"> - <polyline color="#ba00b8" width="52"/> - </itemgra> - <itemgra item_types="selected_line" order="14"> - <polyline color="#ba00b8" width="64"/> - </itemgra> - <itemgra item_types="selected_line" order="15"> - <polyline color="#ba00b8" width="68"/> - </itemgra> - <itemgra item_types="selected_line" order="16"> - <polyline color="#ba00b8" width="132"/> - </itemgra> - <itemgra item_types="selected_line" order="17"> - <polyline color="#ba00b8" width="268"/> - </itemgra> - <itemgra item_types="selected_line" order="18"> - <polyline color="#ba00b8" width="530"/> - </itemgra> - <itemgra item_types="street_nopass" order="10-"> - <polyline color="#000000" width="1"/> - </itemgra> - <itemgra item_types="track_paved" order="10-"> - <polyline color="#000000" width="1"/> - </itemgra> - <itemgra item_types="track_gravelled" order="10-12"> - <polyline color="#800000" width="1" dash="3,6"/> - </itemgra> - <itemgra item_types="track_gravelled" order="13-14"> - <polyline color="#ffffff" width="4" dash="4,8"/> - <polyline color="#800000" width="2" dash="4,8"/> - </itemgra> - <itemgra item_types="track_gravelled" order="15-16"> - <polyline color="#ffffff" width=... [truncated message content] |
From: <mar...@us...> - 2009-11-21 21:50:43
|
Revision: 2787 http://navit.svn.sourceforge.net/navit/?rev=2787&view=rev Author: martin-s Date: 2009-11-21 21:50:36 +0000 (Sat, 21 Nov 2009) Log Message: ----------- Fix:Core:Typo Modified Paths: -------------- trunk/navit/navit/navit_shipped.xml Modified: trunk/navit/navit/navit_shipped.xml =================================================================== --- trunk/navit/navit/navit_shipped.xml 2009-11-21 21:38:29 UTC (rev 2786) +++ trunk/navit/navit/navit_shipped.xml 2009-11-21 21:50:36 UTC (rev 2787) @@ -56,7 +56,7 @@ <img cond='position_coord_geo' src='gui_vehicle' onclick='position(position_coord_geo,_("Vehicle Position"),8|32|64|128|256)'><script>write(position_coord_geo)</script></img> <img src='gui_town' onclick='town()'><text>Town</text></img> <img src='gui_quit' onclick='quit()'><text>Quit</text></img> - <img cond='navit.route.status&48' src='gui_stop' onclick='abort_navigation()'><text>Stop + <img cond='navit.route.route_status&48' src='gui_stop' onclick='abort_navigation()'><text>Stop Navigation</text></img> </a> <a name='Settings'><text>Settings</text> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2009-11-26 15:47:28
|
Revision: 2802 http://navit.svn.sourceforge.net/navit/?rev=2802&view=rev Author: martin-s Date: 2009-11-26 15:46:41 +0000 (Thu, 26 Nov 2009) Log Message: ----------- Fix:Core:Cleanup Modified Paths: -------------- trunk/navit/navit/navit_shipped.xml Modified: trunk/navit/navit/navit_shipped.xml =================================================================== --- trunk/navit/navit/navit_shipped.xml 2009-11-26 13:03:08 UTC (rev 2801) +++ trunk/navit/navit/navit_shipped.xml 2009-11-26 15:46:41 UTC (rev 2802) @@ -101,7 +101,7 @@ <vehicle name="Local GPS" profilename="car" enabled="yes" active="1" source="gpsd://localhost" gpsd_query="w+xj"> <!-- Navit can write a tracklog in several formats (gpx, nmea or textfile): --> - <!-- <log type="gpx" attr_types="position_time_iso8601,position_direction,position_speed,profilename,position_radius" data="track_%Y%m%d-%i.gpx" flush_size="1000" flush_time="30"/> --> + <log enabled="no" type="gpx" attr_types="position_time_iso8601,position_direction,position_speed,profilename,position_radius" data="track_%Y%m%d-%i.gpx" flush_size="1000" flush_time="30"/> </vehicle> <!-- For SDL, you should add follow="1" to have the view centered on your position --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2009-12-23 19:21:44
|
Revision: 2891 http://navit.svn.sourceforge.net/navit/?rev=2891&view=rev Author: martin-s Date: 2009-12-23 19:21:30 +0000 (Wed, 23 Dec 2009) Log Message: ----------- Fix:Core:Removed multiple spaces Modified Paths: -------------- trunk/navit/navit/navit_shipped.xml Modified: trunk/navit/navit/navit_shipped.xml =================================================================== --- trunk/navit/navit/navit_shipped.xml 2009-12-22 10:26:53 UTC (rev 2890) +++ trunk/navit/navit/navit_shipped.xml 2009-12-23 19:21:30 UTC (rev 2891) @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?><!-- - For configuration options used in this file, please read - http://wiki.navit-project.org/index.php/Configuring_NavIt - Do not edit /usr/share/navit/navit.xml : changes would be lost - on upgrade. Rather copy it to ~/.navit/. Please read wiki + For configuration options used in this file, please read + http://wiki.navit-project.org/index.php/Configuring_NavIt + Do not edit /usr/share/navit/navit.xml : changes would be lost + on upgrade. Rather copy it to ~/.navit/. Please read wiki --> <!DOCTYPE config SYSTEM "navit.dtd"> @@ -22,22 +22,22 @@ <!-- timestamps 0/1 - prefix log messages with a timestamp --> <debug name="timestamps" level="0"/> <!-- This line defines which location on the map navit will show after startup. - It makes sense to set it to your home coordinates. - Center coordinates format: - [D][D]DMM.ss[S][S]... N/S [D][D]DMM.ss[S][S]... E/W - [-][D]D.d[d]... [-][D][D]D.d[d]... - [-]0xX [-]0xX --> + It makes sense to set it to your home coordinates. + Center coordinates format: + [D][D]DMM.ss[S][S]... N/S [D][D]DMM.ss[S][S]... E/W + [-][D]D.d[d]... [-][D][D]D.d[d]... + [-]0xX [-]0xX --> <navit center="4808 N 1134 E" zoom="256" tracking="1" orientation="-1" recent_dest="10"> <!-- Use one of gtk_drawing_area, qt_qpainter or sdl. For cegui, use opengl --> <graphics type="gtk_drawing_area"/> <!-- The following line let you select which graphical user interface you'd like to use. - Options include internal (optimized for touch screen devices), gtk (useful for desktop computers) and cegui. - If you don't like the internal gui, set enabled=yes for the following tag and enabled=no for the gui internal tag --> + Options include internal (optimized for touch screen devices), gtk (useful for desktop computers) and cegui. + If you don't like the internal gui, set enabled=yes for the following tag and enabled=no for the gui internal tag --> <gui type="gtk" enabled="no" menubar="1" toolbar="1" statusbar="1"/> <!-- - In case of the internal GUI, you can even influence the size of the text and of the icons in the toolbar and the viewport. - Here's an example for a freerunner: --> + In case of the internal GUI, you can even influence the size of the text and of the icons in the toolbar and the viewport. + Here's an example for a freerunner: --> <!-- <gui type="internal" font_size="350" icon_xs="32" icon_s="96" icon_l="96"/> --> <gui type="internal" enabled="yes"><![CDATA[ @@ -92,8 +92,8 @@ <osd enabled="no" type="navigation_next_turn"/> <!-- Commands include gui_internal_menu, gui_internal_fullscreen, zoom_in and zoom_out. - Usage of negative values change the button origins. x="0" y="0" specifies the top left, x="-0" y="-0" the bottom right corner. - It's always the top left corner of the icon, so you need to consider the icon's size when you enter the values. --> + Usage of negative values change the button origins. x="0" y="0" specifies the top left, x="-0" y="-0" the bottom right corner. + It's always the top left corner of the icon, so you need to consider the icon's size when you enter the values. --> <osd enabled="no" type="button" x="0" y="0" command="gui.fullscreen()" src="toggle_fullscreen.xpm"/> <osd enabled="no" type="button" x="-96" y="0" command="gui.menu()" src="menu.xpm"/> <osd enabled="no" type="button" x="-96" y="-96" command="zoom_in()" src="zoom_in.xpm"/> @@ -229,7 +229,7 @@ <announcement level="2" distance_metric="200"/> </roadprofile> <!-- Those types do not appear in osm2navit.c and therefore are not used ATM --> - <roadprofile item_types="street_3_land,street_4_land" speed="20" route_weight="7"> + <roadprofile item_types="street_3_land,street_4_land" speed="20" route_weight="7"> <announcement level="0" distance_metric="100"/> <announcement level="1" distance_metric="400"/> <announcement level="2" distance_metric="1000"/> @@ -352,8 +352,8 @@ </navigation> <!-- Navit provides speech output in text format. - If you have a speech synthesizer like festival lite installed, you can get turn by turn directions out of navit. Please set the "cps"-value to how many characters your tts engine approximately speaks per second. - The default is text output to the shell --> + If you have a speech synthesizer like festival lite installed, you can get turn by turn directions out of navit. Please set the "cps"-value to how many characters your tts engine approximately speaks per second. + The default is text output to the shell --> <speech type="cmdline" data="echo 'Fix the speech tag in navit.xml to let navit say:' '%s'" cps="15"/> <!-- <speech type="cmdline" data="flite -t '%s'"/> --> @@ -3388,30 +3388,30 @@ <!-- "Contour Lines" --> <layer name="Barriers"> - <itemgra item_types="ditch" order="8-"> - <polyline color="#B8860B" width="1"/> - <text text_size="8"/> - </itemgra> - <itemgra item_types="hedge" order="8-"> - <polyline color="#90EE90" width="1"/> - <text text_size="8"/> - </itemgra> - <itemgra item_types="fence" order="8-"> - <polyline color="#808080" width="1"/> - <text text_size="8"/> - </itemgra> - <itemgra item_types="wall" order="8-"> - <polyline color="#808080" width="1"/> - <text text_size="8"/> - </itemgra> - <itemgra item_types="retaining_wall" order="8-"> - <polyline color="#808080" width="1"/> - <text text_size="8"/> - </itemgra> - <itemgra item_types="city_wall" order="8-"> - <polyline color="#CD5C5C" width="1"/> - <text text_size="8"/> - </itemgra> + <itemgra item_types="ditch" order="8-"> + <polyline color="#B8860B" width="1"/> + <text text_size="8"/> + </itemgra> + <itemgra item_types="hedge" order="8-"> + <polyline color="#90EE90" width="1"/> + <text text_size="8"/> + </itemgra> + <itemgra item_types="fence" order="8-"> + <polyline color="#808080" width="1"/> + <text text_size="8"/> + </itemgra> + <itemgra item_types="wall" order="8-"> + <polyline color="#808080" width="1"/> + <text text_size="8"/> + </itemgra> + <itemgra item_types="retaining_wall" order="8-"> + <polyline color="#808080" width="1"/> + <text text_size="8"/> + </itemgra> + <itemgra item_types="city_wall" order="8-"> + <polyline color="#CD5C5C" width="1"/> + <text text_size="8"/> + </itemgra> </layer> <!-- "Barriers" --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2010-01-05 19:24:55
|
Revision: 2897 http://navit.svn.sourceforge.net/navit/?rev=2897&view=rev Author: martin-s Date: 2010-01-05 19:24:39 +0000 (Tue, 05 Jan 2010) Log Message: ----------- Fix:Core:Better specification of sequence number in gpx track filename Modified Paths: -------------- trunk/navit/navit/navit_shipped.xml Modified: trunk/navit/navit/navit_shipped.xml =================================================================== --- trunk/navit/navit/navit_shipped.xml 2010-01-05 12:32:24 UTC (rev 2896) +++ trunk/navit/navit/navit_shipped.xml 2010-01-05 19:24:39 UTC (rev 2897) @@ -101,7 +101,7 @@ <vehicle name="Local GPS" profilename="car" enabled="yes" active="1" source="gpsd://localhost" gpsd_query="w+xj"> <!-- Navit can write a tracklog in several formats (gpx, nmea or textfile): --> - <log enabled="no" type="gpx" attr_types="position_time_iso8601,position_direction,position_speed,profilename,position_radius" data="track_%Y%m%d-%i.gpx" flush_size="1000" flush_time="30"/> + <log enabled="no" type="gpx" attr_types="position_time_iso8601,position_direction,position_speed,profilename,position_radius" data="track_%Y%m%d-%%i.gpx" flush_size="1000" flush_time="30"/> </vehicle> <!-- For SDL, you should add follow="1" to have the view centered on your position --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ka...@us...> - 2010-02-01 13:30:40
|
Revision: 2939 http://navit.svn.sourceforge.net/navit/?rev=2939&view=rev Author: kazer_ Date: 2010-02-01 13:30:30 +0000 (Mon, 01 Feb 2010) Log Message: ----------- Update:Config:Removed deprecated references to cegui Modified Paths: -------------- trunk/navit/navit/navit_shipped.xml Modified: trunk/navit/navit/navit_shipped.xml =================================================================== --- trunk/navit/navit/navit_shipped.xml 2010-01-31 17:34:06 UTC (rev 2938) +++ trunk/navit/navit/navit_shipped.xml 2010-02-01 13:30:30 UTC (rev 2939) @@ -29,10 +29,10 @@ [-]0xX [-]0xX --> <navit center="4808 N 1134 E" zoom="256" tracking="1" orientation="-1" recent_dest="10"> - <!-- Use one of gtk_drawing_area, qt_qpainter or sdl. For cegui, use opengl --> + <!-- Use one of gtk_drawing_area, qt_qpainter or sdl. --> <graphics type="gtk_drawing_area"/> <!-- The following line let you select which graphical user interface you'd like to use. - Options include internal (optimized for touch screen devices), gtk (useful for desktop computers) and cegui. + Options include internal (optimized for touch screen devices), gtk (useful for desktop computers). If you don't like the internal gui, set enabled=yes for the following tag and enabled=no for the gui internal tag --> <gui type="gtk" enabled="no" menubar="1" toolbar="1" statusbar="1"/> <!-- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2010-02-23 21:11:52
|
Revision: 2966 http://navit.svn.sourceforge.net/navit/?rev=2966&view=rev Author: martin-s Date: 2010-02-23 21:11:46 +0000 (Tue, 23 Feb 2010) Log Message: ----------- Fix:Core:Display Stop navigation button already during route calculation Modified Paths: -------------- trunk/navit/navit/navit_shipped.xml Modified: trunk/navit/navit/navit_shipped.xml =================================================================== --- trunk/navit/navit/navit_shipped.xml 2010-02-23 21:09:07 UTC (rev 2965) +++ trunk/navit/navit/navit_shipped.xml 2010-02-23 21:11:46 UTC (rev 2966) @@ -57,7 +57,7 @@ <img cond='position_coord_geo' src='gui_vehicle' onclick='position(position_coord_geo,_("Vehicle Position"),8|32|64|128|256)'><script>write(position_coord_geo)</script></img> <img src='gui_town' onclick='town()'><text>Town</text></img> <img src='gui_quit' onclick='quit()'><text>Quit</text></img> - <img cond='navit.route.route_status&48' src='gui_stop' onclick='abort_navigation()'><text>Stop + <img cond='navit.route.route_status&52' src='gui_stop' onclick='abort_navigation()'><text>Stop Navigation</text></img> </a> <a name='Settings'><text>Settings</text> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wog...@us...> - 2010-03-11 22:42:07
|
Revision: 2998 http://navit.svn.sourceforge.net/navit/?rev=2998&view=rev Author: woglinde Date: 2010-03-11 22:41:59 +0000 (Thu, 11 Mar 2010) Log Message: ----------- Add:Core:Added comment about to enable only one mapset Modified Paths: -------------- trunk/navit/navit/navit_shipped.xml Modified: trunk/navit/navit/navit_shipped.xml =================================================================== --- trunk/navit/navit/navit_shipped.xml 2010-03-11 20:39:46 UTC (rev 2997) +++ trunk/navit/navit/navit_shipped.xml 2010-03-11 22:41:59 UTC (rev 2998) @@ -358,6 +358,8 @@ <speech type="cmdline" data="echo 'Fix the speech tag in navit.xml to let navit say:' '%s'" cps="15"/> <!-- <speech type="cmdline" data="flite -t '%s'"/> --> + <!-- You can only have enabled only one mapset at time, but with as much maps enabled as you want --> + <!-- If you have the reiseplaner maps installed, set enabled="yes" in the next line and set the path correctly --> <mapset enabled="no"> <map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aka...@us...> - 2010-04-04 16:04:31
|
Revision: 3131 http://navit.svn.sourceforge.net/navit/?rev=3131&view=rev Author: akashihi Date: 2010-04-04 16:04:25 +0000 (Sun, 04 Apr 2010) Log Message: ----------- Fix:core:Replaced invalid fullscreen command example Modified Paths: -------------- trunk/navit/navit/navit_shipped.xml Modified: trunk/navit/navit/navit_shipped.xml =================================================================== --- trunk/navit/navit/navit_shipped.xml 2010-04-04 16:03:02 UTC (rev 3130) +++ trunk/navit/navit/navit_shipped.xml 2010-04-04 16:04:25 UTC (rev 3131) @@ -95,7 +95,7 @@ <!-- Commands include gui_internal_menu, gui_internal_fullscreen, zoom_in and zoom_out. Usage of negative values change the button origins. x="0" y="0" specifies the top left, x="-0" y="-0" the bottom right corner. It's always the top left corner of the icon, so you need to consider the icon's size when you enter the values. --> - <osd enabled="no" type="button" x="0" y="0" command="gui.fullscreen()" src="toggle_fullscreen.xpm"/> + <osd enabled="no" type="button" x="0" y="0" command="gui.fullscreen=!gui.fullscreen" src="toggle_fullscreen.xpm"/> <osd enabled="no" type="button" x="-96" y="0" command="gui.menu()" src="menu.xpm"/> <osd enabled="no" type="button" x="-96" y="-96" command="zoom_in()" src="zoom_in.xpm"/> <osd enabled="no" type="button" x="0" y="-96" command="zoom_out()" src="zoom_out.xpm"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aka...@us...> - 2010-06-10 11:16:20
|
Revision: 3350 http://navit.svn.sourceforge.net/navit/?rev=3350&view=rev Author: akashihi Date: 2010-06-10 11:16:13 +0000 (Thu, 10 Jun 2010) Log Message: ----------- Fix:core:Replaced missing xpms with pngs Modified Paths: -------------- trunk/navit/navit/navit_shipped.xml Modified: trunk/navit/navit/navit_shipped.xml =================================================================== --- trunk/navit/navit/navit_shipped.xml 2010-06-09 10:07:39 UTC (rev 3349) +++ trunk/navit/navit/navit_shipped.xml 2010-06-10 11:16:13 UTC (rev 3350) @@ -1553,7 +1553,7 @@ <icon src="hotel.xpm"/> </itemgra> <itemgra item_types="poi_car_parking" order="11-"> - <icon src="parking.xpm"/> + <icon src="parking.png"/> </itemgra> <itemgra item_types="poi_car_dealer_parts" order="12-"> <icon src="car_dealer.xpm"/> @@ -1772,7 +1772,7 @@ <icon src="personal_service.xpm"/> </itemgra> <itemgra item_types="poi_pharmacy" order="12-"> - <icon src="pharmacy.xpm"/> + <icon src="pharmacy.png"/> </itemgra> <itemgra item_types="poi_post_office,poi_post_box" order="13-"> <icon src="post.png"/> @@ -1802,7 +1802,7 @@ <icon src="resort.xpm"/> </itemgra> <itemgra item_types="poi_restaurant" order="12-"> - <icon src="restaurant.xpm"/> + <icon src="restaurant.png"/> </itemgra> <itemgra item_types="poi_restricted_area" order="12-"> <icon src="restricted_area.xpm"/> @@ -2807,7 +2807,7 @@ <icon src="ghost_town.xpm"/> </itemgra> <itemgra item_types="poi_hotel" order="12-"> - <icon src="hotel.xpm"/> + <icon src="hotel.png"/> </itemgra> <itemgra item_types="poi_car_parking" order="11-"> <icon src="parking.xpm"/> @@ -3035,7 +3035,7 @@ <icon src="personal_service.xpm"/> </itemgra> <itemgra item_types="poi_pharmacy" order="12-"> - <icon src="pharmacy.xpm"/> + <icon src="pharmacy.png"/> </itemgra> <itemgra item_types="poi_post_office,poi_post_box" order="13-"> <icon src="post.png"/> @@ -4613,7 +4613,7 @@ </itemgra> <!-- amenity=parking --> <itemgra item_types="poi_car_parking" order="14-"> - <icon src="parking.xpm"/> + <icon src="parking.png"/> </itemgra> <!-- amenity=police --> <itemgra item_types="poi_police" order="14-"> @@ -4622,7 +4622,7 @@ </itemgra> <!-- amenity=restaurant --> <itemgra item_types="poi_restaurant" order="14-"> - <icon src="restaurant.xpm"/> + <icon src="restaurant.png"/> <circle color="#000000" radius="3" text_size="7"/> </itemgra> <!-- leisure=golf_curse --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aka...@us...> - 2010-06-10 14:15:17
|
Revision: 3352 http://navit.svn.sourceforge.net/navit/?rev=3352&view=rev Author: akashihi Date: 2010-06-10 14:15:10 +0000 (Thu, 10 Jun 2010) Log Message: ----------- Fix:core:Replaced missing xpms with pngs Modified Paths: -------------- trunk/navit/navit/navit_shipped.xml Modified: trunk/navit/navit/navit_shipped.xml =================================================================== --- trunk/navit/navit/navit_shipped.xml 2010-06-10 11:39:06 UTC (rev 3351) +++ trunk/navit/navit/navit_shipped.xml 2010-06-10 14:15:10 UTC (rev 3352) @@ -2825,7 +2825,7 @@ <icon src="attraction.png"/> </itemgra> <itemgra item_types="poi_cafe" order="12-"> - <icon src="cafe.xpm"/> + <icon src="cafe.png"/> </itemgra> <itemgra item_types="poi_bar" order="12-"> <icon src="bar.xpm"/> @@ -3131,7 +3131,7 @@ <icon src="swimming.xpm"/> </itemgra> <itemgra item_types="poi_telephone" order="13-"> - <icon src="telephone.xpm"/> + <icon src="telephone.png"/> </itemgra> <itemgra item_types="poi_theater" order="12-"> <icon src="theater.xpm"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aka...@us...> - 2010-06-25 09:33:10
|
Revision: 3402 http://navit.svn.sourceforge.net/navit/?rev=3402&view=rev Author: akashihi Date: 2010-06-25 09:33:03 +0000 (Fri, 25 Jun 2010) Log Message: ----------- Add:core:Added navigation icons the to Car-Dark and Bike profiles. Added destination icon to Car, Car-Dark and Biker profiles Modified Paths: -------------- trunk/navit/navit/navit_shipped.xml Modified: trunk/navit/navit/navit_shipped.xml =================================================================== --- trunk/navit/navit/navit_shipped.xml 2010-06-25 09:31:10 UTC (rev 3401) +++ trunk/navit/navit/navit_shipped.xml 2010-06-25 09:33:03 UTC (rev 3402) @@ -1518,6 +1518,9 @@ <itemgra item_types="nav_roundabout_r8" order="0-"> <icon src="nav_roundabout_r8_bk.svg" w="32" h="32"/> </itemgra> + <itemgra item_types="route_end" order="0-"> + <icon src="nav_destination_bk.svg" w="32" h="32"/> + </itemgra> <itemgra item_types="nav_none" order="0-"> <icon src="unknown.xpm"/> </itemgra> @@ -2790,6 +2793,103 @@ <circle color="#55c4bd" radius="3" text_size="15"/> </itemgra> </layer> + <layer name="Internal"> + <itemgra item_types="track" order="3-"> + <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="0-"> + <polyline color="#FF089C" width="1"/> + <arrows color="#FF089C" width="1"/> + </itemgra> + <itemgra item_types="rg_point" order="0-"> + <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" order="0-"> + <icon src="nav_turnaround_left_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="route_end" order="0-"> + <icon src="nav_destination_wh.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="points"> <itemgra item_types="mini_roundabout" order="12-"> <icon src="mini_roundabout.xpm"/> @@ -2797,9 +2897,6 @@ <itemgra item_types="turning_circle" order="12-"> <icon src="mini_roundabout.xpm"/> </itemgra> - <itemgra item_types="track" order="3-"> - <polyline color="#3f3f3f" width="1"/> - </itemgra> <itemgra item_types="poi_airport" order="5-"> <icon src="airport.png"/> </itemgra> @@ -3206,13 +3303,6 @@ <itemgra item_types="poi_image" order="0-"> <image/> </itemgra> - <itemgra item_types="rg_segment" order="0-"> - <polyline color="#FF089C" width="1"/> - <arrows color="#FF089C" width="1"/> - </itemgra> - <itemgra item_types="rg_point" order="0-"> - <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 bike layout? --> <itemgra item_types="poi_bench" order="13-"> <icon src="bench.xpm"/> @@ -4070,6 +4160,103 @@ <polyline color="#3f3f3f" width="1"/> </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" order="0-"> + <icon src="nav_turnaround_left_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="route_end" order="0-"> + <icon src="nav_destination_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="Street Labels"> <itemgra item_types="highway_exit_label" order="10-"> <circle color="#000000" radius="3" text_size="12"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ka...@us...> - 2010-11-05 16:09:14
|
Revision: 3652 http://navit.svn.sourceforge.net/navit/?rev=3652&view=rev Author: kazer_ Date: 2010-11-05 16:09:08 +0000 (Fri, 05 Nov 2010) Log Message: ----------- Config:Add:Added truck profile Modified Paths: -------------- trunk/navit/navit/navit_shipped.xml Modified: trunk/navit/navit/navit_shipped.xml =================================================================== --- trunk/navit/navit/navit_shipped.xml 2010-11-05 14:00:40 UTC (rev 3651) +++ trunk/navit/navit/navit_shipped.xml 2010-11-05 16:09:08 UTC (rev 3652) @@ -342,7 +342,98 @@ <roadprofile item_types="roundabout" speed="5" route_weight="2"/> <roadprofile item_types="ferry" speed="40" route_weight="40"/> </vehicleprofile> + <!-- chr: + flags used for a truck: (first flag number is 0) + 8: SIZE_OR_WEIGHT_LIMIT + 21: TRANSPORT_TRUCK + speed setup: + 'speed' data of the vehicleprofile for a car is + reduced about 10 km/h. When the speed was at + 10 km/h, I reduced it to 5 km/h. + 'route_weight' data has been treated in the same way. + If you want to discourage the use of small roads, + just reduce this value. + size and weight setup: + This is an example, you have to use the data of your truck. + bobshaffer's standard truck: + (1 lb = 453.59237 g, 1 foot = .3048 m) + (data has to be in [cm] and [kg] according to 'vehicleprofile.h') + width= 9 feet, 274 cm + height= 13.5 feet, 411 cm + length= 70 feet, 2134 cm + weight= 80000 lbs, 36287 kg + axle_weight= 34000 lbs, 15422 kg + --> + <vehicleprofile name="truck" flags="0x200100" flags_forward_mask="0x200102" flags_reverse_mask="0x200101" maxspeed_handling="1" route_mode="0" static_speed="5" + static_distance="25" + width="274" height="411" length="2134" + weight="36287" axle_weight="15422"> + <roadprofile item_types="street_0,street_1_city,living_street,street_service,track_gravelled,track_unpaved" speed="5" route_weight="5"> + <announcement level="0" distance_metric="25"/> + <announcement level="1" distance_metric="100"/> + <announcement level="2" distance_metric="200"/> + </roadprofile> + <roadprofile item_types="street_2_city,track_paved" speed="20" route_weight="20"> + <announcement level="0" distance_metric="50"/> + <announcement level="1" distance_metric="200"/> + <announcement level="2" distance_metric="500"/> + </roadprofile> + <roadprofile item_types="street_3_city" speed="30" route_weight="30"> + <announcement level="0" distance_metric="50"/> + <announcement level="1" distance_metric="200"/> + <announcement level="2" distance_metric="500"/> + </roadprofile> + <roadprofile item_types="street_4_city" speed="40" route_weight="40"> + <announcement level="0" distance_metric="50"/> + <announcement level="1" distance_metric="200"/> + <announcement level="2" distance_metric="500"/> + </roadprofile> + <roadprofile item_types="highway_city" speed="70" route_weight="70"> + <announcement level="0" distance_metric="100"/> + <announcement level="1" distance_metric="400"/> + <announcement level="2" distance_metric="1000"/> + </roadprofile> + <roadprofile item_types="street_1_land" speed="50" route_weight="50"> + <announcement level="0" distance_metric="100"/> + <announcement level="1" distance_metric="400"/> + <announcement level="2" distance_metric="1000"/> + </roadprofile> + <roadprofile item_types="street_2_land" speed="55" route_weight="55"> + <announcement level="0" distance_metric="100"/> + <announcement level="1" distance_metric="400"/> + <announcement level="2" distance_metric="1000"/> + </roadprofile> + <roadprofile item_types="street_3_land" speed="60" route_weight="60"> + <announcement level="0" distance_metric="100"/> + <announcement level="1" distance_metric="400"/> + <announcement level="2" distance_metric="1000"/> + </roadprofile> + <roadprofile item_types="street_4_land" speed="70" route_weight="70"> + <announcement level="0" distance_metric="100"/> + <announcement level="1" distance_metric="400"/> + <announcement level="2" distance_metric="1000"/> + </roadprofile> + <roadprofile item_types="street_n_lanes" speed="80" route_weight="80"> + <announcement level="0" distance_metric="300"/> + <announcement level="1" distance_metric="1000"/> + <announcement level="2" distance_metric="2000"/> + </roadprofile> + <roadprofile item_types="highway_land" speed="80" route_weight="80"> + <announcement level="0" distance_metric="300"/> + <announcement level="1" distance_metric="1000"/> + <announcement level="2" distance_metric="2000"/> + </roadprofile> + <roadprofile item_types="ramp" speed="30" route_weight="30"> + <announcement level="0" distance_metric="50"/> + <announcement level="1" distance_metric="200"/> + <announcement level="2" distance_metric="500"/> + </roadprofile> + <roadprofile item_types="roundabout" speed="5" route_weight="5"/> + <roadprofile item_types="ferry" speed="40" route_weight="40"/> + </vehicleprofile> + + <route destination_distance="50"/> <navigation> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2010-11-10 10:01:48
|
Revision: 3671 http://navit.svn.sourceforge.net/navit/?rev=3671&view=rev Author: martin-s Date: 2010-11-10 10:01:42 +0000 (Wed, 10 Nov 2010) Log Message: ----------- Add:Core:New Layout Car-simple Modified Paths: -------------- trunk/navit/navit/navit_shipped.xml Modified: trunk/navit/navit/navit_shipped.xml =================================================================== --- trunk/navit/navit/navit_shipped.xml 2010-11-09 18:16:47 UTC (rev 3670) +++ trunk/navit/navit/navit_shipped.xml 2010-11-10 10:01:42 UTC (rev 3671) @@ -3460,6 +3460,130 @@ </layer> </layout> + <layout name="Car-simple" color="#839ea9"> + <layer name="polygon"> + <itemgra item_types="poly_town" order="8-"> + <polygon color="#6b8091"/> + </itemgra> + </layer> + <layer name="streets"> + <itemgra item_types="water_line" order="11-"> + <polyline width="3" color="#5e71a7" /> + </itemgra> + <itemgra item_types="rail" order="9-"> + <polyline width="4" color="#a4bac8" /> + <polyline width="1" color="#e0e0e0" dash="4,6"/> + </itemgra> + <itemgra item_types="street_1_city,street_1_land" order="12-"> + <polyline width="5" color="#516170"/> + </itemgra> + <itemgra item_types="street_2_city,street_2_land" order="12-"> + <polyline width="7" color="#516170"/> + </itemgra> + <itemgra item_types="street_1_city,street_1_land" order="11"> + <polyline width="3" color="#516170"/> + </itemgra> + <itemgra item_types="street_2_city,street_2_land" order="9-11"> + <polyline width="5" color="#516170"/> + </itemgra> + <itemgra item_types="street_3_city,street_3_land,ramp" order="11-"> + <polyline width="9" color="#516170" /> + </itemgra> + <itemgra item_types="street_3_city,street_3_land,ramp" order="8-10"> + <polyline width="7" color="#516170" /> + </itemgra> + <itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="11-"> + <polyline width="9" color="#516170" /> + </itemgra> + <itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="8-10"> + <polyline width="7" color="#516170" /> + </itemgra> + <itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="6-7"> + <polyline width="3" color="#516170" /> + </itemgra> + <itemgra item_types="highway_city,highway_land" order="4-"> + <polyline width="9" color="#516170" /> + </itemgra> + + <itemgra item_types="street_route" > + <polyline width="11" color="#516170" /> + </itemgra> + + <itemgra item_types="street_1_city,street_1_land" order="12-"> + <polyline width="3" color="#a4bac8" /> + </itemgra> + <itemgra item_types="street_2_city,street_2_land" order="12-"> + <polyline width="5" color="#90a3af" /> + </itemgra> + <itemgra item_types="street_1_city,street_1_land" order="11"> + <polyline width="1" color="#a4bac8" /> + </itemgra> + <itemgra item_types="street_2_city,street_2_land" order="9-11"> + <polyline width="3" color="#90a3af" /> + </itemgra> + + <itemgra item_types="street_3_city,street_3_land,ramp" order="11-"> + <polyline width="6" color="#a4bac8" /> + </itemgra> + <itemgra item_types="street_3_city,street_3_land,ramp" order="8-10"> + <polyline width="4" color="#a4bac8" /> + </itemgra> + <itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="11-"> + <polyline width="6" color="#c7e1f2" /> + </itemgra> + <itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="8-10"> + <polyline width="4" color="#c7e1f2" /> + </itemgra> + <itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="6-7"> + <polyline width="1" color="#c7e1f2" /> + </itemgra> + + <itemgra item_types="highway_city,highway_land" order="4-"> + <polyline width="3" color="#c0e1ff" /> + </itemgra> + + <itemgra item_types="street_route" > + <polyline width="9" color="#ffffff" /> + </itemgra> + </layer> + <layer name="labels"> + <itemgra item_types="water_line" order="11-"> + <text text_size="16" color="#0000ff" /> + </itemgra> + <itemgra item_types="street_1_city,street_2_city,street_3_city,street_4_city,highway_city,street_1_land,street_2_land,street_3_land,street_4_land,street_n_lanes,highway_land"> + <text text_size="16" color="#ffffff" background_color="#000000"/> + </itemgra> + <itemgra item_types="town_label,district_label,town_label_0e0,town_label_1e0,town_label_2e0,town_label_5e0,town_label_1e1,town_label_2e1,town_label_5e1,town_label_1e2,town_label_2e2,town_label_5e2,district_label_0e0,district_label_1e0,district_label_2e0,district_label_5e0,district_label_1e1,district_label_2e1,district_label_5e1,district_label_1e2,district_label_2e2,district_label_5e2" order="10-"> + <circle radius="3" text_size="16" color="#ffffff" background_color="#000000"/> + </itemgra> + <itemgra item_types="town_label_1e3,town_label_2e3,district_label_1e3,district_label_2e3" order="9-"> + <circle radius="3" text_size="16" color="#ffffff" background_color="#000000"/> + </itemgra> + <itemgra item_types="town_label_5e3,district_label_5e3" order="8-"> + <circle radius="3" text_size="16" color="#ffffff" background_color="#000000"/> + </itemgra> + <itemgra item_types="town_label_1e4,district_label_1e4" order="7-"> + <circle radius="3" text_size="16" color="#ffffff" background_color="#000000"/> + </itemgra> + <itemgra item_types="town_label_2e4,district_label_2e4" order="6-"> + <circle radius="3" text_size="16" color="#ffffff" background_color="#000000"/> + </itemgra> + <itemgra item_types="town_label_5e4,town_label_1e5,district_label_5e4,district_label_1e5" order="5-"> + <circle radius="3" text_size="16" color="#ffffff" background_color="#000000"/> + </itemgra> + <itemgra item_types="town_label_2e5,district_label_2e5" order="4-"> + <circle radius="3" text_size="16" color="#ffffff" background_color="#000000"/> + </itemgra> + <itemgra item_types="town_label_5e5,district_label_5e5" order="2-"> + <circle radius="3" text_size="16" color="#ffffff" background_color="#000000"/> + </itemgra> + + <itemgra item_types="town_label_1e6,town_label_2e6,town_label_5e6,town_label_1e7,district_label_1e6,district_label_2e6,district_label_5e6,district_label_1e7"> + <circle radius="3" text_size="16" color="#ffffff" background_color="#000000"/> + </itemgra> + </layer> + </layout> + <layout name="Bike" color="#ffefb7" font="Liberation Sans"> <cursor w="26" h="26"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2010-12-09 09:44:13
|
Revision: 3761 http://navit.svn.sourceforge.net/navit/?rev=3761&view=rev Author: martin-s Date: 2010-12-09 09:44:07 +0000 (Thu, 09 Dec 2010) Log Message: ----------- Fix:Corrected truck profile Modified Paths: -------------- trunk/navit/navit/navit_shipped.xml Modified: trunk/navit/navit/navit_shipped.xml =================================================================== --- trunk/navit/navit/navit_shipped.xml 2010-12-08 17:25:10 UTC (rev 3760) +++ trunk/navit/navit/navit_shipped.xml 2010-12-09 09:44:07 UTC (rev 3761) @@ -358,17 +358,17 @@ bobshaffer's standard truck: (1 lb = 453.59237 g, 1 foot = .3048 m) (data has to be in [cm] and [kg] according to 'vehicleprofile.h') - width= 9 feet, 274 cm - height= 13.5 feet, 411 cm - length= 70 feet, 2134 cm - weight= 80000 lbs, 36287 kg - axle_weight= 34000 lbs, 15422 kg + vehicle_width= 9 feet, 274 cm + vehicle_height= 13.5 feet, 411 cm + vehicle_length= 70 feet, 2134 cm + vehicle_weight= 80000 lbs, 36287 kg + vehicle_axle_weight= 34000 lbs, 15422 kg --> - <vehicleprofile name="truck" flags="0x200100" flags_forward_mask="0x200102" flags_reverse_mask="0x200101" maxspeed_handling="1" route_mode="0" static_speed="5" + <vehicleprofile name="Truck" flags="0x200100" flags_forward_mask="0x200102" flags_reverse_mask="0x200101" maxspeed_handling="1" route_mode="0" static_speed="5" static_distance="25" - width="274" height="411" length="2134" - weight="36287" axle_weight="15422"> + vehicle_width="274" vehicle_height="411" vehicle_length="2134" + vehicle_weight="36287" vehicle_axle_weight="15422"> <roadprofile item_types="street_0,street_1_city,living_street,street_service,track_gravelled,track_unpaved" speed="5" route_weight="5"> <announcement level="0" distance_metric="25"/> <announcement level="1" distance_metric="100"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kl...@us...> - 2010-12-20 07:26:12
|
Revision: 3801 http://navit.svn.sourceforge.net/navit/?rev=3801&view=rev Author: klausg Date: 2010-12-20 07:26:05 +0000 (Mon, 20 Dec 2010) Log Message: ----------- Added hints for windows configuration Modified Paths: -------------- trunk/navit/navit/navit_shipped.xml Modified: trunk/navit/navit/navit_shipped.xml =================================================================== --- trunk/navit/navit/navit_shipped.xml 2010-12-18 22:28:23 UTC (rev 3800) +++ trunk/navit/navit/navit_shipped.xml 2010-12-20 07:26:05 UTC (rev 3801) @@ -29,7 +29,8 @@ [-]0xX [-]0xX --> <navit center="4808 N 1134 E" zoom="256" tracking="1" orientation="-1" recent_dest="10"> - <!-- Use one of gtk_drawing_area, qt_qpainter or sdl. --> + <!-- Use one of gtk_drawing_area, qt_qpainter or sdl. + On windows systems, use win32 --> <graphics type="gtk_drawing_area"/> <!-- The following line let you select which graphical user interface you'd like to use. Options include internal (optimized for touch screen devices), gtk (useful for desktop computers). @@ -100,7 +101,12 @@ <osd enabled="no" type="button" x="-96" y="-96" command="zoom_in()" src="zoom_in.xpm"/> <osd enabled="no" type="button" x="0" y="-96" command="zoom_out()" src="zoom_out.xpm"/> + <!-- Vehicle with GPS enabled for gpsd on unix --> <vehicle name="Local GPS" profilename="car" enabled="yes" active="1" source="gpsd://localhost" gpsd_query="w+xj"> + <!-- Vehicle with GPS enabled for direct communication on windows. Remove the line above if you use this. --> + <!-- <vehicle name="Local GPS" profilename="car" follow="1" enabled="yes" active="1" + source="serial:COM4 baud=4800 parity=N data=8 stop=1" > --> + <!-- Navit can write a tracklog in several formats (gpx, nmea or textfile): --> <log enabled="no" type="gpx" attr_types="position_time_iso8601,position_direction,position_speed,profilename,position_radius" data="track_%Y%m%d-%%i.gpx" flush_size="1000" flush_time="30"/> </vehicle> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <geo...@us...> - 2011-01-17 19:52:16
|
Revision: 3927 http://navit.svn.sourceforge.net/navit/?rev=3927&view=rev Author: geoghegan Date: 2011-01-17 19:52:10 +0000 (Mon, 17 Jan 2011) Log Message: ----------- Fix:OSD:Corrects the T@H layout to render correctly. As per ticket #739 Modified Paths: -------------- trunk/navit/navit/navit_shipped.xml Modified: trunk/navit/navit/navit_shipped.xml =================================================================== --- trunk/navit/navit/navit_shipped.xml 2011-01-17 17:48:29 UTC (rev 3926) +++ trunk/navit/navit/navit_shipped.xml 2011-01-17 19:52:10 UTC (rev 3927) @@ -4583,6 +4583,10 @@ <itemgra item_types="poly_wood" order="0-"> <polygon color="#72bf81"/> </itemgra> + <itemgra item_types="poly_flats,poly_scrub,poly_military_zone,poly_marine,plantation,tundra" order="0-"> + <polygon color="#a0a0a0"/> + <text text_size="5"/> + </itemgra> <!-- landuse=residential --> <itemgra item_types="poly_town" order="0-"> <polygon color="#f2f2f2"/> @@ -5008,10 +5012,6 @@ <itemgra item_types="town_label_1e7,district_label_1e7" order="1-"> <circle color="#000000" radius="3" text_size="15"/> </itemgra> - <itemgra item_types="poly_flats,poly_scrub,poly_military_zone,poly_marine,plantation,tundra" order="0-"> - <polygon color="#a0a0a0"/> - <text text_size="5"/> - </itemgra> <itemgra item_types="rg_point" order="0-"> <circle color="#FF089C" radius="10"/> </itemgra> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2011-03-11 09:57:51
|
Revision: 4330 http://navit.svn.sourceforge.net/navit/?rev=4330&view=rev Author: martin-s Date: 2011-03-11 09:57:45 +0000 (Fri, 11 Mar 2011) Log Message: ----------- Fix:Core:Reverted to pngs for zoom buttons because of better portability Modified Paths: -------------- trunk/navit/navit/navit_shipped.xml Modified: trunk/navit/navit/navit_shipped.xml =================================================================== --- trunk/navit/navit/navit_shipped.xml 2011-03-11 09:30:18 UTC (rev 4329) +++ trunk/navit/navit/navit_shipped.xml 2011-03-11 09:57:45 UTC (rev 4330) @@ -98,8 +98,8 @@ It's always the top left corner of the icon, so you need to consider the icon's size when you enter the values. --> <osd enabled="no" type="button" x="0" y="0" command="gui.fullscreen=!gui.fullscreen" src="toggle_fullscreen.xpm"/> <osd enabled="no" type="button" x="-96" y="0" command="gui.menu()" src="menu.xpm"/> - <osd enabled="no" type="button" x="-96" y="-96" command="zoom_in()" src="zoom_in.svg"/> - <osd enabled="no" type="button" x="0" y="-96" command="zoom_out()" src="zoom_out.svg"/> + <osd enabled="no" type="button" x="-96" y="-96" command="zoom_in()" src="zoom_in.png"/> + <osd enabled="no" type="button" x="0" y="-96" command="zoom_out()" src="zoom_out.png"/> <!-- Vehicle with GPS enabled for gpsd on unix --> <vehicle name="Local GPS" profilename="car" enabled="yes" active="1" source="gpsd://localhost" gpsd_query="w+xj"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |