Misc

diff --git a/docs/osm-indexes.sql b/docs/osm-indexes.sql
index 6d69c79447a8141dd98fe489c33dbf37cd5f0759..af28b57d7517a19b25d49e8170fdd2437d8e695b 100644 (file)
--- a/docs/osm-indexes.sql
+++ b/docs/osm-indexes.sql
@@ -8,8 +8,10 @@ CREATE INDEX node_ilat_idx on nodes (ilat);
 CREATE INDEX node_ilon_idx on nodes (ilon);
 
 CREATE INDEX way_name_idx on way_names (name);
+CREATE INDEX way_norm_name_idx on way_names (norm);
 CREATE INDEX way_name_nls_id_idx on way_names_nls (wid);
 CREATE INDEX way_name_nls_name_idx on way_names_nls (name);
+CREATE INDEX way_norm_nls_name_idx on way_names_nls (norm);
 
 CREATE INDEX way_ref_idx on way_ref (ref);
 

diff --git a/src/bt-maemo.c b/src/bt-maemo.c
index cabaafa84178e74c16b5d609b92e0ae49e6be852..793b97bda5e5a1a0293df3697a8dadc18d8d82a3 100644 (file)
--- a/src/bt-maemo.c
+++ b/src/bt-maemo.c
@@ -1,3 +1,28 @@
+/*
+ * This file is part of mapper
+ *
+ * Copyright (C) 2007 Kaj-Michael Lang
+ * Copyright (C) 2006-2007 John Costigan.
+ *
+ * POI and GPS-Info code originally written by Cezary Jackiewicz.
+ *
+ * Default map data provided by http://www.openstreetmap.org/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 #include <config.h>
 
 #define _GNU_SOURCE

diff --git a/src/config-gconf.c b/src/config-gconf.c
index 70e3ea1de30aeeab47f9cdfda32ac433cfdec38e..239c445966e46d71bbe2e7cb122bcb5325bfaca5 100644 (file)
--- a/src/config-gconf.c
+++ b/src/config-gconf.c
@@ -1,3 +1,28 @@
+/*
+ * This file is part of mapper
+ *
+ * Copyright (C) 2007 Kaj-Michael Lang
+ * Copyright (C) 2006-2007 John Costigan.
+ *
+ * POI and GPS-Info code originally written by Cezary Jackiewicz.
+ *
+ * Default map data provided by http://www.openstreetmap.org/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 #include <config.h>
 
 #define _GNU_SOURCE
@@ -688,9 +713,7 @@ _conn_state = (_enable_gps ? RCVR_DOWN : RCVR_OFF);
 /* Load the route locations. */
 {
        GSList *curr;
-       _loc_list = gconf_client_get_list(gconf_client,
-                                 GCONF_KEY_ROUTE_LOCATIONS,
-                                 GCONF_VALUE_STRING, NULL);
+       _loc_list = gconf_client_get_list(gconf_client, GCONF_KEY_ROUTE_LOCATIONS, GCONF_VALUE_STRING, NULL);
        _loc_model = gtk_list_store_new(1, G_TYPE_STRING);
        for (curr = _loc_list; curr != NULL; curr = curr->next) {
                GtkTreeIter iter;

diff --git a/src/file.c b/src/file.c
index 3c4f57b5566dcd3cb19781bc3abdd905d6dd291d..7c3cab6e53c7cbd3f2cf2a322df424982a091ea7 100644 (file)
--- a/src/file.c
+++ b/src/file.c
@@ -1,3 +1,28 @@
+/*
+ * This file is part of mapper
+ *
+ * Copyright (C) 2007 Kaj-Michael Lang
+ * Copyright (C) 2006-2007 John Costigan.
+ *
+ * POI and GPS-Info code originally written by Cezary Jackiewicz.
+ *
+ * Default map data provided by http://www.openstreetmap.org/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 #define _GNU_SOURCE
 
 #include <config.h>

diff --git a/src/filter-gui.c b/src/filter-gui.c
index 52aed2f682a84b3c3e250e88c24bd2595ffb0fbe..5889358302e529367da454d1698dd82412f57120 100644 (file)
--- a/src/filter-gui.c
+++ b/src/filter-gui.c
@@ -1,3 +1,25 @@
+/*
+ * This file is part of mapper
+ *
+ * Copyright (C) 2007 Kaj-Michael Lang
+ *
+ * Default map data provided by http://www.openstreetmap.org/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 #include "config.h"
 
 #define _GNU_SOURCE

diff --git a/src/gps-browse.c b/src/gps-browse.c
index b150cd03f23383decb436543aa7a416a6d477539..85934fd19723b14e1727f7f38bc5b5c1261b63d6 100644 (file)
--- a/src/gps-browse.c
+++ b/src/gps-browse.c
@@ -1,3 +1,28 @@
+/*
+ * This file is part of mapper
+ *
+ * Copyright (C) 2007 Kaj-Michael Lang
+ * Copyright (C) 2006-2007 John Costigan.
+ *
+ * POI and GPS-Info code originally written by Cezary Jackiewicz.
+ *
+ * Default map data provided by http://www.openstreetmap.org/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 #define _GNU_SOURCE
 
 #include <config.h>

diff --git a/src/gps-conn.c b/src/gps-conn.c
index b197eee0fa64fd21c64b2cb011e5427353b10a99..fb5d563c41d9344162e33b3b20df48704fddd8a1 100644 (file)
--- a/src/gps-conn.c
+++ b/src/gps-conn.c
@@ -1,3 +1,28 @@
+/*
+ * This file is part of mapper
+ *
+ * Copyright (C) 2007 Kaj-Michael Lang
+ * Copyright (C) 2006-2007 John Costigan.
+ *
+ * POI and GPS-Info code originally written by Cezary Jackiewicz.
+ *
+ * Default map data provided by http://www.openstreetmap.org/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 #define _GNU_SOURCE
 
 #include <config.h>

diff --git a/src/gps-nmea-parse.c b/src/gps-nmea-parse.c
index b97a7ca3025a59ad57e8282f00e84c4c2d525217..e1c3f74502500fdc55790003cfa124ae4640a802 100644 (file)
--- a/src/gps-nmea-parse.c
+++ b/src/gps-nmea-parse.c
@@ -1,3 +1,28 @@
+/*
+ * This file is part of mapper
+ *
+ * Copyright (C) 2007 Kaj-Michael Lang
+ * Copyright (C) 2006-2007 John Costigan.
+ *
+ * POI and GPS-Info code originally written by Cezary Jackiewicz.
+ *
+ * Default map data provided by http://www.openstreetmap.org/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 #define _GNU_SOURCE
 
 #include <config.h>

diff --git a/src/gps-panels.c b/src/gps-panels.c
index 73c08c086d2dfab8833b6a65bd231e79956851cc..72f8d0724ee5e3d495c1480769996a1e9e92729d 100644 (file)
--- a/src/gps-panels.c
+++ b/src/gps-panels.c
@@ -1,3 +1,28 @@
+/*
+ * This file is part of mapper
+ *
+ * Copyright (C) 2007 Kaj-Michael Lang
+ * Copyright (C) 2006-2007 John Costigan.
+ *
+ * POI and GPS-Info code originally written by Cezary Jackiewicz.
+ *
+ * Default map data provided by http://www.openstreetmap.org/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 #include <config.h>
 
 #define _GNU_SOURCE

diff --git a/src/gps.c b/src/gps.c
index 22d254b4be583d49c0a67e566a562f0240019023..6e8cea548291cceeb6446d5f3328c73987d4b528 100644 (file)
--- a/src/gps.c
+++ b/src/gps.c
@@ -1,3 +1,28 @@
+/*
+ * This file is part of mapper
+ *
+ * Copyright (C) 2007 Kaj-Michael Lang
+ * Copyright (C) 2006-2007 John Costigan.
+ *
+ * POI and GPS-Info code originally written by Cezary Jackiewicz.
+ *
+ * Default map data provided by http://www.openstreetmap.org/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 #include "gps.h"
 #include "utils.h"
 

diff --git a/src/hildon-wrappers.c b/src/hildon-wrappers.c
index 3f30537b95df502d14c468085ec50616b9e4a79f..635005f6d98cf407e27f3bc75222cd439dea08a5 100644 (file)
--- a/src/hildon-wrappers.c
+++ b/src/hildon-wrappers.c
@@ -1,3 +1,26 @@
+/*
+ * This file is part of mapper
+ *
+ * Copyright (C) 2007 Kaj-Michael Lang
+ * POI and GPS-Info code originally written by Cezary Jackiewicz.
+ *
+ * Default map data provided by http://www.openstreetmap.org/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 /****************************************************************************
  * Hildon function Wrappers for non-hildon build
  ****************************************************************************/

diff --git a/src/iap.c b/src/iap.c
index 3d14bed9bf397d1a3d0774e1651d445e701b1333..61d243be517e89889093eb51fea772966451e8a8 100644 (file)
--- a/src/iap.c
+++ b/src/iap.c
@@ -1,3 +1,28 @@
+/*
+ * This file is part of mapper
+ *
+ * Copyright (C) 2007 Kaj-Michael Lang
+ * Copyright (C) 2006-2007 John Costigan.
+ *
+ * POI and GPS-Info code originally written by Cezary Jackiewicz.
+ *
+ * Default map data provided by http://www.openstreetmap.org/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 #include <config.h>
 
 #include <glib.h>

diff --git a/src/latlon.c b/src/latlon.c
index 1d4e44f0675ff2fc2933fb99ec9c4d0195b21272..e8a78d72a5d01e889017242fb9d758b668cdfa91 100644 (file)
--- a/src/latlon.c
+++ b/src/latlon.c
@@ -1,3 +1,27 @@
+/*
+ * This file is part of mapper
+ *
+ * Copyright (C) 2007 Kaj-Michael Lang
+ *
+ * Original Algorithms from misc web sites
+ *
+ * Default map data provided by http://www.openstreetmap.org/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 /*
  * Different Lat/Lon and related functions
  * (conversion, distances, etc)

diff --git a/src/maemo-osso.c b/src/maemo-osso.c
index 7e2b57e747a8f5992cd14ba4bb62c162746f7c00..e79413643b9716b9edaacf0c1c9a1b14a8f66dd8 100644 (file)
--- a/src/maemo-osso.c
+++ b/src/maemo-osso.c
@@ -1,3 +1,28 @@
+/*
+ * This file is part of mapper
+ *
+ * Copyright (C) 2007 Kaj-Michael Lang
+ * Copyright (C) 2006-2007 John Costigan.
+ *
+ * POI and GPS-Info code originally written by Cezary Jackiewicz.
+ *
+ * Default map data provided by http://www.openstreetmap.org/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 /* 
  * Maemo hardware specific functions 
  */

diff --git a/src/map-download.c b/src/map-download.c
index fa292fa32dd3f3e7df498066ed773c331497f0b1..ef8668d51d0ec278b821ae5b1ef29cc171f12755 100644 (file)
--- a/src/map-download.c
+++ b/src/map-download.c
@@ -1,3 +1,28 @@
+/*
+ * This file is part of mapper
+ *
+ * Copyright (C) 2007 Kaj-Michael Lang
+ * Copyright (C) 2006-2007 John Costigan.
+ *
+ * POI and GPS-Info code originally written by Cezary Jackiewicz.
+ *
+ * Default map data provided by http://www.openstreetmap.org/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 #include "config.h"
 
 #define _GNU_SOURCE

diff --git a/src/map-repo.c b/src/map-repo.c
index bbacca5e25a68d09c5a4de70adc48809f06b6486..00c2cde21ad1fefb1af0e107542d35f6e00634e8 100644 (file)
--- a/src/map-repo.c
+++ b/src/map-repo.c
@@ -1,3 +1,28 @@
+/*
+ * This file is part of mapper
+ *
+ * Copyright (C) 2007 Kaj-Michael Lang
+ * Copyright (C) 2006-2007 John Costigan.
+ *
+ * POI and GPS-Info code originally written by Cezary Jackiewicz.
+ *
+ * Default map data provided by http://www.openstreetmap.org/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 #include <config.h>
 
 #define _GNU_SOURCE

diff --git a/src/mapper-types.h b/src/mapper-types.h
index 5ebd7d923584ace182bb8449e641cd09cd168e23..6c776c2326dc4e8108439d1395db584b0b92cd60 100644 (file)
--- a/src/mapper-types.h
+++ b/src/mapper-types.h
@@ -19,6 +19,8 @@ typedef enum {
        ITEM_LABEL,
        ITEM_DESC,
        ITEM_CATLAB,
+       ITEM_ICON,
+       ITEM_COLOR,
        ITEM_NUM_COLUMNS
 } item_list_id;
 

diff --git a/src/osm-db.c b/src/osm-db.c
index 5193392469fc8eecf5a8f30112b81d49713ba8c2..2663ffe41e0d178be762e604f39f7ca5f0235c91 100644 (file)
--- a/src/osm-db.c
+++ b/src/osm-db.c
@@ -956,14 +956,16 @@ if (ltext)
 
 *store = gtk_list_store_new(ITEM_NUM_COLUMNS, 
                                G_TYPE_INT,             /* ID */
-                               G_TYPE_INT,             /* Category ID */
+                               G_TYPE_INT,             /*  */
                                G_TYPE_DOUBLE,  /* Latitude */
                                G_TYPE_DOUBLE,  /* Longitude */
                                G_TYPE_DOUBLE,  /* Distance */
                                G_TYPE_STRING,  /* Lat/Lon */
                                G_TYPE_STRING,  /* Label */
                                G_TYPE_STRING,  /* Desc. */
-                               G_TYPE_STRING); /* Category */
+                               G_TYPE_STRING,  /* Category */
+                               G_TYPE_STRING,  /* Dummy */
+                               G_TYPE_STRING); /* Dummy */
 
 while (SQLITE_ROW == sqlite3_step(sql.select_way_name_search)) {
        gdouble rlat, rlon, dist;

diff --git a/src/route.c b/src/route.c
index ec690b09e20d24d4c56140054a153042c2d9d959..beba25953c7130ed741cfc04bd1646531eeecf53 100644 (file)
--- a/src/route.c
+++ b/src/route.c
@@ -453,17 +453,13 @@ while (GTK_RESPONSE_ACCEPT == gtk_dialog_run(GTK_DIALOG(dialog))) {
                if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(oti.rad_use_gps))
                    && !g_slist_find_custom(_loc_list, from, (GCompareFunc) strcmp)) {
                        _loc_list = g_slist_prepend(_loc_list, g_strdup(from));
-                       gtk_list_store_insert_with_values(_loc_model,
-                                                         &iter, INT_MAX, 0, from, -1);
+                       gtk_list_store_insert_with_values(_loc_model, &iter, INT_MAX, 0, from, -1);
                }
 
                /* Save Destination in Route Locations list. */
                if (!g_slist_find_custom(_loc_list, to, (GCompareFunc) strcmp)) {
                        _loc_list = g_slist_prepend(_loc_list, g_strdup(to));
-                       gtk_list_store_insert_with_values(_loc_model,
-                                                         &iter,
-                                                         INT_MAX, 0,
-                                                         to, -1);
+                       gtk_list_store_insert_with_values(_loc_model, &iter, INT_MAX, 0, to, -1);
                }
 
                MACRO_BANNER_SHOW_INFO(_window, _("Route Downloaded"));

