roadmap-commit Mailing List for RoadMap (Page 13)

Brought to you by: dannybackx, eshabtai, pascmartin, pgf

roadmap-commit — track CVS commits

You can subscribe to this list here.

2005	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (92)	Dec (141)
2006	Jan (126)	Feb (72)	Mar (31)	Apr (200)	May (81)	Jun (130)	Jul (112)	Aug (134)	Sep (76)	Oct (89)	Nov (153)	Dec (9)
2007	Jan (59)	Feb (82)	Mar (50)	Apr (20)	May (9)	Jun (81)	Jul (41)	Aug (109)	Sep (91)	Oct (87)	Nov (33)	Dec (60)
2008	Jan (21)	Feb (15)	Mar (38)	Apr (75)	May (59)	Jun (46)	Jul (30)	Aug (20)	Sep (35)	Oct (32)	Nov (34)	Dec (19)
2009	Jan (29)	Feb (71)	Mar (54)	Apr (17)	May (4)	Jun	Jul (3)	Aug	Sep	Oct	Nov	Dec (3)
2010	Jan	Feb	Mar	Apr	May	Jun	Jul (3)	Aug (58)	Sep (7)	Oct (7)	Nov (12)	Dec (18)
2011	Jan (17)	Feb (29)	Mar (11)	Apr (5)	May (1)	Jun	Jul	Aug (11)	Sep	Oct	Nov	Dec
2012	Jan (2)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2014	Jan	Feb	Mar	Apr	May	Jun (87)	Jul	Aug	Sep	Oct	Nov	Dec
2015	Jan	Feb	Mar	Apr	May (44)	Jun (79)	Jul (16)	Aug (31)	Sep	Oct (51)	Nov	Dec
2016	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (2)	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 11 12 13 14 15 .. 131 > >> (Page 13 of 131)

[Roadmap-commit] SF.net SVN: roadmap:[2704] trunk/roadmap/src/php/osmgetbmapcore.php

From: <pg...@us...> - 2014-06-07 20:21:24

Revision: 2704
          http://sourceforge.net/p/roadmap/code/2704
Author:   pgf
Date:     2014-06-07 20:21:21 +0000 (Sat, 07 Jun 2014)
Log Message:
-----------
osmgetbmapcore:  add latest error codes from web spec

Modified Paths:
--------------
    trunk/roadmap/src/php/osmgetbmapcore.php

Modified: trunk/roadmap/src/php/osmgetbmapcore.php
===================================================================
--- trunk/roadmap/src/php/osmgetbmapcore.php	2014-06-07 20:21:17 UTC (rev 2703)
+++ trunk/roadmap/src/php/osmgetbmapcore.php	2014-06-07 20:21:21 UTC (rev 2704)
@@ -89,6 +89,9 @@
 $EDownloadErrorPerms    = 7;
 $EDownloadErrorXMLError = 8;
 $EDownloadErrorNoData   = 9;
+$EDownloadErrorNoData   = 9;
+$EDownloadErrorServerProblem = 10;
+$EDownloadErrorLzmaProblem   = 11;
 
 // suppress php default error reporting
 error_reporting(0);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Roadmap-commit] SF.net SVN: roadmap:[2703] trunk/roadmap/src

From: <pg...@us...> - 2014-06-07 20:21:20

Revision: 2703
          http://sourceforge.net/p/roadmap/code/2703
Author:   pgf
Date:     2014-06-07 20:21:17 +0000 (Sat, 07 Jun 2014)
Log Message:
-----------
fix polygon line count limit check

one of the two checks was incorrect -- hadn't been updated
with the change to 20 bit counts.

Modified Paths:
--------------
    trunk/roadmap/src/buildmap_polygon.c
    trunk/roadmap/src/roadmap_db_polygon.h

Modified: trunk/roadmap/src/buildmap_polygon.c
===================================================================
--- trunk/roadmap/src/buildmap_polygon.c	2014-06-07 20:21:13 UTC (rev 2702)
+++ trunk/roadmap/src/buildmap_polygon.c	2014-06-07 20:21:17 UTC (rev 2703)
@@ -903,8 +903,8 @@
    /* Create the new-style "polygons" (note new name) tables,
     * based on lines, instead of points).
     */
-   if (PolygonLineCount > 0xffff) {
-      buildmap_error (0, "too many polygon lines - %d, max %d", PolygonLineCount, 0xffff);
+   if (PolygonLineCount > MAX_POLYGON_LINE_COUNT) {
+      buildmap_error (0, "too many polygon lines - %d, max %d", PolygonLineCount, MAX_POLYGON_LINE_COUNT);
       return 1;
    }
 
@@ -974,8 +974,8 @@
          buildmap_polygon_set_first(db_poly, i);
          db_poly->cfcc  = one_polygon->cfcc;
 
-         if (one_polygon->count > 0xfffff) {
-            buildmap_error (0, "too many polygon lines (%d, max %d)", one_polygon->count, 0xfffff);
+         if (one_polygon->count > MAX_POLYGON_LINE_COUNT) {
+            buildmap_error (0, "too many polygon lines (%d, max %d)", one_polygon->count, MAX_POLYGON_LINE_COUNT);
 	    return 1;
          }
          buildmap_polygon_set_count(db_poly, one_polygon->count);

Modified: trunk/roadmap/src/roadmap_db_polygon.h
===================================================================
--- trunk/roadmap/src/roadmap_db_polygon.h	2014-06-07 20:21:13 UTC (rev 2702)
+++ trunk/roadmap/src/roadmap_db_polygon.h	2014-06-07 20:21:17 UTC (rev 2703)
@@ -83,5 +83,7 @@
                 sethifirst(this, (f) / 65536); \
         } while(0)
 
+#define MAX_POLYGON_LINE_COUNT  0xfffff
+
 #endif // INCLUDED__ROADMAP_DB_POLYGON__H
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Roadmap-commit] SF.net SVN: roadmap:[2702] trunk/roadmap/src

From: <pg...@us...> - 2014-06-07 20:21:15

Revision: 2702
          http://sourceforge.net/p/roadmap/code/2702
Author:   pgf
Date:     2014-06-07 20:21:13 +0000 (Sat, 07 Jun 2014)
Log Message:
-----------
buildmap_messages: new buildmap_debug()

added a new DEBUG level of output, and added buildmap_debug().
made buildmap_progress() capable of larger inputs.
added --debug switch to buildmap_osm.

Modified Paths:
--------------
    trunk/roadmap/src/buildmap.h
    trunk/roadmap/src/buildmap_messages.c
    trunk/roadmap/src/buildmap_osm_main.c

Modified: trunk/roadmap/src/buildmap.h
===================================================================
--- trunk/roadmap/src/buildmap.h	2014-06-07 20:21:09 UTC (rev 2701)
+++ trunk/roadmap/src/buildmap.h	2014-06-07 20:21:13 UTC (rev 2702)
@@ -39,11 +39,19 @@
 
 void buildmap_fatal    (int column, const char *format, ...);
 void buildmap_error    (int column, const char *format, ...);
-void buildmap_progress (int done, int estimated);
+void buildmap_progress (unsigned long done, unsigned long estimated);
 void buildmap_info     (const char *format, ...);
 void buildmap_summary  (int verbose, const char *format, ...);
 void buildmap_verbose  (const char *format, ...);
+void buildmap_debug (const char *format, ...);
 int  buildmap_is_verbose (void);
+
+#define BUILDMAP_MESSAGE_DEBUG     6
+#define BUILDMAP_MESSAGE_VERBOSE   5
+#define BUILDMAP_MESSAGE_PROGRESS  4
+#define BUILDMAP_MESSAGE_INFO      3
+#define BUILDMAP_MESSAGE_ERROR     2
+#define BUILDMAP_MESSAGE_FATAL     1
 void buildmap_message_adjust_level (int level);
 
 int buildmap_get_error_count (void);

Modified: trunk/roadmap/src/buildmap_messages.c
===================================================================
--- trunk/roadmap/src/buildmap_messages.c	2014-06-07 20:21:09 UTC (rev 2701)
+++ trunk/roadmap/src/buildmap_messages.c	2014-06-07 20:21:13 UTC (rev 2702)
@@ -42,21 +42,16 @@
 static int   SourceLine = 0;
 static int   ErrorCount = 0;
 static int   ErrorTotal = 0;
-static int   LastProgress = 0;
+static unsigned long   LastProgress = 0;
 
-#define BUILDMAP_MESSAGE_VERBOSE   5
-#define BUILDMAP_MESSAGE_PROGRESS  4
-#define BUILDMAP_MESSAGE_INFO      3
-#define BUILDMAP_MESSAGE_ERROR     2
-#define BUILDMAP_MESSAGE_FATAL     1
-int BuildMapMessageLevel = 4; /* + for more verbosity, - for less */
+int BuildMapMessageLevel = BUILDMAP_MESSAGE_PROGRESS; /* + for more verbosity, - for less */
 
 void buildmap_message_adjust_level (int level) {
 
-    BuildMapMessageLevel += level;
+    BuildMapMessageLevel = level;
 
 #ifndef _WIN32
-    if (BuildMapMessageLevel >= BUILDMAP_MESSAGE_VERBOSE)
+    if (BuildMapMessageLevel >= BUILDMAP_MESSAGE_PROGRESS)
         setbuf(stdout, NULL);
 #endif
 }
@@ -69,6 +64,11 @@
 
    const char *p;
 
+#ifndef _WIN32
+    if (BuildMapMessageLevel >= BUILDMAP_MESSAGE_PROGRESS)
+        setbuf(stdout, NULL);
+#endif
+
    if (name == NULL) {
       if (SourceFile)
          free(SourceFile);
@@ -207,17 +207,18 @@
  * @param done
  * @param estimated
  */
-void buildmap_progress (int done, int estimated) {
+void buildmap_progress (unsigned long done, unsigned long estimated) {
 
-   int this;
+   unsigned long this;
 
+
    if (BuildMapMessageLevel >= BUILDMAP_MESSAGE_PROGRESS) {
 
       this = (100 * done) / estimated;
 
       if (this != LastProgress) {
          LastProgress = this;
-        fprintf (stdout, "-- %s: %3d%% done\r", SourceFile, this);
+        fprintf (stdout, "-- %s: %3ld%% done\r", SourceFile, this);
       }
    }
 }
@@ -270,6 +271,20 @@
    fprintf (stdout, "\n");
 }
 
+void buildmap_debug (const char *format, ...) {
+
+   va_list ap;
+
+   if (BuildMapMessageLevel < BUILDMAP_MESSAGE_DEBUG)
+      return;
+
+   va_start(ap, format);
+   vfprintf(stdout, format, ap);
+   va_end(ap);
+
+   fprintf (stdout, "\n");
+}
+
 /**
  * @brief
  * @param verbose

Modified: trunk/roadmap/src/buildmap_osm_main.c
===================================================================
--- trunk/roadmap/src/buildmap_osm_main.c	2014-06-07 20:21:09 UTC (rev 2701)
+++ trunk/roadmap/src/buildmap_osm_main.c	2014-06-07 20:21:13 UTC (rev 2702)
@@ -86,6 +86,8 @@
         "Show less progress information"},
    {"verbose", "v", opt_flag, "0",
         "Show more progress information"},
+   {"debug", "d", opt_flag, "0",
+        "Show debug information"},
    {"inputfile", "i", opt_string, "",
         "Convert this OSM file into a map"},
    {"outputfile", "o", opt_string, "",
@@ -223,6 +225,7 @@
     }
 
     buildmap_osm_common_find_layers();
+    buildmap_debug("reading file %s", fn);
 
     ret = buildmap_osm_binary_read(fdata);
 
@@ -751,7 +754,7 @@
 {
 
     int error;
-    int verbose, quiet;
+    int verbose = 0, quiet = 0, debug = 0;
     int osm_bits;
     int count;
     int *tileslist;
@@ -767,6 +770,7 @@
 
     /* then, fetch the option values */
     error = opt_val("verbose", &verbose) ||
+            opt_val("debug", &debug) ||
             opt_val("quiet", &quiet) ||
             opt_val("format", &BuildMapFormat) ||
             opt_val("class", &class) ||
@@ -813,8 +817,12 @@
         cmdfmt = "%s -t %d -b %d -h %d";
     }
 
