Skip to content
Commits on Source (5)
......@@ -3,7 +3,7 @@ project (GeographicLib)
# Version information
set (PROJECT_VERSION_MAJOR 1)
set (PROJECT_VERSION_MINOR 50)
set (PROJECT_VERSION_PATCH 0)
set (PROJECT_VERSION_PATCH 1)
set (PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
if (PROJECT_VERSION_PATCH GREATER 0)
set (PROJECT_VERSION "${PROJECT_VERSION}.${PROJECT_VERSION_PATCH}")
......@@ -43,7 +43,7 @@ endif ()
# The library version tracks the numbering given by libtool in the
# autoconf set up.
set (LIBVERSION_API 19)
set (LIBVERSION_BUILD 19.0.0)
set (LIBVERSION_BUILD 19.0.1)
string (TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
string (TOUPPER ${PROJECT_NAME} PROJECT_NAME_UPPER)
......@@ -371,17 +371,6 @@ elseif (GEOGRAPHICLIB_PRECISION EQUAL 4)
if (Boost_FOUND)
include_directories ("${Boost_INCLUDE_DIRS}")
set (HIGHPREC_LIBRARIES quadmath)
if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
# Enable Q suffix for quad precision in g++ 4.8 and later
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fext-numeric-literals")
endif ()
# Boost uses std::auto_ptr which is deprecated in C++11. Suppress
# ensuing warnings. See also
# https://svn.boost.org/trac/boost/ticket/11411
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations")
# Suppress the warnings that boost can spew out, e.g.,
# "typedef 'boost_concept_check905' locally defined but not used"
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-local-typedefs")
endif ()
endif ()
if (NOT HIGHPREC_LIBRARIES)
......
......@@ -4,7 +4,24 @@ For more information, see
https://geographiclib.sourceforge.io/
The current version of the library is 1.50.
The current version of the library is 1.50.1
Changes between 1.50.1 (released 2019-12-13) and 1.50 versions:
* Add the World Magnetic Model 2020, wmm2020, covering the period
2020-2025. This is now the model returned by
MagneticModel::DefaultMagneticName and is default magnetic model
for MagneticField (replacing wmm2015v2 which is only valid thru
the end of 2019).
* Include float instantiations of those templated Math functions
which migrated to Math.cpp in version 1.50.
* WARNING: The next version of GeographicLib will require a C++11
compliant compiler. This means that the minimum version of Visual
Studio will be Visual Studio 12 2013. (This repeats the warning
given with version 1.50. It didn't apply to this version because
this is a minor update.)
Changes between 1.50 (released 2019-09-24) and 1.49 versions:
......
......@@ -51,33 +51,12 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
# Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
# Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
#
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
# Free Software Foundation, either version 3 of the License, or (at your
# option) any later version.
#
# 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, see <https://www.gnu.org/licenses/>.
#
# As a special exception, the respective Autoconf Macro's copyright owner
# gives unlimited permission to copy, distribute and modify the configure
# scripts that are the output of Autoconf when processing the Macro. You
# need not follow the terms of the GNU General Public License when using
# or distributing such scripts, even though portions of the text of the
# Macro appear in them. The GNU General Public License (GPL) does govern
# all other use of the material that constitutes the Autoconf Macro.
#
# This special exception to the GPL applies to versions of the Autoconf
# Macro released by the Autoconf Archive. When you make and distribute a
# modified version of the Autoconf Macro, you may extend this special
# exception to the GPL to apply to your modified version as well.
# Copying and distribution of this file, with or without modification, are
# permitted in any medium without royalty provided the copyright notice
# and this notice are preserved. This file is offered as-is, without any
# warranty.
#serial 5
#serial 6
AC_DEFUN([AX_CHECK_COMPILE_FLAG],
[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
......
......@@ -2,7 +2,7 @@
# Attempt to guess a canonical system name.
# Copyright 1992-2018 Free Software Foundation, Inc.
timestamp='2018-03-08'
timestamp='2018-08-29'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
......@@ -84,8 +84,6 @@ if test $# != 0; then
exit 1
fi
trap 'exit 1' 1 2 15
# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
# compiler to aid in system detection is discouraged as it requires
# temporary files to be created and, as you can see below, it is a
......@@ -96,34 +94,39 @@ trap 'exit 1' 1 2 15
# Portable tmp directory creation inspired by the Autoconf team.
set_cc_for_build='
trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
: ${TMPDIR=/tmp} ;
{ tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
dummy=$tmp/dummy ;
tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
case $CC_FOR_BUILD,$HOST_CC,$CC in
,,) echo "int x;" > "$dummy.c" ;
for c in cc gcc c89 c99 ; do
if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
CC_FOR_BUILD="$c"; break ;
fi ;
done ;
if test x"$CC_FOR_BUILD" = x ; then
CC_FOR_BUILD=no_compiler_found ;
fi
;;
,,*) CC_FOR_BUILD=$CC ;;
,*,*) CC_FOR_BUILD=$HOST_CC ;;
esac ; set_cc_for_build= ;'
tmp=
# shellcheck disable=SC2172
trap 'test -z "$tmp" || rm -fr "$tmp"' 1 2 13 15
trap 'exitcode=$?; test -z "$tmp" || rm -fr "$tmp"; exit $exitcode' 0
set_cc_for_build() {
: "${TMPDIR=/tmp}"
# shellcheck disable=SC2039
{ tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } ||
{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } ||
{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; }
dummy=$tmp/dummy
case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in
,,) echo "int x;" > "$dummy.c"
for driver in cc gcc c89 c99 ; do
if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
CC_FOR_BUILD="$driver"
break
fi
done
if test x"$CC_FOR_BUILD" = x ; then
CC_FOR_BUILD=no_compiler_found
fi
;;
,,*) CC_FOR_BUILD=$CC ;;
,*,*) CC_FOR_BUILD=$HOST_CC ;;
esac
}
# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
# (ghazi@noc.rutgers.edu 1994-08-24)
if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
if test -f /.attbin/uname ; then
PATH=$PATH:/.attbin ; export PATH
fi
......@@ -138,7 +141,7 @@ Linux|GNU|GNU/*)
# We could probably try harder.
LIBC=gnu
eval "$set_cc_for_build"
set_cc_for_build
cat <<-EOF > "$dummy.c"
#include <features.h>
#if defined(__UCLIBC__)
......@@ -199,7 +202,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
os=netbsdelf
;;
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
eval "$set_cc_for_build"
set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ELF__
then
......@@ -237,7 +240,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
# contains redundant information, the shorter form:
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
echo "$machine-${os}${release}${abi}"
echo "$machine-${os}${release}${abi-}"
exit ;;
*:Bitrig:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
......@@ -389,20 +392,15 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
echo i386-pc-auroraux"$UNAME_RELEASE"
exit ;;
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
eval "$set_cc_for_build"
SUN_ARCH=i386
# If there is a compiler, see if it is configured for 64-bit objects.
# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
# This test works for both compilers.
if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
grep IS_64BIT_ARCH >/dev/null
then
SUN_ARCH=x86_64
fi
fi
echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
UNAME_REL="`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
case `isainfo -b` in
32)
echo i386-pc-solaris2"$UNAME_REL"
;;
64)
echo x86_64-pc-solaris2"$UNAME_REL"
;;
esac
exit ;;
sun4*:SunOS:6*:*)
# According to config.sub, this is the proper way to canonicalize
......@@ -482,7 +480,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
echo clipper-intergraph-clix"$UNAME_RELEASE"
exit ;;
mips:*:*:UMIPS | mips:*:*:RISCos)
eval "$set_cc_for_build"
set_cc_for_build
sed 's/^ //' << EOF > "$dummy.c"
#ifdef __cplusplus
#include <stdio.h> /* for printf() prototype */
......@@ -579,7 +577,7 @@ EOF
exit ;;
*:AIX:2:3)
if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
eval "$set_cc_for_build"
set_cc_for_build
sed 's/^ //' << EOF > "$dummy.c"
#include <sys/systemcfg.h>
......@@ -660,7 +658,7 @@ EOF
esac
fi
if [ "$HP_ARCH" = "" ]; then
eval "$set_cc_for_build"
set_cc_for_build
sed 's/^ //' << EOF > "$dummy.c"
#define _HPUX_SOURCE
......@@ -700,7 +698,7 @@ EOF
esac
if [ "$HP_ARCH" = hppa2.0w ]
then
eval "$set_cc_for_build"
set_cc_for_build
# hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
# 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
......@@ -726,7 +724,7 @@ EOF
echo ia64-hp-hpux"$HPUX_REV"
exit ;;
3050*:HI-UX:*:*)
eval "$set_cc_for_build"
set_cc_for_build
sed 's/^ //' << EOF > "$dummy.c"
#include <unistd.h>
int
......@@ -840,6 +838,17 @@ EOF
*:BSD/OS:*:*)
echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
exit ;;
arm:FreeBSD:*:*)
UNAME_PROCESSOR=`uname -p`
set_cc_for_build
if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_PCS_VFP
then
echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabi
else
echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabihf
fi
exit ;;
*:FreeBSD:*:*)
UNAME_PROCESSOR=`/usr/bin/uname -p`
case "$UNAME_PROCESSOR" in
......@@ -894,8 +903,8 @@ EOF
# other systems with GNU libc and userland
echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC"
exit ;;
i*86:Minix:*:*)
echo "$UNAME_MACHINE"-pc-minix
*:Minix:*:*)
echo "$UNAME_MACHINE"-unknown-minix
exit ;;
aarch64:Linux:*:*)
echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
......@@ -922,7 +931,7 @@ EOF
echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
arm*:Linux:*:*)
eval "$set_cc_for_build"
set_cc_for_build
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_EABI__
then
......@@ -971,7 +980,7 @@ EOF
echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
mips:Linux:*:* | mips64:Linux:*:*)
eval "$set_cc_for_build"
set_cc_for_build
sed 's/^ //' << EOF > "$dummy.c"
#undef CPU
#undef ${UNAME_MACHINE}
......@@ -1285,7 +1294,7 @@ EOF
exit ;;
*:Darwin:*:*)
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
eval "$set_cc_for_build"
set_cc_for_build
if test "$UNAME_PROCESSOR" = unknown ; then
UNAME_PROCESSOR=powerpc
fi
......@@ -1358,6 +1367,7 @@ EOF
# "uname -m" is not consistent, so use $cputype instead. 386
# is converted to i386 for consistency with other x86
# operating systems.
# shellcheck disable=SC2154
if test "$cputype" = 386; then
UNAME_MACHINE=i386
else
......
This diff is collapsed.
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for GeographicLib 1.50.
# Generated by GNU Autoconf 2.69 for GeographicLib 1.50.1.
#
# Report bugs to <charles@karney.com>.
#
......@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='GeographicLib'
PACKAGE_TARNAME='geographiclib'
PACKAGE_VERSION='1.50'
PACKAGE_STRING='GeographicLib 1.50'
PACKAGE_VERSION='1.50.1'
PACKAGE_STRING='GeographicLib 1.50.1'
PACKAGE_BUGREPORT='charles@karney.com'
PACKAGE_URL=''
 
