Merge commit 'origin/upstream-svn' into upstream
authorpini <pini@bou-fi.net>
Sat, 3 Oct 2009 14:18:03 +0000 (16:18 +0200)
committerpini <pini@bou-fi.net>
Sat, 3 Oct 2009 14:18:03 +0000 (16:18 +0200)
20 files changed:
configure.in
navit/attr_def.h
navit/graphics/opengl/graphics_opengl.c
navit/map.c
navit/navigation.c
navit/navit.c
navit/navit_shipped.xml
navit/route.c
navit/startonce.sh
navit/tools/cleanattr.sh
navit/vehicle.h
navit/vehicle/gpsd/vehicle_gpsd.c
navit/vehicle/wince/vehicle_wince.c
navit/xpm/gui_arrow_down.svg
navit/xpm/gui_arrow_left.svg
navit/xpm/gui_arrow_right.svg
navit/xpm/gui_arrow_up.svg
navit/xpm/gui_maps.svg
navit/xpm/gui_town.svg
navit/xpm/gui_vehicle.svg

index e38415f..80745b3 100644 (file)
@@ -300,28 +300,21 @@ AC_MSG_CHECKING(for CreateProcess)
 AC_TRY_LINK([#include <windows.h>], [CreateProcess(NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL);],AC_MSG_RESULT(yes);AC_DEFINE(HAVE_CREATEPROCESS, 1, [Define to 1 if you have the `CreateProcess' function.]) speech_cmdline=yes; speech_cmdline_reason="CreateProcess exists", AC_MSG_RESULT(no))
 
 AC_ARG_ENABLE(graphics-sdl, [  --disable-graphics-sdl             don't create graphics sdl], graphics_sdl=$enableval;graphics_sdl_reason="configure parameter")
+
 if test "x${graphics_sdl}" = "xyes" ; then
-       if test -z "$SDL_CONFIG"; then
-            AC_PATH_PROG([SDL_CONFIG], [sdl-config], [])
-        fi
-fi
-if test "x${graphics_sdl}" = "xyes" ; then
-        AC_MSG_CHECKING([for SDL libraries with $SDL_CONFIG])
-       if test ! -x "$SDL_CONFIG"; then
-           graphics_sdl = "no"
-           graphics_sdl_reason = "sdl-config not available"
-            AC_MSG_RESULT([no])
-       else
-           SDL_CFLAGS="`$SDL_CONFIG --cflags`"
-           SDL_LIBS="`$SDL_CONFIG --libs`"
-           AC_SUBST(SDL_CFLAGS)
-           AC_SUBST(SDL_LIBS)
-            AC_MSG_RESULT([yes])
-               fi 
+        PKG_CHECK_MODULES(SDL, 
+                          [sdl], 
+                          [graphics_sdl="yes"
+                           graphics_sdl_reason="sdl present"] , 
+                          [graphics_sdl="no"
+                           graphics_sdl_reason="sdl not available"]
+                         )
+        AC_SUBST(SDL_CFLAGS)
+        AC_SUBST(SDL_LIBS)
 fi
 if test "x${graphics_sdl}" = "xyes" ; then
        save_CPPFLAGS=$CPPFLAGS
-       CPPFLAGS="$($SDL_CONFIG --cflags) $CPPFLAGS"
+       CPPFLAGS="$SDL_CFLAGS $CPPFLAGS"
        AC_CHECK_HEADER(SDL_image.h,SDL_IMAGE_LIBS=-lSDL_image,graphics_sdl="no";graphics_sdl_reason="SDL_image.h missing")
        AC_SUBST(SDL_IMAGE_LIBS)
        CPPFLAGS=$save_CPPFLAGS
@@ -735,6 +728,7 @@ fi
 AC_SUBST(SPEECHD_CFLAGS)
 AC_SUBST(SPEECHD_LIBS)
 AM_CONDITIONAL(SPEECH_SPEECH_DISPATCHER, test "x${speech_speech_dispatcher}" = "xyes")
+AM_CONDITIONAL(SUPPORT_ESPEAK, test "x${support_espeak}" = "xyes")
 
 ## vehicle
 # android
index 5826e9d..61ec3ce 100644 (file)
@@ -159,7 +159,7 @@ ATTR(direction)
 ATTR(route_follow_straight_REMOVE) // This is to be removed with the next version
 ATTR(gui_speech)
 ATTR(town_id) /* fixme? */
-ATTR(street_id) /* fixme? */  
+ATTR(street_id) /* fixme? */
 ATTR(district_id) /* fixme? */
 ATTR(drag_bitmap)
 ATTR(use_mousewheel)
@@ -171,6 +171,7 @@ ATTR(autozoom_active)
 ATTR(position_valid)
 ATTR(frame)
 ATTR(tell_street_name)
+ATTR(bluetooth)
 ATTR2(0x0002ffff,type_int_end)
 ATTR2(0x00030000,type_string_begin)
 ATTR(type)
index a716303..8ca6fa8 100644 (file)
@@ -300,39 +300,42 @@ draw_lines(struct graphics_priv *gr, struct graphics_gc_priv *gc, struct point *
 
 const char* getPrimitiveType(GLenum type)
 {
+    char *ret;
+
     switch(type)
     {
     case 0x0000:
-        return "GL_POINTS"; 
+        ret="GL_POINTS"; 
         break;
     case 0x0001:
-        return "GL_LINES";
+        ret="GL_LINES";
         break;
     case 0x0002:
-        return "GL_LINE_LOOP";
+        ret= "GL_LINE_LOOP";
         break;
     case 0x0003:
-        return "GL_LINE_STRIP";
+        ret="GL_LINE_STRIP";
         break;
     case 0x0004:
-        return "GL_TRIANGLES";
+        ret="GL_TRIANGLES";
         break;
     case 0x0005:
-        return "GL_TRIANGLE_STRIP";
+        ret="GL_TRIANGLE_STRIP";
         break;
     case 0x0006:
-        return "GL_TRIANGLE_FAN";
+        ret="GL_TRIANGLE_FAN";
         break;
     case 0x0007:
-        return "GL_QUADS";
+        ret="GL_QUADS";
         break;
     case 0x0008:
-        return "GL_QUAD_STRIP";
+        ret="GL_QUAD_STRIP";
         break;
     case 0x0009:
-        return "GL_POLYGON";
+        ret="GL_POLYGON";
         break;
     }
+return ret;
 }
 
 void CALLBACK tessBeginCB(GLenum which)
index 404090d..ea6aace 100644 (file)
@@ -373,7 +373,7 @@ struct map_search {
  * have a look into country.c for details. Because of that every map plugin has to accept a country item
  * to be passed as "superior item".
  * 
- * Note: If you change something here, please make shure to also update the documentation of mapset_search_new()
+ * Note: If you change something here, please make sure to also update the documentation of mapset_search_new()
  * in mapset.c!
  *
  * @param m The map that should be searched
index 51f83e8..03afd5a 100644 (file)
@@ -242,7 +242,7 @@ static char
 {
        switch (n) {
        case 0:
-               return _("zeroth"); // Not shure if this exists, neither if it will ever be needed
+               return _("zeroth"); // Not sure if this exists, neither if it will ever be needed
        case 1:
                return _("first");
        case 2:
@@ -265,7 +265,7 @@ static char
 {
        switch (n) {
        case 0:
-               return _("zeroth exit"); // Not shure if this exists, neither if it will ever be needed
+               return _("zeroth exit"); // Not sure if this exists, neither if it will ever be needed
        case 1:
                return _("first exit");
        case 2:
index 7bf53a8..e6038b0 100644 (file)
@@ -50,7 +50,6 @@
 #include "speech.h"
 #include "track.h"
 #include "vehicle.h"
-#include "color.h"
 #include "layout.h"
 #include "log.h"
 #include "attr.h"
@@ -78,9 +77,6 @@ struct navit_vehicle {
        int dir;
        int speed;
        struct coord last; /*< Position of the last update of this vehicle */
-       struct color c;
-       struct color *c2;
-       struct cursor *cursor;
        struct vehicle *vehicle;
        struct attr callback;
        int animate_cursor;
@@ -530,7 +526,7 @@ navit_autozoom(struct navit *this_, struct coord *center, int speed, int draw)
        transform(this_->trans, transform_get_projection(this_->trans), center, &pc, 1, 0, 0, NULL);
        scale = transform_get_scale(this_->trans);
 
-       /* We make shure that the point we want to see is within a certain range
+       /* We make sure that the point we want to see is within a certain range
         * around the vehicle. The radius of this circle is the size of the
         * screen. This doesn't necessarily mean the point is visible because of
         * perspective etc. Quite rough, but should be enough. */
@@ -2166,7 +2162,7 @@ static int
 navit_add_vehicle(struct navit *this_, struct vehicle *v)
 {
        struct navit_vehicle *nv=g_new0(struct navit_vehicle, 1);
-       struct attr follow,color,active, color2, animate;
+       struct attr follow, active, animate;
        nv->vehicle=v;
        nv->follow=0;
        nv->last.x = 0;
@@ -2174,12 +2170,6 @@ navit_add_vehicle(struct navit *this_, struct vehicle *v)
        nv->animate_cursor=0;
        if ((vehicle_get_attr(v, attr_follow, &follow, NULL)))
                nv->follow=nv->follow=follow.u.num;
-       if ((vehicle_get_attr(v, attr_color, &color, NULL)))
-               nv->c=*(color.u.color);
-       if ((vehicle_get_attr(v, attr_color2, &color2, NULL)))
-               nv->c2=color2.u.color;
-       else
-               nv->c2=NULL;
        nv->follow_curr=nv->follow;
        this_->vehicles=g_list_append(this_->vehicles, nv);
        if ((vehicle_get_attr(v, attr_active, &active, NULL)) && active.u.num)
index 43764ae..5cc32c1 100644 (file)
@@ -57,7 +57,7 @@
         <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" color="#0000ff">
+        <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">
index c8bd8a1..d4f0d14 100644 (file)
@@ -1152,7 +1152,7 @@ route_graph_add_segment(struct route_graph *this, struct route_graph_point *star
  * returned to all the coordinates of the item between the two coordinates
  * start end end.
  *
- * @important Make shure that whatever c points to has enough memory allocated
+ * @important Make sure that whatever c points to has enough memory allocated
  * @important to hold max coordinates!
  *
  * @param i The item to get the coordinates of
@@ -1903,7 +1903,7 @@ route_get_coord_dist(struct route *this_, int dist)
  * @brief Creates a new route path
  * 
  * This creates a new non-trivial route. It therefore needs the routing information created by route_graph_flood, so
- * make shure to run route_graph_flood() after changing the destination before using this function.
+ * make sure to run route_graph_flood() after changing the destination before using this function.
  *
  * @param this The route graph to create the route from
  * @param oldpath (Optional) old path which may contain parts of the new part - this speeds things up a bit. May be NULL.
index 4053a11..d0bfafd 100755 (executable)
@@ -1,12 +1,12 @@
 #!/bin/sh
 
 # This script is part of navit, a navigation system.
-# It can be used to make shure that navit is only started
+# It can be used to make sure that navit is only started
 # once. If navit is already running it will be brought to
 # the front.
 
 # Set this to a place where a pidfile should be stored.
-# Make shure you have write access...
+# Make sure you have write access...
 PIDFILE="/var/run/navit/navit.pid"
 
 # Set this to navit's executable.
@@ -78,4 +78,4 @@ check_wmctrl
 
 check_navit
 
-start_navit
\ No newline at end of file
+start_navit
index dc2f0dc..22e561f 100755 (executable)
@@ -16,14 +16,14 @@ TMPFILE2=$TMPDIR/navit-cleanattr.tmp2
 
 if [ -f $TMPFILE ] ; then
                echo "Temporary file $TMPFILE already exists."
-               echo "Please don't run this tool twice at the same time. If you are shure that no other instance of this tool is running, remove the file."
+               echo "Please don't run this tool twice at the same time. If you are sure that no other instance of this tool is running, remove the file."
                exit 1;
 fi
 
 touch $TMPFILE
 if [ $? -ne 0 ] ; then
                echo "Could not write to temporary file $TEMPFILE."
-               echo "Please make shure you have write access to the temporary directory."
+               echo "Please make sure you have write access to the temporary directory."
                exit 1;
 fi
 
index 455e2d6..d4aaecf 100644 (file)
@@ -27,6 +27,7 @@ struct vehicle;
 struct vehicle_priv;
 enum attr_type;
 struct attr;
+struct attr_iter;
 
 struct vehicle_methods {
        void (*destroy)(struct vehicle_priv *priv);
@@ -37,11 +38,13 @@ struct vehicle_methods {
 
 /* prototypes */
 struct vehicle *vehicle_new(struct attr *parent, struct attr **attrs);
+struct attr_iter *vehicle_attr_iter_new(void); 
 int vehicle_get_attr(struct vehicle *this_, enum attr_type type, struct attr *attr, struct attr_iter *iter);
 int vehicle_set_attr(struct vehicle *this_, struct attr *attr, struct attr **attrs);
 int vehicle_add_attr(struct vehicle *this_, struct attr *attr);
 int vehicle_remove_attr(struct vehicle *this_, struct attr *attr);
 void vehicle_destroy(struct vehicle *this_);
+void vehicle_attr_iter_destroy(struct attr_iter *iter); 
 /* end of prototypes */
 #ifdef __cplusplus
 }
index ca6e8c3..4bba75f 100644 (file)
@@ -167,11 +167,13 @@ vehicle_gpsd_try_open(gpointer *data)
        struct vehicle_priv *priv = (struct vehicle_priv *)data;
        char *source = g_strdup(priv->source);
        char *colon = index(source + 7, ':');
+       char *port=NULL;
        if (colon) {
                *colon = '\0';
-               priv->gps = gps_open(source + 7, colon + 1);
-       } else
-               priv->gps = gps_open(source + 7, NULL);
+               port=colon+1;
+       }
+       dbg(0,"Trying to connect to %s:%s\n",source+7,port?port:"default");
+       priv->gps = gps_open(source + 7, port);
        g_free(source);
 
        if (!priv->gps){
index 1df2c42..986a7d0 100644 (file)
 #include <io.h>
 #include <winioctl.h>
 #include <winbase.h>
+#include <wchar.h>
 #include "support/win32/ConvertUTF.h"
 
 #define SwitchToThread() Sleep(0)
 
+typedef int (WINAPI *PFN_BthSetMode)(DWORD pBthMode);
+typedef int (WINAPI *PFN_BthGetMode)(DWORD* pBthMode);
+
+char *_convert = NULL;
+wchar_t *_wconvert = NULL;
+#define W2A(lpw) (\
+    ((LPCSTR)lpw == NULL) ? NULL : (\
+          _convert = alloca(wcslen(lpw)+1),  wcstombs(_convert, lpw, wcslen(lpw) + 1), _convert) )
+
+#define A2W(lpa) (\
+    ((LPCSTR)lpa == NULL) ? NULL : (\
+          _wconvert = alloca(strlen(lpa)*2+1),  mbstowcs(_wconvert, lpa, strlen(lpa) * 2 + 1), _wconvert) )
+
 static void vehicle_wince_disable_watch(struct vehicle_priv *priv);
 static void vehicle_wince_enable_watch(struct vehicle_priv *priv);
 static int vehicle_wince_parse(struct vehicle_priv *priv, char *buffer);
 static int vehicle_wince_open(struct vehicle_priv *priv);
 static void vehicle_wince_close(struct vehicle_priv *priv);
 
-static int buffer_size = 256;
+static const int buffer_size = 256;
 
 struct vehicle_priv {
        char *source;
@@ -59,13 +73,8 @@ struct vehicle_priv {
        HANDLE                  m_hGPSDevice;           // Handle to the device
        HANDLE                  m_hGPSThread;           // Handle to the thread
        DWORD                   m_dwGPSThread;          // Thread id
-       HANDLE                  m_hEventPosition;       // Handle to the position event
-       HANDLE                  m_hEventState;          // Handle to the state event
-       HANDLE                  m_hEventStop;           // Handle to the stop event
-       DWORD                   m_dwError;                      // Last error code
 
        char *buffer;
-       int buffer_pos;
        char *nmea_data;
        char *nmea_data_buf;
 
@@ -84,13 +93,53 @@ struct vehicle_priv {
        int sats_visible;
        int time;
        int on_eof;
-       int no_data_count;
        int baudrate;
        struct attr ** attrs;
        char fixiso8601[128];
        int checksum_ignore;
+       HMODULE hBthDll;
+       PFN_BthSetMode BthSetMode;
 };
 
+static void initBth(struct vehicle_priv *priv)
+{
+
+       BOOL succeeded = FALSE;
+       priv->hBthDll = LoadLibrary(TEXT("bthutil.dll"));
+       if ( priv->hBthDll )
+       {
+               DWORD bthMode;
+               PFN_BthGetMode BthGetMode  = (PFN_BthGetMode)GetProcAddress(priv->hBthDll, TEXT("BthGetMode") );
+
+               if ( BthGetMode && BthGetMode(&bthMode) == ERROR_SUCCESS && bthMode == 0 )
+               {
+                       priv->BthSetMode  = (PFN_BthSetMode)GetProcAddress(priv->hBthDll, TEXT("BthSetMode") );
+                       if( priv->BthSetMode &&  priv->BthSetMode(1) == ERROR_SUCCESS )
+                       {
+                               dbg(1, "bluetooth activated\n");
+                               succeeded = TRUE;
+                       }
+               }
+
+       }
+       else
+       {
+               dbg(0, "Bluetooth library notfound\n");
+       }
+
+       if ( !succeeded )
+       {
+
+               dbg(1, "Bluetooth already enabled or failed to enable it.\n");
+               priv->BthSetMode = NULL;
+               if ( priv->hBthDll )
+               {
+                       FreeLibrary(priv->hBthDll);
+               }
+       }
+}
+
+
 static DWORD WINAPI wince_port_reader_thread (LPVOID lParam)
 {
        struct vehicle_priv *pvt = lParam;
@@ -105,8 +154,6 @@ static DWORD WINAPI wince_port_reader_thread (LPVOID lParam)
        int havedata;
        HANDLE hGPS;
        // Com ports above 9 should be prefixed - $device/COM123
-       wchar_t portname[64];
-       mbstowcs(portname, pvt->source, strlen(pvt->source)+1);
        dbg(0, "GPS Port:[%s]\n", pvt->source);
        pvt->thread_up = 1;
 reconnect_port:
@@ -125,7 +172,7 @@ reconnect_port:
        }
 
        while (pvt->is_running &&
-               (pvt->m_hGPSDevice = CreateFile(portname,
+               (pvt->m_hGPSDevice = CreateFile(A2W(pvt->source),
                        GENERIC_READ, 0,
                        NULL, OPEN_EXISTING, 0, 0)) == INVALID_HANDLE_VALUE) {
                Sleep(1000);
@@ -204,8 +251,6 @@ reconnect_port:
                                // the ui thread
                                event_call_callback(pvt->cbl);
                        }
-               } else {
-                       pvt->no_data_count++;
                }
        }
        CloseHandle(pvt->m_hGPSDevice);
@@ -214,6 +259,44 @@ reconnect_port:
        return 0;
 }
 
+static int
+vehicle_wince_available_ports(void)
+{
+       DWORD regkey_length = 20;
+       DWORD regdevtype_length = 100;
+       HKEY hkResult;
+       HKEY hkSubResult;
+       wchar_t keyname[regkey_length];
+       wchar_t devicename[regkey_length];
+       wchar_t devicetype[regdevtype_length];
+       int index = 0;
+
+       RegOpenKeyEx( HKEY_LOCAL_MACHINE, TEXT("Drivers\\Active"), 0, 0, &hkResult);
+       while (RegEnumKeyEx( hkResult, index++, keyname, &regkey_length, NULL, NULL, NULL, NULL) == ERROR_SUCCESS )
+       {
+               if (RegOpenKeyEx( hkResult, keyname, 0, 0, &hkSubResult) == ERROR_SUCCESS )
+               {
+                       regkey_length = 20;
+                       if ( RegQueryValueEx( hkSubResult,  L"Name", NULL, NULL, devicename, &regkey_length) == ERROR_SUCCESS )
+                       {
+                               if ( RegQueryValueEx( hkSubResult, L"Key", NULL, NULL, devicetype, &regdevtype_length) == ERROR_SUCCESS )
+                               {
+                                       dbg(0, "Found device '%s' (%s)\n", W2A(devicename), W2A(devicetype));
+                               }
+                               else
+                               {
+                                       dbg(0, "Found device '%s'\n", W2A(devicename));
+                               }
+                       }
+                       RegCloseKey(hkSubResult);
+               }
+               regkey_length = 20;
+       }
+
+       RegCloseKey(hkResult);
+       return 0;
+}
+
 
 static int
 vehicle_wince_open(struct vehicle_priv *priv)
@@ -221,6 +304,13 @@ vehicle_wince_open(struct vehicle_priv *priv)
        dbg(1, "enter vehicle_wince_open, priv->source='%s'\n", priv->source);
 
        if (priv->source ) {
+
+               if ( strcmp(priv->source, "list") == 0 )
+               {
+                       vehicle_wince_available_ports();
+                       return 0;
+               }
+
                char* raw_setting_str = g_strdup( priv->source );
                char* strport = strchr(raw_setting_str, ':' );
                char* strsettings = strchr(raw_setting_str, ' ' );
@@ -242,6 +332,11 @@ static void
 vehicle_wince_close(struct vehicle_priv *priv)
 {
        vehicle_wince_disable_watch(priv);
+       if (priv->BthSetMode)
+       {
+               (void)priv->BthSetMode(0);
+               FreeLibrary(priv->hBthDll);
+       }
 }
 
 static int
@@ -469,9 +564,6 @@ vehicle_wince_disable_watch(struct vehicle_priv *priv)
 {
        int wait = 5000;
        priv->is_running = 0;
-//     DWORD res;
-//     res = WaitForSingleObject(priv->m_hGPSThread, 2000);
-//
        while (wait-- > 0 && priv->thread_up) {
                SwitchToThread();
        }
@@ -573,6 +665,7 @@ vehicle_wince_new(struct vehicle_methods
        struct attr *on_eof;
        struct attr *baudrate;
        struct attr *checksum_ignore;
+       struct attr *handle_bluetooth;
        char *cp;
 
        dbg(1, "enter\n");
@@ -589,7 +682,7 @@ vehicle_wince_new(struct vehicle_methods
        ret->buffer = g_malloc(buffer_size);
        ret->time=1000;
        ret->baudrate=0;        // do not change the rate if not configured
-       // ret->fixtime = 0.0f;
+
        time = attr_search(attrs, NULL, attr_time);
        if (time)
                ret->time=time->u.num;
@@ -607,12 +700,17 @@ vehicle_wince_new(struct vehicle_methods
        if (on_eof && !strcasecmp(on_eof->u.str, "exit"))
                ret->on_eof=2;
        dbg(0,"on_eof=%d\n", ret->on_eof);
+
+
+       handle_bluetooth = attr_search(attrs, NULL, attr_bluetooth);
+       if ( handle_bluetooth && handle_bluetooth->u.num == 1 )
+               initBth(ret);
+
        *meth = vehicle_wince_methods;
        if (vehicle_wince_open(ret)) {
                vehicle_wince_enable_watch(ret);
                return ret;
        }
-       ret->no_data_count = 0;
        dbg(0, "Failed to open '%s'\n", ret->source);
        vehicle_wince_destroy(ret);
        return NULL;
index b748705..cd44ad4 100644 (file)
@@ -8,14 +8,15 @@
    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"
-   width="64px"
-   height="64px"
+   width="48"
+   height="48"
    id="svg2175"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    sodipodi:docbase="/home/martin/map/sf/navit-test/navit/xpm"
    sodipodi:docname="gui_arrow_down.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0">
   <defs
      id="defs2177" />
   <sodipodi:namedview
@@ -25,9 +26,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="9.5760562"
+     inkscape:zoom="4.7880281"
      inkscape:cx="32"
-     inkscape:cy="32"
+     inkscape:cy="65.416679"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
@@ -45,7 +46,9 @@
      inkscape:window-width="1280"
      inkscape:window-height="954"
      inkscape:window-x="0"
-     inkscape:window-y="0" />
+     inkscape:window-y="0"
+     width="48px"
+     height="48px" />
   <metadata
      id="metadata2180">
     <rdf:RDF>
@@ -62,8 +65,8 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       style="fill:#c0c0c0;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 60.541944,1.500495 L 32.063785,32.499997 L 3.4580555,1.5 L 60.541944,1.500495 z "
+       style="fill:#c0c0c0;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 45.406458,1.1253713 L 24.047839,24.374997 L 2.593542,1.125 L 45.406458,1.1253713 z "
        id="path2185"
        sodipodi:nodetypes="cccc" />
   </g>
index 4060c6f..783758a 100644 (file)
@@ -8,14 +8,15 @@
    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"
-   width="64px"
-   height="64px"
+   width="48"
+   height="48"
    id="svg2175"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
-   sodipodi:docbase="/tmp"
+   sodipodi:docbase="/home/martin/map/sf/navit-test/navit/xpm"
    sodipodi:docname="gui_arrow_left.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0">
   <defs
      id="defs2177" />
   <sodipodi:namedview
@@ -45,7 +46,9 @@
      inkscape:window-width="1280"
      inkscape:window-height="954"
      inkscape:window-x="0"
-     inkscape:window-y="0" />
+     inkscape:window-y="0"
+     width="48px"
+     height="48px" />
   <metadata
      id="metadata2180">
     <rdf:RDF>
@@ -62,8 +65,8 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       style="fill:#c0c0c0;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 61.499502,3.4161112 L 30.5,31.89427 L 61.499997,60.5 L 61.499502,3.4161112 z "
+       style="fill:#c0c0c0;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 46.874629,2.5935415 L 23.625003,23.95216 L 46.875,45.406458 L 46.874629,2.5935415 z "
        id="path2185"
        sodipodi:nodetypes="cccc" />
   </g>
index d7e0d96..94f11d9 100644 (file)
@@ -8,14 +8,15 @@
    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"
-   width="64px"
-   height="64px"
+   width="48"
+   height="48"
    id="svg2175"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
-   sodipodi:docbase="/tmp"
+   sodipodi:docbase="/home/martin/map/sf/navit-test/navit/xpm"
    sodipodi:docname="gui_arrow_right.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0">
   <defs
      id="defs2177" />
   <sodipodi:namedview
@@ -45,7 +46,9 @@
      inkscape:window-width="1280"
      inkscape:window-height="954"
      inkscape:window-x="0"
-     inkscape:window-y="0" />
+     inkscape:window-y="0"
+     width="48px"
+     height="48px" />
   <metadata
      id="metadata2180">
     <rdf:RDF>
@@ -62,8 +65,8 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       style="fill:#c0c0c0;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-       d="M 2.000498,3.5218412 L 33,32 L 2.0000035,60.60573 L 2.000498,3.5218412 z "
+       style="fill:#c0c0c0;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 1.12537,2.5935415 L 24.374996,23.95216 L 1.125,45.406458 L 1.12537,2.5935415 z "
        id="path2185"
        sodipodi:nodetypes="cccc" />
   </g>
index 7ce21b3..f64166e 100644 (file)
@@ -8,14 +8,15 @@
    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"
-   width="64px"
-   height="64px"
+   width="48"
+   height="48"
    id="svg2175"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    sodipodi:docbase="/home/martin/map/sf/navit-test/navit/xpm"
    sodipodi:docname="gui_arrow_up.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0">
   <defs
      id="defs2177" />
   <sodipodi:namedview
@@ -45,7 +46,9 @@
      inkscape:window-width="1280"
      inkscape:window-height="954"
      inkscape:window-x="0"
-     inkscape:window-y="0" />
+     inkscape:window-y="0"
+     width="48px"
+     height="48px" />
   <metadata
      id="metadata2180">
     <rdf:RDF>
@@ -62,8 +65,8 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       style="fill:#c0c0c0;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 60.541944,62.499505 L 32.063785,31.500003 L 3.4580555,62.5 L 60.541944,62.499505 z "
+       style="fill:#c0c0c0;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 45.406458,46.874629 L 24.047839,23.625003 L 2.593542,46.875 L 45.406458,46.874629 z "
        id="path2185"
        sodipodi:nodetypes="cccc" />
   </g>
index 92f15f9..3a9ff3e 100644 (file)
 <?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:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" id="svg2488" sodipodi:version="0.32" inkscape:version="0.46" width="128" height="128" version="1.0" sodipodi:docname="Map_icon.svg" inkscape:export-xdpi="180" inkscape:export-ydpi="180" inkscape:output_extension="org.inkscape.output.svg.inkscape" inkscape:export-filename="D:\tmp\Map_icon.png">
-  <metadata id="metadata2493">
+<svg
+   xmlns:ns="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2488"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   width="48"
+   height="48"
+   version="1.0"
+   sodipodi:docname="gui_maps.svg"
+   inkscape:export-xdpi="180"
+   inkscape:export-ydpi="180"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="D:\tmp\Map_icon.png"
+   sodipodi:docbase="/home/martin/map/sf/navit-test/navit/xpm">
+  <metadata
+     id="metadata2493">
     <rdf:RDF>
-      <cc:Work rdf:about="">
+      <ns:Work
+         rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:title>Map</dc:title>
         <dc:subject>
           <rdf:Bag>
             <rdf:li>Map</rdf:li>
           </rdf:Bag>
         </dc:subject>
-        <cc:license rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/"/>
+        <ns:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
+      </ns:Work>
+      <ns:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
+        <ns:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <ns:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <ns:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <ns:requires
+           rdf:resource="http://web.resource.org/cc/Attribution" />
+        <ns:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <ns:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+      </ns:License>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
       </cc:Work>
-      <cc:License rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits rdf:resource="http://web.resource.org/cc/Reproduction"/>
-        <cc:permits rdf:resource="http://web.resource.org/cc/Distribution"/>
-        <cc:requires rdf:resource="http://web.resource.org/cc/Notice"/>
-        <cc:requires rdf:resource="http://web.resource.org/cc/Attribution"/>
-        <cc:permits rdf:resource="http://web.resource.org/cc/DerivativeWorks"/>
-        <cc:requires rdf:resource="http://web.resource.org/cc/ShareAlike"/>
-      </cc:License>
     </rdf:RDF>
   </metadata>
-  <defs id="defs2491">
-    <linearGradient id="linearGradient3801">
-      <stop style="stop-color: rgb(0, 130, 0); stop-opacity: 1;" offset="0" id="stop3803"/>
-      <stop style="stop-color: rgb(0, 130, 0); stop-opacity: 0;" offset="1" id="stop3805"/>
-    </linearGradient>
-    <linearGradient id="linearGradient3793">
-      <stop style="stop-color: rgb(0, 130, 0); stop-opacity: 1;" offset="0" id="stop3795"/>
-      <stop style="stop-color: rgb(0, 130, 0); stop-opacity: 0;" offset="1" id="stop3797"/>
-    </linearGradient>
-    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 24 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="48 : 24 : 1" inkscape:persp3d-origin="24 : 16 : 1" id="perspective45"/>
-    <linearGradient id="linearGradient4198">
-      <stop style="stop-color: rgb(255, 255, 255); stop-opacity: 1;" offset="0" id="stop4200"/>
-      <stop style="stop-color: rgb(255, 255, 255); stop-opacity: 0.57265;" offset="1" id="stop4202"/>
-    </linearGradient>
-    <linearGradient id="linearGradient4181">
-      <stop style="stop-color: rgb(204, 0, 0); stop-opacity: 1;" offset="0" id="stop4183"/>
-      <stop style="stop-color: rgb(247, 15, 15); stop-opacity: 1;" offset="1" id="stop4185"/>
-    </linearGradient>
-    <linearGradient id="linearGradient5048">
-      <stop style="stop-color: black; stop-opacity: 0;" offset="0" id="stop5050"/>
-      <stop id="stop5056" offset="0.5" style="stop-color: black; stop-opacity: 1;"/>
-      <stop style="stop-color: black; stop-opacity: 0;" offset="1" id="stop5052"/>
-    </linearGradient>
-    <linearGradient id="linearGradient3289">
-      <stop style="stop-color: rgb(255, 255, 142); stop-opacity: 1;" offset="0" id="stop3291"/>
-      <stop style="stop-color: rgb(255, 255, 255); stop-opacity: 0.533898;" offset="1" id="stop3293"/>
-    </linearGradient>
-    <linearGradient id="linearGradient7336">
-      <stop id="stop7338" offset="0" style="stop-color: rgb(236, 192, 92); stop-opacity: 1;"/>
-      <stop style="stop-color: rgb(215, 183, 86); stop-opacity: 1;" offset="0.19283746" id="stop7340"/>
-      <stop id="stop4206" offset="0.63636363" style="stop-color: rgb(226, 203, 144); stop-opacity: 1;"/>
-      <stop id="stop7342" offset="1" style="stop-color: rgb(242, 235, 160); stop-opacity: 1;"/>
-    </linearGradient>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4181" id="linearGradient4187" x1="30.229904" y1="33.538868" x2="16.130783" y2="13.761145" gradientUnits="userSpaceOnUse"/>
-    <linearGradient id="aigrd1" gradientUnits="userSpaceOnUse" x1="12.4873" y1="3.7319" x2="31.081301" y2="36.032799">
-      <stop offset="0" style="stop-color: rgb(210, 210, 210); stroke-dasharray: none; stroke-miterlimit: 4; stroke-width: 1.21667;" id="stop16177"/>
-      <stop offset="1" style="stop-color: rgb(237, 237, 237); stroke-dasharray: none; stroke-miterlimit: 4; stroke-width: 1.21667;" id="stop16179"/>
-    </linearGradient>
-    <linearGradient id="linearGradient3300">
-      <stop id="stop3557" offset="0" style="stop-color: rgb(242, 242, 242); stop-opacity: 1;"/>
-      <stop id="stop3559" offset="1" style="stop-color: rgb(208, 208, 208); stop-opacity: 1;"/>
-    </linearGradient>
-    <linearGradient id="linearGradient3563">
-      <stop id="stop3565" offset="0" style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"/>
-      <stop id="stop3567" offset="1" style="stop-color: rgb(147, 147, 147); stop-opacity: 1;"/>
-    </linearGradient>
-    <inkscape:perspective id="perspective3294" inkscape:persp3d-origin="24 : 16 : 1" inkscape:vp_z="48 : 24 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 24 : 1" sodipodi:type="inkscape:persp3d"/>
-    <linearGradient gradientTransform="matrix(0.354101, 0, 0, 0.354101, 1.63868, -0.0836492)" y2="35.569" x2="64.387703" y1="65.124001" x1="64.387703" gradientUnits="userSpaceOnUse" id="XMLID_39_">
-      <stop id="stop336" style="stop-color: rgb(255, 255, 255);" offset="0"/>
-      <stop id="stop338" style="stop-color: rgb(255, 98, 0);" offset="0.8539"/>
-      <stop id="stop340" style="stop-color: rgb(242, 93, 0);" offset="1"/>
-      <midPointStop id="midPointStop335" style="stop-color:#FFFFFF" offset="0"/>
-      <midPointStop id="midPointStop337" style="stop-color:#FFFFFF" offset="0.5"/>
-      <midPointStop id="midPointStop339" style="stop-color:#FF6200" offset="0.8539"/>
-      <midPointStop id="midPointStop341" style="stop-color:#FF6200" offset="0.5"/>
-      <midPointStop id="midPointStop343" style="stop-color:#F25D00" offset="1"/>
-    </linearGradient>
-    <linearGradient gradientTransform="matrix(0.314683, 0, 0, 0.314683, 4.12826, 3.74287)" y2="59.7995" x2="48.046001" y1="117.5205" x1="80.223602" gradientUnits="userSpaceOnUse" id="XMLID_2_">
-      <stop id="stop17" style="stop-color: rgb(204, 204, 204);" offset="0"/>
-      <stop id="stop19" style="stop-color: rgb(255, 255, 255);" offset="0.9831"/>
-      <midPointStop id="midPointStop48" style="stop-color:#CCCCCC" offset="0"/>
-      <midPointStop id="midPointStop50" style="stop-color:#CCCCCC" offset="0.5"/>
-      <midPointStop id="midPointStop52" style="stop-color:#FFFFFF" offset="0.9831"/>
-    </linearGradient>
-    <linearGradient id="linearGradient2299" inkscape:collect="always">
-      <stop id="stop2301" offset="0" style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"/>
-      <stop id="stop2303" offset="1" style="stop-color: rgb(255, 255, 255); stop-opacity: 0;"/>
-    </linearGradient>
-    <linearGradient id="linearGradient2307">
-      <stop id="stop2309" offset="0" style="stop-color: rgb(237, 212, 0); stop-opacity: 1;"/>
-      <stop id="stop2311" offset="1" style="stop-color: rgb(153, 136, 0); stop-opacity: 1;"/>
-    </linearGradient>
-    <linearGradient id="linearGradient2329">
-      <stop id="stop2331" offset="0" style="stop-color: rgb(0, 0, 0); stop-opacity: 0.185567;"/>
-      <stop id="stop2333" offset="1" style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"/>
-    </linearGradient>
-    <linearGradient id="linearGradient2341">
-      <stop style="stop-color: rgb(0, 0, 0); stop-opacity: 1;" offset="0" id="stop2343"/>
-      <stop style="stop-color: rgb(0, 0, 0); stop-opacity: 0;" offset="1" id="stop2345"/>
-    </linearGradient>
-    <linearGradient id="linearGradient2378" inkscape:collect="always">
-      <stop id="stop2380" offset="0" style="stop-color: rgb(87, 87, 87); stop-opacity: 1;"/>
-      <stop id="stop2382" offset="1" style="stop-color: rgb(87, 87, 87); stop-opacity: 0;"/>
-    </linearGradient>
-    <linearGradient id="linearGradient2406">
-      <stop id="stop2408" offset="0" style="stop-color: rgb(124, 126, 121); stop-opacity: 1;"/>
-      <stop style="stop-color: rgb(132, 134, 129); stop-opacity: 1;" offset="0.1724138" id="stop2414"/>
-      <stop id="stop2410" offset="1" style="stop-color: rgb(137, 140, 134); stop-opacity: 1;"/>
-    </linearGradient>
-    <inkscape:perspective id="perspective3625" inkscape:persp3d-origin="24 : 16 : 1" inkscape:vp_z="48 : 24 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 24 : 1" sodipodi:type="inkscape:persp3d"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3289" id="linearGradient4034" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.00603462, -0.958809, 1.29051, -0.00448353, -19.5963, 45.1767)" x1="36.880539" y1="20.811714" x2="23.073864" y2="43.531128"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient7336" id="linearGradient4037" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.00268541, -0.958817, 1.29052, -0.00199517, -19.6938, 45.1029)" x1="11.002116" y1="29.756582" x2="46.998974" y2="29.756582"/>
-    <linearGradient inkscape:collect="always" xlink:href="#XMLID_2_" id="linearGradient4111" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.0393106, 0, 0, 0.0194718, 25.0392, 27.618)" x1="52.006104" y1="166.1331" x2="14.049017" y2="-42.218513"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient2378" id="radialGradient4113" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.131291, 0, 0, 0.156352, 22.5903, 25.9721)" cx="24.195112" cy="10.577631" fx="24.195112" fy="10.577631" r="15.242914"/>
-    <linearGradient inkscape:collect="always" xlink:href="#XMLID_39_" id="linearGradient4115" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.041315, 0, 0, 0.041315, 23.1323, 25.8042)" x1="64.387703" y1="65.124001" x2="64.387703" y2="35.569"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient2299" id="radialGradient4117" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.47838, 0, 0, 0.490192, 19.9757, 16.6503)" cx="7.5326638" cy="24.202574" fx="7.5326638" fy="24.202574" r="8.2452126"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient2341" id="radialGradient4119" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.47838, 0, 0, -0.490192, 22.3346, 38.1062)" cx="11.68129" cy="19.554111" fx="11.68129" fy="19.554111" r="8.2452126"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient7336" id="linearGradient4160" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.00268541, -0.958817, 1.29052, -0.00199517, -19.6938, 45.1029)" x1="11.002116" y1="29.756582" x2="46.998974" y2="29.756582"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3289" id="linearGradient4162" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.00603462, -0.958809, 1.29051, -0.00448353, -19.5963, 45.1767)" x1="36.880539" y1="20.811714" x2="23.073864" y2="43.531128"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3289" id="linearGradient4174" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.00603462, -0.958809, 1.29051, -0.00448353, -19.5963, 45.1767)" x1="36.880539" y1="20.811714" x2="23.073864" y2="43.531128"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient7336" id="linearGradient4177" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.00268541, -0.958817, 1.29052, -0.00199517, -19.6938, 45.1029)" x1="11.002116" y1="29.756582" x2="46.998974" y2="29.756582"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3289" id="linearGradient2483" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.0200831, -3.4544, 4.2948, -0.0161533, -63.1931, 164.667)" x1="36.880539" y1="20.811714" x2="23.073864" y2="43.531128"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient7336" id="linearGradient2486" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.00893698, -3.45443, 4.29483, -0.0071882, -63.5175, 164.401)" x1="11.002116" y1="29.756582" x2="46.998974" y2="29.756582"/>
+  <defs
+     id="defs2491">
+    <linearGradient
+       id="linearGradient3801">
+      <stop
+         style="stop-color: rgb(0, 130, 0); stop-opacity: 1;"
+         offset="0"
+         id="stop3803" />
+      <stop
+         style="stop-color: rgb(0, 130, 0); stop-opacity: 0;"
+         offset="1"
+         id="stop3805" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3793">
+      <stop
+         style="stop-color: rgb(0, 130, 0); stop-opacity: 1;"
+         offset="0"
+         id="stop3795" />
+      <stop
+         style="stop-color: rgb(0, 130, 0); stop-opacity: 0;"
+         offset="1"
+         id="stop3797" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       id="perspective45" />
+    <linearGradient
+       id="linearGradient4198">
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"
+         offset="0"
+         id="stop4200" />
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 0.57265;"
+         offset="1"
+         id="stop4202" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4181">
+      <stop
+         style="stop-color: rgb(204, 0, 0); stop-opacity: 1;"
+         offset="0"
+         id="stop4183" />
+      <stop
+         style="stop-color: rgb(247, 15, 15); stop-opacity: 1;"
+         offset="1"
+         id="stop4185" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5048">
+      <stop
+         style="stop-color: black; stop-opacity: 0;"
+         offset="0"
+         id="stop5050" />
+      <stop
+         id="stop5056"
+         offset="0.5"
+         style="stop-color: black; stop-opacity: 1;" />
+      <stop
+         style="stop-color: black; stop-opacity: 0;"
+         offset="1"
+         id="stop5052" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3289">
+      <stop
+         style="stop-color: rgb(255, 255, 142); stop-opacity: 1;"
+         offset="0"
+         id="stop3291" />
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 0.533898;"
+         offset="1"
+         id="stop3293" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7336">
+      <stop
+         id="stop7338"
+         offset="0"
+         style="stop-color: rgb(236, 192, 92); stop-opacity: 1;" />
+      <stop
+         style="stop-color: rgb(215, 183, 86); stop-opacity: 1;"
+         offset="0.19283746"
+         id="stop7340" />
+      <stop
+         id="stop4206"
+         offset="0.63636363"
+         style="stop-color: rgb(226, 203, 144); stop-opacity: 1;" />
+      <stop
+         id="stop7342"
+         offset="1"
+         style="stop-color: rgb(242, 235, 160); stop-opacity: 1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4181"
+       id="linearGradient4187"
+       x1="30.229904"
+       y1="33.538868"
+       x2="16.130783"
+       y2="13.761145"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="aigrd1"
+       gradientUnits="userSpaceOnUse"
+       x1="12.4873"
+       y1="3.7319"
+       x2="31.081301"
+       y2="36.032799">
+      <stop
+         offset="0"
+         style="stop-color: rgb(210, 210, 210); stroke-dasharray: none; stroke-miterlimit: 4; stroke-width: 1.21667;"
+         id="stop16177" />
+      <stop
+         offset="1"
+         style="stop-color: rgb(237, 237, 237); stroke-dasharray: none; stroke-miterlimit: 4; stroke-width: 1.21667;"
+         id="stop16179" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3300">
+      <stop
+         id="stop3557"
+         offset="0"
+         style="stop-color: rgb(242, 242, 242); stop-opacity: 1;" />
+      <stop
+         id="stop3559"
+         offset="1"
+         style="stop-color: rgb(208, 208, 208); stop-opacity: 1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3563">
+      <stop
+         id="stop3565"
+         offset="0"
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;" />
+      <stop
+         id="stop3567"
+         offset="1"
+         style="stop-color: rgb(147, 147, 147); stop-opacity: 1;" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective3294"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 24 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       gradientTransform="matrix(0.354101,0,0,0.354101,1.63868,-8.36492e-2)"
+       y2="35.569"
+       x2="64.387703"
+       y1="65.124001"
+       x1="64.387703"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_39_">
+      <stop
+         id="stop336"
+         style="stop-color: rgb(255, 255, 255);"
+         offset="0" />
+      <stop
+         id="stop338"
+         style="stop-color: rgb(255, 98, 0);"
+         offset="0.8539" />
+      <stop
+         id="stop340"
+         style="stop-color: rgb(242, 93, 0);"
+         offset="1" />
+      <midPointStop
+         id="midPointStop335"
+         style="stop-color:#FFFFFF"
+         offset="0" />
+      <midPointStop
+         id="midPointStop337"
+         style="stop-color:#FFFFFF"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop339"
+         style="stop-color:#FF6200"
+         offset="0.8539" />
+      <midPointStop
+         id="midPointStop341"
+         style="stop-color:#FF6200"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop343"
+         style="stop-color:#F25D00"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.314683,0,0,0.314683,4.12826,3.74287)"
+       y2="59.7995"
+       x2="48.046001"
+       y1="117.5205"
+       x1="80.223602"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_2_">
+      <stop
+         id="stop17"
+         style="stop-color: rgb(204, 204, 204);"
+         offset="0" />
+      <stop
+         id="stop19"
+         style="stop-color: rgb(255, 255, 255);"
+         offset="0.9831" />
+      <midPointStop
+         id="midPointStop48"
+         style="stop-color:#CCCCCC"
+         offset="0" />
+      <midPointStop
+         id="midPointStop50"
+         style="stop-color:#CCCCCC"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop52"
+         style="stop-color:#FFFFFF"
+         offset="0.9831" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2299"
+       inkscape:collect="always">
+      <stop
+         id="stop2301"
+         offset="0"
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;" />
+      <stop
+         id="stop2303"
+         offset="1"
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2307">
+      <stop
+         id="stop2309"
+         offset="0"
+         style="stop-color: rgb(237, 212, 0); stop-opacity: 1;" />
+      <stop
+         id="stop2311"
+         offset="1"
+         style="stop-color: rgb(153, 136, 0); stop-opacity: 1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2329">
+      <stop
+         id="stop2331"
+         offset="0"
+         style="stop-color: rgb(0, 0, 0); stop-opacity: 0.185567;" />
+      <stop
+         id="stop2333"
+         offset="1"
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2341">
+      <stop
+         style="stop-color: rgb(0, 0, 0); stop-opacity: 1;"
+         offset="0"
+         id="stop2343" />
+      <stop
+         style="stop-color: rgb(0, 0, 0); stop-opacity: 0;"
+         offset="1"
+         id="stop2345" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2378"
+       inkscape:collect="always">
+      <stop
+         id="stop2380"
+         offset="0"
+         style="stop-color: rgb(87, 87, 87); stop-opacity: 1;" />
+      <stop
+         id="stop2382"
+         offset="1"
+         style="stop-color: rgb(87, 87, 87); stop-opacity: 0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2406">
+      <stop
+         id="stop2408"
+         offset="0"
+         style="stop-color: rgb(124, 126, 121); stop-opacity: 1;" />
+      <stop
+         style="stop-color: rgb(132, 134, 129); stop-opacity: 1;"
+         offset="0.1724138"
+         id="stop2414" />
+      <stop
+         id="stop2410"
+         offset="1"
+         style="stop-color: rgb(137, 140, 134); stop-opacity: 1;" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective3625"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 24 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3289"
+       id="linearGradient4034"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-6.03462e-3,-0.958809,1.29051,-4.48353e-3,-19.5963,45.1767)"
+       x1="36.880539"
+       y1="20.811714"
+       x2="23.073864"
+       y2="43.531128" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7336"
+       id="linearGradient4037"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.68541e-3,-0.958817,1.29052,-1.99517e-3,-19.6938,45.1029)"
+       x1="11.002116"
+       y1="29.756582"
+       x2="46.998974"
+       y2="29.756582" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_2_"
+       id="linearGradient4111"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.93106e-2,0,0,1.94718e-2,25.0392,27.618)"
+       x1="52.006104"
+       y1="166.1331"
+       x2="14.049017"
+       y2="-42.218513" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2378"
+       id="radialGradient4113"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.131291,0,0,0.156352,22.5903,25.9721)"
+       cx="24.195112"
+       cy="10.577631"
+       fx="24.195112"
+       fy="10.577631"
+       r="15.242914" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_39_"
+       id="linearGradient4115"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(4.1315e-2,0,0,4.1315e-2,23.1323,25.8042)"
+       x1="64.387703"
+       y1="65.124001"
+       x2="64.387703"
+       y2="35.569" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2299"
+       id="radialGradient4117"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.47838,0,0,0.490192,19.9757,16.6503)"
+       cx="7.5326638"
+       cy="24.202574"
+       fx="7.5326638"
+       fy="24.202574"
+       r="8.2452126" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2341"
+       id="radialGradient4119"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.47838,0,0,-0.490192,22.3346,38.1062)"
+       cx="11.68129"
+       cy="19.554111"
+       fx="11.68129"
+       fy="19.554111"
+       r="8.2452126" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7336"
+       id="linearGradient4160"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.68541e-3,-0.958817,1.29052,-1.99517e-3,-19.6938,45.1029)"
+       x1="11.002116"
+       y1="29.756582"
+       x2="46.998974"
+       y2="29.756582" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3289"
+       id="linearGradient4162"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-6.03462e-3,-0.958809,1.29051,-4.48353e-3,-19.5963,45.1767)"
+       x1="36.880539"
+       y1="20.811714"
+       x2="23.073864"
+       y2="43.531128" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3289"
+       id="linearGradient4174"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-6.03462e-3,-0.958809,1.29051,-4.48353e-3,-19.5963,45.1767)"
+       x1="36.880539"
+       y1="20.811714"
+       x2="23.073864"
+       y2="43.531128" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7336"
+       id="linearGradient4177"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.68541e-3,-0.958817,1.29052,-1.99517e-3,-19.6938,45.1029)"
+       x1="11.002116"
+       y1="29.756582"
+       x2="46.998974"
+       y2="29.756582" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3289"
+       id="linearGradient2483"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-7.5311625e-3,-1.2954,1.61055,-6.0574875e-3,16.302686,101.75013)"
+       x1="36.880539"
+       y1="20.811714"
+       x2="23.073864"
+       y2="43.531128" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7336"
+       id="linearGradient2486"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.3513675e-3,-1.2954112,1.6105612,-2.695575e-3,16.181036,101.65038)"
+       x1="11.002116"
+       y1="29.756582"
+       x2="46.998974"
+       y2="29.756582" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7336"
+       id="linearGradient2256"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.3513675e-3,-1.2954112,1.6105612,-2.695575e-3,16.181036,101.65038)"
+       x1="11.002116"
+       y1="29.756582"
+       x2="46.998974"
+       y2="29.756582" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3289"
+       id="linearGradient2258"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-7.5311625e-3,-1.2954,1.61055,-6.0574875e-3,16.302686,101.75013)"
+       x1="36.880539"
+       y1="20.811714"
+       x2="23.073864"
+       y2="43.531128" />
   </defs>