diff --git a/src/track.h b/src/track.h
index 57901685ccd870de31605b8d161fa22dc4787a54..20750de8f44de40abd7591324322e0dce09dc693 100644 (file)
--- a/src/track.h
+++ b/src/track.h
@@ -4,16 +4,20 @@
 #include <glib.h>
 #include <sqlite3.h>
 
-#define TRACK_SQL_SELECT_TRACKS "select id,name,sloc,eloc,sdate,edate from tracks order by sdate"
+#define TRACK_SQL_SELECT_TRACKS "select id,name,slat,slon,elat,elon,len,sdate,edate from tracks order by sdate"
 #define TRACK_SQL_INSERT_TRACK "insert into tracks (id,name,sloc,sdate) values (?,?,?,?);
 #define TRACK_SQL_INSERT_TRACK_POINT "insert into trackpoints (tid,dt,lat,lon,alt,hdop,vdop,pdop,sat,fix) values (?,?,?,?,?,?,?,?,?,?)"
 #define TRACK_SQL_SELECT_TRACK_POINTS "select tid,dt,lat,lon,alt,hdop,vdop,pdop,sat,fix from trackpoints where tid=? order by dt"
 
 struct {
-       sqlite3_stmt *_insert_track;
-       sqlite3_stmt *_select_tracks;
-       sqlite3_stmt *_insert_track_point;
-       sqlite3_stmt *_select_track_points;
+       sqlite3_stmt *insert_track;
+       sqlite3_stmt *select_tracks;
+       sqlite3_stmt *select_latest_track;
+       sqlite3_stmt *delete_track;
+
+       sqlite3_stmt *insert_track_point;
+       sqlite3_stmt *select_track_points;
+       sqlite3_stmt *delete_track_points;
 } track_sql;
 
 void track_init(void);