Update NEWS for 7.0.1

Originally proposed by Greg Troxel on the mailing list:
https://lists.osgeo.org/pipermail/proj/2020-April/009597.html

Co-authored-by: Greg Troxel <gdt@lexort.com>

.cirrus.yml

@@ -13,17 +13,15 @@ task:
     CIRRUS_CLONE_DEPTH: 1
     MAKE_FLAGS: -j 4
 
-  cache:
-    folder: $HOME/.ccache
+  # Disable cache: its upload can take up to 30 minutes!
+  #cache:
+  #  folder: $HOME/.ccache
 
   pkginstall_script:
     - pkg install -y autoconf automake libtool pkgconf sqlite3 tiff ccache gmake
-  download_grid_script:
-    - fetch https://download.osgeo.org/proj/proj-datumgrid-1.8.zip
-    - (cd data && tar xvf ../proj-datumgrid-1.8.zip)
   configure_script:
     - ./autogen.sh
-    - CC="ccache cc" CXX="ccache c++" ./configure --disable-static
+    - ./configure --disable-static
   compile_script:
     - gmake $(MAKE_FLAGS)
   test_script:

.travis.yml

@@ -21,15 +21,22 @@ matrix:
         - docker
       env:
         - BUILD_NAME=linux_gcc
-        - DETAILS="linux, gcc"
+        - DETAILS="linux, gcc-4.8"
+        - CC=gcc-4.8
+        - CXX=g++-4.8
+      addons:
+        apt:
+          packages:
+            - g++-4.8
 
     - os: linux
-      dist: xenial
+      dist: bionic
       compiler: gcc
       services:
         - docker
       env:
         - BUILD_NAME=linux_gcc8
+        - DETAILS="linux, gcc8"
         - DETAILS="linux, gcc8, i386"
         - ARCH=i386
         - CC=gcc-8
@@ -40,11 +47,10 @@ matrix:
         - TIFF_LIBS="-L/usr/lib/i386-linux-gnu -ltiff"
         - SQLITE3_CFLAGS=-I/usr/include/i386-linux-gnu
         - SQLITE3_LIBS="-L/usr/lib/i386-linux-gnu -lsqlite3"
-        - SKIP_BUILDS_WITHOUT_GRID=yes
       addons:
         apt:
           sources:
-            - ubuntu-toolchain-r-test
+            - sourceline: 'ppa:ubuntu-toolchain-r/test'
           packages:
             - g++-8-multilib
             - make

CMakeLists.txt

@@ -11,7 +11,10 @@
 ################################################################################
 cmake_minimum_required(VERSION 3.9 FATAL_ERROR)
 
-project(PROJ LANGUAGES C CXX)
+project(PROJ
+  DESCRIPTION "PROJ coordinate transformation software library"
+  LANGUAGES C CXX
+)
 
 # Only interpret if() arguments as variables or keywords when unquoted
 cmake_policy(SET CMP0054 NEW)
@@ -100,9 +103,9 @@ message(STATUS "Configuring PROJ:")
 #PROJ version information
 ################################################################################
 include(ProjVersion)
-proj_version(MAJOR 7 MINOR 0 PATCH 0)
+proj_version(MAJOR 7 MINOR 0 PATCH 1)
 set(PROJ_API_VERSION "19")
-set(PROJ_BUILD_VERSION "19.0.0")
+set(PROJ_BUILD_VERSION "19.1.0")
 
 ################################################################################
 # Build features and variants
@@ -124,26 +127,31 @@ if(NOT SQLITE3_FOUND)
   message(SEND_ERROR "sqlite3 dependency not found!")
 endif()
 
-# Would build and run with older versons, but with horrible performance
+# Would build and run with older versions, but with horrible performance
 # See https://github.com/OSGeo/PROJ/issues/1718
-IF("${SQLITE3_VERSION}" VERSION_LESS "3.11")
+if("${SQLITE3_VERSION}" VERSION_LESS "3.11")
   message(SEND_ERROR "sqlite3 >= 3.11 required!")
-ENDIF()
+endif()
 
 ################################################################################
 # Check for libtiff
 ################################################################################
 
-option(DISABLE_TIFF "Disable TIFF support" OFF)
-mark_as_advanced(DISABLE_TIFF)
-if(DISABLE_TIFF)
-  message(WARNING "TIFF support has been disabled and will result in the inability to read some grids")
-else()
+option(ENABLE_TIFF "Enable TIFF support to read some grids" ON)
+mark_as_advanced(ENABLE_TIFF)
+set(TIFF_ENABLED FALSE)
+if(ENABLE_TIFF)
   find_package(TIFF REQUIRED)
-  if(NOT TIFF_FOUND)
-    message(SEND_ERROR "libtiff dependency not found!")
+  if(TIFF_FOUND)
+    set(TIFF_ENABLED TRUE)
+  else()
+    message(SEND_ERROR
+      "libtiff dependency not found! Use ENABLE_TIFF=OFF to force it off")
   endif()
-  add_definitions(-DTIFF_ENABLED)
+else()
+  message(WARNING
+    "TIFF support is not enabled and will result in the inability to read "
+    "some grids")
 endif()
 
 ################################################################################
@@ -151,12 +159,14 @@ endif()
 ################################################################################
 
 option(ENABLE_CURL "Enable Curl support" ON)
+set(CURL_ENABLED FALSE)
 if(ENABLE_CURL)
   find_package(CURL REQUIRED)
-  if(NOT CURL_FOUND)
+  if(CURL_FOUND)
+    set(CURL_ENABLED TRUE)
+  else()
     message(SEND_ERROR "curl dependency not found!")
   endif()
-  add_definitions(-DCURL_ENABLED)
 endif()
 
 ################################################################################
@@ -208,9 +218,9 @@ endif()
 # top of the build tree rather than in hard-to-find leaf
 # directories. This simplifies manual testing and the use of the build
 # tree rather than installed PROJ libraries.
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJ_BINARY_DIR}/lib)
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJ_BINARY_DIR}/lib)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJ_BINARY_DIR}/bin)
 link_directories(${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
 
 ################################################################################

Doxyfile

@@ -230,12 +230,6 @@ TAB_SIZE               = 4
 
 ALIASES                =
 
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
 # instance, some of the names that are used will be different. The list of all

HOWTO-RELEASE

@@ -63,7 +63,7 @@ Update the following files with the new ABI version number:
 Man pages are (mostly) automatically generated from the Sphinx docs. Follow
 these steps:
 
-    - Temporarily update version in `docs/source/conf.py`
+    - Temporarily update `version` and `data_version` in `docs/source/conf.py`
     - run `scripts/update_man.sh`
     - Revert version number in `docs/source/conf.py`
 

NEWS

@@ -1,3 +1,116 @@
+7.0.1 Release Notes
+-------------------
+
+ Updates
+ -------
+
+ o Database: update to EPSG v9.8.9 #2141
+
+ Bug fixes
+ ---------
+
+ o Make tests independent of proj-datumgrid (#1995)
+
+ o Add missing projection property tables (#1996)
+
+ o Avoid crash when running against SQLite3 binary built with
+   -DSQLITE_OMIT_AUTOINIT (#1999)
+
+ o createOperations(): fix wrong pipeline generation with CRS that has +nadgrids=
+   and +pm= (#2002)
+
+ o Fix bad copy&replace pattern on HEALPix and rHEALPix projection names (#2007)
+
+ o createUnitOfMeasure(): use full double resolution for the conversion
+   factor (#2014)
+
+ o Update README with info on PROJ-data (#2015)
+
+ o utm/ups: make sure to set errno to PJD_ERR_ELLIPSOID_USE_REQUIRED if
+   es==0 (#2045)
+
+ o data/Makefile.am: remove bashism (#2048)
+
+ o ProjectedCRS::identify(): tune it to better work with ESRI WKT
+   representation of EPSG:2193 (#2059)
+
+ o Fix build with gcc 4.8.5 (#2066)
+
+ o Autotools/pkg-conf: Define datarootdir (#2069)
+
+ o cs2cs: don't require +to for '{source_crs} {target_crs} filename...'
+   syntax (#2081)
+
+ o CMake: fix bug with find_package(PROJ) with macOS (#2082)
+
+ o ESRI WKT import / identification: special case for
+   NAD_1983_HARN_StatePlane_Colorado_North_FIPS_0501 with Foot_US unit (#2088)
+
+ o ESRI WKT import / identification: special case for
+   NAD_1983_HARN_StatePlane_Colorado_North_FIPS_0501 with Foot_US unit (#2089)
+
+ o EngineeringCRS: when exporting to WKT1_GDAL, output unit and axis (#2092)
+
+ o Use jtsk03-jtsk horizontal grid from CDN (#2098)
+
+ o CMake: prefer to use use PROJ_SOURCE_DIR and PROJ_BINARY_DIR (#2100)
+
+ o Fix wrong grids file name in esri.sql (#2104)
+
+ o Fix identification of projected CRS whose name is close but not strictly
+   equal to a ESRI alias (#2106)
+
+ o Fix working of Helmert transform between the horizontal part of
+   2 compoundCRS (#2111)
+
+ o Database: fix registration of custom entries of grid_transformation_custom.sql
+   for geoid grids (#2114)
+
+ o ESRI_WKT ingestion: make sure to identify to non-deprecated EPSG entry when
+   possible (#2119)
+
+ o Make sure that importing a Projected 3D CRS from WKT:2019 keeps the base
+   geographic CRS as 3D (#2125)
+
+ o createOperations(): improve results of compoundCRS to compoundCRS case (#2131)
+
+ o hgridshift/vgridshift: defer grid opening when grid has already
+   been opened (#2132)
+
+ o Resolve a few shadowed declaration warnings (#2142)
+
+ o ProjectedCRS identification: deal with switched 1st/2nd std parallels for
+   LCC_2SP(#2153)
+
+ o Fix Robinson inverse projection (#2154)
+
+ o createOperations(): do not remove ballpark transformation if there are only
+   grid based operations, even if they cover the whole area of use (#2156)
+
+ o createFromCoordinateReferenceSystemCodes(): 'optimization' to avoid using
+   C++ exceptions (#2161)
+
+ o Ingestion of WKT1_GDAL: correctly map 'Cylindrical_Equal_Area' (#2167)
+
+ o Add limited support for non-conformant WKT1 LAS COMPD_CS[] (#2172)
+
+ o PROJ4 string import: take into correctly non-metre unit when the string
+   looks like the one for WGS 84 / Pseudo Mercator (#2177)
+
+ o io.hpp: avoid dependency to proj_json_streaming_writer.hpp (#2184)
+
+ o Fix support of WKT1_GDAL with netCDF rotated pole formulation (#2186)
+
+
+ THANKS TO
+ ---------
+
+ Mike Taves
+ Chris Mayo
+ Kristian Evers
+ Even Rouault
+
+
 7.0.0 Release Notes
 -------------------
 

README.md

@@ -51,20 +51,14 @@ number, and "z" indicates the patch number of the release.
 
 In addition to the PROJ software package, distributions of datum
 conversion grid files and PROJ parameter files are also available.
-The grid package is distributed under the name `proj-datumgrid-x.y.zip`,
+The grid package is distributed under the name `proj-data-x.y.zip`,
 where "x" is the major release version and "y" is the minor release
-version numbers. Similarly regional packages are distributed. The
-regional packages contain resources that are not essential to the
-functionality of PROJ but still of value to users in the region
-specific to the package. All grids that were in proj-datumgrids-1.6
-remain in proj-datumgrids-1.7; the regional datumgrid files contain
-grids for datums not previously supported (prior to PROJ 5.0.0).
+version numbers. The resource packages can be downloaded from the
+[PROJ website](https://proj.org/download.html).
 
-The resource packages can be downloaded from the [PROJ website](https://proj.org/download.html).
-
-More info on the contents of the various resource packages can be
+More info on the contents of the proj-data package can be
 found at the
-[proj-datumgrid GitHub repository](https://github.com/OSGeo/proj-datumgrid).
+[PROJ-data GitHub repository](https://github.com/OSGeo/PROJ-data).
 
 The resource file packages should be extracted to `PROJ_LIB`
 where PROJ will find them after installation. The default location of
@@ -72,6 +66,13 @@ where PROJ will find them after installation. The default location of
 be changed to a different directory. On Windows you have to define
 `PROJ_LIB` yourself.
 
+As an alternative to installing the data package on the local system,
+the resource files can be retrieved on-the-fly from the
+[PROJ CDN](https://cdn.proj.org/). A [network-enabled](https://proj.org/usage/network.html) PROJ build, will
+automatically fetch resource files that are not present locally from the
+CDN.
+
+
 ## Citing PROJ in publications
 
 See [CITATION](CITATION)

appveyor.yml

@@ -1,7 +1,3 @@
-platform:
-- x64
-- x86
-
 branches:
   except:
     - /(cherry-pick-)?backport-\d+-to-/
@@ -10,48 +6,47 @@ environment:
   matrix:
 
 # VS 2015
-  - VS_VERSION: Visual Studio 14
+  - platform: x86
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+    BUILD_SHARED_LIBS: OFF
 
 # VS 2017
-  - VS_VERSION: Visual Studio 15
+  - platform: x64
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    BUILD_SHARED_LIBS: ON
 
 shallow_clone: true
 
+cache:
+  - C:\Tools\vcpkg\installed\ -> appveyor.yml
+
 build_script:
-  - echo build_script
-  - git clone https://github.com/microsoft/vcpkg
-  - cd vcpkg
-  - bootstrap-vcpkg.bat
-  - set PATH=%CD%;%PATH%
-  - cd ..
-  - vcpkg install sqlite3:"%platform%"-windows
-  - vcpkg install tiff:"%platform%"-windows
-  - vcpkg install curl:"%platform%"-windows
-  - set SQLITE3_BIN=%APPVEYOR_BUILD_FOLDER%\sqlite3\bin
-  - mkdir %SQLITE3_BIN%
-  - ps: |
-        appveyor DownloadFile https://sqlite.org/2018/sqlite-tools-win32-x86-3250100.zip
-        7z x sqlite-tools-win32-x86-3250100.zip
-  - copy "%APPVEYOR_BUILD_FOLDER%"\sqlite-tools-win32-x86-3250100\sqlite3.exe %SQLITE3_BIN%
-  - set PATH=%SQLITE3_BIN%;%PATH%
-  - if "%platform%" == "x64" SET VS_FULL=%VS_VERSION% Win64
-  - if "%platform%" == "x64" SET BUILD_LIBPROJ_SHARED=ON
-  - if "%platform%" == "x86" SET VS_FULL=%VS_VERSION%
-  - if "%platform%" == "x86" SET BUILD_LIBPROJ_SHARED=OFF
-  - echo "%VS_FULL%"
+  - set VCPKG_INSTALLED=C:\Tools\vcpkg\installed\%platform%-windows
+  # If cached directory does not exist, update vcpkg and install dependencies
+  - if not exist %VCPKG_INSTALLED%\bin (
+      cd "C:\Tools\vcpkg" &
+      git pull > nul &
+      .\bootstrap-vcpkg.bat -disableMetrics &
+      vcpkg install sqlite3[core,tool]:"%platform%"-windows &
+      vcpkg install tiff:"%platform%"-windows &
+      vcpkg install curl:"%platform%"-windows &
+      cd %APPVEYOR_BUILD_FOLDER%
+    )
+  - dir %VCPKG_INSTALLED%\bin
+  - set PATH=%VCPKG_INSTALLED%\bin;%PATH%
+  # See https://www.appveyor.com/docs/lang/cpp/
+  - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" if %platform%==x86
+      (call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86)
+  - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017"
+      (call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" %platform% )
 #
-  - cd %APPVEYOR_BUILD_FOLDER%\data
-  - curl -O https://download.osgeo.org/proj/proj-datumgrid-1.8.zip
-  - 7z e -aoa -y proj-datumgrid-1.8.zip
   - set PROJ_BUILD=%APPVEYOR_BUILD_FOLDER%\build
   - mkdir %PROJ_BUILD%
   - cd %PROJ_BUILD%
   - set PROJ_DIR=%APPVEYOR_BUILD_FOLDER%\proj_dir
-  - cmake -G "%VS_FULL%" .. -DCMAKE_BUILD_TYPE=Release -DBUILD_LIBPROJ_SHARED="%BUILD_LIBPROJ_SHARED%" -DCMAKE_C_FLAGS="/WX" -DCMAKE_CXX_FLAGS="/WX" -DCMAKE_TOOLCHAIN_FILE=C:/projects/proj/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_INSTALL_PREFIX="%PROJ_DIR%"
-  - cmake --build . --config Release --target install
-  - copy c:\projects\proj\vcpkg\installed\"%platform%"-windows\bin\*.dll %PROJ_DIR%\bin
+  - cmake -GNinja .. -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS="%BUILD_SHARED_LIBS%" -DCMAKE_C_FLAGS="/WX" -DCMAKE_CXX_FLAGS="/WX" -DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_INSTALL_PREFIX="%PROJ_DIR%"
+  - ninja -v
+  - ninja install
   - dir %PROJ_DIR%\bin
 
 test_script:

cmake/ProjConfig.cmake

@@ -41,7 +41,7 @@ set(PACKAGE_VERSION "${${PROJECT_NAME}_VERSION}")
 
 # check if a second proj_config.h exists (created by ./configure)
 # as this is within CMake's C_INCLUDES / CXX_INCLUDES
-set(AUTOCONF_PROJ_CONFIG_H "${CMAKE_SOURCE_DIR}/src/proj_config.h")
+set(AUTOCONF_PROJ_CONFIG_H "${PROJ_SOURCE_DIR}/src/proj_config.h")
 if(EXISTS ${AUTOCONF_PROJ_CONFIG_H})
   message(WARNING
     "Autoconf's ${AUTOCONF_PROJ_CONFIG_H} may interfere with this "

cmake/ProjTest.cmake

@@ -3,32 +3,22 @@
 #
 
 function(proj_test_set_properties TESTNAME)
-    set_tests_properties( ${TESTNAME}
-        PROPERTIES ENVIRONMENT "PROJ_IGNORE_USER_WRITABLE_DIRECTORY=YES;PROJ_LIB=${PROJECT_BINARY_DIR}/data/for_tests")
+  set_property(TEST ${TESTNAME}
+    PROPERTY ENVIRONMENT
+      "PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES"
+      "PROJ_LIB=${PROJ_BINARY_DIR}/data/for_tests")
 endfunction()
 
 function(proj_add_test_script_sh SH_NAME BIN_USE)
   if(UNIX)
     get_filename_component(testname ${SH_NAME} NAME_WE)
 
-    set(TEST_OK 1)
-    if(ARGV2)
-      set(TEST_OK 0)
-      set(GRID_FULLNAME ${PROJECT_SOURCE_DIR}/data/${ARGV2})
-      if(EXISTS ${GRID_FULLNAME})
-        set(TEST_OK 1)
-      endif()
-    endif()
-
-    if(${TEST_OK})
-      add_test(NAME "${testname}"
-        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/data
-        COMMAND bash ${PROJECT_SOURCE_DIR}/test/cli/${SH_NAME}
-        ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${${BIN_USE}}
-      )
-
-      proj_test_set_properties(${testname})
-    endif()
+    add_test(NAME "${testname}"
+      WORKING_DIRECTORY ${PROJ_SOURCE_DIR}/data
+      COMMAND bash ${PROJ_SOURCE_DIR}/test/cli/${SH_NAME}
+      ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${${BIN_USE}}
+    )
+    proj_test_set_properties(${testname})
 
   endif()
 endfunction()
@@ -37,9 +27,9 @@ endfunction()
 function(proj_add_gie_test TESTNAME TESTCASE)
 
     set(GIE_BIN $<TARGET_FILE_NAME:gie>)
-    set(TESTFILE ${CMAKE_SOURCE_DIR}/test/${TESTCASE})
+    set(TESTFILE ${PROJ_SOURCE_DIR}/test/${TESTCASE})
     add_test(NAME ${TESTNAME}
-      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/test
+      WORKING_DIRECTORY ${PROJ_SOURCE_DIR}/test
       COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${GIE_BIN}
       ${TESTFILE}
     )

cmake/project-config-version.cmake.in

@@ -30,10 +30,10 @@ if (NOT PACKAGE_FIND_NAME STREQUAL "@PROJECT_VARIANT_NAME@")
   set (REASON "package = @PROJECT_VARIANT_NAME@, NOT ${PACKAGE_FIND_NAME}")
   set (PACKAGE_VERSION_UNSUITABLE TRUE)
 elseif (NOT (APPLE OR (NOT DEFINED CMAKE_SIZEOF_VOID_P) OR
-      CMAKE_SIZEOF_VOID_P EQUAL @CMAKE_SIZEOF_VOID_P@))
+      CMAKE_SIZEOF_VOID_P EQUAL "@CMAKE_SIZEOF_VOID_P@"))
   # Reject if there's a 32-bit/64-bit mismatch (not necessary with Apple
   # since a multi-architecture library is built for that platform).
-  set (REASON "sizeof(*void) =  @CMAKE_SIZEOF_VOID_P@")
+  set (REASON "sizeof(*void) = @CMAKE_SIZEOF_VOID_P@")
   set (PACKAGE_VERSION_UNSUITABLE TRUE)
 elseif (MSVC AND NOT (
     # toolset version must be at least as great as @PROJECT_NAME@'s

configure.ac

@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([PROJ], [7.0.0],
+AC_INIT([PROJ], [7.0.1],
         [https://github.com/OSGeo/PROJ/issues], proj, [https://proj.org])
 AC_CONFIG_MACRO_DIR([m4])
 AC_LANG(C)
@@ -238,7 +238,7 @@ dnl ---------------------------------------------------------------------------
 
 if test "x$SQLITE3_CFLAGS$SQLITE3_LIBS" = "x" ; then
 
-    dnl Would build and run with older versons, but with horrible performance
+    dnl Would build and run with older versions, but with horrible performance
     dnl See https://github.com/OSGeo/PROJ/issues/1718
 
     PKG_CHECK_MODULES([SQLITE3], [sqlite3 >= 3.11])
@@ -256,12 +256,10 @@ dnl Check for libtiff
 dnl ---------------------------------------------------------------------------
 
 AC_ARG_ENABLE([tiff],
-              AS_HELP_STRING([--disable-tiff],
-                    [Disable TIFF support. Strongly discouraged !]),
-              [enable_tiff=no],
-              [enable_tiff=yes])
+              AS_HELP_STRING([--enable-tiff],
+                    [Enable TIFF support; strongly encouraged to read some grids [default=yes]]))
 
-if test "x$enable_tiff" = "xyes" -o "x$enable_tiff" = ""; then
+if test "x$enable_tiff" != "xno" -o "x$enable_tiff" = ""; then
     if test "x$TIFF_CFLAGS$TIFF_LIBS" = "x" ; then
         if $PKG_CONFIG libtiff; then
             PKG_CHECK_MODULES([TIFF], [libtiff])
@@ -351,7 +349,7 @@ dnl ---------------------------------------------------------------------------
 AC_CONFIG_FILES([Makefile cmake/Makefile src/Makefile include/Makefile include/proj/Makefile include/proj/internal/Makefile
                  include/proj/internal/nlohmann/Makefile
                  test/Makefile test/cli/Makefile test/gie/Makefile test/gigs/Makefile test/unit/Makefile
-                 man/Makefile man/man1/Makefile man/man3/Makefile data/Makefile])
+                 man/Makefile man/man1/Makefile data/Makefile])
 if ! test "x$with_external_gtest" = "xyes" ; then
     AC_CONFIG_FILES([test/googletest/Makefile test/googletest/include/Makefile
                      test/googletest/include/gtest/Makefile

data/CMakeLists.txt

@@ -70,30 +70,34 @@ set(DATA_FOR_TESTS
     GL27
     nad27
     nad83
-    ntv1_can.dat
-    MD
-    ntf_r93.gsb
-    egm96_15.gtx
-    ntv2_0.gsb
-    conus
-    alaska
-    nzgd2kgrid0005.gsb
-    ITRF2000
-    BETA2007.gsb)
-file(GLOB DATA_TESTS tests/*)
+    ITRF2000)
 
 execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/for_tests)
 execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/for_tests/tests)
+
 foreach(FILE ${DATA_FOR_TESTS} ${CONFIG_FILES})
-    if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE})
-        configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${FILE} ${CMAKE_CURRENT_BINARY_DIR}/for_tests/${FILE} COPYONLY)
-    endif()
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${FILE} ${CMAKE_CURRENT_BINARY_DIR}/for_tests/${FILE} COPYONLY)
 endforeach()
+
+file(GLOB DATA_TESTS tests/*)
 foreach(FILE ${DATA_TESTS})
     get_filename_component(FILENAME ${FILE} NAME)
     configure_file(${FILE} ${CMAKE_CURRENT_BINARY_DIR}/for_tests/tests/${FILENAME} COPYONLY)
 endforeach()
 
+set(DATA_FOR_TESTS_FROM_TESTS_SUBDIR
+    alaska
+    BETA2007.gsb
+    conus
+    MD
+    ntf_r93.gsb
+    ntv1_can.dat)
+foreach(FILE ${DATA_FOR_TESTS_FROM_TESTS_SUBDIR})
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tests/${FILE} ${CMAKE_CURRENT_BINARY_DIR}/for_tests/${FILE} COPYONLY)
+endforeach()
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tests/egm96_15_downsampled.gtx ${CMAKE_CURRENT_BINARY_DIR}/for_tests/egm96_15.gtx COPYONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tests/ntv2_0_downsampled.gsb ${CMAKE_CURRENT_BINARY_DIR}/for_tests/ntv2_0.gsb COPYONLY)
+
 #
 #install
 #

data/Makefile.am

@@ -87,6 +87,16 @@ EXTRA_DIST = proj.ini GL27 nad.lst nad27 nad83 \
 		tests/nkgrf03vel_realigned_z_extract.gtx \
 		tests/test_hgrid_with_two_level_of_subgrids_no_grid_name.tif \
 		tests/us_noaa_geoid06_ak_subset_at_antimeridian.tif \
+		tests/test_hgrid_little_endian.gsb \
+		tests/test_hgrid_big_endian.gsb \
+		tests/BETA2007.gsb \
+		tests/MD \
+		tests/alaska \
+		tests/conus \
+		tests/egm96_15_downsampled.gtx \
+		tests/ntv1_can.dat \
+		tests/ntv2_0_downsampled.gsb \
+		tests/ntf_r93.gsb \
 		generate_all_sql_in.cmake sql_filelist.cmake \
 		$(SQL_ORDERED_LIST)
 
@@ -125,7 +135,7 @@ proj.db: $(DATAPATH)/sql/*.sql
 	echo "" | head -c1; \
         if [ $$? -eq 0 ] ; then \
          echo "Running foreign_key_check"; \
-	 if [[ $$(echo "pragma foreign_key_check;" | sqlite3 proj.db | head -c1 | wc -c) -ne 0 ]]; then \
+	 if [ $$(echo "pragma foreign_key_check;" | sqlite3 proj.db | head -c1 | wc -c) -ne 0 ]; then \
 		echo "Foreign key check failed"; \
 		$(RM) proj.db; \
 		exit 1; \
@@ -141,6 +151,19 @@ proj.db: $(DATAPATH)/sql/*.sql
 # For out-of-tree builds, link all file of the source data dir to the generated data
 # Also link select resource files in a for_tests subdirectory so that we are not
 # influenced by the presence of other grids
+
+# egm96_15_downsampled.gtx created with
+# gdal_translate proj-datumgrid/egm96_15.gtx egm96_15_downsampled.gtx -of GTX -outsize 25% 25% -r average
+
+# ntv2_0_downsampled.gsb created with:
+# gdal_translate NTv2:0:/home/even/proj/proj-datumgrid/north-america/ntv2_0.gsb  /tmp/ntv2_0_downsampled.gsb -of NTv2 -outsize 10% 10%
+# gdal_translate NTv2:1:/home/even/proj/proj-datumgrid/north-america/ntv2_0.gsb  /tmp/ntv2_0_downsampled.gsb -of NTv2 -outsize 10% 10% -co append_subdataset=yes
+# gdal_translate NTv2:2:/home/even/proj/proj-datumgrid/north-america/ntv2_0.gsb  /tmp/ntv2_0_downsampled.gsb -of NTv2 -outsize 10% 10% -co append_subdataset=yes
+# gdal_translate NTv2:3:/home/even/proj/proj-datumgrid/north-america/ntv2_0.gsb  /tmp/ntv2_0_downsampled.gsb -of NTv2 -outsize 10% 10% -co append_subdataset=yes
+# gdal_translate NTv2:99:/home/even/proj/proj-datumgrid/north-america/ntv2_0.gsb  /tmp/ntv2_0_downsampled.gsb -of NTv2 -co append_subdataset=yes
+# gdal_translate NTv2:44:/home/even/proj/proj-datumgrid/north-america/ntv2_0.gsb  /tmp/ntv2_0_downsampled.gsb -of NTv2 -co append_subdataset=yes
+# gdal_translate NTv2:4:/home/even/proj/proj-datumgrid/north-america/ntv2_0.gsb  /tmp/ntv2_0_downsampled.gsb -of NTv2 -co append_subdataset=yes
+
 check-local:
 	@if [ ! -f GL27 ]; then \
 		for x in $(DATAPATH)/*; do \
@@ -152,24 +175,24 @@ check-local:
 	for x in $(DATAPATH)/GL27 \
 		 $(DATAPATH)/nad27 \
 		 $(DATAPATH)/nad83 \
-		 $(DATAPATH)/ntv1_can.dat \
-		 $(DATAPATH)/MD \
-		 $(DATAPATH)/ntf_r93.gsb \
-		 $(DATAPATH)/egm96_15.gtx \
-		 $(DATAPATH)/ntv2_0.gsb \
-		 $(DATAPATH)/conus \
-		 $(DATAPATH)/alaska \
-		 $(DATAPATH)/nzgd2kgrid0005.gsb \
+		 $(DATAPATH)/tests/ntv1_can.dat \
+		 $(DATAPATH)/tests/MD \
+		 $(DATAPATH)/tests/ntf_r93.gsb \
+		 $(DATAPATH)/tests/conus \
+		 $(DATAPATH)/tests/alaska \
 		 $(DATAPATH)/ITRF2000 \
-		 $(DATAPATH)/BETA2007.gsb; \
+		 $(DATAPATH)/tests/BETA2007.gsb; \
 	do \
 		if test -f "$$x" ; then \
 			ln -sf "../$$x" for_tests; \
 		else \
-			echo "WARNING: grid $$x missing: some tests will be skipped"; \
+			echo "ERROR: grid $$x missing: some tests will be skipped"; \
+			exit 1; \
 		fi \
 	done; \
 	ln -sf ../$(DATAPATH)/tests for_tests; \
+	ln -sf ../$(DATAPATH)/tests/ntv2_0_downsampled.gsb for_tests/ntv2_0.gsb; \
+	ln -sf ../$(DATAPATH)/tests/egm96_15_downsampled.gtx for_tests/egm96_15.gtx; \
 	ln -sf ../$(DATAPATH)/proj.ini for_tests; \
 	ln -sf ../proj.db for_tests
 

data/proj.ini

@@ -3,10 +3,10 @@
 ;
 
 ; Network capabilities disabled by default.
-; Can be overriden with the PROJ_NETWORK=ON environment variable.
+; Can be overridden with the PROJ_NETWORK=ON environment variable.
 ; network = on
 
-; Can be overriden with the PROJ_NETWORK_ENDPOINT environment variable.
+; Can be overridden with the PROJ_NETWORK_ENDPOINT environment variable.
 cdn_endpoint = https://cdn.proj.org
 
 cache_enabled = on

data/sql/alias_name.sql

@@ -482,6 +482,7 @@ INSERT INTO "alias_name" VALUES('vertical_datum','EPSG','1260','SRVN16','EPSG');
 INSERT INTO "alias_name" VALUES('geodetic_datum','EPSG','6160','Quiñi-Huao','EPSG');
 INSERT INTO "alias_name" VALUES('vertical_datum','EPSG','1261','EVRF2000 Austria','EPSG');
 INSERT INTO "alias_name" VALUES('vertical_datum','EPSG','1262','SA LLD','EPSG');
+INSERT INTO "alias_name" VALUES('geodetic_datum','EPSG','1263','ONGD17','EPSG');
 INSERT INTO "alias_name" VALUES('vertical_datum','EPSG','1269','KSA-VRF14','EPSG');
 INSERT INTO "alias_name" VALUES('geodetic_datum','EPSG','1268','KSA-GRF17','EPSG');
 INSERT INTO "alias_name" VALUES('geodetic_datum','EPSG','1042','Red Geodesica Nacional 1992','EPSG');
@@ -600,18 +601,7 @@ INSERT INTO "alias_name" VALUES('projected_crs','EPSG','21150','Genuk / UTM zone
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','22700','Levant / Levant Zone','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','22770','Levant / Syria Lambert','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','22780','Levant / Levant Stereo','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','25828','ETRF89 / UTM zone 28N','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','25829','ETRF89 / UTM zone 29N','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','25830','ETRF89 / UTM zone 30N','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','25831','ETRF89 / UTM zone 31N','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','25832','ETRF89 / UTM zone 32N','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','25833','ETRF89 / UTM zone 33N','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','25834','ETRF89 / UTM zone 34N','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','25835','ETRF89 / UTM zone 35N','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','25836','ETRF89 / UTM zone 36N','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','25837','ETRF89 / UTM zone 37N','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','25838','ETRF89 / UTM zone 38N','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','25884','ETRF89 / TM Baltic93','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','27258','GD49 / UTM zone 58','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','27259','GD49 / UTM zone 59','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','27260','GD49 / UTM zone 60','EPSG');
@@ -1107,7 +1097,6 @@ INSERT INTO "alias_name" VALUES('projected_crs','EPSG','2167','Pulkovo 1942(83)
 INSERT INTO "alias_name" VALUES('geodetic_crs','EPSG','4181','LUREF','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6791','NAD83(2011) / OCRS_BKF (ft)','EPSG');
 INSERT INTO "alias_name" VALUES('geodetic_crs','EPSG','8233','NAD83(CSRS98)','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','2180','EUREF89 / CS92','EPSG');
 INSERT INTO "alias_name" VALUES('geodetic_crs','EPSG','3906','HR1901','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6795','NAD83(2011) / OCRS_BRP (ft)','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6794','NAD83(2011) / OCRS_BRP (m)','EPSG');
@@ -1127,11 +1116,8 @@ INSERT INTO "alias_name" VALUES('geodetic_crs','EPSG','4176','AAD98','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','2193','NZGD2000 / NZTM','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6802','NAD83(2011) / OCRS_CGP (m)','EPSG');
 INSERT INTO "alias_name" VALUES('geodetic_crs','EPSG','4300','1975 Mapping Adjustment','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','2196','EUREF89 / Kp2000 Jutland','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','2196','System 2000 Jylland zoner','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','2197','EUREF89 / Kp2000 Zealand','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','2197','System 2000 Sjaelland zoner','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','2198','EUREF89 / Kp2000 Bornholm','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','2198','System 2000 Bornholm zoner','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6807','NAD83(2011) / OCRS_CRE (ft)','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6810','NAD83(2011) / OCRS_CRW (m)','EPSG');
@@ -1920,12 +1906,9 @@ INSERT INTO "alias_name" VALUES('vertical_crs','EPSG','5794','IGN 1955 height','
 INSERT INTO "alias_name" VALUES('vertical_crs','EPSG','5795','IGN 1951 height','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3106','Gulshan  / Bangladesh TM','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3108','ETRS89 / New Guernsey Grid','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3109','ETRF89 / Jersey Transverse Mercator','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3109','ETRS89 / JTM','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3109','ETRF89 / JTM','EPSG');
 INSERT INTO "alias_name" VALUES('vertical_crs','EPSG','5713','CVD28 height','EPSG');
 INSERT INTO "alias_name" VALUES('vertical_crs','EPSG','5713','Canadian Vertical Datum of 1928 height','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3108','ETRF89 / Guernsey Grid','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6879','NAD83(2011) / WI C (m)','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3110','Vicgrid','EPSG');
 INSERT INTO "alias_name" VALUES('geodetic_crs','EPSG','4994','New Luzon','EPSG');
@@ -2241,11 +2224,6 @@ INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3404','NAD83(HPGN) / Nor
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3414','SVY21 plane coordinate system','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3174','NAD83 / GLGIS Albers (basin)','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3175','NAD83 / GLGIS Albers (basin+SLS)','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','7416','EUREF89 / UTM zone 32N + DVR90 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','7417','EUREF89 / UTM zone 33N + DVR90 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','7418','EUREF89 / Kp2000 Jutland + DVR90 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','7419','EUREF89 / Kp2000 Zealand + DVR90 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','7420','EUREF89 / Kp2000 Bornholm + DVR90 height','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3415','WGS 72BE / SCS Lambert','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3425','NAD83(HPGN) / Iowa North (ftUS)','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3426','NAD83(HPGN) / Iowa South (ftUS)','EPSG');
@@ -2403,55 +2381,11 @@ INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3568','NAD83(HPGN) / Uta
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3569','NAD83(HPGN) / Utah Central (ftUS)','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3570','NAD83(HPGN) / Utah South (ftUS)','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3448','JAD2001 / Jamaica Metric Grid 2001','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3416','ETRF89 / Austria Lambert','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','2176','ETRF89 / Poland CS2000 zone 5','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','2177','ETRF89 / Poland CS2000 zone 6','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','2178','ETRF89 / Poland CS2000 zone 7','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','2179','ETRF89 / Poland CS2000 zone 8','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','2180','ETRF89 / Poland CS92','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','2196','ETRF89 / Kp2000 Jutland','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','2197','ETRF89 / Kp2000 Zealand','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','2198','ETRF89 / Kp2000 Bornholm','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','2213','ETRF89 / TM 30 NE','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3034','ETRF89 / LCC','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3035','ETRF89 / LAEA','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3038','ETRF89 / TM26','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3039','ETRF89 / TM27','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3040','ETRF89 / UTM zone 28N (N-E)','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3041','ETRF89 / UTM zone 29N (N-E)','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3042','ETRF89 / UTM zone 30N (N-E)','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3043','ETRF89 / UTM zone 31N (N-E)','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3044','ETRF89 / UTM zone 32N (N-E)','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3045','ETRF89 / UTM zone 33N (N-E)','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3046','ETRF89 / UTM zone 34N (N-E)','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3047','ETRF89 / UTM zone 35N (N-E)','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3048','ETRF89 / UTM zone 36N (N-E)','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3049','ETRF89 / UTM zone 37N (N-E)','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3050','ETRF89 / TM38','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3051','ETRF89 / TM39','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3067','ETRF89 / TM35FIN(E,N)','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3126','ETRF89 / ETRS-GK19FIN','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3127','ETRF89 / ETRS-GK20FIN','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3128','ETRF89 / ETRS-GK21FIN','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3129','ETRF89 / ETRS-GK22FIN','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3130','ETRF89 / ETRS-GK23FIN','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3131','ETRF89 / ETRS-GK24FIN','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3132','ETRF89 / ETRS-GK25FIN','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3133','ETRF89 / ETRS-GK26FIN','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3134','ETRF89 / ETRS-GK27FIN','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3135','ETRF89 / ETRS-GK28FIN','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3136','ETRF89 / ETRS-GK29FIN','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3137','ETRF89 / ETRS-GK30FIN','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3138','ETRF89 / ETRS-GK31FIN','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3145','ETRF89 / Faroe Lambert','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3447','ETRF89 / Belgian Lambert 2005','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','7409','ETRF89 + EVRF2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','7416','ETRF89 / UTM zone 32N + DVR90 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','7417','ETRF89 / UTM zone 33N + DVR90 height','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6922','NAD83 / Kansas LCC (m)','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','7418','ETRF89 / Kp2000 Jutland + DVR90 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','7419','ETRF89 / Kp2000 Zealand + DVR90 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','7420','ETRF89 / Kp2000 Bornholm + DVR90 height','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6924','NAD83(2011) / Kansas LCC (m)','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3396','PD/83 / Gauss-Kruger zone 3','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3463','Maine Coordinate System of 2000 Central Zone','EPSG');
@@ -2616,7 +2550,6 @@ INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3546','KY1Z','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3547','NAD83(NSRS) / KY1Z (ftUS)','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3547','KY1Z','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3447','BE_ETRS89 / LB05','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3763','ETRF89 / Portugal TM06','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3765','HTRS96 / TM','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3766','HTRS96 / LCC','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3770','BNG2000','EPSG');
@@ -2761,7 +2694,6 @@ INSERT INTO "alias_name" VALUES('projected_crs','EPSG','26862','NAD83(HPGN) / We
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3800','NAD27 / Alberta 3TM ref merid 120','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3801','NAD83 / Alberta 3TM ref merid 120','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3802','NAD83(CSRS) / Alberta 3TM ref merid 120','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3812','ETRF89 / Belgian Lambert 2008','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3812','ETRS89 / Lambert 2008','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3814','NAD83 / MSTM','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3815','NAD83(HARN) / MSTM','EPSG');
@@ -4270,7 +4202,6 @@ INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3085','NAD83(HARN) / TX
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3091','KY1Z','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3090','NAD83(HARN) / KY1Z','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3088','NAD83 / KY1Z (m)','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','7423','ETRF89 + EVRF2007 height','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3857','WGS 84 / Popular Visualisation Pseudo-Mercator','EPSG');
 INSERT INTO "alias_name" VALUES('vertical_crs','EPSG','3886','National Elevation Network height','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3893','ED50 / Iraq Nat. Grid','EPSG');
@@ -4774,15 +4705,7 @@ INSERT INTO "alias_name" VALUES('projected_crs','EPSG','7631','WISCRS Sauk (ftUS
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','7617','WISCRS Lincoln (ftUS)','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','7638','WISCRS Vilas (ftUS)','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','7618','WISCRS Marathon (ftUS)','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','4093','ETRF89 / DKTM1','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','4093','EUREF89 / DKTM1','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','7639','WISCRS Walworth (ftUS)','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','4094','ETRF89 / DKTM2','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','4094','EUREF89 / DKTM2','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','4095','ETRF89 / DKTM3','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','4095','EUREF89 / DKTM3','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','4096','ETRF89 / DKTM4','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','4096','EUREF89 / DKTM4','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','7640','WISCRS Washburn (ftUS)','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','7641','WISCRS Washington (ftUS)','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','7642','WISCRS Waukesha (ftUS)','EPSG');
@@ -4791,14 +4714,6 @@ INSERT INTO "alias_name" VALUES('projected_crs','EPSG','7644','WISCRS Waushara (
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','7645','WISCRS Wood (ftUS)','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6316','Macedonia State Coordinate System zone 7','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3857','Web Mercator','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','4099','ETRF89 / DKTM3 + DVR90 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','4099','EUREF89 / DKTM3 + DVR90 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','4097','ETRF89 / DKTM1 + DVR90 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','4097','EUREF89 / DKTM1 + DVR90 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','4098','ETRF89 / DKTM2 + DVR90 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','4098','EUREF89 / DKTM2 + DVR90 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','4100','ETRF89 / DKTM4 + DVR90 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','4100','EUREF89 / DKTM4 + DVR90 height','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','7692','Kyrg06-68','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','7693','Kyrg06-71','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','7694','Kyrg06-74','EPSG');
@@ -6092,6 +6007,7 @@ INSERT INTO "alias_name" VALUES('projected_crs','EPSG','9285','Pampa del Castill
 INSERT INTO "alias_name" VALUES('geodetic_crs','EPSG','4289','RD-Bessel','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','4776','New Beijing / 3GK zone 40','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','4777','New Beijing / 3GK zone 41','EPSG');
+INSERT INTO "alias_name" VALUES('projected_crs','EPSG','9311','US National Atlas EA','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','31289','MGI (Ferro) / M31','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','31290','MGI (Ferro) / M34','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','31288','MGI (Ferro) / M28','EPSG');
@@ -6250,48 +6166,35 @@ INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5018','Lisbon 1937 / Por
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','2083','Hito XVIII / Argentina 2','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','2081','Chos Malal / Argentina 2','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','2393','YKG','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','7405','OSGB36 / British National Grid + ODN height','EPSG');
+INSERT INTO "alias_name" VALUES('compound_crs','EPSG','7405','OSGB 1936 / British National Grid + Newlyn height','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3067','ETRS89 / TM35FIN','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3067','ETRS89-TM35FIN(E,N)','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3067','ETRS-TM35FIN(E,N)','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3873','ETRF89 / GK19FIN','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3873','ETRS89-GK19FIN','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3873','ETRS-GK19FIN','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3874','ETRF89 / GK20FIN','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3874','ETRS89-GK20FIN','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3874','ETRS-GK20FIN','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3875','ETRS89-GK21FIN','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3875','ETRF89 / GK21FIN','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3875','ETRS-GK21FIN','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3876','ETRF89 / GK22FIN','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3876','ETRS89-GK22FIN','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3876','ETRS-GK22FIN','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3877','ETRF89 / GK23FIN','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3877','ETRS89-GK23FIN','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3877','ETRS-GK23FIN','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3878','ETRF89 / GK24FIN','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3878','ETRS89-GK24FIN','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3878','ETRS-GK24FIN','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3879','ETRS89-GK25FIN','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3879','ETRF89 / GK25FIN','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3879','ETRS-GK25FIN','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3880','ETRF89 / GK26FIN','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3880','ETRS89-GK26FIN','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3880','ETRS-GK26FIN','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3881','ETRF89 / GK27FIN','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3881','ETRS89-GK27FIN','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3881','ETRS-GK27FIN','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3882','ETRF89 / GK28FIN','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3882','ETRS89-GK28FIN','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3882','ETRS-GK28FIN','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3883','ETRF89 / GK29FIN','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3883','ETRS89-GK29FIN','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3883','ETRS-GK29FIN','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3884','ETRF89 / GK30FIN','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3884','ETRS89-GK30FIN','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3884','ETRS-GK30FIN','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3885','ETRS-GK31FIN','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3885','ETRF89 / GK31FIN','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3885','ETRS89-GK31FIN','EPSG');
 INSERT INTO "alias_name" VALUES('compound_crs','EPSG','3903','ETRS-TM35FIN(N,E)/N2000','EPSG');
 INSERT INTO "alias_name" VALUES('compound_crs','EPSG','3903','ETRS89-TM35FIN(N,E)/N2000','EPSG');
@@ -6299,63 +6202,10 @@ INSERT INTO "alias_name" VALUES('compound_crs','EPSG','3901','YKJ/N60','EPSG');
 INSERT INTO "alias_name" VALUES('compound_crs','EPSG','3901','YKJ + N60 height','EPSG');
 INSERT INTO "alias_name" VALUES('vertical_crs','EPSG','3900','N2000','EPSG');
 INSERT INTO "alias_name" VALUES('vertical_crs','EPSG','5717','N60','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5048','ETRF89 / TM35FIN(N,E)','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5048','ETRS89-TM35FIN(N,E)','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5048','ETRS-TM35FIN(N,E)','EPSG');
 INSERT INTO "alias_name" VALUES('compound_crs','EPSG','3902','ETRS89-TM35FIN(N,E)/N60','EPSG');
 INSERT INTO "alias_name" VALUES('compound_crs','EPSG','3902','ETRS-TM35FIN(N,E)/N60','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5120','ETRF89 / NTM zone 20','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5120','EUREF89 / NTM zone 20','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5123','ETRF89 / NTM zone 23','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5123','EUREF89 / NTM zone 23','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5124','ETRF89 / NTM zone 24','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5124','EUREF89 / NTM zone 24','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5125','ETRF89 / NTM zone 25','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5125','EUREF89 / NTM zone 25','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5126','ETRF89 / NTM zone 26','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5126','EUREF89 / NTM zone 26','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5129','ETRF89 / NTM zone 29','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5129','EUREF89 / NTM zone 29','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5130','ETRF89 / NTM zone 30','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5130','EUREF89 / NTM zone 30','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5105','ETRF89 / NTM zone 5','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5105','EUREF89 / NTM zone 5','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5106','ETRF89 / NTM zone 6','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5106','EUREF89 / NTM zone 6','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5107','ETRF89 / NTM zone 7','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5107','EUREF89 / NTM zone 7','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5108','ETRF89 / NTM zone 8','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5108','EUREF89 / NTM zone 8','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5109','ETRF89 / NTM zone 9','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5109','EUREF89 / NTM zone 9','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5110','ETRF89 / NTM zone 10','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5110','EUREF89 / NTM zone 10','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5111','ETRF89 / NTM zone 11','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5111','EUREF89 / NTM zone 11','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5112','ETRF89 / NTM zone 12','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5112','EUREF89 / NTM zone 12','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5113','ETRF89 / NTM zone 13','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5113','EUREF89 / NTM zone 13','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5114','ETRF89 / NTM zone 14','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5114','EUREF89 / NTM zone 14','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5115','ETRF89 / NTM zone 15','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5115','EUREF89 / NTM zone 15','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5116','ETRF89 / NTM zone 16','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5116','EUREF89 / NTM zone 16','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5117','ETRF89 / NTM zone 17','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5117','EUREF89 / NTM zone 17','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5118','ETRF89 / NTM zone 18','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5118','EUREF89 / NTM zone 18','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5119','ETRF89 / NTM zone 19','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5119','EUREF89 / NTM zone 19','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5121','ETRF89 / NTM zone 21','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5121','EUREF89 / NTM zone 21','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5122','ETRF89 / NTM zone 22','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5122','EUREF89 / NTM zone 22','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5127','ETRF89 / NTM zone 27','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5127','EUREF89 / NTM zone 27','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5128','ETRF89 / NTM zone 28','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5128','EUREF89 / NTM zone 28','EPSG');
 INSERT INTO "alias_name" VALUES('vertical_crs','EPSG','5781','RO_CONST / NH','EPSG');
 INSERT INTO "alias_name" VALUES('vertical_crs','EPSG','5705','LT_KRON / NH','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5181','Korea 2000 / Central','EPSG');
@@ -6554,7 +6404,6 @@ INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5596','FCS','EPSG');
 INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5598','FCS + FCSVR10 height','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5624','NAD27 / Michigan Old Cen','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','3040','ETRS89 / TM28','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','4647','ETRF89 / UTM zone 32N (zE-N)','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5646','NAD83 / VT (ftUS)','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5654','NAD83(HPGN) / Vermont (ftUS)','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5654','NAD83(HARN) / VT (ftUS)','EPSG');
@@ -6649,16 +6498,10 @@ INSERT INTO "alias_name" VALUES('vertical_crs','EPSG','5862','Lower Low Water La
 INSERT INTO "alias_name" VALUES('vertical_crs','EPSG','5874','High Tide height','EPSG');
 INSERT INTO "alias_name" VALUES('vertical_crs','EPSG','5873','Low Tide depth','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5649','ETRS89 / UTM zone 31','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5649','ETRF89 / UTM zone 31N (zE-N)','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5651','ETRS89 / UTM zone 31','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5651','ETRF89 / UTM zone 31N (N-zE)','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5652','ETRF89 / UTM zone 32N (N-zE)','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5652','ETRS89 / UTM zone 32N','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5650','ETRF89 / UTM zone 33N (zE-N)','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5650','ETRS89 / UTM zone 33N','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5653','ETRF89 / UTM zone 33N (N-zE)','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5653','ETRS89 / UTM zone 33N','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','4839','ETRF89 / LCC Germany (N-E)','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5879','Cadastre 1997 / UTM 38S','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5887','TGD2005 / TMG','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5890','JAXA Snow Depth PS North','EPSG');
@@ -6682,68 +6525,12 @@ INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5938','WGS 84 / EPSG Gre
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5939','WGS 84 / EPSG Norway PS','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5940','WGS 84 / EPSG Russia PS','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5930','WGS 84 / EPSG Arctic B5','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5945','ETRF89 / NTM zone 5 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5945','EUREF89 / NTM zone 5 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5946','ETRF89 / NTM zone 6 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5946','EUREF89 / NTM zone 6 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5947','ETRF89 / NTM zone 7 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5947','EUREF89 / NTM zone 7 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5949','ETRF89 / NTM zone 9 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5949','EUREF89 / NTM zone 9 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5950','ETRF89 / NTM zone 10 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5950','EUREF89 / NTM zone 10 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5951','ETRF89 / NTM zone 11 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5951','EUREF89 / NTM zone 11 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5952','ETRF89 / NTM zone 12 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5952','EUREF89 / NTM zone 12 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5953','ETRF89 / NTM zone 13 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5953','EUREF89 / NTM zone 13 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5954','ETRF89 / NTM zone 14 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5954','EUREF89 / NTM zone 14 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5955','ETRF89 / NTM zone 15 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5955','EUREF89 / NTM zone 15 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5956','ETRF89 / NTM zone 16 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5956','EUREF89 / NTM zone 16 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5957','ETRF89 / NTM zone 17 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5957','EUREF89 / NTM zone 17 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5958','ETRF89 / NTM zone 18 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5958','EUREF89 / NTM zone 18 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5959','ETRF89 / NTM zone 19 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5959','EUREF89 / NTM zone 19 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5960','ETRF89 / NTM zone 20 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5960','EUREF89 / NTM zone 20 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5961','ETRF89 / NTM zone 21 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5961','EUREF89 / NTM zone 21 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5962','ETRF89 / NTM zone 22 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5962','EUREF89 / NTM zone 22 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5963','ETRF89 / NTM zone 23 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5963','EUREF89 / NTM zone 23 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5964','ETRF89 / NTM zone 24 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5964','EUREF89 / NTM zone 24 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5965','ETRF89 / NTM zone 25 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5965','EUREF89 / NTM zone 25 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5967','ETRF89 / NTM zone 27 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5967','EUREF89 / NTM zone 27 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5966','ETRF89 / NTM zone 26 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5966','EUREF89 / NTM zone 26 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5968','ETRF89 / NTM zone 28 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5968','EUREF89 / NTM zone 28 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5969','ETRF89 / NTM zone 29 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5969','EUREF89 / NTM zone 29 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5970','ETRF89 / NTM zone 30 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5970','EUREF89 / NTM zone 30 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5973','ETRF89 / UTM zone 33 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5973','EUREF89 / UTM zone 33 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5975','ETRF89 / UTM zone 35 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5975','EUREF89 / UTM zone 35 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5974','ETRF89 / UTM zone 34 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5974','EUREF89 / UTM zone 34 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5976','ETRF89 / UTM zone 36 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5976','EUREF89 / UTM zone 36 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5972','ETRF89 / UTM zone 32 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5972','EUREF89 / UTM zone 32 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5971','ETRF89 / UTM zone 31 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5971','EUREF89 / UTM zone 31 + NN2000 height','EPSG');
+INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5973','ETRS89 / UTM zone 33 + NN2000 height','EPSG');
+INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5975','ETRS89 / UTM zone 35 + NN2000 height','EPSG');
+INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5974','ETRS89 / UTM zone 34 + NN2000 height','EPSG');
+INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5976','ETRS89 / UTM zone 36 + NN2000 height','EPSG');
+INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5972','ETRS89 / UTM zone 32 + NN2000 height','EPSG');
+INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5971','ETRS89 / UTM zone 31 + NN2000 height','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6050','GR96 / EPSG Arctic 1-25','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6051','GR96 / EPSG Arctic 2-18','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6052','GR96 / EPSG Arctic 2-20','EPSG');
@@ -6759,25 +6546,15 @@ INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6063','GR96 / EPSG Arcti
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6067','GR96 / EPSG Arctic 8-20','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6068','GR96 / EPSG Arctic 8-22','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6070','ETRS89 / EPSG Arctic 3-11','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6070','EUREF89 / EPSG Arctic zone 3-11','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6070','ETRF89 / EPSG Arctic zone 3-11','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6071','ETRS89 / EPSG Arctic 4-26','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6071','EUREF89 / EPSG Arctic zone 4-26','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6071','ETRF89 / EPSG Arctic zone 4-26','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6073','ETRS89 / EPSG Arctic 5-11','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6073','EUREF89 / EPSG Arctic zone 5-11','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6073','ETRF89 / EPSG Arctic zone 5-11','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6074','ETRS89 / EPSG Arctic 5-13','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6074','EUREF89 / EPSG Arctic zone 5-13','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6074','ETRF89 / EPSG Arctic zone 5-13','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6075','WGS 84 / EPSG Arctic 2-24','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6076','WGS 84 / EPSG Arctic 2-26','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6077','WGS 84 / EPSG Arctic 3-13','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6078','WGS 84 / EPSG Arctic 3-15','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6079','WGS 84 / EPSG Arctic 3-17','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6069','ETRS89 / EPSG Arctic 2-22','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6069','EUREF89 / EPSG Arctic zone 2-22','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6069','ETRF89 / EPSG Arctic zone 2-22','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6080','WGS 84 / EPSG Arctic 3-19','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6087','WGS 84 / EPSG Arctic 5-15','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6088','WGS 84 / EPSG Arctic 5-17','EPSG');
@@ -6826,86 +6603,18 @@ INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6083','WGS 84 / EPSG Arc
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6082','WGS 84 / EPSG Arctic 4-32','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6081','WGS 84 / EPSG Arctic 4-30','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6124','WGS 84 / EPSG Arctic 4-12','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5948','ETRF89 / NTM zone 8 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5948','EUREF89 / NTM zone 8 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6125','ETRF89 / EPSG Arctic zone 5-47','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6125','ETRS89 / EPSG Arctic 5-47','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6125','EUREF89 / EPSG Arctic zone 5-47','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6072','ETRS89 / EPSG Arctic 4-28','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6072','EUREF89 / EPSG Arctic zone 4-28','EPSG');
-INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6072','ETRF89 / EPSG Arctic zone 4-28','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6104','NAD83(CSRS) / EPSG Arctic 4-14','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6141','CING11','EPSG');
 INSERT INTO "alias_name" VALUES('geodetic_crs','EPSG','4723','Grand Cayman 1959','EPSG');
 INSERT INTO "alias_name" VALUES('geodetic_crs','EPSG','4726','Little Cayman 1961','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5942','ETRF89 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5942','EUREF89 + NN2000 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6147','ETRF89 / NTM zone 7 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6147','EUREF89 / NTM zone 7 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6148','ETRF89 / NTM zone 8 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6148','EUREF89 / NTM zone 8 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6149','ETRF89 / NTM zone 9 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6149','EUREF89 / NTM zone 9 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6146','ETRF89 / NTM zone 6 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6146','EUREF89 / NTM zone 6 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6145','ETRF89 / NTM zone 5 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6145','EUREF89 / NTM zone 5 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6170','ETRF89 / NTM zone 30 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6170','EUREF89 / NTM zone 30 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6169','ETRF89 / NTM zone 29 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6169','EUREF89 / NTM zone 29 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6168','ETRF89 / NTM zone 28 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6168','EUREF89 / NTM zone 28 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6167','ETRF89 / NTM zone 27 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6167','EUREF89 / NTM zone 27 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6166','ETRF89 / NTM zone 26 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6166','EUREF89 / NTM zone 26 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6165','ETRF89 / NTM zone 25 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6165','EUREF89 / NTM zone 25 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6164','ETRF89 / NTM zone 24 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6164','EUREF89 / NTM zone 24 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6163','ETRF89 / NTM zone 23 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6163','EUREF89 / NTM zone 23 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6162','ETRF89 / NTM zone 22 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6162','EUREF89 / NTM zone 22 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6161','ETRF89 / NTM zone 21 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6161','EUREF89 / NTM zone 21 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6160','ETRF89 / NTM zone 20 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6160','EUREF89 / NTM zone 20 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6159','ETRF89 / NTM zone 19 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6159','EUREF89 / NTM zone 19 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6158','ETRF89 / NTM zone 18 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6158','EUREF89 / NTM zone 18 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6157','ETRF89 / NTM zone 17 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6157','EUREF89 / NTM zone 17 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6156','ETRF89 / NTM zone 16 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6156','EUREF89 / NTM zone 16 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6155','ETRF89 / NTM zone 15 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6155','EUREF89 / NTM zone 15 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6154','ETRF89 / NTM zone 14 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6154','EUREF89 / NTM zone 14 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6153','ETRF89 / NTM zone 13 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6153','EUREF89 / NTM zone 13 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6152','ETRF89 / NTM zone 12 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6152','EUREF89 / NTM zone 12 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6151','ETRF89 / NTM zone 11 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6151','EUREF89 / NTM zone 11 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6150','ETRF89 / NTM zone 10 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6150','EUREF89 / NTM zone 10 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6171','ETRF89 / UTM zone 31 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6171','EUREF89 / UTM zone 31 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6172','ETRF89 / UTM zone 32 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6172','EUREF89 / UTM zone 32 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6173','ETRF89 / UTM zone 33 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6173','EUREF89 / UTM zone 33 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6174','ETRF89 / UTM zone 34 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6174','EUREF89 / UTM zone 34 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6175','ETRF89 / UTM zone 35 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6175','EUREF89 / UTM zone 35 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6176','ETRF89 / UTM zone 36 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6176','EUREF89 / UTM zone 36 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6144','ETRF89 + NN54 height','EPSG');
-INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6144','EUREF89 + NN54 height','EPSG');
+INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6171','ETRS89 / UTM zone 31 + NN54 height','EPSG');
+INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6172','ETRS89 / UTM zone 32 + NN54 height','EPSG');
+INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6173','ETRS89 / UTM zone 33 + NN54 height','EPSG');
+INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6174','ETRS89 / UTM zone 34 + NN54 height','EPSG');
+INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6175','ETRS89 / UTM zone 35 + NN54 height','EPSG');
+INSERT INTO "alias_name" VALUES('compound_crs','EPSG','6176','ETRS89 / UTM zone 36 + NN54 height','EPSG');
 INSERT INTO "alias_name" VALUES('vertical_crs','EPSG','5710','BE_OOST / UNCOR','EPSG');
 INSERT INTO "alias_name" VALUES('vertical_crs','EPSG','5710','Oostende height','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6057','GR96 / EPSG Arctic 4-22','EPSG');

data/sql/area.sql

@@ -73,7 +73,7 @@ INSERT INTO "area" VALUES('EPSG','1093','Faroe Islands','Faroe Islands - onshore
 INSERT INTO "area" VALUES('EPSG','1094','Fiji - onshore','Fiji - onshore. Includes Viti Levu, Vanua Levu, Taveuni, the Yasawa Group, the Kadavu Group, the Lau Islands and Rotuma Islands.',-20.81,-12.42,176.81,-178.15,0);
 INSERT INTO "area" VALUES('EPSG','1095','Finland','Finland - onshore and offshore.',58.84,70.09,19.08,31.59,0);
 INSERT INTO "area" VALUES('EPSG','1096','France','France - onshore and offshore, mainland and Corsica.',41.15,51.56,-9.86,10.38,0);
-INSERT INTO "area" VALUES('EPSG','1097','French Guiana','French Guiana - onshore and offshore.',2.11,8.88,-54.6,-49.46,0);
+INSERT INTO "area" VALUES('EPSG','1097','French Guiana','French Guiana - onshore and offshore.',2.11,8.88,-54.61,-49.45,0);
 INSERT INTO "area" VALUES('EPSG','1098','French Polynesia','French Polynesia - onshore and offshore. Includes Society archipelago, Tuamotu archipelago, Marquesas Islands, Gambier Islands and Austral Islands.',-31.24,-4.52,-158.13,-131.97,0);
 INSERT INTO "area" VALUES('EPSG','1099','French Southern Territories','French Southern Territories - onshore and offshore. Includes Amsterdam and St Paul, Bassas da India, Crozet, Europa, Glorieuses, Juan de Nova, Kerguelen and Tromelin.',-53.24,-10.65,37.55,81.83,0);
 INSERT INTO "area" VALUES('EPSG','1100','Gabon','Gabon - onshore and offshore.',-6.37,2.32,7.03,14.52,0);
@@ -182,7 +182,7 @@ INSERT INTO "area" VALUES('EPSG','1202','St Vincent and the Grenadines','St Vinc
 INSERT INTO "area" VALUES('EPSG','1203','Samoa','Samoa - onshore and offshore.',-15.84,-10.94,-174.54,-170.51,0);
 INSERT INTO "area" VALUES('EPSG','1204','San Marino','San Marino.',43.89,43.99,12.4,12.52,0);
 INSERT INTO "area" VALUES('EPSG','1205','Sao Tome and Principe','Sao Tome and Principe - onshore and offshore.',-1.49,2.72,3.2,8.56,0);
-INSERT INTO "area" VALUES('EPSG','1206','Saudi Arabia','Saudi Arabia - onshore and offshore.',15.61,32.16,34.44,55.67,0);
+INSERT INTO "area" VALUES('EPSG','1206','Saudi Arabia','Saudi Arabia - onshore and offshore.',16.29,32.16,34.44,55.67,0);
 INSERT INTO "area" VALUES('EPSG','1207','Senegal','Senegal - onshore and offshore.',10.64,16.7,-20.22,-11.36,0);
 INSERT INTO "area" VALUES('EPSG','1208','Seychelles','Seychelles - onshore and offshore - Alphonse, Bijoutier, St Francois Islands, St Pierre islet, Cosmoledo Islands, Amirantes, Aldabra, Farquhar, and Desroches.',-12.72,-0.37,43.19,59.66,0);
 INSERT INTO "area" VALUES('EPSG','1209','Sierra Leone','Sierra Leone - onshore and offshore.',4.22,10.0,-16.57,-10.26,0);
@@ -248,7 +248,7 @@ INSERT INTO "area" VALUES('EPSG','1268','Venezuela - Falcon state','Venezuela -
 INSERT INTO "area" VALUES('EPSG','1269','Venezuela - Pedregal area of Falcon state','Venezuela - Pedregal area of Falcon state.',10.8,11.26,-70.4,-69.69,0);
 INSERT INTO "area" VALUES('EPSG','1270','Venezuela - Maracaibo south','Venezuela - south Maracaibo area.',8.72,10.01,-72.4,-70.78,0);
 INSERT INTO "area" VALUES('EPSG','1271','Africa - Eritrea, Ethiopia, South Sudan and Sudan','Eritrea; Ethiopia; South Sudan; Sudan.',3.4,22.24,21.82,47.99,0);
-INSERT INTO "area" VALUES('EPSG','1272','Asia - Middle East - Bahrain, Kuwait and Saudi Arabia','Bahrain, Kuwait and Saudi Arabia - onshore.',15.61,32.16,34.51,55.67,0);
+INSERT INTO "area" VALUES('EPSG','1272','Asia - Middle East - Bahrain, Kuwait and Saudi Arabia','Bahrain, Kuwait and Saudi Arabia - onshore.',16.37,32.16,34.51,55.67,0);
 INSERT INTO "area" VALUES('EPSG','1273','Antigua - onshore','Antigua island - onshore.',16.94,17.22,-61.95,-61.61,0);
 INSERT INTO "area" VALUES('EPSG','1274','Brazil - Aratu','Brazil - offshore south and east of a line intersecting the coast at 2°55''S; onshore Tucano basin.',-35.71,4.26,-53.38,-26.0,0);
 INSERT INTO "area" VALUES('EPSG','1275','Netherlands - onshore','Netherlands - onshore, including Waddenzee, Dutch Wadden Islands and 12-mile offshore coastal zone.',50.75,53.7,3.2,7.22,0);
@@ -274,7 +274,7 @@ INSERT INTO "area" VALUES('EPSG','1294','Portugal - mainland - onshore','Portuga
 INSERT INTO "area" VALUES('EPSG','1295','Germany - DHDN','Germany - onshore - Baden-Wurtemberg, Bayern, Hessen, Niedersachsen, Nordrhein-Westfalen, Rheinland-Pfalz, Saarland, Schleswig-Holstein. Also former DDR states of Sachsen and Thuringen by transformation.',47.27,55.06,5.87,15.03,1);
 INSERT INTO "area" VALUES('EPSG','1296','Europe - ED50 by country','Europe - west: Andorra; Cyprus; Denmark - onshore and offshore; Faroe Islands - onshore; France - offshore; Germany - offshore North Sea; Gibraltar; Greece - offshore; Israel - offshore; Italy including San Marino and Vatican City State; Ireland offshore; Malta; Netherlands - offshore; North Sea; Norway including Svalbard - onshore and offshore; Portugal - mainland - offshore; Spain - onshore; Turkey - onshore and offshore; United Kingdom UKCS offshore east of 6°W including Channel Islands (Guernsey and Jersey). Egypt - Western Desert; Iraq - onshore; Jordan.',25.71,84.17,-16.1,48.61,0);
 INSERT INTO "area" VALUES('EPSG','1297','Europe - west','Europe - west.',34.88,84.17,-10.56,39.65,0);
-INSERT INTO "area" VALUES('EPSG','1298','Europe - ETRS89','Europe - onshore and offshore: Albania; Andorra; Austria; Belgium; Bosnia and Herzegovina; Bulgaria; Croatia; Cyprus; Czechia; Denmark; Estonia; Faroe Islands; Finland; France; Germany; Gibraltar; Greece; Hungary; Ireland; Italy; Kosovo; Latvia; Liechtenstein; Lithuania; Luxembourg; Malta; Moldova; Monaco; Montenegro; Netherlands; North Macedonia; Norway including Svalbard and Jan Mayen; Poland; Portugal; Romania; San Marino; Serbia; Slovakia; Slovenia; Spain; Sweden; Switzerland; United Kingdom (UK) including Channel Islands and Isle of Man; Vatican City State.',32.88,84.17,-16.1,40.18,0);
+INSERT INTO "area" VALUES('EPSG','1298','Europe - ETRF by country','Europe - onshore and offshore: Albania; Andorra; Austria; Belgium; Bosnia and Herzegovina; Bulgaria; Croatia; Cyprus; Czechia; Denmark; Estonia; Faroe Islands; Finland; France; Germany; Gibraltar; Greece; Hungary; Ireland; Italy; Kosovo; Latvia; Liechtenstein; Lithuania; Luxembourg; Malta; Moldova; Monaco; Montenegro; Netherlands; North Macedonia; Norway including Svalbard and Jan Mayen; Poland; Portugal; Romania; San Marino; Serbia; Slovakia; Slovenia; Spain; Sweden; Switzerland; United Kingdom (UK) including Channel Islands and Isle of Man; Vatican City State.',32.88,84.17,-16.1,40.18,0);
 INSERT INTO "area" VALUES('EPSG','1299','Europe - EVRF2000','Europe - onshore - Andorra; Austria; Belgium; Bosnia and Herzegovina; Croatia; Czechia; Denmark; Estonia; Finland; France - mainland; Germany; Gibraltar; Hungary; Italy - mainland and Sicily; Latvia; Liechtenstein; Lithuania; Luxembourg; Netherlands; Norway; Poland; Portugal - mainland; Romania; San Marino; Slovakia; Slovenia; Spain - mainland; Sweden; Switzerland; United Kingdom (UK) - Great Britain mainland; Vatican City State.',35.95,71.21,-9.56,31.59,0);
 INSERT INTO "area" VALUES('EPSG','1300','Iran - FD58','Iran - Arwaz area and onshore Gulf coast west of 54°E, Lavan Island, offshore Balal field and South Pars blocks 2 and 3.',26.21,33.22,47.13,53.61,0);
 INSERT INTO "area" VALUES('EPSG','1301','Portugal - Azores C - onshore','Portugal - central Azores onshore - Faial, Graciosa, Pico, Sao Jorge, Terceira.',38.32,39.14,-28.9,-26.97,0);
@@ -415,7 +415,7 @@ INSERT INTO "area" VALUES('EPSG','1435','Canada - Ontario - 88.5°W to 85.5°W',
 INSERT INTO "area" VALUES('EPSG','1436','Canada - Ontario - 91.5°W to 88.5°W','Canada - Ontario - between 91°30''W and 88°30''W.',47.97,56.9,-91.5,-88.5,0);
 INSERT INTO "area" VALUES('EPSG','1437','Canada - Ontario - 94.5°W to 91.5°W','Canada - Ontario - between 94°30''W and 91°30''W.',48.06,55.2,-94.5,-91.5,0);
 INSERT INTO "area" VALUES('EPSG','1438','Canada - Ontario - west of 94.5°W','Canada - Ontario - west of 94°30''W.',48.69,53.24,-95.16,-94.5,0);
-INSERT INTO "area" VALUES('EPSG','1439','Canada - Ontario - west of 90°W','Canada - Ontario - west of 90°W.',48.03,56.2,-95.17,-90.0,0);
+INSERT INTO "area" VALUES('EPSG','1439','Canada - Ontario - west of 90°W','Canada - Ontario - west of 90°W.',48.03,56.2,-95.16,-90.0,0);
 INSERT INTO "area" VALUES('EPSG','1440','Canada - Ontario - 90°W to 84°W','Canada - Ontario - between 90°W and 84°W.',46.11,56.9,-90.0,-84.0,0);
 INSERT INTO "area" VALUES('EPSG','1441','Canada - Ontario - 84°W to 78°W','Canada - Ontario - between 84°W and 78°W.',41.67,55.37,-84.0,-78.0,0);
 INSERT INTO "area" VALUES('EPSG','1442','Canada - Ontario - east of 78°W','Canada - Ontario - east of 78°W.',43.63,46.25,-78.0,-74.35,0);
@@ -466,9 +466,9 @@ INSERT INTO "area" VALUES('EPSG','1486','Argentina - Tierra del Fuego offshore',
 INSERT INTO "area" VALUES('EPSG','1487','Cuba - onshore north of 21°30''N','Cuba - onshore north of 21°30''N but also including all of Isla de la Juventud.',21.38,23.25,-85.01,-76.91,0);
 INSERT INTO "area" VALUES('EPSG','1488','Cuba - onshore south of 21°30''N','Cuba - onshore south of 21°30''N and east of 80°W .',19.77,21.5,-78.69,-74.07,0);
 INSERT INTO "area" VALUES('EPSG','1489','Tunisia - offshore','Tunisia - offshore.',33.22,38.41,7.81,13.67,0);
-INSERT INTO "area" VALUES('EPSG','1490','Yemen - 42°E to 48°E','Yemen - between 42°E and 48°E, onshore and offshore.',11.57,17.53,42.0,48.0,0);
-INSERT INTO "area" VALUES('EPSG','1491','Yemen - 48°E to 54°E','Yemen - between 48°E and 54°E, onshore and offshore.',9.45,19.0,48.0,54.0,0);
-INSERT INTO "area" VALUES('EPSG','1492','Yemen - South Yemen - mainland west of 48°E','Yemen - South Yemen onshore mainland west of 48°E.',12.54,17.44,43.37,48.0,0);
+INSERT INTO "area" VALUES('EPSG','1490','Yemen - 42°E to 48°E','Yemen - between 42°E and 48°E, onshore and offshore.',11.57,17.95,42.0,48.01,0);
+INSERT INTO "area" VALUES('EPSG','1491','Yemen - 48°E to 54°E','Yemen - between 48°E and 54°E, onshore and offshore.',9.45,19.0,48.0,54.01,0);
+INSERT INTO "area" VALUES('EPSG','1492','Yemen - South Yemen - mainland west of 48°E','Yemen - South Yemen onshore mainland west of 48°E.',12.54,17.95,43.37,48.01,0);
 INSERT INTO "area" VALUES('EPSG','1493','Yemen - South Yemen - mainland east of 48°E','Yemen - South Yemen onshore mainland east of 48°E.',13.94,19.0,48.0,53.14,0);
 INSERT INTO "area" VALUES('EPSG','1494','Vietnam - onshore Vung Tau area','Vietnam - onshore Vung Tau area.',9.03,11.04,105.49,107.58,0);
 INSERT INTO "area" VALUES('EPSG','1495','Vietnam - offshore Cuu Long basin','Vietnam - offshore - Cuu Long basin and northwestern part of Nam Con Son basin.',7.99,11.15,106.54,110.0,0);
@@ -546,8 +546,8 @@ INSERT INTO "area" VALUES('EPSG','1566','Australia - EEZ east of 162°E','Austra
 INSERT INTO "area" VALUES('EPSG','1567','Australasia - Australia and PNG - 138°E to 144°E','Australia - onshore and offshore between 138°E and 144°E. Papua New Guinea - onshore west of 144°E.',-46.63,-2.53,138.0,144.01,0);
 INSERT INTO "area" VALUES('EPSG','1568','Australasia - Australia and PNG - 144°E to 150°E','Australia - onshore and offshore between 144°E and 150°E. Papua New Guinea (PNG) - onshore between 144°E and 150°E.',-47.2,-1.3,144.0,150.01,0);
 INSERT INTO "area" VALUES('EPSG','1569','Saudi Arabia - onshore 36°E to 42°E','Saudi Arabia - onshore between 36°E and 42°E.',16.59,32.16,36.0,42.0,0);
-INSERT INTO "area" VALUES('EPSG','1570','Asia - Middle East - Kuwait and Saudi - 48°E to 54°E','Kuwait - onshore east of 48°E. Saudi Arabia - onshore between 48°E and 54°E.',17.43,30.04,48.0,54.01,0);
-INSERT INTO "area" VALUES('EPSG','1571','Asia - Middle East - Kuwait and Saudi - 42°E to 48°E','Kuwait - west of 48°E. Saudi Arabia - between of 42°E and 48°E.',15.61,31.15,42.0,48.0,0);
+INSERT INTO "area" VALUES('EPSG','1570','Asia - Middle East - Kuwait and Saudi - 48°E to 54°E','Kuwait - onshore east of 48°E. Saudi Arabia - onshore between 48°E and 54°E.',17.94,30.04,47.99,54.01,0);
+INSERT INTO "area" VALUES('EPSG','1571','Asia - Middle East - Kuwait and Saudi - 42°E to 48°E','Kuwait - west of 48°E. Saudi Arabia - between of 42°E and 48°E.',16.37,31.15,42.0,48.01,0);
 INSERT INTO "area" VALUES('EPSG','1572','Brazil - 54°W to 48°W and Aratu','Brazil - offshore between 54°W and 48°W, including Pelotas basin.',-35.71,-25.01,-53.38,-47.99,0);
 INSERT INTO "area" VALUES('EPSG','1573','Brazil - 48°W to 42°W and Aratu','Brazil - offshore areas south of intersection of parallel of 2°55''S with coast and between 48°W and 42°W including Santos basin.',-33.5,0.0,-48.01,-41.99,0);
 INSERT INTO "area" VALUES('EPSG','1574','Brazil - 42°W to 36°W and Aratu','Brazil - between 42°W and 36°W, southern hemisphere offshore including Campos and Espirito Santo basins; onshore Tucano basin area.',-26.35,0.01,-42.01,-36.0,0);
@@ -611,7 +611,7 @@ INSERT INTO "area" VALUES('EPSG','1631','Europe - 18°W to 12°W and ED50 by cou
 INSERT INTO "area" VALUES('EPSG','1632','Europe - 12°W to 6°W and ED50 by country','Europe - between 12°W and 6°W - Faroe Islands - onshore; Spain - mainland onshore; Ireland offshore.',36.13,62.41,-12.0,-6.0,0);
 INSERT INTO "area" VALUES('EPSG','1633','Europe - 6°W to 0°W and ED50 by country','Europe - between 6°W and 0°W - Channel Islands (Jersey, Guernsey); France offshore; Gibraltar; Ireland offshore; Norway including Svalbard - offshore; Spain - onshore; United Kingdom - UKCS offshore.',35.26,80.53,-6.0,0.0,0);
 INSERT INTO "area" VALUES('EPSG','1634','Europe - 0°E to 6°E and ED50 by country','Europe - between 0°E and 6°E - Andorra; Denmark (North Sea); Germany offshore; Netherlands offshore; Norway including Svalbard - onshore and offshore; Spain - onshore (mainland and Balearic Islands); United Kingdom (UKCS) offshore.',38.56,82.41,0.0,6.01,0);
-INSERT INTO "area" VALUES('EPSG','1635','Europe - 6°E to 12°E and ED50 by country','Europe - between 6°E and 12°E - Denmark - onshore and offshore; France - offshore; Germany offshore; Italy - onshore and offshore; Netherlands offshore; Norway including Svalbard - onshore and offshore.',36.53,83.92,5.99,12.0,0);
+INSERT INTO "area" VALUES('EPSG','1635','Europe - 6°E to 12°E and ED50 by country','Europe - between 6°E and 12°E - Denmark - onshore and offshore; France - offshore; Germany offshore; Italy - onshore and offshore; Netherlands offshore; Norway including Svalbard - onshore and offshore.',36.53,83.92,5.99,12.01,0);
 INSERT INTO "area" VALUES('EPSG','1636','Europe - 12°E to 18°E and ED50 by country','Europe - between 12°E and 18°E onshore and offshore - Denmark (including Bornholm); Italy including San Marino and Vatican City State; Malta; Norway including Svalbard.',34.49,84.0,12.0,18.0,0);
 INSERT INTO "area" VALUES('EPSG','1637','Europe - 18°E to 24°E and ED50 by country','Europe - between 18°E and 24°E - Greece - offshore; Italy - onshore and offshore; Norway including Svalbard - onshore and offshore.',33.59,84.0,18.0,24.0,0);
 INSERT INTO "area" VALUES('EPSG','1638','Europe - 24°E to 30°E and ED50 by country','Europe - between 24°E and 30°E - Greece - offshore; Norway including Svalbard - onshore and offshore; Turkey - onshore and offshore. Egypt - Western Desert.',25.71,84.01,24.0,30.0,0);
@@ -709,7 +709,7 @@ INSERT INTO "area" VALUES('EPSG','1729','Algeria - 31°30''N to 34°39''N','Alge
 INSERT INTO "area" VALUES('EPSG','1730','North America - NAVD88','North America: Canada - Alberta; British Columbia (BC); Manitoba; New Brunswick (NB); Newfoundland and Labrador; Northwest Territories (NWT); Nova Scotia (NS); Nunavut; Ontario; Prince Edward Island (PEI); Quebec; Saskatchewan; Yukon. United States (USA) - Alabama; Alaska; Arizona; Arkansas; California; Colorado; Connecticut; Delaware; Florida; Georgia; Idaho; Illinois; Indiana; Iowa; Kansas; Kentucky; Louisiana; Maine; Maryland; Massachusetts; Michigan; Minnesota; Mississippi; Missouri; Montana; Nebraska; Nevada; New Hampshire; New Jersey; New Mexico; New York; North Carolina; North Dakota; Ohio; Oklahoma; Oregon; Pennsylvania; Rhode Island; South Carolina; South Dakota; Tennessee; Texas; Utah; Vermont; Virginia; Washington; West Virginia; Wisconsin; Wyoming.',25.0,58.0,-168.0,-52.0,1);
 INSERT INTO "area" VALUES('EPSG','1731','France - mainland north of 48.15°N','France mainland onshore north of 53.5 grads North (48°09''N).',48.14,51.14,-4.87,8.23,0);
 INSERT INTO "area" VALUES('EPSG','1732','France - mainland 45.45°N to 48.15°N','France mainland onshore between 50.5 grads and 53.5 grads North (45°27''N to 48°09''N).',45.44,48.15,-4.8,7.63,0);
-INSERT INTO "area" VALUES('EPSG','1733','France - mainland south of 45.45°N','France - mainland onshore south of 50.5 grads North (45°27''N).',42.33,45.45,-1.79,7.71,0);
+INSERT INTO "area" VALUES('EPSG','1733','France - mainland south of 45.45°N','France - mainland onshore south of 50.5 grads North (45°27''N).',42.33,45.46,-1.79,7.71,0);
 INSERT INTO "area" VALUES('EPSG','1734','France - mainland 45.45°N to 48.15°N. Also all mainland.','France mainland onshore between 50.5 grads and 53.5 grads North (45°27''N to 48°09''N). Also used over all onshore mainland France.',42.33,51.14,-4.87,8.23,0);
 INSERT INTO "area" VALUES('EPSG','1735','Algeria - west of 6°W','Algeria - west of 6°W (of Greenwich).',25.73,29.85,-8.67,-6.0,0);
 INSERT INTO "area" VALUES('EPSG','1736','Algeria - 6°W to 0°W onshore','Algeria - onshore between 6°W and 0°W (of Greenwich).',21.82,35.96,-6.0,0.0,0);
@@ -733,9 +733,9 @@ INSERT INTO "area" VALUES('EPSG','1753','Peru - west of 79°W','Peru - west of 7
 INSERT INTO "area" VALUES('EPSG','1754','Brazil - Amazon cone shelf','Brazil - offshore shelf - Amazon cone.',-1.05,5.6,-51.64,-48.0,0);
 INSERT INTO "area" VALUES('EPSG','1755','South America - 84°W to 78°W, S hemisphere and PSAD56 by country','South America (Ecuador and Peru) between 84°W and 78°W, southern hemisphere, onshore.',-10.53,0.0,-81.41,-78.0,0);
 INSERT INTO "area" VALUES('EPSG','1756','South America - 78°W to 72°W, N hemisphere and PSAD56 by country','South America (Ecuador; Venezuela) between 78°W and 72°W, northern hemisphere, onshore.',0.0,11.62,-78.0,-71.99,0);
-INSERT INTO "area" VALUES('EPSG','1757','South America - 78°W to 72°W, S hemisphere and PSAD56 by country','South America (Chile - north of 45°S; Ecuador; Peru) between 78°W and 72°W, southern hemisphere, onshore.',-45.0,0.0,-78.0,-72.0,0);
+INSERT INTO "area" VALUES('EPSG','1757','South America - 78°W to 72°W, S hemisphere and PSAD56 by country','South America (Chile - north of 45°S; Ecuador; Peru) between 78°W and 72°W, southern hemisphere, onshore.',-43.5,0.0,-78.0,-71.99,0);
 INSERT INTO "area" VALUES('EPSG','1758','South America - 72°W to 66°W, N hemisphere and PSAD56 by country','South America (Aruba; Bonaire; Curacao; Venezuela) between 72°W and 66°W, northern hemisphere, onshore.',0.73,12.68,-72.0,-66.0,0);
-INSERT INTO "area" VALUES('EPSG','1759','South America - 72°W to 66°W, S hemisphere and PSAD56 by country','South America (Bolivia; Chile - north of 45°S; Peru) between 72°W and 66°W, southern hemisphere, onshore.',-45.0,-2.14,-72.0,-66.0,0);
+INSERT INTO "area" VALUES('EPSG','1759','South America - 72°W to 66°W, S hemisphere and PSAD56 by country','South America (Bolivia; Chile - north of 45°S; Peru) between 72°W and 66°W, southern hemisphere, onshore.',-43.5,-2.14,-72.0,-66.0,0);
 INSERT INTO "area" VALUES('EPSG','1760','South America - 66°W to 60°W, N hemisphere and PSAD56 by country','South America (Guyana; Venezuela) onshore between 66°W and 60°W, northern hemisphere.',0.64,11.23,-66.0,-59.99,0);
 INSERT INTO "area" VALUES('EPSG','1761','Bolivia - 66°W to 60°W','Bolivia between 66°W and 60°W.',-22.87,-9.67,-66.0,-60.0,0);
 INSERT INTO "area" VALUES('EPSG','1762','South America - 60°W to 54°W, N hemisphere and PSAD56 by country','South America (Guyana) onshore between 60°W and 54°W, northern hemisphere.',1.18,8.58,-60.0,-56.47,0);
@@ -1321,7 +1321,7 @@ INSERT INTO "area" VALUES('EPSG','2341','Egypt - Gulf of Suez','Egypt - Gulf of
 INSERT INTO "area" VALUES('EPSG','2342','Europe - common offshore','Denmark - offshore North Sea; Ireland - offshore; Netherlands - offshore; United Kingdom - UKCS offshore.',47.42,63.89,-16.1,10.86,0);
 INSERT INTO "area" VALUES('EPSG','2343','Europe - British Isles and Channel Islands onshore','Channel islands - onshore. Ireland - onshore. Isle of Man - onshore. United Kingdom (UK) -  onshore - England; Scotland; Wales; Northern Ireland.',49.11,60.9,-10.56,1.84,0);
 INSERT INTO "area" VALUES('EPSG','2344','Europe - Finland and Norway - onshore','Finland and Norway - onshore.',57.93,71.21,4.68,31.59,0);
-INSERT INTO "area" VALUES('EPSG','2345','Asia - Middle East - Iraq; Israel; Jordan; Lebanon; Kuwait; Saudi Arabia; Syria','Iraq, Israel, Jordan, Lebanon, Kuwait, Saudi Arabia and Syria - onshore.',15.61,37.39,34.17,55.67,0);
+INSERT INTO "area" VALUES('EPSG','2345','Asia - Middle East - Iraq; Israel; Jordan; Lebanon; Kuwait; Saudi Arabia; Syria','Iraq, Israel, Jordan, Lebanon, Kuwait, Saudi Arabia and Syria - onshore.',16.37,37.39,34.17,55.67,0);
 INSERT INTO "area" VALUES('EPSG','2346','World - WGS72 BE to WGS 84 - by country','World. Vietnam - offshore.',-90.0,90.0,-180.0,180.0,0);
 INSERT INTO "area" VALUES('EPSG','2347','Algeria - north of 31.5°N','Algeria - onshore north of 35 grads North (31°30''N).',31.5,37.14,-3.85,9.22,0);
 INSERT INTO "area" VALUES('EPSG','2348','Brunei - offshore','Brunei Darussalam - offshore.',4.58,6.37,112.5,115.24,1);
@@ -1508,8 +1508,8 @@ INSERT INTO "area" VALUES('EPSG','2528','USA - Texas - SPCS83 - S','United State
 INSERT INTO "area" VALUES('EPSG','2529','USA - Louisiana - SPCS83 - S','United States (USA) - Louisiana - counties of Acadia; Allen; Ascension; Assumption; Beauregard; Calcasieu; Cameron; East Baton Rouge; East Feliciana; Evangeline; Iberia; Iberville; Jefferson; Jefferson Davis; Lafayette; LaFourche; Livingston; Orleans; Plaquemines; Pointe Coupee; St Bernard; St Charles; St Helena; St James; St John the Baptist; St Landry; St Martin; St Mary; St Tammany; Tangipahoa; Terrebonne; Vermilion; Washington; West Baton Rouge; West Feliciana.',28.85,31.07,-93.94,-88.75,0);
 INSERT INTO "area" VALUES('EPSG','2530','UK - Northern Ireland - onshore','United Kingdom (UK) - Northern Ireland (Ulster) - onshore.',53.96,55.36,-8.18,-5.34,0);
 INSERT INTO "area" VALUES('EPSG','2531','Denmark - onshore Jutland and Funen','Denmark - Jutland and Funen - onshore.',54.67,57.8,8.0,11.29,0);
-INSERT INTO "area" VALUES('EPSG','2532','Denmark - onshore Zealand and Lolland','Denmark - Zealand and Lolland (onshore).',54.51,56.18,10.79,12.69,0);
-INSERT INTO "area" VALUES('EPSG','2533','Denmark - onshore Bornholm','Denmark - Bornholm onshore.',54.94,55.36,14.59,15.24,0);
+INSERT INTO "area" VALUES('EPSG','2532','Denmark - onshore Zealand and Lolland','Denmark - Zealand and Lolland (onshore).',54.51,56.79,10.79,12.69,0);
+INSERT INTO "area" VALUES('EPSG','2533','Denmark - onshore Bornholm','Denmark - Bornholm (including Ertholmene) onshore.',54.94,55.38,14.59,15.25,0);
 INSERT INTO "area" VALUES('EPSG','2534','World - N hemisphere - 3-degree CM 027°E','Between 25°30''E and 28°30''E, northern hemisphere.',0.0,84.0,25.5,28.5,0);
 INSERT INTO "area" VALUES('EPSG','2535','World - N hemisphere - 3-degree CM 030°E','Between 28°30''E and 31°30''E, northern hemisphere.',0.0,84.0,28.5,31.5,0);
 INSERT INTO "area" VALUES('EPSG','2536','World - N hemisphere - 3-degree CM 033°E','Between 31°30''E and 34°30''E, northern hemisphere.',0.0,84.0,31.5,34.5,0);
@@ -2213,7 +2213,7 @@ INSERT INTO "area" VALUES('EPSG','3233','Cote d''Ivoire (Ivory Coast) - onshore'
 INSERT INTO "area" VALUES('EPSG','3234','Croatia - onshore','Croatia - onshore.',42.34,46.54,13.43,19.43,0);
 INSERT INTO "area" VALUES('EPSG','3235','Cuba - onshore','Cuba - onshore.',19.77,23.25,-85.01,-74.07,0);
 INSERT INTO "area" VALUES('EPSG','3236','Cyprus - onshore','Cyprus - onshore.',34.59,35.74,32.2,34.65,0);
-INSERT INTO "area" VALUES('EPSG','3237','Denmark - onshore','Denmark - onshore.',54.51,57.8,8.0,15.24,0);
+INSERT INTO "area" VALUES('EPSG','3237','Denmark - onshore','Denmark - onshore.',54.51,57.8,8.0,15.25,0);
 INSERT INTO "area" VALUES('EPSG','3238','Djibouti - onshore','Djibouti - onshore.',10.94,12.72,41.75,43.48,0);
 INSERT INTO "area" VALUES('EPSG','3239','Dominica - onshore','Dominica - onshore.',15.14,15.69,-61.55,-61.2,0);
 INSERT INTO "area" VALUES('EPSG','3240','Dominican Republic - onshore','Dominican Republic - onshore.',17.55,19.99,-72.01,-68.27,0);
@@ -2223,7 +2223,7 @@ INSERT INTO "area" VALUES('EPSG','3243','El Salvador - onshore','El Salvador - o
 INSERT INTO "area" VALUES('EPSG','3244','Equatorial Guinea - onshore','Equatorial Guinea - onshore.',0.93,3.82,8.37,11.36,0);
 INSERT INTO "area" VALUES('EPSG','3245','Eritrea - onshore','Eritrea - onshore.',12.36,18.01,36.44,43.18,0);
 INSERT INTO "area" VALUES('EPSG','3246','Estonia - onshore','Estonia - onshore.',57.52,59.75,21.74,28.2,0);
-INSERT INTO "area" VALUES('EPSG','3247','Falkland Islands - onshore','Falkland Islands (Malvinas) - onshore.',-52.51,-50.96,-61.54,-57.61,0);
+INSERT INTO "area" VALUES('EPSG','3247','Falkland Islands - onshore','Falkland Islands (Malvinas) - onshore.',-52.51,-50.96,-61.55,-57.6,0);
 INSERT INTO "area" VALUES('EPSG','3248','Faroe Islands - onshore','Faroe Islands - onshore.',61.33,62.41,-7.49,-6.33,0);
 INSERT INTO "area" VALUES('EPSG','3249','Gabon - onshore','Gabon - onshore.',-3.98,2.32,8.65,14.52,0);
 INSERT INTO "area" VALUES('EPSG','3250','Gambia - onshore','Gambia - onshore.',13.05,13.83,-16.88,-13.79,0);
@@ -2279,7 +2279,7 @@ INSERT INTO "area" VALUES('EPSG','3299','St Pierre and Miquelon - onshore','St P
 INSERT INTO "area" VALUES('EPSG','3300','St Vincent and the Grenadines - onshore','St Vincent and the northern Grenadine Islands - onshore.',12.54,13.44,-61.52,-61.07,0);
 INSERT INTO "area" VALUES('EPSG','3301','Samoa - onshore','Samoa - onshore.',-14.11,-13.41,-172.84,-171.37,0);
 INSERT INTO "area" VALUES('EPSG','3302','Sao Tome and Principe - onshore','Sao Tome and Principe - onshore.',-0.04,1.76,6.41,7.52,0);
-INSERT INTO "area" VALUES('EPSG','3303','Saudi Arabia - onshore','Saudi Arabia - onshore.',15.61,32.16,34.51,55.67,0);
+INSERT INTO "area" VALUES('EPSG','3303','Saudi Arabia - onshore','Saudi Arabia - onshore.',16.37,32.16,34.51,55.67,0);
 INSERT INTO "area" VALUES('EPSG','3304','Senegal - onshore','Senegal - onshore.',12.29,16.7,-17.59,-11.36,0);
 INSERT INTO "area" VALUES('EPSG','3305','Serbia and Montenegro - onshore','Serbia and Montenegro - onshore.',41.82,46.23,18.44,23.05,1);
 INSERT INTO "area" VALUES('EPSG','3306','Sierra Leone - onshore','Sierra Leone - onshore.',6.88,10.0,-13.35,-10.26,0);
@@ -2331,7 +2331,7 @@ INSERT INTO "area" VALUES('EPSG','3351','Slovenia - Kocevje','Slovenia - Kocevje
 INSERT INTO "area" VALUES('EPSG','3352','Slovenia - Koroska','Slovenia - Koroska Region (Slovene Carinthia).',46.46,46.66,14.83,15.51,0);
 INSERT INTO "area" VALUES('EPSG','3353','Slovenia - Velenje','Slovenia - Velenje with part of Koroska Region (Slovene Carinthia).',46.28,46.51,14.9,15.26,0);
 INSERT INTO "area" VALUES('EPSG','3354','Slovenia - Zasavje','Slovenia - Zasavje (the Sava Valley) with the broad region of Celje.',46.0,46.32,14.84,15.35,0);
-INSERT INTO "area" VALUES('EPSG','3355','Brazil - south of 18°S and west of 54°W','Brazil - onshore south of 18°S and west of 54°W.',-31.91,-17.99,-58.16,-54.0,0);
+INSERT INTO "area" VALUES('EPSG','3355','Brazil - west of 54°W and south of 18°S','Brazil - west of 54°W and south of 18°S.',-31.91,-17.99,-58.16,-54.0,0);
 INSERT INTO "area" VALUES('EPSG','3356','South America - Brazil - south of 18°S and west of 54°W + DF; N Paraguay','Brazil - south of 18°S and west of 54°W, plus Distrito Federal. Paraguay - north.',-31.91,-15.37,-62.57,-47.1,0);
 INSERT INTO "area" VALUES('EPSG','3357','USA - GoM OCS','United States (USA) - offshore Gulf of Mexico outer continental shelf (GoM OCS) - protraction areas South Padre Island; North Padre Island; Mustang Island; Matagorda Island; Brazos; Galveston; High Island; Sabine Pass; West Cameron; East Cameron; Vermilion; South Marsh Island; Eugene Island; Ship Shoal; South Pelto; Bay Marchand; South Timbalier; Grand Isle; West Delta; South Pass; Main Pass; Breton Sound; Chandeleur; Corpus Christi; Port Isabel; East Breaks; Alaminos Canyon; Garden Banks; Keathley Canyon; Sigsbee Escarpment; Ewing Bank; Green Canyon; Walker Ridge; Amery Terrace; Mobile; Viosca Knoll; Mississippi Canyon; Atwater Valley; Lund; Lund South; Pensacola; Destin Dome; De Soto Canyon; Lloyd Ridge; Henderson; Florida Plain; Campeche Escarpment; Apalachicola; Florida Middle Ground; The Elbow; Vernon Basin; Howell Hook; Rankin; Gainesville; Tarpon Springs; St Petersburg; Charlotte Harbor; Pulley Ridge; Dry Tortugas; Tortugas Valley; Miami; Key West.',23.82,30.25,-97.22,-81.17,0);
 INSERT INTO "area" VALUES('EPSG','3358','USA - GoM - east of 87.25°W','United States (USA) - offshore Gulf of Mexico (GoM) east of approximately 87°15''W - protraction areas Gainesville, Tarpon Springs, St Petersburg, Charlotte Harbor, Pulley Ridge, Dry Tortugas, Tortugas Valley, Miami, Key West, Apalachicola, Florida Middle Ground, The Elbow, Vernon Basin, Howell Hook, Rankin and Campeche Escarpment. Also for protraction areas Pensacola, Destin Dome, Desoto Canyon, Lloyd Ridge, Henderson and Florida Plain - east of 87°15''W.',23.82,30.25,-87.25,-81.17,0);
@@ -2448,7 +2448,7 @@ INSERT INTO "area" VALUES('EPSG','3468','North America - Great Lakes basin and S
 INSERT INTO "area" VALUES('EPSG','3469','China - offshore - Yellow Sea','China - offshore - Huang Hai (Yellow Sea).',31.23,37.4,119.23,125.06,0);
 INSERT INTO "area" VALUES('EPSG','3470','China - offshore - Pearl River basin','China - offshore South China Sea - Pearl River basin.',18.31,22.89,110.13,116.76,0);
 INSERT INTO "area" VALUES('EPSG','3471','Denmark - onshore west of 12°E','Denmark - onshore west of 12°E - Zealand, Jutland, Fuen and Lolland.',54.51,57.8,8.0,12.0,0);
-INSERT INTO "area" VALUES('EPSG','3472','Denmark - onshore east of 12°E','Denmark - onshore east of 12°E - Zealand and Falster, Bornholm.',54.51,56.18,12.0,15.24,0);
+INSERT INTO "area" VALUES('EPSG','3472','Denmark - onshore east of 12°E','Denmark - onshore east of 12°E - Zealand and Falster, Bornholm.',54.51,56.18,12.0,15.25,0);
 INSERT INTO "area" VALUES('EPSG','3473','World - south of 40°S','Southern hemisphere - south of 40°S including Antarctica.',-90.0,-40.0,-180.0,180.0,1);
 INSERT INTO "area" VALUES('EPSG','3474','World - south of 0°N','Southern hemisphere.',-90.0,0.0,-180.0,180.0,0);
 INSERT INTO "area" VALUES('EPSG','3475','World - north of 0°N','Northern hemisphere.',0.0,90.0,-180.0,180.0,0);
@@ -2522,8 +2522,8 @@ INSERT INTO "area" VALUES('EPSG','3542','Canada - Alberta - 115.5°W to 112.5°W
 INSERT INTO "area" VALUES('EPSG','3543','Canada - Alberta - east of 112.5°W','Canada - Alberta - east of 112°30''W.',48.99,60.0,-112.5,-109.98,0);
 INSERT INTO "area" VALUES('EPSG','3544','World - 85°S to 85°N','World between 85.06°S and 85.06°N.',-85.06,85.06,-180.0,180.0,0);
 INSERT INTO "area" VALUES('EPSG','3545','France - mainland south of 43°N and Corsica','France onshore - mainland south of 43°N and Corsica.',41.31,43.07,-1.06,9.63,0);
-INSERT INTO "area" VALUES('EPSG','3546','France - mainland south of 44°N','France - mainland onshore south of 44°N.',42.33,44.0,-1.79,7.65,0);
-INSERT INTO "area" VALUES('EPSG','3547','France - mainland - 43°N to 45°N','France - mainland onshore between 43°N and 45°N.',43.0,45.0,-1.79,7.71,0);
+INSERT INTO "area" VALUES('EPSG','3546','France - mainland south of 44°N','France - mainland onshore south of 44°N.',42.33,44.01,-1.79,7.65,0);
+INSERT INTO "area" VALUES('EPSG','3547','France - mainland - 43°N to 45°N','France - mainland onshore between 43°N and 45°N.',42.92,45.0,-1.79,7.71,0);
 INSERT INTO "area" VALUES('EPSG','3548','France - mainland - 44°N to 46°N','France - mainland onshore between 44°N and 46°N.',44.0,46.0,-1.46,7.71,0);
 INSERT INTO "area" VALUES('EPSG','3549','France - mainland - 45°N to 47°N','France - mainland onshore between 45°N and 47°N.',45.0,47.0,-2.21,7.16,0);
 INSERT INTO "area" VALUES('EPSG','3550','France - mainland - 46°N to 48°N','France - mainland onshore between 46°N and 48°N.',46.0,48.0,-4.77,7.63,0);
@@ -2585,7 +2585,7 @@ INSERT INTO "area" VALUES('EPSG','3605','Finland - 28.5°E to 29.5°E nominal','
 INSERT INTO "area" VALUES('EPSG','3606','Finland - 29.5°E to 30.5°E nominal','Finland - nominally between 29°30''E and 30°30''E but may be used in adjacent areas if a municipality chooses to use one zone over its whole extent.',61.43,67.98,29.5,30.5,0);
 INSERT INTO "area" VALUES('EPSG','3607','Finland - east of 30.5°E nominal','Finland - nominally east of 30°30''E but may be used in adjacent areas to west if a municipality chooses to use one zone over its whole extent.',62.08,64.27,30.5,31.59,0);
 INSERT INTO "area" VALUES('EPSG','3608','Sweden - Stockholm county','Sweden - Stockholm county. Municipalities of Botkyrka, Danderyd, Ekerö, Haninge, Huddinge, Järfälla, Lidingö, Nacka, Nynäshamn, Salem, Sigtuna, Sollentuna, Solna, Stockholm and Sundbyberg.',58.69,60.27,17.25,19.61,0);
-INSERT INTO "area" VALUES('EPSG','3609','Congo DR (Zaire) - Katanga west of 25.5°E','The Democratic Republic of the Congo (Zaire) - Katanga west of 25°30''E.',-11.72,-6.32,21.74,25.5,0);
+INSERT INTO "area" VALUES('EPSG','3609','Congo DR (Zaire) - Katanga west of 25.5°E','The Democratic Republic of the Congo (Zaire) - Katanga west of 25°30''E.',-11.72,-6.32,21.74,25.51,0);
 INSERT INTO "area" VALUES('EPSG','3610','Congo DR (Zaire) - Katanga 24.5°E to 27.5°E','The Democratic Republic of the Congo (Zaire) - Katanga between 24°30''E and 27°30''E.',-12.08,-4.99,24.5,27.5,0);
 INSERT INTO "area" VALUES('EPSG','3611','Congo DR (Zaire) - Katanga 26.5°E to 29.5°E','The Democratic Republic of the Congo (Zaire) - Katanga between 26°30''E and 29°30''E.',-13.44,-4.99,26.5,29.5,0);
 INSERT INTO "area" VALUES('EPSG','3612','Congo DR (Zaire) - Katanga east of 28.5°E','The Democratic Republic of the Congo (Zaire) - Katanga east of 28°30''E.',-13.46,-4.99,28.5,30.78,0);
@@ -3503,8 +3503,8 @@ INSERT INTO "area" VALUES('EPSG','4523','World centred on 150°E','World centred
 INSERT INTO "area" VALUES('EPSG','4524','Saudi Arabia - west of 36°E','Saudi Arabia - onshore and offshore - west of 36°E.',24.92,29.38,34.44,36.01,0);
 INSERT INTO "area" VALUES('EPSG','4525','Pacific - Guam and NMI - onshore','Guam - onshore. Northern Mariana Islands - onshore.',13.18,20.61,144.58,146.12,0);
 INSERT INTO "area" VALUES('EPSG','4526','Saudi Arabia - 36°E to 42°E','Saudi Arabia - onshore and offshore - between 36°E and 42°E.',16.29,32.16,36.0,42.0,0);
-INSERT INTO "area" VALUES('EPSG','4527','Saudi Arabia - 42°E to 48°E','Saudi Arabia - onshore and offshore - between of 42°E and 48°E.',15.61,31.15,41.99,48.0,0);
-INSERT INTO "area" VALUES('EPSG','4528','Saudi Arabia - 48°E to 54°E','Saudi Arabia - onshore and offshore - between 48°E and 54°E.',17.43,28.94,48.0,54.01,0);
+INSERT INTO "area" VALUES('EPSG','4527','Saudi Arabia - 42°E to 48°E','Saudi Arabia - onshore and offshore - between of 42°E and 48°E.',16.35,31.15,41.99,48.0,0);
+INSERT INTO "area" VALUES('EPSG','4528','Saudi Arabia - 48°E to 54°E','Saudi Arabia - onshore and offshore - between 48°E and 54°E.',17.94,28.94,47.99,54.01,0);
 INSERT INTO "area" VALUES('EPSG','4530','Latin America - Central America and South America','Latin America - Central America and South America, onshore and offshore.',-59.87,32.72,-122.19,-25.28,0);
 INSERT INTO "area" VALUES('EPSG','4531','Costa Rica - offshore Caribbean','Costa Rica - offshore - Caribbean sea.',9.6,11.77,-83.6,-81.43,0);
 INSERT INTO "area" VALUES('EPSG','4532','Costa Rica - offshore Pacific','Costa Rica - offshore Pacific ocean and onshore Coco Island.',2.15,11.11,-90.45,-82.92,0);
@@ -3549,3 +3549,13 @@ INSERT INTO "area" VALUES('EPSG','4570','Argentina - south Santa Cruz west of 70
 INSERT INTO "area" VALUES('EPSG','4571','Argentina - south Santa Cruz east of 70.5°W','Argentina - Santa Cruz province south of approximately 50°20''S and east of 70°30''W.',-52.43,-50.33,-70.5,-68.3,0);
 INSERT INTO "area" VALUES('EPSG','4572','Argentina - 44°S to 47.5°S','Argentina - Chubut province south of approximately 44°S and Santa Cruz province north of approximately 47°30''S - Golfo San Jorge basin onshore and offshore.',-47.5,-43.99,-72.36,-63.24,0);
 INSERT INTO "area" VALUES('EPSG','4573','Argentina - onshore','Argentina - onshore.',-55.11,-21.78,-73.59,-53.65,0);
+INSERT INTO "area" VALUES('EPSG','4574','Brazil - west of 54°W and between 18°S and 27°30''S','Brazil - west of 54°W and between 18°S and 27°30''S.',-27.5,-17.99,-58.16,-54.0,0);
+INSERT INTO "area" VALUES('EPSG','4575','Denmark - onshore Jutland, Funen, Zealand and Lolland','Denmark - onshore Jutland, Funen, Zealand and Lolland.',54.51,57.8,8.0,12.69,0);
+INSERT INTO "area" VALUES('EPSG','4576','Brazil - 54°W to 48°W and 15°S to 27°30''S','Brazil - onshore between 54°W and 48°W and between 15°S and 27°30''S.',-27.5,-14.99,-54.0,-47.99,0);
+INSERT INTO "area" VALUES('EPSG','4577','Argentina - 70.5°W to 67.5°W mainland onshore','Argentina - between 70°30''W and 67°30''W, onshore mainland.',-52.43,-24.08,-70.5,-67.49,0);
+INSERT INTO "area" VALUES('EPSG','4578','Argentina - 67.5°W to 64.5°W mainland onshore','Argentina - between 67°30''W and 64°30''W, onshore mainland.',-49.05,-21.78,-67.5,-64.49,0);
+INSERT INTO "area" VALUES('EPSG','4579','Argentina - 64.5°W to 61.5°W mainland onshore','Argentina - between 64°30''W and 61°30''W, onshore mainland.',-43.14,-21.99,-64.5,-61.49,0);
+INSERT INTO "area" VALUES('EPSG','4580','Germany - Baden-Wurttemberg','Germany - Baden-Wurttemberg.',47.54,49.8,7.51,10.5,0);
+INSERT INTO "area" VALUES('EPSG','4581','Africa - Morocco and Western Sahara - onshore','Africa - Morocco and Western Sahara - onshore.',20.71,35.97,-17.16,-1.01,0);
+INSERT INTO "area" VALUES('EPSG','4584','Germany - Saarland','Germany - Saarland.',49.11,49.64,6.35,7.41,0);
+INSERT INTO "area" VALUES('EPSG','4587','Congo DR (Zaire) - 6th parallel south 21.5°E to 23°E','The Democratic Republic of the Congo (Zaire) - adjacent to 6th parallel south traverse between 21°30''E and 23°E.',-7.31,-5.31,21.5,23.01,0);

data/sql/commit.sql

@@ -63,19 +63,6 @@ FOR EACH ROW BEGIN
                       (SELECT auth_name || code FROM geodetic_crs
                        WHERE type = 'geographic 2D'));
 
-    -- check that grids with HEIGHT_TO_GEOGRAPHIC3D method are properly registered
-    SELECT RAISE(ABORT, 'One grid_transformation with HEIGHT_TO_GEOGRAPHIC3D has not its source_crs in vertical_crs table')
-        WHERE EXISTS (SELECT * FROM grid_transformation g WHERE
-                      g.method_code = 'HEIGHT_TO_GEOGRAPHIC3D' AND
-                      g.source_crs_auth_name || g.source_crs_code NOT IN
-                      (SELECT auth_name || code FROM vertical_crs));
-    SELECT RAISE(ABORT, 'One grid_transformation with HEIGHT_TO_GEOGRAPHIC3D has not its target_crs in geodetic_crs table with type = ''geographic 3D''')
-        WHERE EXISTS (SELECT * FROM grid_transformation g WHERE
-                      g.method_code = 'HEIGHT_TO_GEOGRAPHIC3D' AND
-                      g.target_crs_auth_name || g.target_crs_code NOT IN
-                      (SELECT auth_name || code FROM geodetic_crs
-                       WHERE type = 'geographic 3D'));
-
     -- check that grids with Geographic3D to GravityRelatedHeight method are properly registered
     SELECT RAISE(ABORT, 'One grid_transformation with Geographic3D to GravityRelatedHeight has not its target_crs in vertical_crs table')
         WHERE EXISTS (SELECT * FROM grid_transformation g WHERE
@@ -137,10 +124,6 @@ FOR EACH ROW BEGIN
     SELECT RAISE(ABORT, 'missing au_ga_AUSGeoid98.tif')
         WHERE NOT EXISTS(SELECT 1 FROM grid_alternatives WHERE proj_grid_name = 'au_ga_AUSGeoid98.tif');
 
-    -- detect if PROJ:NTF_PARIS_TO_RGF93_GEOCENTRIC_TRANSLATION can be removed
-    SELECT RAISE(ABORT, 'PROJ:NTF_PARIS_TO_RGF93_GEOCENTRIC_TRANSLATION can probably be removed')
-        WHERE EXISTS(SELECT 1 FROM concatenated_operation_step WHERE operation_auth_name = 'EPSG' AND step_number = 2 AND step_auth_name = 'EPSG' AND step_code = '9327');
-
 END;
 INSERT INTO dummy DEFAULT VALUES;
 DROP TRIGGER final_checks;

data/sql/compound_crs.sql

@@ -64,12 +64,12 @@ INSERT INTO "compound_crs" VALUES('EPSG','5967','ETRS89 / NTM zone 27 + NN2000 h
 INSERT INTO "compound_crs" VALUES('EPSG','5968','ETRS89 / NTM zone 28 + NN2000 height',NULL,NULL,'EPSG','5128','EPSG','5941','EPSG','3673',0);
 INSERT INTO "compound_crs" VALUES('EPSG','5969','ETRS89 / NTM zone 29 + NN2000 height',NULL,NULL,'EPSG','5129','EPSG','5941','EPSG','3674',0);
 INSERT INTO "compound_crs" VALUES('EPSG','5970','ETRS89 / NTM zone 30 + NN2000 height',NULL,NULL,'EPSG','5130','EPSG','5941','EPSG','3676',0);
-INSERT INTO "compound_crs" VALUES('EPSG','5971','ETRS89 / UTM zone 31 + NN2000 height',NULL,NULL,'EPSG','25831','EPSG','5941','EPSG','3636',0);
-INSERT INTO "compound_crs" VALUES('EPSG','5972','ETRS89 / UTM zone 32 + NN2000 height',NULL,NULL,'EPSG','25832','EPSG','5941','EPSG','4066',0);
-INSERT INTO "compound_crs" VALUES('EPSG','5973','ETRS89 / UTM zone 33 + NN2000 height',NULL,NULL,'EPSG','25833','EPSG','5941','EPSG','4067',0);
-INSERT INTO "compound_crs" VALUES('EPSG','5974','ETRS89 / UTM zone 34 + NN2000 height',NULL,NULL,'EPSG','25834','EPSG','5941','EPSG','4068',0);
-INSERT INTO "compound_crs" VALUES('EPSG','5975','ETRS89 / UTM zone 35 + NN2000 height',NULL,NULL,'EPSG','25835','EPSG','5941','EPSG','4069',0);
-INSERT INTO "compound_crs" VALUES('EPSG','5976','ETRS89 / UTM zone 36 + NN2000 height',NULL,NULL,'EPSG','25836','EPSG','5941','EPSG','3676',0);
+INSERT INTO "compound_crs" VALUES('EPSG','5971','ETRS89 / UTM zone 31N + NN2000 height',NULL,NULL,'EPSG','25831','EPSG','5941','EPSG','3636',0);
+INSERT INTO "compound_crs" VALUES('EPSG','5972','ETRS89 / UTM zone 32N + NN2000 height',NULL,NULL,'EPSG','25832','EPSG','5941','EPSG','4066',0);
+INSERT INTO "compound_crs" VALUES('EPSG','5973','ETRS89 / UTM zone 33N + NN2000 height',NULL,NULL,'EPSG','25833','EPSG','5941','EPSG','4067',0);
+INSERT INTO "compound_crs" VALUES('EPSG','5974','ETRS89 / UTM zone 34N + NN2000 height',NULL,NULL,'EPSG','25834','EPSG','5941','EPSG','4068',0);
+INSERT INTO "compound_crs" VALUES('EPSG','5975','ETRS89 / UTM zone 35N + NN2000 height',NULL,NULL,'EPSG','25835','EPSG','5941','EPSG','4069',0);
+INSERT INTO "compound_crs" VALUES('EPSG','5976','ETRS89 / UTM zone 36N + NN2000 height',NULL,NULL,'EPSG','25836','EPSG','5941','EPSG','3676',0);
 INSERT INTO "compound_crs" VALUES('EPSG','6144','ETRS89 + NN54 height',NULL,NULL,'EPSG','4258','EPSG','5776','EPSG','1352',0);
 INSERT INTO "compound_crs" VALUES('EPSG','6145','ETRS89 / NTM zone 5 + NN54 height',NULL,NULL,'EPSG','5105','EPSG','5776','EPSG','3636',0);
 INSERT INTO "compound_crs" VALUES('EPSG','6146','ETRS89 / NTM zone 6 + NN54 height',NULL,NULL,'EPSG','5106','EPSG','5776','EPSG','3639',0);
@@ -97,12 +97,12 @@ INSERT INTO "compound_crs" VALUES('EPSG','6167','ETRS89 / NTM zone 27 + NN54 hei
 INSERT INTO "compound_crs" VALUES('EPSG','6168','ETRS89 / NTM zone 28 + NN54 height',NULL,NULL,'EPSG','5128','EPSG','5776','EPSG','3673',0);
 INSERT INTO "compound_crs" VALUES('EPSG','6169','ETRS89 / NTM zone 29 + NN54 height',NULL,NULL,'EPSG','5129','EPSG','5776','EPSG','3674',0);
 INSERT INTO "compound_crs" VALUES('EPSG','6170','ETRS89 / NTM zone 30 + NN54 height',NULL,NULL,'EPSG','5130','EPSG','5776','EPSG','3676',0);
-INSERT INTO "compound_crs" VALUES('EPSG','6171','ETRS89 / UTM zone 31 + NN54 height',NULL,NULL,'EPSG','25831','EPSG','5776','EPSG','3636',0);
-INSERT INTO "compound_crs" VALUES('EPSG','6172','ETRS89 / UTM zone 32 + NN54 height',NULL,NULL,'EPSG','25832','EPSG','5776','EPSG','4066',0);
-INSERT INTO "compound_crs" VALUES('EPSG','6173','ETRS89 / UTM zone 33 + NN54 height',NULL,NULL,'EPSG','25833','EPSG','5776','EPSG','4067',0);
-INSERT INTO "compound_crs" VALUES('EPSG','6174','ETRS89 / UTM zone 34 + NN54 height',NULL,NULL,'EPSG','25834','EPSG','5776','EPSG','4068',0);
-INSERT INTO "compound_crs" VALUES('EPSG','6175','ETRS89 / UTM zone 35 + NN54 height',NULL,NULL,'EPSG','25835','EPSG','5776','EPSG','4069',0);
-INSERT INTO "compound_crs" VALUES('EPSG','6176','ETRS89 / UTM zone 36 + NN54 height',NULL,NULL,'EPSG','25836','EPSG','5776','EPSG','3676',0);
+INSERT INTO "compound_crs" VALUES('EPSG','6171','ETRS89 / UTM zone 31N + NN54 height',NULL,NULL,'EPSG','25831','EPSG','5776','EPSG','3636',0);
+INSERT INTO "compound_crs" VALUES('EPSG','6172','ETRS89 / UTM zone 32N + NN54 height',NULL,NULL,'EPSG','25832','EPSG','5776','EPSG','4066',0);
+INSERT INTO "compound_crs" VALUES('EPSG','6173','ETRS89 / UTM zone 33N + NN54 height',NULL,NULL,'EPSG','25833','EPSG','5776','EPSG','4067',0);
+INSERT INTO "compound_crs" VALUES('EPSG','6174','ETRS89 / UTM zone 34N + NN54 height',NULL,NULL,'EPSG','25834','EPSG','5776','EPSG','4068',0);
+INSERT INTO "compound_crs" VALUES('EPSG','6175','ETRS89 / UTM zone 35N + NN54 height',NULL,NULL,'EPSG','25835','EPSG','5776','EPSG','4069',0);
+INSERT INTO "compound_crs" VALUES('EPSG','6176','ETRS89 / UTM zone 36N + NN54 height',NULL,NULL,'EPSG','25836','EPSG','5776','EPSG','3676',0);
 INSERT INTO "compound_crs" VALUES('EPSG','6190','Belge 1972 / Belgian Lambert 72 + Ostend height',NULL,NULL,'EPSG','31370','EPSG','5710','EPSG','1347',0);
 INSERT INTO "compound_crs" VALUES('EPSG','6349','NAD83(2011) + NAVD88 height',NULL,NULL,'EPSG','6318','EPSG','5703','EPSG','3664',0);
 INSERT INTO "compound_crs" VALUES('EPSG','6649','NAD83(CSRS) + CGVD2013 height',NULL,NULL,'EPSG','4617','EPSG','6647','EPSG','1061',0);

data/sql/concatenated_operation.sql

@@ -13,7 +13,7 @@ INSERT INTO "concatenated_operation" VALUES('EPSG','5838','Lisbon (Lisbon) to WG
 INSERT INTO "concatenated_operation" VALUES('EPSG','6714','Tokyo to JGD2011 (1)','See Tokyo to JGD2011 (2) (code 6740) for areas other than northern Honshu.','Surveying, mapping and civil engineering.','EPSG','4301','EPSG','6668','EPSG','4170',NULL,'OGP-Jpn N Honshu',0);
 INSERT INTO "concatenated_operation" VALUES('EPSG','6739','NAD27 to NAD83(HARN) (22)','May be taken as approximate transformation NAD27 to WGS 84 - see code 8622.','Accuracy at 67% confidence level is 0.2m.','EPSG','4267','EPSG','4152','EPSG','1410',NULL,'NGS-Usa SD',0);
 INSERT INTO "concatenated_operation" VALUES('EPSG','6874','Tananarive (Paris) to WGS 84 (2)','Used by OMV.','For applications with an accuracy of 3m.','EPSG','4810','EPSG','4326','EPSG','3273',NULL,'OGP-Mdg',0);
-INSERT INTO "concatenated_operation" VALUES('EPSG','7811','NTF (Paris) to RGF93 (2)','Second step is an emulation using NTv2 method of geocentric Interpolation method described in tfm code 7810. Note that the grid file parameters are of opposite sign.','Approximation to better than 1m of transformation of coordinates referenced to NTF (Paris) to RGF93.','EPSG','4807','EPSG','4171','EPSG','3694',NULL,'IOGP-Fra NTv2',0);
+INSERT INTO "concatenated_operation" VALUES('EPSG','7811','NTF (Paris) to RGF93 (2)','Second step is an emulation (using the NTv2 method) of the geocentric Interpolation method described in tfm code 9337. Note that the grid file parameters are of opposite sign.','Approximation to better than 1m of transformation of coordinates referenced to NTF (Paris) to RGF93.','EPSG','4807','EPSG','4171','EPSG','3694',NULL,'IOGP-Fra NTv2',0);
 INSERT INTO "concatenated_operation" VALUES('EPSG','7965','Poolbeg height (ft(Br36)) to Malin Head height (1)','','Change of height to a different vertical reference surface for topographic mapping. Accuracy 0.1m.','EPSG','5754','EPSG','5731','EPSG','1305',NULL,'1',0);
 INSERT INTO "concatenated_operation" VALUES('EPSG','7967','Poolbeg height (ft(Br36)) to Belfast height (1)','','Change of height to a different vertical reference surface for topographic mapping and engineering survey. Accuracy 0.1m.','EPSG','5754','EPSG','5732','EPSG','1305',NULL,'1',0);
 INSERT INTO "concatenated_operation" VALUES('EPSG','7973','NGVD29 height (ftUS) to NAVD88 height (1)','','Change of height to a different vertical reference surface and unit. Accuracy 2cm.','EPSG','5702','EPSG','5703','EPSG','2950',NULL,'IOGP - US Conus W',0);
@@ -137,7 +137,7 @@ INSERT INTO "concatenated_operation" VALUES('EPSG','8581','PSD93 to WGS 84 (2)',
 INSERT INTO "concatenated_operation" VALUES('EPSG','8582','Old Hawaiian to WGS 84 (2)','Transformation steps are from Old Hawaiian to NAD83(HARN) (1) (code 8508) assuming that NAD83(HARN) is equivalent to WGS 84 within the accuracy of the transformation.','Approximation at the +/- 1m level.','EPSG','4135','EPSG','4326','EPSG','1334',NULL,'EPSG-Usa Hi',0);
 INSERT INTO "concatenated_operation" VALUES('EPSG','8583','Puerto Rico to WGS 84 (2)','Transformation steps are from Puerto Rico to NAD83(HARN) (1) (code 4435) assuming that NAD83(HARN) is equivalent to WGS 84 within the accuracy of the transformation.','Approximation at the +/- 1m level.','EPSG','4139','EPSG','4326','EPSG','3634',NULL,'EPSG-PRVI',0);
 INSERT INTO "concatenated_operation" VALUES('EPSG','8584','NAD27 to NAD83(CSRS98) (3)','Can be taken as an approximate transformation NAD27 to WGS 84 - see code 8585.','Accuracy 1-2 metres.','EPSG','4267','EPSG','4140','EPSG','2376',NULL,'EPSG-Can AB',1);
-INSERT INTO "concatenated_operation" VALUES('EPSG','8585','NAD27 to WGS 84 (36)','Steps based on concatenated transformation NAD27 to NAD83(CSRS) (3) (code 8635) assuming that NAD83(CSRS) is equivalent to WGS 84.','Approximation at the +/- 1m level.','EPSG','4267','EPSG','4326','EPSG','2376',NULL,'EPSG-Can AB',0);
+INSERT INTO "concatenated_operation" VALUES('EPSG','8585','NAD27 to WGS 84 (36)','Steps based on concatenated transformation NAD27 to NAD83(CSRS)v4 (3) (code 9336) assuming that NAD83(CSRS)v4 is equivalent to WGS 84.','Approximation at the +/- 1m level.','EPSG','4267','EPSG','4326','EPSG','2376',NULL,'EPSG-Can AB',0);
 INSERT INTO "concatenated_operation" VALUES('EPSG','8586','NAD27 to NAD83(HARN) (38)','May be taken as approximate transformation NAD27 to WGS 84 - see code 8592.','Accuracy at 67% confidence level is 0.2m.','EPSG','4267','EPSG','4152','EPSG','1374',NULL,'NGS-Usa AR',0);
 INSERT INTO "concatenated_operation" VALUES('EPSG','8587','NAD27 to NAD83(HARN) (39)','May be taken as approximate transformation NAD27 to WGS 84 - see code 8600.','Accuracy at 67% confidence level is 0.2m.','EPSG','4267','EPSG','4152','EPSG','1384',NULL,'NGS-Usa IA',0);
 INSERT INTO "concatenated_operation" VALUES('EPSG','8588','NAD27 to NAD83(HARN) (40)','May be taken as approximate transformation NAD27 to WGS 84 - see code 8608.','Accuracy at 67% confidence level is 0.2m.','EPSG','4267','EPSG','4152','EPSG','1392',NULL,'NGS-Usa MN',0);
@@ -187,7 +187,7 @@ INSERT INTO "concatenated_operation" VALUES('EPSG','8631','Garoua to WGS 84 (1)'
 INSERT INTO "concatenated_operation" VALUES('EPSG','8632','Kousseri to WGS 84 (1)','','Oil industry.','EPSG','4198','EPSG','4326','EPSG','2591',NULL,'EPSG-Cmr',0);
 INSERT INTO "concatenated_operation" VALUES('EPSG','8633','Yoff to WGS 84 (1)','Derived via WGS72. Can be used as a single positon vector transformation with parameter vaues of dX = -37 m, dY = +157 m, dZ = +89.5 m, rX = rY = 0 sec, rZ = 0.554 sec, dS = 0.219 ppm','Military purposes.','EPSG','4310','EPSG','4326','EPSG','1207',NULL,'EPSG-SEN',0);
 INSERT INTO "concatenated_operation" VALUES('EPSG','8634','Beduaram to WGS 84 (1)','Derived via WGS72BE. Can be used as a single positon vector transformation with parameter vaues of dX = -101 m, dY = -111 m, dZ = +188.9 m, rX = rY = 0 sec, rZ = 0.814 sec, dS = -0.38 ppm','Oil exploration.','EPSG','4213','EPSG','4326','EPSG','2771',NULL,'ELF-Ner SE',0);
-INSERT INTO "concatenated_operation" VALUES('EPSG','8635','NAD27 to NAD83(CSRS) (3)','Can be taken as an approximate transformation NAD27 to WGS 84 - see code 8585.','Accuracy 1-2 metres.','EPSG','4267','EPSG','4617','EPSG','2376',NULL,'EPSG-Can AB',0);
+INSERT INTO "concatenated_operation" VALUES('EPSG','8635','NAD27 to NAD83(CSRS) (3)','Can be taken as an approximate transformation NAD27 to WGS 84 - see code 8585.','Accuracy 1-2 metres.','EPSG','4267','EPSG','4617','EPSG','2376',NULL,'EPSG-Can AB',1);
 INSERT INTO "concatenated_operation" VALUES('EPSG','8636','Carthage (Paris) to WGS 84 (1)','','For military purposes.','EPSG','4816','EPSG','4326','EPSG','1618',NULL,'EPSG-Tun',0);
 INSERT INTO "concatenated_operation" VALUES('EPSG','8637','Lisbon (Lisbon) to WGS 84 (1)','','For applications to an accuracy of 2 metres.','EPSG','4803','EPSG','4326','EPSG','1294',NULL,'EPSG-Prt',1);
 INSERT INTO "concatenated_operation" VALUES('EPSG','8638','Makassar (Jakarta) to WGS 84 (1)','','Oil exploration.','EPSG','4804','EPSG','4326','EPSG','1316',NULL,'EPSG - Idn Sul SW',0);
@@ -210,3 +210,5 @@ INSERT INTO "concatenated_operation" VALUES('EPSG','8656','Mhast (offshore) to W
 INSERT INTO "concatenated_operation" VALUES('EPSG','8657','Egypt Gulf of Suez S-650 TL to WGS 84 (1)','Can be implemented as a single positon vector transformation with parameter vaues of dX = -123.0 m, dY = 98.0 m, dZ = 3.9 m, rX = rY = 0 sec, rZ = 0.814 sec, dS = -0.38 ppm. Replaced by Egypt Gulf of Suez S-650 TL to WGS 84 (2) (tfm code 15846).','Oil industry exploration and production between 1980 and 1984.','EPSG','4706','EPSG','4326','EPSG','2341',NULL,'OGP-Egy GoS',0);
 INSERT INTO "concatenated_operation" VALUES('EPSG','8659','Kertau (RSO) to WGS 84 (1)','Step 1 is necessary to rescale the grid units before using step 2.','For transformation of MRT68 RSO coordinates.','EPSG','4751','EPSG','4326','EPSG','1309',NULL,'OGP-Mys',0);
 INSERT INTO "concatenated_operation" VALUES('EPSG','9103','NAD27 to ITRF2014 (1)','For use with legacy data - see CT code 9104 for alternative for new areas. Note that steps 1 and 2 are documented in the geog2D domain, steps 3 and 4 in the geocentric domain. Steps 3 and 4 may be implemented in one operation using CT code 8970.','Oil and gas exploration and production.','EPSG','4267','EPSG','7789','EPSG','3357',NULL,'IOGP-Usa GoM legacy',0);
+INSERT INTO "concatenated_operation" VALUES('EPSG','9336','NAD27 to NAD83(CSRS)v4 (3)','Can be taken as an approximate transformation NAD27 to WGS 84 - see code 8585.','Accuracy 1-2 metres.','EPSG','4267','EPSG','8246','EPSG','2376',NULL,'EPSG-Can AB',0);
+INSERT INTO "concatenated_operation" VALUES('EPSG','9337','NTF (Paris) to RGF93 (1)','See transformation code 7811 for an alternative which uses the NTv2 method as an emulation of the geocentric interpolation in the second step.','Transformation of coordinates referenced to NTF (Paris) to RGF93.','EPSG','4807','EPSG','4171','EPSG','3694',NULL,'IOGP-Fra',0);

data/sql/concatenated_operation_step.sql

@@ -425,3 +425,7 @@ INSERT INTO "concatenated_operation_step" VALUES('EPSG','9103',1,'EPSG','1241');
 INSERT INTO "concatenated_operation_step" VALUES('EPSG','9103',2,'EPSG','8971');
 INSERT INTO "concatenated_operation_step" VALUES('EPSG','9103',3,'EPSG','7807');
 INSERT INTO "concatenated_operation_step" VALUES('EPSG','9103',4,'EPSG','7790');
+INSERT INTO "concatenated_operation_step" VALUES('EPSG','9336',1,'EPSG','1313');
+INSERT INTO "concatenated_operation_step" VALUES('EPSG','9336',2,'EPSG','9244');
+INSERT INTO "concatenated_operation_step" VALUES('EPSG','9337',1,'EPSG','1763');
+INSERT INTO "concatenated_operation_step" VALUES('EPSG','9337',2,'EPSG','9327');

data/sql/customizations.sql

@@ -135,12 +135,3 @@ INSERT INTO "alias_name" VALUES('geodetic_datum','EPSG','6312','hermannskogel','
 INSERT INTO "alias_name" VALUES('geodetic_datum','EPSG','6299','ire65','PROJ');
 INSERT INTO "alias_name" VALUES('geodetic_datum','EPSG','6272','nzgd49','PROJ');
 INSERT INTO "alias_name" VALUES('geodetic_datum','EPSG','6277','OSGB36','PROJ');
-
----- NTF_PARIS_TO_RGF93_GEOCENTRIC_TRANSLATION -----
-
--- This is a copy of EPSG:7810 (NTF (Paris) to RGF93 (1)) which uses the deprecated EPSG:1053 operation as the second step.
--- We replace it by the non-deprecated EPSG:9327
--- Issue raised to EPSG
-INSERT INTO "concatenated_operation" VALUES('PROJ','NTF_PARIS_TO_RGF93_GEOCENTRIC_TRANSLATION','NTF (Paris) to RGF93 (1)','See transformation code 7811 for an alternative which uses the NTv2 method as an emulation of the geocentric interpolation in the second step.','Approximation to better than 1m of transformation of coordinates referenced to NTF (Paris) to RGF93.','EPSG','4807','EPSG','4171','EPSG','3694',NULL,'',0);
-INSERT INTO "concatenated_operation_step" VALUES('PROJ','NTF_PARIS_TO_RGF93_GEOCENTRIC_TRANSLATION',1,'EPSG','1763');
-INSERT INTO "concatenated_operation_step" VALUES('PROJ','NTF_PARIS_TO_RGF93_GEOCENTRIC_TRANSLATION',2,'EPSG','9327');

data/sql/deprecation.sql

@@ -456,3 +456,10 @@ INSERT INTO "deprecation" VALUES('projected_crs','EPSG','3911','EPSG','8686','EP
 INSERT INTO "deprecation" VALUES('geodetic_crs','EPSG','8449','EPSG','8860','EPSG');
 INSERT INTO "deprecation" VALUES('geodetic_crs','EPSG','4280','EPSG','4211','EPSG');
 INSERT INTO "deprecation" VALUES('geodetic_crs','EPSG','4808','EPSG','4813','EPSG');
+INSERT INTO "deprecation" VALUES('projected_crs','EPSG','2163','EPSG','9311','EPSG');
+INSERT INTO "deprecation" VALUES('projected_crs','EPSG','3408','EPSG','6931','EPSG');
+INSERT INTO "deprecation" VALUES('projected_crs','EPSG','3409','EPSG','6932','EPSG');
+INSERT INTO "deprecation" VALUES('projected_crs','EPSG','3410','EPSG','6933','EPSG');
+INSERT INTO "deprecation" VALUES('projected_crs','EPSG','3411','EPSG','3413','EPSG');
+INSERT INTO "deprecation" VALUES('projected_crs','EPSG','3412','EPSG','3976','EPSG');
+INSERT INTO "deprecation" VALUES('projected_crs','EPSG','4088','EPSG','4087','EPSG');

data/sql/geodetic_crs.sql

@@ -10,53 +10,53 @@ INSERT INTO "geodetic_crs" VALUES('EPSG','3888','IGRS',NULL,NULL,'geographic 3D'
 INSERT INTO "geodetic_crs" VALUES('EPSG','3889','IGRS',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','1029','EPSG','1124',NULL,0);
 INSERT INTO "geodetic_crs" VALUES('EPSG','3906','MGI 1901',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','1031','EPSG','2370',NULL,0);
 INSERT INTO "geodetic_crs" VALUES('EPSG','4000','MOLDREF99',NULL,NULL,'geocentric','EPSG','6500','EPSG','1032','EPSG','1162',NULL,0);
-INSERT INTO "geodetic_crs" VALUES('EPSG','4001','Unknown datum based upon the Airy 1830 ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6001','EPSG','1263',NULL,0);
-INSERT INTO "geodetic_crs" VALUES('EPSG','4002','Unknown datum based upon the Airy Modified 1849 ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6002','EPSG','1263',NULL,0);
-INSERT INTO "geodetic_crs" VALUES('EPSG','4003','Unknown datum based upon the Australian National Spheroid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6003','EPSG','1263',NULL,0);
-INSERT INTO "geodetic_crs" VALUES('EPSG','4004','Unknown datum based upon the Bessel 1841 ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6004','EPSG','1263',NULL,0);
-INSERT INTO "geodetic_crs" VALUES('EPSG','4005','Unknown datum based upon the Bessel Modified ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6005','EPSG','1263',NULL,0);
-INSERT INTO "geodetic_crs" VALUES('EPSG','4006','Unknown datum based upon the Bessel Namibia ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6006','EPSG','1263',NULL,0);
-INSERT INTO "geodetic_crs" VALUES('EPSG','4007','Unknown datum based upon the Clarke 1858 ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6007','EPSG','1263',NULL,0);
-INSERT INTO "geodetic_crs" VALUES('EPSG','4008','Unknown datum based upon the Clarke 1866 ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6008','EPSG','1263',NULL,0);
+INSERT INTO "geodetic_crs" VALUES('EPSG','4001','Unknown datum based upon the Airy 1830 ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6001','EPSG','1263',NULL,1);
+INSERT INTO "geodetic_crs" VALUES('EPSG','4002','Unknown datum based upon the Airy Modified 1849 ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6002','EPSG','1263',NULL,1);
+INSERT INTO "geodetic_crs" VALUES('EPSG','4003','Unknown datum based upon the Australian National Spheroid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6003','EPSG','1263',NULL,1);
+INSERT INTO "geodetic_crs" VALUES('EPSG','4004','Unknown datum based upon the Bessel 1841 ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6004','EPSG','1263',NULL,1);
+INSERT INTO "geodetic_crs" VALUES('EPSG','4005','Unknown datum based upon the Bessel Modified ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6005','EPSG','1263',NULL,1);
+INSERT INTO "geodetic_crs" VALUES('EPSG','4006','Unknown datum based upon the Bessel Namibia ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6006','EPSG','1263',NULL,1);
+INSERT INTO "geodetic_crs" VALUES('EPSG','4007','Unknown datum based upon the Clarke 1858 ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6007','EPSG','1263',NULL,1);
+INSERT INTO "geodetic_crs" VALUES('EPSG','4008','Unknown datum based upon the Clarke 1866 ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6008','EPSG','1263',NULL,1);
 INSERT INTO "geodetic_crs" VALUES('EPSG','4009','Unknown datum based upon the Clarke 1866 Michigan ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6009','EPSG','1263',NULL,1);
-INSERT INTO "geodetic_crs" VALUES('EPSG','4010','Unknown datum based upon the Clarke 1880 (Benoit) ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6010','EPSG','1263',NULL,0);
-INSERT INTO "geodetic_crs" VALUES('EPSG','4011','Unknown datum based upon the Clarke 1880 (IGN) ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6011','EPSG','1263',NULL,0);
-INSERT INTO "geodetic_crs" VALUES('EPSG','4012','Unknown datum based upon the Clarke 1880 (RGS) ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6012','EPSG','1263',NULL,0);
-INSERT INTO "geodetic_crs" VALUES('EPSG','4013','Unknown datum based upon the Clarke 1880 (Arc) ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6013','EPSG','1263',NULL,0);
-INSERT INTO "geodetic_crs" VALUES('EPSG','4014','Unknown datum based upon the Clarke 1880 (SGA 1922) ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6014','EPSG','1263',NULL,0);
-INSERT INTO "geodetic_crs" VALUES('EPSG','4015','Unknown datum based upon the Everest 1830 (1937 Adjustment) ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6015','EPSG','1263',NULL,0);
-INSERT INTO "geodetic_crs" VALUES('EPSG','4016','Unknown datum based upon the Everest 1830 (1967 Definition) ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6016','EPSG','1263',NULL,0);
+INSERT INTO "geodetic_crs" VALUES('EPSG','4010','Unknown datum based upon the Clarke 1880 (Benoit) ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6010','EPSG','1263',NULL,1);
+INSERT INTO "geodetic_crs" VALUES('EPSG','4011','Unknown datum based upon the Clarke 1880 (IGN) ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6011','EPSG','1263',NULL,1);
+INSERT INTO "geodetic_crs" VALUES('EPSG','4012','Unknown datum based upon the Clarke 1880 (RGS) ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6012','EPSG','1263',NULL,1);
+INSERT INTO "geodetic_crs" VALUES('EPSG','4013','Unknown datum based upon the Clarke 1880 (Arc) ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6013','EPSG','1263',NULL,1);
+INSERT INTO "geodetic_crs" VALUES('EPSG','4014','Unknown datum based upon the Clarke 1880 (SGA 1922) ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6014','EPSG','1263',NULL,1);
+INSERT INTO "geodetic_crs" VALUES('EPSG','4015','Unknown datum based upon the Everest 1830 (1937 Adjustment) ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6015','EPSG','1263',NULL,1);
+INSERT INTO "geodetic_crs" VALUES('EPSG','4016','Unknown datum based upon the Everest 1830 (1967 Definition) ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6016','EPSG','1263',NULL,1);
 INSERT INTO "geodetic_crs" VALUES('EPSG','4017','MOLDREF99',NULL,NULL,'geographic 3D','EPSG','6423','EPSG','1032','EPSG','1162',NULL,0);
-INSERT INTO "geodetic_crs" VALUES('EPSG','4018','Unknown datum based upon the Everest 1830 Modified ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6018','EPSG','1263',NULL,0);
-INSERT INTO "geodetic_crs" VALUES('EPSG','4019','Unknown datum based upon the GRS 1980 ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6019','EPSG','1263',NULL,0);
-INSERT INTO "geodetic_crs" VALUES('EPSG','4020','Unknown datum based upon the Helmert 1906 ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6020','EPSG','1263',NULL,0);
-INSERT INTO "geodetic_crs" VALUES('EPSG','4021','Unknown datum based upon the Indonesian National Spheroid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6021','EPSG','1263',NULL,0);
-INSERT INTO "geodetic_crs" VALUES('EPSG','4022','Unknown datum based upon the International 1924 ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6022','EPSG','1263',NULL,0);
+INSERT INTO "geodetic_crs" VALUES('EPSG','4018','Unknown datum based upon the Everest 1830 Modified ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6018','EPSG','1263',NULL,1);
+INSERT INTO "geodetic_crs" VALUES('EPSG','4019','Unknown datum based upon the GRS 1980 ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6019','EPSG','1263',NULL,1);
+INSERT INTO "geodetic_crs" VALUES('EPSG','4020','Unknown datum based upon the Helmert 1906 ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6020','EPSG','1263',NULL,1);
+INSERT INTO "geodetic_crs" VALUES('EPSG','4021','Unknown datum based upon the Indonesian National Spheroid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6021','EPSG','1263',NULL,1);
+INSERT INTO "geodetic_crs" VALUES('EPSG','4022','Unknown datum based upon the International 1924 ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6022','EPSG','1263',NULL,1);
 INSERT INTO "geodetic_crs" VALUES('EPSG','4023','MOLDREF99',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','1032','EPSG','1162',NULL,0);
-INSERT INTO "geodetic_crs" VALUES('EPSG','4024','Unknown datum based upon the Krassowsky 1940 ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6024','EPSG','1263',NULL,0);
-INSERT INTO "geodetic_crs" VALUES('EPSG','4025','Unknown datum based upon the NWL 9D ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6025','EPSG','1263',NULL,0);
-INSERT INTO "geodetic_crs" VALUES('EPSG','4027','Unknown datum based upon the Plessis 1817 ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6027','EPSG','1263',NULL,0);
-INSERT INTO "geodetic_crs" VALUES('EPSG','4028','Unknown datum based upon the Struve 1860 ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6028','EPSG','1263',NULL,0);
-INSERT INTO "geodetic_crs" VALUES('EPSG','4029','Unknown datum based upon the War Office ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6029','EPSG','1263',NULL,0);
-INSERT INTO "geodetic_crs" VALUES('EPSG','4030','Unknown datum based upon the WGS 84 ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6030','EPSG','1263',NULL,0);
-INSERT INTO "geodetic_crs" VALUES('EPSG','4031','Unknown datum based upon the GEM 10C ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6031','EPSG','1263',NULL,0);
-INSERT INTO "geodetic_crs" VALUES('EPSG','4032','Unknown datum based upon the OSU86F ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6032','EPSG','1263',NULL,0);
-INSERT INTO "geodetic_crs" VALUES('EPSG','4033','Unknown datum based upon the OSU91A ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6033','EPSG','1263',NULL,0);
-INSERT INTO "geodetic_crs" VALUES('EPSG','4034','Unknown datum based upon the Clarke 1880 ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6034','EPSG','1263',NULL,0);
+INSERT INTO "geodetic_crs" VALUES('EPSG','4024','Unknown datum based upon the Krassowsky 1940 ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6024','EPSG','1263',NULL,1);
+INSERT INTO "geodetic_crs" VALUES('EPSG','4025','Unknown datum based upon the NWL 9D ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6025','EPSG','1263',NULL,1);
+INSERT INTO "geodetic_crs" VALUES('EPSG','4027','Unknown datum based upon the Plessis 1817 ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6027','EPSG','1263',NULL,1);
+INSERT INTO "geodetic_crs" VALUES('EPSG','4028','Unknown datum based upon the Struve 1860 ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6028','EPSG','1263',NULL,1);
+INSERT INTO "geodetic_crs" VALUES('EPSG','4029','Unknown datum based upon the War Office ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6029','EPSG','1263',NULL,1);
+INSERT INTO "geodetic_crs" VALUES('EPSG','4030','Unknown datum based upon the WGS 84 ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6030','EPSG','1263',NULL,1);
+INSERT INTO "geodetic_crs" VALUES('EPSG','4031','Unknown datum based upon the GEM 10C ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6031','EPSG','1263',NULL,1);
+INSERT INTO "geodetic_crs" VALUES('EPSG','4032','Unknown datum based upon the OSU86F ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6032','EPSG','1263',NULL,1);
+INSERT INTO "geodetic_crs" VALUES('EPSG','4033','Unknown datum based upon the OSU91A ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6033','EPSG','1263',NULL,1);
+INSERT INTO "geodetic_crs" VALUES('EPSG','4034','Unknown datum based upon the Clarke 1880 ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6034','EPSG','1263',NULL,1);
 INSERT INTO "geodetic_crs" VALUES('EPSG','4035','Unknown datum based upon the Authalic Sphere',NULL,NULL,'geographic 2D','EPSG','6402','EPSG','6035','EPSG','1263',NULL,1);
-INSERT INTO "geodetic_crs" VALUES('EPSG','4036','Unknown datum based upon the GRS 1967 ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6036','EPSG','1263',NULL,0);
+INSERT INTO "geodetic_crs" VALUES('EPSG','4036','Unknown datum based upon the GRS 1967 ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6036','EPSG','1263',NULL,1);
 INSERT INTO "geodetic_crs" VALUES('EPSG','4039','RGRDC 2005',NULL,NULL,'geocentric','EPSG','6500','EPSG','1033','EPSG','3613',NULL,0);
 INSERT INTO "geodetic_crs" VALUES('EPSG','4040','RGRDC 2005',NULL,NULL,'geographic 3D','EPSG','6423','EPSG','1033','EPSG','3613',NULL,0);
-INSERT INTO "geodetic_crs" VALUES('EPSG','4041','Unknown datum based upon the Average Terrestrial System 1977 ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6041','EPSG','1263',NULL,0);
-INSERT INTO "geodetic_crs" VALUES('EPSG','4042','Unknown datum based upon the Everest (1830 Definition) ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6042','EPSG','1263',NULL,0);
-INSERT INTO "geodetic_crs" VALUES('EPSG','4043','Unknown datum based upon the WGS 72 ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6043','EPSG','1263',NULL,0);
-INSERT INTO "geodetic_crs" VALUES('EPSG','4044','Unknown datum based upon the Everest 1830 (1962 Definition) ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6044','EPSG','1263',NULL,0);
-INSERT INTO "geodetic_crs" VALUES('EPSG','4045','Unknown datum based upon the Everest 1830 (1975 Definition) ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6045','EPSG','1263',NULL,0);
+INSERT INTO "geodetic_crs" VALUES('EPSG','4041','Unknown datum based upon the Average Terrestrial System 1977 ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6041','EPSG','1263',NULL,1);
+INSERT INTO "geodetic_crs" VALUES('EPSG','4042','Unknown datum based upon the Everest (1830 Definition) ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6042','EPSG','1263',NULL,1);
+INSERT INTO "geodetic_crs" VALUES('EPSG','4043','Unknown datum based upon the WGS 72 ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6043','EPSG','1263',NULL,1);
+INSERT INTO "geodetic_crs" VALUES('EPSG','4044','Unknown datum based upon the Everest 1830 (1962 Definition) ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6044','EPSG','1263',NULL,1);
+INSERT INTO "geodetic_crs" VALUES('EPSG','4045','Unknown datum based upon the Everest 1830 (1975 Definition) ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6045','EPSG','1263',NULL,1);
 INSERT INTO "geodetic_crs" VALUES('EPSG','4046','RGRDC 2005',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','1033','EPSG','3613',NULL,0);
-INSERT INTO "geodetic_crs" VALUES('EPSG','4047','Unspecified datum based upon the GRS 1980 Authalic Sphere',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6047','EPSG','1263',NULL,0);
-INSERT INTO "geodetic_crs" VALUES('EPSG','4052','Unspecified datum based upon the Clarke 1866 Authalic Sphere',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6052','EPSG','1263',NULL,0);
-INSERT INTO "geodetic_crs" VALUES('EPSG','4053','Unspecified datum based upon the International 1924 Authalic Sphere',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6053','EPSG','1263',NULL,0);
-INSERT INTO "geodetic_crs" VALUES('EPSG','4054','Unspecified datum based upon the Hughes 1980 ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6054','EPSG','1263',NULL,0);
+INSERT INTO "geodetic_crs" VALUES('EPSG','4047','Unspecified datum based upon the GRS 1980 Authalic Sphere',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6047','EPSG','1263',NULL,1);
+INSERT INTO "geodetic_crs" VALUES('EPSG','4052','Unspecified datum based upon the Clarke 1866 Authalic Sphere',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6052','EPSG','1263',NULL,1);
+INSERT INTO "geodetic_crs" VALUES('EPSG','4053','Unspecified datum based upon the International 1924 Authalic Sphere',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6053','EPSG','1263',NULL,1);
+INSERT INTO "geodetic_crs" VALUES('EPSG','4054','Unspecified datum based upon the Hughes 1980 ellipsoid',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6054','EPSG','1263',NULL,1);
 INSERT INTO "geodetic_crs" VALUES('EPSG','4055','Popular Visualisation CRS',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6055','EPSG','1262',NULL,1);
 INSERT INTO "geodetic_crs" VALUES('EPSG','4073','SREF98',NULL,NULL,'geocentric','EPSG','6500','EPSG','1034','EPSG','4543',NULL,0);
 INSERT INTO "geodetic_crs" VALUES('EPSG','4074','SREF98',NULL,NULL,'geographic 3D','EPSG','6423','EPSG','1034','EPSG','4543',NULL,0);
@@ -201,7 +201,7 @@ INSERT INTO "geodetic_crs" VALUES('EPSG','4257','Makassar',NULL,NULL,'geographic
 INSERT INTO "geodetic_crs" VALUES('EPSG','4258','ETRS89',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6258','EPSG','1298',NULL,0);
 INSERT INTO "geodetic_crs" VALUES('EPSG','4259','Malongo 1987',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6259','EPSG','3180',NULL,0);
 INSERT INTO "geodetic_crs" VALUES('EPSG','4260','Manoca',NULL,NULL,'geographic 2D','EPSG','6402','EPSG','6260','EPSG','1060',NULL,1);
-INSERT INTO "geodetic_crs" VALUES('EPSG','4261','Merchich',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6261','EPSG','3280',NULL,0);
+INSERT INTO "geodetic_crs" VALUES('EPSG','4261','Merchich',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6261','EPSG','4581',NULL,0);
 INSERT INTO "geodetic_crs" VALUES('EPSG','4262','Massawa',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6262','EPSG','1089',NULL,0);
 INSERT INTO "geodetic_crs" VALUES('EPSG','4263','Minna',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6263','EPSG','1178',NULL,0);
 INSERT INTO "geodetic_crs" VALUES('EPSG','4264','Mhast',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','6264','EPSG','1318',NULL,1);
@@ -1031,6 +1031,9 @@ INSERT INTO "geodetic_crs" VALUES('EPSG','9251','MMN',NULL,NULL,'geographic 2D',
 INSERT INTO "geodetic_crs" VALUES('EPSG','9253','MMS',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','1259','EPSG','2357',NULL,0);
 INSERT INTO "geodetic_crs" VALUES('EPSG','9266','MGI',NULL,NULL,'geocentric','EPSG','6500','EPSG','6312','EPSG','1037',NULL,0);
 INSERT INTO "geodetic_crs" VALUES('EPSG','9267','MGI',NULL,NULL,'geographic 3D','EPSG','6423','EPSG','6312','EPSG','1037',NULL,0);
+INSERT INTO "geodetic_crs" VALUES('EPSG','9292','ONGD17',NULL,NULL,'geocentric','EPSG','6500','EPSG','1263','EPSG','1183',NULL,0);
+INSERT INTO "geodetic_crs" VALUES('EPSG','9293','ONGD17',NULL,NULL,'geographic 3D','EPSG','6423','EPSG','1263','EPSG','1183',NULL,0);
+INSERT INTO "geodetic_crs" VALUES('EPSG','9294','ONGD17',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','1263','EPSG','1183',NULL,0);
 INSERT INTO "geodetic_crs" VALUES('EPSG','9331','KSA-GRF17',NULL,NULL,'geocentric','EPSG','6500','EPSG','1268','EPSG','1206',NULL,0);
 INSERT INTO "geodetic_crs" VALUES('EPSG','9332','KSA-GRF17',NULL,NULL,'geographic 3D','EPSG','6423','EPSG','1268','EPSG','1206',NULL,0);
 INSERT INTO "geodetic_crs" VALUES('EPSG','9333','KSA-GRF17',NULL,NULL,'geographic 2D','EPSG','6422','EPSG','1268','EPSG','1206',NULL,0);

data/sql/geodetic_datum.sql

@@ -151,6 +151,7 @@ INSERT INTO "geodetic_datum" VALUES('EPSG','1254','SIRGAS-Chile',NULL,NULL,'EPSG
 INSERT INTO "geodetic_datum" VALUES('EPSG','1257','Tapi Aike',NULL,NULL,'EPSG','7022','EPSG','8901','EPSG','4569','1945-01-01',0);
 INSERT INTO "geodetic_datum" VALUES('EPSG','1258','Ministerio de Marina Norte',NULL,NULL,'EPSG','7022','EPSG','8901','EPSG','2357',NULL,0);
 INSERT INTO "geodetic_datum" VALUES('EPSG','1259','Ministerio de Marina Sur',NULL,NULL,'EPSG','7022','EPSG','8901','EPSG','2357',NULL,0);
+INSERT INTO "geodetic_datum" VALUES('EPSG','1263','Oman National Geodetic Datum 2017',NULL,NULL,'EPSG','7019','EPSG','8901','EPSG','1183','2017-11-01',0);
 INSERT INTO "geodetic_datum" VALUES('EPSG','1268','Kingdom of Saudi Arabia Geodetic Reference Frame 2017',NULL,NULL,'EPSG','7019','EPSG','8901','EPSG','1206','2017-12-01',0);
 INSERT INTO "geodetic_datum" VALUES('EPSG','6001','Not specified (based on Airy 1830 ellipsoid)',NULL,NULL,'EPSG','7001','EPSG','8901','EPSG','1263',NULL,0);
 INSERT INTO "geodetic_datum" VALUES('EPSG','6002','Not specified (based on Airy Modified 1849 ellipsoid)',NULL,NULL,'EPSG','7002','EPSG','8901','EPSG','1263',NULL,0);

data/sql/grid_alternatives.sql

@@ -136,6 +136,8 @@ VALUES
 -- Portugal
 ('DLx_ETRS89_geo.gsb','pt_dgt_DLx_ETRS89_geo.tif','DLx_ETRS89_geo.gsb','GTiff','hgridshift',0,NULL,'https://cdn.proj.org/pt_dgt_DLx_ETRS89_geo.tif',1,1,NULL),
 ('D73_ETRS89_geo.gsb','pt_dgt_D73_ETRS89_geo.tif','D73_ETRS89_geo.gsb','GTiff','hgridshift',0,NULL,'https://cdn.proj.org/pt_dgt_D73_ETRS89_geo.tif',1,1,NULL),
+('portugal/DLX_ETRS89_geo','pt_dgt_DLx_ETRS89_geo.tif','DLx_ETRS89_geo.gsb','GTiff','hgridshift',0,NULL,'https://cdn.proj.org/pt_dgt_DLx_ETRS89_geo.tif',1,1,NULL),
+('portugal/D73_ETRS89_geo','pt_dgt_D73_ETRS89_geo.tif','D73_ETRS89_geo.gsb','GTiff','hgridshift',0,NULL,'https://cdn.proj.org/pt_dgt_D73_ETRS89_geo.tif',1,1,NULL),
 -- Canada provincial grids
 ('AB_CSRS.DAC','ca_nrc_ABCSRSV4.tif','ABCSRSV4.GSB','GTiff','hgridshift',0,NULL,'https://cdn.proj.org/ca_nrc_ABCSRSV4.tif',1,1,NULL),
 ('CRD27_00.GSB','ca_nrc_CRD27_00.tif','CRD27_00.GSB','GTiff','hgridshift',0,NULL,'https://cdn.proj.org/ca_nrc_CRD27_00.tif',1,1,NULL),
@@ -176,6 +178,8 @@ VALUES
 ('Icegeoid_ISN2016.gtx','is_lmi_Icegeoid_ISN2016.tif','Icegeoid_ISN2016.gtx','GTiff','geoid_like',0,NULL,'https://cdn.proj.org/is_lmi_Icegeoid_ISN2016.tif',1,1,NULL),
 -- New Zealand grid shift models.
 ('auckland-1946-to-nzvd2016-conversion.csv','nz_linz_auckht1946-nzvd2016.tif','auckht1946-nzvd2016.gtx','GTiff','vgridshift',0,NULL,'https://cdn.proj.org/nz_linz_auckht1946-nzvd2016.tif',1,1,NULL),
+-- Slovakia
+('Slovakia_JTSK03_to_JTSK.LAS','sk_gku_JTSK03_to_JTSK.tif',NULL,'GTiff','hgridshift',0,NULL,'https://cdn.proj.org/sk_gku_JTSK03_to_JTSK.tif',1,1,NULL),
 -- Superseded entries
 ('bluff-1955-to-nzvd2016-conversion.csv','nz_linz_blufht1955-nzvd2016.tif','blufht1955-nzvd2016.gtx','GTiff','vgridshift',0,NULL,'https://cdn.proj.org/nz_linz_blufht1955-nzvd2016.tif',1,1,NULL),
 ('dunedin-1958-to-nzvd2016-conversion.csv','nz_linz_duneht1958-nzvd2016.tif','duneht1958-nzvd2016.gtx','GTiff','vgridshift',0,NULL,'https://cdn.proj.org/nz_linz_duneht1958-nzvd2016.tif',1,1,NULL),

data/sql/grid_transformation.sql

@@ -214,12 +214,12 @@ INSERT INTO "grid_transformation" VALUES('EPSG','7673','CH1903 to CHTRF95 (1)','
 INSERT INTO "grid_transformation" VALUES('EPSG','7674','CH1903 to ETRS89 (2)','Replaces tfm code 1646. Equivalent to concatenation of transformations 15486 and 1647 to within 2cm. Also used as transformation between CH1903 and CHTRF95 (see code 7673). May be used as approximate tfm CH1903 to WGS 84 - see code 7788.','Approximation (to better than 2cm) using NTv2 method of results of FINELTRA programme concatenated with LV-95 parameters.','EPSG','9615','NTv2','EPSG','4149','EPSG','4258','EPSG','1286',0.25,'EPSG','8656','Latitude and longitude difference file','CHENyx06_ETRS.gsb',NULL,NULL,NULL,NULL,NULL,NULL,'BfL-Che NTv2',0);
 INSERT INTO "grid_transformation" VALUES('EPSG','7709','OSGB 1936 to ETRS89 (2)','Approximate alternative to official OSTN15 method (tfm code 7953). May be taken as approximate transformation OSGB 1936 to WGS 84 - see code 7710. Replaces OSGB 1936 to ETRS89 (1) (tfm code 5338).','Accuracy at 2000 test points compared to official OSTN15 (tfm code 7708): latitude 0.5mm average, 17mm maximum; longitude 0.8mm average, 23mm maximum.','EPSG','9615','NTv2','EPSG','4277','EPSG','4258','EPSG','4390',0.03,'EPSG','8656','Latitude and longitude difference file','OSTN15_NTv2_OSGBtoETRS.gsb',NULL,NULL,NULL,NULL,NULL,NULL,'OSGB-UK Gbr15 NT',0);
 INSERT INTO "grid_transformation" VALUES('EPSG','7710','OSGB 1936 to WGS 84 (9)','Parameter values taken from OSGB 1936 to ETRS89 (3) (tfm code 7709) assuming that ETRS89 is coincident with WGS 84 within the accuracy of the tfm. Replaces OSGB 1936 to WGS 84 (7) (tfm code 5339).','Accuracy 1m.','EPSG','9615','NTv2','EPSG','4277','EPSG','4326','EPSG','4390',1.0,'EPSG','8656','Latitude and longitude difference file','OSTN15_NTv2_OSGBtoETRS.gsb',NULL,NULL,NULL,NULL,NULL,NULL,'OGP-UK Gbr15 NT',0);
-INSERT INTO "grid_transformation" VALUES('EPSG','7711','ETRS89 to Newlyn height (2)','OSGM15 supersedes OSGM02 geoid model. Replaces ETRS89 to Newlyn height (1) (tfm code 10021).','Derivation of gravity-related heights from OSGM15 geoid model.','EPSG','9663','Geographic3D to GravityRelatedHeight (OSGM-GB)','EPSG','4937','EPSG','5701','EPSG','2792',0.008,'EPSG','8666','Geoid (height correction) model file','OSTN15_OSGM15_GB.txt',NULL,NULL,NULL,NULL,NULL,NULL,'OS-UK Gbr 2015',0);
-INSERT INTO "grid_transformation" VALUES('EPSG','7712','ETRS89 to Newlyn (Orkney Isles) height (2)','OSGM15 supersedes OSGM02 geoid model. Replaces ETRS89 to Newlyn (Orkney Isles) height (1) (tfm code 10029).','Derivation of gravity-related heights from OSGM15 geoid model.','EPSG','9663','Geographic3D to GravityRelatedHeight (OSGM-GB)','EPSG','4937','EPSG','5740','EPSG','2793',0.017,'EPSG','8666','Geoid (height correction) model file','OSTN15_OSGM15_GB.txt',NULL,NULL,NULL,NULL,NULL,NULL,'OS-UK Ork 2015',0);
-INSERT INTO "grid_transformation" VALUES('EPSG','7713','ETRS89 to Newlyn (Offshore) height (1)','Replaces ETRS89 to Fair Isle/Flannan Isles/Foula/North Rona/St Kilda/Sule Skerry height (1) (tfm codes 10024-26, 10030-31 and 10034).','Derivation of gravity-related heights from OSGM15 geoid model.','EPSG','9663','Geographic3D to GravityRelatedHeight (OSGM-GB)','EPSG','4937','EPSG','7707','EPSG','4391',0.02,'EPSG','8666','Geoid (height correction) model file','OSTN15_OSGM15_GB.txt',NULL,NULL,NULL,NULL,NULL,NULL,'OS-UK Off 2015',0);
+INSERT INTO "grid_transformation" VALUES('EPSG','7711','ETRS89 to ODN height (2)','OSGM15 supersedes OSGM02 geoid model. Replaces ETRS89 to Newlyn height (1) (tfm code 10021).','Derivation of gravity-related heights from OSGM15 geoid model.','EPSG','9663','Geographic3D to GravityRelatedHeight (OSGM-GB)','EPSG','4937','EPSG','5701','EPSG','2792',0.008,'EPSG','8666','Geoid (height correction) model file','OSTN15_OSGM15_GB.txt',NULL,NULL,NULL,NULL,NULL,NULL,'OS-UK Gbr 2015',0);
+INSERT INTO "grid_transformation" VALUES('EPSG','7712','ETRS89 to ODN Orkney height (2)','OSGM15 supersedes OSGM02 geoid model. Replaces ETRS89 to ODN Orkney height (1) (tfm code 10029).','Derivation of gravity-related heights from OSGM15 geoid model.','EPSG','9663','Geographic3D to GravityRelatedHeight (OSGM-GB)','EPSG','4937','EPSG','5740','EPSG','2793',0.017,'EPSG','8666','Geoid (height correction) model file','OSTN15_OSGM15_GB.txt',NULL,NULL,NULL,NULL,NULL,NULL,'OS-UK Ork 2015',0);
+INSERT INTO "grid_transformation" VALUES('EPSG','7713','ETRS89 to ODN (Offshore) height (1)','Replaces ETRS89 to Fair Isle/Flannan Isles/Foula/North Rona/St Kilda/Sule Skerry height (1) (tfm codes 10024-26, 10030-31 and 10034).','Derivation of gravity-related heights from OSGM15 geoid model.','EPSG','9663','Geographic3D to GravityRelatedHeight (OSGM-GB)','EPSG','4937','EPSG','7707','EPSG','4391',0.02,'EPSG','8666','Geoid (height correction) model file','OSTN15_OSGM15_GB.txt',NULL,NULL,NULL,NULL,NULL,NULL,'OS-UK Off 2015',0);
 INSERT INTO "grid_transformation" VALUES('EPSG','7714','ETRS89 to Lerwick height (2)','OSGM15 supersedes OSGM02 geoid model. Replaces ETRS89 to Lerwick height (1) (tfm code 10027).','Derivation of gravity-related heights from OSGM15 geoid model.','EPSG','9663','Geographic3D to GravityRelatedHeight (OSGM-GB)','EPSG','4937','EPSG','5742','EPSG','2795',0.018,'EPSG','8666','Geoid (height correction) model file','OSTN15_OSGM15_GB.txt',NULL,NULL,NULL,NULL,NULL,NULL,'OS -UK Shet 2015',0);
 INSERT INTO "grid_transformation" VALUES('EPSG','7715','ETRS89 to Stornoway height (2)','OSGM15 supersedes OSGM02 geoid model. Replaces ETRS89 to Stornaway height (1) (tfm code 10033).','Derivation of gravity-related heights from OSGM15 geoid model.','EPSG','9663','Geographic3D to GravityRelatedHeight (OSGM-GB)','EPSG','4937','EPSG','5746','EPSG','2799',0.011,'EPSG','8666','Geoid (height correction) model file','OSTN15_OSGM15_GB.txt',NULL,NULL,NULL,NULL,NULL,NULL,'OS-UK Heb 2015',0);
-INSERT INTO "grid_transformation" VALUES('EPSG','7716','ETRS89 to St. Marys height (2)','OSGM15 supersedes OSGM02 geoid model. Replaces ETRS89 to St Marys height (1) (tfm code 10032).','Derivation of gravity-related heights from OSGM15 geoid model.','EPSG','9663','Geographic3D to GravityRelatedHeight (OSGM-GB)','EPSG','4937','EPSG','5749','EPSG','2802',0.01,'EPSG','8666','Geoid (height correction) model file','OSTN15_OSGM15_GB.txt',NULL,NULL,NULL,NULL,NULL,NULL,'OS-UK Scilly 2015',0);
+INSERT INTO "grid_transformation" VALUES('EPSG','7716','ETRS89 to St. Marys height (2)','OSGM15 supersedes OSGM02 geoid model. Replaces ETRS89 to St. Marys height (1) (tfm code 10032).','Derivation of gravity-related heights from OSGM15 geoid model.','EPSG','9663','Geographic3D to GravityRelatedHeight (OSGM-GB)','EPSG','4937','EPSG','5749','EPSG','2802',0.01,'EPSG','8666','Geoid (height correction) model file','OSTN15_OSGM15_GB.txt',NULL,NULL,NULL,NULL,NULL,NULL,'OS-UK Scilly 2015',0);
 INSERT INTO "grid_transformation" VALUES('EPSG','7717','ETRS89 to Douglas height (2)','OSGM15 supersedes OSGM02 geoid model. Replaces ETRS89 to Douglas height (1) (tfm code 10023).','Derivation of gravity-related heights from OSGM15 geoid model.','EPSG','9663','Geographic3D to GravityRelatedHeight (OSGM-GB)','EPSG','4937','EPSG','5750','EPSG','2803',0.03,'EPSG','8666','Geoid (height correction) model file','OSTN15_OSGM15_GB.txt',NULL,NULL,NULL,NULL,NULL,NULL,'OS-UK Man 2015',0);
 INSERT INTO "grid_transformation" VALUES('EPSG','7718','ETRS89 to Belfast height (2)','OSGM15 supersedes OSGM02 geoid model. Replaces ETRS89 to Belfast height (1) (tfm code 5334).','Derivation of gravity-related heights from OSGM15 geoid model.','EPSG','1045','Geographic3D to GravityRelatedHeight (OSGM02-Ire)','EPSG','4937','EPSG','5732','EPSG','2530',0.014,'EPSG','8666','Geoid (height correction) model file','OSGM15_Belfast.gri',NULL,NULL,NULL,NULL,NULL,NULL,'OS-UK NI 2015',1);
 INSERT INTO "grid_transformation" VALUES('EPSG','7719','ETRS89 to Malin Head height (2)','OSGM15 supersedes OSGM02 geoid model. Replaces ETRS89 to Malin Head height (1) (tfm code 5335).','Derivation of gravity-related heights from OSGM15 geoid model.','EPSG','1045','Geographic3D to GravityRelatedHeight (OSGM02-Ire)','EPSG','4937','EPSG','5731','EPSG','1305',0.023,'EPSG','8666','Geoid (height correction) model file','OSGM15_Malin.gri',NULL,NULL,NULL,NULL,NULL,NULL,'OS-Ire 2015',1);
@@ -349,6 +349,7 @@ INSERT INTO "grid_transformation" VALUES('EPSG','9278','ETRS89 to GHA Austria he
 INSERT INTO "grid_transformation" VALUES('EPSG','9280','ITRF2005 to SA LLD height (1)','Hybrid geoid referenced to ITRF2005@2010.02. Accuracy 7cm at 1 sigma.','Derivation of gravity-related heights from GNSS observations.','EPSG','1082','Geographic3D to GravityRelatedHeight (SA 2010)','EPSG','7910','EPSG','9279','EPSG','3309',0.07,'EPSG','8666','Geoid (height correction) model file','SAGEOID2010.dat',NULL,NULL,NULL,NULL,NULL,NULL,'NGI-Zaf',0);
 INSERT INTO "grid_transformation" VALUES('EPSG','9282','Amersfoort to ETRS89 (9)','Consistent to within 1mm with official RNAPTRANS(TM)2018 at ground level onshore and at MSL offshore. The horizontal deviation using this NTv2 grid is approximately 1mm per 50m height difference from ground level or MSL.','Approximation of horizontal component of official 3D RDNAPTRANS(TM) transformation, which since 1st October 2000 has defined Amersfoort geodetic datum.','EPSG','9615','NTv2','EPSG','4289','EPSG','4258','EPSG','1275',0.001,'EPSG','8656','Latitude and longitude difference file','rdtrans2018.gsb',NULL,NULL,NULL,NULL,NULL,NULL,'NSGI-Nld 2018',0);
 INSERT INTO "grid_transformation" VALUES('EPSG','9283','ETRS89 to NAP height (2)','Vertical component of official RDNAPTRANS(TM)2018 procedure. Replaces previous versions of RDNAPTRANS.','Derivation of gravity-related heights from GPS observations.','EPSG','9665','Geographic3D to GravityRelatedHeight (gtx)','EPSG','4937','EPSG','5709','EPSG','1275',0.001,'EPSG','8666','Geoid (height correction) model file','nlgeo2018.gtx',NULL,NULL,NULL,NULL,NULL,NULL,'NSGI-Nld 2018',0);
+INSERT INTO "grid_transformation" VALUES('EPSG','9310','DHDN to ETRS89 (10)','Replaces SeTa2009 from 2018-01-15. Derived using the 2016 implementation of ETRS89 / DREF91 and DHHN2016. Coincident with the transformation of cadastral data from DHDN to ETRS89 used by LVGL at a level of 1-2 mm.','Cadastre, engineering survey, topographic mapping (large scale).','EPSG','9615','NTv2','EPSG','4314','EPSG','4258','EPSG','4584',0.01,'EPSG','8656','Latitude and longitude difference file','SeTa2016.gsb',NULL,NULL,NULL,NULL,NULL,NULL,'LVGL-Deu SL 2016',0);
 INSERT INTO "grid_transformation" VALUES('EPSG','9312','NZVD2016 height to Auckland 1946 height (2)','Derived at 260 control points. Mean offset 0.292m, standard deviation 0.029m, maximum difference from mean 0.075m. Supersedes NZVD2016 height to Auckland 1946 height (1) (code 7860) after change of grid file format.','Transformation between national and local height systems.','EPSG','1084','Vertical Offset by Grid Interpolation (gtx)','EPSG','7839','EPSG','5759','EPSG','3764',0.02,'EPSG','8732','Vertical offset file','auckht1946-nzvd2016.gtx',NULL,NULL,NULL,NULL,'EPSG','4167','LINZ-NZ AUCK gtx',0);
 INSERT INTO "grid_transformation" VALUES('EPSG','9313','NZVD2016 height to Bluff 1955 height (2)','Derived at 71 control points. Mean offset 0.273m, standard deviation 0.034m, maximum difference from mean 0.079m. Supersedes NZVD2016 height to Bluff 1955 height (1) (code 7861) after change of grid file format.','Transformation between national and local height systems.','EPSG','1084','Vertical Offset by Grid Interpolation (gtx)','EPSG','7839','EPSG','5760','EPSG','3801',0.02,'EPSG','8732','Vertical offset file','blufht1955-nzvd2016.gtx',NULL,NULL,NULL,NULL,'EPSG','4167','LINZ-NZ BLUF gtx',0);
 INSERT INTO "grid_transformation" VALUES('EPSG','9314','NZVD2016 height to Dunedin 1958 height (2)','Derived at 197 control points. Mean offset 0.326m, standard deviation 0.043m, maximum difference from mean 0.152m. Supersedes NZVD2016 height to Dunedin 1958 height (1) (code 7862) after change of grid file format.','Transformation between national and local height systems.','EPSG','1084','Vertical Offset by Grid Interpolation (gtx)','EPSG','7839','EPSG','5761','EPSG','3803',0.02,'EPSG','8732','Vertical offset file','duneht1958-nzvd2016.gtx',NULL,NULL,NULL,NULL,'EPSG','4167','LINZ-NZ DUNE gtx',0);
@@ -368,6 +369,7 @@ INSERT INTO "grid_transformation" VALUES('EPSG','9327','NTF to RGF93 (1)','May b
 INSERT INTO "grid_transformation" VALUES('EPSG','9328','NEA74 Noumea to RGNC91-93 (3)','Developed in July 2002 and officially adopted in August 2005. May be emulated using NTv2 method - see RGNC91-93 to NEA74 Noumea (4) (code 1295).','Accuracy 5-10cm.','EPSG','1087','Geocentric translation by Grid Interpolation (IGN)','EPSG','4644','EPSG','4749','EPSG','2823',0.05,'EPSG','8727','Geocentric translation file','gr3dnc03a.mnt',NULL,NULL,NULL,NULL,'EPSG','4749','BGN-Ncl 0.05m',0);
 INSERT INTO "grid_transformation" VALUES('EPSG','9329','IGN72 Grande Terre to RGNC91-93 (4)','Developed in July 2002 and officially adopted in August 2005. May be emulated using NTv2 method - see RGNC91-93 to IGN72 Grande Terre (6) (code 15962).','Accuracy better than +/- 0.1 metre.','EPSG','1087','Geocentric translation by Grid Interpolation (IGN)','EPSG','4662','EPSG','4749','EPSG','2822',0.1,'EPSG','8727','Geocentric translation file','gr3dnc01b.mnt',NULL,NULL,NULL,NULL,'EPSG','4749','BGN-Ncl 0.1m',0);
 INSERT INTO "grid_transformation" VALUES('EPSG','9330','IGN72 Grande Terre to RGNC91-93 (5)','Developed in July 2002 and officially adopted in August 2005.','Accuracy 5-10cm.','EPSG','1087','Geocentric translation by Grid Interpolation (IGN)','EPSG','4662','EPSG','4749','EPSG','2823',0.05,'EPSG','8727','Geocentric translation file','gr3dnc02b.mnt',NULL,NULL,NULL,NULL,'EPSG','4749','BGN-Ncl Noum 0.05m',0);
+INSERT INTO "grid_transformation" VALUES('EPSG','9338','DHDN to ETRS89 (9)','Official transformation for the state of Baden-Württemberg. Used in ATKIS (Amtliches Topographisch-Kartographisches Informationssystem [Official Topographic and Cartographic Information System]).','Cadastre, engineering survey, topographic mapping (large scale).','EPSG','9615','NTv2','EPSG','4314','EPSG','4258','EPSG','4580',0.1,'EPSG','8656','Latitude and longitude difference file','BWTA2017.gsb',NULL,NULL,NULL,NULL,NULL,NULL,'LGL-Deu BWTA2017',0);
 INSERT INTO "grid_transformation" VALUES('EPSG','10000','RGF93 to NGF IGN69 height (1)','May be used for transformations from WGS 84 to NGF IGN69. Accuracy at each 0.1 deg x 0.1 degree grid node is given within the geoid model file.','Derivation of gravity-related heights from GPS observations.','EPSG','9664','Geographic3D to GravityRelatedHeight (IGN1997)','EPSG','4965','EPSG','5720','EPSG','1326',0.5,'EPSG','8666','Geoid (height correction) model file','ggf97a.txt',NULL,NULL,NULL,NULL,NULL,NULL,'IGN Fra',0);
 INSERT INTO "grid_transformation" VALUES('EPSG','10001','ETRS89 to NGF IGN69 height (1)','Parameter values taken from RGF93 to NGF IGN69 (1) (code 10000) assuming that RGF93 is equivalent to ETRS89 within the accuracy of the transformation. Accuracy at each 0.1 deg x 0.1 degree grid node is given within the geoid model file.','Derivation of gravity-related heights from GPS observations.','EPSG','9664','Geographic3D to GravityRelatedHeight (IGN1997)','EPSG','4937','EPSG','5720','EPSG','1326',0.5,'EPSG','8666','Geoid (height correction) model file','ggf97a.txt',NULL,NULL,NULL,NULL,NULL,NULL,'IGN Fra',0);
 INSERT INTO "grid_transformation" VALUES('EPSG','10002','RGF93 to IGN78 Corsica height (1)','May be used for transformations from WGS 84 to IGN78 Corsica. Accuracy at each 0.1 deg x 0.1 degree grid node is given within the geoid model file.','Derivation of gravity-related heights from GPS observations.','EPSG','9664','Geographic3D to GravityRelatedHeight (IGN1997)','EPSG','4965','EPSG','5721','EPSG','1327',0.5,'EPSG','8666','Geoid (height correction) model file','ggf97a_corse.txt',NULL,NULL,NULL,NULL,NULL,NULL,'IGN Fra Cor',0);
@@ -389,7 +391,7 @@ INSERT INTO "grid_transformation" VALUES('EPSG','10017','NAD83 to NAVD88 height
 INSERT INTO "grid_transformation" VALUES('EPSG','10018','NAD83 to NAVD88 height (6)','Uses Geoid03 hybrid model. See information source for further information. Note: Source CRS is 2D, used in this application of the method as a pseudo-3D CRS.','Derivation of approximate gravity-related heights from GPS observations.','EPSG','9665','Geographic3D to GravityRelatedHeight (gtx)','EPSG','4269','EPSG','5703','EPSG','2974',0.05,'EPSG','8666','Geoid (height correction) model file','g2003u06.bin',NULL,NULL,NULL,NULL,NULL,NULL,'NGS-US Conus CSW',1);
 INSERT INTO "grid_transformation" VALUES('EPSG','10019','NAD83 to NAVD88 height (7)','Uses Geoid03 hybrid model. See information source for further information. Note: Source CRS is 2D, used in this application of the method as a pseudo-3D CRS.','Derivation of approximate gravity-related heights from GPS observations.','EPSG','9665','Geographic3D to GravityRelatedHeight (gtx)','EPSG','4269','EPSG','5703','EPSG','2975',0.05,'EPSG','8666','Geoid (height correction) model file','g2003u07.bin',NULL,NULL,NULL,NULL,NULL,NULL,'NGS-US Conus CSE',1);
 INSERT INTO "grid_transformation" VALUES('EPSG','10020','NAD83 to NAVD88 height (8)','Uses Geoid03 hybrid model. See information source for further information. Note: Source CRS is 2D, used in this application of the method as a pseudo-3D CRS.','Derivation of approximate gravity-related heights from GPS observations.','EPSG','9665','Geographic3D to GravityRelatedHeight (gtx)','EPSG','4269','EPSG','5703','EPSG','2976',0.05,'EPSG','8666','Geoid (height correction) model file','g2003u08.bin',NULL,NULL,NULL,NULL,NULL,NULL,'NGS-US Conus SE',1);
-INSERT INTO "grid_transformation" VALUES('EPSG','10021','ETRS89 to Newlyn height (1)','May be used for transformations from WGS 84 to Newlyn.','Derivation of gravity-related heights from GPS observations.','EPSG','9663','Geographic3D to GravityRelatedHeight (OSGM-GB)','EPSG','4937','EPSG','5701','EPSG','2792',0.02,'EPSG','8666','Geoid (height correction) model file','OSTN02_OSGM02_GB.txt',NULL,NULL,NULL,NULL,NULL,NULL,'OS-UK Gbr',0);
+INSERT INTO "grid_transformation" VALUES('EPSG','10021','ETRS89 to ODN height (1)','','Derivation of gravity-related heights from GPS observations.','EPSG','9663','Geographic3D to GravityRelatedHeight (OSGM-GB)','EPSG','4937','EPSG','5701','EPSG','2792',0.02,'EPSG','8666','Geoid (height correction) model file','OSTN02_OSGM02_GB.txt',NULL,NULL,NULL,NULL,NULL,NULL,'OS-UK Gbr',0);
 INSERT INTO "grid_transformation" VALUES('EPSG','10022','ETRS89 to Belfast height (1)','May be used for transformations from WGS 84 to Belfast.','Derivation of gravity-related heights from GPS observations.','EPSG','9663','Geographic3D to GravityRelatedHeight (OSGM-GB)','EPSG','4937','EPSG','5732','EPSG','2530',0.03,'EPSG','8666','Geoid (height correction) model file','OSTN02_OSGM02_GB.txt',NULL,NULL,NULL,NULL,NULL,NULL,'OS-UK NI',1);
 INSERT INTO "grid_transformation" VALUES('EPSG','10023','ETRS89 to Douglas height (1)','May be used for transformations from WGS 84 to Douglas.','Derivation of gravity-related heights from GPS observations.','EPSG','9663','Geographic3D to GravityRelatedHeight (OSGM-GB)','EPSG','4937','EPSG','5750','EPSG','2803',0.02,'EPSG','8666','Geoid (height correction) model file','OSTN02_OSGM02_GB.txt',NULL,NULL,NULL,NULL,NULL,NULL,'OS-UK Man',0);
 INSERT INTO "grid_transformation" VALUES('EPSG','10024','ETRS89 to Fair Isle height (1)','May be used for transformations from WGS 84 to Fair Isle.','Derivation of gravity-related heights from GPS observations.','EPSG','9663','Geographic3D to GravityRelatedHeight (OSGM-GB)','EPSG','4937','EPSG','5741','EPSG','2794',0.05,'EPSG','8666','Geoid (height correction) model file','OSTN02_OSGM02_GB.txt',NULL,NULL,NULL,NULL,NULL,NULL,'OS-UK Fair',0);
@@ -397,7 +399,7 @@ INSERT INTO "grid_transformation" VALUES('EPSG','10025','ETRS89 to Flannan Isles
 INSERT INTO "grid_transformation" VALUES('EPSG','10026','ETRS89 to Foula height (1)','May be used for transformations from WGS 84 to Foula.','Derivation of gravity-related heights from GPS observations.','EPSG','9663','Geographic3D to GravityRelatedHeight (OSGM-GB)','EPSG','4937','EPSG','5743','EPSG','2796',0.05,'EPSG','8666','Geoid (height correction) model file','OSTN02_OSGM02_GB.txt',NULL,NULL,NULL,NULL,NULL,NULL,'OS-UK Foula',0);
 INSERT INTO "grid_transformation" VALUES('EPSG','10027','ETRS89 to Lerwick height (1)','May be used for transformations from WGS 84 to Lerwick.','Derivation of gravity-related heights from GPS observations.','EPSG','9663','Geographic3D to GravityRelatedHeight (OSGM-GB)','EPSG','4937','EPSG','5742','EPSG','2795',0.05,'EPSG','8666','Geoid (height correction) model file','OSTN02_OSGM02_GB.txt',NULL,NULL,NULL,NULL,NULL,NULL,'OS-UK Shet',0);
 INSERT INTO "grid_transformation" VALUES('EPSG','10028','ETRS89 to Malin Head height (1)','May be used for transformations from WGS 84 to Malin Head.','Derivation of gravity-related heights from GPS observations.','EPSG','9663','Geographic3D to GravityRelatedHeight (OSGM-GB)','EPSG','4937','EPSG','5731','EPSG','1305',0.04,'EPSG','8666','Geoid (height correction) model file','OSTN02_OSGM02_GB.txt',NULL,NULL,NULL,NULL,NULL,NULL,'OS-Ire',1);
-INSERT INTO "grid_transformation" VALUES('EPSG','10029','ETRS89 to Newlyn (Orkney Isles) height (1)','May be used for transformations from WGS 84 to Newlyn (Orkney Isles).','Derivation of gravity-related heights from GPS observations.','EPSG','9663','Geographic3D to GravityRelatedHeight (OSGM-GB)','EPSG','4937','EPSG','5740','EPSG','2793',0.05,'EPSG','8666','Geoid (height correction) model file','OSTN02_OSGM02_GB.txt',NULL,NULL,NULL,NULL,NULL,NULL,'OS-UK Ork',0);
+INSERT INTO "grid_transformation" VALUES('EPSG','10029','ETRS89 to ODN Orkney height (1)','','Derivation of gravity-related heights from GPS observations.','EPSG','9663','Geographic3D to GravityRelatedHeight (OSGM-GB)','EPSG','4937','EPSG','5740','EPSG','2793',0.05,'EPSG','8666','Geoid (height correction) model file','OSTN02_OSGM02_GB.txt',NULL,NULL,NULL,NULL,NULL,NULL,'OS-UK Ork',0);
 INSERT INTO "grid_transformation" VALUES('EPSG','10030','ETRS89 to North Rona height (1)','May be used for transformations from WGS 84 to North Rona.','Derivation of gravity-related heights from GPS observations.','EPSG','9663','Geographic3D to GravityRelatedHeight (OSGM-GB)','EPSG','4937','EPSG','5745','EPSG','2798',0.05,'EPSG','8666','Geoid (height correction) model file','OSTN02_OSGM02_GB.txt',NULL,NULL,NULL,NULL,NULL,NULL,'OS-UK Rona',0);
 INSERT INTO "grid_transformation" VALUES('EPSG','10031','ETRS89 to St. Kilda height (1)','May be used for transformations from WGS 84 to St. Kilda.','Derivation of gravity-related heights from GPS observations.','EPSG','9663','Geographic3D to GravityRelatedHeight (OSGM-GB)','EPSG','4937','EPSG','5747','EPSG','2800',0.05,'EPSG','8666','Geoid (height correction) model file','OSTN02_OSGM02_GB.txt',NULL,NULL,NULL,NULL,NULL,NULL,'OS-UK Kilda',0);
 INSERT INTO "grid_transformation" VALUES('EPSG','10032','ETRS89 to St. Marys height (1)','May be used for transformations from WGS 84 to St. Marys.','Derivation of gravity-related heights from GPS observations.','EPSG','9663','Geographic3D to GravityRelatedHeight (OSGM-GB)','EPSG','4937','EPSG','5749','EPSG','2802',0.0,'EPSG','8666','Geoid (height correction) model file','OSTN02_OSGM02_GB.txt',NULL,NULL,NULL,NULL,NULL,NULL,'OS-UK Scilly',0);

data/sql/grid_transformation_custom.sql

@@ -3,22 +3,22 @@
 -- Denmark
 
 INSERT INTO "grid_transformation" VALUES(
-    'PROJ','EPSG_5799_TO_EPSG_4937','DVR90 height to ETRS89',
+    'PROJ','EPSG_4937_TO_EPSG_5799','ETRS89 to DVR90 height',
     NULL,NULL,
-    'PROJ','HEIGHT_TO_GEOGRAPHIC3D','GravityRelatedHeight to Geographic3D',
-    'EPSG','5799', -- source CRS (DVR90 height)
-    'EPSG','4937', -- target CRS (ETRS89)
+    'EPSG','9665','Geographic3D to GravityRelatedHeight (gtx)',
+    'EPSG','4937', -- source CRS (ETRS89)
+    'EPSG','5799', -- target CRS (DVR90 height)
     'EPSG','3237', -- area of use: Denmark onshore
     NULL,
     'EPSG','8666','Geoid (height correction) model file','dvr90.gtx',
     NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);
 
 INSERT INTO "grid_transformation" VALUES(
-    'PROJ','EPSG_5733_TO_EPSG_4937','DNN height to ETRS89',
+    'PROJ','EPSG_4937_TO_EPSG_5733','ETRS89 to DNN height',
     NULL,NULL,
-    'PROJ','HEIGHT_TO_GEOGRAPHIC3D','GravityRelatedHeight to Geographic3D',
-    'EPSG','5733', -- source CRS (DNN height)
-    'EPSG','4937', -- target CRS (ETRS89)
+    'EPSG','9665','Geographic3D to GravityRelatedHeight (gtx)',
+    'EPSG','4937', -- source CRS (ETRS89)
+    'EPSG','5733', -- target CRS (DNN height)
     'EPSG','3237', -- area of use: Denmark onshore
     NULL,
     'EPSG','8666','Geoid (height correction) model file','dnn.gtx',
@@ -27,11 +27,11 @@ INSERT INTO "grid_transformation" VALUES(
 -- Faroe Islands
 
 INSERT INTO "grid_transformation" VALUES(
-    'PROJ','EPSG_5317_TO_EPSG_4937','FVR09 height to ETRS89',
+    'PROJ','EPSG_4937_TO_EPSG_5317','ETRS89 to FVR09 height',
     NULL,NULL,
-    'PROJ','HEIGHT_TO_GEOGRAPHIC3D','GravityRelatedHeight to Geographic3D',
-    'EPSG','5317', -- source CRS (FVR09 height)
-    'EPSG','4937', -- target CRS (ETRS89)
+    'EPSG','9665','Geographic3D to GravityRelatedHeight (gtx)',
+    'EPSG','4937', -- source CRS (ETRS89)
+    'EPSG','5317', -- target CRS (FVR09 height)
     'EPSG','3248', -- area of use: Faroe Islands - onshore
     NULL,
     'EPSG','8666','Geoid (height correction) model file','fvr09.gtx',
@@ -40,58 +40,46 @@ INSERT INTO "grid_transformation" VALUES(
 -- Sweden
 
 INSERT INTO "grid_transformation" VALUES(
-    'PROJ','EPSG_5613_TO_EPSG_4977','RH2000 height to SWEREF99',
+    'PROJ','EPSG_4977_TO_EPSG_5613','SWEREF99 to RH2000 height',
     NULL,NULL,
-    'PROJ','HEIGHT_TO_GEOGRAPHIC3D','GravityRelatedHeight to Geographic3D',
-    'EPSG','5613', -- source CRS (RH2000 height)
-    'EPSG','4977', -- target CRS (SWEREF99)
+    'EPSG','9665','Geographic3D to GravityRelatedHeight (gtx)',
+    'EPSG','4977', -- source CRS (SWEREF99)
+    'EPSG','5613', -- target CRS (RH2000 height)
     'EPSG','3313', -- area of use: Sweden onshore
     NULL,
     'EPSG','8666','Geoid (height correction) model file','SWEN17_RH2000.gtx',
     NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);
 
------ Hopefully temporary entry for BWTA2017.gsb grid -----
-
-INSERT INTO "area" VALUES('PROJ','BWTA2017','Germany - Baden-Wurtemberg','Germany - Baden-Wurtemberg',47.5,49.83,7.49,10.51,0);
--- Advertize a 0.8 accuracy slightly better than the 0.9 of BETA2007 for sort purposes
-INSERT INTO "grid_transformation" VALUES('PROJ','BWTA2017','DHDN to ETRS89 (BWTA2017)','DHDN to ETRS89 for Baden-Wurtemberg for ALKIS 2017. Using official BWTA2017 grid but this transformation entry has been created temporarily by PROJ. Accuracy indication not to be considered as authoritative','For applications requiring an accuracy of better than 1 metre.','EPSG','9615','NTv2','EPSG','4314','EPSG','4258','PROJ','BWTA2017',0.89,'EPSG','8656','Latitude and longitude difference file','BWTA2017.gsb',NULL,NULL,NULL,NULL,NULL,NULL,'-',0);
-
------ Hopefully temporary entry for SeTa2016.gsb grid -----
-
-INSERT INTO "area" VALUES('PROJ','SETA2016','Germany - Saarland','Germany - Saarland',49.10,49.64,6.345,7.45,0);
--- Advertize a 0.8 accuracy slightly better than the 0.9 of BETA2007 for sort purposes
-INSERT INTO "grid_transformation" VALUES('PROJ','SETA2016','DHDN to ETRS89 (SETA2016)','DHDN to ETRS89 for Saarland. Using official SETA2016 grid but this transformation entry has been created temporarily by PROJ. Accuracy indication not to be considered as authoritative','For applications requiring an accuracy of better than 1 metre.','EPSG','9615','NTv2','EPSG','4314','EPSG','4258','PROJ','SETA2016',0.89,'EPSG','8656','Latitude and longitude difference file','SeTa2016.gsb',NULL,NULL,NULL,NULL,NULL,NULL,'-',0);
-
 -- Iceland
 
 INSERT INTO "grid_transformation" VALUES(
-    'PROJ','EPSG_8089_TO_EPSG_5323','ISH2004 height to ISN2004',
+    'PROJ','EPSG_5323_TO_EPSG_8089','ISN2004 to ISH2004 height',
     NULL,NULL,
-    'PROJ','HEIGHT_TO_GEOGRAPHIC3D','GravityRelatedHeight to Geographic3D',
-    'EPSG','8089', -- source CRS (ISH2004 height)
-    'EPSG','5323', -- target CRS (ISN2004 geographic 3D)
+    'EPSG','9665','Geographic3D to GravityRelatedHeight (gtx)',
+    'EPSG','5323', -- source CRS (ISN2004 geographic 3D)
+    'EPSG','8089', -- target CRS (ISH2004 height)
     'EPSG','1120', -- area of use: Iceland - onshore and offshore
     NULL,
     'EPSG','8666','Geoid (height correction) model file','Icegeoid_ISN2004.gtx',
     NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);
-    
+
 INSERT INTO "grid_transformation" VALUES(
-    'PROJ','EPSG_8089_TO_EPSG_4945','ISH2004 height to ISN93',
+    'PROJ','EPSG_4945_TO_EPSG_8089','ISN93 to ISH2004 height',
     NULL,NULL,
-    'PROJ','HEIGHT_TO_GEOGRAPHIC3D','GravityRelatedHeight to Geographic3D',
-    'EPSG','8089', -- source CRS (ISH2004 height)
-    'EPSG','4945', -- target CRS (ISN93 geographic 3D)
+    'EPSG','9665','Geographic3D to GravityRelatedHeight (gtx)',
+    'EPSG','4945', -- source CRS (ISN93 geographic 3D)
+    'EPSG','8089', -- target CRS (ISH2004 height)
     'EPSG','1120', -- area of use: Iceland - onshore and offshore
     NULL,
     'EPSG','8666','Geoid (height correction) model file','Icegeoid_ISN93.gtx',
     NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);
-    
+
 INSERT INTO "grid_transformation" VALUES(
-    'PROJ','EPSG_8089_TO_EPSG_8085','ISH2004 height to ISN2016',
+    'PROJ','EPSG_8085_TO_EPSG_8089','ISN2016 to ISH2004 height',
     NULL,NULL,
-    'PROJ','HEIGHT_TO_GEOGRAPHIC3D','GravityRelatedHeight to Geographic3D',
-    'EPSG','8089', -- source CRS (ISH2004 height)
-    'EPSG','8085', -- target CRS (ISN2016 geographic 3D)
+    'EPSG','9665','Geographic3D to GravityRelatedHeight (gtx)',
+    'EPSG','8085', -- source CRS (ISN2016 geographic 3D)
+    'EPSG','8089', -- target CRS (ISH2004 height)
     'EPSG','1120', -- area of use: Iceland - onshore and offshore
     NULL,
     'EPSG','8666','Geoid (height correction) model file','Icegeoid_ISN2016.gtx',

data/sql/helmert_transformation.sql

@@ -238,7 +238,7 @@ INSERT INTO "helmert_transformation" VALUES('EPSG','1308','NAD83 to WGS 84 (4)',
 INSERT INTO "helmert_transformation" VALUES('EPSG','1309','DHDN to ETRS89 (1)','Mean of 69 stations. May be taken as approximate tfm DHDN to WGS 84 (code 1673). Replaced by DHDN to ETRS89 (2) (tfm code 1776) and regional higher accuracy tfms. Note: these later tfms have been published using the Position Vector method.','For applications with an accuracy at 5 m level.','EPSG','9607','Coordinate Frame rotation (geog2D domain)','EPSG','4314','EPSG','4258','EPSG','2326',5.0,582.0,105.0,414.0,'EPSG','9001',-1.04,-0.35,3.08,'EPSG','9104',8.3,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'IfAG-Deu W',0);
 INSERT INTO "helmert_transformation" VALUES('EPSG','1310','Pulkovo 1942 to ETRS89 (1)','Mean of 20 stations.','Residuals under 2 m.','EPSG','9607','Coordinate Frame rotation (geog2D domain)','EPSG','4284','EPSG','4258','EPSG','1343',2.0,24.0,-123.0,-94.0,'EPSG','9001',-0.02,0.25,0.13,'EPSG','9104',1.1,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'IfAG-Deu E',1);
 INSERT INTO "helmert_transformation" VALUES('EPSG','1311','ED50 to WGS 84 (18)','Based on ED50 to WGS72 (precise ephemeris) 6-nations agreement of 1981 to which precise to broadcast and broadcast to WGS 84 transformations have been concatenated.','Recommended transformation for UKCS and IrishCS petroleum purposes.','EPSG','9606','Position Vector transformation (geog2D domain)','EPSG','4230','EPSG','4326','EPSG','2342',1.0,-89.5,-93.8,-123.1,'EPSG','9001',0.0,0.0,-0.156,'EPSG','9104',1.2,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'UKOOA-CO',0);
-INSERT INTO "helmert_transformation" VALUES('EPSG','1314','OSGB 1936 to WGS 84 (6)','For a more accurate transformation see OSGB 1936 / British National Grid to ETRS89 (2) (code 1039): contact the Ordnance Survey of Great Britain (http://www.gps.gov.uk/gpssurveying.asp) for details.','Oil exploration. Accuracy better than 4m and generally better than 2m.','EPSG','9606','Position Vector transformation (geog2D domain)','EPSG','4277','EPSG','4326','EPSG','1264',2.0,446.448,-125.157,542.06,'EPSG','9001',0.15,0.247,0.842,'EPSG','9104',-20.489,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'UKOOA-Pet',0);
+INSERT INTO "helmert_transformation" VALUES('EPSG','1314','OSGB 1936 to WGS 84 (6)','For a more accurate transformation see ETRS89 to OSGB 1936 / British National Grid (3) (code 7953).','Oil exploration. Accuracy better than 4m and generally better than 2m.','EPSG','9606','Position Vector transformation (geog2D domain)','EPSG','4277','EPSG','4326','EPSG','1264',2.0,446.448,-125.157,542.06,'EPSG','9001',0.15,0.247,0.842,'EPSG','9104',-20.489,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'UKOOA-Pet',0);
 INSERT INTO "helmert_transformation" VALUES('EPSG','1315','OSGB 1936 to ED50 (UKOOA)','This transformation is concatenated from OSGB36 to WGS 84 (Petroleum) (code 1314) minus ED50 to WGS 84 (Common Offshore) (code 1311).','For oil exploration. Accuracy better than 4m and generally better than 2m.','EPSG','9606','Position Vector transformation (geog2D domain)','EPSG','4277','EPSG','4230','EPSG','1264',2.0,535.948,-31.357,665.16,'EPSG','9001',0.15,0.247,0.998,'EPSG','9104',-21.689,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'UKOOA-UKCS',0);
 INSERT INTO "helmert_transformation" VALUES('EPSG','1316','Manoca to WGS 84 (1)','','?','EPSG','9603','Geocentric translations (geog2D domain)','EPSG','4260','EPSG','4326','EPSG','1060',999.0,-70.9,-151.8,-41.4,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'SCS-Cmr',1);
 INSERT INTO "helmert_transformation" VALUES('EPSG','1317','Camacupa 1948 to WGS 72BE (1)','Derived by Geophysical Services Inc. in 1979 from mean of Transit results at 7 stations.','Oil exploration.','EPSG','9603','Geocentric translations (geog2D domain)','EPSG','4220','EPSG','4324','EPSG','1604',10.0,-37.2,-370.6,-228.5,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'GSI-Ago',0);
@@ -1178,6 +1178,7 @@ INSERT INTO "helmert_transformation" VALUES('EPSG','9262','MMS to WGS 84 (1)',''
 INSERT INTO "helmert_transformation" VALUES('EPSG','9263','Hito XVIII 1963 to WGS 84 (3)','','Oil and gas exploration and production.','EPSG','9603','Geocentric translations (geog2D domain)','EPSG','4254','EPSG','4326','EPSG','2357',2.5,18.2,190.7,100.9,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'YPF-Arg TdF Hito',0);
 INSERT INTO "helmert_transformation" VALUES('EPSG','9264','POSGAR 2007 to WGS 84 (2)','Derived as average at all points common between the POSGAR 94 and POSGAR 2007 networks. POSGAR 94 was adjusted to the WGS 84 coordinates of 20 stations in March to May 1994. Accuracy 0.1m in 1994 + 1.5cm per year.','Oil and gas exploration and production.','EPSG','9603','Geocentric translations (geog2D domain)','EPSG','5340','EPSG','4326','EPSG','1033',0.5,-0.41,0.46,-0.35,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'YPF-Arg',0);
 INSERT INTO "helmert_transformation" VALUES('EPSG','9281','Amersfoort to ETRS89 (8)','Derived using ETRF2014. In RDNAPTRANS2018 software used assuming an ETRS89 ellipsoidal height of 43m and with an additional correction grid (corrections of up to 0.25m). Replaces Amersfoort to ETRS89 (5) and (6) (tfm codes 4830 and 4831).','Accuracy 0.25m','EPSG','9607','Coordinate Frame rotation (geog2D domain)','EPSG','4289','EPSG','4258','EPSG','1275',0.25,565.7381,50.4018,465.2904,'EPSG','9001',1.91514,-1.60363,9.09546,'EPSG','9109',4.07244,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'IOGP-Nld 2018',0);
+INSERT INTO "helmert_transformation" VALUES('EPSG','9298','ONGD17 to  WGS 84 (1)','','Geodesy.','EPSG','1032','Coordinate Frame rotation (geocentric domain)','EPSG','9292','EPSG','4978','EPSG','1183',0.1,1.16835,-1.42001,-2.24431,'EPSG','9001',0.00822,0.05508,-0.01818,'EPSG','9104',0.23388,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'NSA-Omn',0);
 INSERT INTO "helmert_transformation" VALUES('EPSG','9334','ITRF2014 to KSA-GRF17 (1)','Arabian plate rotations derived during KSA-GRF17 adjustment from observations at 41 sites with at least 2.5 years of continuous observations.','Geodesy.','EPSG','1053','Time-dependent Position Vector tfm (geocentric)','EPSG','7789','EPSG','9331','EPSG','1206',0.001,0.0,0.0,0.0,'EPSG','1025',0.0,0.0,0.0,'EPSG','1031',0.0,'EPSG','1028',0.0,0.0,0.0,'EPSG','1027',-1.199,0.107,-1.468,'EPSG','1032',0.0,'EPSG','1030',2017.0,'EPSG','1029',NULL,NULL,NULL,NULL,NULL,'GCS-Sau',0);
 INSERT INTO "helmert_transformation" VALUES('EPSG','10085','Trinidad 1903 to WGS 84 (2)','Parameter values provided to EOG by Trinidad Ministry of Energy and Energy Industries. Used by EOG offshore Trinidad (including Pelican, Kiskadee and Ibis fields) since 1996.','Oil exploration.','EPSG','9603','Geocentric translations (geog2D domain)','EPSG','4302','EPSG','4326','EPSG','1339',3.0,-61.0,285.2,471.6,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'EOG-Tto Trin',0);
 INSERT INTO "helmert_transformation" VALUES('EPSG','10086','JAD69 to WGS 72 (1)','Derived in 1977 through Transit observations at 2 stations by US DMA.','For military mapping.','EPSG','9603','Geocentric translations (geog2D domain)','EPSG','4242','EPSG','4322','EPSG','3342',15.0,48.0,208.0,382.0,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'SD-Jam',0);

data/sql/metadata.sql

@@ -1,2 +1,2 @@
-INSERT INTO "metadata" VALUES('EPSG.VERSION', 'v9.8.6');
-INSERT INTO "metadata" VALUES('EPSG.DATE', '2020-01-22');
+INSERT INTO "metadata" VALUES('EPSG.VERSION', 'v9.8.9');
+INSERT INTO "metadata" VALUES('EPSG.DATE', '2020-04-07');

data/sql/proj_db_table_defs.sql

@@ -681,7 +681,7 @@ FOR EACH ROW BEGIN
         WHERE EXISTS (SELECT 1 FROM crs_view WHERE crs_view.auth_name = NEW.auth_name AND crs_view.code = NEW.code);
 
     SELECT RAISE(ABORT, 'insert on projected_crs violates constraint: geodetic_crs must not be deprecated when projected_crs is not deprecated')
-        WHERE EXISTS(SELECT 1 FROM geodetic_crs WHERE geodetic_crs.auth_name = NEW.geodetic_crs_auth_name AND geodetic_crs.code = NEW.geodetic_crs_code AND geodetic_crs.deprecated != 0) AND NEW.deprecated = 0 AND NOT (NEW.auth_name = 'ESRI' AND NEW.geodetic_crs_auth_name != 'ESRI');
+        WHERE EXISTS(SELECT 1 FROM geodetic_crs WHERE geodetic_crs.auth_name = NEW.geodetic_crs_auth_name AND geodetic_crs.code = NEW.geodetic_crs_code AND geodetic_crs.deprecated != 0 AND geodetic_crs.name NOT LIKE 'Unknown datum%' AND geodetic_crs.name NOT LIKE 'Unspecified datum%') AND NEW.deprecated = 0 AND NOT (NEW.auth_name = 'ESRI' AND NEW.geodetic_crs_auth_name != 'ESRI');
 
     SELECT RAISE(ABORT, 'insert on projected_crs violates constraint: conversion must exist when text_definition is NULL')
         WHERE NOT EXISTS(SELECT 1 FROM conversion WHERE conversion.auth_name = NEW.conversion_auth_name AND conversion.code = NEW.conversion_code) AND NEW.text_definition IS NULL;

data/sql/projected_crs.sql

@@ -163,7 +163,7 @@ INSERT INTO "projected_crs" VALUES('EPSG','2159','Sierra Leone 1924 / New Colony
 INSERT INTO "projected_crs" VALUES('EPSG','2160','Sierra Leone 1924 / New War Office Grid',NULL,NULL,'EPSG','4404','EPSG','4174','EPSG','19964','EPSG','1342',NULL,0);
 INSERT INTO "projected_crs" VALUES('EPSG','2161','Sierra Leone 1968 / UTM zone 28N',NULL,NULL,'EPSG','4400','EPSG','4175','EPSG','16028','EPSG','1509',NULL,0);
 INSERT INTO "projected_crs" VALUES('EPSG','2162','Sierra Leone 1968 / UTM zone 29N',NULL,NULL,'EPSG','4400','EPSG','4175','EPSG','16029','EPSG','1510',NULL,0);
-INSERT INTO "projected_crs" VALUES('EPSG','2163','US National Atlas Equal Area',NULL,NULL,'EPSG','4499','EPSG','4052','EPSG','3899','EPSG','1245',NULL,0);
+INSERT INTO "projected_crs" VALUES('EPSG','2163','US National Atlas Equal Area',NULL,NULL,'EPSG','4499','EPSG','4052','EPSG','3899','EPSG','1245',NULL,1);
 INSERT INTO "projected_crs" VALUES('EPSG','2164','Locodjo 1965 / TM 5 NW',NULL,NULL,'EPSG','4400','EPSG','4142','EPSG','17005','EPSG','2296',NULL,0);
 INSERT INTO "projected_crs" VALUES('EPSG','2165','Abidjan 1987 / TM 5 NW',NULL,NULL,'EPSG','4400','EPSG','4143','EPSG','17005','EPSG','2296',NULL,0);
 INSERT INTO "projected_crs" VALUES('EPSG','2166','Pulkovo 1942(83) / Gauss Kruger zone 3',NULL,NULL,'EPSG','4530','EPSG','4178','EPSG','16263','EPSG','1512',NULL,1);
@@ -1307,7 +1307,7 @@ INSERT INTO "projected_crs" VALUES('EPSG','3312','CSG67 / UTM zone 21N',NULL,NUL
 INSERT INTO "projected_crs" VALUES('EPSG','3313','RGFG95 / UTM zone 21N',NULL,NULL,'EPSG','4400','EPSG','4624','EPSG','16021','EPSG','3145',NULL,0);
 INSERT INTO "projected_crs" VALUES('EPSG','3314','Katanga 1955 / Katanga Lambert',NULL,NULL,'EPSG','4400','EPSG','4695','EPSG','17401','EPSG','3147',NULL,1);
 INSERT INTO "projected_crs" VALUES('EPSG','3315','Katanga 1955 / Katanga TM',NULL,NULL,'EPSG','4400','EPSG','4695','EPSG','17402','EPSG','3147',NULL,1);
-INSERT INTO "projected_crs" VALUES('EPSG','3316','Kasai 1953 / Congo TM zone 22',NULL,NULL,'EPSG','4400','EPSG','4696','EPSG','17422','EPSG','3163',NULL,0);
+INSERT INTO "projected_crs" VALUES('EPSG','3316','Kasai 1953 / Congo TM zone 22',NULL,NULL,'EPSG','4400','EPSG','4696','EPSG','17422','EPSG','4587',NULL,0);
 INSERT INTO "projected_crs" VALUES('EPSG','3317','Kasai 1953 / Congo TM zone 24',NULL,NULL,'EPSG','4400','EPSG','4696','EPSG','17424','EPSG','3164',NULL,0);
 INSERT INTO "projected_crs" VALUES('EPSG','3318','IGC 1962 / Congo TM zone 12',NULL,NULL,'EPSG','4400','EPSG','4697','EPSG','17412','EPSG','3150',NULL,0);
 INSERT INTO "projected_crs" VALUES('EPSG','3319','IGC 1962 / Congo TM zone 14',NULL,NULL,'EPSG','4400','EPSG','4697','EPSG','17414','EPSG','3151',NULL,0);
@@ -1399,11 +1399,11 @@ INSERT INTO "projected_crs" VALUES('EPSG','3404','NAD83(HARN) / North Carolina (
 INSERT INTO "projected_crs" VALUES('EPSG','3405','VN-2000 / UTM zone 48N',NULL,NULL,'EPSG','4400','EPSG','4756','EPSG','16048','EPSG','1452',NULL,0);
 INSERT INTO "projected_crs" VALUES('EPSG','3406','VN-2000 / UTM zone 49N',NULL,NULL,'EPSG','4400','EPSG','4756','EPSG','16049','EPSG','1453',NULL,0);
 INSERT INTO "projected_crs" VALUES('EPSG','3407','Hong Kong 1963 Grid System',NULL,NULL,'EPSG','4502','EPSG','4738','EPSG','19896','EPSG','1118',NULL,0);
-INSERT INTO "projected_crs" VALUES('EPSG','3408','NSIDC EASE-Grid North',NULL,NULL,'EPSG','4469','EPSG','4053','EPSG','3897','EPSG','3475',NULL,0);
-INSERT INTO "projected_crs" VALUES('EPSG','3409','NSIDC EASE-Grid South',NULL,NULL,'EPSG','4470','EPSG','4053','EPSG','3898','EPSG','3474',NULL,0);
-INSERT INTO "projected_crs" VALUES('EPSG','3410','NSIDC EASE-Grid Global',NULL,NULL,'EPSG','4499','EPSG','4053','EPSG','19869','EPSG','3463',NULL,0);
-INSERT INTO "projected_crs" VALUES('EPSG','3411','NSIDC Sea Ice Polar Stereographic North',NULL,NULL,'EPSG','4468','EPSG','4054','EPSG','19865','EPSG','1996',NULL,0);
-INSERT INTO "projected_crs" VALUES('EPSG','3412','NSIDC Sea Ice Polar Stereographic South',NULL,NULL,'EPSG','4470','EPSG','4054','EPSG','19866','EPSG','1997',NULL,0);
+INSERT INTO "projected_crs" VALUES('EPSG','3408','NSIDC EASE-Grid North',NULL,NULL,'EPSG','4469','EPSG','4053','EPSG','3897','EPSG','3475',NULL,1);
+INSERT INTO "projected_crs" VALUES('EPSG','3409','NSIDC EASE-Grid South',NULL,NULL,'EPSG','4470','EPSG','4053','EPSG','3898','EPSG','3474',NULL,1);
+INSERT INTO "projected_crs" VALUES('EPSG','3410','NSIDC EASE-Grid Global',NULL,NULL,'EPSG','4499','EPSG','4053','EPSG','19869','EPSG','3463',NULL,1);
+INSERT INTO "projected_crs" VALUES('EPSG','3411','NSIDC Sea Ice Polar Stereographic North',NULL,NULL,'EPSG','4468','EPSG','4054','EPSG','19865','EPSG','1996',NULL,1);
+INSERT INTO "projected_crs" VALUES('EPSG','3412','NSIDC Sea Ice Polar Stereographic South',NULL,NULL,'EPSG','4470','EPSG','4054','EPSG','19866','EPSG','1997',NULL,1);
 INSERT INTO "projected_crs" VALUES('EPSG','3413','WGS 84 / NSIDC Sea Ice Polar Stereographic North',NULL,NULL,'EPSG','4468','EPSG','4326','EPSG','19865','EPSG','1996',NULL,0);
 INSERT INTO "projected_crs" VALUES('EPSG','3414','SVY21 / Singapore TM',NULL,NULL,'EPSG','4500','EPSG','4757','EPSG','19864','EPSG','1210',NULL,0);
 INSERT INTO "projected_crs" VALUES('EPSG','3415','WGS 72BE / South China Sea Lambert',NULL,NULL,'EPSG','4400','EPSG','4324','EPSG','19863','EPSG','3470',NULL,0);
@@ -1898,7 +1898,7 @@ INSERT INTO "projected_crs" VALUES('EPSG','4071','Chua / UTM zone 23S',NULL,NULL
 INSERT INTO "projected_crs" VALUES('EPSG','4082','REGCAN95 / UTM zone 27N',NULL,NULL,'EPSG','4400','EPSG','4081','EPSG','16027','EPSG','3629',NULL,0);
 INSERT INTO "projected_crs" VALUES('EPSG','4083','REGCAN95 / UTM zone 28N',NULL,NULL,'EPSG','4400','EPSG','4081','EPSG','16028','EPSG','3630',NULL,0);
 INSERT INTO "projected_crs" VALUES('EPSG','4087','WGS 84 / World Equidistant Cylindrical',NULL,NULL,'EPSG','4499','EPSG','4326','EPSG','4085','EPSG','1262',NULL,0);
-INSERT INTO "projected_crs" VALUES('EPSG','4088','World Equidistant Cylindrical (Sphere)',NULL,NULL,'EPSG','4499','EPSG','4047','EPSG','4086','EPSG','1262',NULL,0);
+INSERT INTO "projected_crs" VALUES('EPSG','4088','World Equidistant Cylindrical (Sphere)',NULL,NULL,'EPSG','4499','EPSG','4047','EPSG','4086','EPSG','1262',NULL,1);
 INSERT INTO "projected_crs" VALUES('EPSG','4093','ETRS89 / DKTM1',NULL,NULL,'EPSG','4400','EPSG','4258','EPSG','4089','EPSG','3631',NULL,0);
 INSERT INTO "projected_crs" VALUES('EPSG','4094','ETRS89 / DKTM2',NULL,NULL,'EPSG','4400','EPSG','4258','EPSG','4090','EPSG','3632',NULL,0);
 INSERT INTO "projected_crs" VALUES('EPSG','4095','ETRS89 / DKTM3',NULL,NULL,'EPSG','4400','EPSG','4258','EPSG','4091','EPSG','2532',NULL,0);
@@ -2282,8 +2282,8 @@ INSERT INTO "projected_crs" VALUES('EPSG','5532','SAD69(96) / UTM zone 22S',NULL
 INSERT INTO "projected_crs" VALUES('EPSG','5533','SAD69(96) / UTM zone 23S',NULL,NULL,'EPSG','4400','EPSG','5527','EPSG','16123','EPSG','3445',NULL,0);
 INSERT INTO "projected_crs" VALUES('EPSG','5534','SAD69(96) / UTM zone 24S',NULL,NULL,'EPSG','4400','EPSG','5527','EPSG','16124','EPSG','3446',NULL,0);
 INSERT INTO "projected_crs" VALUES('EPSG','5535','SAD69(96) / UTM zone 25S',NULL,NULL,'EPSG','4400','EPSG','5527','EPSG','16125','EPSG','3447',NULL,0);
-INSERT INTO "projected_crs" VALUES('EPSG','5536','Corrego Alegre 1961 / UTM zone 21S',NULL,NULL,'EPSG','4400','EPSG','5524','EPSG','16121','EPSG','3355',NULL,0);
-INSERT INTO "projected_crs" VALUES('EPSG','5537','Corrego Alegre 1961 / UTM zone 22S',NULL,NULL,'EPSG','4400','EPSG','5524','EPSG','16122','EPSG','3176',NULL,0);
+INSERT INTO "projected_crs" VALUES('EPSG','5536','Corrego Alegre 1961 / UTM zone 21S',NULL,NULL,'EPSG','4400','EPSG','5524','EPSG','16121','EPSG','4574',NULL,0);
+INSERT INTO "projected_crs" VALUES('EPSG','5537','Corrego Alegre 1961 / UTM zone 22S',NULL,NULL,'EPSG','4400','EPSG','5524','EPSG','16122','EPSG','4576',NULL,0);
 INSERT INTO "projected_crs" VALUES('EPSG','5538','Corrego Alegre 1961 / UTM zone 23S',NULL,NULL,'EPSG','4400','EPSG','5524','EPSG','16123','EPSG','3177',NULL,0);
 INSERT INTO "projected_crs" VALUES('EPSG','5539','Corrego Alegre 1961 / UTM zone 24S',NULL,NULL,'EPSG','4400','EPSG','5524','EPSG','16124','EPSG','3877',NULL,0);
 INSERT INTO "projected_crs" VALUES('EPSG','5550','PNG94 / PNGMG94 zone 54',NULL,NULL,'EPSG','4400','EPSG','5546','EPSG','5547','EPSG','3882',NULL,0);
@@ -2379,7 +2379,7 @@ INSERT INTO "projected_crs" VALUES('EPSG','5877','SAD69(96) / UTM zone 20S',NULL
 INSERT INTO "projected_crs" VALUES('EPSG','5879','Cadastre 1997 / UTM zone 38S',NULL,NULL,'EPSG','4400','EPSG','4475','EPSG','16138','EPSG','3340',NULL,0);
 INSERT INTO "projected_crs" VALUES('EPSG','5880','SIRGAS 2000 / Brazil Polyconic',NULL,NULL,'EPSG','4499','EPSG','4674','EPSG','19941','EPSG','1053',NULL,0);
 INSERT INTO "projected_crs" VALUES('EPSG','5887','TGD2005 / Tonga Map Grid',NULL,NULL,'EPSG','4400','EPSG','5886','EPSG','5883','EPSG','1234',NULL,0);
-INSERT INTO "projected_crs" VALUES('EPSG','5890','JAXA Snow Depth Polar Stereographic North',NULL,NULL,'EPSG','1035','EPSG','4054','EPSG','5889','EPSG','1996',NULL,0);
+INSERT INTO "projected_crs" VALUES('EPSG','5890','JAXA Snow Depth Polar Stereographic North',NULL,NULL,'EPSG','1035','EPSG','4054','EPSG','5889','EPSG','1996',NULL,1);
 INSERT INTO "projected_crs" VALUES('EPSG','5896','VN-2000 / TM-3 zone 481',NULL,NULL,'EPSG','4400','EPSG','4756','EPSG','5892','EPSG','4193',NULL,0);
 INSERT INTO "projected_crs" VALUES('EPSG','5897','VN-2000 / TM-3 zone 482',NULL,NULL,'EPSG','4400','EPSG','4756','EPSG','5893','EPSG','4215',NULL,0);
 INSERT INTO "projected_crs" VALUES('EPSG','5898','VN-2000 / TM-3 zone 491',NULL,NULL,'EPSG','4400','EPSG','4756','EPSG','5894','EPSG','4217',NULL,0);
@@ -3611,6 +3611,10 @@ INSERT INTO "projected_crs" VALUES('EPSG','9272','MGI / Austria Central',NULL,NU
 INSERT INTO "projected_crs" VALUES('EPSG','9273','MGI / Austria East',NULL,NULL,'EPSG','4530','EPSG','4312','EPSG','9270','EPSG','1708',NULL,0);
 INSERT INTO "projected_crs" VALUES('EPSG','9284','Pampa del Castillo / Argentina 1',NULL,NULL,'EPSG','4530','EPSG','4161','EPSG','18031','EPSG','4564',NULL,0);
 INSERT INTO "projected_crs" VALUES('EPSG','9285','Pampa del Castillo / Argentina 3',NULL,NULL,'EPSG','4530','EPSG','4161','EPSG','18033','EPSG','4565',NULL,0);
+INSERT INTO "projected_crs" VALUES('EPSG','9295','ONGD17 / UTM zone 39N',NULL,NULL,'EPSG','4400','EPSG','9294','EPSG','16039','EPSG','4322',NULL,0);
+INSERT INTO "projected_crs" VALUES('EPSG','9296','ONGD17 / UTM zone 40N',NULL,NULL,'EPSG','4400','EPSG','9294','EPSG','16040','EPSG','4323',NULL,0);
+INSERT INTO "projected_crs" VALUES('EPSG','9297','ONGD17 / UTM zone 41N',NULL,NULL,'EPSG','4400','EPSG','9294','EPSG','16041','EPSG','4324',NULL,0);
+INSERT INTO "projected_crs" VALUES('EPSG','9311','NAD27 / US National Atlas Equal Area',NULL,NULL,'EPSG','4499','EPSG','4267','EPSG','3899','EPSG','1245',NULL,0);
 INSERT INTO "projected_crs" VALUES('EPSG','20004','Pulkovo 1995 / Gauss-Kruger zone 4',NULL,NULL,'EPSG','4530','EPSG','4200','EPSG','16204','EPSG','1763',NULL,0);
 INSERT INTO "projected_crs" VALUES('EPSG','20005','Pulkovo 1995 / Gauss-Kruger zone 5',NULL,NULL,'EPSG','4530','EPSG','4200','EPSG','16205','EPSG','1764',NULL,0);
 INSERT INTO "projected_crs" VALUES('EPSG','20006','Pulkovo 1995 / Gauss-Kruger zone 6',NULL,NULL,'EPSG','4530','EPSG','4200','EPSG','16206','EPSG','1765',NULL,0);
@@ -3789,9 +3793,9 @@ INSERT INTO "projected_crs" VALUES('EPSG','22185','POSGAR 94 / Argentina 5',NULL
 INSERT INTO "projected_crs" VALUES('EPSG','22186','POSGAR 94 / Argentina 6',NULL,NULL,'EPSG','4530','EPSG','4694','EPSG','18036','EPSG','1613',NULL,0);
 INSERT INTO "projected_crs" VALUES('EPSG','22187','POSGAR 94 / Argentina 7',NULL,NULL,'EPSG','4530','EPSG','4694','EPSG','18037','EPSG','1614',NULL,0);
 INSERT INTO "projected_crs" VALUES('EPSG','22191','Campo Inchauspe / Argentina 1',NULL,NULL,'EPSG','4530','EPSG','4221','EPSG','18031','EPSG','1608',NULL,0);
-INSERT INTO "projected_crs" VALUES('EPSG','22192','Campo Inchauspe / Argentina 2',NULL,NULL,'EPSG','4530','EPSG','4221','EPSG','18032','EPSG','1609',NULL,0);
-INSERT INTO "projected_crs" VALUES('EPSG','22193','Campo Inchauspe / Argentina 3',NULL,NULL,'EPSG','4530','EPSG','4221','EPSG','18033','EPSG','1610',NULL,0);
-INSERT INTO "projected_crs" VALUES('EPSG','22194','Campo Inchauspe / Argentina 4',NULL,NULL,'EPSG','4530','EPSG','4221','EPSG','18034','EPSG','1611',NULL,0);
+INSERT INTO "projected_crs" VALUES('EPSG','22192','Campo Inchauspe / Argentina 2',NULL,NULL,'EPSG','4530','EPSG','4221','EPSG','18032','EPSG','4577',NULL,0);
+INSERT INTO "projected_crs" VALUES('EPSG','22193','Campo Inchauspe / Argentina 3',NULL,NULL,'EPSG','4530','EPSG','4221','EPSG','18033','EPSG','4578',NULL,0);
+INSERT INTO "projected_crs" VALUES('EPSG','22194','Campo Inchauspe / Argentina 4',NULL,NULL,'EPSG','4530','EPSG','4221','EPSG','18034','EPSG','4579',NULL,0);
 INSERT INTO "projected_crs" VALUES('EPSG','22195','Campo Inchauspe / Argentina 5',NULL,NULL,'EPSG','4530','EPSG','4221','EPSG','18035','EPSG','1612',NULL,0);
 INSERT INTO "projected_crs" VALUES('EPSG','22196','Campo Inchauspe / Argentina 6',NULL,NULL,'EPSG','4530','EPSG','4221','EPSG','18036','EPSG','1613',NULL,0);
 INSERT INTO "projected_crs" VALUES('EPSG','22197','Campo Inchauspe / Argentina 7',NULL,NULL,'EPSG','4530','EPSG','4221','EPSG','18037','EPSG','1614',NULL,0);

data/sql/vertical_crs.sql

@@ -78,9 +78,9 @@ INSERT INTO "vertical_crs" VALUES('EPSG','5743','Foula height',NULL,NULL,'EPSG',
 INSERT INTO "vertical_crs" VALUES('EPSG','5744','Sule Skerry height',NULL,NULL,'EPSG','6499','EPSG','5142','EPSG','2797',0);
 INSERT INTO "vertical_crs" VALUES('EPSG','5745','North Rona height',NULL,NULL,'EPSG','6499','EPSG','5143','EPSG','2798',0);
 INSERT INTO "vertical_crs" VALUES('EPSG','5746','Stornoway height',NULL,NULL,'EPSG','6499','EPSG','5144','EPSG','2799',0);
-INSERT INTO "vertical_crs" VALUES('EPSG','5747','St Kilda height',NULL,NULL,'EPSG','6499','EPSG','5145','EPSG','2800',0);
+INSERT INTO "vertical_crs" VALUES('EPSG','5747','St. Kilda height',NULL,NULL,'EPSG','6499','EPSG','5145','EPSG','2800',0);
 INSERT INTO "vertical_crs" VALUES('EPSG','5748','Flannan Isles height',NULL,NULL,'EPSG','6499','EPSG','5146','EPSG','2801',0);
-INSERT INTO "vertical_crs" VALUES('EPSG','5749','St Marys height',NULL,NULL,'EPSG','6499','EPSG','5147','EPSG','2802',0);
+INSERT INTO "vertical_crs" VALUES('EPSG','5749','St. Marys height',NULL,NULL,'EPSG','6499','EPSG','5147','EPSG','2802',0);
 INSERT INTO "vertical_crs" VALUES('EPSG','5750','Douglas height',NULL,NULL,'EPSG','6499','EPSG','5148','EPSG','2803',0);
 INSERT INTO "vertical_crs" VALUES('EPSG','5751','Fao height',NULL,NULL,'EPSG','6499','EPSG','5149','EPSG','3390',0);
 INSERT INTO "vertical_crs" VALUES('EPSG','5752','Bandar Abbas height',NULL,NULL,'EPSG','6499','EPSG','5150','EPSG','3336',0);

data/sql/vertical_datum.sql

@@ -128,9 +128,9 @@ INSERT INTO "vertical_datum" VALUES('EPSG','5141','Foula',NULL,NULL,'EPSG','2796
 INSERT INTO "vertical_datum" VALUES('EPSG','5142','Sule Skerry',NULL,NULL,'EPSG','2797',NULL,0);
 INSERT INTO "vertical_datum" VALUES('EPSG','5143','North Rona',NULL,NULL,'EPSG','2798',NULL,0);
 INSERT INTO "vertical_datum" VALUES('EPSG','5144','Stornoway',NULL,NULL,'EPSG','2799',NULL,0);
-INSERT INTO "vertical_datum" VALUES('EPSG','5145','St Kilda',NULL,NULL,'EPSG','2800',NULL,0);
+INSERT INTO "vertical_datum" VALUES('EPSG','5145','St. Kilda',NULL,NULL,'EPSG','2800',NULL,0);
 INSERT INTO "vertical_datum" VALUES('EPSG','5146','Flannan Isles',NULL,NULL,'EPSG','2801',NULL,0);
-INSERT INTO "vertical_datum" VALUES('EPSG','5147','St Marys',NULL,NULL,'EPSG','2802',NULL,0);
+INSERT INTO "vertical_datum" VALUES('EPSG','5147','St. Marys',NULL,NULL,'EPSG','2802',NULL,0);
 INSERT INTO "vertical_datum" VALUES('EPSG','5148','Douglas',NULL,NULL,'EPSG','2803',NULL,0);
 INSERT INTO "vertical_datum" VALUES('EPSG','5149','Fao',NULL,NULL,'EPSG','3390',NULL,0);
 INSERT INTO "vertical_datum" VALUES('EPSG','5150','Bandar Abbas',NULL,NULL,'EPSG','3336','2001-01-01',0);

docs/source/apps/cs2cs.rst

@@ -15,19 +15,16 @@ Synopsis
 
 or
 
-    **cs2cs** [**-eEfIlrstvwW** [args]] {source_crs} +to {target_crs} file ...
+    **cs2cs** [**-eEfIlrstvwW** [args]] {source_crs} {target_crs} file ...
 
     where {source_crs} or {target_crs} is a PROJ string, a WKT string or a AUTHORITY:CODE
     (where AUTHORITY is the name of a CRS authority and CODE the code of a CRS
     found in the proj.db database), expressing a coordinate reference system.
 
-.. versionadded:: 6.0.0
+    .. versionadded:: 6.0.0
 
-or
-
-    **cs2cs** [**-eEfIlrstvwW** [args]] {source_crs} {target_crs}
-
-.. versionadded:: 6.0.0
+    .. note:: before 7.0.1, it was needed to add +to between {source_crs} and {target_crs}
+              when adding a filename
 
 Description
 ***********
@@ -93,13 +90,18 @@ The following control parameters can appear in any order:
 
 .. option:: -r
 
-    This options reverses the order of the expected input from
-    longitude-latitude or x-y to latitude-longitude or y-x.
+    This options reverses the order of the first two expected
+    inputs from that specified by the CRS to the opposite
+    order.  The third coordinate, typically height, remains
+    third.
 
 .. option:: -s
 
-    This options reverses the order of the output from x-y or longitude-latitude
-    to y-x or latitude-longitude.
+    This options reverses the order of the first two expected
+    outputs from that specified by the CRS to the opposite
+    order.  The third coordinate, typically height, remains
+    third.
+
 
 .. option:: -f <format>
 

docs/source/community/rfc/rfc-4.rst

@@ -103,7 +103,7 @@ environment variable.
 
 The rationale for putting proj.ini in that location is
 that it is a well-known place by PROJ users, with the existing PROJ_LIB mechanics
-for systems like Windows where hardcoded paths at runtime aren't generaly usable.
+for systems like Windows where hardcoded paths at runtime aren't generally usable.
 
 C API
 +++++
@@ -492,7 +492,7 @@ Limitations of current formats
 ++++++++++++++++++++++++++++++
 
 Several formats exist depending on the ad-hoc needs and ideas of the original
-data producer. It would be apropriate to converge on a common format able to
+data producer. It would be appropriate to converge on a common format able to
 address the different use cases.
 
 - Not tiled. Tiling is a nice to have propery for cloud-friendly access to
@@ -538,7 +538,7 @@ Strong points:
   geospatial field to store multi-resolution/pyramid rasters. So it can be
   used with sub-grids as in the NTv2 format.
 
-* Extensive experience with the TIFF format, and its appropriatness for network
+* Extensive experience with the TIFF format, and its appropriateness for network
   access, in particular through the `Cloud Optimized GeoTIFF initiative <https://www.cogeo.org/>`_
   whose layout can make use of sub-grids efficient from a network access
   perspective, because grid headers can be put at the beginning of the file, and

docs/source/community/rfc/rfc-5.rst

@@ -86,7 +86,7 @@ Summary of work planned by this RFC and related decisions
 - Obviously, all the above assumes PROJ builds to have libtiff enabled.
   Non-libtiff builds are not considered as nominal PROJ builds (if a PROJ master
   build is attempted and libtiff is not detected, it fails. The user has to
-  explictly ask to disable TIFF support), and users deciding to go through that
+  explicitly ask to disable TIFF support), and users deciding to go through that
   route will have to deal with the consequences (that is that
   grid-based transformations generated by PROJ will likely be non working)
 

docs/source/conf.py

@@ -68,7 +68,8 @@ copyright = u'1983-{0}'.format(now.year)
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
-version = '7.0.0'
+version = '7.0.1'
+data_version = '1.0'
 
 # use same |release| as |version|
 release = version
@@ -120,6 +121,22 @@ highlight_language = 'none'
 # If true, `todo` and `todoList` produce output, else they produce nothing.
 todo_include_todos = False
 
+# Replacement macros for use in code-blocks etc. With inspiration from
+# https://github.com/sphinx-doc/sphinx/issues/4054#issuecomment-329097229
+def replace_words(app, docname, source):
+    result = source[0]
+    for key in app.config.replacements:
+        result = result.replace(key, app.config.replacements[key])
+    source[0] = result
+
+replacements = {
+    "{PROJVERSION}" : "{version_number}".format(version_number=version),
+    "{PROJDATAVERSION}" : "{data_version_number}".format(data_version_number=data_version),
+}
+
+def setup(app):
+   app.add_config_value('replacements', {}, True)
+   app.connect('source-read', replace_words)
 
 # -- Options for HTML output ----------------------------------------------
 
@@ -176,7 +193,7 @@ html_context = {
     'github_user': 'OSGeo',
     'github_repo': 'PROJ',
     # TODO: edit when switching active branch
-    'github_version': '/6.3/docs/source/',
+    'github_version': '/7.0/docs/source/',
     'css_files': [
         '_static/theme_overrides.css',  # override wide tables in RTD theme
     ],

docs/source/development/reference/datatypes.rst

@@ -37,15 +37,15 @@ Transformation objects
             PJ_INV   = -1    /* Inverse    */
         } PJ_DIRECTION;
 
-    .. c:member:: PJ_FWD
+    .. cpp:enumerator:: PJ_FWD
 
         Perform transformation in the forward direction.
 
-    .. c:member:: PJ_IDENT
+    .. cpp:enumerator:: PJ_IDENT
 
         Identity. Do nothing.
 
-    .. c:member:: PJ_INV
+    .. cpp:enumerator:: PJ_INV
 
         Perform transformation in the inverse direction.
 
@@ -486,7 +486,7 @@ List structures
 
         Operation entry point.
 
-    .. c:member:: char * const *
+    .. c:member:: char * const * descr
 
         Description of operation.
 
@@ -755,24 +755,24 @@ Logging
     Enum of logging levels in PROJ. Used to set the logging level in PROJ.
     Usually using :c:func:`proj_log_level`.
 
-    .. c:member:: PJ_LOG_NONE
+    .. cpp:enumerator:: PJ_LOG_NONE
 
         Don't log anything.
 
-    .. c:member:: PJ_LOG_ERROR
+    .. cpp:enumerator:: PJ_LOG_ERROR
 
         Log only errors.
 
-    .. c:member:: PJ_LOG_DEBUG
+    .. cpp:enumerator:: PJ_LOG_DEBUG
 
         Log errors and additional debug information.
 
-    .. c:member:: PJ_LOG_TRACE
+    .. cpp:enumerator:: PJ_LOG_TRACE
 
         Highest logging level. Log everything including very detailed debug
         information.
 
-    .. c:member:: PJ_LOG_TELL
+    .. cpp:enumerator:: PJ_LOG_TELL
 
         Special logging level that when used in :c:func:`proj_log_level`
         will return the current logging level set in PROJ.
@@ -788,9 +788,9 @@ Logging
 
         typedef void (*PJ_LOG_FUNCTION)(void *, int, const char *);
 
-    where the :c:type:`void` pointer references a data structure used by the
-    calling application, the :c:type:`int` is used to set the logging level
-    and the :c:type:`const char` pointer is the string that will be logged
+    where the first argument (void pointer) references a data structure used by the
+    calling application, the second argument (int type) is used to set the logging level
+    and the third argument (const char pointer) is the string that will be logged
     by the function.
 
 

docs/source/development/reference/functions.rst

@@ -11,13 +11,15 @@ Threading contexts
 
     Create a new threading-context.
 
-    :returns: :c:type:`PJ_CONTEXT*`
+    :returns: a new context
 
 .. c:function:: void proj_context_destroy(PJ_CONTEXT *ctx)
 
     Deallocate a threading-context.
 
-    :param PJ_CONTEXT* ctx: Threading context.
+    :param ctx: Threading context.
+    :type ctx: :c:type:`PJ_CONTEXT` *
+
 
 Transformation setup
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -63,9 +65,10 @@ paragraph for more details.
 
     The returned :c:type:`PJ`-pointer should be deallocated with :c:func:`proj_destroy`.
 
-    :param PJ_CONTEXT* ctx: Threading context.
-    :param `definition`: Proj-string of the desired transformation.
-    :type `definition`: const char*
+    :param ctx: Threading context.
+    :type ctx: :c:type:`PJ_CONTEXT` *
+    :param definition: Proj-string of the desired transformation.
+    :type definition: `const char*`
 
 
 .. c:function:: PJ* proj_create_argv(PJ_CONTEXT *ctx, int argc, char **argv)
@@ -93,10 +96,13 @@ paragraph for more details.
 
     The returned :c:type:`PJ`-pointer should be deallocated with :c:func:`proj_destroy`.
 
-    :param PJ_CONTEXT* ctx: Threading context
-    :param int argc: Count of arguments in :c:data:`argv`
-    :param char** argv: Vector of strings with proj-string parameters, e.g. ``+proj=merc``
-    :returns: :c:type:`PJ*`
+    :param ctx: Threading context.
+    :type ctx: :c:type:`PJ_CONTEXT` *
+    :param argc: Count of arguments in :c:data:`argv`
+    :type argc: `int`
+    :param argv: Array of strings with proj-string parameters, e.g. ``+proj=merc``
+    :type argv: `char **`
+    :returns: :c:type:`PJ` *
 
 .. c:function:: PJ* proj_create_crs_to_crs(PJ_CONTEXT *ctx, const char *source_crs, const char *target_crs, PJ_AREA *area)
 
@@ -144,14 +150,15 @@ paragraph for more details.
 
     The returned :c:type:`PJ`-pointer should be deallocated with :c:func:`proj_destroy`.
 
-    :param PJ_CONTEXT* ctx: Threading context.
+    :param ctx: Threading context.
+    :type ctx: :c:type:`PJ_CONTEXT` *
     :param `source_crs`: Source CRS.
-    :type `source_crs`: const char*
+    :type `source_crs`: `const char*`
     :param `target_crs`: Destination SRS.
-    :type `target_crs`: const char*
+    :type `target_crs`: `const char*`
     :param `area`: Descriptor of the desired area for the transformation.
-    :type `area`: PJ_AREA
-    :returns: :c:type:`PJ*`
+    :type `area`: :c:type:`PJ_AREA` *
+    :returns: :c:type:`PJ` *
 
 .. c:function:: PJ* proj_create_crs_to_crs_from_pj(PJ_CONTEXT *ctx, PJ *source_crs, PJ *target_crs, PJ_AREA *area, const char* const *options)
 
@@ -179,17 +186,20 @@ paragraph for more details.
 
     The returned :c:type:`PJ`-pointer should be deallocated with :c:func:`proj_destroy`.
 
-    :param PJ_CONTEXT* ctx: Threading context.
+    :param ctx: Threading context.
+    :type ctx: :c:type:`PJ_CONTEXT` *
     :param `obj`: Object of type CoordinateOperation
-    :returns: :c:type:`PJ*`
+    :type `obj`: const :c:type:`PJ` *
+    :returns: :c:type:`PJ` *
 
 
 .. c:function:: PJ* proj_destroy(PJ *P)
 
     Deallocate a :c:type:`PJ` transformation object.
 
-    :param PJ* P:
-    :returns: :c:type:`PJ*`
+    :param `P`: Transformation object
+    :type `P`: const :c:type:`PJ` *
+    :returns: :c:type:`PJ` *
 
 Area of interest
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -204,7 +214,7 @@ Area of interest
     Such an area of use is to be passed to :c:func:`proj_create_crs_to_crs` to
     specify the area of use for the choice of relevant coordinate operations.
 
-    :returns: :c:type:`PJ_AREA*` to be deallocated with :c:func:`proj_area_destroy`
+    :returns: :c:type:`PJ_AREA` * to be deallocated with :c:func:`proj_area_destroy`
 
 
 .. c:function:: void proj_area_set_bbox(PJ_AREA *area, double west_lon_degree, double south_lat_degree, double east_lon_degree, double north_lat_degree)
@@ -240,16 +250,19 @@ Coordinate transformation
 
     Transform a single :c:type:`PJ_COORD` coordinate.
 
-    :param PJ* P:
+    :param P: Transformation object
+    :type P: :c:type:`PJ` *
     :param `direction`: Transformation direction.
     :type `direction`: PJ_DIRECTION
-    :param PJ_COORD coord: Coordinate that will be transformed.
+    :param coord: Coordinate that will be transformed.
+    :type coord: :c:type:`PJ_COORD`
     :returns: :c:type:`PJ_COORD`
 
 
 .. c:function:: size_t proj_trans_generic(PJ *P, PJ_DIRECTION direction, \
-                                          double *x, size_t sx, size_t nx, double *y, \
-                                          size_t sy, size_t ny, double *z, size_t sz, size_t nz, \
+                                          double *x, size_t sx, size_t nx, \
+                                          double *y, size_t sy, size_t ny, \
+                                          double *z, size_t sz, size_t nz, \
                                           double *t, size_t st, size_t nt)
 
     Transform a series of coordinates, where the individual coordinate dimension
@@ -289,11 +302,11 @@ Coordinate transformation
         ...
 
         proj_trans_generic (
-            P, PJ_INV, sizeof(XYQS),
+            P, PJ_INV,
             &(survey[0].x), stride, 345,  /*  We have 345 eastings  */
             &(survey[0].y), stride, 345,  /*  ...and 345 northings. */
-            &height, 1,                   /*  The height is the constant  23.45 m */
-            0, 0                          /*  and the time is the constant 0.00 s */
+            &height, sizeof(double), 1,   /*  The height is the constant  23.45 m */
+            0, 0, 0                       /*  and the time is the constant 0.00 s */
         );
 
     This is similar to the inner workings of the deprecated :c:func:`pj_transform`
@@ -313,21 +326,34 @@ Coordinate transformation
               will return from the call in altered state. Hence, remember to
               reinitialize between repeated calls.
 
-    :param PJ* P: Transformation object
-    :param `direction`: Transformation direction
-    :type `PJ_DIRECTION`:
-    :param double* x: Array of x-coordinates
-    :param double* y: Array of y-coordinates
-    :param double* z: Array of z-coordinates
-    :param double* t: Array of t-coordinates
-    :param size_t sx: Step length, in bytes, between consecutive elements of the corresponding array
-    :param size_t nx: Number of elements in the corresponding array
-    :param size_t sy: Step length, in bytes, between consecutive elements of the corresponding array
-    :param size_t nv: Number of elements in the corresponding array
-    :param size_t sz: Step length, in bytes, between consecutive elements of the corresponding array
-    :param size_t nz: Number of elements in the corresponding array
-    :param size_t st: Step length, in bytes, between consecutive elements of the corresponding array
-    :param size_t nt: Number of elements in the corresponding array
+    :param P: Transformation object
+    :type P: :c:type:`PJ` *
+    :param direction: Transformation direction.
+    :type direction: PJ_DIRECTION
+    :param x: Array of x-coordinates
+    :type x: `double *`
+    :param sx: Step length, in bytes, between consecutive elements of the corresponding array
+    :type sx: `size_t`
+    :param nx: Number of elements in the corresponding array
+    :type nx: `size_t`
+    :param y: Array of y-coordinates
+    :type y: `double *`
+    :param sy: Step length, in bytes, between consecutive elements of the corresponding array
+    :type sy: `size_t`
+    :param ny: Number of elements in the corresponding array
+    :type ny: `size_t`
+    :param z: Array of z-coordinates
+    :type z: `double *`
+    :param sz: Step length, in bytes, between consecutive elements of the corresponding array
+    :type sz: `size_t`
+    :param nz: Number of elements in the corresponding array
+    :type nz: `size_t`
+    :param t: Array of t-coordinates
+    :type t: `double *`
+    :param st: Step length, in bytes, between consecutive elements of the corresponding array
+    :type st: `size_t`
+    :param nt: Number of elements in the corresponding array
+    :type nt: `size_t`
     :returns: Number of transformations successfully completed
 
 
@@ -336,10 +362,12 @@ Coordinate transformation
 
     Batch transform an array of :c:type:`PJ_COORD`.
 
-    :param PJ* P:
-    :param `direction`: Transformation direction
+    :param P: Transformation object
+    :type P: :c:type:`PJ` *
+    :param `direction`: Transformation direction.
     :type `direction`: PJ_DIRECTION
-    :param size_t n: Number of coordinates in :c:data:`coord`
+    :param n: Number of coordinates in :c:data:`coord`
+    :type n: `size_t`
     :returns: :c:type:`size_t` 0 if all observations are transformed without error, otherwise returns error number
 
 
@@ -354,9 +382,10 @@ Error reporting
     context is read. A text representation of the error number can be retrieved
     with :c:func:`proj_errno_string`.
 
-    :param: PJ* P: Transformation object.
+    :param P: Transformation object
+    :type P: :c:type:`PJ` *
 
-    :returns: :c:type:`int`
+    :returns: `int`
 
 .. c:function:: int proj_context_errno(PJ_CONTEXT *ctx)
 
@@ -365,16 +394,19 @@ Error reporting
     transformation. A text representation of the error number can be retrieved
     with :c:func:`proj_errno_string`.
 
-    :param: PJ_CONTEXT* ctx: threading context.
+    :param ctx: threading context.
+    :type ctx: :c:type:`PJ_CONTEXT` *
 
-    :returns: :c:type:`int`
+    :returns: `int`
 
 .. c:function:: void proj_errno_set(PJ *P, int err)
 
-Change the error-state of :c:data:`P` to `err`.
+    Change the error-state of :c:data:`P` to `err`.
 
-    :param PJ* P: Transformation object.
-    :param int err: Error number.
+    :param P: Transformation object
+    :type P: :c:type:`PJ` *
+    :param err: Error number.
+    :type err: `int`
 
 .. c:function:: int proj_errno_reset(PJ *P)
 
@@ -397,9 +429,10 @@ Change the error-state of :c:data:`P` to `err`.
             return;
         }
 
-    :param: PJ* P: Transformation object.
+    :param P: Transformation object
+    :type P: :c:type:`PJ` *
 
-    :returns: :c:type:`int` Returns the previous value of the errno, for convenient reset/restore operations.
+    :returns: `int` Returns the previous value of the errno, for convenient reset/restore operations.
 
 .. c:function:: void proj_errno_restore(PJ *P, int err)
 
@@ -414,8 +447,10 @@ Change the error-state of :c:data:`P` to `err`.
 
     See usage example under :c:func:`proj_errno_reset`
 
-    :param PJ* P: Transformation object.
-    :param int err: Error code.
+    :param P: Transformation object
+    :type P: :c:type:`PJ` *
+    :param err: Error number.
+    :type err: `int`
 
 .. c:function:: const char* proj_errno_string(int err)
 
@@ -423,9 +458,10 @@ Change the error-state of :c:data:`P` to `err`.
 
     Get a text representation of an error number.
 
-    :param int err: Error number.
+    :param err: Error number.
+    :type err: `int`
 
-    :returns: :c:type:`const char*` String with description of error.
+    :returns: `const char*` String with description of error.
 
 Logging
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -437,8 +473,10 @@ Logging
     :c:data:`level` set to :c:type:`PJ_LOG_TELL` the function returns the current
     logging level without changing it.
 
-    :param PJ_CONTEXT* ctx: Threading context.
-    :param PJ_LOG_LEVEL level: New logging level.
+    :param ctx: Threading context.
+    :type ctx: :c:type:`PJ_CONTEXT` *
+    :param level: New logging level.
+    :type level: PJ_LOG_LEVEL
 
     :returns: :c:type:`PJ_LOG_LEVEL`
 
@@ -448,9 +486,12 @@ Logging
 
     Override the internal log function of PROJ.
 
-    :param PJ_CONTEXT* ctx: Threading context.
-    :param void* app_data: Pointer to data structure used by the calling application.
-    :param PJ_LOG_FUNCTION logf: Log function that overrides the PROJ log function.
+    :param ctx: Threading context.
+    :type ctx: :c:type:`PJ_CONTEXT` *
+    :param app_data: Pointer to data structure used by the calling application.
+    :type app_data: `void *`
+    :param logf: Log function that overrides the PROJ log function.
+    :type logf: :c:type:`PJ_LOG_FUNCTION`
 
     .. versionadded:: 5.1.0
 
@@ -467,8 +508,8 @@ Info functions
 
     Get information about a specific transformation object, :c:data:`P`.
 
-    :param `P`: Transformation object
-    :type `P`: const PJ*
+    :param P: Transformation object
+    :type P: const :c:type:`PJ` *
     :returns: :c:type:`PJ_PROJ_INFO`
 
 .. c:function:: PJ_GRID_INFO proj_grid_info(const char *gridname)
@@ -476,7 +517,7 @@ Info functions
     Get information about a specific grid.
 
     :param `gridname`: Gridname in the PROJ searchpath
-    :type `gridname`: const char*
+    :type `gridname`: `const char*`
     :returns: :c:type:`PJ_GRID_INFO`
 
 .. c:function:: PJ_INIT_INFO proj_init_info(const char *initname)
@@ -484,7 +525,7 @@ Info functions
     Get information about a specific init file.
 
     :param `initname`: Init file in the PROJ searchpath
-    :type `initname`: const char*
+    :type `initname`: `const char*`
     :returns: :c:type:`PJ_INIT_INFO`
 
 Lists
@@ -505,7 +546,7 @@ Lists
             printf("%s\n", ops->id);
 
 
-    :returns: :c:type:`PJ_OPERATIONS*`
+    :returns: const :c:type:`PJ_OPERATIONS` *
 
 .. c:function:: const PJ_ELLPS* proj_list_ellps(void)
 
@@ -513,7 +554,7 @@ Lists
     of the returned array is a NULL-entry. The array is statically allocated
     and does not need to be freed after use.
 
-    :returns: :c:type:`PJ_ELLPS*`
+    :returns: const :c:type:`PJ_ELLPS` *
 
 .. c:function:: const PJ_UNITS* proj_list_units(void)
 
@@ -521,7 +562,7 @@ Lists
     entry of the returned array is a NULL-entry. The array is statically
     allocated and does not need to be freed after use.
 
-    :returns: :c:type:`PJ_UNITS*`
+    :returns: const :c:type:`PJ_UNITS` *
 
 .. c:function:: const PJ_PRIME_MERIDIANS* proj_list_prime_meridians(void)
 
@@ -529,7 +570,7 @@ Lists
     entry of the returned array is a NULL-entry. The array is statically
     allocated and does not need to be freed after use.
 
-    :returns: :c:type:`PJ_PRIME_MERIDIANS*`
+    :returns: const :c:type:`PJ_PRIME_MERIDIANS` *
 
 Distances
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -539,10 +580,11 @@ Distances
     Calculate geodesic distance between two points in geodetic coordinates. The
     calculated distance is between the two points located on the ellipsoid.
 
-    :param PJ* P: Transformation object
+    :param P: Transformation object
+    :type P: const :c:type:`PJ` *
     :param PJ_COORD a: Coordinate of first point
     :param PJ_COORD b: Coordinate of second point
-    :returns: :c:type:`double` Distance between :c:data:`a` and :c:data:`b` in meters.
+    :returns: `double` Distance between :c:data:`a` and :c:data:`b` in meters.
 
 .. c:function:: double proj_lpz_dist(const PJ *P, PJ_COORD a, PJ_COORD b)
 
@@ -550,10 +592,11 @@ Distances
     Similar to :c:func:`proj_lp_dist` but also takes the height above the ellipsoid
     into account.
 
-    :param PJ* P: Transformation object
+    :param P: Transformation object
+    :type P: const :c:type:`PJ` *
     :param PJ_COORD a: Coordinate of first point
     :param PJ_COORD b: Coordinate of second point
-    :returns: :c:type:`double` Distance between :c:data:`a` and :c:data:`b` in meters.
+    :returns: `double` Distance between :c:data:`a` and :c:data:`b` in meters.
 
 .. c:function:: double proj_xy_dist(PJ_COORD a, PJ_COORD b)
 
@@ -561,7 +604,7 @@ Distances
 
     :param PJ_COORD a: First coordinate
     :param PJ_COORD b: Second coordinate
-    :returns: :c:type:`double` Distance between :c:data:`a` and :c:data:`b` in meters.
+    :returns: `double` Distance between :c:data:`a` and :c:data:`b` in meters.
 
 .. c:function:: double proj_xyz_dist(PJ_COORD a, PJ_COORD b)
 
@@ -569,7 +612,7 @@ Distances
 
     :param PJ_COORD a: First coordinate
     :param PJ_COORD b: Second coordinate
-    :returns: :c:type:`double` Distance between :c:data:`a` and :c:data:`b` in meters.
+    :returns: `double` Distance between :c:data:`a` and :c:data:`b` in meters.
 
 
 Various
@@ -601,10 +644,14 @@ Various
     :c:type:`PJ_UVWT` or :c:type:`PJ_LPZT`.
 
 
-    :param double x: 1st component in a :c:type:`PJ_COORD`
-    :param double y: 2nd component in a :c:type:`PJ_COORD`
-    :param double z: 3rd component in a :c:type:`PJ_COORD`
-    :param double t: 4th component in a :c:type:`PJ_COORD`
+    :param x: 1st component in a :c:type:`PJ_COORD`
+    :type x: `double`
+    :param y: 2nd component in a :c:type:`PJ_COORD`
+    :type y: `double`
+    :param z: 3rd component in a :c:type:`PJ_COORD`
+    :type z: `double`
+    :param t: 4th component in a :c:type:`PJ_COORD`
+    :type t: `double`
     :returns: :c:type:`PJ_COORD`
 
 
@@ -616,13 +663,15 @@ Various
     distance of the starting point :c:data:`coo` and the resulting
     coordinate after :c:data:`n` iterations back and forth.
 
-    :param PJ* P:
-    :type `P`: const PJ*
+    :param P: Transformation object
+    :type P: :c:type:`PJ` *
     :param `direction`: Starting direction of transformation
     :type `direction`: PJ_DIRECTION
-    :param int n: Number of roundtrip transformations
-    :param PJ_COORD coord: Input coordinate
-    :returns: :c:type:`double` Distance between original coordinate and the \
+    :param n: Number of roundtrip transformations
+    :type n: `int`
+    :param coord: Input coordinate
+    :type coord: :c:type:`PJ_COORD` *
+    :returns: `double` Distance between original coordinate and the \
               resulting coordinate after :c:data:`n` transformation iterations.
 
 .. c:function:: PJ_FACTORS proj_factors(PJ *P, PJ_COORD lp)
@@ -634,25 +683,27 @@ Various
     The function also calculates the partial derivatives of the given
     coordinate.
 
-    :param `P`: Transformation object
-    :type `P`: const PJ*
+    :param P: Transformation object
+    :type P: :c:type:`PJ` *
     :param `lp`: Geodetic coordinate
-    :type `lp`: const PJ_COORD
+    :type `lp`: :c:type:`PJ_COORD`
     :returns: :c:type:`PJ_FACTORS`
 
 .. c:function:: double proj_torad(double angle_in_degrees)
 
     Convert degrees to radians.
 
-    :param double angle_in_degrees: Degrees
-    :returns: :c:type:`double` Radians
+    :param angle_in_degrees: Degrees
+    :type angle_in_degrees: `double`
+    :returns: `double` Radians
 
 .. c:function:: double proj_todeg(double angle_in_radians)
 
     Convert radians to degrees
 
-    :param double angle_in_radians: Radians
-    :returns: :c:type:`double` Degrees
+    :param angle_in_radians: Radians
+    :type angle_in_radians: `double`
+    :returns: `double` Degrees
 
 .. c:function:: double proj_dmstor(const char *is, char **rs)
 
@@ -660,7 +711,7 @@ Various
     Works similarly to the C standard library function :c:func:`strtod`.
 
     :param `is`: Value to be converted to radians
-    :type `is`: const  char*
+    :type `is`: `const  char*`
     :param `rs`: Reference to an already allocated char*, whose value is \
                  set by the function to the next character in :c:data:`is` \
                  after the numerical value.
@@ -669,32 +720,36 @@ Various
 
     Convert radians to string representation of degrees, minutes and seconds.
 
-    :param char* s: Buffer that holds the output string
-    :param double r: Value to convert to dms-representation
-    :param int pos: Character denoting positive direction, typically `'N'` or `'E'`.
-    :param int neg: Character denoting negative direction, typically `'S'` or `'W'`.
-    :returns: :c:type:`char*` Pointer to output buffer (same as :c:data:`s`)
+    :param s: Buffer that holds the output string
+    :type s: `char *`
+    :param r: Value to convert to dms-representation
+    :type r: `double`
+    :param pos: Character denoting positive direction, typically `'N'` or `'E'`.
+    :type pos: `int`
+    :param neg: Character denoting negative direction, typically `'S'` or `'W'`.
+    :type neg: `int`
+    :returns: `char*` Pointer to output buffer (same as :c:data:`s`)
 
 
 .. c:function:: int proj_angular_input (PJ *P, enum PJ_DIRECTION dir)
 
     Check if a operation expects input in radians or not.
 
-    :param `P`: Transformation object
-    :type `P`: const PJ*
+    :param P: Transformation object
+    :type P: :c:type:`PJ` *
     :param `direction`: Starting direction of transformation
     :type `direction`: PJ_DIRECTION
-    :returns: :c:type:`int` 1 if input units is expected in radians, otherwise 0
+    :returns: `int` 1 if input units is expected in radians, otherwise 0
 
 .. c:function:: int proj_angular_output (PJ *P, enum PJ_DIRECTION dir)
 
     Check if an operation returns output in radians or not.
 
-    :param `P`: Transformation object
-    :type `P`: const PJ*
+    :param P: Transformation object
+    :type P: :c:type:`PJ` *
     :param `direction`: Starting direction of transformation
     :type `direction`: PJ_DIRECTION
-    :returns: :c:type:`int` 1 if output units is expected in radians, otherwise 0
+    :returns: `int` 1 if output units is expected in radians, otherwise 0
 
 
 Setting custom I/O functions
@@ -720,6 +775,9 @@ Network related functionality
 .. doxygenfunction:: proj_context_set_enable_network
    :project: doxygen_api
 
+.. doxygenfunction:: proj_context_is_network_enabled
+   :project: doxygen_api
+
 .. doxygenfunction:: proj_context_set_url_endpoint
    :project: doxygen_api
 

docs/source/download.rst

@@ -13,17 +13,27 @@ distribution of the source code and various resource file archives. See
 Current Release
 --------------------------------------------------------------------------------
 
-* **2020-02-11** `proj-6.3.1.tar.gz`_ (`md5`_)
+* **2020-03-01** `proj-7.0.0.tar.gz`_ (`md5`_)
+* **2020-03-01** `proj-data-1.0.tar.gz`_
 * **2018-09-15** `proj-datumgrid-1.8.zip`_
-* **2019-09-01** `proj-datumgrid-europe-1.5.zip`_
-* **2019-03-01** `proj-datumgrid-north-america-1.3.zip`_
-* **2018-03-01** `proj-datumgrid-oceania-1.1.zip`_
+* **2020-03-01** `proj-datumgrid-europe-1.6.zip`_
+* **2020-03-01** `proj-datumgrid-north-america-1.4.zip`_
+* **2020-03-01** `proj-datumgrid-oceania-1.2.zip`_
 * **2019-03-01** `proj-datumgrid-world-1.0.zip`_
 * **PDF Manual** `proj.pdf`_
 
+.. note::
+
+    The proj-datumgrid packages have been deprecated with PROJ 7.0.0.
+    The proj-data package should be used with PROJ 7.0.0
+
+    The proj-datumgrid packages should be used with PROJ releases from the 5.x
+    and 6.x branches.
+
 Past Releases
 --------------------------------------------------------------------------------
 
+* **2020-02-11** `proj-6.3.1.tar.gz`_
 * **2020-01-01** `proj-6.3.0.tar.gz`_
 * **2019-11-01** `proj-6.2.1.tar.gz`_
 * **2019-09-01** `proj-6.2.0.tar.gz`_
@@ -40,18 +50,22 @@ Past Releases
 
 * **2018-03-01** `proj-datumgrid-1.7.zip`_
 * **2016-09-11** `proj-datumgrid-1.6.zip`_
+* **2019-09-01** `proj-datumgrid-europe-1.5.zip`_
 * **2019-09-01** `proj-datumgrid-europe-1.4.zip`_
 * **2019-07-01** `proj-datumgrid-europe-1.3.zip`_
 * **2019-03-01** `proj-datumgrid-europe-1.2.zip`_
 * **2018-09-15** `proj-datumgrid-europe-1.1.zip`_
 * **2018-03-01** `proj-datumgrid-europe-1.0.zip`_
+* **2019-03-01** `proj-datumgrid-north-america-1.3.zip`_
 * **2019-03-01** `proj-datumgrid-north-america-1.2.zip`_
 * **2018-09-15** `proj-datumgrid-north-america-1.1.zip`_
 * **2018-03-01** `proj-datumgrid-north-america-1.0.zip`_
+* **2018-03-01** `proj-datumgrid-oceania-1.1.zip`_
 * **2018-03-01** `proj-datumgrid-oceania-1.0.zip`_
 
+.. _`proj-7.0.0.tar.gz`: https://download.osgeo.org/proj/proj-7.0.0.tar.gz
+.. _`md5`: https://download.osgeo.org/proj/proj-7.0.0.tar.gz.md5
 .. _`proj-6.3.1.tar.gz`: https://download.osgeo.org/proj/proj-6.3.1.tar.gz
-.. _`md5`: https://download.osgeo.org/proj/proj-6.3.1.tar.gz.md5
 .. _`proj-6.3.0.tar.gz`: https://download.osgeo.org/proj/proj-6.3.0.tar.gz
 .. _`proj-6.2.1.tar.gz`: https://download.osgeo.org/proj/proj-6.2.1.tar.gz
 .. _`proj-6.2.0.tar.gz`: https://download.osgeo.org/proj/proj-6.2.0.tar.gz
@@ -65,6 +79,7 @@ Past Releases
 .. _`proj-4.9.1.tar.gz`: https://download.osgeo.org/proj/proj-4.9.1.tar.gz
 .. _`proj-4.9.2.tar.gz`: https://download.osgeo.org/proj/proj-4.9.2.tar.gz
 .. _`proj-4.9.3.tar.gz`: https://download.osgeo.org/proj/proj-4.9.3.tar.gz
+.. _`proj-data-1.0.tar.gz`: https://download.osgeo.org/proj/proj-data-1.0.tar.gz
 .. _`proj-datumgrid-1.6.zip`: https://download.osgeo.org/proj/proj-datumgrid-1.6.zip
 .. _`proj-datumgrid-1.7.zip`: https://download.osgeo.org/proj/proj-datumgrid-1.7.zip
 .. _`proj-datumgrid-1.8.zip`: https://download.osgeo.org/proj/proj-datumgrid-1.8.zip
@@ -74,11 +89,14 @@ Past Releases
 .. _`proj-datumgrid-europe-1.3.zip`: https://download.osgeo.org/proj/proj-datumgrid-europe-1.3.zip
 .. _`proj-datumgrid-europe-1.4.zip`: https://download.osgeo.org/proj/proj-datumgrid-europe-1.4.zip
 .. _`proj-datumgrid-europe-1.5.zip`: https://download.osgeo.org/proj/proj-datumgrid-europe-1.5.zip
+.. _`proj-datumgrid-europe-1.6.zip`: https://download.osgeo.org/proj/proj-datumgrid-europe-1.6.zip
 .. _`proj-datumgrid-north-america-1.0.zip`: https://download.osgeo.org/proj/proj-datumgrid-north-america-1.0.zip
 .. _`proj-datumgrid-north-america-1.1.zip`: https://download.osgeo.org/proj/proj-datumgrid-north-america-1.1.zip
 .. _`proj-datumgrid-north-america-1.2.zip`: https://download.osgeo.org/proj/proj-datumgrid-north-america-1.2.zip
 .. _`proj-datumgrid-north-america-1.3.zip`: https://download.osgeo.org/proj/proj-datumgrid-north-america-1.3.zip
+.. _`proj-datumgrid-north-america-1.4.zip`: https://download.osgeo.org/proj/proj-datumgrid-north-america-1.4.zip
 .. _`proj-datumgrid-oceania-1.0.zip`: https://download.osgeo.org/proj/proj-datumgrid-oceania-1.0.zip
 .. _`proj-datumgrid-oceania-1.1.zip`: https://download.osgeo.org/proj/proj-datumgrid-oceania-1.1.zip
+.. _`proj-datumgrid-oceania-1.2.zip`: https://download.osgeo.org/proj/proj-datumgrid-oceania-1.2.zip
 .. _`proj-datumgrid-world-1.0.zip`: https://download.osgeo.org/proj/proj-datumgrid-world-1.0.zip
 .. _`proj.pdf`: https://raw.githubusercontent.com/OSGeo/PROJ/gh-pages/proj.pdf

docs/source/faq.rst

@@ -173,7 +173,7 @@ Note that if you're using conda, activating an environment sets
 :envvar:`PROJ_LIB` to a resource directory located in that environment.
 
 
-What happend to PROJ.4?
+What happened to PROJ.4?
 --------------------------------------------------------------------------------
 
 The first incarnation of PROJ saw the light of day in 1983. Back then it

docs/source/glossary.rst

@@ -6,6 +6,25 @@ Glossary
 
 .. glossary::
 
+    Ballpark transformation
+
+        For a transformation between two geographic CRS, a ballpark
+        transformation is a coordinate operation that only takes into account
+        potential difference of axis orders (long-lat vs lat-long),
+        units (degree vs grads) and  prime meridian (Greewich vs Paris/Rome/other
+        historic prime meridians). It does not attempt any datum shift, hence
+        the "ballpark" qualifier in its name. Its accuracy is unknown, and could
+        lead in some cases to errors of a few hundreds of metres.
+
+        For a transformation between two vertical CRS or a vertical CRS and
+        a geographic CRS, a ballpark transformation only takes into account
+        potential different in units (e.g. metres vs feet). Its accuracy is
+        unknown, and could lead in some cases to errors of a few tens of metres.
+
+        .. note::
+
+            The term "Ballpark transformation" is specific to PROJ.
+
     Pseudocylindrical Projection
 
         Pseudocylindrical projections have the mathematical characteristics of

docs/source/install.rst

@@ -26,13 +26,14 @@ from the ``conda-forge`` channel::
 
     conda install -c conda-forge proj
 
-Using ``conda`` you can also install the PROJ grid packages. Here's how to install
-the `proj-datumgrid-europe` package::
+Using ``conda`` you can also install the PROJ data package. Here's how to install
+the `proj-data` package::
 
-    conda install -c conda-forge proj-datumgrid-europe
+    conda install -c conda-forge proj-data
 
-Available is also the ``proj-datumgrid-north-america``, ``proj-datumgrid-oceania``
-and ``proj-datumgrid-world``.
+Available is also the legacy packages ``proj-datumgrid-europe``,
+``proj-datumgrid-north-america``, ``proj-datumgrid-oceania`` and
+``proj-datumgrid-world``.
 
 .. tip::
    Read more about the various datumgrid packages available :ref:`here<datumgrid>`.
@@ -129,9 +130,6 @@ Compilation and installation from source code
 The classic way of installing PROJ is via the source code distribution. The
 most recent version is available from the :ref:`download page<current_release>`.
 
-You will need that and at least the standard *proj-datumgrid* package for a
-successful installation.
-
 The following guides show how to compile and install the software using the
 Autotools and CMake build systems.
 
@@ -157,7 +155,7 @@ FSF's configuration procedure is used to ease installation of the PROJ system.
 
 The default destination path prefix for installed files is ``/usr/local``.
 Results from the installation script will be placed into subdirectories ``bin``,
-``include``, ``lib``, ``man/man1`` and ``man/man3``. If this default path prefix
+``include``, ``lib``, and ``man/man1``. If this default path prefix
 is proper, then execute::
 
     ./configure
@@ -175,17 +173,7 @@ If you are building from the git repository you have to first run::
 
 which will generate a configure script that can be used as described above.
 
-Before proceeding with the installation we need to add the datum grids. Unzip
-the contents of the *proj-datumgrid* package into ``data/``::
-
-    unzip proj-datumgrid-1.7.zip -d proj-5.0.1/data/
-
-The installation will automatically move the grid files to the correct location.
-Alternatively the grids can be installed manually in the directory pointed to
-by the :envvar:`PROJ_LIB` environment variable. The default location is
-``/usr/local/share/proj``.
-
-With the grid files in place we can now build and install PROJ::
+With the data files in place we can now build and install PROJ::
 
     make
     make install
@@ -196,9 +184,73 @@ Tests are run with::
 
     make check
 
-The test suite requires that the proj-datumgrid package is installed in
-:envvar:`PROJ_LIB`.
+With a successful install of PROJ we can now install data files using the
+:program:`projsync` utility::
 
+    projsync --system-directory
+
+which will download all resource files currently available for PROJ. If less than
+the entire collection of resource files is needed the call to :program:`projsync`
+can be modified to suit the users needs. See :ref:`projsync` for more options.
+
+.. note::
+
+    The use of :program:`projsync` requires that network support is enabled (the
+    default option). If the resource files are not installed using
+    :program:`projsync` PROJ will attempt to fetch them automatically when a
+    transformation needs a specific data file. This  requires that
+    :envvar:`PROJ_NETWORK` is set to ``ON``.
+
+    As an alternative on systems where network access is disabled, the
+    :ref:`proj-data <datumgrid>`
+    package can be downloaded and added to the :envvar:`PROJ_LIB` directory.
+
+
+
+Autotools configure options
++++++++++++++++++++++++++++
+
+Most POSIX systems may not require any options to ``./configure`` if all
+PROJ requirements are met, installed into common directories, and a
+"default" behaviour is desired.
+
+Some influential environment variables are used by ``./configure``,
+with no expected defaults:
+
+.. envvar:: CC
+
+    C compiler command.
+
+.. envvar:: CFLAGS
+
+    C compiler flags.
+
+.. envvar:: CXX
+
+    C++ compiler command.
+
+.. envvar:: CXXFLAGS
+
+    C++ compiler flags
+
+See ``./configure --help`` for all options, here are a few key options:
+
+.. option:: --enable-lto
+
+    Enable compiler's Link Time Optimization, default disabled.
+
+.. option:: --disable-tiff
+
+    TIFF support is enabled by default to use PROJ-data resource files,
+    but this can be disabled, if required.
+
+.. option:: --with-curl=ARG
+
+    Enable CURL support (``ARG=path`` to ``curl-config``).
+
+.. option:: --without-mutex
+
+    Disable real mutex locks (lacking pthreads).
 
 CMake
 --------------------------------------------------------------------------------
@@ -207,7 +259,7 @@ With the CMake build system you can compile and install PROJ on more or less any
 platform. After unpacking the source distribution archive step into the source-
 tree::
 
-    cd proj-5.0.1
+    cd proj-{PROJVERSION}
 
 Create a build directory and step into it::
 
@@ -237,12 +289,168 @@ Tests are run with::
 
     ctest
 
-The test suite requires that the proj-datumgrid package is installed
-in :envvar:`PROJ_LIB`.
+With a successful install of PROJ we can now install data files using the
+:program:`projsync` utility::
 
-If tests are not required, PROJ can be built without the test suite using the following configuration::
+    projsync --system-directory
 
-    cmake -DBUILD_TESTING=OFF ..
+which will download all resource files currently available for PROJ. If less than
+the entire collection of resource files is needed the call to :program:`projsync`
+can be modified to suit the users needs. See :ref:`projsync` for more options.
+
+.. note::
+
+    The use of :program:`projsync` requires that network support is enabled (the
+    default option). If the resource files are not installed using
+    :program:`projsync` PROJ will attempt to fetch them automatically when a
+    transformation needs a specific data file. This  requires that
+    :envvar:`PROJ_NETWORK` is set to ``ON``.
+
+    As an alternative on systems where network access is disabled, the
+    :ref:`proj-data <datumgrid>`
+    package can be downloaded and added to the :envvar:`PROJ_LIB` directory.
+
+
+
+
+CMake configure options
++++++++++++++++++++++++
+
+Options to configure a CMake are provided using ``-D<var>=<value>``.
+All cached entries can be viewed using ``cmake -LAH`` from a build directory.
+
+.. option:: BUILD_CCT=ON
+
+    Build :ref:`cct`, default ON.
+
+.. option:: BUILD_CS2CS=ON
+
+    Build :ref:`cs2cs`, default ON.
+
+.. option:: BUILD_GEOD=ON
+
+    Build :ref:`geod`, default ON.
+
+.. option:: BUILD_GIE=ON
+
+    Build :ref:`gie`, default ON.
+
+.. option:: BUILD_PROJ=ON
+
+    Build :ref:`proj`, default ON.
+
+.. option:: BUILD_PROJINFO=ON
+
+    Build :ref:`projinfo`, default ON.
+
+.. option:: BUILD_PROJSYNC=ON
+
+    Build :ref:`projsync`, default ON.
+
+.. option:: BUILD_SHARED_LIBS
+
+    Build PROJ library shared. Default for Windows is OFF, building only
+    a static library. Default for all others is ON. See also the CMake
+    documentation for `BUILD_SHARED_LIBS
+    <https://cmake.org/cmake/help/v3.9/variable/BUILD_SHARED_LIBS.html>`_.
+
+    .. versionchanged:: 7.0
+        Renamed from ``BUILD_LIBPROJ_SHARED``
+
+.. option:: BUILD_TESTING=ON
+
+    CTest option to build the testing tree, which also downloads and installs
+    Googletest. Default is ON, but can be turned OFF if tests are not required.
+
+    .. versionchanged:: 7.0
+        Renamed from ``PROJ_TESTS``
+
+.. option:: CMAKE_BUILD_TYPE
+
+    Choose the type of build, options are: None (default), Debug, Release,
+    RelWithDebInfo, or MinSizeRel. See also the CMake documentation for
+    `CMAKE_BUILD_TYPE
+    <https://cmake.org/cmake/help/v3.9/variable/CMAKE_BUILD_TYPE.html>`_.
+
+    .. note::
+        A default build is not optimized without specifying
+        ``-DCMAKE_BUILD_TYPE=Release`` (or similar) during configuration,
+        or by specifying ``--config Release`` with CMake
+        multi-configuration build tools (see example below).
+
+.. option:: CMAKE_C_COMPILER
+
+    C compiler. Ignored for some generators, such as Visual Studio.
+
+.. option:: CMAKE_C_FLAGS
+
+    Flags used by the C compiler during all build types. This is
+    initialized by the :envvar:`CFLAGS` environment variable.
+
+.. option:: CMAKE_CXX_COMPILER
+
+    C++ compiler. Ignored for some generators, such as Visual Studio.
+
+.. option:: CMAKE_CXX_FLAGS
+
+    Flags used by the C++ compiler during all build types. This is
+    initialized by the :envvar:`CXXFLAGS` environment variable.
+
+.. option:: CMAKE_INSTALL_PREFIX
+
+    Default for Windows is based on the environment variable
+    :envvar:`OSGEO4W_ROOT` (if set), otherwise is ``c:/OSGeo4W``.
+    Default for Unix-like is ``/usr/local/``.
+
+.. option:: ENABLE_IPO=OFF
+
+    Build library using the compiler's `interprocedural optimization
+    <https://en.wikipedia.org/wiki/Interprocedural_optimization>`_
+    (IPO), if available, default OFF.
+
+    .. versionchanged:: 7.0
+        Renamed from ``ENABLE_LTO``.
+
+.. option:: EXE_SQLITE3
+
+    Path to an ``sqlite3`` or ``sqlite3.exe`` executable.
+
+.. option:: SQLITE3_INCLUDE_DIR
+
+    Path to an include directory with the ``sqlite3.h`` header file.
+
+.. option:: SQLITE3_LIBRARY
+
+    Path to a shared or static library file, such as ``sqlite3.dll``,
+    ``libsqlite3.so``, ``sqlite3.lib`` or other name.
+
+.. option:: ENABLE_CURL=ON
+
+    Enable CURL support, default ON.
+
+.. option:: CURL_INCLUDE_DIR
+
+    Path to an include directory with the ``curl`` directory.
+
+.. option:: CURL_LIBRARY
+
+    Path to a shared or static library file, such as ``libcurl.dll``,
+    ``libcurl.so``, ``libcurl.lib``, or other name.
+
+.. option:: ENABLE_TIFF=ON
+
+    Enable TIFF support to use PROJ-data resource files, default ON.
+
+.. option:: TIFF_INCLUDE_DIR
+
+    Path to an include directory with the ``tiff.h`` header file.
+
+.. option:: TIFF_LIBRARY_RELEASE
+
+    Path to a shared or static library file, such as ``tiff.dll``,
+    ``libtiff.so``, ``tiff.lib``, or other name. A similar variable
+    ``TIFF_LIBRARY_DEBUG`` can also be specified to a similar library for
+    building Debug releases.
 
 
 Building on Windows with vcpkg and Visual Studio 2017 or 2019

docs/source/news.rst

@@ -3,6 +3,119 @@
 News
 ###############################################################################
 
+7.0.0 Release Notes
+++++++++++++++++++++++++++++++++++++++++
+*March 1st 2020*
+
+The major feature in PROJ 7 is significantly improved handling of gridded
+models. This was implemented in :ref:`RFC4`.
+The main features of the RFC4 work is that PROJ now implements a new grid format,
+Geodetic TIFF grids, for exchaning gridded transformation models. In addition
+to the new grid format, PROJ can now also access grids online using a data
+store in the cloud.
+
+The grids that was previously available via the proj-datumgrid packages are now
+available in two places:
+
+  1. As a single combined data archive including all available resource files
+  2. From the cloud via https://cdn.proj.org
+
+In Addition, provided with PROJ is a utility called :program:`projsync` that can be used
+download grids from the data store in the cloud.
+
+The use of the new grid format and the data from the cloud requires that
+PROJ is build against ``libtiff`` and ``libcurl``. Both are optional dependencies
+to PROJ but it is highly encouraged that the software is build against both.
+
+
+.. warning::
+
+    PROJ 7 will be last major release version that includes the ``proj_api.h``
+    header. The functionality in ``proj_api.h`` is deprecated and only supported in
+    maintenance mode. It is inferior to the functionality provided by functions
+    in the ``proj.h`` header and all projects still relying on ``proj_api.h`` are encouraged
+    to migrate to the new API in ``proj.h``. See :ref:`API_migration`.
+    for more info on how to migrate from the old to the new API.
+
+
+Updates
+-------
+
+* Added new file access API to ``proj.h`` (`#866 <https://github.com/OSGeo/PROJ/issues/866>`_)
+
+* Updated the name of the most recent version of the WKT2 standard from
+  WKT2_2018 to WKT2_2019 to reflect the proper name of the standard (`#1585 <https://github.com/OSGeo/PROJ/issues/1585>`_)
+
+* Improvements in transformations from/to WGS 84 (Gxxxx) realizations and
+  vertical <--> geog transormations (`#1608 <https://github.com/OSGeo/PROJ/issues/1608>`_)
+
+* Update to version 1.50 of the geodesic library (`#1629 <https://github.com/OSGeo/PROJ/issues/1629>`_)
+
+* Promote :c:func:`proj_assign_context` to ``proj.h`` from ``proj_experimental.h`` (`#1630 <https://github.com/OSGeo/PROJ/issues/1630>`_)
+
+* Add rotation support to the HEALPix projection (`#1638 <https://github.com/OSGeo/PROJ/issues/1638>`_)
+
+* Add C function :c:func:`proj_crs_create_bound_vertical_crs` (`#1689 <https://github.com/OSGeo/PROJ/issues/1689>`_)
+
+* Use Win32 Unicode APIs and expect all strings to be UTF-8 (`#1765 <https://github.com/OSGeo/PROJ/issues/1765>`_)
+
+* Improved name aliases lookup (`#1827 <https://github.com/OSGeo/PROJ/issues/1827>`_)
+
+* CMake: Employ better use of CTest with the ``BUILD_TESTING`` option (`#1870 <https://github.com/OSGeo/PROJ/issues/1870>`_)
+
+* Grid correction: fix handling grids spanning antimeridian (`#1882 <https://github.com/OSGeo/PROJ/issues/1882>`_)
+
+* Remove legacy CMake target name ``proj`` (`#1883 <https://github.com/OSGeo/PROJ/issues/1883>`_)
+
+* :program:`projinfo` add ``--searchpaths`` switch (`#1892 <https://github.com/OSGeo/PROJ/issues/1892>`_)
+
+* Add :ref:`+proj=set operation<set>` to set component(s) of a coordinate to a fixed
+  value (`#1896 <https://github.com/OSGeo/PROJ/issues/1896>`_)
+
+* Add EPSG records for 'Geocentric translation by Grid Interpolation (IGN)'
+  (``gr3df97a.txt``) and map them to new :ref:`+proj=xyzgridshift<xyzgridshift>` (`#1897 <https://github.com/OSGeo/PROJ/issues/1897>`_)
+
+* Remove ``null`` grid file as it is now a special hardcoded case in grid
+  code (`#1898 <https://github.com/OSGeo/PROJ/issues/1898>`_)
+
+* Add :program:`projsync` utility (`#1903 <https://github.com/OSGeo/PROJ/issues/1903>`_)
+
+* Make ``PROJ`` the CMake project name (`#1910 <https://github.com/OSGeo/PROJ/issues/1910>`_)
+
+* Use relative directory to locate PROJ resource files (`#1921 <https://github.com/OSGeo/PROJ/issues/1921>`_)
+
+
+Bug fixes
+---------
+
+* Horizontal grid shift: fix failures on points slightly outside a
+  subgrid (`#209 <https://github.com/OSGeo/PROJ/issues/209>`_)
+
+* Fix ASAN issue with SQLite3VFS class (`#1902 <https://github.com/OSGeo/PROJ/issues/1902>`_)
+
+* tests: force use of bash for ``proj_add_test_script_sh`` (`#1905 <https://github.com/OSGeo/PROJ/issues/1905>`_)
+
+
+Breaking changes
+----------------
+
+* Reject NTV2 files where ``GS_TYPE != SECONDS`` (`#1294 <https://github.com/OSGeo/PROJ/issues/1294>`_)
+
+* On Windows the name of the library is now fixed to ``proj.lib`` instead
+  of encoding the version number in the library name (`#1581 <https://github.com/OSGeo/PROJ/issues/1581>`_)
+
+* Require C99 compiler (`#1624 <https://github.com/OSGeo/PROJ/issues/1624>`_)
+
+* Remove deprecated JNI bindings (`#1825 <https://github.com/OSGeo/PROJ/issues/1825>`_)
+
+* Remove -ld option from :program:`proj` and :program:`cs2cs` (`#1844 <https://github.com/OSGeo/PROJ/issues/1844>`_)
+
+* Increase CMake minimum version from 3.5 to 3.9 (`#1907 <https://github.com/OSGeo/PROJ/issues/1907>`_)
+
+
+
+
+
 6.3.1 Release Notes
 ++++++++++++++++++++++++++++++++++++++++
 *February 11th 2020*
@@ -77,7 +190,7 @@ Updates
 * :c:func:`proj_trans`: add retry logic to select other transformation if the best one
   fails. (`#1809 <https://github.com/OSGeo/PROJ/issues/1809>`_)
 
-* :c:func:`BoundCRS::identify()`: improvements to discard CRS that aren't relevant
+* `BoundCRS::identify()`: improvements to discard CRS that aren't relevant
   (`#1802 <https://github.com/OSGeo/PROJ/issues/1802>`_)
 
 * Database: update to IGNF v3.1.0 (`#1785 <https://github.com/OSGeo/PROJ/issues/1785>`_)
@@ -150,7 +263,7 @@ Bug fixes
 
 * :c:func:`proj_create_crs_to_crs_from_pj()`: make the PJ* arguments const PJ* (`#1583 <https://github.com/OSGeo/PROJ/issues/1583>`_)
 
-* :c:func:`PROJStringParser::createFromPROJString()`: avoid potential infinite
+* `PROJStringParser::createFromPROJString()`: avoid potential infinite
   recursion (`#1574 <https://github.com/OSGeo/PROJ/issues/1574>`_)
 
 * Avoid core dump when setting ``ctx==NULL`` in functions

docs/source/operations/operations_computation.rst

@@ -106,11 +106,8 @@ which can be used as an override).
 
 As those results all involve operations that does not have a perfect accuracy and that
 does not cover the area of use of the 2 CRSs, a
-'Ballpark geographic offset from NAD27 to NAD83' operation is synthetized by PROJ.
-This operation is a sort of dummy operation that only takes into account potential
-difference of axis orders (long-lat vs lat-long), units (degree vs grads) and
-prime meridian (Greewich vs Paris/Rome/other historic prime meridians). It does
-not attempt any datum shift, hence the "ballpark" qualifier in its name.
+'Ballpark geographic offset from NAD27 to NAD83' operation is synthetized by PROJ
+(see :term:`Ballpark transformation`)
 
 Filtering and sorting of coordinate operations
 ----------------------------------------------
@@ -660,47 +657,74 @@ CompoundCRS to CompoundCRS
 ---------------------------------------------------------------------------------
 
 There is some similarity with the previous paragraph. We first research the
-vertical transformations between the vertical CRS. If such tranformation has
-a registered interpolation geographic CRS, then it is used. Otherwise we fallback
-to the geographic CRS of the source CRS.
+vertical transformations between the two vertical CRS.
 
-Finally, a 3-level loop to create the final set of operations chaining together:
+1. If there is such a tranformation, be it direct, or if both vertical CRS
+   relate to a common intermediate CRS.
+   If it has a registered interpolation geographic CRS, then it is used.
+   Otherwise we fallback to the geographic CRS of the source CRS.
 
-- the horizontal transformation from the source CRS to the interpolation CRS
-- the vertical transformation
-- the horizontal transformation from the interpolation CRS to the target CRS.
+   Finally, a 3-level loop to create the final set of operations chaining together:
 
-This is implemented by the ``createOperationsCompoundToGeog`` method
+   - the horizontal transformation from the source CRS to the interpolation CRS
+   - the vertical transformation
+   - the horizontal transformation from the interpolation CRS to the target CRS.
 
-Example:
+    Example:
 
-.. code-block:: shell
+    .. code-block:: shell
 
-    $ projinfo -s "NAD27 + NGVD29 height (ftUS)" -t "NAD83 + NAVD88 height" --spatial-test intersects --summary
+        $ projinfo -s "NAD27 + NGVD29 height (ftUS)" -t "NAD83 + NAVD88 height" --spatial-test intersects --summary
 
-    Candidate operations found: 20
-    unknown id, NGVD29 height (ftUS) to NAVD88 height (3) + NAD27 to NAD83 (1), 0.17 m, USA - CONUS east of 89°W - onshore
-    unknown id, NGVD29 height (ftUS) to NAVD88 height (2) + NAD27 to NAD83 (1), 0.17 m, USA - CONUS 89°W-107°W - onshore
-    unknown id, NGVD29 height (ftUS) to NAVD88 height (1) + NAD27 to NAD83 (1), 0.17 m, USA - CONUS west of 107°W - onshore
-    unknown id, NGVD29 height (ftUS) to NAVD88 height (3) + NAD27 to NAD83 (3), 1.02 m, unknown domain of validity
-    unknown id, NGVD29 height (ftUS) to NAVD88 height (2) + NAD27 to NAD83 (3), 1.02 m, unknown domain of validity
-    unknown id, NGVD29 height (ftUS) to NAVD88 height (1) + NAD27 to NAD83 (3), 1.02 m, unknown domain of validity
-    unknown id, NGVD29 height (ftUS) to NAVD88 height (3) + NAD27 to NAD83 (5), 1.02 m, unknown domain of validity, at least one grid missing
-    unknown id, NGVD29 height (ftUS) to NAVD88 height (3) + NAD27 to NAD83 (6), 1.52 m, unknown domain of validity, at least one grid missing
-    unknown id, NGVD29 height (ftUS) to NAVD88 height (2) + NAD27 to NAD83 (9), 1.52 m, unknown domain of validity, at least one grid missing
-    unknown id, NGVD29 height (ftUS) to NAVD88 height (1) + NAD27 to NAD83 (9), 1.52 m, unknown domain of validity, at least one grid missing
-    unknown id, NGVD29 height (ftUS) to NAVD88 height (3) + Ballpark geographic offset from NAD27 to NAD83, unknown accuracy, USA - CONUS east of 89°W - onshore, has ballpark transformation
-    unknown id, NGVD29 height (ftUS) to NAVD88 height (2) + Ballpark geographic offset from NAD27 to NAD83, unknown accuracy, USA - CONUS 89°W-107°W - onshore, has ballpark transformation
-    unknown id, NGVD29 height (ftUS) to NAVD88 height (1) + Ballpark geographic offset from NAD27 to NAD83, unknown accuracy, USA - CONUS west of 107°W - onshore, has ballpark transformation
-    unknown id, Transformation from NGVD29 height (ftUS) to NAVD88 height (ballpark vertical transformation) + NAD27 to NAD83 (1), unknown accuracy, USA - CONUS including EEZ, has ballpark transformation
-    unknown id, Transformation from NGVD29 height (ftUS) to NAVD88 height (ballpark vertical transformation) + NAD27 to NAD83 (3), unknown accuracy, Canada, has ballpark transformation
-    unknown id, Transformation from NGVD29 height (ftUS) to NAVD88 height (ballpark vertical transformation) + NAD27 to NAD83 (4), unknown accuracy, Canada - NAD27, has ballpark transformation
-    unknown id, Transformation from NGVD29 height (ftUS) to NAVD88 height (ballpark vertical transformation) + NAD27 to NAD83 (5), unknown accuracy, Canada - Quebec, has ballpark transformation, at least one grid missing
-    unknown id, Transformation from NGVD29 height (ftUS) to NAVD88 height (ballpark vertical transformation) + NAD27 to NAD83 (6), unknown accuracy, Canada - Quebec, has ballpark transformation, at least one grid missing
-    unknown id, Transformation from NGVD29 height (ftUS) to NAVD88 height (ballpark vertical transformation) + NAD27 to NAD83 (9), unknown accuracy, Canada - Saskatchewan, has ballpark transformation, at least one grid missing
-    unknown id, Transformation from NGVD29 height (ftUS) to NAVD88 height (ballpark vertical transformation) + Ballpark geographic offset from NAD27 to NAD83, unknown accuracy, World, has ballpark transformation
+        Candidate operations found: 20
+        unknown id, NGVD29 height (ftUS) to NAVD88 height (3) + NAD27 to NAD83 (1), 0.17 m, USA - CONUS east of 89°W - onshore
+        unknown id, NGVD29 height (ftUS) to NAVD88 height (2) + NAD27 to NAD83 (1), 0.17 m, USA - CONUS 89°W-107°W - onshore
+        unknown id, NGVD29 height (ftUS) to NAVD88 height (1) + NAD27 to NAD83 (1), 0.17 m, USA - CONUS west of 107°W - onshore
+        unknown id, NGVD29 height (ftUS) to NAVD88 height (3) + NAD27 to NAD83 (3), 1.02 m, unknown domain of validity
+        unknown id, NGVD29 height (ftUS) to NAVD88 height (2) + NAD27 to NAD83 (3), 1.02 m, unknown domain of validity
+        unknown id, NGVD29 height (ftUS) to NAVD88 height (1) + NAD27 to NAD83 (3), 1.02 m, unknown domain of validity
+        unknown id, NGVD29 height (ftUS) to NAVD88 height (3) + NAD27 to NAD83 (5), 1.02 m, unknown domain of validity, at least one grid missing
+        unknown id, NGVD29 height (ftUS) to NAVD88 height (3) + NAD27 to NAD83 (6), 1.52 m, unknown domain of validity, at least one grid missing
+        unknown id, NGVD29 height (ftUS) to NAVD88 height (2) + NAD27 to NAD83 (9), 1.52 m, unknown domain of validity, at least one grid missing
+        unknown id, NGVD29 height (ftUS) to NAVD88 height (1) + NAD27 to NAD83 (9), 1.52 m, unknown domain of validity, at least one grid missing
+        unknown id, NGVD29 height (ftUS) to NAVD88 height (3) + Ballpark geographic offset from NAD27 to NAD83, unknown accuracy, USA - CONUS east of 89°W - onshore, has ballpark transformation
+        unknown id, NGVD29 height (ftUS) to NAVD88 height (2) + Ballpark geographic offset from NAD27 to NAD83, unknown accuracy, USA - CONUS 89°W-107°W - onshore, has ballpark transformation
+        unknown id, NGVD29 height (ftUS) to NAVD88 height (1) + Ballpark geographic offset from NAD27 to NAD83, unknown accuracy, USA - CONUS west of 107°W - onshore, has ballpark transformation
+        unknown id, Transformation from NGVD29 height (ftUS) to NAVD88 height (ballpark vertical transformation) + NAD27 to NAD83 (1), unknown accuracy, USA - CONUS including EEZ, has ballpark transformation
+        unknown id, Transformation from NGVD29 height (ftUS) to NAVD88 height (ballpark vertical transformation) + NAD27 to NAD83 (3), unknown accuracy, Canada, has ballpark transformation
+        unknown id, Transformation from NGVD29 height (ftUS) to NAVD88 height (ballpark vertical transformation) + NAD27 to NAD83 (4), unknown accuracy, Canada - NAD27, has ballpark transformation
+        unknown id, Transformation from NGVD29 height (ftUS) to NAVD88 height (ballpark vertical transformation) + NAD27 to NAD83 (5), unknown accuracy, Canada - Quebec, has ballpark transformation, at least one grid missing
+        unknown id, Transformation from NGVD29 height (ftUS) to NAVD88 height (ballpark vertical transformation) + NAD27 to NAD83 (6), unknown accuracy, Canada - Quebec, has ballpark transformation, at least one grid missing
+        unknown id, Transformation from NGVD29 height (ftUS) to NAVD88 height (ballpark vertical transformation) + NAD27 to NAD83 (9), unknown accuracy, Canada - Saskatchewan, has ballpark transformation, at least one grid missing
+        unknown id, Transformation from NGVD29 height (ftUS) to NAVD88 height (ballpark vertical transformation) + Ballpark geographic offset from NAD27 to NAD83, unknown accuracy, World, has ballpark transformation
 
 
+2. Otherwise, when there is no such transformation, we decompose into 3 steps:
+
+   - transform from the source CRS to the geographic 3D CRS corresponding to it
+   - transform from the geographic 3D CRS corresponding to the source CRS to the
+     geographic 3D CRS corresponding to the target CRS
+   - transform from the geographic 3D CRS corresponding to the target CRS to the
+     target CRS.
+
+    Example:
+
+    .. code-block:: shell
+
+        $  projinfo -s "WGS 84 + EGM96 height" -t "ETRS89 + Belfast height" --spatial-test intersects --summary
+
+        Candidate operations found: 7
+        unknown id, Inverse of WGS 84 to EGM96 height (1) + Inverse of ETRS89 to WGS 84 (1) + ETRS89 to Belfast height (2), 2.014 m, UK - Northern Ireland - onshore
+        unknown id, Inverse of WGS 84 to EGM96 height (1) + Inverse of ETRS89 to WGS 84 (1) + ETRS89 to Belfast height (1), 2.03 m, UK - Northern Ireland - onshore, at least one grid missing
+        unknown id, Inverse of WGS 84 to EGM96 height (1) + Null geographic offset from WGS 84 (geog3D) to WGS 84 (geog2D) + Inverse of OSGB 1936 to WGS 84 (4) + OSGB 1936 to ETRS89 (2) + Null geographic offset from ETRS89 (geog2D) to ETRS89 (geog3D) + ETRS89 to Belfast height (2), 19.044 m, unknown domain of validity
+        unknown id, Inverse of WGS 84 to EGM96 height (1) + Null geographic offset from WGS 84 (geog3D) to WGS 84 (geog2D) + Inverse of OSGB 1936 to WGS 84 (2) + OSGB 1936 to ETRS89 (2) + Null geographic offset from ETRS89 (geog2D) to ETRS89 (geog3D) + ETRS89 to Belfast height (2), 11.044 m, unknown domain of validity
+        unknown id, Inverse of WGS 84 to EGM96 height (1) + Null geographic offset from WGS 84 (geog3D) to WGS 84 (geog2D) + Inverse of TM75 to WGS 84 (2) + TM75 to ETRS89 (3) + Null geographic offset from ETRS89 (geog2D) to ETRS89 (geog3D) + ETRS89 to Belfast height (2), 2.424 m, UK - Northern Ireland - onshore, at least one grid missing
+        unknown id, Inverse of WGS 84 to EGM96 height (1) + Null geographic offset from WGS 84 (geog3D) to WGS 84 (geog2D) + Inverse of TM75 to WGS 84 (2) + TM75 to ETRS89 (3) + Null geographic offset from ETRS89 (geog2D) to ETRS89 (geog3D) + ETRS89 to Belfast height (1), 2.44 m, UK - Northern Ireland - onshore, at least one grid missing
+        unknown id, Inverse of WGS 84 to EGM96 height (1) + Null geographic offset from WGS 84 (geog3D) to WGS 84 (geog2D) + Inverse of OSGB 1936 to WGS 84 (4) + OSGB 1936 to ETRS89 (2) + Null geographic offset from ETRS89 (geog2D) to ETRS89 (geog3D) + ETRS89 to Belfast height (1), 19.06 m, unknown domain of validity, at least one grid missing
+
+
+This is implemented by the ``createOperationsCompoundToCompound`` method
+
 When the source or target CRS is a BoundCRS
 ---------------------------------------------------------------------------------
 

docs/source/operations/projections/aea.rst

@@ -6,7 +6,7 @@ Albers Equal Area
 +---------------------+----------------------------------------------------------+
 | **Classification**  | Conic                                                    |
 +---------------------+----------------------------------------------------------+
-| **Available forms** | Forward and inverse, spherical and elliptical projection |
+| **Available forms** | Forward and inverse, spherical and ellipsoidal           |
 +---------------------+----------------------------------------------------------+
 | **Defined area**    | Global                                                   |
 +---------------------+----------------------------------------------------------+

docs/source/operations/projections/aeqd.rst

@@ -6,7 +6,7 @@ Azimuthal Equidistant
 +---------------------+----------------------------------------------------------+
 | **Classification**  | Azimuthal                                                |
 +---------------------+----------------------------------------------------------+
-| **Available forms** | Forward and inverse, spherical and elliptical projection |
+| **Available forms** | Forward and inverse, spherical and ellipsoidal           |
 +---------------------+----------------------------------------------------------+
 | **Alias**           | aeqd                                                     |
 +---------------------+----------------------------------------------------------+
@@ -33,7 +33,7 @@ Options
 
 .. option:: +guam
 
-    Use Guam elliptical formulas. Only accurate near the Island of Guam
+    Use Guam ellipsoidal formulas. Only accurate near the Island of Guam
     (:math:`\lambda\approx 144.5^{\circ}`, :math:`\phi\approx 13.5^{\circ}`)
 
 .. include:: ../options/k_0.rst

docs/source/operations/projections/alsk.rst

@@ -6,7 +6,7 @@ Modified Stererographics of Alaska
 +---------------------+----------------------------------------------------------+
 | **Classification**  | Modified azimuthal                                       |
 +---------------------+----------------------------------------------------------+
-| **Available forms** | Forward and inverse, spherical and elliptical projection |
+| **Available forms** | Forward and inverse, spherical and ellipsoidal           |
 +---------------------+----------------------------------------------------------+
 | **Defined area**    | Alaska                                                   |
 +---------------------+----------------------------------------------------------+

docs/source/operations/projections/august.rst

@@ -4,6 +4,23 @@
 August Epicycloidal
 ********************************************************************************
 
++---------------------+----------------------------------------------------------+
+| **Classification**  | Miscellaneous                                            |
++---------------------+----------------------------------------------------------+
+| **Available forms** | Forward spherical projection                             |
++---------------------+----------------------------------------------------------+
+| **Defined area**    | Global                                                   |
++---------------------+----------------------------------------------------------+
+| **Alias**           | august                                                   |
++---------------------+----------------------------------------------------------+
+| **Domain**          | 2D                                                       |
++---------------------+----------------------------------------------------------+
+| **Input type**      | Geodetic coordinates                                     |
++---------------------+----------------------------------------------------------+
+| **Output type**     | Projected coordinates                                    |
++---------------------+----------------------------------------------------------+
+
+
 .. figure:: ./images/august.png
    :width: 500 px
    :align: center

docs/source/operations/projections/bacon.rst

@@ -4,6 +4,23 @@
 Bacon Globular
 ********************************************************************************
 
++---------------------+----------------------------------------------------------+
+| **Classification**  | Miscellaneous                                            |
++---------------------+----------------------------------------------------------+
+| **Available forms** | Forward spherical projection                             |
++---------------------+----------------------------------------------------------+
+| **Defined area**    | Global                                                   |
++---------------------+----------------------------------------------------------+
+| **Alias**           | bacon                                                    |
++---------------------+----------------------------------------------------------+
+| **Domain**          | 2D                                                       |
++---------------------+----------------------------------------------------------+
+| **Input type**      | Geodetic coordinates                                     |
++---------------------+----------------------------------------------------------+
+| **Output type**     | Projected coordinates                                    |
++---------------------+----------------------------------------------------------+
+
+
 .. figure:: ./images/bacon.png
    :width: 500 px
    :align: center

docs/source/operations/projections/bipc.rst

@@ -4,6 +4,23 @@
 Bipolar conic of western hemisphere
 ********************************************************************************
 
++---------------------+----------------------------------------------------------+
+| **Classification**  | Miscellaneous                                            |
++---------------------+----------------------------------------------------------+
+| **Available forms** | Forward and inverse spherical projection                 |
++---------------------+----------------------------------------------------------+
+| **Defined area**    | Global                                                   |
++---------------------+----------------------------------------------------------+
+| **Alias**           | bipc                                                     |
++---------------------+----------------------------------------------------------+
+| **Domain**          | 2D                                                       |
++---------------------+----------------------------------------------------------+
+| **Input type**      | Geodetic coordinates                                     |
++---------------------+----------------------------------------------------------+
+| **Output type**     | Projected coordinates                                    |
++---------------------+----------------------------------------------------------+
+
+
 .. figure:: ./images/bipc.png
    :width: 500 px
    :align: center

docs/source/operations/projections/boggs.rst

@@ -4,6 +4,23 @@
 Boggs Eumorphic
 ********************************************************************************
 
++---------------------+----------------------------------------------------------+
+| **Classification**  | Pseudocylindrical                                        |
++---------------------+----------------------------------------------------------+
+| **Available forms** | Forward spherical projection                             |
++---------------------+----------------------------------------------------------+
+| **Defined area**    | Global                                                   |
++---------------------+----------------------------------------------------------+
+| **Alias**           | boggs                                                    |
++---------------------+----------------------------------------------------------+
+| **Domain**          | 2D                                                       |
++---------------------+----------------------------------------------------------+
+| **Input type**      | Geodetic coordinates                                     |
++---------------------+----------------------------------------------------------+
+| **Output type**     | Projected coordinates                                    |
++---------------------+----------------------------------------------------------+
+
+
 .. figure:: ./images/boggs.png
    :width: 500 px
    :align: center

docs/source/operations/projections/bonne.rst

@@ -4,6 +4,23 @@
 Bonne (Werner lat_1=90)
 ********************************************************************************
 
++---------------------+----------------------------------------------------------+
+| **Classification**  | Miscellaneous                                            |
++---------------------+----------------------------------------------------------+
+| **Available forms** | Forward and inverse, spherical and ellipsoidal           |
++---------------------+----------------------------------------------------------+
+| **Defined area**    | Global                                                   |
++---------------------+----------------------------------------------------------+
+| **Alias**           | bonne                                                    |
++---------------------+----------------------------------------------------------+
+| **Domain**          | 2D                                                       |
++---------------------+----------------------------------------------------------+
+| **Input type**      | Geodetic coordinates                                     |
++---------------------+----------------------------------------------------------+
+| **Output type**     | Projected coordinates                                    |
++---------------------+----------------------------------------------------------+
+
+
 .. figure:: ./images/bonne.png
    :width: 500 px
    :align: center

docs/source/operations/projections/calcofi.rst

@@ -10,7 +10,7 @@ California Cooperative Oceanic Fisheries Investigations program, known as CalCOF
 +---------------------+----------------------------------------------------------+
 | **Classification**  | Conformal cylindrical                                    |
 +---------------------+----------------------------------------------------------+
-| **Available forms** | Forward and inverse, spherical and elliptical projection |
+| **Available forms** | Forward and inverse, spherical and ellipsoidal           |
 +---------------------+----------------------------------------------------------+
 | **Defined area**    | Only valid for the west coast of USA and Mexico          |
 +---------------------+----------------------------------------------------------+

docs/source/operations/projections/cass.rst

@@ -9,7 +9,7 @@ Although the Cassini projection has been largely replaced by the Transverse Merc
 +---------------------+-------------------------------------------------------------------------+
 | **Classification**  | Transverse and oblique cylindrical                                      |
 +---------------------+-------------------------------------------------------------------------+
-| **Available forms** | Forward and inverse, Spherical and Elliptical                           |
+| **Available forms** | Forward and inverse, Spherical and ellipsoidal                          |
 +---------------------+-------------------------------------------------------------------------+
 | **Defined area**    | Global, but best used near the central meridian with long, narrow areas |
 +---------------------+-------------------------------------------------------------------------+
@@ -40,12 +40,12 @@ The Cassini-Soldner was also used for the detailed mapping of many German states
 
 Example using EPSG 30200 (Trinidad 1903, units in clarke's links)::
 
-    $ echo 0.17453293 -1.08210414 | proj +proj=cass +lat_0=10.44166666666667 +lon_0=-61.33333333333334 +x_0=86501.46392051999 +y_0=65379.0134283 +a=6378293.645208759 +b=6356617.987679838 +to_meter=0.201166195164 +no_defs
+    $ echo 0.17453293 -1.08210414 | proj +proj=cass +lat_0=10.44166666666667 +lon_0=-61.33333333333334 +x_0=86501.46392051999 +y_0=65379.0134283 +a=6378293.645208759 +b=6356617.987679838 +to_meter=0.201166195164
     66644.94	82536.22
 
 Example using EPSG 3068 (Soldner Berlin)::
 
-    $ echo 13.5 52.4 | proj +proj=cass +lat_0=52.41864827777778 +lon_0=13.62720366666667 +x_0=40000 +y_0=10000 +ellps=bessel +datum=potsdam +units=m +no_defs
+    $ echo 13.5 52.4 | proj +proj=cass +lat_0=52.41864827777778 +lon_0=13.62720366666667 +x_0=40000 +y_0=10000 +ellps=bessel +units=m
     31343.05	7932.76
 
 Options
@@ -100,8 +100,8 @@ Inverse projection
 
   \lambda = \arctan2(\tan(x), \cos(y+\phi_0))
 
-Elliptical form
-===============
+Ellipsoidal form
+================
 
 Forward projection
 ------------------

docs/source/operations/projections/cc.rst

@@ -4,6 +4,23 @@
 Central Cylindrical
 ********************************************************************************
 
++---------------------+----------------------------------------------------------+
+| **Classification**  | Cylindrical                                              |
++---------------------+----------------------------------------------------------+
+| **Available forms** | Forward and inverse, spherical projection                |
++---------------------+----------------------------------------------------------+
+| **Defined area**    | Global                                                   |
++---------------------+----------------------------------------------------------+
+| **Alias**           | cc                                                       |
++---------------------+----------------------------------------------------------+
+| **Domain**          | 2D                                                       |
++---------------------+----------------------------------------------------------+
+| **Input type**      | Geodetic coordinates                                     |
++---------------------+----------------------------------------------------------+
+| **Output type**     | Projected coordinates                                    |
++---------------------+----------------------------------------------------------+
+
+
 .. figure:: ./images/cc.png
    :width: 500 px
    :align: center

docs/source/operations/projections/ccon.rst

@@ -120,7 +120,7 @@ For ATPOL to WGS84 test, run the following script:
 ::
 
    #!/bin/bash
-   cat << EOF | src/cs2cs -v -f "%E" +proj=ccon +lat_1=52 +lat_0=52 +lon_0=19 +axis=esu +a=6390000 +x_0=330000 +y_0=-350000 +to +proj=longlat +datum=WGS84 +no_defs
+   cat << EOF | src/cs2cs -v -f "%E" +proj=ccon +lat_1=52 +lat_0=52 +lon_0=19 +axis=esu +a=6390000 +x_0=330000 +y_0=-350000 +to +proj=longlat
    0 0
    0 700000
    700000 0
@@ -142,7 +142,7 @@ Analogous script can be run for reverse test:
 
 ::
 
-   cat << EOF  | src/cs2cs -v -f "%E" +proj=longlat +datum=WGS84 +no_defs +to +proj=ccon +lat_1=52 +lat_0=52 +lon_0=19 +axis=esu +a=6390000 +x_0=330000 +y_0=-350000
+   cat << EOF  | src/cs2cs -v -f "%E" +proj=longlat +to +proj=ccon +lat_1=52 +lat_0=52 +lon_0=19 +axis=esu +a=6390000 +x_0=330000 +y_0=-350000
    24 55
    15 49
    24 49

docs/source/operations/projections/cea.rst

@@ -4,6 +4,23 @@
 Equal Area Cylindrical
 ********************************************************************************
 
++---------------------+----------------------------------------------------------+
+| **Classification**  | Cylindrical                                              |
++---------------------+----------------------------------------------------------+
+| **Available forms** | Forward and inverse, spherical and ellipsoidal           |
++---------------------+----------------------------------------------------------+
+| **Defined area**    | Global                                                   |
++---------------------+----------------------------------------------------------+
+| **Alias**           | cea                                                      |
++---------------------+----------------------------------------------------------+
+| **Domain**          | 2D                                                       |
++---------------------+----------------------------------------------------------+
+| **Input type**      | Geodetic coordinates                                     |
++---------------------+----------------------------------------------------------+
+| **Output type**     | Projected coordinates                                    |
++---------------------+----------------------------------------------------------+
+
+
 .. figure:: ./images/cea.png
    :width: 500 px
    :align: center

docs/source/operations/projections/chamb.rst

@@ -4,6 +4,23 @@
 Chamberlin Trimetric
 ********************************************************************************
 
++---------------------+----------------------------------------------------------+
+| **Classification**  | Miscellaneous                                            |
++---------------------+----------------------------------------------------------+
+| **Available forms** | Forward spherical projection                             |
++---------------------+----------------------------------------------------------+
+| **Defined area**    | Global                                                   |
++---------------------+----------------------------------------------------------+
+| **Alias**           | chamb                                                    |
++---------------------+----------------------------------------------------------+
+| **Domain**          | 2D                                                       |
++---------------------+----------------------------------------------------------+
+| **Input type**      | Geodetic coordinates                                     |
++---------------------+----------------------------------------------------------+
+| **Output type**     | Projected coordinates                                    |
++---------------------+----------------------------------------------------------+
+
+
 .. figure:: ./images/chamb.png
    :width: 500 px
    :align: center
@@ -17,6 +34,8 @@ Parameters
 Required
 --------------------------------------------------------------------------------
 
+.. note:: Control points should be oriented clockwise.
+
 .. option:: +lat_1=<value>
 
     Latitude of the first control point.

docs/source/operations/projections/collg.rst

@@ -4,6 +4,23 @@
 Collignon
 ********************************************************************************
 
++---------------------+----------------------------------------------------------+
+| **Classification**  | Pseudocylindrical                                        |
++---------------------+----------------------------------------------------------+
+| **Available forms** | Forward and inverse, spherical projection                |
++---------------------+----------------------------------------------------------+
+| **Defined area**    | Global                                                   |
++---------------------+----------------------------------------------------------+
+| **Alias**           | collg                                                    |
++---------------------+----------------------------------------------------------+
+| **Domain**          | 2D                                                       |
++---------------------+----------------------------------------------------------+
+| **Input type**      | Geodetic coordinates                                     |
++---------------------+----------------------------------------------------------+
+| **Output type**     | Projected coordinates                                    |
++---------------------+----------------------------------------------------------+
+
+
 .. figure:: ./images/collg.png
    :width: 500 px
    :align: center

docs/source/operations/projections/crast.rst

@@ -4,6 +4,23 @@
 Craster Parabolic (Putnins P4)
 ********************************************************************************
 
++---------------------+----------------------------------------------------------+
+| **Classification**  | Pseudocylindrical                                        |
++---------------------+----------------------------------------------------------+
+| **Available forms** | Forward and inverse, spherical projection                |
++---------------------+----------------------------------------------------------+
+| **Defined area**    | Global                                                   |
++---------------------+----------------------------------------------------------+
+| **Alias**           | crast                                                    |
++---------------------+----------------------------------------------------------+
+| **Domain**          | 2D                                                       |
++---------------------+----------------------------------------------------------+
+| **Input type**      | Geodetic coordinates                                     |
++---------------------+----------------------------------------------------------+
+| **Output type**     | Projected coordinates                                    |
++---------------------+----------------------------------------------------------+
+
+
 .. figure:: ./images/crast.png
    :width: 500 px
    :align: center

docs/source/operations/projections/denoy.rst

@@ -4,6 +4,23 @@
 Denoyer Semi-Elliptical
 ********************************************************************************
 
++---------------------+----------------------------------------------------------+
+| **Classification**  | Miscellaneous                                            |
++---------------------+----------------------------------------------------------+
+| **Available forms** | Forward spherical projection                             |
++---------------------+----------------------------------------------------------+
+| **Defined area**    | Global                                                   |
++---------------------+----------------------------------------------------------+
+| **Alias**           | denoy                                                    |
++---------------------+----------------------------------------------------------+
+| **Domain**          | 2D                                                       |
++---------------------+----------------------------------------------------------+
+| **Input type**      | Geodetic coordinates                                     |
++---------------------+----------------------------------------------------------+
+| **Output type**     | Projected coordinates                                    |
++---------------------+----------------------------------------------------------+
+
+
 .. figure:: ./images/denoy.png
    :width: 500 px
    :align: center

docs/source/operations/projections/eck1.rst

@@ -4,6 +4,23 @@
 Eckert I
 ********************************************************************************
 
++---------------------+----------------------------------------------------------+
+| **Classification**  | Pseudocylindrical                                        |
++---------------------+----------------------------------------------------------+
+| **Available forms** | Forward and inverse, spherical projection                |
++---------------------+----------------------------------------------------------+
+| **Defined area**    | Global                                                   |
++---------------------+----------------------------------------------------------+
+| **Alias**           | eck1                                                     |
++---------------------+----------------------------------------------------------+
+| **Domain**          | 2D                                                       |
++---------------------+----------------------------------------------------------+
+| **Input type**      | Geodetic coordinates                                     |
++---------------------+----------------------------------------------------------+
+| **Output type**     | Projected coordinates                                    |
++---------------------+----------------------------------------------------------+
+
+
 .. figure:: ./images/eck1.png
    :width: 500 px
    :align: center

docs/source/operations/projections/eck2.rst

@@ -4,6 +4,23 @@
 Eckert II
 ********************************************************************************
 
++---------------------+----------------------------------------------------------+
+| **Classification**  | Pseudocylindrical                                        |
++---------------------+----------------------------------------------------------+
+| **Available forms** | Forward and inverse, spherical projection                |
++---------------------+----------------------------------------------------------+
+| **Defined area**    | Global                                                   |
++---------------------+----------------------------------------------------------+
+| **Alias**           | eck2                                                     |
++---------------------+----------------------------------------------------------+
+| **Domain**          | 2D                                                       |
++---------------------+----------------------------------------------------------+
+| **Input type**      | Geodetic coordinates                                     |
++---------------------+----------------------------------------------------------+
+| **Output type**     | Projected coordinates                                    |
++---------------------+----------------------------------------------------------+
+
+
 .. figure:: ./images/eck2.png
    :width: 500 px
    :align: center

docs/source/operations/projections/eck3.rst

@@ -4,6 +4,23 @@
 Eckert III
 ********************************************************************************
 
++---------------------+----------------------------------------------------------+
+| **Classification**  | Pseudocylindrical                                        |
++---------------------+----------------------------------------------------------+
+| **Available forms** | Forward and inverse, spherical projection                |
++---------------------+----------------------------------------------------------+
+| **Defined area**    | Global                                                   |
++---------------------+----------------------------------------------------------+
+| **Alias**           | eck3                                                     |
++---------------------+----------------------------------------------------------+
+| **Domain**          | 2D                                                       |
++---------------------+----------------------------------------------------------+
+| **Input type**      | Geodetic coordinates                                     |
++---------------------+----------------------------------------------------------+
+| **Output type**     | Projected coordinates                                    |
++---------------------+----------------------------------------------------------+
+
+
 .. figure:: ./images/eck3.png
    :width: 500 px
    :align: center

docs/source/operations/projections/eck4.rst

@@ -4,6 +4,23 @@
 Eckert IV
 ********************************************************************************
 
++---------------------+----------------------------------------------------------+
+| **Classification**  | Pseudocylindrical                                        |
++---------------------+----------------------------------------------------------+
+| **Available forms** | Forward and inverse, spherical projection                |
++---------------------+----------------------------------------------------------+
+| **Defined area**    | Global                                                   |
++---------------------+----------------------------------------------------------+
+| **Alias**           | eck4                                                     |
++---------------------+----------------------------------------------------------+
+| **Domain**          | 2D                                                       |
++---------------------+----------------------------------------------------------+
+| **Input type**      | Geodetic coordinates                                     |
++---------------------+----------------------------------------------------------+
+| **Output type**     | Projected coordinates                                    |
++---------------------+----------------------------------------------------------+
+
+
 .. figure:: ./images/eck4.png
    :width: 500 px
    :align: center

docs/source/operations/projections/eck5.rst

@@ -4,6 +4,23 @@
 Eckert V
 ********************************************************************************
 
++---------------------+----------------------------------------------------------+
+| **Classification**  | Pseudocylindrical                                        |
++---------------------+----------------------------------------------------------+
+| **Available forms** | Forward and inverse, spherical projection                |
++---------------------+----------------------------------------------------------+
+| **Defined area**    | Global                                                   |
++---------------------+----------------------------------------------------------+
+| **Alias**           | eck5                                                     |
++---------------------+----------------------------------------------------------+
+| **Domain**          | 2D                                                       |
++---------------------+----------------------------------------------------------+
+| **Input type**      | Geodetic coordinates                                     |
++---------------------+----------------------------------------------------------+
+| **Output type**     | Projected coordinates                                    |
++---------------------+----------------------------------------------------------+
+
+
 .. figure:: ./images/eck5.png
    :width: 500 px
    :align: center

docs/source/operations/projections/eck6.rst

@@ -4,6 +4,23 @@
 Eckert VI
 ********************************************************************************
 
++---------------------+----------------------------------------------------------+
+| **Classification**  | Pseudocylindrical                                        |
++---------------------+----------------------------------------------------------+
+| **Available forms** | Forward and inverse, spherical projection                |
++---------------------+----------------------------------------------------------+
+| **Defined area**    | Global                                                   |
++---------------------+----------------------------------------------------------+
+| **Alias**           | eck6                                                     |
++---------------------+----------------------------------------------------------+
+| **Domain**          | 2D                                                       |
++---------------------+----------------------------------------------------------+
+| **Input type**      | Geodetic coordinates                                     |
++---------------------+----------------------------------------------------------+
+| **Output type**     | Projected coordinates                                    |
++---------------------+----------------------------------------------------------+
+
+
 .. figure:: ./images/eck6.png
    :width: 500 px
    :align: center

docs/source/operations/projections/eqc.rst

@@ -63,7 +63,7 @@ The following table gives special cases of the cylindrical equidistant projectio
 
 Example using EPSG 32662 (WGS84 Plate Carrée)::
 
-    $ echo 2 47 | proj +proj=eqc +lat_ts=0 +lat_0=0 +lon_0=0 +x_0=0 +y_0=0 +ellps=WGS84 +datum=WGS84 +units=m +no_defs
+    $ echo 2 47 | proj +proj=eqc +lat_ts=0 +lat_0=0 +lon_0=0 +x_0=0 +y_0=0 +ellps=WGS84 +units=m
     222638.98       5232016.07
 
 Example using Plate Carrée projection with true scale at latitude 30° and central meridian 90°W::

docs/source/operations/projections/eqdc.rst

@@ -4,6 +4,23 @@
 Equidistant Conic
 ********************************************************************************
 
++---------------------+----------------------------------------------------------+
+| **Classification**  | Conic                                                    |
++---------------------+----------------------------------------------------------+
+| **Available forms** | Forward and inverse, ellipsoidal                         |
++---------------------+----------------------------------------------------------+
+| **Defined area**    | Global                                                   |
++---------------------+----------------------------------------------------------+
+| **Alias**           | eqdc                                                     |
++---------------------+----------------------------------------------------------+
+| **Domain**          | 2D                                                       |
++---------------------+----------------------------------------------------------+
+| **Input type**      | Geodetic coordinates                                     |
++---------------------+----------------------------------------------------------+
+| **Output type**     | Projected coordinates                                    |
++---------------------+----------------------------------------------------------+
+
+
 .. figure:: ./images/eqdc.png
    :width: 500 px
    :align: center

docs/source/operations/projections/euler.rst

@@ -4,6 +4,23 @@
 Euler
 ********************************************************************************
 
++---------------------+----------------------------------------------------------+
+| **Classification**  | Miscellaneous                                            |
++---------------------+----------------------------------------------------------+
+| **Available forms** | Forward and inverse, spherical projection                |
++---------------------+----------------------------------------------------------+
+| **Defined area**    | Global                                                   |
++---------------------+----------------------------------------------------------+
+| **Alias**           | euler                                                    |
++---------------------+----------------------------------------------------------+
+| **Domain**          | 2D                                                       |
++---------------------+----------------------------------------------------------+
+| **Input type**      | Geodetic coordinates                                     |
++---------------------+----------------------------------------------------------+
+| **Output type**     | Projected coordinates                                    |
++---------------------+----------------------------------------------------------+
+
+
 .. figure:: ./images/euler.png
    :width: 500 px
    :align: center

docs/source/operations/projections/fahey.rst

@@ -4,6 +4,23 @@
 Fahey
 ********************************************************************************
 
++---------------------+----------------------------------------------------------+
+| **Classification**  | Pseudocylindrical                                        |
++---------------------+----------------------------------------------------------+
+| **Available forms** | Forward and inverse, spherical projection                |
++---------------------+----------------------------------------------------------+
+| **Defined area**    | Global                                                   |
++---------------------+----------------------------------------------------------+
+| **Alias**           | fahey                                                    |
++---------------------+----------------------------------------------------------+
+| **Domain**          | 2D                                                       |
++---------------------+----------------------------------------------------------+
+| **Input type**      | Geodetic coordinates                                     |
++---------------------+----------------------------------------------------------+
+| **Output type**     | Projected coordinates                                    |
++---------------------+----------------------------------------------------------+
+
+
 .. figure:: ./images/fahey.png
    :width: 500 px
    :align: center

docs/source/operations/projections/fouc.rst

@@ -4,6 +4,23 @@
 Foucaut
 ********************************************************************************
 
++---------------------+----------------------------------------------------------+
+| **Classification**  | Pseudocylindrical                                        |
++---------------------+----------------------------------------------------------+
+| **Available forms** | Forward and inverse, spherical projection                |
++---------------------+----------------------------------------------------------+
+| **Defined area**    | Global                                                   |
++---------------------+----------------------------------------------------------+
+| **Alias**           | fouc                                                     |
++---------------------+----------------------------------------------------------+
+| **Domain**          | 2D                                                       |
++---------------------+----------------------------------------------------------+
+| **Input type**      | Geodetic coordinates                                     |
++---------------------+----------------------------------------------------------+
+| **Output type**     | Projected coordinates                                    |
++---------------------+----------------------------------------------------------+
+
+
 .. figure:: ./images/fouc.png
    :width: 500 px
    :align: center

docs/source/operations/projections/fouc_s.rst

@@ -4,6 +4,23 @@
 Foucaut Sinusoidal
 ********************************************************************************
 
++---------------------+----------------------------------------------------------+
+| **Classification**  | Pseudocylindrical                                        |
++---------------------+----------------------------------------------------------+
+| **Available forms** | Forward and inverse, spherical projection                |
++---------------------+----------------------------------------------------------+
+| **Defined area**    | Global                                                   |
++---------------------+----------------------------------------------------------+
+| **Alias**           | fouc_s                                                   |
++---------------------+----------------------------------------------------------+
+| **Domain**          | 2D                                                       |
++---------------------+----------------------------------------------------------+
+| **Input type**      | Geodetic coordinates                                     |
++---------------------+----------------------------------------------------------+
+| **Output type**     | Projected coordinates                                    |
++---------------------+----------------------------------------------------------+
+
+
 .. figure:: ./images/fouc_s.png
    :width: 500 px
    :align: center

docs/source/operations/projections/gall.rst

@@ -45,12 +45,12 @@ Unlike the Mercator, the Gall shows the poles as lines running across the top an
 
 Example using Gall Stereographical  ::
 
-    $ echo 9 51 | proj +proj=gall +lon_0=0 +x_0=0 +y_0=0 +ellps=WGS84 +datum=WGS84 +units=m +no_defs
+    $ echo 9 51 | proj +proj=gall +lon_0=0 +x_0=0 +y_0=0 +ellps=WGS84 +units=m
     708432.90	5193386.36
 
 Example using Gall Stereographical (Central meridian 90°W) ::
 
-    $ echo 9 51 | proj +proj=gall +lon_0=90w +x_0=0 +y_0=0 +ellps=WGS84 +datum=WGS84 +units=m +no_defs
+    $ echo 9 51 | proj +proj=gall +lon_0=90w +x_0=0 +y_0=0 +ellps=WGS84 +units=m
     7792761.91	5193386.36
 
 Parameters

docs/source/operations/projections/geos.rst

@@ -10,7 +10,7 @@ scanning angle intervals.
 +---------------------+----------------------------------------------------------+
 | **Classification**  | Azimuthal                                                |
 +---------------------+----------------------------------------------------------+
-| **Available forms** | Forward and inverse, spherical and elliptical projection |
+| **Available forms** | Forward and inverse, spherical and ellipsoidal           |
 +---------------------+----------------------------------------------------------+
 | **Defined area**    | Global                                                   |
 +---------------------+----------------------------------------------------------+

docs/source/operations/projections/gins8.rst

@@ -4,6 +4,23 @@
 Ginsburg VIII (TsNIIGAiK)
 ********************************************************************************
 
++---------------------+----------------------------------------------------------+
+| **Classification**  | Pseudocylindrical                                        |
++---------------------+----------------------------------------------------------+
+| **Available forms** | Forward spherical projection                             |
++---------------------+----------------------------------------------------------+
+| **Defined area**    | Global                                                   |
++---------------------+----------------------------------------------------------+
+| **Alias**           | gins8                                                    |
++---------------------+----------------------------------------------------------+
+| **Domain**          | 2D                                                       |
++---------------------+----------------------------------------------------------+
+| **Input type**      | Geodetic coordinates                                     |
++---------------------+----------------------------------------------------------+
+| **Output type**     | Projected coordinates                                    |
++---------------------+----------------------------------------------------------+
+
+
 .. figure:: ./images/gins8.png
    :width: 500 px
    :align: center

docs/source/operations/projections/gn_sinu.rst

@@ -4,6 +4,23 @@
 General Sinusoidal Series
 ********************************************************************************
 
++---------------------+----------------------------------------------------------+
+| **Classification**  | Pseudocylindrical                                        |
++---------------------+----------------------------------------------------------+
+| **Available forms** | Forward and inverse, spherical and ellipsoidal           |
++---------------------+----------------------------------------------------------+
+| **Defined area**    | Global                                                   |
++---------------------+----------------------------------------------------------+
+| **Alias**           | gn_sinu                                                  |
++---------------------+----------------------------------------------------------+
+| **Domain**          | 2D                                                       |
++---------------------+----------------------------------------------------------+
+| **Input type**      | Geodetic coordinates                                     |
++---------------------+----------------------------------------------------------+
+| **Output type**     | Projected coordinates                                    |
++---------------------+----------------------------------------------------------+
+
+
 .. figure:: ./images/gn_sinu.png
    :width: 500 px
    :align: center

docs/source/operations/projections/gnom.rst

@@ -4,6 +4,23 @@
 Gnomonic
 ********************************************************************************
 
++---------------------+----------------------------------------------------------+
+| **Classification**  | Pseudocylindrical                                        |
++---------------------+----------------------------------------------------------+
+| **Available forms** | Forward and inverse, spherical projection                |
++---------------------+----------------------------------------------------------+
+| **Defined area**    | Global                                                   |
++---------------------+----------------------------------------------------------+
+| **Alias**           | gnom                                                     |
++---------------------+----------------------------------------------------------+
+| **Domain**          | 2D                                                       |
++---------------------+----------------------------------------------------------+
+| **Input type**      | Geodetic coordinates                                     |
++---------------------+----------------------------------------------------------+
+| **Output type**     | Projected coordinates                                    |
++---------------------+----------------------------------------------------------+
+
+
 .. figure:: ./images/gnom.png
    :width: 500 px
    :align: center

docs/source/operations/projections/goode.rst

@@ -4,6 +4,23 @@
 Goode Homolosine
 ********************************************************************************
 
++---------------------+----------------------------------------------------------+
+| **Classification**  | Pseudocylindrical                                        |
++---------------------+----------------------------------------------------------+
+| **Available forms** | Forward and inverse, spherical projection                |
++---------------------+----------------------------------------------------------+
+| **Defined area**    | Global                                                   |
++---------------------+----------------------------------------------------------+
+| **Alias**           | goode                                                    |
++---------------------+----------------------------------------------------------+
+| **Domain**          | 2D                                                       |
++---------------------+----------------------------------------------------------+
+| **Input type**      | Geodetic coordinates                                     |
++---------------------+----------------------------------------------------------+
+| **Output type**     | Projected coordinates                                    |
++---------------------+----------------------------------------------------------+
+
+
 .. figure:: ./images/goode.png
    :width: 500 px
    :align: center

docs/source/operations/projections/gs48.rst

@@ -4,6 +4,23 @@
 Mod. Stererographics of 48 U.S.
 ********************************************************************************
 
++---------------------+----------------------------------------------------------+
+| **Classification**  | Azimuthal                                                |
++---------------------+----------------------------------------------------------+
+| **Available forms** | Forward and inverse, spherical and ellipsoidal           |
++---------------------+----------------------------------------------------------+
+| **Defined area**    | The lower 48 states of the U.S.                          |
++---------------------+----------------------------------------------------------+
+| **Alias**           | gs48                                                     |
++---------------------+----------------------------------------------------------+
+| **Domain**          | 2D                                                       |
++---------------------+----------------------------------------------------------+
+| **Input type**      | Geodetic coordinates                                     |
++---------------------+----------------------------------------------------------+
+| **Output type**     | Projected coordinates                                    |
++---------------------+----------------------------------------------------------+
+
+
 .. figure:: ./images/gs48.png
    :width: 500 px
    :align: center

docs/source/operations/projections/gs50.rst

@@ -4,6 +4,23 @@
 Mod. Stererographics of 50 U.S.
 ********************************************************************************
 
++---------------------+----------------------------------------------------------+
+| **Classification**  | Azimuthal                                                |
++---------------------+----------------------------------------------------------+
+| **Available forms** | Forward and inverse, spherical and ellipsoidal           |
++---------------------+----------------------------------------------------------+
+| **Defined area**    | All 50 states of the U.S.                                |
++---------------------+----------------------------------------------------------+
+| **Alias**           | gs50                                                     |
++---------------------+----------------------------------------------------------+
+| **Domain**          | 2D                                                       |
++---------------------+----------------------------------------------------------+
+| **Input type**      | Geodetic coordinates                                     |
++---------------------+----------------------------------------------------------+
+| **Output type**     | Projected coordinates                                    |
++---------------------+----------------------------------------------------------+
+
+
 .. figure:: ./images/gs50.png
    :width: 500 px
    :align: center

docs/source/operations/projections/gstmerc.rst

@@ -4,6 +4,23 @@
 Gauss-Schreiber Transverse Mercator (aka Gauss-Laborde Reunion)
 ********************************************************************************
 
++---------------------+----------------------------------------------------------+
+| **Classification**  | Conformal                                                |
++---------------------+----------------------------------------------------------+
+| **Available forms** | Forward and inverse, spherical projection                |
++---------------------+----------------------------------------------------------+
+| **Defined area**    | Global                                                   |
++---------------------+----------------------------------------------------------+
+| **Alias**           | gstmerc                                                  |
++---------------------+----------------------------------------------------------+
+| **Domain**          | 2D                                                       |
++---------------------+----------------------------------------------------------+
+| **Input type**      | Geodetic coordinates                                     |
++---------------------+----------------------------------------------------------+
+| **Output type**     | Projected coordinates                                    |
++---------------------+----------------------------------------------------------+
+
+
 .. figure:: ./images/gstmerc.png
    :width: 500 px
    :align: center

docs/source/operations/projections/hammer.rst

@@ -4,6 +4,23 @@
 Hammer & Eckert-Greifendorff
 ********************************************************************************
 
++---------------------+----------------------------------------------------------+
+| **Classification**  | Azimuthal                                                |
++---------------------+----------------------------------------------------------+
+| **Available forms** | Forward and inverse, spherical projection                |
++---------------------+----------------------------------------------------------+
+| **Defined area**    | Global                                                   |
++---------------------+----------------------------------------------------------+
+| **Alias**           | hammer                                                   |
++---------------------+----------------------------------------------------------+
+| **Domain**          | 2D                                                       |
++---------------------+----------------------------------------------------------+
+| **Input type**      | Geodetic coordinates                                     |
++---------------------+----------------------------------------------------------+
+| **Output type**     | Projected coordinates                                    |
++---------------------+----------------------------------------------------------+
+
+
 .. figure:: ./images/hammer.png
    :width: 500 px
    :align: center

docs/source/operations/projections/healpix.rst

@@ -6,7 +6,7 @@ HEALPix
 +---------------------+----------------------------------------------------------+
 | **Classification**  | Miscellaneous                                            |
 +---------------------+----------------------------------------------------------+
-| **Available forms** | Forward and inverse, spherical and elliptical projection |
+| **Available forms** | Forward and inverse, spherical and ellipsoidal           |
 +---------------------+----------------------------------------------------------+
 | **Defined area**    | Global                                                   |
 +---------------------+----------------------------------------------------------+

docs/source/operations/projections/igh.rst

@@ -4,6 +4,23 @@
 Interrupted Goode Homolosine
 ********************************************************************************
 
++---------------------+----------------------------------------------------------+
+| **Classification**  | Pseudocylindrical                                        |
++---------------------+----------------------------------------------------------+
+| **Available forms** | Forward and inverse, spherical projection                |
++---------------------+----------------------------------------------------------+
+| **Defined area**    | Global                                                   |
++---------------------+----------------------------------------------------------+
+| **Alias**           | igh                                                      |
++---------------------+----------------------------------------------------------+
+| **Domain**          | 2D                                                       |
++---------------------+----------------------------------------------------------+
+| **Input type**      | Geodetic coordinates                                     |
++---------------------+----------------------------------------------------------+
+| **Output type**     | Projected coordinates                                    |
++---------------------+----------------------------------------------------------+
+
+
 .. figure:: ./images/igh.png
    :width: 500 px
    :align: center

docs/source/operations/projections/imw_p.rst

@@ -4,6 +4,23 @@
 International Map of the World Polyconic
 ********************************************************************************
 
++---------------------+----------------------------------------------------------+
+| **Classification**  | Pseudoconical                                            |
++---------------------+----------------------------------------------------------+
+| **Available forms** | Forward and inverse, spherical and ellipsoidal           |
++---------------------+----------------------------------------------------------+
+| **Defined area**    | Global                                                   |
++---------------------+----------------------------------------------------------+
+| **Alias**           | imw_p                                                    |
++---------------------+----------------------------------------------------------+
+| **Domain**          | 2D                                                       |
++---------------------+----------------------------------------------------------+
+| **Input type**      | Geodetic coordinates                                     |
++---------------------+----------------------------------------------------------+
+| **Output type**     | Projected coordinates                                    |
++---------------------+----------------------------------------------------------+
+
+
 .. figure:: ./images/imw_p.png
    :width: 500 px
    :align: center

docs/source/operations/projections/kav5.rst

@@ -4,6 +4,23 @@
 Kavraisky V
 ********************************************************************************
 
++---------------------+----------------------------------------------------------+
+| **Classification**  | Pseudocylindrical                                        |
++---------------------+----------------------------------------------------------+
+| **Available forms** | Forward and inverse, spherical projection                |
++---------------------+----------------------------------------------------------+
+| **Defined area**    | Global                                                   |
++---------------------+----------------------------------------------------------+
+| **Alias**           | kav5                                                     |
++---------------------+----------------------------------------------------------+
+| **Domain**          | 2D                                                       |
++---------------------+----------------------------------------------------------+
+| **Input type**      | Geodetic coordinates                                     |
++---------------------+----------------------------------------------------------+
+| **Output type**     | Projected coordinates                                    |
++---------------------+----------------------------------------------------------+
+
+
 .. figure:: ./images/kav5.png
    :width: 500 px
    :align: center

docs/source/operations/projections/kav7.rst

@@ -4,6 +4,23 @@
 Kavraisky VII
 ********************************************************************************
 
++---------------------+----------------------------------------------------------+
+| **Classification**  | Pseudocylindrical                                        |
++---------------------+----------------------------------------------------------+
+| **Available forms** | Forward and inverse, spherical projection                |
++---------------------+----------------------------------------------------------+
+| **Defined area**    | Global                                                   |
++---------------------+----------------------------------------------------------+
+| **Alias**           | kav7                                                     |
++---------------------+----------------------------------------------------------+
+| **Domain**          | 2D                                                       |
++---------------------+----------------------------------------------------------+
+| **Input type**      | Geodetic coordinates                                     |
++---------------------+----------------------------------------------------------+
+| **Output type**     | Projected coordinates                                    |
++---------------------+----------------------------------------------------------+
+
+
 .. figure:: ./images/kav7.png
    :width: 500 px
    :align: center