-  <sodipodi:namedview inkscape:window-height="712" inkscape:window-width="1024" inkscape:pageshadow="2" inkscape:pageopacity="0" borderopacity="1.0" bordercolor="#666666" pagecolor="#000000" id="base" showgrid="true" showborder="true" showguides="true" inkscape:guide-bbox="true" inkscape:zoom="3.9609375" inkscape:cx="64" inkscape:cy="71.783949" inkscape:window-x="0" inkscape:window-y="22" inkscape:current-layer="svg2488" fill="#ef2929"/>
-  <path style="overflow: visible; marker: none; fill: url(#linearGradient2486) rgb(0, 0, 0); fill-opacity: 1; fill-rule: evenodd; stroke: rgb(197, 136, 57); stroke-width: 6.92533; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0pt; stroke-opacity: 1; visibility: visible; display: block;" d="M 14.371222,124.53727 C -13.802223,92.864546 22.493553,35.947417 14.058456,3.6431714 L 121.86863,3.4627322 C 134.85599,34.562392 94.756334,88.493443 122.18139,124.35683 L 14.371222,124.53727 z" id="path6459" sodipodi:nodetypes="ccccc"/>
-  <path style="overflow: visible; marker: none; opacity: 0.629213; fill: none; fill-opacity: 1; fill-rule: evenodd; stroke: url(#linearGradient2483) rgb(0, 0, 0); stroke-width: 2.99577; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dashoffset: 0pt; stroke-opacity: 1; visibility: visible; display: block;" d="M 16.464545,122.16589 C -8.297272,94.702188 24.327224,38.068599 17.938402,6.3046728 L 119.26131,5.9398387 C 129.65242,29.778267 94.639066,85.722539 117.02096,121.57178 L 16.464545,122.16589 z" id="path16506" sodipodi:nodetypes="ccccc"/>
-  <path style="fill: none; fill-opacity: 1; fill-rule: evenodd; stroke: rgb(0, 112, 198); stroke-width: 9.43779; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-opacity: 1;" d="M 26.108938,114.58331 C 32.39054,91.76958 32.740531,87.011272 43.11024,75.512092 C 52.314785,65.304985 81.596844,63.896358 90.619066,53.182112 C 99.64129,42.467865 100.32448,32.745999 102.06063,12.143419" id="path3216" sodipodi:nodetypes="cszz"/>
-  <g id="g3551" transform="matrix(1.58513, -0.4171, 0.385284, 1.71603, 8.86323, 8.19939)">
-    <path d="M 11.318692,9.2240568 C 16.641997,14.693047 22.769247,19.123651 29.210664,22.931105 L 27.441568,24.159843 C 21.101863,20.04489 15.052508,15.498993 9.1840818,10.652117 L 11.318692,9.2240568 z" id="path2565" style="overflow: visible; marker: none; opacity: 1; fill: rgb(204, 0, 0); fill-opacity: 1; fill-rule: nonzero; stroke: rgb(204, 0, 0); stroke-width: 2.58923; stroke-linecap: round; stroke-linejoin: round; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0pt; stroke-opacity: 1; visibility: visible; display: inline;"/>
-    <path d="M 26.73892,8.9210568 C 21.867631,15.95255 15.247359,21.081199 7.9065151,25.28163 L 10.087564,23.520856 C 8.7241111,24.379297 25.574485,11.804168 23.852075,10.207903 L 26.73892,8.9210568 z" id="path2575" style="overflow: visible; marker: none; opacity: 1; fill: rgb(204, 0, 0); fill-opacity: 1; fill-rule: nonzero; stroke: rgb(204, 0, 0); stroke-width: 2.58923; stroke-linecap: round; stroke-linejoin: round; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0pt; stroke-opacity: 1; visibility: visible; display: inline;"/>
+  <sodipodi:namedview
+     inkscape:window-height="954"
+     inkscape:window-width="1280"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#000000"
+     id="base"
+     showgrid="true"
+     showborder="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="3.9609375"
+     inkscape:cx="64"
+     inkscape:cy="1.0936137"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:current-layer="svg2488"
+     fill="#ef2929"
+     width="48px"
+     height="48px" />
+  <g
+     id="g2247"
+     transform="translate(-40.000157,-40.000001)">
+    <path
+       sodipodi:nodetypes="ccccc"
+       id="path6459"
+       d="M 45.389306,86.701477 C 34.824265,74.824205 48.435181,53.480282 45.272019,41.36619 L 85.700834,41.298525 C 90.571094,52.960898 75.533723,73.185042 85.818119,86.633812 L 45.389306,86.701477 z "
+       style="fill:url(#linearGradient2256);fill-opacity:1;fill-rule:evenodd;stroke:#c58839;stroke-width:2.59699869;stroke-linecap:butt;stroke-linejoin:miter;marker:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       id="path16506"
+       d="M 46.174303,85.812209 C 36.888621,75.513321 49.122807,54.275725 46.726999,42.364253 L 84.723089,42.22744 C 88.619756,51.166851 75.489748,72.145953 83.882958,85.589418 L 46.174303,85.812209 z "
+       style="opacity:0.62921298;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2258);stroke-width:1.1234138;stroke-linecap:butt;stroke-linejoin:miter;marker:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+    <path
+       sodipodi:nodetypes="cszz"
+       id="path3216"
+       d="M 49.79095,82.968742 C 52.146551,74.413593 52.277797,72.629228 56.166438,68.317035 C 59.618143,64.48937 70.598915,63.961135 73.982248,59.943293 C 77.365582,55.92545 77.621778,52.27975 78.272834,44.553783"
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0070c6;stroke-width:3.53917122;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <g
+       transform="matrix(0.5944238,-0.1564125,0.1444815,0.6435113,43.323809,43.074772)"
+       id="g3551">
+      <path
+         style="opacity:1;fill:#cc0000;fill-opacity:1;fill-rule:nonzero;stroke:#cc0000;stroke-width:2.58923006;stroke-linecap:round;stroke-linejoin:round;marker:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         id="path2565"
+         d="M 11.318692,9.2240568 C 16.641997,14.693047 22.769247,19.123651 29.210664,22.931105 L 27.441568,24.159843 C 21.101863,20.04489 15.052508,15.498993 9.1840818,10.652117 L 11.318692,9.2240568 z " />
+      <path
+         style="opacity:1;fill:#cc0000;fill-opacity:1;fill-rule:nonzero;stroke:#cc0000;stroke-width:2.58923006;stroke-linecap:round;stroke-linejoin:round;marker:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         id="path2575"
+         d="M 26.73892,8.9210568 C 21.867631,15.95255 15.247359,21.081199 7.9065151,25.28163 L 10.087564,23.520856 C 8.7241111,24.379297 25.574485,11.804168 23.852075,10.207903 L 26.73892,8.9210568 z " />
+    </g>
+    <path
+       id="path2473"
+       d="M 74.627177,81.489386 L 68.198166,78.085424 L 64.936126,73.597777 L 60.766297,68.897166 L 58.793357,63.58633 L 58.273225,57.80667 L 58.273225,57.80667"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:3, 9;stroke-dashoffset:0;stroke-opacity:1" />
   </g>