......@@ -1354,7 +1354,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures GeographicLib 1.50 to adapt to many kinds of systems.
\`configure' configures GeographicLib 1.50.1 to adapt to many kinds of systems.
 
Usage: $0 [OPTION]... [VAR=VALUE]...
 
......@@ -1425,7 +1425,7 @@ fi
 
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of GeographicLib 1.50:";;
short | recursive ) echo "Configuration of GeographicLib 1.50.1:";;
esac
cat <<\_ACEOF
 
......@@ -1548,7 +1548,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
GeographicLib configure 1.50
GeographicLib configure 1.50.1
generated by GNU Autoconf 2.69
 
Copyright (C) 2012 Free Software Foundation, Inc.
......@@ -1989,7 +1989,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
 
It was created by GeographicLib $as_me 1.50, which was
It was created by GeographicLib $as_me 1.50.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
 
$ $0 $@
......@@ -2966,7 +2966,7 @@ fi
 
# Define the identity of the package.
PACKAGE='geographiclib'
VERSION='1.50'
VERSION='1.50.1'
 
 
cat >>confdefs.h <<_ACEOF
......@@ -3062,7 +3062,7 @@ fi
 
GEOGRAPHICLIB_VERSION_MAJOR=1
GEOGRAPHICLIB_VERSION_MINOR=50
GEOGRAPHICLIB_VERSION_PATCH=0
GEOGRAPHICLIB_VERSION_PATCH=1
 
cat >>confdefs.h <<_ACEOF
#define GEOGRAPHICLIB_VERSION_MAJOR $GEOGRAPHICLIB_VERSION_MAJOR
......@@ -3110,7 +3110,7 @@ ac_config_headers="$ac_config_headers include/GeographicLib/Config-ac.h"
 
 
LT_CURRENT=19
LT_REVISION=0
LT_REVISION=1
LT_AGE=0
 
 
......@@ -17187,7 +17187,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by GeographicLib $as_me 1.50, which was
This file was extended by GeographicLib $as_me 1.50.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
 
CONFIG_FILES = $CONFIG_FILES
......@@ -17253,7 +17253,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
GeographicLib config.status 1.50
GeographicLib config.status 1.50.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
 
......
dnl
dnl Copyright (C) 2009, Francesco P. Lovergine <frankie@debian.org>
AC_INIT([GeographicLib],[1.50],[charles@karney.com])
AC_INIT([GeographicLib],[1.50.1],[charles@karney.com])
AC_CANONICAL_SYSTEM
AC_PREREQ(2.61)
AC_CONFIG_SRCDIR(src/Geodesic.cpp)
......@@ -10,7 +10,7 @@ AM_INIT_AUTOMAKE
GEOGRAPHICLIB_VERSION_MAJOR=1
GEOGRAPHICLIB_VERSION_MINOR=50
GEOGRAPHICLIB_VERSION_PATCH=0
GEOGRAPHICLIB_VERSION_PATCH=1
AC_DEFINE_UNQUOTED([GEOGRAPHICLIB_VERSION_MAJOR],
[$GEOGRAPHICLIB_VERSION_MAJOR],[major version number])
AC_DEFINE_UNQUOTED([GEOGRAPHICLIB_VERSION_MINOR],
......@@ -35,7 +35,7 @@ dnl Interfaces changed/added/removed: CURRENT++ REVISION=0
dnl Interfaces added: AGE++
dnl Interfaces removed: AGE=0
LT_CURRENT=19
LT_REVISION=0
LT_REVISION=1
LT_AGE=0
AC_SUBST(LT_CURRENT)
AC_SUBST(LT_REVISION)
......
geographiclib (1.50-2) UNRELEASED; urgency=medium
geographiclib (1.50.1-1) unstable; urgency=medium
* New upstream release.
* Drop Name field from upstream metadata.
* Update symbols for amd64.
-- Bas Couwenberg <sebastic@debian.org> Mon, 09 Dec 2019 09:07:32 +0100
-- Bas Couwenberg <sebastic@debian.org> Thu, 12 Dec 2019 14:49:12 +0100
geographiclib (1.50-1) unstable; urgency=medium
......
# SymbolsHelper-Confirmed: 1.50 amd64 arm64 armel armhf hppa hurd-i386 i386 ia64 ppc64 riscv64 s390x sh4 sparc64 x32
# SymbolsHelper-Confirmed: 1.50.1 amd64
libGeographic.so.19 #PACKAGE# #MINVER#
* Build-Depends-Package: libgeographic-dev
_ZGVZN13GeographicLib4Math4tandIdEET_S2_E8overflow@Base 1.42
_ZGVZN13GeographicLib4Math4tandIeEET_S2_E8overflow@Base 1.50
_ZGVZN13GeographicLib4Math4tandIfEET_S2_E8overflow@Base 1.50.1
(arch=ppc64 s390x)_ZGVZN13GeographicLib4Math4tandIgEET_S2_E8overflow@Base 1.50
_ZGVZN13GeographicLib4Math6degreeIdEET_vE6degree@Base 1.40
_ZGVZN13GeographicLib4Math6degreeIeEET_vE6degree@Base 1.50
_ZGVZN13GeographicLib4Math6degreeIfEET_vE6degree@Base 1.50.1
(arch=ppc64 s390x)_ZGVZN13GeographicLib4Math6degreeIgEET_vE6degree@Base 1.50
_ZN13GeographicLib10Geocentric5WGS84Ev@Base 1.40
_ZN13GeographicLib10Geocentric8RotationEddddPd@Base 1.40
......@@ -207,89 +209,116 @@ libGeographic.so.19 #PACKAGE# #MINVER#
_ZN13GeographicLib4Math12extra_digitsEv@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math3NaNIdEET_v@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math3NaNIeEET_v@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math3NaNIfEET_v@Base 1.50.1
(optional=templinst|arch=ppc64 s390x)_ZN13GeographicLib4Math3NaNIgEET_v@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math3NaNIiEET_v@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math3fmaIdEET_S2_S2_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math3fmaIeEET_S2_S2_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math3fmaIfEET_S2_S2_S2_@Base 1.50.1
(optional=templinst|arch=ppc64 s390x)_ZN13GeographicLib4Math3fmaIgEET_S2_S2_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math3sumIdEET_S2_S2_RS2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math3sumIeEET_S2_S2_RS2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math3sumIfEET_S2_S2_RS2_@Base 1.50.1
(optional=templinst|arch=ppc64 s390x)_ZN13GeographicLib4Math3sumIgEET_S2_S2_RS2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math4cbrtIdEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math4cbrtIeEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math4cbrtIfEET_S2_@Base 1.50.1
(optional=templinst|arch=ppc64 s390x)_ZN13GeographicLib4Math4cbrtIgEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math4cosdIdEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math4cosdIeEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math4cosdIfEET_S2_@Base 1.50.1
(optional=templinst|arch=ppc64 s390x)_ZN13GeographicLib4Math4cosdIgEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math4sindIdEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math4sindIeEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math4sindIfEET_S2_@Base 1.50.1
(optional=templinst|arch=ppc64 s390x)_ZN13GeographicLib4Math4sindIgEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math4tandIdEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math4tandIeEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math4tandIfEET_S2_@Base 1.50.1
(optional=templinst|arch=ppc64 s390x)_ZN13GeographicLib4Math4tandIgEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math4taufIdEET_S2_S2_@Base 1.42
(optional=templinst)_ZN13GeographicLib4Math4taufIeEET_S2_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math4taufIfEET_S2_S2_@Base 1.50.1
(optional=templinst|arch=ppc64 s390x)_ZN13GeographicLib4Math4taufIgEET_S2_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math5asinhIdEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math5asinhIeEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math5asinhIfEET_S2_@Base 1.50.1
(optional=templinst|arch=ppc64 s390x)_ZN13GeographicLib4Math5asinhIgEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math5atandIdEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math5atandIeEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math5atandIfEET_S2_@Base 1.50.1
(optional=templinst|arch=ppc64 s390x)_ZN13GeographicLib4Math5atandIgEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math5atanhIdEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math5atanhIeEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math5atanhIfEET_S2_@Base 1.50.1
(optional=templinst|arch=ppc64 s390x)_ZN13GeographicLib4Math5atanhIgEET_S2_@Base 1.50
_ZN13GeographicLib4Math5dummyEv@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math5expm1IdEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math5expm1IeEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math5expm1IfEET_S2_@Base 1.50.1
(optional=templinst|arch=ppc64 s390x)_ZN13GeographicLib4Math5expm1IgEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math5hypotIdEET_S2_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math5hypotIeEET_S2_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math5hypotIfEET_S2_S2_@Base 1.50.1
(optional=templinst|arch=ppc64 s390x)_ZN13GeographicLib4Math5hypotIgEET_S2_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math5isnanIdEEbT_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math5isnanIeEEbT_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math5isnanIfEEbT_@Base 1.50.1
(optional=templinst|arch=ppc64 s390x)_ZN13GeographicLib4Math5isnanIgEEbT_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math5log1pIdEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math5log1pIeEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math5log1pIfEET_S2_@Base 1.50.1
(optional=templinst|arch=ppc64 s390x)_ZN13GeographicLib4Math5log1pIgEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math5roundIdEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math5roundIeEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math5roundIfEET_S2_@Base 1.50.1
(optional=templinst|arch=ppc64 s390x)_ZN13GeographicLib4Math5roundIgEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math5taupfIdEET_S2_S2_@Base 1.42
(optional=templinst)_ZN13GeographicLib4Math5taupfIeEET_S2_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math5taupfIfEET_S2_S2_@Base 1.50.1
(optional=templinst|arch=ppc64 s390x)_ZN13GeographicLib4Math5taupfIgEET_S2_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math6atan2dIdEET_S2_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math6atan2dIeEET_S2_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math6atan2dIfEET_S2_S2_@Base 1.50.1
(optional=templinst|arch=ppc64 s390x)_ZN13GeographicLib4Math6atan2dIgEET_S2_S2_@Base 1.50
_ZN13GeographicLib4Math6digitsEv@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math6lroundIdEElT_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math6lroundIeEElT_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math6lroundIfEElT_@Base 1.50.1
(optional=templinst|arch=ppc64 s390x)_ZN13GeographicLib4Math6lroundIgEElT_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math6remquoIdEET_S2_S2_Pi@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math6remquoIeEET_S2_S2_Pi@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math6remquoIfEET_S2_S2_Pi@Base 1.50.1
(optional=templinst|arch=ppc64 s390x)_ZN13GeographicLib4Math6remquoIgEET_S2_S2_Pi@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math7eatanheIdEET_S2_S2_@Base 1.42
(optional=templinst)_ZN13GeographicLib4Math7eatanheIeEET_S2_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math7eatanheIfEET_S2_S2_@Base 1.50.1
(optional=templinst|arch=ppc64 s390x)_ZN13GeographicLib4Math7eatanheIgEET_S2_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math7sincosdIdEEvT_RS2_S3_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math7sincosdIeEEvT_RS2_S3_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math7sincosdIfEEvT_RS2_S3_@Base 1.50.1
(optional=templinst|arch=ppc64 s390x)_ZN13GeographicLib4Math7sincosdIgEEvT_RS2_S3_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math8AngRoundIdEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math8AngRoundIeEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math8AngRoundIfEET_S2_@Base 1.50.1
(optional=templinst|arch=ppc64 s390x)_ZN13GeographicLib4Math8AngRoundIgEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math8copysignIdEET_S2_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math8copysignIeEET_S2_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math8copysignIfEET_S2_S2_@Base 1.50.1
(optional=templinst|arch=ppc64 s390x)_ZN13GeographicLib4Math8copysignIgEET_S2_S2_@Base 1.50
_ZN13GeographicLib4Math8digits10Ev@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math8infinityIdEET_v@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math8infinityIeEET_v@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math8infinityIfEET_v@Base 1.50.1
(optional=templinst|arch=ppc64 s390x)_ZN13GeographicLib4Math8infinityIgEET_v@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math8infinityIiEET_v@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math8isfiniteIdEEbT_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math8isfiniteIeEEbT_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math8isfiniteIfEEbT_@Base 1.50.1
(optional=templinst|arch=ppc64 s390x)_ZN13GeographicLib4Math8isfiniteIgEEbT_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math9remainderIdEET_S2_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math9remainderIeEET_S2_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math9remainderIfEET_S2_S2_@Base 1.50.1
(optional=templinst|arch=ppc64 s390x)_ZN13GeographicLib4Math9remainderIgEET_S2_S2_@Base 1.50
_ZN13GeographicLib4OSGB11CheckCoordsEdd@Base 1.40
_ZN13GeographicLib4OSGB13GridReferenceERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERdS9_Rib@Base 1.43
......@@ -589,7 +618,9 @@ libGeographic.so.19 #PACKAGE# #MINVER#
_ZTVN13GeographicLib13GeographicErrE@Base 1.40
(optional=templinst)_ZZN13GeographicLib4Math4tandIdEET_S2_E8overflow@Base 1.42
(optional=templinst)_ZZN13GeographicLib4Math4tandIeEET_S2_E8overflow@Base 1.50
(optional=templinst)_ZZN13GeographicLib4Math4tandIfEET_S2_E8overflow@Base 1.50.1
(optional=templinst|arch=ppc64 s390x)_ZZN13GeographicLib4Math4tandIgEET_S2_E8overflow@Base 1.50
(optional=templinst)_ZZN13GeographicLib4Math6degreeIdEET_vE6degree@Base 1.40
(optional=templinst)_ZZN13GeographicLib4Math6degreeIeEET_vE6degree@Base 1.50
(optional=templinst)_ZZN13GeographicLib4Math6degreeIfEET_vE6degree@Base 1.50.1
(optional=templinst|arch=ppc64 s390x)_ZZN13GeographicLib4Math6degreeIgEET_vE6degree@Base 1.50
......@@ -12,7 +12,7 @@ namespace GeographicLib {
\mainpage GeographicLib library
\author Charles F. F. Karney (charles@karney.com)
\version @PROJECT_VERSION@
\date 2019-09-24
\date 2019-12-13
The documentation for other versions is available at
<tt>https://geographiclib.sourceforge.io/m.nn/</tt> for versions numbers
......@@ -23,7 +23,7 @@ The documentation for other versions is available at
GeographicLib is a small set of <a href="annotated.html">C++
classes</a> for performing conversions between geographic, UTM, UPS,
MGRS, geocentric, and local cartesian coordinates, for gravity (e.g.,
EGM2008), geoid height and geomagnetic field (e.g., WMM2015)
EGM2008), geoid height and geomagnetic field (e.g., WMM2020)
calculations, and for solving geodesic problems. The emphasis is on
returning accurate results with errors close to round-off (about 5--15
nanometers). Accurate algorithms for \ref geodesic and \ref
......@@ -130,7 +130,7 @@ The goals of GeographicLib are:
- Completeness. For each of the projections included, an attempt is
made to provide a complete solution. For example,
Geodesic::Inverse works for anti-podal points.
Similarly, Geocentric.Reverse will return accurate
Similarly, Geocentric::Reverse will return accurate
geodetic coordinates even for points close to the center of the
earth.
- C++ interface. For the projection methods, this allows encapsulation
......@@ -661,6 +661,7 @@ The following Fedora packages are required by
- ccache
- doxygen
- boost-devel
- mpfr-devel
- octave
- python2-sphinx
- nodejs
......@@ -2906,10 +2907,15 @@ The supported models are
<a href="https://ngdc.noaa.gov/geomag/WMM/DoDWMM.shtml"> World
Magnetic Model 2010</a>, which approximates the main magnetic field
for the period 2010--2015.
- <b>wmm2015</b>, the
- <b>wmm2015v2</b>, the
<a href="https://ngdc.noaa.gov/geomag/WMM/DoDWMM.shtml"> World
Magnetic Model 2015</a>, which approximates the main magnetic field
for the period 2015--2020.
- <b>wmm2015</b>, a deprecated version of wmm2015v2.
- <b>wmm2020</b>, the
<a href="https://ngdc.noaa.gov/geomag/WMM/DoDWMM.shtml"> World
Magnetic Model 2020</a>, which approximates the main magnetic field
for the period 2020--2025.
- <b>igrf11</b>, the
<a href="https://ngdc.noaa.gov/IAGA/vmod/igrf.html">International
Geomagnetic Reference Field (11th generation)</a>, which approximates
......@@ -2978,6 +2984,34 @@ These magnetic models are available for download:
<td><center>
<a href="https://sourceforge.net/projects/geographiclib/files/magnetic-distrib/wmm2015.zip">
link</a> (2)</center>
<tr>
<td>wmm2015v2
<td><center>12</center>
<td><center>2015--2020</center>
<td><center>3</center>
<td><center>
<a href="https://sourceforge.net/projects/geographiclib/files/magnetic-distrib/wmm2015v2.tar.bz2">
link</a> (2)</center>
<td><center>
<a href="https://sourceforge.net/projects/geographiclib/files/magnetic-distrib/wmm2015v2.exe">
link</a> (300)</center>
<td><center>
<a href="https://sourceforge.net/projects/geographiclib/files/magnetic-distrib/wmm2015v2.zip">
link</a> (2)</center>
<tr>
<td>wmm2020
<td><center>12</center>
<td><center>2020--2025</center>
<td><center>3</center>
<td><center>
<a href="https://sourceforge.net/projects/geographiclib/files/magnetic-distrib/wmm2020.tar.bz2">
link</a> (2)</center>
<td><center>
<a href="https://sourceforge.net/projects/geographiclib/files/magnetic-distrib/wmm2020.exe">
link</a> (1390)</center>
<td><center>
<a href="https://sourceforge.net/projects/geographiclib/files/magnetic-distrib/wmm2020.zip">
link</a> (2)</center>
<tr>
<td>igrf11
<td><center>13</center>
......@@ -3050,14 +3084,15 @@ These magnetic models are available for download:
link</a> (2750)</center>
</table>
</center>
The "size" column is the size of the uncompressed data.
The "size" column is the size of the uncompressed data. <b>N.B.</b>, the
wmm2015 model is <b>deprecated</b>; use wmm2015v2 instead.
For Linux and Unix systems, GeographicLib provides a shell script
geographiclib-get-magnetic (typically installed in /usr/local/sbin)
which automates the process of downloading and installing the magnetic
models. For example
\verbatim
geographiclib-get-magnetic all # install wmm2010, wmm2015, igrf11, igrf12, emm2010, emm2015, emm2017
geographiclib-get-magnetic all # install all available models
geographiclib-get-magnetic -h # for help
\endverbatim
This script should be run as a user with write access to the
......@@ -3078,7 +3113,7 @@ Otherwise download \e either the tar.bz2 file \e or the zip file (they
have the same contents). To unpack these, run, for example
\verbatim
mkdir -p /usr/local/share/GeographicLib
tar xofjC wmm2015.tar.bz2 /usr/local/share/GeographicLib
tar xofjC wmm2020.tar.bz2 /usr/local/share/GeographicLib
tar xofjC emm2010.tar.bz2 /usr/local/share/GeographicLib
etc.
\endverbatim
......@@ -3124,9 +3159,9 @@ keywords
- keywords that affect the field calculation, namely:
- <b>Radius</b> (required), the normalizing radius of the model in
meters.
- <b>NumModels</b> (default 1), the number of models. WMM2015
- <b>NumModels</b> (default 1), the number of models. WMM2020
consists of a single model giving the magnetic field and its time
variation at 2015. IGRF12 consists of 24 models for 1900 thru 2015
variation at 2020. IGRF12 consists of 24 models for 1900 thru 2015
at 5 year intervals. The time variation is given only for the last
model to allow extrapolation beyond 2015. For dates prior to 2015,
linear interpolation is used.
......@@ -4240,12 +4275,12 @@ the vantage-point tree described by
- J. K. Uhlmann,
<a href="https://doi.org/10.1016/0020-0190(91)90074-r">
Satisfying general proximity/similarity queries with metric trees</a>,
Information Processing Letters 40 175&ndash;179 (1991).
Information Processing Letters 40 175--179 (1991).
- P. N. Yianilos,
<a href="http://pnylab.com/pny/papers/vptree/vptree/">
Data structures and algorithms for nearest neighbor search in general
metric spaces</a>, Proc. 4th ACM-SIAM Symposium on Discrete Algorithms,
(SIAM, 1993). pp. 311&ndash;321.
(SIAM, 1993). pp. 311--321.
Given a set of points \e x, \e y, \e z, &hellip;, in some space and a
distance function \e d satisfying the metric conditions,
......@@ -7674,6 +7709,21 @@ git repository for GeographicLib</a>.
&gt; 1/sqrt(2).
\endif
- <a href="https://geographiclib.sourceforge.io/1.50.1">Version 1.50.1</a>
(released 2019-12-13)
- Add the World Magnetic Model 2020, wmm2020, covering the period
2020--2025. This is now the model returned by
MagneticModel::DefaultMagneticName and is default magnetic model
for <a href="MagneticField.1.html">MagneticField</a> (replacing
wmm2015v2 which is only valid thru the end of 2019).
- Include float instantiations of those templated Math functions
which migrated to Math.cpp in version 1.50.
- <b>WARNING:</b> The <i>next</i> version of GeographicLib will
require a C++11 compliant compiler. This means that the minimum
version of Visual Studio will be Visual Studio 12 2013. (This
repeats the warning given with version 1.50. It didn't apply to
this version because this is a minor update.)
- <a href="https://geographiclib.sourceforge.io/1.50">Version 1.50</a>
(released 2019-09-24)
- BUG fixes:
......
......@@ -11,8 +11,8 @@
/**
\mainpage NETGeographicLib library
\author Scott Heiman (mrmtdew2@outlook.com)
\version 1.50
\date 2019-09-24
\version 1.50.1
\date 2019-12-13
The documentation for other versions is available at
<tt>https://geographiclib.sourceforge.io/m.nn/NET</tt> for versions numbers
......@@ -30,16 +30,16 @@ to the GeographicLib classes. GeographicLib and NETGeographicLib is an
integrated product.
The NETGeographic solutions and C++ projects are located in the
\<ROOT\>/GeographicLib-1.50/windows folder where \<ROOT\> is the
\<ROOT\>/GeographicLib-1.50.1/windows folder where \<ROOT\> is the
directory where you unpacked the GeographicLib source distribution. The
C# Projections projects are located in the
\<ROOT\>/GeographicLib-1.50/dotnet/Projections folder. Solution files
\<ROOT\>/GeographicLib-1.50.1/dotnet/Projections folder. Solution files
have been provided for VS 2010 and VS 2013 NETGeographicLib is not
available for older versions of Microsoft Visual Studio.
NETGeographicLib has been tested with C#, Managed C++, and Visual Basic.
Sample code snippets can be found in
\<ROOT\>/GeographicLib-1.50/dotnet/examples.
\<ROOT\>/GeographicLib-1.50.1/dotnet/examples.
\section differences Differences between NETGeographicLib and GeographicLib
......@@ -145,7 +145,7 @@ to any Visual Basic source that uses NETGeographicLib classes.
A C# sample application is provided that demonstrates NETGeographicLib classes.
The source code for the sample application is located in
\<ROOT\>/GeographicLib-1.50/dotnet/Projections. The sample
\<ROOT\>/GeographicLib-1.50.1/dotnet/Projections. The sample
application creates a tabbed dialog. Each tab provides data entry fields that
allow the user to exercise one or more NETGeographicLib classes.
......
......@@ -40,6 +40,9 @@ namespace NETGeographicLib
* - WMM2015v2:
* - http://ngdc.noaa.gov/geomag/WMM/DoDWMM.shtml
* - http://ngdc.noaa.gov/geomag/WMM/data/WMM2015/WMM2015v2COF.zip
* - WMM2020:
* - http://ngdc.noaa.gov/geomag/WMM/DoDWMM.shtml
* - http://ngdc.noaa.gov/geomag/WMM/data/WMM2020/WMM2020COF.zip
* - IGRF11:
* - http://ngdc.noaa.gov/IAGA/vmod/igrf.html
* - http://ngdc.noaa.gov/IAGA/vmod/igrf11coeffs.txt
......@@ -362,7 +365,7 @@ namespace NETGeographicLib
* @return the default name for the magnetic model.
*
* This is the value of the environment variable
* GEOGRAPHICLIB_MAGNETIC_NAME, if set, otherwise, it is "wmm2015v2".
* GEOGRAPHICLIB_MAGNETIC_NAME, if set, otherwise, it is "wmm2020".
* The MagneticModel class does not use this function; it is just
* provided as a convenience for a calling program when constructing a
* MagneticModel object.
......
......@@ -3,7 +3,7 @@
// machine using OpenMP.
//
// For the format of gtx files, see
// http://vdatum.noaa.gov/dev/gtx_info.html#dev_gtx_binary
// https://vdatum.noaa.gov/docs/gtx_info.html#dev_gtx_binary
//
// data is binary big-endian:
// south latitude edge (degrees double)
......
// This will be overwritten by ./configure
#define GEOGRAPHICLIB_VERSION_STRING "1.50"
#define GEOGRAPHICLIB_VERSION_STRING "1.50.1"
#define GEOGRAPHICLIB_VERSION_MAJOR 1
#define GEOGRAPHICLIB_VERSION_MINOR 50
#define GEOGRAPHICLIB_VERSION_PATCH 0
#define GEOGRAPHICLIB_VERSION_PATCH 1
// Undefine HAVE_LONG_DOUBLE if this type is unknown to the compiler
#define GEOGRAPHICLIB_HAVE_LONG_DOUBLE 1
......
......@@ -48,6 +48,9 @@ namespace GeographicLib {
* - WMM2015V2:
* - https://ngdc.noaa.gov/geomag/WMM/DoDWMM.shtml
* - https://ngdc.noaa.gov/geomag/WMM/data/WMM2015/WMM2015v2COF.zip
* - WMM2020:
* - https://ngdc.noaa.gov/geomag/WMM/DoDWMM.shtml
* - https://ngdc.noaa.gov/geomag/WMM/data/WMM2020/WMM2020COF.zip
* - IGRF11:
* - https://ngdc.noaa.gov/IAGA/vmod/igrf.html
* - https://ngdc.noaa.gov/IAGA/vmod/igrf11coeffs.txt
......@@ -366,7 +369,7 @@ namespace GeographicLib {
* @return the default name for the magnetic model.
*
* This is the value of the environment variable
* GEOGRAPHICLIB_MAGNETIC_NAME, if set; otherwise, it is "wmm2015v2". The
* GEOGRAPHICLIB_MAGNETIC_NAME, if set; otherwise, it is "wmm2020". The
* MagneticModel class does not use this function; it is just provided as a
* convenience for a calling program when constructing a MagneticModel
* object.
......
......@@ -431,10 +431,11 @@ namespace GeographicLib {
* T.
* @return object of type T
*
* \note The msys shell under Windows converts arguments which look
* like pathnames into their Windows equivalents. As a result the argument
* \note The msys shell under Windows converts arguments which look like
* pathnames into their Windows equivalents. As a result the argument
* "-1/300" gets mangled into something unrecognizable. A workaround is to
* use a floating point number in the numerator, i.e., "-1.0/300".
* use a floating point number in the numerator, i.e., "-1.0/300". (Recent
* versions of the msys shell appear \e not to have this problem.)
**********************************************************************/
template<typename T> static T fract(const std::string& s) {
std::string::size_type delim = s.find('/');
......
......@@ -125,7 +125,7 @@
*
* <h3>Using maven to build and run {@code Inverse.java}</h3>
* The sample code includes a {@code pom.xml} which specifies
* GeographicLib-Jave as a dependency. You can build and install this
* GeographicLib-Java as a dependency. You can build and install this
* dependency by running (in the main java directory) <pre>
* mvn install </pre>
* Alternatively, you can let maven download it from Maven Central. You can
......
.\" Automatically generated by Pod::Man 4.12 (Pod::Simple 3.35)
.\" Automatically generated by Pod::Man 4.12 (Pod::Simple 3.39)
.\"
.\" Standard preamble:
.\" ========================================================================
......@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "CARTCONVERT 1"
.TH CARTCONVERT 1 "2019-09-24" "GeographicLib 1.50" "GeographicLib Utilities"
.TH CARTCONVERT 1 "2019-12-12" "GeographicLib 1.50.1" "GeographicLib Utilities"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
......
......@@ -9,7 +9,7 @@ int usage(int retval, bool brief) {
"For full documentation type:\n"
" CartConvert --help\n"
"or visit:\n"
" https://geographiclib.sourceforge.io/1.50/CartConvert.1.html\n";
" https://geographiclib.sourceforge.io/1.50.1/CartConvert.1.html\n";
else
( retval ? std::cerr : std::cout ) << "Man page:\n"
"NAME\n"
......
.\" Automatically generated by Pod::Man 4.12 (Pod::Simple 3.35)
.\" Automatically generated by Pod::Man 4.12 (Pod::Simple 3.39)
.\"
.\" Standard preamble:
.\" ========================================================================
......@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "CONICPROJ 1"
.TH CONICPROJ 1 "2019-09-24" "GeographicLib 1.50" "GeographicLib Utilities"
.TH CONICPROJ 1 "2019-12-12" "GeographicLib 1.50.1" "GeographicLib Utilities"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
......