Fix:#1218

docs/configuration/coordinates.rst

@@ -0,0 +1,136 @@
+Coordinates in Navit
+====================
+
+Various parts of Navit will read geographical coordinates provided as
+text:
+
+-   the `textfile <https://wiki.navit-project.org/index.php/Textfile>`__
+   map format
+
+-   the "center=" attribute in the configuration file
+
+-   some Navit commands (e.g. set_position), which can be invoked via
+   the `internal
+   GUI <https://wiki.navit-project.org/index.php/Internal_GUI>`__ or the
+   `Dbus <https://wiki.navit-project.org/index.php/Dbus>`__ bindings
+
+-   the files for bookmarks and last map position (bookmarks.txt and
+   center.txt)
+
+This page documents the coordinate systems and formats that Navit will
+accept.
+
+Supported coordinate systems and formats
+========================================
+
+.. _longitude--latitude-in-decimal-degrees:
+
+Longitude / Latitude in decimal degrees
+---------------------------------------
+
+Longitude / latitude in degrees can be specified as signed decimal
+fractions:
+
+.. code:: 
+
+   -33.3553 6.334
+
+That would be about 33° West, 6° North. Note that in this format
+longitude comes first. The coordinates are assumed to be based on WGS84
+(the coordinate system used by the GPS system, and by practically all
+common navigation systems).
+
+.. _latitude--longitude-in-degrees-and-minutes:
+
+Latitude / Longitude in degrees and minutes
+-------------------------------------------
+
+Latitude / Longitude can also be specified in degress and minutes with
+compass directions (N/S, E/W):
+
+.. code:: 
+
+   4808 N 1134 E
+
+Latitude and longitude are multiplied by 100, so the position above
+corresponds to 48°8' N, 11°34' (Munich).
+
+For greater precision you can write the minutes as decimal fractions:
+
+.. code:: 
+
+   4808.2356 N 1134.5252 E
+
+That is 48°8.2356' N 11°34.5252' E, the center of the Marienplatz in
+Munich.
+
+Notes:
+
+-   This format is rather unusual (because it uses arcminutes, but not
+   arcseconds). It is probably easier to just use decimal fractions of
+   degrees.
+
+-   The spaces are relevant for parsing. Use exactly one space between
+   the number and the letter N/S/E/W.
+
+Cartesian coordinates
+---------------------
+
+Internally, Navit uses a cartesian coordinate system induced by a
+Mercator projection. Coordinates are written as hexadecimal integers:
+
+.. code:: 
+
+   0x13a3d7 0x5d6d6d
+
+or specifying a projection:
+
+.. code:: 
+
+   mg: 0x13a3d7 0x5d6d6d
+
+That is again 48°8.2356' N 11°34.5252' E. The part up to and including
+the colon is optional, it names the projection to use. Possible values:
+
+-   mg - the projection used by Map&Guide (the default)
+
+-   garmin - "Garmin" projection (TODO: When would it be useful?)
+
+This format is used internally by Navit, but is probably not very useful
+for other purposes.
+
+Google Maps Format
+------------------
+
+.. code:: 
+
+   48.137260, 11.575420
+
+That is again 48°8.2356' N 11°34.5252' E. The values are comma
+separated. You can pick such values from Google Maps with right click on
+a location and then click on the coordinate in the context menu. This is
+useful when planning a route online by creating a waypoint file.
+
+UTM coordinates
+---------------
+
+Navit can read coordinates in the `Universal Transverse Mercator
+coordinate
+system <http://en.wikipedia.org/wiki/Universal_Transverse_Mercator_coordinate_system>`__
+(UTM).
+
+.. code:: 
+
+   utm32U: 674499.306 5328063.675
+
+.. code:: 
+
+   utmref32UPU:74499.306 28063.675
+
+Development notes
+=================
+
+The coordinates are parsed in function coord_parse() in coord.c. This
+code is used everywhere where Navit parses coordinates, except for the
+manual coordinate input in the Internal GUI (which uses its own format
+and parsing function).

docs/configuration/general.rst

@@ -18,7 +18,7 @@ On Navit's very first startup, it needs a **center** to look at on the map. By d
 
 		center="11.5666 48.1333"
 