-  <path style="fill: none; fill-rule: evenodd; stroke: rgb(0, 0, 0); stroke-width: 8; stroke-linecap: round; stroke-linejoin: round; stroke-miterlimit: 4; stroke-dasharray: 8, 24; stroke-dashoffset: 0pt; stroke-opacity: 1;" d="M 92.338877,110.63836 L 75.194847,101.56113 L 66.496075,89.594069 L 55.376529,77.059108 L 50.115356,62.896879 L 48.728338,47.484451 L 48.728338,47.484451" id="path2473"/>
-</svg>
\ No newline at end of file
+</svg>
index ed84265..2d1f383 100644 (file)
@@ -1,14 +1,81 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.0" width="180" height="200" id="svg2006">
-  <defs id="defs2008"/>
-  <g transform="translate(-262.487, -353.979)" id="layer1">
-    <g transform="matrix(9, 0, 0, 9, -2287.46, -1926.28)" style="opacity: 1;" id="g1978">
-      <g transform="translate(0.0668287, 0.000457222)" id="g2084">
-        <rect width="17.999981" height="17.999981" x="284.26093" y="255.07872" style="opacity: 1; fill: rgb(195, 215, 235); fill-opacity: 1; stroke: none; stroke-width: 2; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-opacity: 1;" id="rect5453"/>
-        <path d="M 290.63841,259.35139 L 295.05402,256.20842 L 298.46279,257.68362 L 300.17752,260.56527 L 300.67227,268.08928 L 297.80771,270.24944 L 290.67064,268.80589 L 285.84987,264.26648 L 286.41339,260.48177 L 290.63841,259.35139 z " style="opacity: 1; fill: gray; fill-opacity: 1; fill-rule: evenodd; stroke: none; stroke-width: 1px; stroke-linecap: butt; stroke-linejoin: miter; stroke-opacity: 1;" id="path5463"/>
-        <path d="M 289.53125,253.4375 C 289.53515,257.64346 291.65509,260.23937 292.59375,263.16328 C 293.1102,264.772 293.41458,265.85533 293.25,267.22578 C 293.08542,268.59623 292.41574,270.43919 290.5,273.25703 L 293.8125,275.50703 C 295.93452,272.38578 296.95037,269.96061 297.21875,267.72578 C 297.48713,265.49095 296.94611,263.62619 296.40625,261.94453 C 295.23231,258.2877 293.53379,256.1759 293.53125,253.4375 L 289.53125,253.4375 z " style="opacity: 1; fill: rgb(32, 74, 135); fill-opacity: 1; fill-rule: evenodd; stroke: none; stroke-width: 4; stroke-linecap: butt; stroke-linejoin: round; stroke-miterlimit: 4; stroke-opacity: 1;" id="path5455"/>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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="48"
+   height="48"
+   id="svg2006"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docname="gui_town.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   sodipodi:docbase="/home/martin/map/sf/navit-test/navit/xpm">
+  <metadata
+     id="metadata11">
+    <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="954"
+     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"
+     width="48px"
+     height="48px"
+     inkscape:zoom="10"
+     inkscape:cx="24.803347"
+     inkscape:cy="32.662819"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:current-layer="svg2006" />
+  <defs
+     id="defs2008" />
+  <g
+     transform="matrix(0.240149,0,0,0.240149,-60.65005,-85.021524)"
+     id="layer1">
+    <g
+       transform="matrix(9,0,0,9,-2287.46,-1926.28)"
+       style="opacity:1"
+       id="g1978">
+      <g
+         transform="translate(6.68287e-2,4.57222e-4)"
+         id="g2084">
+        <rect
+           width="17.999981"
+           height="17.999981"
+           x="284.26093"
+           y="255.07872"
+           style="opacity:1;fill:#c3d7eb;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="rect5453" />
+        <path
+           d="M 290.63841,259.35139 L 295.05402,256.20842 L 298.46279,257.68362 L 300.17752,260.56527 L 300.67227,268.08928 L 297.80771,270.24944 L 290.67064,268.80589 L 285.84987,264.26648 L 286.41339,260.48177 L 290.63841,259.35139 z "
+           style="opacity:1;fill:#808080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           id="path5463" />
+        <path
+           d="M 289.53125,253.4375 C 289.53515,257.64346 291.65509,260.23937 292.59375,263.16328 C 293.1102,264.772 293.41458,265.85533 293.25,267.22578 C 293.08542,268.59623 292.41574,270.43919 290.5,273.25703 L 293.8125,275.50703 C 295.93452,272.38578 296.95037,269.96061 297.21875,267.72578 C 297.48713,265.49095 296.94611,263.62619 296.40625,261.94453 C 295.23231,258.2877 293.53379,256.1759 293.53125,253.4375 L 289.53125,253.4375 z "
+           style="opacity:1;fill:#204a87;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+           id="path5455" />
       </g>
     </g>
   </g>
