From: <mar...@us...> - 2009-12-15 10:54:17
|
Revision: 2871 http://navit.svn.sourceforge.net/navit/?rev=2871&view=rev Author: martin-s Date: 2009-12-15 10:53:38 +0000 (Tue, 15 Dec 2009) Log Message: ----------- Add:Core:New POIs Modified Paths: -------------- trunk/navit/navit/item_def.h trunk/navit/navit/navit_shipped.xml trunk/navit/navit/xpm/Makefile.am Added Paths: ----------- trunk/navit/navit/xpm/danger.svg trunk/navit/navit/xpm/gui_vehicle_pedestrian.svg Modified: trunk/navit/navit/item_def.h =================================================================== --- trunk/navit/navit/item_def.h 2009-12-15 09:57:17 UTC (rev 2870) +++ trunk/navit/navit/item_def.h 2009-12-15 10:53:38 UTC (rev 2871) @@ -331,6 +331,7 @@ ITEM(ch_node) ITEM(place_label) ITEM(vehicle) +ITEM(vehicle_pedestrian) /* Line */ ITEM2(0x80000000,line) ITEM2(0x80000001,line_unspecified) Modified: trunk/navit/navit/navit_shipped.xml =================================================================== --- trunk/navit/navit/navit_shipped.xml 2009-12-15 09:57:17 UTC (rev 2870) +++ trunk/navit/navit/navit_shipped.xml 2009-12-15 10:53:38 UTC (rev 2871) @@ -1661,7 +1661,7 @@ <icon src="dam.xpm"/> </itemgra> <itemgra item_types="poi_danger_area" order="12-"> - <icon src="danger_area.xpm"/> + <icon src="danger_16_16.png"/> </itemgra> <itemgra item_types="poi_danger_sea_wreck" order="12-"> <icon src="dangerous.xpm"/> @@ -1982,6 +1982,9 @@ <itemgra item_types="vehicle" order="0-"> <icon src="gui_vehicle_16_16.png" /> </itemgra> + <itemgra item_types="vehicle_pedestrian" order="0-"> + <icon src="gui_vehicle_pedestrian_16_16.png" /> + </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_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,vehicle" order="14-"> @@ -2914,8 +2917,8 @@ <itemgra item_types="poi_dam" order="0-"> <icon src="dam.xpm"/> </itemgra> - <itemgra item_types="poi_danger_area" order="0-"> - <icon src="danger_area.xpm"/> + <itemgra item_types="poi_danger_area" order="12-"> + <icon src="danger_16_16.png"/> </itemgra> <itemgra item_types="poi_danger_sea_wreck" order="0-"> <icon src="dangerous.xpm"/> @@ -3244,6 +3247,9 @@ <itemgra item_types="vehicle" order="0-"> <icon src="gui_vehicle_16_16.png" /> </itemgra> + <itemgra item_types="vehicle_pedestrian" order="0-"> + <icon src="gui_vehicle_pedestrian_16_16.png" /> + </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_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,vehicle" order="14-"> Modified: trunk/navit/navit/xpm/Makefile.am =================================================================== --- trunk/navit/navit/xpm/Makefile.am 2009-12-15 09:57:17 UTC (rev 2870) +++ trunk/navit/navit/xpm/Makefile.am 2009-12-15 10:53:38 UTC (rev 2871) @@ -86,6 +86,7 @@ svgs += gui_quit.svg gui_stop.svg svgs += gui_town.svg svgs += gui_vehicle.svg +svgs += gui_vehicle_pedestrian.svg svgs += gui_zoom_in.svg svgs += gui_zoom_out.svg svgs += zoom_in.svg @@ -116,6 +117,7 @@ svgs += boat_ramp.svg svgs += bus.svg svgs += cinema.svg +svgs += danger.svg svgs += exit.svg svgs += fastfood.svg svgs += firebrigade.svg Added: trunk/navit/navit/xpm/danger.svg =================================================================== --- trunk/navit/navit/xpm/danger.svg (rev 0) +++ trunk/navit/navit/xpm/danger.svg 2009-12-15 10:53:38 UTC (rev 2871) @@ -0,0 +1,84 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + version="1.0" + width="64" + height="64" + id="svg2" + sodipodi:version="0.32" + inkscape:version="0.46" + sodipodi:docname="danger.svg" + sodipodi:docbase="C:\Dokumente und Einstellungen\Internet\Desktop\Wiki\SVG sonstiges (fertig)" + inkscape:output_extension="org.inkscape.output.svg.inkscape"> + <metadata + id="metadata12"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + </cc:Work> + </rdf:RDF> + </metadata> + <sodipodi:namedview + inkscape:window-height="726" + inkscape:window-width="1024" + inkscape:pageshadow="2" + inkscape:pageopacity="0.0" + guidetolerance="10.0" + gridtolerance="10.0" + objecttolerance="10.0" + borderopacity="1.0" + bordercolor="#666666" + pagecolor="#ffffff" + id="base" + inkscape:zoom="0.45689977" + inkscape:cx="337.5" + inkscape:cy="516.84554" + inkscape:window-x="246" + inkscape:window-y="25" + inkscape:current-layer="svg2" + showgrid="false" /> + <defs + id="defs4"> + <inkscape:perspective + sodipodi:type="inkscape:persp3d" + inkscape:vp_x="0 : 292.5 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_z="675 : 292.5 : 1" + inkscape:persp3d-origin="337.5 : 195 : 1" + id="perspective11" /> + </defs> + <g + id="g2384" + transform="matrix(9.3986055e-2,0,0,9.3986055e-2,0.2797068,4.5090786)"> + <g + transform="matrix(0.977077,0,0,0.977077,-30.42813,-35.56338)" + id="g1909"> + <path + style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:2" + d="M 71.985614,631.52918 C 60.553114,631.52918 49.989054,625.43 44.272794,615.52918 C 38.556554,605.62833 38.556554,593.43 44.272794,583.52918 L 348.84719,55.99085 C 354.56345,46.09002 365.12751,39.99084 376.56,39.99084 C 387.99251,39.99084 398.55659,46.09002 404.27283,55.99085 L 708.84723,583.52918 C 714.56347,593.43 714.56347,605.62833 708.84723,615.52918 C 703.13097,625.42999 692.56691,631.52918 681.13441,631.52918 L 71.985614,631.52918 z" + id="path1902" /> + <path + style="fill:#cc0000;fill-rule:evenodd;stroke:none" + d="M 71.985614,619.52918 C 64.840294,619.52918 58.237754,615.7172 54.665094,609.52918 C 51.092454,603.34114 51.092454,595.7172 54.665094,589.52918 L 359.23951,61.99086 C 362.81215,55.80282 369.41471,51.99084 376.56,51.99084 C 383.70533,51.99084 390.30787,55.80282 393.88053,61.99086 L 698.45493,589.52918 C 702.02757,595.7172 702.02757,603.34114 698.45493,609.52918 C 694.88227,615.7172 688.27973,619.52918 681.13441,619.52918 L 71.985614,619.52918 z M 141.2677,559.52918 L 376.56,151.99085 L 611.85233,559.52918 L 141.2677,559.52918 z" + id="path1904" /> + </g> + <path + d="M 305.54965,214.69023 C 305.54965,178.32435 369.45035,178.50719 369.45035,214.69023 L 352.68951,405.86854 C 352.68951,420.93416 322.83426,420.97671 322.83426,405.86854 L 305.54965,214.69023 z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + id="path37169" /> + <path + d="M 369.18845,460.60298 C 369.18845,478.10403 355.00104,492.29143 337.5,492.29143 C 319.99896,492.29143 305.81155,478.10403 305.81155,460.60298 C 305.81155,443.10194 319.99896,428.91453 337.5,428.91453 C 355.00104,428.91453 369.18845,443.10194 369.18845,460.60298 z" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path37167" /> + </g> +</svg> Added: trunk/navit/navit/xpm/gui_vehicle_pedestrian.svg =================================================================== --- trunk/navit/navit/xpm/gui_vehicle_pedestrian.svg (rev 0) +++ trunk/navit/navit/xpm/gui_vehicle_pedestrian.svg 2009-12-15 10:53:38 UTC (rev 2871) @@ -0,0 +1,77 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + version="1.0" + height="64" + width="64" + id="svg2" + sodipodi:version="0.32" + inkscape:version="0.46" + sodipodi:docname="gui_vehicle_pedestrian.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape"> + <metadata + id="metadata16"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs14"> + <inkscape:perspective + sodipodi:type="inkscape:persp3d" + inkscape:vp_x="0 : 335.76001 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_z="753.12 : 335.76001 : 1" + inkscape:persp3d-origin="376.56 : 223.84001 : 1" + id="perspective18" /> + </defs> + <sodipodi:namedview + inkscape:window-height="726" + inkscape:window-width="1280" + inkscape:pageshadow="2" + inkscape:pageopacity="0.0" + guidetolerance="10.0" + gridtolerance="10.0" + objecttolerance="10.0" + borderopacity="1.0" + bordercolor="#666666" + pagecolor="#ffffff" + id="base" + showgrid="false" + inkscape:zoom="8.2333334" + inkscape:cx="31.163054" + inkscape:cy="30.91053" + inkscape:window-x="0" + inkscape:window-y="24" + inkscape:current-layer="svg2" /> + <g + transform="matrix(8.5470085e-2,0,0,8.5470085e-2,14.979693,-2.188034)" + id="PedestrianSymbol" + style="fill:#808080;fill-opacity:1"> + <circle + r="56" + cx="188" + cy="105" + style="fill:#808080;stroke:none;fill-opacity:1" + id="circle9" + sodipodi:cx="188" + sodipodi:cy="105" + sodipodi:rx="56" + sodipodi:ry="56" /> + <path + style="fill:#808080;stroke:none;fill-opacity:1" + d="M 22,427 C 173.66667,190.33333 159.33333,183.66667 216,182 C 249,183 250,192 306,236 C 375,286.66667 370,287.33333 369,343 C 368.66667,410 373.33333,405 320,430 L 320,317 L 273,275 L 273,434 L 161,433 L 160,307 C 68,449 74,441 22,427 z M 163,450 L 272,450 C 272,475 280,473 338,582 C 399,694.33333 400,686.66667 365,751 L 214,480 C 71,756.66667 89,748.33333 10,743 L 89,595 C 156.66667,472.66667 160.33333,472.33333 163,450 z" + id="path11" /> + </g> +</svg> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |