limestone

commit 02ed0547552e86a34ccfc1ea870ee6f17b8c6a26
parent b2b02b392c2fbeba7bbc2fb5132b7c9f4029b4de
Author: Christoph Lohmann <20h@r-36.net>
Date:   Fri, 31 Oct 2014 13:29:10 +0100

geo: is lat,lon,alt

After rereading the geo: specification it's lat,lon, like the natural way.

Diffstat:
TODO
 | 
1
+
limestone.1
 | 
2
+-
limestone.cpp
 | 
14
+++++++-------

3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/TODO b/TODO
@@ -2,6 +2,7 @@
 * geo uri
 	* add crs support
 	* add uncertainty support
+* maps:// support
 * allow kml files to be read from stdin
 * xembed support
 * better overlay support
diff --git a/limestone.1 b/limestone.1
@@ -38,7 +38,7 @@ to be displayed (KML, OSM, SHP, GPX, ...).
 .BI \-p " position"
 will open the map at
 .I position.
-It should be in the form of "lon,lat[,alt]" and in decimal degree.
+It should be in the form of "lat,lon[,alt]" and in decimal degree.
 .TP
 .BI \-s " stylestring"
 defines the style you want for the map. Upper case letters are activating and
diff --git a/limestone.cpp b/limestone.cpp
@@ -57,22 +57,22 @@ parseposition(char *s, float *lat, float *lon, float *alt)
 		for (; *s2 == ' '; s2++);
 	}
 
-	if (lon != NULL) {
-		*lon = strtof(sb, NULL);
+	if (lat != NULL) {
+		*lat = strtof(sb, NULL);
 		isgood++;
 		if (sd != NULL) {
 			for (; *sd != 'W' && *sd != 'E' && *sd; sd++);
 			if (*sd == 'W')
-				*lon *= -1;
+				*lat *= -1;
 		}
 	}
-	if (lat != NULL && s1 != NULL) {
-		*lat = strtof(s1, NULL);
+	if (lon != NULL && s1 != NULL) {
+		*lon = strtof(s1, NULL);
 		isgood++;
 		if (sd1 != NULL) {
 			for (; *sd1 != 'S' && *sd1 != 'N' && *sd1; sd1++);
 			if (*sd1 == 'S')
-				*lat *= -1;
+				*lon *= -1;
 		}
 	}
 	if (alt != NULL && s2 != NULL)
@@ -179,7 +179,7 @@ usage(void)
 {
 	fprintf(stderr, "usage: %s [-h] "\
 			"[-k datafile] "\
-			"[-p lon,lat[,alt]] "\
+			"[-p lat,lon[,alt]] "\
 			"[-s stylestring] "\
 			"[-t theme] "\
 			"[-w winid] "\