-</svg>
\ No newline at end of file
+</svg>
index ae7f3d5..5fb4b1a 100644 (file)
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
+   xmlns:ns="http://creativecommons.org/ns#"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:cc="http://web.resource.org/cc/"
    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"
-   width="310"
-   height="260"
+   width="64"
+   height="64"
    id="svg2307"
    sodipodi:version="0.32"
-   inkscape:version="0.46"
+   inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/phsi/Desktop/clIPART"
+   sodipodi:docbase="/home/martin/map/sf/navit-test/navit/xpm"
    sodipodi:docname="gui_vehicle.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      objecttolerance="10"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.69326923"
-     inkscape:cx="240.61188"
-     inkscape:cy="154.13128"
+     inkscape:zoom="2"
+     inkscape:cx="141.5"
+     inkscape:cy="95.089384"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      inkscape:window-width="1022"
      inkscape:window-height="748"
      inkscape:window-x="0"
-     inkscape:window-y="0"
-     width="310px"
-     height="260px"
+     inkscape:window-y="197"
+     width="64px"
+     height="64px"
      showgrid="false" />
   <metadata
      id="metadata2312">
     <rdf:RDF>
+      <ns:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </ns:Work>
       <cc:Work
          rdf:about="">
         <dc:format>image/svg+xml</dc:format>
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(2.44179, -204.566)"
-     style="fill: rgb(0, 0, 0); fill-opacity: 1; stroke: none;">
+     transform="translate(2.44179,-204.566)"
+     style="fill:#000000;fill-opacity:1;stroke:none">
     <path
        id="path9347"
-       style="fill:#808080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.22296999999999989;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
-       d="M -53.582954,-415.35856 C -67.309015,-415.84417 -79.137232,-411.40275 -86.431515,-395.45159 L -112.76807,-329.50717 C -131.95714,-324.21675 -140.31066,-310.27864 -140.75323,-298.84302 L -140.75323,-212.49705 L -115.44706,-212.49705 L -115.44706,-183.44029 C -116.67339,-155.74786 -71.290042,-154.67757 -70.275134,-183.7288 L -69.739335,-212.24976 L 94.421043,-212.24976 L 94.956841,-183.7288 C 95.971739,-154.67759 141.39631,-155.74786 140.16998,-183.44029 L 140.16998,-212.49705 L 165.43493,-212.49705 L 165.43493,-298.84302 C 164.99236,-310.27864 156.63886,-324.21677 137.44977,-329.50717 L 111.11322,-395.45159 C 103.81894,-411.40272 91.990714,-415.84414 78.264661,-415.35856 L -53.582954,-415.35856 z M -50.57424,-392.48409 C -49.426163,-392.49037 -48.215854,-392.45144 -46.988512,-392.40166 L 72.082372,-392.03072 C 82.980293,-392.28497 87.602258,-392.03039 92.236634,-381.7269 L 111.19565,-330.61998 L -86.30787,-330.86727 L -67.554927,-380.61409 C -64.630656,-390.57231 -58.610776,-392.44013 -50.57424,-392.48409 z M -92.036791,-305.02531 C -80.233147,-305.02529 -70.646071,-295.47944 -70.646071,-283.6758 C -70.646071,-271.87217 -80.233147,-262.28508 -92.036791,-262.28508 C -103.84043,-262.28508 -113.42751,-271.87216 -113.42751,-283.6758 C -113.42751,-295.47946 -103.84043,-305.02531 -92.036791,-305.02531 z M 117.91374,-305.02531 C 129.71738,-305.02533 139.26324,-295.47944 139.26324,-283.6758 C 139.26324,-271.87216 129.71738,-262.28508 117.91374,-262.28508 C 106.1101,-262.28507 96.523021,-271.87216 96.523021,-283.6758 C 96.523021,-295.47944 106.1101,-305.02531 117.91374,-305.02531 z M 103.2216,-333.14394 L 103.2216,-333.14394 z M 103.2216,-333.14394 C 103.11577,-333.93673 102.96963,-334.55679 102.80176,-335.21316 C 101.69663,-339.53416 100.2179,-342.16153 97.043938,-345.3793 C 93.958208,-348.50762 90.488134,-350.42644 86.42796,-351.28706 C 82.4419,-352.13197 45.472822,-352.13422 41.474993,-351.28706 C 33.885682,-349.67886 27.380491,-343.34759 25.371094,-335.633 C 25.286417,-335.3079 25.200722,-334.40363 25.131185,-333.2339 L 103.2216,-333.14394 z M 64.176391,-389.01277 C 58.091423,-389.00227 52.013792,-385.83757 48.882186,-379.47638 C 47.628229,-376.92924 47.532697,-376.52293 47.532697,-372.24912 C 47.532697,-368.02543 47.619523,-367.53023 48.822209,-364.99187 C 50.995125,-360.40581 54.081354,-357.67937 59.048334,-355.90531 C 60.598733,-355.35157 62.040853,-355.17797 64.86613,-355.27555 C 68.233081,-355.39187 68.925861,-355.58211 71.703539,-356.95492 C 75.281118,-358.72306 77.90719,-361.35074 79.680517,-364.96188 C 80.736152,-367.11156 80.820083,-367.68829 80.820085,-372.0392 C 80.820081,-376.56329 80.765213,-376.87662 79.470596,-379.50637 C 76.3443,-385.85678 70.261355,-389.02327 64.176391,-389.01277 z "
-       transform="matrix(0.97979, 0, 0, 0.987795, 140.467, 619.89)" />
+       style="fill:#808080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.22297001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 17.053296,212.37271 C 14.449642,212.27985 12.205975,213.1292 10.82234,216.17967 L 5.8266373,228.79068 C 2.1867153,229.80242 0.6021477,232.46788 0.5181979,234.65481 L 0.5181979,251.16736 L 5.3184615,251.16736 L 5.3184615,256.72409 C 5.085839,262.01991 13.694493,262.22459 13.887004,256.66892 L 13.988644,251.21465 L 45.127788,251.21465 L 45.229416,256.66892 C 45.421927,262.22459 54.038398,262.01991 53.805775,256.72409 L 53.805775,251.16736 L 58.598222,251.16736 L 58.598222,234.65481 C 58.514272,232.46788 56.929717,229.8024 53.289795,228.79068 L 48.29408,216.17967 C 46.910445,213.12922 44.666778,212.27985 42.063124,212.37271 L 17.053296,212.37271 z M 17.624016,216.74716 C 17.841792,216.74596 18.071365,216.75339 18.304181,216.76292 L 40.890417,216.83386 C 42.957617,216.78524 43.834347,216.83393 44.713436,218.80433 L 48.309713,228.57787 L 10.845802,228.53059 L 14.402996,219.01714 C 14.957697,217.11276 16.099586,216.75556 17.624016,216.74716 z M 9.7590889,233.47253 C 11.998097,233.47253 13.816642,235.29805 13.816642,237.55534 C 13.816642,239.81264 11.998097,241.64604 9.7590889,241.64604 C 7.5200928,241.64604 5.7015475,239.81264 5.7015475,237.55534 C 5.7015475,235.29804 7.5200928,233.47253 9.7590889,233.47253 z M 49.584049,233.47253 C 51.823057,233.47253 53.633786,235.29805 53.633786,237.55534 C 53.633786,239.81264 51.823057,241.64604 49.584049,241.64604 C 47.345053,241.64604 45.526507,239.81264 45.526507,237.55534 C 45.526507,235.29805 47.345053,233.47253 49.584049,233.47253 z M 46.797141,228.0952 L 46.797141,228.0952 z M 46.797141,228.0952 C 46.777067,227.94358 46.749346,227.825 46.717498,227.69948 C 46.507878,226.87315 46.227376,226.37069 45.625316,225.75534 C 45.039991,225.15709 44.381763,224.79015 43.611598,224.62557 C 42.855493,224.46398 35.842926,224.46356 35.084595,224.62557 C 33.644997,224.9331 32.411039,226.14389 32.029889,227.61919 C 32.01382,227.68137 31.99757,227.8543 31.984381,228.07799 L 46.797141,228.0952 z M 39.390755,217.41101 C 38.236511,217.41302 37.083672,218.01823 36.489647,219.23472 C 36.251785,219.72182 36.233659,219.79953 36.233659,220.61684 C 36.233659,221.42457 36.250127,221.51927 36.47826,222.0047 C 36.890435,222.88173 37.475857,223.40311 38.418036,223.74239 C 38.712126,223.84827 38.985671,223.88147 39.521592,223.86282 C 40.160266,223.84057 40.291672,223.80419 40.818567,223.54166 C 41.497183,223.20352 41.995316,222.70101 42.331696,222.01043 C 42.531939,221.59932 42.54785,221.48904 42.54785,220.65698 C 42.54785,219.7918 42.537444,219.73189 42.291875,219.22899 C 41.698854,218.01454 40.544998,217.40901 39.390755,217.41101 z " />
   </g>
 </svg>