-Coordinates can be written in different formats; see [[Coordinate_format]] for the full list.
+Coordinates can be written in different formats; see :doc:`coordinates` for the full list.
 To determine a specific latitude and longitude for your location you can use http://itouchmap.com/latlong.html.
 Usually, changing the "center" setting is not necessary, since it is only used during the first start.
 On subsequent starts, Navit will remember the last map position (stored in "center.txt") and ignore the "center" setting.

navit/coord.c

@@ -132,11 +132,11 @@ void coord_rect_extend(struct coord_rect *r, struct coord *c) {
  * Parses \c char \a *coord_input and writes back the coordinates to \c coord \a *result, using \c projection \a output_projection.
  * \a *coord_input may specify its projection at the beginning.
  * The format for \a *coord_input can be:
- * 	\li [Proj:][-]0xXX.... [-]0xXX... - Mercator coordinates, hex integers (XX), Proj can be "mg" or "garmin", defaults to mg
- * 	\li [Proj:][D][D]Dmm.mm.. N/S [D][D]DMM.mm... E/W - lat/long (WGS 84), integer degrees (DD) and minutes as decimal fraction (MM), Proj must be "geo" or absent
- * 	\li [Proj:][-][D]D.d[d]... [-][D][D]D.d[d]... - long/lat (WGS 84, note order!), degrees as decimal fraction, Proj does not matter
- * 	\li utm[zoneinfo]:[-][D]D.d[d]... [-][D][D]D.d[d] - UTM coordinates, as decimal fraction, with optional zone information (?)
- *     \li [-][D]D.d[d]...,[-][D][D]D.d[d]... - comma-separated (but without space inside the string) lat/long degrees as decimal fraction, Proj does not matter
+ *  \li [Proj:][-]0xXX.... [-]0xXX... - Mercator coordinates, hex integers (XX), Proj can be "mg" or "garmin", defaults to mg
+ *  \li [Proj:][D][D]Dmm.mm.. N/S [D][D]DMM.mm... E/W - lat/long (WGS 84), integer degrees (DD) and minutes as decimal fraction (MM), Proj must be "geo" or absent
+ *  \li [Proj:][-][D]D.d[d]... [-][D][D]D.d[d]... - long/lat (WGS 84, note order!), degrees as decimal fraction, Proj does not matter
+ *  \li utm[zoneinfo]:[-][D]D.d[d]... [-][D][D]D.d[d] - UTM coordinates, as decimal fraction, with optional zone information (?)
+ *  \li [-][D]D.d[d]...,[-][D][D]D.d[d]... - comma-separated (but without space inside the string) lat/long degrees as decimal fraction, Proj does not matter
  * Note that the spaces are relevant for parsing.
  *
  * @param *coord_input String to be parsed
@@ -146,50 +146,60 @@ void coord_rect_extend(struct coord_rect *r, struct coord *c) {
  */
 
 int coord_parse(const char *coord_input, enum projection output_projection, struct coord *result) {
-    char *proj=NULL,*s,*co;
+    char *proj=NULL,*s=NULL,*co;
     const char *str=coord_input;
     int args,ret = 0;
     struct coord_geo g;
     struct coord c,offset;
     enum projection str_pro=projection_none;
     int space_as_sep = 0;
+    c.x=0;
+    c.y=0;
 
-    dbg(lvl_debug,"enter('%s',%d,%p)", coord_input, output_projection, result);
-    s=strchr(str, ' ');
-    if (!s) {
+    dbg(lvl_debug,"enter('%s',%s,%p)\n", coord_input, projection_to_name(output_projection), result);
+    co=strchr(str,':');
+    if(co)
+        s=strstr(str, ": ");
+    else {
+        while(*str==' ') {
+            str++;
+        }
+        s=strstr(str, " ");
+        while(s && *s==' ') {
+            s++;
+        }
+    }
+
+
+    if (s && !strstr(str, ",")) {
         space_as_sep = 1;
-        s=strchr(str, ',');
     }
-    co=strchr(str,':');
-    if (co && co < s) {
+    if (co) {
         proj=g_malloc(co-str+1);
         g_strlcpy(proj, str, 1+co-str);
-        dbg(lvl_debug,"projection=%s", proj);
+        dbg(lvl_debug,"projection=%s\n", proj);
         str=co+1;
-        s=strchr(str,space_as_sep?' ':',');
+        if(space_as_sep)
+            str++;
+        s=(char*)str;
         if (!strcmp(proj, "geo"))
             str_pro = projection_none;
         else {
             str_pro = projection_from_name(proj,&offset);
             if (str_pro == projection_none) {
-                dbg(lvl_error, "Unknown projection: %s", proj);
+                dbg(lvl_error, "Unknown projection: %s\n", proj);
                 goto out;
             }
         }
+    } else if (!space_as_sep || strstr(str, "0x")) {
+        s=(char*)str;
     }
-    if (! s) {
-        ret=0;
-        goto out;
-    }
-    while (*s == ' ') {
-        s++;
-    }
-    if (!space_as_sep && (!strncmp(s, "0x", 2) || !strncmp(s, "-0x", 3))) {
+    if ((!strncmp(s, "0x", 2) || !strncmp(s, "-0x", 3))) {
         args=sscanf(str, "%i %i%n",&c.x, &c.y, &ret);
         if (args < 2)
             goto out;
-        dbg(lvl_debug,"str='%s' x=0x%x y=0x%x c=%d", str, c.x, c.y, ret);
-        dbg(lvl_debug,"rest='%s'", str+ret);
+        dbg(lvl_debug,"str='%s' x=0x%x y=0x%x c=%d\n", str, c.x, c.y, ret);
+        dbg(lvl_debug,"rest='%s'\n", str+ret);
 
         if (str_pro == projection_none)
             str_pro=projection_mg;
@@ -198,16 +208,17 @@ int coord_parse(const char *coord_input, enum projection output_projection, stru
             transform_from_geo(output_projection, &g, &c);
         }
         *result=c;
-    } else if (!space_as_sep && (*s == 'N' || *s == 'n' || *s == 'S' || *s == 's')) {
+    } else if ((*s == 'N' || *s == 'n' || *s == 'S' || *s == 's')) {
         double lng, lat;
         char ns, ew;
-        dbg(lvl_debug,"str='%s'", str);
+        dbg(lvl_debug,"str='%s'\n", str);
         args=sscanf(str, "%lf %c %lf %c%n", &lat, &ns, &lng, &ew, &ret);
-        dbg(lvl_debug,"args=%d", args);
-        dbg(lvl_debug,"lat=%f %c lon=%f %c", lat, ns, lng, ew);
+        dbg(lvl_debug,"args=%d\n", args);
+        dbg(lvl_debug,"lat=%f %c lon=%f %c\n", lat, ns, lng, ew);
         if (args < 4)
             goto out;
-        dbg(lvl_debug,"projection=%d str_pro=%d projection_none=%d", output_projection, str_pro, projection_none);
+        dbg(lvl_debug,"projection=%s str_pro=%d projection_none=%d\n", projection_to_name(output_projection), str_pro,
+            projection_none);
         if (str_pro == projection_none) {
             g.lat=floor(lat/100);
             lat-=g.lat*100;
@@ -219,13 +230,13 @@ int coord_parse(const char *coord_input, enum projection output_projection, stru
                 g.lat=-g.lat;
             if (ew == 'w' || ew == 'W')
                 g.lng=-g.lng;
-            dbg(lvl_debug,"transform_from_geo(%f,%f)",g.lat,g.lng);
+            dbg(lvl_debug,"transform_from_geo(%f,%f)\n",g.lat,g.lng);
             transform_from_geo(output_projection, &g, result);
-            dbg(lvl_debug,"result 0x%x,0x%x", result->x,result->y);
+            dbg(lvl_debug,"result 0x%x,0x%x\n", result->x,result->y);
         }
-        dbg(lvl_debug,"str='%s' x=%f ns=%c y=%f ew=%c c=%d", str, lng, ns, lat, ew, ret);
-        dbg(lvl_debug,"rest='%s'", str+ret);
-    } else if (!space_as_sep && (str_pro == projection_utm)) {
+        dbg(lvl_debug,"str='%s' x=%f ns=%c y=%f ew=%c c=%d\n", str, lng, ns, lat, ew, ret);
+        dbg(lvl_debug,"rest='%s'\n", str+ret);
+    } else if (str_pro == projection_utm) {
         double x,y;
         args=sscanf(str, "%lf %lf%n", &x, &y, &ret);
         if (args < 2)
@@ -237,31 +248,30 @@ int coord_parse(const char *coord_input, enum projection output_projection, stru
             transform_from_geo(output_projection, &g, &c);
         }
         *result=c;
-    } else if (space_as_sep) {
+    } else if (!space_as_sep) {
         // When entering coords like google's format, we actually get strings like "52.5219,19.4127"
         double lng, lat;
         args=sscanf(str, "%lf,%lf%n", &lat, &lng, &ret);
         if (args < 2)
             goto out;
-        dbg(lvl_debug,"str='%s' x=%f y=%f  c=%d", str, lng, lat, ret);
-        dbg(lvl_debug,"rest='%s'", str+ret);
+        dbg(lvl_debug,"str='%s' x=%f y=%f  c=%d\n", str, lng, lat, ret);
+        dbg(lvl_debug,"rest='%s'\n", str+ret);
         g.lng=lng;
         g.lat=lat;
         transform_from_geo(output_projection, &g, result);
-    }
-    else {
+    } else {
         double lng, lat;
         args=sscanf(str, "%lf %lf%n", &lng, &lat, &ret);
         if (args < 2)
             goto out;
-        dbg(lvl_debug,"str='%s' x=%f y=%f  c=%d", str, lng, lat, ret);
-        dbg(lvl_debug,"rest='%s'", str+ret);
+        dbg(lvl_debug,"str='%s' x=%f y=%f  c=%d\n", str, lng, lat, ret);
+        dbg(lvl_debug,"rest='%s'\n", str+ret);
         g.lng=lng;
         g.lat=lat;
         transform_from_geo(output_projection, &g, result);
     }
     ret+=str-coord_input;
-    dbg(lvl_info, "ret=%d delta=%d ret_str='%s'", ret, GPOINTER_TO_INT(str-coord_input), coord_input+ret);
+    dbg(lvl_debug, "ret=%d delta=%d ret_str='%s'\n", ret, GPOINTER_TO_INT(str-coord_input), coord_input+ret);
 out:
     g_free(proj);
     return ret;
@@ -300,7 +310,7 @@ void coord_print(enum projection pro, struct coord *c, FILE *out) {
     } else {
         y = c->y;
     }
-    fprintf( out, "%s: %s0x%x %s0x%x\n",
+    fprintf( out, "%s:%s0x%x %s0x%x\n",
              projection_to_name( pro ),
              sign_x, x,
              sign_y, y );

navit/projection.c

@@ -65,12 +65,18 @@ enum projection projection_from_name(const char *name, struct coord *utm_offset)
             return projection_names[i].projection;
     }
     if (utm_offset) {
-        if (sscanf(name,"utm%d%c",&zone,&ns) == 2 && zone > 0 && zone <= 60 && (ns == 'n' || ns == 's')) {
+        int scanres = sscanf(name,"utm%d%c",&zone,&ns);
+        ns = tolower(ns);
+        if (scanres == 2 && zone > 0 && zone <= 60 && (ns == 'n' || ns == 's')) {
             utm_offset->x=zone*1000000;
             utm_offset->y=(ns == 's' ? -10000000:0);
             return projection_utm;
         }
         if (sscanf(name,"utmref%d%c%c%c",&zone,&zone_field,&square_x,&square_y)) {
+            zone=tolower(zone);
+            zone_field=tolower(zone_field);
+            square_x=tolower(square_x);
+            square_y=tolower(square_y);
             i=utmref_letter(zone_field);
             if (i < 2 || i > 21) {
                 dbg(lvl_error,"invalid zone field '%c' in '%s'",zone_field,name);

navit/projection.h

@@ -21,11 +21,11 @@
 #define NAVIT_PROJECTION_H
 
 enum projection {
-	projection_none,	/*!< No projection or unknown projection */
-	projection_mg,		/*!< Mercator projection */
-	projection_garmin,	/*!< Garmin projection */
-	projection_screen,	/*!< Screen projection */
-	projection_utm		/*!< UTM projection */
+    projection_none,      /*!< No projection or unknown projection */
+    projection_mg,        /*!< Mercator projection */
+    projection_garmin,    /*!< Garmin projection */
+    projection_screen,    /*!< Screen projection */
+    projection_utm        /*!< UTM projection */
 };
 
 enum map_datum {