-    if (verbose || quiet)
-        buildmap_message_adjust_level (verbose - quiet);
+    if (debug)
+        buildmap_message_adjust_level (BUILDMAP_MESSAGE_DEBUG);
+    else if (verbose)
+        buildmap_message_adjust_level (BUILDMAP_MESSAGE_VERBOSE);
+    else if (quiet)
+        buildmap_message_adjust_level (BUILDMAP_MESSAGE_ERROR);
 
     buildmap_layer_load(class);
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Roadmap-commit] SF.net SVN: roadmap:[2701] trunk/roadmap/src

From: <pg...@us...> - 2014-06-07 20:21:11

Revision: 2701
          http://sourceforge.net/p/roadmap/code/2701
Author:   pgf
Date:     2014-06-07 20:21:09 +0000 (Sat, 07 Jun 2014)
Log Message:
-----------
buildmap_osm: check returns from roadmap_iso_division_to_num()

Modified Paths:
--------------
    trunk/roadmap/src/buildmap_osm_main.c
    trunk/roadmap/src/buildus_main.c
    trunk/roadmap/src/roadmap_iso.c

Modified: trunk/roadmap/src/buildmap_osm_main.c
===================================================================
--- trunk/roadmap/src/buildmap_osm_main.c	2014-06-07 20:21:04 UTC (rev 2700)
+++ trunk/roadmap/src/buildmap_osm_main.c	2014-06-07 20:21:09 UTC (rev 2701)
@@ -281,9 +281,13 @@
             buildmap_metadata_add_value ("Territory", "Parent", country);
 
             country_num = roadmap_iso_alpha_to_num(country);
