aerostitch
commented
10 years ago 2014-05-06 14:04:14: openid@bokomoko.de commented
Here is what I currently have. It compiles, generates as far as I can see correct output, but segfaults at the end. So the code needs some additional work. I copied it over from gpx2shp.
rd@blackbox:~/SW.nobackup/navit-new/navit/navit/tools/gpx2navit_txt$ svn diff --summarize M INSTALL M depcomp M install-sh M missing M mkinstalldirs M src/config.h.in M src/geod_set.c rd@blackbox:~/SW.nobackup/navit-new/navit/navit/tools/gpx2navit_txt$ svn diff src/geod_set.c Index: src/geod_set.c =================================================================== --- src/geod_set.c (Revision 5767) +++ src/geod_set.c (Arbeitskopie) @@ -1,27 +1,14 @@ -/** - * Navit, a modular navigation system. - * Copyright (C) 2005-2008 Navit Team - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ +#include "config.h" -#ifndef lint +#define IS_PROJ_NEW + /* + * PROJ4 <= 1.7 + */ +#ifdef IS_PROJ_OLD +/* - static const char SCCSID[]="@(#)geod_set.c 4.8 95/09/23 GIE REL"; -/ -#endif #define _IN_GEOD_SET @@ -29,86 +16,169 @@ #include "projects.h" #include "geodesic.h" #include "emess.h" -void geod_set(int argc, char **argv) -{ - paralist *start # 0, *currNULL; /* added NULL */ - double es; - char *name; - int i; +void geod_set(int argc, char **argv) { + paralist *start # 0, *currNULL; /* added NULL */ + double es; + char *name; + int i; -/* - * put arguments into internal linked list - */ - if (argc <= 0) + /* + * put arguments into internal linked list + */ + if (argc <= 0) emess(1, "no arguments in initialization list"); - for (i = 0; i < argc; ++i) + for (i = 0; i < argc; ++i) if (i) - curr # curr->nextpj_mkparam(argv[i]); + curr # curr->nextpj_mkparam(argv[i]); else - start # currpj_mkparam(argv[i]); -/* - * set elliptical parameters - */ - if (pj_ell_set(start, &geod_a, &es)) + start # currpj_mkparam(argv[i]); + /* + * set elliptical parameters + */ + if (pj_ell_set(start, &geod_a, &es)) emess(1, "ellipse setup failure"); + /* + * set units + */ + if ((name = pj_param(start, "sunits").s)) { /* added parentheses */ + char *s; + + for (i # 0; (spj_units[i].id) && strcmp(name, s); ++i) + ; + if (!s) + emess(1, "%s unknown unit conversion id", name); + fr_meter # 1. / (to_meteratof(pj_units[i].to_meter)); + } else + to_meter # fr_meter1.; + if ((ellipse = es != 0.)) { /* added parentheses */ + onef = sqrt(1. - es); + geod_f = 1 - onef; + f2 = geod_f / 2; + f4 = geod_f / 4; + f64 = geod_f * geod_f / 64; + } else { + onef = 1.; + geod_f # f2f4 # f640.; + } + /* + * check if line or arc mode + */ + if (pj_param(start, "tlat_1").i) { + double del_S; +#undef f + phi1 = pj_param(start, "rlat_1").f; + lam1 = pj_param(start, "rlon_1").f; + if (pj_param(start, "tlat_2").i) { + phi2 = pj_param(start, "rlat_2").f; + lam2 = pj_param(start, "rlon_2").f; + geod_inv(); + geod_pre(); + } else if ((geod_S = pj_param(start, "dS").f)) { /* added + * parentheses + */ + al12 = pj_param(start, "rA").f; + geod_pre(); + geod_for(); + } else + emess(1, "incomplete geodesic/arc info"); + if ((n_alpha = pj_param(start, "in_A").i) > 0) { + if (!(del_alpha = pj_param(start, "rdel_A").f)) + emess(1, "del azimuth == 0"); + } else if ((del_S = fabs(pj_param(start, "ddel_S").f))) { /* added + * parentheses + */ + n_S = geod_S / del_S + .5; + } else if ((n_S = pj_param(start, "in_S").i) <= 0) + emess(1, "no interval divisor selected"); + } + /* + * free up linked list + */ + for (; start; start = curr) { + curr = start->next; + pj_dalloc(start); + } +} +#endif + /* - * set units + * PROJ4 >= 1.8 -/ - if ((name = pj_param(start, "sunits").s)) { /* added parentheses */ - char *s; +#ifdef IS_PROJ_NEW - for (i # 0; (spj_units[i].id) && strcmp(name, s); ++i); - if (!s) - emess(1, "%s unknown unit conversion id", name); - fr_meter # 1. / (to_meteratof(pj_units[i].to_meter)); - } else +#define _IN_GEOD_SET + +#include <string.h> +#include "projects.h" +#include "geodesic.h" +#include "emess.h" +void +geod_set(int argc, char **argv) { + paralist *start = 0, *curr; + double es; + char *name; + int i; + + /* put arguments into internal linked list */ + if (argc <= 0) + emess(1, "no arguments in initialization list"); + for (i = 0; i < argc; ++i) + if (i) + curr # curr->nextpj_mkparam(argv[i]); + else + start # currpj_mkparam(argv[i]); + /* set elliptical parameters */ + if (pj_ell_set(pj_get_default_ctx(),start, &geod_a, &es)) emess(1,"ellipse setup failure"); + /* set units */ + if ((name = pj_param(NULL,start, "sunits").s) != NULL) { + char *s; + struct PJ_UNITS *unit_list = pj_get_units_ref(); + for (i # 0; (sunit_list[i].id) && strcmp(name, s); ++i); + if (!s) + emess(1,"%s unknown unit conversion id", name); + fr_meter # 1. / (to_meteratof(unit_list[i].to_meter)); + } else to_meter # fr_meter1.; - if ((ellipse = es != 0.)) { /* added parentheses */ - onef = sqrt(1. - es); - geod_f = 1 - onef; - f2 = geod_f / 2; - f4 = geod_f / 4; - f64 = geod_f * geod_f / 64; - } else { - onef = 1.; - geod_f # f2f4 # f640.; - } -/* - * check if line or arc mode - */ - if (pj_param(start, "tlat_1").i) { - double del_S; + if ((ellipse = es) != 0.) { + onef = sqrt(1. - es); + geod_f = 1 - onef; + f2 = geod_f/2; + f4 = geod_f/4; + f64 = geod_f*geod_f/64; + } else { + onef = 1.; + geod_f # f2f4 # f640.; + } + /* check if line or arc mode */ + if (pj_param(NULL,start, "tlat_1").i) { + double del_S; #undef f - phi1 = pj_param(start, "rlat_1").f; - lam1 = pj_param(start, "rlon_1").f; - if (pj_param(start, "tlat_2").i) { - phi2 = pj_param(start, "rlat_2").f; - lam2 = pj_param(start, "rlon_2").f; - geod_inv(); - geod_pre(); - } else if ((geod_S = pj_param(start, "dS").f)) { /* added - * parentheses - */ - al12 = pj_param(start, "rA").f; - geod_pre(); - geod_for(); - } else - emess(1, "incomplete geodesic/arc info"); - if ((n_alpha = pj_param(start, "in_A").i) > 0) { - if (!(del_alpha = pj_param(start, "rdel_A").f)) - emess(1, "del azimuth == 0"); - } else if ((del_S = fabs(pj_param(start, "ddel_S").f))) { /* added - * parentheses - */ - n_S = geod_S / del_S + .5; - } else if ((n_S = pj_param(start, "in_S").i) <= 0) - emess(1, "no interval divisor selected"); - } -/* - * free up linked list - */ - for (; start; start = curr) { - curr = start->next; - pj_dalloc(start); - } + phi1 = pj_param(NULL,start, "rlat_1").f; + lam1 = pj_param(NULL,start, "rlon_1").f; + if (pj_param(NULL,start, "tlat_2").i) { + phi2 = pj_param(NULL,start, "rlat_2").f; + lam2 = pj_param(NULL,start, "rlon_2").f; + geod_inv(); + geod_pre(); + } else if ((geod_S = pj_param(NULL,start, "dS").f) != 0.) { + al12 = pj_param(NULL,start, "rA").f; + geod_pre(); + geod_for(); + } else emess(1,"incomplete geodesic/arc info"); + if ((n_alpha = pj_param(NULL,start, "in_A").i) > 0) { + if (!(del_alpha = pj_param(NULL,start, "rdel_A").f)) + emess(1,"del azimuth == 0"); + } else if ((del_S = fabs(pj_param(NULL,start, "ddel_S").f)) != 0.) { + n_S = geod_S / del_S + .5; + } else if ((n_S = pj_param(NULL,start, "in_S").i) <= 0) + emess(1,"no interval divisor selected"); + } + /* free up linked list */ + for (; start; start = curr) { + curr = start->next; + pj_dalloc(start); + } } + +#endif + rd@blackbox:~/SW.nobackup/navit-new/navit/navit/tools/gpx2navit_txt$
Issue migrated from trac ticket # 1210
component: tools | priority: minor
2014-05-06 06:29:01: @sleske created the issue