navit-cvs-commit Mailing List for Navit (Page 10)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 5906
          http://sourceforge.net/p/navit/code/5906
Author:   sleske
Date:     2014-10-11 23:13:02 +0000 (Sat, 11 Oct 2014)
Log Message:
-----------
Refactor:core:Better variable names for coord_parse, simplify code.

Modified Paths:
--------------
    trunk/navit/navit/coord.c

Modified: trunk/navit/navit/coord.c
===================================================================

--- trunk/navit/navit/coord.c	2014-10-11 23:12:40 UTC (rev 5905)
+++ trunk/navit/navit/coord.c	2014-10-11 23:13:02 UTC (rev 5906)
@@ -146,33 +146,32 @@
 }
 
 /**
- * Parses \c char \a *c_str and writes back the coordinates to \c coord \a *c_ret, using \c projection \a pro.
- * \a *c_str may specify its projection at the beginning.
- * The format for \a *c_str can be: 
+ * 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 (?)
  * Note that the spaces are relevant for parsing.
  *
- * @param *c_str String to be parsed
- * @param pro Desired projection of the result
- * @param *c_ret For returning result
+ * @param *coord_input String to be parsed
+ * @param output_projection Desired projection of the result
+ * @param *result For returning result
  * @returns The lenght of the parsed string
  */
 
 int
-coord_parse(const char *c_str, enum projection pro, struct coord *c_ret)
+coord_parse(const char *coord_input, enum projection output_projection, struct coord *result)
 {
-	int debug=0;
 	char *proj=NULL,*s,*co;
-	const char *str=c_str;
+	const char *str=coord_input;
 	int args,ret = 0;
 	struct coord_geo g;
 	struct coord c,offset;
 	enum projection str_pro=projection_none;
 
-	dbg(1,"enter('%s',%d,%p)\n", c_str, pro, c_ret);
+	dbg(1,"enter('%s',%d,%p)\n", coord_input, output_projection, result);
 	s=strchr(str,' ');
 	co=strchr(str,':');
 	if (co && co < s) {
@@ -182,11 +181,7 @@
 		dbg(1,"projection=%s\n", proj);
 		str=co+1;
 		s=strchr(str,' ');
-		if (!strcmp(proj, "mg"))
-			str_pro = projection_mg;
-		else if (!strcmp(proj, "garmin"))
-			str_pro = projection_garmin;
-		else if (!strcmp(proj, "geo"))
+		if (!strcmp(proj, "geo"))
 			str_pro = projection_none;
 		else {
 			str_pro = projection_from_name(proj,&offset);
@@ -212,11 +207,11 @@
 
 		if (str_pro == projection_none) 
 			str_pro=projection_mg;
-		if (str_pro != pro) {
+		if (str_pro != output_projection) {
 			transform_to_geo(str_pro, &c, &g);
-			transform_from_geo(pro, &g, &c);
+			transform_from_geo(output_projection, &g, &c);
 		}
-		*c_ret=c;
+		*result=c;
 	} else if (*s == 'N' || *s == 'n' || *s == 'S' || *s == 's') {
 		double lng, lat;
 		char ns, ew;
@@ -226,7 +221,7 @@
 		dbg(1,"lat=%f %c lon=%f %c\n", lat, ns, lng, ew);
 		if (args < 4)
 			goto out;
-		dbg(1,"projection=%d str_pro=%d projection_none=%d\n", pro, str_pro, projection_none);
+		dbg(1,"projection=%d str_pro=%d projection_none=%d\n", output_projection, str_pro, projection_none);
 		if (str_pro == projection_none) {
 			g.lat=floor(lat/100);
 			lat-=g.lat*100;
@@ -239,8 +234,8 @@
 			if (ew == 'w' || ew == 'W')
 				g.lng=-g.lng;
 			dbg(1,"transform_from_geo(%f,%f)",g.lat,g.lng);
-			transform_from_geo(pro, &g, c_ret);
-			dbg(1,"result 0x%x,0x%x\n", c_ret->x,c_ret->y);
+			transform_from_geo(output_projection, &g, result);
+			dbg(1,"result 0x%x,0x%x\n", result->x,result->y);
 		}
 		dbg(3,"str='%s' x=%f ns=%c y=%f ew=%c c=%d\n", str, lng, ns, lat, ew, ret);
 		dbg(3,"rest='%s'\n", str+ret);
@@ -251,11 +246,11 @@
 			goto out;
 		c.x=x+offset.x;
 		c.y=y+offset.y;
-		if (str_pro != pro) {
+		if (str_pro != output_projection) {
 			transform_to_geo(str_pro, &c, &g);
-			transform_from_geo(pro, &g, &c);
+			transform_from_geo(output_projection, &g, &c);
 		}
-		*c_ret=c;
+		*result=c;
 	} else {
 		double lng, lat;
 		args=sscanf(str, "%lf %lf%n", &lng, &lat, &ret);
@@ -265,15 +260,10 @@
 		dbg(1,"rest='%s'\n", str+ret);
 		g.lng=lng;
 		g.lat=lat;
-		transform_from_geo(pro, &g, c_ret);
+		transform_from_geo(output_projection, &g, result);
 	}
-	if (debug)
-		printf("rest='%s'\n", str+ret);
-	ret+=str-c_str;
-	if (debug) {
-		printf("args=%d\n", args);
-		printf("ret=%d delta=%d ret_str='%s'\n", ret, GPOINTER_TO_INT(str-c_str), c_str+ret);
-	}
+	ret+=str-coord_input;
+	dbg(2, "ret=%d delta=%d ret_str='%s'\n", ret, GPOINTER_TO_INT(str-coord_input), coord_input+ret);
 out:
 	free(proj);
 	return ret;

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





2007	Jan	Feb	Mar	Apr	May	Jun	Jul (4)	Aug (59)	Sep (43)	Oct (95)	Nov (135)	Dec (108)
2008	Jan (229)	Feb (141)	Mar (59)	Apr (70)	May (64)	Jun (87)	Jul (57)	Aug (108)	Sep (74)	Oct (203)	Nov (141)	Dec (108)
2009	Jan (114)	Feb (91)	Mar (101)	Apr (69)	May (54)	Jun (82)	Jul (49)	Aug (109)	Sep (81)	Oct (93)	Nov (100)	Dec (79)
2010	Jan (46)	Feb (36)	Mar (135)	Apr (103)	May (116)	Jun (130)	Jul (52)	Aug (31)	Sep (46)	Oct (48)	Nov (98)	Dec (110)
2011	Jan (234)	Feb (184)	Mar (150)	Apr (43)	May (53)	Jun (52)	Jul (112)	Aug (72)	Sep (79)	Oct (23)	Nov (6)	Dec (30)
2012	Jan (39)	Feb (37)	Mar (49)	Apr (60)	May (63)	Jun (38)	Jul (33)	Aug (24)	Sep (20)	Oct (14)	Nov (23)	Dec (50)
2013	Jan (30)	Feb (32)	Mar (27)	Apr (41)	May (59)	Jun (21)	Jul (10)	Aug (73)	Sep (23)	Oct (60)	Nov (14)	Dec (15)
2014	Jan (4)	Feb (8)	Mar (11)	Apr (6)	May (27)	Jun (4)	Jul (29)	Aug (62)	Sep (11)	Oct (17)	Nov (58)	Dec (9)
2015	Jan (23)	Feb (3)	Mar (26)	Apr (47)	May (8)	Jun (28)	Jul (10)	Aug (3)	Sep	Oct	Nov	Dec

navit-cvs-commit Mailing List for Navit (Page 10)

navit-cvs-commit — CVS commit mailing list