-            if (n == 2)
+            if (n == 2) {
                     division_num =
                         roadmap_iso_division_to_num(country, division);
+		    if (division_num < 0)
+			buildmap_fatal(0, "couldn't get division num");
+	    }
+
     } else if (buildmap_osm_filename_usc(fn, &fips)) {
             /* ?? */
             buildmap_metadata_add_attribute ("Territory", "Id", fn);

Modified: trunk/roadmap/src/buildus_main.c
===================================================================
--- trunk/roadmap/src/buildus_main.c	2014-06-07 20:21:04 UTC (rev 2700)
+++ trunk/roadmap/src/buildus_main.c	2014-06-07 20:21:09 UTC (rev 2701)
@@ -209,8 +209,12 @@
 
 	     fips = roadmap_iso_alpha_to_num(country_iso) * 1000 + 1000000;
 	     if (n == 2) {
-                 fips += roadmap_iso_division_to_num(country_iso,
+		 int i = roadmap_iso_division_to_num(country_iso,
 				 country_division);
+		 if (i < 0) {
+                    buildmap_fatal (0, "couldn't find division number");
+		 }
+                 fips += i; 
 		 buildmap_info("Country %s division %s fips %d",
 				 country_iso, country_division, fips);
 	     } else {

Modified: trunk/roadmap/src/roadmap_iso.c
===================================================================
--- trunk/roadmap/src/roadmap_iso.c	2014-06-07 20:21:04 UTC (rev 2700)
+++ trunk/roadmap/src/roadmap_iso.c	2014-06-07 20:21:09 UTC (rev 2701)
@@ -399,19 +399,19 @@
 	if (! f) {
 		/* How to report errors here ? */
 		roadmap_log(ROADMAP_WARNING, "Cannot open %s", mfn);
-		return 0;
+		return -1;
 	}
 
 	while (! feof(f)) {
 		if (fscanf(f, "%d %s", &num, div) != 2)
 			continue;
-		if (strcmp(div, division) == 0) {
+		if (strcasecmp(div, division) == 0) {
 			fclose(f);
 			return num;
 		}
 	}
 	fclose(f);
-	return 0;
+	return -1;
 }
 
 /**

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Roadmap-commit] SF.net SVN: roadmap:[2700] trunk/roadmap/doc/OpenStreetMap

From: <pg...@us...> - 2014-06-07 20:21:07

Revision: 2700
          http://sourceforge.net/p/roadmap/code/2700
Author:   pgf
Date:     2014-06-07 20:21:04 +0000 (Sat, 07 Jun 2014)
Log Message:
-----------
fix garbled text in doc

Modified Paths:
--------------
    trunk/roadmap/doc/OpenStreetMap

Modified: trunk/roadmap/doc/OpenStreetMap
===================================================================
--- trunk/roadmap/doc/OpenStreetMap	2014-06-07 20:20:59 UTC (rev 2699)
+++ trunk/roadmap/doc/OpenStreetMap	2014-06-07 20:21:04 UTC (rev 2700)
@@ -12,7 +12,7 @@
     The maps that RoadMap renders come from several sources (TIGER, various
     shapefile formats, OpenStreetMap). They all need to be indexed for use
     by RoadMap for several reasons. First, we don't want to overload RoadMap
-    to be with several ways to interpret the same data. Second, there's not
+    with several ways to interpret the same data. Second, there's not
     always a direct mapping between the coordinates on the screen where
     RoadMap is trying to display a map, and the name of the map file(s) that
     contain(s) information for that region.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Roadmap-commit] SF.net SVN: roadmap:[2699] trunk/roadmap/src/buildmap_osm_text.c

From: <pg...@us...> - 2014-06-07 20:21:01

Revision: 2699
          http://sourceforge.net/p/roadmap/code/2699
Author:   pgf
Date:     2014-06-07 20:20:59 +0000 (Sat, 07 Jun 2014)
Log Message:
-----------
re-initialize WayLayer for every way

Modified Paths:
--------------
    trunk/roadmap/src/buildmap_osm_text.c

Modified: trunk/roadmap/src/buildmap_osm_text.c
===================================================================
--- trunk/roadmap/src/buildmap_osm_text.c	2014-06-07 20:20:54 UTC (rev 2698)
+++ trunk/roadmap/src/buildmap_osm_text.c	2014-06-07 20:20:59 UTC (rev 2699)
@@ -176,6 +176,7 @@
         nWayNodes = 0;
         free(WayStreetName); WayStreetName = 0;
         free(WayStreetRef); WayStreetRef = 0;
+        WayLayer = 0;
         WayFlags = 0;
         WayInvalid = 0;
 	WayIsOneWay = ROADMAP_LINE_DIRECTION_BOTH;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Roadmap-commit] SF.net SVN: roadmap:[2698] trunk/roadmap/src

From: <pg...@us...> - 2014-06-07 20:20:57

Revision: 2698
          http://sourceforge.net/p/roadmap/code/2698
Author:   pgf
Date:     2014-06-07 20:20:54 +0000 (Sat, 07 Jun 2014)
Log Message:
-----------
rearrange build support for libgps

Modified Paths:
--------------
    trunk/roadmap/src/config.mk
    trunk/roadmap/src/options.mk

Modified: trunk/roadmap/src/config.mk
===================================================================
--- trunk/roadmap/src/config.mk	2014-06-07 20:20:49 UTC (rev 2697)
+++ trunk/roadmap/src/config.mk	2014-06-07 20:20:54 UTC (rev 2698)
@@ -117,13 +117,12 @@
 # EXPAT = NO
 
 #
-# Implement the new gpsd protocol, referred to as gpsd3 .
+# RoadMap implements the new gpsd protocol, referred to as gpsd3.
 # This requires the libgps library, part of the gpsd distribution.
 # If the library isn't used, roadmap's "gpsd3" protocol mode will
 # attempt to use the NMEA mode offered by the new gpsd versions.
-#
-CFLAGS += -DROADMAP_USES_LIBGPS
-LIBS += -lgps
+LIBGPS = YES
+# LIBGPS = NO
 
 # RoadMap users in the USA will probably use the Tiger maps from
 # the US Census bureau.  These maps do not requre "shapefile"

Modified: trunk/roadmap/src/options.mk
===================================================================
--- trunk/roadmap/src/options.mk	2014-06-07 20:20:49 UTC (rev 2697)
+++ trunk/roadmap/src/options.mk	2014-06-07 20:20:54 UTC (rev 2698)
@@ -202,6 +202,11 @@
 	CFLAGS += -DQT_NO_ROTATE
 endif
 
+# libgps support
+ifeq ($(strip $(LIBGPS)),YES)
+    CFLAGS += -DROADMAP_USES_LIBGPS
+    LIBS += -lgps
+endif
 
 # each DESKTOP version has a fully-"native" canvas
 # implementation, as well as a possible agg-based implementation.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Roadmap-commit] SF.net SVN: roadmap:[2697] trunk/roadmap/src/roadmap_trip.c

From: <pg...@us...> - 2014-06-07 20:20:52

Revision: 2697
          http://sourceforge.net/p/roadmap/code/2697
Author:   pgf
Date:     2014-06-07 20:20:49 +0000 (Sat, 07 Jun 2014)
Log Message:
-----------
change some wrongly-set WARNING messages to DEBUG

Modified Paths:
--------------
    trunk/roadmap/src/roadmap_trip.c

Modified: trunk/roadmap/src/roadmap_trip.c
===================================================================
--- trunk/roadmap/src/roadmap_trip.c	2014-06-07 20:20:44 UTC (rev 2696)
+++ trunk/roadmap/src/roadmap_trip.c	2014-06-07 20:20:49 UTC (rev 2697)
@@ -653,7 +653,7 @@
 
         }
 
-        roadmap_log (ROADMAP_WARNING, "roadmap_trip_restore_focus(%s) {%d,%d}", focal->id, focal->map.latitude, focal->map.longitude);
+        roadmap_log (ROADMAP_DEBUG, "roadmap_trip_restore_focus(%s) {%d,%d}", focal->id, focal->map.latitude, focal->map.longitude);
         if (focal->mobile) {
 
             /* This is a mobile point: what was recorded was the GPS
@@ -1066,7 +1066,7 @@
  */
 static void roadmap_trip_set_nav_departure (const char *name, void *data)
 {
-    roadmap_log (ROADMAP_WARNING, "roadmap_trip_departure_waypoint");
+    roadmap_log (ROADMAP_DEBUG, "roadmap_trip_departure_waypoint");
     roadmap_trip_set_point ("Departure",
 	    &RoadMapTripSelectedPlace->wpt->pos);
     roadmap_dialog_hide (name);
@@ -2002,7 +2002,7 @@
 
     /* Info from another call if !suppress_dist */
     if (suppress_dist)
-	roadmap_log(ROADMAP_WARNING, "roadmap_trip_set_directions(%d, %d)",
+	roadmap_log(ROADMAP_DEBUG, "roadmap_trip_set_directions(%d, %d)",
 			dist_to_next, suppress_dist);
 
     if (next == NULL) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Roadmap-commit] SF.net SVN: roadmap:[2696] trunk/roadmap/src/roadmap_trip.c

From: <pg...@us...> - 2014-06-07 20:20:47

Revision: 2696
          http://sourceforge.net/p/roadmap/code/2696
Author:   pgf
Date:     2014-06-07 20:20:44 +0000 (Sat, 07 Jun 2014)
Log Message:
-----------
don't allow selection of hidden routepoints

Modified Paths:
--------------
    trunk/roadmap/src/roadmap_trip.c

Modified: trunk/roadmap/src/roadmap_trip.c
===================================================================
--- trunk/roadmap/src/roadmap_trip.c	2014-06-07 20:20:38 UTC (rev 2695)
+++ trunk/roadmap/src/roadmap_trip.c	2014-06-07 20:20:44 UTC (rev 2696)
@@ -3176,11 +3176,13 @@
 
     ROADMAP_LIST_FOR_EACH (&RoadMapTripRouteHead, relem, rtmp) {
         route_head *rh = (route_head *) relem;
-        RoadMapAreaCurListName = rh->rte_name;
-        QUEUE_FOR_EACH(&rh->waypoint_list, elem, tmp) {
-                w = (waypoint *) elem;
-                (*cb)(w);
-        }
+	if (rh == RoadMapCurrentRoute || RoadMapTripShowInactiveRoutes) {
+	    RoadMapAreaCurListName = rh->rte_name;
+	    QUEUE_FOR_EACH(&rh->waypoint_list, elem, tmp) {
+		    w = (waypoint *) elem;
+		    (*cb)(w);
+	    }
+	}
     }
     ROADMAP_LIST_FOR_EACH (&RoadMapTripTrackHead, relem, rtmp) {
         route_head *rh = (route_head *) relem;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Roadmap-commit] SF.net SVN: roadmap:[2695] trunk/roadmap/.gitignore

From: <pg...@us...> - 2014-06-07 20:20:42

Revision: 2695
          http://sourceforge.net/p/roadmap/code/2695
Author:   pgf
Date:     2014-06-07 20:20:38 +0000 (Sat, 07 Jun 2014)
Log Message:
-----------
add a .gitignore file

yes, we're using svn on sourceforge, but i use git svn for development.

Added Paths:
-----------
    trunk/roadmap/.gitignore

Added: trunk/roadmap/.gitignore
===================================================================
--- trunk/roadmap/.gitignore	                        (rev 0)
+++ trunk/roadmap/.gitignore	2014-06-07 20:20:38 UTC (rev 2695)
@@ -0,0 +1,21 @@
+*.o
+*.a
+.depends.mk
+ID
+src/buildmap
+src/buildmap_osm
+src/buildplace
+src/buildus
+src/dumpmap
+src/gtk2/gtkroadgps
+src/gtk2/gtkroadmap
+src/gtk2/libgtkroadmap.a
+src/qt/.depends.mk
+src/qt4/.depends.mk
+src/sunrise
+src/usermanual.html
+src/rdmfriends
+src/rdmghost
+src/rdmkismet
+src/rdmtrace
+src/rdmxchange

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Roadmap-commit] SF.net SVN: roadmap:[2694] trunk/roadmap/src/android/roadmap_main.c

From: <dan...@us...> - 2012-01-29 15:37:28

Revision: 2694
          http://roadmap.svn.sourceforge.net/roadmap/?rev=2694&view=rev
Author:   dannybackx
Date:     2012-01-29 15:37:22 +0000 (Sun, 29 Jan 2012)
Log Message:
-----------
Another EclairHelper reference

Modified Paths:
--------------
    trunk/roadmap/src/android/roadmap_main.c

Modified: trunk/roadmap/src/android/roadmap_main.c
===================================================================
--- trunk/roadmap/src/android/roadmap_main.c	2012-01-29 15:36:37 UTC (rev 2693)
+++ trunk/roadmap/src/android/roadmap_main.c	2012-01-29 15:37:22 UTC (rev 2694)
@@ -150,7 +150,7 @@
 	jmethodID	mid = TheMethod(cls, "CreateMenu", "(Ljava/lang/String;)I");
 	jstring		js;
 
-	// roadmap_log (ROADMAP_WARNING, "roadmap_main_new_menu(%s)", title);
+	// DANNY roadmap_log (ROADMAP_WARNING, "roadmap_main_new_menu(%s)", title);
 
 	js = (*RoadMapJniEnv)->NewStringUTF(RoadMapJniEnv, title);
 	int i = (*RoadMapJniEnv)->CallIntMethod(RoadMapJniEnv, RoadMapThiz, mid, js);
@@ -213,6 +213,8 @@
 	jmethodID	mid = TheMethod(cls, "AddMenuItem", "(ILjava/lang/String;)I");
 	jstring		js;
 
+	// DANNY roadmap_log (ROADMAP_WARNING, "roadmap_main_add_menu_item(%s)", label);
+
 	js = (*RoadMapJniEnv)->NewStringUTF(RoadMapJniEnv, label);
 	int i = (*RoadMapJniEnv)->CallIntMethod(RoadMapJniEnv, RoadMapThiz, mid, m, js);
 
@@ -288,6 +290,7 @@
 	jmethodID       mid = TheMethod(cls, "AddToolbar", "(Ljava/lang/String;)V");
 	jstring         js;
 
+	if (orientation) roadmap_log (ROADMAP_WARNING, "roadmap_main_add_toolbar(%s)", orientation);
 	js = orientation ? (*RoadMapJniEnv)->NewStringUTF(RoadMapJniEnv, orientation) : NULL;
 	(*RoadMapJniEnv)->CallVoidMethod(RoadMapJniEnv, RoadMapThiz, mid, js);
 }
@@ -319,9 +322,12 @@
 	 * The Java code doesn't handle this because we do it here.
 	 */
 	const char *fnicon = roadmap_path_search_icon(icon);
+	if (fnicon) roadmap_log (ROADMAP_WARNING, "roadmap_main_add_tool(%s)", fnicon);
 	jsicon = fnicon ? (*RoadMapJniEnv)->NewStringUTF(RoadMapJniEnv, fnicon) : NULL;
 
+	if (label) roadmap_log (ROADMAP_WARNING, "roadmap_main_add_tool(%s)", label);
 	jslabel = label ? (*RoadMapJniEnv)->NewStringUTF(RoadMapJniEnv, label) : NULL;
+	if (tip) roadmap_log (ROADMAP_WARNING, "roadmap_main_add_tool(%s)", tip);
 	jstip = tip ? (*RoadMapJniEnv)->NewStringUTF(RoadMapJniEnv, tip) : NULL;
 
 	if (nToolCallbacks == MAXTOOLCALLBACKS) {
@@ -493,7 +499,7 @@
  * @param nmea string (Java format) passed by Android
  */
 void
-Java_net_sourceforge_projects_roadmap_RoadMap_NMEALogger(JNIEnv* env, jobject thiz, int id, jstring nmea)
+Java_net_sourceforge_projects_roadmap_EclairHelper_NMEALogger(JNIEnv* env, jobject thiz, int id, jstring nmea)
 {
    struct roadmap_main_io *context = &RoadMapMainIo[id];
    const char	*s = (*env)->GetStringUTFChars(env, nmea, NULL);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Roadmap-commit] SF.net SVN: roadmap:[2693] trunk/roadmap/src/android

From: <dan...@us...> - 2012-01-29 15:36:44

Revision: 2693
          http://roadmap.svn.sourceforge.net/roadmap/?rev=2693&view=rev
Author:   dannybackx
Date:     2012-01-29 15:36:37 +0000 (Sun, 29 Jan 2012)
Log Message:
-----------
Looks like I never committed EclairHelper.

Modified Paths:
--------------
    trunk/roadmap/src/android/Makefile
    trunk/roadmap/src/android/src/net/sourceforge/projects/roadmap/Panel.java
    trunk/roadmap/src/android/src/net/sourceforge/projects/roadmap/Pen.java
    trunk/roadmap/src/android/src/net/sourceforge/projects/roadmap/RoadMap.java

Added Paths:
-----------
    trunk/roadmap/src/android/src/net/sourceforge/projects/roadmap/EclairHelper.java

Modified: trunk/roadmap/src/android/Makefile
===================================================================
--- trunk/roadmap/src/android/Makefile	2011-08-18 15:55:53 UTC (rev 2692)
+++ trunk/roadmap/src/android/Makefile	2012-01-29 15:36:37 UTC (rev 2693)
@@ -32,20 +32,32 @@
 # TARGETS += demomaps.apk
 
 #
-# I used this with Android 2.3
+# Definitions to get a Makefile to work with Android SDK/NDK.
+# Some of these require configuration or version dependent changes,
+# the ones at the top are more likely to require that than the lower ones.
 #
 
-NDKHOME=	/home/danny/src/android/android-ndk-r5
+#
+# This is the place where you chose to install the Android SDK and NDK.
+#
+SDKHOME=	/home/danny/src/android/android-sdk-linux_86
+NDKHOME=	/home/danny/src/android/android-ndk-r6
+#
+# The number here is the Android SDK API level, e.g. 13 for Android 3.2 .
+#
+SDK_ANDV=	android-13
 NDK_LEVEL=	9
+#
+# In theory, the stuff below should not change (much) between Android releases.
+#
+NDK_NAME=	arm-linux-androideabi-4.4.0
+NDK_TARGET=	arm-linux-androideabi
 NDK_ARCH=	arm
-NDK_NAME=	arm-eabi-4.4.0
 NDK_PREFIX=	linux-x86
 NDK_SYSROOT=	${NDKHOME}/platforms/android-${NDK_LEVEL}/arch-${NDK_ARCH}
 NDK_CC=		${NDKHOME}/toolchains/${NDK_NAME}/prebuilt/${NDK_SYSTEM}/bin/${NDK_PREFIX}gcc --sysroot=${NDK_SYSROOT}
 NDK_LDFLAGS=	'-Wl,--fix-cortex-a8'
 
-SDKHOME=	/home/danny/src/android/android-sdk-linux_86
-SDK_ANDV=	android-9
 SDKPLAT=	${SDKHOME}/platforms/${SDK_ANDV}
 NDK_CFLAGS=	-I$(NDKHOME)/platforms/android-${NDK_LEVEL}/arch-${NDK_ARCH}/usr/include \
 		-DANDROID -fno-short-enums -g
@@ -53,7 +65,7 @@
 JAVA=		/usr/share/java
 JAVAC_FLAGS=	-cp ${JAVA}/jaxp_parser_impl.jar:${JAVA}/xml-commons-apis.jar:${JAVA}/antlr.jar:${JAVA}/ant/ant-antlr.jar:${JAVA}/regexp.jar:${JAVA}/ant/ant-apache-regexp.jar:${JAVA}/jakarta-commons-logging.jar:${JAVA}/ant/ant-commons-logging.jar:${JAVA}/javamail.jar:${JAVA}/jaf.jar:${JAVA}/ant/ant-javamail.jar:${JAVA}/jsch.jar:${JAVA}/ant/ant-jsch.jar:/usr/lib/jvm/java/lib/tools.jar:${SDKPLAT}/android.jar -sourcepath gen:src -bootclasspath ${SDKPLAT}/android.jar
 SRCNAME=	RoadMap
-CLSES=		${DIRHIER}/RoadMap.class ${DIRHIER}/Panel.class ${DIRHIER}/Pen.class
+CLSES=		${DIRHIER}/RoadMap.class ${DIRHIER}/Panel.class ${DIRHIER}/Pen.class ${DIRHIER}/EclairHelper.class
 DX=		${SDKHOME}/platform-tools/dx
 AAPT=		${SDKHOME}/platform-tools/aapt
 APKBUILDER=	${SDKHOME}/tools/apkbuilder
@@ -121,6 +133,9 @@
 ${DIRHIER}/Pen.class:	src/${DIRHIER}/Pen.java
 	javac ${JAVAC_FLAGS} -d . src/${DIRHIER}/Pen.java
 
+${DIRHIER}/EclairHelper.class:	src/${DIRHIER}/EclairHelper.java
+	javac ${JAVAC_FLAGS} -d . src/${DIRHIER}/EclairHelper.java
+
 RMLIBS=	../libguiroadmap.a ../libroadmap.a ../gpx/libgpx.a ../unix/libosroadmap.a \
 	-L/opt/android/lib -lexpat-1
 RMDLIBS=	../libguiroadmap.a ../libroadmap.a ../gpx/libgpx.a ../unix/libosroadmap.a
@@ -136,8 +151,8 @@
 		../win32/roadmap_colors.c \
 		roadmap_sound.c
 
-libs/armeabi/gdbserver:	${NDKHOME}/toolchains/arm-eabi-4.4.0/prebuilt/gdbserver
-	cp ${NDKHOME}/toolchains/arm-eabi-4.4.0/prebuilt/gdbserver libs/armeabi/gdbserver
+libs/armeabi/gdbserver:	${NDKHOME}/toolchains/arm-linux-androideabi-4.4.3/prebuilt/gdbserver
+	cp ${NDKHOME}/toolchains/arm-linux-androideabi-4.4.3/prebuilt/gdbserver libs/armeabi/gdbserver
 
 libs/armeabi/gdb.setup:
 	echo "set solib-search-path libs/armeabi" >$@
@@ -147,7 +162,7 @@
 
 libs/armeabi/librmnative.so:	${RMANDROID} ${RMDLIBS} /opt/android/lib/libgps.a
 	-mkdir -p libs/armeabi
-	arm-eabi-gcc --Wl,-soname,librmnative.so -o libs/armeabi/librmnative.so \
+	${NDK_TARGET}-gcc --Wl,-soname,librmnative.so -o libs/armeabi/librmnative.so \
 		${NDK_CFLAGS} ${NDK_LDFLAGS} \
 		${RMANDROID} \
 		${RMLIBS} \

Added: trunk/roadmap/src/android/src/net/sourceforge/projects/roadmap/EclairHelper.java
===================================================================
--- trunk/roadmap/src/android/src/net/sourceforge/projects/roadmap/EclairHelper.java	                        (rev 0)
+++ trunk/roadmap/src/android/src/net/sourceforge/projects/roadmap/EclairHelper.java	2012-01-29 15:36:37 UTC (rev 2693)
@@ -0,0 +1,53 @@
+/*
+ * LICENSE:
+ *
+ *   Copyright (c) 2011, Danny Backx
+ *
+ *   This file is part of RoadMap.
+ *
+ *   RoadMap 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.
+ *
+ *   RoadMap 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 RoadMap; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+/**
+ * @file
+ * @brief Code to support running on "Eclair", Android 1.6 .
+ *
+ * This class is only used to avoid linking functions that are unsupported in
+ * older versions of Android.
+ * See the MainSetInput function in the RoadMap class.
+ *
+ * @ingroup android
+ */
+package net.sourceforge.projects.roadmap;
+
+import android.location.LocationManager;
+import android.location.GpsStatus.NmeaListener;
+
+class EclairHelper {
+   static int	InputHandler;
+
+   static native void NMEALogger(int id, String nmea);
+
+   static NmeaListener onNmea = new NmeaListener() {
+      public void onNmeaReceived(long ts, String nmea) {
+         NMEALogger(InputHandler, nmea);
+      }
+   };
+
+   static void MainSetInputAndroid(LocationManager mgr, int id) {
+      InputHandler = id;
+      mgr.addNmeaListener(onNmea);
+   };
+}


Property changes on: trunk/roadmap/src/android/src/net/sourceforge/projects/roadmap/EclairHelper.java
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: trunk/roadmap/src/android/src/net/sourceforge/projects/roadmap/Panel.java
===================================================================
--- trunk/roadmap/src/android/src/net/sourceforge/projects/roadmap/Panel.java	2011-08-18 15:55:53 UTC (rev 2692)
+++ trunk/roadmap/src/android/src/net/sourceforge/projects/roadmap/Panel.java	2012-01-29 15:36:37 UTC (rev 2693)
@@ -67,7 +67,9 @@
 		if (cacheBitmap != null)
 			return;
 
-		Log.e("RoadMap Panel", "Size wid " + getWidth() + ", ht " + getHeight());
+		Log.e("RoadMap Panel", "Size wid " + getWidth() + ", ht " + getHeight()
+			+ ", margins left " + getLeft() + " right " + getRight()
+			+ " top " + getTop() + " bottom " + getBottom());
 		cacheBitmap = Bitmap.createBitmap(getWidth(), getHeight(), Bitmap.Config.ARGB_8888);
 		cacheCanvas = new Canvas(cacheBitmap);
 
@@ -179,6 +181,11 @@
 		pen.SetThickness(thickness);
 	}
 
+	public int SetForegroundInt(int colorvalue)
+	{
+		return pen.SetForegroundInt(colorvalue);
+	}
+
 	public int SetForeground(String color)
 	{
 		return pen.SetForeground(color);

Modified: trunk/roadmap/src/android/src/net/sourceforge/projects/roadmap/Pen.java
===================================================================
--- trunk/roadmap/src/android/src/net/sourceforge/projects/roadmap/Pen.java	2011-08-18 15:55:53 UTC (rev 2692)
+++ trunk/roadmap/src/android/src/net/sourceforge/projects/roadmap/Pen.java	2012-01-29 15:36:37 UTC (rev 2693)
@@ -78,6 +78,18 @@
 		return 0;
 	}
 
+	public int SetForegroundInt(int colorvalue)
+	{
+		try {
+			Log.e("RoadMap", "SetForegroundInt(" + colorvalue + ")");
+			pens[current].setColor(colorvalue);
+		} catch (Exception e) {
+			Log.e("RoadMap", "SetForegroundInt(" + colorvalue + ") failed : " + e);
+			return -2;
+		};
+		return 0;
+	}
+
 	public void SetLineStyle(int dashed)
 	{
 		try {

Modified: trunk/roadmap/src/android/src/net/sourceforge/projects/roadmap/RoadMap.java
===================================================================
--- trunk/roadmap/src/android/src/net/sourceforge/projects/roadmap/RoadMap.java	2011-08-18 15:55:53 UTC (rev 2692)
+++ trunk/roadmap/src/android/src/net/sourceforge/projects/roadmap/RoadMap.java	2012-01-29 15:36:37 UTC (rev 2693)
@@ -1,7 +1,7 @@
 /*
  * LICENSE:
  *
- *   Copyright (c) 2010, 2011, Danny Backx
+ *   Copyright (c) 2010, 2011, 2012, Danny Backx
  *
  *   This file is part of RoadMap.
  *
@@ -42,6 +42,8 @@
 
 import android.os.Handler;
 import android.os.Message;
+import android.os.Build;
+import android.os.Build.VERSION_CODES;
 
 import android.widget.Button;
 import android.widget.ImageButton;
@@ -61,10 +63,9 @@
 import android.location.Location;
 import android.location.LocationListener;
 import android.location.LocationManager;
-import android.location.LocationManager;
 import android.location.GpsStatus;
 import android.location.GpsStatus.Listener;
-import android.location.GpsStatus.NmeaListener;
+// import android.location.GpsStatus.NmeaListener;
 import android.location.GpsSatellite;
 
 import android.content.res.AssetManager;
@@ -95,6 +96,9 @@
 import android.net.Uri;
 import java.io.File;
 
+import android.view.WindowManager;
+import android.util.DisplayMetrics;
+
 public class RoadMap extends Activity
 {
 	private LocationManager mgr = null;
@@ -108,7 +112,7 @@
 
 	AssetManager		asm;
 	PowerManager		power;
-	PowerManager.WakeLock	wl;
+	PowerManager.WakeLock	wl = null;
 
 	/*
 	 * References to native functions
@@ -129,7 +133,6 @@
 	public native void DialogSpecialCallback(int dlg, int btn);
 	public native void ReturnStringDataHack(String s);
 	public native void RoadMapDialogChosen(int dlg, int position, long id);
-	public native void NMEALogger(int id, String nmea);
 	public native void FileSelectionResult(String filename);
 	public native int MonitorSocketIO();
 	public native void HandleSocketIO(int ix);
@@ -158,10 +161,14 @@
 		/*
 		 * Keep on the screen, possibly dimmed.
 		 */
+		/*
 		power = (PowerManager)getSystemService(POWER_SERVICE);
 		wl = power.newWakeLock(PowerManager.SCREEN_DIM_WAKE_LOCK, "RoadMap");
 		wl.acquire();
+		*/
 
+		getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+
 		/*
 		 * Some experimental code - not really used yet - to try and
 		 * figure out stuff about Android packaging, bitmaps, ..
@@ -189,17 +196,41 @@
 		 */
 		JniStart();
 
-		// Don't do this here - moved to Panel
-		// so we're sure that the View is created first.
+		/* Figure out our Android level */
+		try {
+		   Log.e("RoadMap", "We're running on Android version "
+		   + Build.VERSION.SDK_INT
+		   + " (" + Build.VERSION.CODENAME
+		   + "," + Build.VERSION.INCREMENTAL
+		   + "," + Build.VERSION.RELEASE
+		   + ")");
+		} catch (Exception es) {
+		   Log.e("RoadMap", "Cannot assert software level : " + es);
+		};
+
+		try {
+		   Log.e("RoadMap", "Hardware "
+		   + Build.BOARD
+		   + "," + Build.BRAND
+		   + "," + Build.DEVICE);
+		} catch (Exception eh) {
+		   Log.e("RoadMap", "Cannot assert hardware level : " + eh);
+		};
+
 		//
-		// RoadMapStart();
+		// Show some data about our display
+		//
+		DisplayMetrics metrics = new DisplayMetrics();
+		getWindowManager().getDefaultDisplay().getMetrics(metrics);
+		Log.e("RoadMap", "Display dpi " + metrics.densityDpi
+			+ " (x " + metrics.xdpi + " y " + metrics.ydpi + ") pixels x " + metrics.widthPixels + " y " + metrics.heightPixels);
 	}
 
 	@Override
 	public void onPause()
 	{
 		super.onPause();
-		wl.release();
+		if (wl != null) wl.release();
 	}
 
 	@Override
@@ -213,7 +244,7 @@
 	public void onRestart()
 	{
 		super.onRestart();
-		wl.acquire();
+		if (wl != null) wl.acquire();
 	}
 
 	private void displayFiles (AssetManager mgr, String path) {
@@ -276,14 +307,23 @@
 		mgr.removeGpsStatusListener(onGpsChange);
 	}
 
+	/**
+	 * @brief this function is more complicated because it calls a helper class to avoid
+	 * using stuff that didn't exist in earlier versions of Android.
+	 *
+	 * In this case, the functionality is NMEA logging.
+	 */
 	public void MainSetInputAndroid(int id) {
-		InputHandler = id;
+	   InputHandler = id;
 
-		try {
-			mgr.addNmeaListener(onNmea);
-		} catch (Exception e) {
-			Log.e("RoadMap", "MainSetInputAndroid exception" + e);
-		}
+	   /* Only call if Android supports it. */
+	   try {
+	      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ECLAIR) {
+	         EclairHelper.MainSetInputAndroid(mgr, id);
+	      }
+	   } catch (Exception e) {
+	      Log.e("RoadMap", "MainSetInputAndroid exception" + e);
+	   }
 	}
 
 	Handler socketHandler = new Handler() {
@@ -335,12 +375,6 @@
 		slt.start();
 	}
 
-	NmeaListener onNmea = new NmeaListener() {
-		public void onNmeaReceived(long ts, String nmea) {
-			NMEALogger(InputHandler, nmea);
-		}
-	};
-
 	LocationListener onLocationChange = new LocationListener() {
 		int mystatus;
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Roadmap-commit] SF.net SVN: roadmap:[2692] trunk/roadmap/src

From: <pg...@us...> - 2011-08-18 15:55:59

Revision: 2692
          http://roadmap.svn.sourceforge.net/roadmap/?rev=2692&view=rev
Author:   pgf
Date:     2011-08-18 15:55:53 +0000 (Thu, 18 Aug 2011)

Log Message:
-----------
fix compilation errors when libgps is in use.

Modified Paths:
--------------
    trunk/roadmap/src/config.mk
    trunk/roadmap/src/roadmap_gps.c
    trunk/roadmap/src/roadmap_gps.h

Modified: trunk/roadmap/src/config.mk
===================================================================
--- trunk/roadmap/src/config.mk	2011-08-18 15:17:54 UTC (rev 2691)
+++ trunk/roadmap/src/config.mk	2011-08-18 15:55:53 UTC (rev 2692)
@@ -122,8 +122,8 @@
 # If the library isn't used, roadmap's "gpsd3" protocol mode will
 # attempt to use the NMEA mode offered by the new gpsd versions.
 #
-# CFLAGS += -DROADMAP_USES_LIBGPS
-# LIBS += -lgps
+CFLAGS += -DROADMAP_USES_LIBGPS
+LIBS += -lgps
 
 # RoadMap users in the USA will probably use the Tiger maps from
 # the US Census bureau.  These maps do not requre "shapefile"

Modified: trunk/roadmap/src/roadmap_gps.c
===================================================================
--- trunk/roadmap/src/roadmap_gps.c	2011-08-18 15:17:54 UTC (rev 2691)
+++ trunk/roadmap/src/roadmap_gps.c	2011-08-18 15:55:53 UTC (rev 2692)
@@ -629,7 +629,7 @@
  * @param speed
  * @param steering
  */
-static void roadmap_gps_navigation (char status,
+void roadmap_gps_navigation (char status,
                                     int gmt_time,
                                     int latitude,
                                     int longitude,
@@ -686,7 +686,7 @@
  * @param strength
  * @param active
  */
-static void roadmap_gps_satellites  (int sequence,
+void roadmap_gps_satellites  (int sequence,
                                      int id,
                                      int elevation,
                                      int azimuth,
@@ -737,7 +737,7 @@
  * @param horizontal Latitude position uncertainty, meters
  * @param vertical Vertical position uncertainty, meters
  */
-static void roadmap_gps_dilution (int dimension,
+void roadmap_gps_dilution (int dimension,
                                   double position,
                                   double horizontal,
                                   double vertical) {

Modified: trunk/roadmap/src/roadmap_gps.h
===================================================================
--- trunk/roadmap/src/roadmap_gps.h	2011-08-18 15:17:54 UTC (rev 2691)
+++ trunk/roadmap/src/roadmap_gps.h	2011-08-18 15:55:53 UTC (rev 2692)
@@ -149,5 +149,22 @@
 extern roadmap_gps_periodic_control RoadMapGpsPeriodicAdd;
 extern roadmap_gps_periodic_control RoadMapGpsPeriodicRemove;
 
+extern void roadmap_gps_navigation (char status,
+                                    int gmt_time,
+                                    int latitude,
+                                    int longitude,
+                                    int altitude,   // "preferred" units
+                                    int speed,      // knots
+                                    int steering);
+void roadmap_gps_satellites  (int sequence,
+                                     int id,
+                                     int elevation,
+                                     int azimuth,
+                                     int strength,
+                                     int active);
+void roadmap_gps_dilution (int dimension,
+                                  double position,
+                                  double horizontal,
+                                  double vertical);
 #endif // INCLUDED__ROADMAP_GPS__H
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Roadmap-commit] SF.net SVN: roadmap:[2691] trunk/roadmap/src

From: <pg...@us...> - 2011-08-18 15:18:00

Revision: 2691
          http://roadmap.svn.sourceforge.net/roadmap/?rev=2691&view=rev
Author:   pgf
Date:     2011-08-18 15:17:54 +0000 (Thu, 18 Aug 2011)

Log Message:
-----------
suppress some minor type incompatibility warnings

Modified Paths:
--------------
    trunk/roadmap/src/buildmap_osm_binary.c
    trunk/roadmap/src/roadmap_io.c

Modified: trunk/roadmap/src/buildmap_osm_binary.c
===================================================================
--- trunk/roadmap/src/buildmap_osm_binary.c	2011-08-18 15:17:45 UTC (rev 2690)
+++ trunk/roadmap/src/buildmap_osm_binary.c	2011-08-18 15:17:54 UTC (rev 2691)
@@ -515,8 +515,8 @@
     /*
      * Interpret the HTTP error code, if present
      */
-    if (slen > 14 && strncasecmp(data+5, "http", 4) == 0) {
-       error = atoi(data + 14);
+    if (slen > 14 && strncasecmp((char *)data+5, "http", 4) == 0) {
+       error = atoi((char *)data + 14);
        return -error;
     }
     return -1;

Modified: trunk/roadmap/src/roadmap_io.c
===================================================================
--- trunk/roadmap/src/roadmap_io.c	2011-08-18 15:17:45 UTC (rev 2690)
+++ trunk/roadmap/src/roadmap_io.c	2011-08-18 15:17:54 UTC (rev 2691)
@@ -36,6 +36,7 @@
  */
 
 #include "roadmap_io.h"
+#include "string.h"
 #include "roadmap.h"
 
 
@@ -97,7 +98,7 @@
          return length; /* It's all done, since there is nothing to do. */
 
       case ROADMAP_IO_MEMORY:
-	 io->os.data = data;
+	 io->os.data = (void *)data;
          return length;
    }
    return -1;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Roadmap-commit] SF.net SVN: roadmap:[2690] trunk/roadmap/src/roadmap_start.c

From: <pg...@us...> - 2011-08-18 15:17:51

Revision: 2690
          http://roadmap.svn.sourceforge.net/roadmap/?rev=2690&view=rev
Author:   pgf
Date:     2011-08-18 15:17:45 +0000 (Thu, 18 Aug 2011)

Log Message:
-----------
move gps initialization earlier.

the recent addition of clearing the listeners array caused the track
listener to be clobbered.

Modified Paths:
--------------
    trunk/roadmap/src/roadmap_start.c

Modified: trunk/roadmap/src/roadmap_start.c
===================================================================
--- trunk/roadmap/src/roadmap_start.c	2011-08-18 15:17:37 UTC (rev 2689)
+++ trunk/roadmap/src/roadmap_start.c	2011-08-18 15:17:45 UTC (rev 2690)
@@ -1613,6 +1613,7 @@
 
    roadmap_option_initialize   ();
    roadmap_math_initialize     ();
+   roadmap_gps_initialize      ();
    roadmap_trip_initialize     ();
 #ifdef HAVE_NAVIGATE_PLUGIN
    roadmap_tripdb_initialize   ();
@@ -1626,7 +1627,6 @@
    roadmap_label_initialize    ();
    roadmap_display_initialize  ();
    roadmap_voice_initialize    ();
-   roadmap_gps_initialize      ();
    roadmap_track_initialize    ();
    roadgps_screen_initialize ();
    roadmap_canvas_register_configure_handler (roadmap_start_screen_configure);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Roadmap-commit] SF.net SVN: roadmap:[2689] trunk/roadmap/src/unix/roadmap_path.c

From: <pg...@us...> - 2011-08-18 15:17:43

Revision: 2689
          http://roadmap.svn.sourceforge.net/roadmap/?rev=2689&view=rev
Author:   pgf
Date:     2011-08-18 15:17:37 +0000 (Thu, 18 Aug 2011)

Log Message:
-----------
fix pointer type warnings

Modified Paths:
--------------
    trunk/roadmap/src/unix/roadmap_path.c

Modified: trunk/roadmap/src/unix/roadmap_path.c
===================================================================
--- trunk/roadmap/src/unix/roadmap_path.c	2011-08-18 15:17:26 UTC (rev 2688)
+++ trunk/roadmap/src/unix/roadmap_path.c	2011-08-18 15:17:37 UTC (rev 2689)
@@ -76,7 +76,7 @@
 static const char *RoadMapUser = NULL;
 static const char *RoadMapTrips = NULL;
 static char *RoadMapPathHome = NULL;
-static const char *RoadMapPathEmptyList = NULL;
+static char *RoadMapPathEmptyList = NULL;
 
 /**
  * @brief This list exist because the user context is a special case


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Roadmap-commit] SF.net SVN: roadmap:[2688] trunk/roadmap/src/roadmap_start.c

From: <pg...@us...> - 2011-08-18 15:17:32

Revision: 2688
          http://roadmap.svn.sourceforge.net/roadmap/?rev=2688&view=rev
Author:   pgf
Date:     2011-08-18 15:17:26 +0000 (Thu, 18 Aug 2011)

Log Message:
-----------
eliminate nested comment warning

Modified Paths:
--------------
    trunk/roadmap/src/roadmap_start.c

Modified: trunk/roadmap/src/roadmap_start.c
===================================================================
--- trunk/roadmap/src/roadmap_start.c	2011-08-18 15:17:18 UTC (rev 2687)
+++ trunk/roadmap/src/roadmap_start.c	2011-08-18 15:17:26 UTC (rev 2688)
@@ -1251,13 +1251,13 @@
 
    static int RoadMapSynchronous = -1;
 
-   /*
+#ifdef NEEDED
    roadmap_log (ROADMAP_WARNING,
       "roadmap_start_gps_listen(recep %d) frozen %d pos %d %d (%s)",
       reception, RoadMapStartFrozen,
       gps_position->longitude, gps_position->latitude,
       roadmap_start_now());
-   /* */
+#endif
 
    if (RoadMapStartFrozen) {
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Roadmap-commit] SF.net SVN: roadmap:[2687] trunk/roadmap/src

From: <pg...@us...> - 2011-08-18 15:17:24

Revision: 2687
          http://roadmap.svn.sourceforge.net/roadmap/?rev=2687&view=rev
Author:   pgf
Date:     2011-08-18 15:17:18 +0000 (Thu, 18 Aug 2011)

Log Message:
-----------
if libgps isn't being used (no ROADMAP_USES_LIBGPS), arrange for gpsd3:
protocol to ask gpsd to emit NMEA sentences, and use those instead.

Modified Paths:
--------------
    trunk/roadmap/src/config.mk
    trunk/roadmap/src/roadmap_gps.c
    trunk/roadmap/src/roadmap_gps.h
    trunk/roadmap/src/roadmap_gpsd3.c
    trunk/roadmap/src/roadmap_gpsd3.h

Modified: trunk/roadmap/src/config.mk
===================================================================
--- trunk/roadmap/src/config.mk	2011-08-18 15:17:04 UTC (rev 2686)
+++ trunk/roadmap/src/config.mk	2011-08-18 15:17:18 UTC (rev 2687)
@@ -119,6 +119,8 @@
 #
 # Implement the new gpsd protocol, referred to as gpsd3 .
 # This requires the libgps library, part of the gpsd distribution.
+# If the library isn't used, roadmap's "gpsd3" protocol mode will
+# attempt to use the NMEA mode offered by the new gpsd versions.
 #
 # CFLAGS += -DROADMAP_USES_LIBGPS
 # LIBS += -lgps

Modified: trunk/roadmap/src/roadmap_gps.c
===================================================================
--- trunk/roadmap/src/roadmap_gps.c	2011-08-18 15:17:04 UTC (rev 2686)
+++ trunk/roadmap/src/roadmap_gps.c	2011-08-18 15:17:18 UTC (rev 2687)
@@ -362,7 +362,7 @@
 
 /* NMEA protocol support ----------------------------------------------- */
 
-static RoadMapNmeaAccount RoadMapGpsNmeaAccount;
+RoadMapNmeaAccount RoadMapGpsNmeaAccount;
 static RoadMapNmeaAccount RoadMapGpsExtendedAccount;
 
 /**
@@ -593,7 +593,7 @@
 /**
  * @brief
  */
-static void roadmap_gps_nmea (void) {
+void roadmap_gps_nmea (void) {
 
    if (RoadMapGpsNmeaAccount == NULL) {
       RoadMapGpsNmeaAccount = roadmap_gps_subscribe (RoadMapGpsTitle);
@@ -1120,9 +1120,7 @@
 
       case ROADMAP_GPS_GPSD3:
 
-         roadmap_gpsd3_subscribe_to_navigation (roadmap_gps_navigation);
-         roadmap_gpsd3_subscribe_to_satellites (roadmap_gps_satellites);
-         roadmap_gpsd3_subscribe_to_dilution   (roadmap_gps_dilution);
+         roadmap_gpsd3_subscriptions();
          break;
 
       case ROADMAP_GPS_VII:
@@ -1218,7 +1216,7 @@
       case ROADMAP_GPS_GPSD3:
 
          decode.decoder = roadmap_gpsd3_decode;
-         decode.decoder_context = NULL;
+         decode.decoder_context = roadmap_gpsd3_decoder_context();
          break;
 
       case ROADMAP_GPS_VII:

Modified: trunk/roadmap/src/roadmap_gps.h
===================================================================
--- trunk/roadmap/src/roadmap_gps.h	2011-08-18 15:17:04 UTC (rev 2686)
+++ trunk/roadmap/src/roadmap_gps.h	2011-08-18 15:17:18 UTC (rev 2687)
@@ -126,7 +126,7 @@
 
 void roadmap_gps_register_logger (roadmap_gps_logger logger);
 
-
+void roadmap_gps_nmea (void);
 void roadmap_gps_open   (void);
 void roadmap_gps_input  (RoadMapIO *io);
 int  roadmap_gps_active (void);

Modified: trunk/roadmap/src/roadmap_gpsd3.c
===================================================================
--- trunk/roadmap/src/roadmap_gpsd3.c	2011-08-18 15:17:04 UTC (rev 2686)
+++ trunk/roadmap/src/roadmap_gpsd3.c	2011-08-18 15:17:18 UTC (rev 2687)
@@ -34,6 +34,8 @@
 
 #include "roadmap.h"
 #include "roadmap_gpsd3.h"
+#include "roadmap_gps.h"
+#include "roadmap_nmea.h"
 
 #if defined(ROADMAP_USES_LIBGPS)
 /* This include won't work on WinCE but libgps won't run on WinCE either. */
@@ -49,11 +51,13 @@
 static RoadMapGpsdDilution   RoadmapGpsd2DilutionListener = NULL;
 
 RoadMapSocket gpsd3_socket;
+#ifdef ROADMAP_USES_LIBGPS
 #if GPSD_API_MAJOR_VERSION == 5
 struct gps_data_t	gpsd_e, *gpsdp = &gpsd_e;
 #else
 struct gps_data_t	*gpsdp = NULL;
 #endif
+#endif
 
 RoadMapSocket roadmap_gpsd3_connect (const char *name) {
 #if defined(ROADMAP_USES_LIBGPS) && defined(GPSD_API_MAJOR_VERSION)
@@ -69,7 +73,25 @@
 #endif
    return (RoadMapSocket)gpsdp->gps_fd;
 #else /* ! (defined(ROADMAP_USES_LIBGPS) && defined(GPSD_API_MAJOR_VERSION)) */
-   return ROADMAP_INVALID_SOCKET;
+   gpsd3_socket = roadmap_net_connect ("tcp", name, 2947);
+
+   if (ROADMAP_NET_IS_VALID(gpsd3_socket)) {
+
+      /* Start watching what happens. */
+
+      static const char request[] = "?WATCH={\"enable\":true,\"nmea\":true}\n";
+
+      if (roadmap_net_send
+	    (gpsd3_socket, request, sizeof(request)-1) != sizeof(request)-1) {
+
+	 roadmap_log (ROADMAP_WARNING, "Lost gpsd server session");
+	 roadmap_net_close (gpsd3_socket);
+
+	 return ROADMAP_INVALID_SOCKET;
+      }
+   }
+
+   return gpsd3_socket;
 #endif /* defined(ROADMAP_USES_LIBGPS) && defined(GPSD_API_MAJOR_VERSION) */
 }
 
@@ -90,7 +112,28 @@
    RoadmapGpsd2DilutionListener = dilution;
 }
 
+void roadmap_gpsd3_subscriptions(void)
+{
+#ifdef ROADMAP_USES_LIBGPS
+	 roadmap_gpsd3_subscribe_to_navigation (roadmap_gps_navigation);
+	 roadmap_gpsd3_subscribe_to_satellites (roadmap_gps_satellites);
+	 roadmap_gpsd3_subscribe_to_dilution   (roadmap_gps_dilution);
+#else
+	 roadmap_gps_nmea();
+#endif
+}
 
+void *roadmap_gpsd3_decoder_context(void)
+{
+#ifdef ROADMAP_USES_LIBGPS
+	 return NULL;
+#else
+	 extern RoadMapNmeaAccount RoadMapGpsNmeaAccount;
+	 return (void *)RoadMapGpsNmeaAccount;
+#endif
+}
+  
+
 int roadmap_gpsd3_decode (void *user_context,
                           void *decoder_context, char *sentence) {
 #ifdef ROADMAP_USES_LIBGPS
@@ -171,6 +214,6 @@
 
    return 1;
 #else
-   return 0;
+   return roadmap_nmea_decode (user_context, decoder_context, sentence);
 #endif
 }

Modified: trunk/roadmap/src/roadmap_gpsd3.h
===================================================================
--- trunk/roadmap/src/roadmap_gpsd3.h	2011-08-18 15:17:04 UTC (rev 2686)
+++ trunk/roadmap/src/roadmap_gpsd3.h	2011-08-18 15:17:18 UTC (rev 2687)
@@ -37,13 +37,10 @@
 #include "roadmap_net.h"
 #include "roadmap_input.h"
 
-void roadmap_gpsd3_subscribe_to_navigation (RoadMapGpsdNavigation navigation);
+void roadmap_gpsd3_subscriptions(void);
+void *roadmap_gpsd3_decoder_context(void);
 
-void roadmap_gpsd3_subscribe_to_satellites (RoadMapGpsdSatellite satellite);
 
-void roadmap_gpsd3_subscribe_to_dilution   (RoadMapGpsdDilution dilution);
-
-
 RoadMapSocket roadmap_gpsd3_connect (const char *name);
 
 int roadmap_gpsd3_decode (void *user_context,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Roadmap-commit] SF.net SVN: roadmap:[2686] trunk/roadmap/src/config.mk

From: <pg...@us...> - 2011-08-18 15:17:10

Revision: 2686
          http://roadmap.svn.sourceforge.net/roadmap/?rev=2686&view=rev
Author:   pgf
Date:     2011-08-18 15:17:04 +0000 (Thu, 18 Aug 2011)

Log Message:
-----------
don't build android by default

Modified Paths:
--------------
    trunk/roadmap/src/config.mk

Modified: trunk/roadmap/src/config.mk
===================================================================
--- trunk/roadmap/src/config.mk	2011-05-02 18:29:43 UTC (rev 2685)
+++ trunk/roadmap/src/config.mk	2011-08-18 15:17:04 UTC (rev 2686)
@@ -45,14 +45,14 @@
 # For the SDK/NDK development environments used, I recomment the latest.
 # Currently this has been tested with the tools for Android 2.3 (SDK r9, NDK r5).
 #
-NDK = /home/danny/src/android/android-ndk-r5
-CROSS=arm-eabi-
-CFLAGS += -I$(NDK)/platforms/android-9/arch-arm/usr/include \
-	  -I$(NDK)/apps/ndk_demo/project/jni \
-	  -DANDROID \
-	  -fno-short-enums -g -Wl,--fix-cortex-a8
-LIBS +=
-
+# NDK = /home/danny/src/android/android-ndk-r5
+# CROSS=arm-eabi-
+# CFLAGS += -I$(NDK)/platforms/android-9/arch-arm/usr/include \
+# 	  -I$(NDK)/apps/ndk_demo/project/jni \
+# 	  -DANDROID \
+# 	  -fno-short-enums -g -Wl,--fix-cortex-a8
+# LIBS +=
+# 
 # Support for WINCE is still a work in progress.
 # If you select WINCE for your WinCE device, you'll need the
 # arm-wince-mingw32ce cross-compiler.  Uncomment these 3


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Roadmap-commit] roadmap/src roadmap_start.c,1.164,1.165

From: Paul F. <pg...@us...> - 2011-08-15 16:13:02

Update of /cvsroot/roadmap/roadmap/src
In directory vz-cvs-4.sog:/tmp/cvs-serv11358

Modified Files:
	roadmap_start.c 
Log Message:
move gps initialization earlier.  the recent addition of clearing the
listeners array caused the track listener to be clobbered.


Index: roadmap_start.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_start.c,v
retrieving revision 1.164
retrieving revision 1.165
diff -C2 -d -r1.164 -r1.165
*** roadmap_start.c	15 Aug 2011 16:11:15 -0000	1.164
--- roadmap_start.c	15 Aug 2011 16:13:00 -0000	1.165
***************
*** 1614,1617 ****
--- 1614,1618 ----
     roadmap_option_initialize   ();
     roadmap_math_initialize     ();
+    roadmap_gps_initialize      ();
     roadmap_trip_initialize     ();
  #ifdef HAVE_NAVIGATE_PLUGIN
***************
*** 1628,1632 ****
     roadmap_display_initialize  ();
     roadmap_voice_initialize    ();
-    roadmap_gps_initialize      ();
     roadgps_screen_initialize ();
     roadmap_canvas_register_configure_handler (roadmap_start_screen_configure);
--- 1629,1632 ----

[Roadmap-commit] roadmap/src buildmap_dbwrite.c, 1.9, 1.10 buildmap_point.c, 1.12, 1.13 roadmap_dialog.h, 1.9, 1.10 roadmap_factory.h, 1.15, 1.16 roadmap_history.h, 1.2, 1.3 roadmap_path.h, 1.12, 1.13 roadmap_start.c, 1.163, 1.164

From: Paul F. <pg...@us...> - 2011-08-15 16:11:17

Update of /cvsroot/roadmap/roadmap/src
In directory vz-cvs-4.sog:/tmp/cvs-serv10136

Modified Files:
	buildmap_dbwrite.c buildmap_point.c roadmap_dialog.h 
	roadmap_factory.h roadmap_history.h roadmap_path.h 
	roadmap_start.c 
Log Message:
clean up a bunch of needless build warnings


Index: roadmap_factory.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_factory.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** roadmap_factory.h	19 Aug 2010 20:32:09 -0000	1.15
--- roadmap_factory.h	15 Aug 2011 16:11:15 -0000	1.16
***************
*** 74,77 ****
--- 74,78 ----
  
  void roadmap_factory_usage (const char *section, const RoadMapAction *action);
+ void roadmap_factory_initialize (void);
  void roadmap_factory_shutdown (void);
  

Index: roadmap_dialog.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_dialog.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** roadmap_dialog.h	12 Feb 2009 18:51:38 -0000	1.9
--- roadmap_dialog.h	15 Aug 2011 16:11:15 -0000	1.10
***************
*** 202,205 ****
--- 202,207 ----
  #endif
  
+ void roadmap_dialog_shutdown (void);
+ 
  void roadmap_dialog_new_progress (const char *frame, const char *name);
  void  roadmap_dialog_set_progress (const char *frame, const char *name, int progress);

Index: roadmap_path.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_path.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** roadmap_path.h	25 Jun 2008 21:43:34 -0000	1.12
--- roadmap_path.h	15 Aug 2011 16:11:15 -0000	1.13
***************
*** 148,151 ****
--- 148,153 ----
  const char *roadmap_path_temporary (void);
  
+ void roadmap_path_shutdown (void);
+ 
  #endif // INCLUDE__ROADMAP_PATH__H
  

Index: buildmap_point.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/buildmap_point.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** buildmap_point.c	17 Nov 2010 00:05:28 -0000	1.12
--- buildmap_point.c	15 Aug 2011 16:11:15 -0000	1.13
***************
*** 375,379 ****
     buildmap_db *table_bysquare;
  
!    if (!PointCount) return;
  
     buildmap_info ("saving %d points...", PointCount);
--- 375,379 ----
     buildmap_db *table_bysquare;
  
!    if (!PointCount) return 0;
  
     buildmap_info ("saving %d points...", PointCount);

Index: roadmap_history.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_history.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** roadmap_history.h	7 Jul 2003 03:58:28 -0000	1.2
--- roadmap_history.h	15 Aug 2011 16:11:15 -0000	1.3
***************
*** 41,43 ****
--- 41,45 ----
  void roadmap_history_save  (void);
  
+ void roadmap_history_shutdown (void);
+ 
  #endif // INCLUDE__ROADMAP_HISTORY__H

Index: buildmap_dbwrite.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/buildmap_dbwrite.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** buildmap_dbwrite.c	17 Nov 2010 00:05:28 -0000	1.9
--- buildmap_dbwrite.c	15 Aug 2011 16:11:15 -0000	1.10
***************
*** 30,33 ****
--- 30,34 ----
  #include <stdlib.h>
  #include <string.h>
+ #include <unistd.h>
  
  #include "roadmap_types.h"
***************
*** 206,210 ****
   */
  int buildmap_db_remove (const char *path, const char *name) {
-    struct roadmap_db_section *root;
  
     if (path == NULL) {
--- 207,210 ----

Index: roadmap_start.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_start.c,v
retrieving revision 1.163
retrieving revision 1.164
diff -C2 -d -r1.163 -r1.164
*** roadmap_start.c	20 Jan 2011 19:02:57 -0000	1.163
--- roadmap_start.c	15 Aug 2011 16:11:15 -0000	1.164
***************
*** 51,54 ****
--- 51,55 ----
  #include "roadmap_gps.h"
  
+ #include "roadmap_dialog.h"
  #include "roadmap_canvas.h"
  #include "roadmap_time.h"
***************
*** 1251,1255 ****
     static int RoadMapSynchronous = -1;
  
!    /*
     roadmap_log (ROADMAP_WARNING,
        "roadmap_start_gps_listen(recep %d) frozen %d pos %d %d (%s)",
--- 1252,1256 ----
     static int RoadMapSynchronous = -1;
  
! #ifdef NEEDED
     roadmap_log (ROADMAP_WARNING,
        "roadmap_start_gps_listen(recep %d) frozen %d pos %d %d (%s)",
***************
*** 1257,1261 ****
        gps_position->longitude, gps_position->latitude,
        roadmap_start_now());
!    /* */
  
     if (RoadMapStartFrozen) {
--- 1258,1262 ----
        gps_position->longitude, gps_position->latitude,
        roadmap_start_now());
! #endif
  
     if (RoadMapStartFrozen) {

[Roadmap-commit] roadmap/src roadmap_gps.c, 1.53, 1.54 roadmap_gps.h, 1.16, 1.17 roadmap_gpsd3.c, 1.2, 1.3 roadmap_gpsd3.h, 1.1, 1.2

From: Paul F. <pg...@us...> - 2011-08-12 16:33:28

Update of /cvsroot/roadmap/roadmap/src
In directory vz-cvs-4.sog:/tmp/cvs-serv1374

Modified Files:
	roadmap_gps.c roadmap_gps.h roadmap_gpsd3.c roadmap_gpsd3.h 
Log Message:
if libgps isn't being used (no ROADMAP_USES_LIBGPS), arrange for gpsd3:
protocol to ask gpsd to emit NMEA sentences, and use those instead.


Index: roadmap_gpsd3.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_gpsd3.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** roadmap_gpsd3.c	30 Oct 2010 17:51:32 -0000	1.2
--- roadmap_gpsd3.c	12 Aug 2011 16:33:26 -0000	1.3
***************
*** 35,38 ****
--- 35,40 ----
  #include "roadmap.h"
  #include "roadmap_gpsd3.h"
+ #include "roadmap_gps.h"
+ #include "roadmap_nmea.h"
  
  #if defined(ROADMAP_USES_LIBGPS)
***************
*** 49,54 ****
--- 51,60 ----
  static RoadMapGpsdDilution   RoadmapGpsd2DilutionListener = NULL;
  
+ #ifdef ROADMAP_USES_LIBGPS
  RoadMapSocket gpsd3_socket;
  struct gps_data_t	*gpsdp;
+ #else
+ RoadMapSocket gpsd3_socket;
+ #endif
  
  RoadMapSocket roadmap_gpsd3_connect (const char *name) {
***************
*** 60,64 ****
     return (RoadMapSocket)gpsdp->gps_fd;
  #else
!    return 0;
  #endif
  }
--- 66,88 ----
     return (RoadMapSocket)gpsdp->gps_fd;
  #else
!    gpsd3_socket = roadmap_net_connect ("tcp", name, 2947);
! 
!    if (ROADMAP_NET_IS_VALID(gpsd3_socket)) {
! 
!       /* Start watching what happens. */
! 
!       static const char request[] = "?WATCH={\"enable\":true,\"nmea\":true}\n";
! 
!       if (roadmap_net_send
!             (gpsd3_socket, request, sizeof(request)-1) != sizeof(request)-1) {
! 
!          roadmap_log (ROADMAP_WARNING, "Lost gpsd server session");
!          roadmap_net_close (gpsd3_socket);
! 
!          return ROADMAP_INVALID_SOCKET;
!       }
!    }
! 
!    return gpsd3_socket;
  #endif
  }
***************
*** 81,84 ****
--- 105,128 ----
  }
  
+ void roadmap_gpsd3_subscriptions(void)
+ {
+ #ifdef ROADMAP_USES_LIBGPS
+          roadmap_gpsd3_subscribe_to_navigation (roadmap_gps_navigation);
+          roadmap_gpsd3_subscribe_to_satellites (roadmap_gps_satellites);
+          roadmap_gpsd3_subscribe_to_dilution   (roadmap_gps_dilution);
+ #else
+          roadmap_gps_nmea();
+ #endif
+ }
+ 
+ void *roadmap_gpsd3_decoder_context(void)
+ {
+ #ifdef ROADMAP_USES_LIBGPS
+          return NULL;
+ #else
+          extern RoadMapNmeaAccount RoadMapGpsNmeaAccount;
+          return (void *)RoadMapGpsNmeaAccount;
+ #endif
+ }
  
  int roadmap_gpsd3_decode (void *user_context,
***************
*** 152,156 ****
     return 1;
  #else
!    return 0;
  #endif
  }
--- 196,200 ----
     return 1;
  #else
!    return roadmap_nmea_decode (user_context, decoder_context, sentence);
  #endif
  }

Index: roadmap_gps.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_gps.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** roadmap_gps.c	20 Aug 2010 18:27:33 -0000	1.53
--- roadmap_gps.c	12 Aug 2011 16:33:26 -0000	1.54
***************
*** 357,361 ****
  /* NMEA protocol support ----------------------------------------------- */
  
! static RoadMapNmeaAccount RoadMapGpsNmeaAccount;
  static RoadMapNmeaAccount RoadMapGpsExtendedAccount;
  
--- 357,361 ----
  /* NMEA protocol support ----------------------------------------------- */
  
! RoadMapNmeaAccount RoadMapGpsNmeaAccount;
  static RoadMapNmeaAccount RoadMapGpsExtendedAccount;
  
***************
*** 588,592 ****
   * @brief
   */
! static void roadmap_gps_nmea (void) {
  
     if (RoadMapGpsNmeaAccount == NULL) {
--- 588,592 ----
   * @brief
   */
! void roadmap_gps_nmea (void) {
  
     if (RoadMapGpsNmeaAccount == NULL) {
***************
*** 1111,1117 ****
        case ROADMAP_GPS_GPSD3:
  
!          roadmap_gpsd3_subscribe_to_navigation (roadmap_gps_navigation);
!          roadmap_gpsd3_subscribe_to_satellites (roadmap_gps_satellites);
!          roadmap_gpsd3_subscribe_to_dilution   (roadmap_gps_dilution);
           break;
  
--- 1111,1115 ----
        case ROADMAP_GPS_GPSD3:
  
!          roadmap_gpsd3_subscriptions();
           break;
  
***************
*** 1206,1210 ****
  
           decode.decoder = roadmap_gpsd3_decode;
!          decode.decoder_context = NULL;
           break;
  
--- 1204,1208 ----
  
           decode.decoder = roadmap_gpsd3_decode;
!          decode.decoder_context = roadmap_gpsd3_decoder_context();
           break;
  

Index: roadmap_gps.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_gps.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** roadmap_gps.h	16 Aug 2010 05:31:45 -0000	1.16
--- roadmap_gps.h	12 Aug 2011 16:33:26 -0000	1.17
***************
*** 127,130 ****
--- 127,131 ----
  void roadmap_gps_register_logger (roadmap_gps_logger logger);
  
+ void roadmap_gps_nmea (void);
  
  void roadmap_gps_open   (void);

Index: roadmap_gpsd3.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_gpsd3.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** roadmap_gpsd3.h	17 Aug 2010 18:57:10 -0000	1.1
--- roadmap_gpsd3.h	12 Aug 2011 16:33:26 -0000	1.2
***************
*** 38,47 ****
  #include "roadmap_input.h"
  
! void roadmap_gpsd3_subscribe_to_navigation (RoadMapGpsdNavigation navigation);
! 
! void roadmap_gpsd3_subscribe_to_satellites (RoadMapGpsdSatellite satellite);
! 
! void roadmap_gpsd3_subscribe_to_dilution   (RoadMapGpsdDilution dilution);
! 
  
  RoadMapSocket roadmap_gpsd3_connect (const char *name);
--- 38,43 ----
  #include "roadmap_input.h"
  
! void roadmap_gpsd3_subscriptions(void);
! void *roadmap_gpsd3_decoder_context(void);
  
  RoadMapSocket roadmap_gpsd3_connect (const char *name);

[Roadmap-commit] roadmap/src config.mk,1.39,1.40

From: Paul F. <pg...@us...> - 2011-08-12 16:11:14

Update of /cvsroot/roadmap/roadmap/src
In directory vz-cvs-4.sog:/tmp/cvs-serv30150

Modified Files:
	config.mk 
Log Message:
don't build android by default


Index: config.mk
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/config.mk,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** config.mk	23 Dec 2010 08:31:22 -0000	1.39
--- config.mk	12 Aug 2011 16:11:12 -0000	1.40
***************
*** 46,57 ****
  # Currently this has been tested with the tools for Android 2.3 (SDK r9, NDK r5).
  #
! NDK = /home/danny/src/android/android-ndk-r5
! CROSS=arm-eabi-
! CFLAGS += -I$(NDK)/platforms/android-9/arch-arm/usr/include \
! 	  -I$(NDK)/apps/ndk_demo/project/jni \
! 	  -DANDROID \
! 	  -fno-short-enums -g -Wl,--fix-cortex-a8
! LIBS +=
! 
  # Support for WINCE is still a work in progress.
  # If you select WINCE for your WinCE device, you'll need the
--- 46,57 ----
  # Currently this has been tested with the tools for Android 2.3 (SDK r9, NDK r5).
  #
! # NDK = /home/danny/src/android/android-ndk-r5
! # CROSS=arm-eabi-
! # CFLAGS += -I$(NDK)/platforms/android-9/arch-arm/usr/include \
! # 	  -I$(NDK)/apps/ndk_demo/project/jni \
! # 	  -DANDROID \
! # 	  -fno-short-enums -g -Wl,--fix-cortex-a8
! # LIBS +=
! # 
  # Support for WINCE is still a work in progress.
  # If you select WINCE for your WinCE device, you'll need the
***************
*** 120,123 ****
--- 120,125 ----
  # Implement the new gpsd protocol, referred to as gpsd3 .
  # This requires the libgps library, part of the gpsd distribution.
+ # If the library isn't used, roadmap's "gpsd3" protocol mode will
+ # attempt to use the NMEA mode offered by the new gpsd versions.
  #
  # CFLAGS += -DROADMAP_USES_LIBGPS

[Roadmap-commit] SF.net SVN: roadmap:[2685] trunk/roadmap/src/roadmap_gpsd3.c

From: <dan...@us...> - 2011-05-02 18:29:49

Revision: 2685
          http://roadmap.svn.sourceforge.net/roadmap/?rev=2685&view=rev
Author:   dannybackx
Date:     2011-05-02 18:29:43 +0000 (Mon, 02 May 2011)

Log Message:
-----------
Add steering info to gpsd3, see Pauls remark on the list.

Modified Paths:
--------------
    trunk/roadmap/src/roadmap_gpsd3.c

Modified: trunk/roadmap/src/roadmap_gpsd3.c
===================================================================
--- trunk/roadmap/src/roadmap_gpsd3.c	2011-04-24 20:41:56 UTC (rev 2684)
+++ trunk/roadmap/src/roadmap_gpsd3.c	2011-05-02 18:29:43 UTC (rev 2685)
@@ -132,6 +132,9 @@
       if (isnan(gpsdp->fix.time) == 0) {
          gps_time = gpsdp->fix.time;
       }
+      if (isnan(gpsdp->fix.track) == 0) {
+         steering = gpsdp->fix.track;
+      }
    }
 
    RoadmapGpsd2NavigationListener


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Roadmap-commit] SF.net SVN: roadmap:[2684] trunk/roadmap/src/roadmap_navigate.c

From: <dan...@us...> - 2011-04-24 20:42:03

Revision: 2684
          http://roadmap.svn.sourceforge.net/roadmap/?rev=2684&view=rev
Author:   dannybackx
Date:     2011-04-24 20:41:56 +0000 (Sun, 24 Apr 2011)

Log Message:
-----------
Cleanup the previous change, as announced/queried on the list.

Modified Paths:
--------------
    trunk/roadmap/src/roadmap_navigate.c

Modified: trunk/roadmap/src/roadmap_navigate.c
===================================================================
--- trunk/roadmap/src/roadmap_navigate.c	2011-04-21 06:35:19 UTC (rev 2683)
+++ trunk/roadmap/src/roadmap_navigate.c	2011-04-24 20:41:56 UTC (rev 2684)
@@ -2,7 +2,7 @@
  * LICENSE:
  *
  *   Copyright 2003 Pascal F. Martin
- *   Copyright (c) 2008, 2009, Danny Backx
+ *   Copyright (c) 2008, 2009, 2011, Danny Backx
  *
  *   This file is part of RoadMap.
  *
@@ -517,6 +517,7 @@
 
     static RoadMapTracking candidate;
     static RoadMapTracking nominated;
+    RoadMapPosition rmp;
 
     RoadMapArea focus;
     int navigation_mode = roadmap_navigate_get_mode();
@@ -615,19 +616,11 @@
         RoadMapConfirmedStreet.fuzzyfied = best;
         INVALIDATE_PLUGIN(RoadMapConfirmedStreet.intersection);
 
-	/* ?? */
-#if 0
+        rmp.longitude = gps_position->longitude;
+        rmp.latitude = gps_position->latitude;
+
         roadmap_display_activate ("Current Street", &RoadMapConfirmedLine.line,
-            NULL, &RoadMapConfirmedStreet.street);
-#else /* Danny hack FIX ME */
-	{
-	 RoadMapPosition p;
-	 p.longitude = gps_position->longitude;
-	 p.latitude = gps_position->latitude;
-        roadmap_display_activate ("Current Street", &RoadMapConfirmedLine.line,
-            &p, &RoadMapConfirmedStreet.street);
-	    }
-#endif
+            &rmp, &RoadMapConfirmedStreet.street);
 
         if (gps_position->speed > roadmap_gps_speed_accuracy()) {
            PluginLine p_line;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Flat | Threaded

<< < 1 .. 11 12 13 14 15 .. 131 > >> (Page 13 of 131)