Skip to content

Move from dev-1.50 to master #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rijnb merged 10 commits into from
May 22, 2015
Merged

Move from dev-1.50 to master #3

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ffe20f3
Development for 1.50
rijnb May 18, 2015
009b34e
Untabbed, added release note
rijnb May 18, 2015
14493fd
Improved release note
rijnb May 18, 2015
1ed5d4b
Changed language to alphabet
rijnb May 18, 2015
d68970a
Changed example to utility
rijnb May 18, 2015
7eb0d68
Fixed bug in coder
rijnb May 19, 2015
f9097ac
Fixed copyright and tabs/CR/LF
rijnb May 20, 2015
9de1640
Prepare for release
rijnb May 21, 2015
5e372d0
Switched off self check
rijnb May 21, 2015
c93d215
Updated for release
rijnb May 22, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Prepare for release
  • Loading branch information
@rijnb
rijnb committed May 21, 2015
commit 9de16400165f0ba3e0602a55bd160669a6b69ff7
2 changes: 1 addition & 1 deletion NOTICE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Original C library created by Pieter Geelen. Work on Java version
of the Mapcode library by Rijn Buve and Matthew Lowden.
of the Mapcode library by Rijn Buve (original port by Matthew Lowden).

Copyright (C) 2014-2015 Stichting Mapcode Foundation (http://www.mapcode.com)
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ decode Mapcodes.
Retired legacy aliases EAZ and SKM, AU-QL, AU-TS, AU-NI and AU-JB.

Retired legacy Antarctica claims AT0 through AT8.

* 1.41.1

Bugfix for “utility/mapcode” utility (-d option was case sensitive).
Expand Down
6 changes: 5 additions & 1 deletion utility/mapcode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,10 @@ static void usage(const char* appName) {
printf(" and the (x, y, z) coordinates are placed on a sphere with radius 1.\n");
printf(" The (x, y, z) coordinates are primarily meant for visualization of the data set.\n");
printf("\n");
printf(" Example:\n");
printf(" %s -g 100 : produces a grid of 100 points as lat/lon pairs\n");
printf(" %s -gXYZ 100 : produces a grid of 100 points as (x, y, z) sphere coordinates)\n");
printf("\n");
printf(" Notes on the use of stdout and stderr:\n");
printf(" stdout: used for outputting 3D point data; stderr: used for statistics.\n");
printf(" You can redirect stdout to a destination file, while stderr will show progress.\n");
Expand Down Expand Up @@ -216,7 +220,7 @@ static void selfCheckLatLonToMapcode(const double lat, double lon, const char* t
}

found = (((strcasecmp(territory, foundTerritory) == 0) ||
(strcasecmp(territory, foundTerritoryMin) == 0)) &&
(strcasecmp(territory, foundTerritoryMin) == 0)) &&
(strcasecmp(mapcode, foundMapcode) == 0));
}
if (!found) {
Expand Down