This is an automated email from the git hooks/post-receive script. sf pushed a commit to annotated tag v1.33 in repository mapcode.
commit de189cb0826305e604a443e35effa06cea869047 Author: Rijn Buve <[email protected]> Date: Tue Aug 19 20:40:52 2014 +0200 Fixed generator --- mapcode.c => "\\" | 20 +++++++++++++++----- mapcode.c | 18 +++++++++++++----- 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/mapcode.c "b/\\" similarity index 84% copy from mapcode.c copy to "\\" index 883da0d..6f84338 100644 --- a/mapcode.c +++ "b/\\" @@ -49,7 +49,9 @@ int main(const int argc, const char** argv) const char* cmd = argv[1]; if ((strcmp(cmd, "-d") == 0) || (strcmp(cmd, "--decode") == 0)) { + // ------------------------------------------------------------------ // Decode: [-d | --decode] <default-country-ISO3> <mapcode> [<mapcode> ...] + // ------------------------------------------------------------------ if (argc < 4) { usage(appName); return -1; @@ -65,12 +67,14 @@ int main(const int argc, const char** argv) printf("error: cannot decode '%s' (default country='%s')\n", argv[i], argv[1]); return -1; } - printf("%g %g\n", lat, lon); + printf("%f %f\n", lat, lon); } } else if ((strcmp(cmd, "-e") == 0) || (strcmp(cmd, "--encode") == 0)) { + // ------------------------------------------------------------------ // Encode: [-e | --encode] <lat:-90..90> <lon:-180..180> [country-ISO3]> + // ------------------------------------------------------------------ if ((argc != 4) && (argc != 5)) { usage(appName); return -1; @@ -78,11 +82,12 @@ int main(const int argc, const char** argv) const double lat = atof(argv[2]); const double lon = atof(argv[3]); - const char* results[32]; int context = 0; if (argc == 4) { context = text2tc(argv[4], 0); } + const char* results[32]; + printf("e: %f %f %d\n", lat, lon, context); const int nrResults = coord2mc(results, lat, lon, context); if (nrResults <= 0) { printf("error: cannot encode lat=%s, lon=%s (default country=%d)\n", argv[2], argv[3], context); @@ -94,7 +99,9 @@ int main(const int argc, const char** argv) } else if ((strcmp(cmd, "-g") == 0) || (strcmp(cmd, "--generate") == 0)) { + // ------------------------------------------------------------------ // Generate uniform test set: [-g | --generate] <nrPoints> [<seed>] + // ------------------------------------------------------------------ if ((argc != 3) && (argc != 4)) { usage(appName); return -1; @@ -130,21 +137,24 @@ int main(const int argc, const char** argv) const double lat = latRad * (180.0 / PI); const double lon = lonRad * (180.0 / PI); + printf("e: %f %f %d\n", lat, lon, context); const int nrResults = coord2mc(results, lat, lon, context); if (nrResults <= 0) { - printf("error: cannot encode lat=%g, lon=%g)\n", lat, lon); + printf("error: cannot encode lat=%f, lon=%f)\n", lat, lon); return -1; } - printf("%d %g %g %g %g %g\n", nrResults, lat, lon, x, y, z); + printf("%d %f %f %f %f %f\n", nrResults, lat, lon, x, y, z); for (int i = 0; i < nrResults; ++i) { - printf("%s %s\n", results[i*2 + 1], results[i*2]); + printf("%s %s\n", results[(i * 2) + 1], results[(i * 2)]); } printf("\n"); } } else { + // ------------------------------------------------------------------ // Usage. + // ------------------------------------------------------------------ usage(appName); return -1; } diff --git a/mapcode.c b/mapcode.c index 883da0d..3ac0a71 100644 --- a/mapcode.c +++ b/mapcode.c @@ -49,7 +49,9 @@ int main(const int argc, const char** argv) const char* cmd = argv[1]; if ((strcmp(cmd, "-d") == 0) || (strcmp(cmd, "--decode") == 0)) { + // ------------------------------------------------------------------ // Decode: [-d | --decode] <default-country-ISO3> <mapcode> [<mapcode> ...] + // ------------------------------------------------------------------ if (argc < 4) { usage(appName); return -1; @@ -65,12 +67,14 @@ int main(const int argc, const char** argv) printf("error: cannot decode '%s' (default country='%s')\n", argv[i], argv[1]); return -1; } - printf("%g %g\n", lat, lon); + printf("%f %f\n", lat, lon); } } else if ((strcmp(cmd, "-e") == 0) || (strcmp(cmd, "--encode") == 0)) { + // ------------------------------------------------------------------ // Encode: [-e | --encode] <lat:-90..90> <lon:-180..180> [country-ISO3]> + // ------------------------------------------------------------------ if ((argc != 4) && (argc != 5)) { usage(appName); return -1; @@ -78,11 +82,11 @@ int main(const int argc, const char** argv) const double lat = atof(argv[2]); const double lon = atof(argv[3]); - const char* results[32]; int context = 0; if (argc == 4) { context = text2tc(argv[4], 0); } + const char* results[32]; const int nrResults = coord2mc(results, lat, lon, context); if (nrResults <= 0) { printf("error: cannot encode lat=%s, lon=%s (default country=%d)\n", argv[2], argv[3], context); @@ -94,7 +98,9 @@ int main(const int argc, const char** argv) } else if ((strcmp(cmd, "-g") == 0) || (strcmp(cmd, "--generate") == 0)) { + // ------------------------------------------------------------------ // Generate uniform test set: [-g | --generate] <nrPoints> [<seed>] + // ------------------------------------------------------------------ if ((argc != 3) && (argc != 4)) { usage(appName); return -1; @@ -132,19 +138,21 @@ int main(const int argc, const char** argv) const int nrResults = coord2mc(results, lat, lon, context); if (nrResults <= 0) { - printf("error: cannot encode lat=%g, lon=%g)\n", lat, lon); + printf("error: cannot encode lat=%f, lon=%f)\n", lat, lon); return -1; } - printf("%d %g %g %g %g %g\n", nrResults, lat, lon, x, y, z); + printf("%d %lf %lf %lf %lf %lf\n", nrResults, lat, lon, x, y, z); for (int i = 0; i < nrResults; ++i) { - printf("%s %s\n", results[i*2 + 1], results[i*2]); + printf("%s %s\n", results[(i * 2) + 1], results[(i * 2)]); } printf("\n"); } } else { + // ------------------------------------------------------------------ // Usage. + // ------------------------------------------------------------------ usage(appName); return -1; } -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapcode.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
