vcs.maemo.org Git - navit-package/blob - debian/patches/xml_config.patch

   1 Index: navit/navit/navit_shipped.xml
   2 ===================================================================
   3 --- navit.orig/navit/navit_shipped.xml  2010-01-28 11:46:24.887339124 +0100
   4 +++ navit/navit/navit_shipped.xml       2010-01-28 15:32:31.515572482 +0100
   5 @@ -38,9 +38,9 @@
   6         <!--
   7                         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.
   8                         Here's an example for a freerunner: -->
   9 -               <!-- <gui type="internal" font_size="350" icon_xs="32" icon_s="96" icon_l="96"/> -->
  10 +               <!-- <gui type="internal" fullscreen="1" font_size="350" icon_xs="32" icon_s="96" icon_l="96"/> -->
  11
  12 -               <gui type="internal" enabled="yes"><![CDATA[
  13 +               <gui type="internal" fullscreen="1" font_size="350" icon_xs="32" icon_s="96" icon_l="96" enabled="yes"><![CDATA[
  14                         <html>
  15                                 <a name='Main Menu'><text>Main menu</text>
  16                                         <a href='#Actions'><img src='gui_actions'>Actions</img></a>
  17 @@ -49,7 +49,7 @@
  18                                         <a href='#Settings'><img src='gui_settings'><text>Settings</text></img></a>
  19                                 <a href='#Tools'><img src='gui_tools'><text>Tools</text></img></a>
  20                                 <a href='#Route'><img src='gui_settings'><text>Route</text></img></a>
  21 -                <img src='gui_about'  onclick='about()'><text>About</text></img>
  22 +                                <img src='gui_tools'  onclick='about()'><text>About</text></img>
  23                                 </a>
  24                         <a name='Actions'><text>Actions</text>
  25                                 <img src='gui_bookmark' onclick='bookmarks()'><text>Bookmarks</text></img>
  26 @@ -84,23 +84,49 @@
  27                 ]]></gui>
  28                 <!-- for a debug log -->
  29                 <log enabled="no" type="textfile_debug" data="debug_%Y%m%d-%i.txt" flush_size="1000" flush_time="30"/>
  30 +
  31                 <!-- osd items allow to position display and control items directly on top of the map: -->
  32 -               <osd enabled="no" type="compass"/>
  33                 <osd enabled="no" type="eta"/>
  34                 <osd enabled="no" type="navigation_distance_to_target"/>
  35                 <osd enabled="no" type="navigation"/>
  36                 <osd enabled="no" type="navigation_distance_to_next"/>
  37                 <osd enabled="no" type="navigation_next_turn"/>
  38
  39 +               <osd enabled="yes" type="compass" x="-110" y="-60" font_size="250" w="60" h="60" background_color="#000000c8"/>
  40 +               <osd enabled="yes" type="gps_status" x="-50" y="-60" w="50" h="40" background_color="#000000c8"/>
  41 +               <osd enabled="yes" type="text" label="${vehicle.position_sats_signal}/${vehicle.position_qual}" x="-50" y="-20"
  42 +                                  font_size="250" w="50" h="20" align="0" background_color="#000000c8"/>
  43 +               <osd enabled="yes" type="text" label="${vehicle.position_speed}" x="0" y="-60" font_size="400" w="110" h="60"
  44 +                                  align="4" background_color="#000000c8"/>
  45 +               <osd enabled="yes" type="text" label="ETA: ${navigation.item.destination_time[arrival]}" x="110" y="-30"
  46 +                                   font_size="300" w="170" h="30" align="4" background_color="#000000c8"/>
  47 +               <osd enabled="yes" type="text" label="${navigation.item.destination_length[named]}" x="280" y="-30"
  48 +                                  font_size="300" w="170" h="30" align="4" background_color="#000000c8"/>
  49 +               <osd enabled="yes" type="text" label="${navigation.item.destination_time[remaining]}" x="450" y="-30"
  50 +                                  font_size="300" w="240" h="30" align="4" background_color="#000000c8"/>
  51 +               <osd enabled="yes" type="text" label="In ${navigation.item[1].length[named]} " x="0" y="0" font_size="500"
  52 +                                  w="245" h="40" align="4" background_color="#000000c8"/>
  53 +               <osd enabled="yes" type="navigation_next_turn" x="245" y="0" font_size="500" w="60" h="40" background_color="#000000c8"
  54 +                                  icon_src="$NAVIT_SHAREDIR/xpm/%s.svg" />
  55 +               <osd enabled="yes" type="text" label="Onto ${navigation.item[1].street_name}" x="305" y="0" font_size="500"
  56 +                                  w="495" h="40" align="4" background_color="#000000c8"/>
  57 +               <osd enabled="yes" type="text" label="${navigation.item.street_name}" x="110" y="-60"  font_size="500"
  58 +                                  w="580" h="30" align="0" background_color="#000000c8"/>
  59 +
  60                 <!-- Commands include gui_internal_menu, gui_internal_fullscreen, zoom_in and zoom_out.
  61                         Usage of negative values change the button origins. x="0" y="0" specifies the top left, x="-0" y="-0" the bottom right corner.
  62                         It's always the top left corner of the icon, so you need to consider the icon's size when you enter the values. -->
  63 -               <osd enabled="no" type="button" x="0" y="0" command="gui.fullscreen()" src="toggle_fullscreen.xpm"/>
  64 -               <osd enabled="no" type="button" x="-96" y="0" command="gui.menu()" src="menu.xpm"/>
  65 -               <osd enabled="no" type="button" x="-96" y="-96" command="zoom_in()" src="zoom_in.xpm"/>
  66 -               <osd enabled="no" type="button" x="0" y="-96" command="zoom_out()" src="zoom_out.xpm"/>
  67
  68 -               <vehicle name="Local GPS" profilename="car" enabled="yes" active="1" source="gpsd://localhost" gpsd_query="w+xj">
  69 +               <osd enabled="yes" type="button" x="-60" y="50" command="zoom_in()" src="gui_zoom_in.svg"/>
  70 +               <osd enabled="yes" type="button" x="-60" y="130" command="gui.fullscreen=!gui.fullscreen" src="gui_fullscreen.svg"/>
  71 +               <osd enabled="yes" type="button" x="-60" y="220" command="zoom_out()" src="gui_zoom_out.svg"/>
  72 +                <osd enabled="yes" type="button" x="-70" y="290" command="gui.menu()" src="gui_menu.svg"/>
  73 +
  74 +               <!-- allow user customize the OSD -->
  75 +               <xi:include href="/home/user/.navit/OSD.xml"/>
  76 +
  77 +               <!-- On n900 we are using maemo vehicle -->
  78 +               <vehicle name="Local GPS" profilename="car" enabled="yes" active="1" source="maemo">
  79                         <!-- Navit can write a tracklog in several formats (gpx, nmea or textfile): -->
  80                         <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"/>
  81                 </vehicle>
  82 @@ -355,8 +381,12 @@
  83                 <!-- Navit provides speech output in text format.
  84                         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.
  85                         The default is text output to the shell -->
  86 -               <speech type="cmdline" data="echo 'Fix the speech tag in navit.xml to let navit say:' '%s'" cps="15"/>
  87 +               <!-- <speech type="cmdline" data="echo 'Fix the speech tag in navit.xml to let navit say:' '%s'" cps="15"/> -->
  88                 <!-- <speech type="cmdline" data="flite -t '%s'"/> -->
  89 +               <!-- on n900 espeak works pretty good, but user have to enable it, put this line with enabled="yes"
  90 +                    into the speech.xml file -->
  91 +               <speech type="cmdline" data="espeak '%s'" enabled="no"/>
  92 +                <xi:include href="/home/user/.navit/speech.xml"/>
  93
  94                 <!-- If you have the reiseplaner maps installed, set enabled="yes" in the next line and set the path correctly -->
  95                 <mapset enabled="no">
  96 @@ -369,10 +399,16 @@
  97                 </mapset>
  98
  99                 <!-- 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 -->
 100 -               <mapset enabled="yes">
 101 +               <mapset enabled="no">
 102                         <xi:include href="$NAVIT_SHAREDIR/maps/*.xml"/>
 103                 </mapset>
 104
 105 +                <!-- Mapset template for userdefined maps on n900 -->
 106 +                <mapset enabled="yes">
 107 +                       <map type="binfile" enabled="yes" data="/home/user/MyDocs/map.bin"/>
 108 +                        <xi:include href="/home/user/.navit/maps.xml"/>
 109 +                </mapset>
 110 +
 111                 <!-- Mapset template for openstreetmaps -->
 112                 <mapset enabled="no">
 113                         <map type="binfile" enabled="yes" data="/media/mmc2/MapsNavit/osm_europe.bin"/>
 114 @@ -1520,7 +1556,7 @@
 115                                         <icon src="unknown.xpm"/>
 116                                 </itemgra>
 117                                 <itemgra item_types="announcement" order="7-">
 118 -                                       <icon src="gui_sound_32_32.png"/>
 119 +                                       <icon src="gui_sound.svg"/>
 120                                         <circle color="#FF089C" radius="10" text_size="7"/>
 121                                 </itemgra>
 122                         </layer>
 123 @@ -1542,7 +1578,7 @@
 124                                         <icon src="mini_roundabout.xpm"/>
 125                                 </itemgra>
 126                                 <itemgra item_types="poi_airport" order="5-">
 127 -                                       <icon src="airport.png"/>
 128 +                                       <icon src="airport.svg"/>
 129                                 </itemgra>
 130                                 <itemgra item_types="town_ghost" order="10-">
 131                                         <icon src="ghost_town.xpm"/>
 132 @@ -1557,13 +1593,13 @@
 133                                         <icon src="car_dealer.xpm"/>
 134                                 </itemgra>
 135                                 <itemgra item_types="poi_fuel" order="12-">
 136 -                                       <icon src="fuel.png"/>
 137 +                                       <icon src="fuel.svg"/>
 138                                 </itemgra>
 139                                 <itemgra item_types="poi_shopping" order="12-">
 140 -                                       <icon src="shopping.png"/>
 141 +                                       <icon src="shopping.svg"/>
 142                                 </itemgra>
 143                                 <itemgra item_types="poi_attraction" order="11-">
 144 -                                       <icon src="attraction.png"/>
 145 +                                       <icon src="attraction.svg"/>
 146                                 </itemgra>
 147                                 <itemgra item_types="poi_cafe" order="12-">
 148                                         <icon src="cafe.xpm"/>
 149 @@ -1575,7 +1611,7 @@
 150                                         <icon src="bridge.xpm"/>
 151                                 </itemgra>
 152                                 <itemgra item_types="highway_exit" order="11-">
 153 -                                       <icon src="exit.png"/>
 154 +                                       <icon src="exit.svg"/>
 155                                 </itemgra>
 156                                 <itemgra item_types="poi_camp_rv" order="12-">
 157                                         <icon src="camping.xpm"/>
 158 @@ -1584,16 +1620,16 @@
 159                                         <icon src="museum.xpm"/>
 160                                 </itemgra>
 161                                 <itemgra item_types="poi_hospital" order="12-">
 162 -                                       <icon src="hospital.png"/>
 163 +                                       <icon src="hospital.svg"/>
 164                                 </itemgra>
 165                                 <itemgra item_types="poi_dining" order="12-">
 166                                         <icon src="dining.xpm"/>
 167                                 </itemgra>
 168                                 <itemgra item_types="poi_fastfood" order="12-">
 169 -                                       <icon src="fastfood.png"/>
 170 +                                       <icon src="fastfood.svg"/>
 171                                 </itemgra>
 172                                 <itemgra item_types="poi_police" order="12-">
 173 -                                       <icon src="police.png"/>
 174 +                                       <icon src="police.svg"/>
 175                                 </itemgra>
 176                                 <itemgra item_types="poi_auto_club" order="12-">
 177                                         <icon src="auto_club.xpm"/>
 178 @@ -1602,7 +1638,7 @@
 179                                         <icon src="car_dealer.xpm"/>
 180                                 </itemgra>
 181                                 <itemgra item_types="poi_bank" order="12-">
 182 -                                       <icon src="bank.png"/>
 183 +                                       <icon src="bank.svg"/>
 184                                 </itemgra>
 185                                 <itemgra item_types="poi_bay" order="12-">
 186                                         <icon src="bay.xpm"/>
 187 @@ -1611,7 +1647,7 @@
 188                                         <icon src="bend.xpm"/>
 189                                 </itemgra>
 190                                 <itemgra item_types="poi_boat_ramp" order="12-">
 191 -                                       <icon src="boat_ramp.png"/>
 192 +                                       <icon src="boat_ramp.svg"/>
 193                                 </itemgra>
 194                                 <itemgra item_types="poi_border_station" order="12-">
 195                                         <icon src="border_station.xpm"/>
 196 @@ -1620,10 +1656,10 @@
 197                                         <icon src="bowling.xpm"/>
 198                                 </itemgra>
 199                                 <itemgra item_types="poi_bus_station" order="11-">
 200 -                                       <icon src="bus.png"/>
 201 +                                       <icon src="bus.svg"/>
 202                                 </itemgra>
 203                                 <itemgra item_types="poi_bus_stop" order="12-">
 204 -                                       <icon src="bus.png"/>
 205 +                                       <icon src="bus.svg"/>
 206                                 </itemgra>
 207                                 <itemgra item_types="poi_business_service" order="12-">
 208                                         <icon src="bussines_service.xpm"/>
 209 @@ -1641,10 +1677,10 @@
 210                                         <icon src="cemetery.xpm"/>
 211                                 </itemgra>
 212                                 <itemgra item_types="poi_church" order="11-">
 213 -                                       <icon src="church.png"/>
 214 +                                       <icon src="church.svg"/>
 215                                 </itemgra>
 216                                 <itemgra item_types="poi_cinema" order="12-">
 217 -                                       <icon src="cinema.png"/>
 218 +                                       <icon src="cinema.svg"/>
 219                                 </itemgra>
 220                                 <itemgra item_types="poi_communication" order="12-">
 221                                         <icon src="communication.xpm"/>
 222 @@ -1662,7 +1698,7 @@
 223                                         <icon src="dam.xpm"/>
 224                                 </itemgra>
 225                                 <itemgra item_types="poi_danger_area" order="12-">
 226 -                                       <icon src="danger_16_16.png"/>
 227 +                                       <icon src="danger.svg" w="16" h="16"/>
 228                                 </itemgra>
 229                                 <itemgra item_types="poi_danger_sea_wreck" order="12-">
 230                                         <icon src="dangerous.xpm"/>
 231 @@ -1683,7 +1719,7 @@
 232                                         <icon src="fair.xpm"/>
 233                                 </itemgra>
 234                                 <itemgra item_types="poi_firebrigade" order="12-">
 235 -                                       <icon src="firebrigade.png"/>
 236 +                                       <icon src="firebrigade.svg"/>
 237                                 </itemgra>
 238                                 <itemgra item_types="poi_fish" order="9-">
 239                                         <icon src="fish.xpm"/>
 240 @@ -1764,7 +1800,7 @@
 241                                         <icon src="oil_field.xpm"/>
 242                                 </itemgra>
 243                                 <itemgra item_types="poi_peak" order="7-">
 244 -                                       <icon src="peak.png"/>
 245 +                                       <icon src="peak.svg"/>
 246                                 </itemgra>
 247                                 <itemgra item_types="poi_personal_service" order="12-">
 248                                         <icon src="personal_service.xpm"/>
 249 @@ -1773,7 +1809,7 @@
 250                                         <icon src="pharmacy.xpm"/>
 251                                 </itemgra>
 252                                 <itemgra item_types="poi_post_office,poi_post_box" order="13-">
 253 -                                       <icon src="post.png"/>
 254 +                                       <icon src="post.svg"/>
 255                                 </itemgra>
 256                                 <itemgra item_types="poi_public_office" order="12-">
 257                                         <icon src="public_office.xpm"/>
 258 @@ -1929,7 +1965,7 @@
 259                                         <icon src="gc_webcam.xpm"/>
 260                                 </itemgra>
 261                                 <itemgra item_types="traffic_signals" order="13-">
 262 -                                       <icon src="traffic_signals.png"/>
 263 +                                       <icon src="traffic_signals.svg"/>
 264                                 </itemgra>
 265                                 <itemgra item_types="poi_wifi" order="13-">
 266                                         <icon src="wifi.xpm"/>
 267 @@ -1978,13 +2014,13 @@
 268                                         <icon src="viewpoint.xpm"/>
 269                                 </itemgra>
 270                                 <itemgra item_types="tec_common" order="11-">
 271 -                                       <icon src="tec_common.png" w="24" h="24"/>
 272 +                                       <icon src="tec_common.svg" w="24" h="24"/>
 273                                 </itemgra>
 274                                 <itemgra item_types="vehicle" order="0-">
 275 -                                       <icon src="gui_vehicle_16_16.png" />
 276 +                                       <icon src="gui_vehicle.svg" h="16" w="16"/>
 277                                 </itemgra>
 278                                 <itemgra item_types="vehicle_pedestrian" order="0-">
 279 -                                       <icon src="gui_vehicle_pedestrian_16_16.png" />
 280 +                                       <icon src="gui_vehicle_pedestrian.svg" h="16" w="16"/>
 281                                 </itemgra>
 282                         </layer>
 283                         <layer name="POI Labels">
 284 @@ -2793,7 +2829,7 @@
 285                                         <polyline color="#3f3f3f" width="1"/>
 286                                 </itemgra>
 287                                 <itemgra item_types="poi_airport" order="5-">
 288 -                                       <icon src="airport.png"/>
 289 +                                       <icon src="airport.svg"/>
 290                                 </itemgra>
 291                                 <itemgra item_types="town_ghost" order="0-">
 292                                         <icon src="ghost_town.xpm"/>
 293 @@ -2808,13 +2844,13 @@
 294                                         <icon src="car_dealer.xpm"/>
 295                                 </itemgra>
 296                                 <itemgra item_types="poi_fuel" order="10-">
 297 -                                       <icon src="fuel.png"/>
 298 +                                       <icon src="fuel.svg"/>
 299                                 </itemgra>
 300                                 <itemgra item_types="poi_shopping" order="10-">
 301 -                                       <icon src="shopping.png"/>
 302 +                                       <icon src="shopping.svg"/>
 303                                 </itemgra>
 304                                 <itemgra item_types="poi_attraction" order="8-">
 305 -                                       <icon src="attraction.png"/>
 306 +                                       <icon src="attraction.svg"/>
 307                                 </itemgra>
 308                                 <itemgra item_types="poi_cafe" order="12-">
 309                                         <icon src="cafe.xpm"/>
 310 @@ -2826,7 +2862,7 @@
 311                                         <icon src="bridge.xpm"/>
 312                                 </itemgra>
 313                                 <itemgra item_types="highway_exit" order="11-">
 314 -                                       <icon src="exit.png"/>
 315 +                                       <icon src="exit.svg"/>
 316                                 </itemgra>
 317                                 <itemgra item_types="poi_camp_rv" order="9-">
 318                                         <icon src="camping.xpm"/>
 319 @@ -2835,11 +2871,11 @@
 320                                         <icon src="museum.xpm"/>
 321                                 </itemgra>
 322                                 <itemgra item_types="poi_hospital" order="12-">
 323 -                                       <icon src="hospital.png"/>
 324 +                                       <icon src="hospital.svg"/>
 325                                 </itemgra>
 326                                 <!-- not really usefull -->
 327                                 <!--
 328 -                               <itemgra item_types="point_unkn" order="0-">
 329 +                               <itemgra item_types="point_unknown" order="0-">
 330                                                 <circle color="#8080ff" radius="3"/>
 331                                 </itemgra>
 332                                 -->
 333 @@ -2847,10 +2883,10 @@
 334                                         <icon src="dining.xpm"/>
 335                                 </itemgra>
 336                                 <itemgra item_types="poi_fastfood" order="12-">
 337 -                                       <icon src="fastfood.png"/>
 338 +                                       <icon src="fastfood.svg"/>
 339                                 </itemgra>
 340                                 <itemgra item_types="poi_police" order="12-">
 341 -                                       <icon src="police.png"/>
 342 +                                       <icon src="police.svg"/>
 343                                 </itemgra>
 344                                 <itemgra item_types="poi_auto_club" order="0-">
 345                                         <icon src="auto_club.xpm"/>
 346 @@ -2859,7 +2895,7 @@
 347                                         <icon src="autoservice.xpm"/>
 348                                 </itemgra>
 349                                 <itemgra item_types="poi_bank" order="12-">
 350 -                                       <icon src="bank.png"/>
 351 +                                       <icon src="bank.svg"/>
 352                                 </itemgra>
 353                                 <itemgra item_types="poi_bay" order="0-">
 354                                         <icon src="bay.xpm"/>
 355 @@ -2868,7 +2904,7 @@
 356                                         <icon src="bend.xpm"/>
 357                                 </itemgra>
 358                                 <itemgra item_types="poi_boat_ramp" order="12-">
 359 -                                       <icon src="boat_ramp.png"/>
 360 +                                       <icon src="boat_ramp.svg"/>
 361                                 </itemgra>
 362                                 <itemgra item_types="poi_border_station" order="0-">
 363                                         <icon src="border_station.xpm"/>
 364 @@ -2877,10 +2913,10 @@
 365                                         <icon src="bowling.xpm"/>
 366                                 </itemgra>
 367                                 <itemgra item_types="poi_bus_station" order="12-">
 368 -                                       <icon src="bus.png"/>
 369 +                                       <icon src="bus.svg"/>
 370                                 </itemgra>
 371                                 <itemgra item_types="poi_bus_stop" order="12-">
 372 -                                       <icon src="bus.png"/>
 373 +                                       <icon src="bus.svg"/>
 374                                 </itemgra>
 375                                 <itemgra item_types="poi_business_service" order="0-">
 376                                         <icon src="bussines_service.xpm"/>
 377 @@ -2898,10 +2934,10 @@
 378                                         <icon src="cemetery.xpm"/>
 379                                 </itemgra>
 380                                 <itemgra item_types="poi_church" order="11-">
 381 -                                       <icon src="church.png"/>
 382 +                                       <icon src="church.svg"/>
 383                                 </itemgra>
 384                                 <itemgra item_types="poi_cinema" order="12-">
 385 -                                       <icon src="cinema.png"/>
 386 +                                       <icon src="cinema.svg"/>
 387                                 </itemgra>
 388                                 <itemgra item_types="poi_communication" order="0-">
 389                                         <icon src="communication.xpm"/>
 390 @@ -2919,7 +2955,7 @@
 391                                         <icon src="dam.xpm"/>
 392                                 </itemgra>
 393                                 <itemgra item_types="poi_danger_area" order="12-">
 394 -                                       <icon src="danger_16_16.png"/>
 395 +                                       <icon src="danger.svg" h="16" w="16"/>
 396                                 </itemgra>
 397                                 <itemgra item_types="poi_danger_sea_wreck" order="0-">
 398                                         <icon src="dangerous.xpm"/>
 399 @@ -2940,7 +2976,7 @@
 400                                         <icon src="fair.xpm"/>
 401                                 </itemgra>
 402                                 <itemgra item_types="poi_firebrigade" order="12-">
 403 -                                       <icon src="firebrigade.png"/>
 404 +                                       <icon src="firebrigade.svg"/>
 405                                 </itemgra>
 406                                 <itemgra item_types="poi_fish" order="0-">
 407                                         <icon src="fish.xpm"/>
 408 @@ -3021,7 +3057,7 @@
 409                                         <icon src="oil_field.xpm"/>
 410                                 </itemgra>
 411                                 <itemgra item_types="poi_peak" order="6-">
 412 -                                       <icon src="peak.png"/>
 413 +                                       <icon src="peak.svg"/>
 414                                 </itemgra>
 415                                 <itemgra item_types="poi_personal_service" order="0-">
 416                                         <icon src="personal_service.xpm"/>
 417 @@ -3030,7 +3066,7 @@
 418                                         <icon src="pharmacy.xpm"/>
 419                                 </itemgra>
 420                                 <itemgra item_types="poi_post_office,poi_post_box" order="13-">
 421 -                                       <icon src="post.png"/>
 422 +                                       <icon src="post.svg"/>
 423                                 </itemgra>
 424                                 <itemgra item_types="poi_public_office" order="0-">
 425                                         <icon src="public_office.xpm"/>
 426 @@ -3189,7 +3225,7 @@
 427                                         <icon src="gc_webcam.xpm"/>
 428                                 </itemgra>
 429                                 <itemgra item_types="traffic_signals" order="13-">
 430 -                                       <icon src="traffic_signals.png"/>
 431 +                                       <icon src="traffic_signals.svg"/>
 432                                 </itemgra>
 433                                 <itemgra item_types="poly_flats,poly_scrub,poly_military_zone,poly_marine,plantation,tundra" order="0-">
 434                                         <polygon color="#041a06"/>
 435 @@ -3243,13 +3279,13 @@
 436                                         <icon src="viewpoint.xpm"/>
 437                                 </itemgra>
 438                                 <itemgra item_types="tec_common" order="11-">
 439 -                                       <icon src="tec_common.png" w="24" h="24"/>
 440 +                                       <icon src="tec_common.svg" w="24" h="24"/>
 441                                 </itemgra>
 442                                 <itemgra item_types="vehicle" order="0-">
 443 -                                       <icon src="gui_vehicle_16_16.png" />
 444 +                                       <icon src="gui_vehicle.svg" h="16" w="16"/>
 445                                 </itemgra>
 446                                 <itemgra item_types="vehicle_pedestrian" order="0-">
 447 -                                       <icon src="gui_vehicle_pedestrian_16_16.png" />
 448 +                                       <icon src="gui_vehicle_pedestrian.svg" h="16" w="16"/>
 449                                 </itemgra>
 450                         </layer>
 451                         <layer name="POI Labels">
 452 @@ -4590,17 +4626,17 @@
 453                                 <!-- !!!!...POIs...!!!! -->
 454                                 <!-- amenity=bank -->
 455                                 <itemgra item_types="poi_bank" order="14-">
 456 -                                       <icon src="bank.png"/>
 457 +                                       <icon src="bank.svg"/>
 458                                         <circle color="#000000" radius="3" text_size="7"/>
 459                                 </itemgra>
 460                                 <!-- amenity=fuel -->
 461                                 <itemgra item_types="poi_fuel" order="14-">
 462 -                                       <icon src="fuel.png"/>
 463 +                                       <icon src="fuel.svg"/>
 464                                         <circle color="#000000" radius="3" text_size="7"/>
 465                                 </itemgra>
 466                                 <!-- amenity=hospitalg -->
 467                                 <itemgra item_types="poi_hospital" order="14-">
 468 -                                       <icon src="hospital.png"/>
 469 +                                       <icon src="hospital.svg"/>
 470                                         <circle color="#000000" radius="3" text_size="7"/>
 471                                 </itemgra>
 472                                 <!-- amenity=parking -->
 473 @@ -4609,7 +4645,7 @@
 474                                 </itemgra>
 475                                 <!-- amenity=police -->
 476                                 <itemgra item_types="poi_police" order="14-">
 477 -                                       <icon src="police.png"/>
 478 +                                       <icon src="police.svg"/>
 479                                         <circle color="#000000" radius="3" text_size="7"/>
 480                                 </itemgra>
 481                                 <!-- amenity=restaurant -->