aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AUTHORS2
-rw-r--r--CITATION4
-rw-r--r--CONTRIBUTING.md6
-rw-r--r--README.md2
-rw-r--r--cmake/ProjConfig.cmake2
-rw-r--r--configure.ac2
-rw-r--r--docs/source/apps/cct.rst2
-rw-r--r--docs/source/apps/cs2cs.rst2
-rw-r--r--docs/source/apps/geod.rst2
-rw-r--r--docs/source/apps/gie.rst2
-rw-r--r--docs/source/apps/proj.rst2
-rw-r--r--docs/source/apps/projinfo.rst2
-rw-r--r--docs/source/community/contributing.rst2
-rw-r--r--docs/source/community/rfc/rfc-2.rst4
-rw-r--r--jniwrap/build.xml2
-rw-r--r--jniwrap/org.osgeo.proj/org/proj4/PJ.java2
-rw-r--r--jniwrap/org.osgeo.proj/org/proj4/package-info.java2
-rw-r--r--src/iso19111/coordinateoperation.cpp134
-rwxr-xr-xtravis/deploy_website.sh2
19 files changed, 89 insertions, 89 deletions
diff --git a/AUTHORS b/AUTHORS
index e00a3d78..9fd655bd 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -18,7 +18,7 @@ Project Steering Committee
--------------------------------------------------------------------------------
Process and membership can be found at:
-https://proj4.org/community/rfc/rfc-1.html
+https://proj.org/community/rfc/rfc-1.html
Chair
................................................................................
diff --git a/CITATION b/CITATION
index cd765bfe..9d2b6c3c 100644
--- a/CITATION
+++ b/CITATION
@@ -1,7 +1,7 @@
To cite PROJ in publications use:
PROJ contributors (2019). PROJ coordinate transformation software
- library. Open Source Geospatial Foundation. URL https://proj4.org/.
+ library. Open Source Geospatial Foundation. URL https://proj.org/.
A BibTeX entry for LaTeX users is
@@ -12,5 +12,5 @@ A BibTeX entry for LaTeX users is
author = {{PROJ contributors}},
organization = {Open Source Geospatial Foundation},
year = {2019},
- url = {https://proj4.org/},
+ url = {https://proj.org/},
}
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 24410928..83cd5a1a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -68,18 +68,18 @@ Note that not all feature requests are accepted.
## Write documentation
PROJ.4 is in dire need of better documentation. Any contributions of documentation
-are greatly appreciated. The PROJ.4 documentation is available on [proj4.org](https://proj4.org).
+are greatly appreciated. The PROJ.4 documentation is available on [proj.org](https://proj.org).
The website is generated with [Sphinx](http://www.sphinx-doc.org/en/stable/). Contributions
to the documentation should be made as [Pull Requests](https://github.com/OSGeo/proj.4/pulls)
on GitHub.
If you intend to document one of PROJ.4's supported projections please use the
-[Mercator projection](https://proj4.org/projections/merc.html) as a template.
+[Mercator projection](https://proj.org/operations/projections/merc.html) as a template.
## Code contributions
-See [Code Contributions](https://proj4.org/development/for_proj_contributors.html)
+See [Code Contributions](https://proj.org/community/code_contributions.html)
#### Legalese
Committers are the front line gatekeepers to keep the code base clear of improperly contributed code.
diff --git a/README.md b/README.md
index 602b4d40..177ac7a4 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ This includes cartographic projections as well as geodetic transformations.
For more information on the PROJ.4 project please see the web page at:
-https://proj4.org/
+https://proj.org/
The PROJ.4 mailing list can be found at:
diff --git a/cmake/ProjConfig.cmake b/cmake/ProjConfig.cmake
index 2243c37d..2d992992 100644
--- a/cmake/ProjConfig.cmake
+++ b/cmake/ProjConfig.cmake
@@ -35,7 +35,7 @@ set(PACKAGE_BUGREPORT "https://github.com/OSGeo/proj.4/issues")
set(PACKAGE_NAME "PROJ")
set(PACKAGE_STRING "PROJ ${${PROJECT_INTERN_NAME}_VERSION}")
set(PACKAGE_TARNAME "proj")
-set(PACKAGE_URL "https://proj4.org")
+set(PACKAGE_URL "https://proj.org")
set(PACKAGE_VERSION "${${PROJECT_INTERN_NAME}_VERSION}")
# check if a second proj_config.h exists (created by ./configure)
diff --git a/configure.ac b/configure.ac
index a76710d0..4d0d3a17 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
AC_INIT([PROJ], [6.1.0],
- [https://github.com/OSGeo/proj.4/issues], proj, [https://proj4.org])
+ [https://github.com/OSGeo/proj.4/issues], proj, [https://proj.org])
AC_CONFIG_MACRO_DIR([m4])
AC_LANG(C)
diff --git a/docs/source/apps/cct.rst b/docs/source/apps/cct.rst
index 629e181c..22b26f46 100644
--- a/docs/source/apps/cct.rst
+++ b/docs/source/apps/cct.rst
@@ -190,4 +190,4 @@ Hence, in honour of *cct* (the geodesist) this is :program:`cct` (the program).
Home page
*********
- https://proj4.org/
+ https://proj.org/
diff --git a/docs/source/apps/cs2cs.rst b/docs/source/apps/cs2cs.rst
index afe5a610..649ccc74 100644
--- a/docs/source/apps/cs2cs.rst
+++ b/docs/source/apps/cs2cs.rst
@@ -235,4 +235,4 @@ outputs
Home page
*********
- https://proj4.org/
+ https://proj.org/
diff --git a/docs/source/apps/geod.rst b/docs/source/apps/geod.rst
index 2897445d..15389bb5 100644
--- a/docs/source/apps/geod.rst
+++ b/docs/source/apps/geod.rst
@@ -211,4 +211,4 @@ Further reading
Home page
*********
- https://proj4.org/
+ https://proj.org/
diff --git a/docs/source/apps/gie.rst b/docs/source/apps/gie.rst
index bab0ec69..b3eb170b 100644
--- a/docs/source/apps/gie.rst
+++ b/docs/source/apps/gie.rst
@@ -377,4 +377,4 @@ So in honour, and hopefully also in the spirit, of Gerald Ian Evenden
Home page
*********
- https://proj4.org/
+ https://proj.org/
diff --git a/docs/source/apps/proj.rst b/docs/source/apps/proj.rst
index 2dbd104a..547ff90e 100644
--- a/docs/source/apps/proj.rst
+++ b/docs/source/apps/proj.rst
@@ -229,4 +229,4 @@ data will appear as three lines of::
Home page
*********
- https://proj4.org/
+ https://proj.org/
diff --git a/docs/source/apps/projinfo.rst b/docs/source/apps/projinfo.rst
index fc816e40..94a80420 100644
--- a/docs/source/apps/projinfo.rst
+++ b/docs/source/apps/projinfo.rst
@@ -332,4 +332,4 @@ Output:
Home page
*********
- https://proj4.org/
+ https://proj.org/
diff --git a/docs/source/community/contributing.rst b/docs/source/community/contributing.rst
index 8ead82bd..b3f234f4 100644
--- a/docs/source/community/contributing.rst
+++ b/docs/source/community/contributing.rst
@@ -88,7 +88,7 @@ Write documentation
PROJ is in dire need of better documentation. Any contributions of
documentation are greatly appreciated. The PROJ documentation is
-available on `proj4.org <https://proj4.org>`__. The website is generated
+available on `proj.org <https://proj.org>`__. The website is generated
with `Sphinx <http://www.sphinx-doc.org/en/stable/>`__. Contributions to
the documentation should be made as `Pull
Requests <https://github.com/OSGeo/proj.4/pulls>`__ on GitHub.
diff --git a/docs/source/community/rfc/rfc-2.rst b/docs/source/community/rfc/rfc-2.rst
index c510bb75..e6f013a3 100644
--- a/docs/source/community/rfc/rfc-2.rst
+++ b/docs/source/community/rfc/rfc-2.rst
@@ -303,9 +303,9 @@ transformations)
unknown id, Inverse of Tokyo to WGS 84 (1) + Tokyo to JGD2011 (2), 29.2 m, Asia - Japan and South Korea
-.. _`coordinate operations`: https://proj4.org/operations/index.html
+.. _`coordinate operations`: https://proj.org/operations/index.html
-.. _`PROJ transformation grid`: https://proj4.org/resource_files.html#transformation-grids
+.. _`PROJ transformation grid`: https://proj.org/resource_files.html#transformation-grids
Code repository
diff --git a/jniwrap/build.xml b/jniwrap/build.xml
index 20c7523c..11aef091 100644
--- a/jniwrap/build.xml
+++ b/jniwrap/build.xml
@@ -36,7 +36,7 @@
<attribute name="Implementation-Title" value="PROJ bridge to Java"/>
<attribute name="Implementation-Version" value="${version}"/>
<attribute name="Implementation-Vendor" value="Proj.4 project"/>
- <attribute name="Implementation-URL" value="https://proj4.org/"/>
+ <attribute name="Implementation-URL" value="https://proj.org/"/>
</manifest>
</jar>
</target>
diff --git a/jniwrap/org.osgeo.proj/org/proj4/PJ.java b/jniwrap/org.osgeo.proj/org/proj4/PJ.java
index d8facf76..e33c9aae 100644
--- a/jniwrap/org.osgeo.proj/org/proj4/PJ.java
+++ b/jniwrap/org.osgeo.proj/org/proj4/PJ.java
@@ -32,7 +32,7 @@ import java.lang.annotation.Native;
/**
- * Wraps the <a href="https://proj4.org/">PROJ</a> {@code PJ} native data structure.
+ * Wraps the <a href="https://proj.org/">PROJ</a> {@code PJ} native data structure.
* Almost every methods defined in this class are native methods delegating the work to the PROJ library.
* This class is the only place where such native methods are defined.
*
diff --git a/jniwrap/org.osgeo.proj/org/proj4/package-info.java b/jniwrap/org.osgeo.proj/org/proj4/package-info.java
index 1dda16a3..dc38e762 100644
--- a/jniwrap/org.osgeo.proj/org/proj4/package-info.java
+++ b/jniwrap/org.osgeo.proj/org/proj4/package-info.java
@@ -27,7 +27,7 @@
*/
/**
- * Wrappers for the <a href="https://proj4.org/">PROJ</a> library.
+ * Wrappers for the <a href="https://proj.org/">PROJ</a> library.
* The {@link org.proj4.PJ} class contains only native methods delegating their work to the PROJ library.
* For higher-level methods making use of those native methods, see for example the
* <a href="http://www.geoapi.org/geoapi-proj4/index.html">GeoAPI bindings for PROJ</a>.
diff --git a/src/iso19111/coordinateoperation.cpp b/src/iso19111/coordinateoperation.cpp
index 3b480a92..2686f515 100644
--- a/src/iso19111/coordinateoperation.cpp
+++ b/src/iso19111/coordinateoperation.cpp
@@ -2700,7 +2700,7 @@ createParams(const common::Measure &m1, const common::Measure &m2,
// ---------------------------------------------------------------------------
/** \brief Instantiate a [Universal Transverse Mercator]
- *(https://proj4.org/operations/projections/utm.html) conversion.
+ *(https://proj.org/operations/projections/utm.html) conversion.
*
* UTM is a family of conversions, of EPSG codes from 16001 to 16060 for the
* northern hemisphere, and 17001 to 17060 for the southern hemisphere,
@@ -2729,7 +2729,7 @@ ConversionNNPtr Conversion::createUTM(const util::PropertyMap &properties,
// ---------------------------------------------------------------------------
/** \brief Instantiate a conversion based on the [Transverse Mercator]
- *(https://proj4.org/operations/projections/tmerc.html) projection method.
+ *(https://proj.org/operations/projections/tmerc.html) projection method.
*
* This method is defined as [EPSG:9807]
* (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::9807)
@@ -2756,7 +2756,7 @@ ConversionNNPtr Conversion::createTransverseMercator(
/** \brief Instantiate a conversion based on the [Gauss Schreiber Transverse
*Mercator]
- *(https://proj4.org/operations/projections/gstmerc.html) projection method.
+ *(https://proj.org/operations/projections/gstmerc.html) projection method.
*
* This method is also known as Gauss-Laborde Reunion.
*
@@ -2785,7 +2785,7 @@ ConversionNNPtr Conversion::createGaussSchreiberTransverseMercator(
/** \brief Instantiate a conversion based on the [Transverse Mercator South
*Orientated]
- *(https://proj4.org/operations/projections/tmerc.html) projection method.
+ *(https://proj.org/operations/projections/tmerc.html) projection method.
*
* This method is defined as [EPSG:9808]
* (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::9808)
@@ -2812,7 +2812,7 @@ ConversionNNPtr Conversion::createTransverseMercatorSouthOriented(
// ---------------------------------------------------------------------------
/** \brief Instantiate a conversion based on the [Two Point Equidistant]
- *(https://proj4.org/operations/projections/tpeqd.html) projection method.
+ *(https://proj.org/operations/projections/tpeqd.html) projection method.
*
* There is no equivalent in EPSG.
*
@@ -2870,7 +2870,7 @@ ConversionNNPtr Conversion::createTunisiaMappingGrid(
// ---------------------------------------------------------------------------
/** \brief Instantiate a conversion based on the [Albers Conic Equal Area]
- *(https://proj4.org/operations/projections/aea.html) projection method.
+ *(https://proj.org/operations/projections/aea.html) projection method.
*
* This method is defined as [EPSG:9822]
* (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::9822)
@@ -2905,7 +2905,7 @@ Conversion::createAlbersEqualArea(const util::PropertyMap &properties,
// ---------------------------------------------------------------------------
/** \brief Instantiate a conversion based on the [Lambert Conic Conformal 1SP]
- *(https://proj4.org/operations/projections/lcc.html) projection method.
+ *(https://proj.org/operations/projections/lcc.html) projection method.
*
* This method is defined as [EPSG:9801]
* (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::9801)
@@ -2931,7 +2931,7 @@ ConversionNNPtr Conversion::createLambertConicConformal_1SP(
// ---------------------------------------------------------------------------
/** \brief Instantiate a conversion based on the [Lambert Conic Conformal (2SP)]
- *(https://proj4.org/operations/projections/lcc.html) projection method.
+ *(https://proj.org/operations/projections/lcc.html) projection method.
*
* This method is defined as [EPSG:9802]
* (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::9802)
@@ -2967,7 +2967,7 @@ ConversionNNPtr Conversion::createLambertConicConformal_2SP(
/** \brief Instantiate a conversion based on the [Lambert Conic Conformal (2SP
*Michigan)]
- *(https://proj4.org/operations/projections/lcc.html) projection method.
+ *(https://proj.org/operations/projections/lcc.html) projection method.
*
* This method is defined as [EPSG:1051]
* (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::1051)
@@ -3004,7 +3004,7 @@ ConversionNNPtr Conversion::createLambertConicConformal_2SP_Michigan(
/** \brief Instantiate a conversion based on the [Lambert Conic Conformal (2SP
*Belgium)]
- *(https://proj4.org/operations/projections/lcc.html) projection method.
+ *(https://proj.org/operations/projections/lcc.html) projection method.
*
* This method is defined as [EPSG:9803]
* (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::9803)
@@ -3045,7 +3045,7 @@ ConversionNNPtr Conversion::createLambertConicConformal_2SP_Belgium(
/** \brief Instantiate a conversion based on the [Modified Azimuthal
*Equidistant]
- *(https://proj4.org/operations/projections/aeqd.html) projection method.
+ *(https://proj.org/operations/projections/aeqd.html) projection method.
*
* This method is defined as [EPSG:9832]
* (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::9832)
@@ -3070,7 +3070,7 @@ ConversionNNPtr Conversion::createAzimuthalEquidistant(
// ---------------------------------------------------------------------------
/** \brief Instantiate a conversion based on the [Guam Projection]
- *(https://proj4.org/operations/projections/aeqd.html) projection method.
+ *(https://proj.org/operations/projections/aeqd.html) projection method.
*
* This method is defined as [EPSG:9831]
* (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::9831)
@@ -3096,7 +3096,7 @@ ConversionNNPtr Conversion::createGuamProjection(
// ---------------------------------------------------------------------------
/** \brief Instantiate a conversion based on the [Bonne]
- *(https://proj4.org/operations/projections/bonne.html) projection method.
+ *(https://proj.org/operations/projections/bonne.html) projection method.
*
* This method is defined as [EPSG:9827]
* (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::9827)
@@ -3124,7 +3124,7 @@ ConversionNNPtr Conversion::createBonne(const util::PropertyMap &properties,
/** \brief Instantiate a conversion based on the [Lambert Cylindrical Equal Area
*(Spherical)]
- *(https://proj4.org/operations/projections/cea.html) projection method.
+ *(https://proj.org/operations/projections/cea.html) projection method.
*
* This method is defined as [EPSG:9834]
* (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::9834)
@@ -3155,7 +3155,7 @@ ConversionNNPtr Conversion::createLambertCylindricalEqualAreaSpherical(
/** \brief Instantiate a conversion based on the [Lambert Cylindrical Equal Area
*(ellipsoidal form)]
- *(https://proj4.org/operations/projections/cea.html) projection method.
+ *(https://proj.org/operations/projections/cea.html) projection method.
*
* This method is defined as [EPSG:9835]
* (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::9835)
@@ -3181,7 +3181,7 @@ ConversionNNPtr Conversion::createLambertCylindricalEqualArea(
// ---------------------------------------------------------------------------
/** \brief Instantiate a conversion based on the [Cassini-Soldner]
- * (https://proj4.org/operations/projections/cass.html) projection method.
+ * (https://proj.org/operations/projections/cass.html) projection method.
*
* This method is defined as [EPSG:9806]
* (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::9806)
@@ -3206,7 +3206,7 @@ ConversionNNPtr Conversion::createCassiniSoldner(
// ---------------------------------------------------------------------------
/** \brief Instantiate a conversion based on the [Equidistant Conic]
- *(https://proj4.org/operations/projections/eqdc.html) projection method.
+ *(https://proj.org/operations/projections/eqdc.html) projection method.
*
* There is no equivalent in EPSG.
*
@@ -3238,7 +3238,7 @@ ConversionNNPtr Conversion::createEquidistantConic(
// ---------------------------------------------------------------------------
/** \brief Instantiate a conversion based on the [Eckert I]
- * (https://proj4.org/operations/projections/eck1.html) projection method.
+ * (https://proj.org/operations/projections/eck1.html) projection method.
*
* There is no equivalent in EPSG.
*
@@ -3260,7 +3260,7 @@ ConversionNNPtr Conversion::createEckertI(const util::PropertyMap &properties,
// ---------------------------------------------------------------------------
/** \brief Instantiate a conversion based on the [Eckert II]
- * (https://proj4.org/operations/projections/eck2.html) projection method.
+ * (https://proj.org/operations/projections/eck2.html) projection method.
*
* There is no equivalent in EPSG.
*
@@ -3281,7 +3281,7 @@ ConversionNNPtr Conversion::createEckertII(
// ---------------------------------------------------------------------------
/** \brief Instantiate a conversion based on the [Eckert III]
- * (https://proj4.org/operations/projections/eck3.html) projection method.
+ * (https://proj.org/operations/projections/eck3.html) projection method.
*
* There is no equivalent in EPSG.
*
@@ -3302,7 +3302,7 @@ ConversionNNPtr Conversion::createEckertIII(
// ---------------------------------------------------------------------------
/** \brief Instantiate a conversion based on the [Eckert IV]
- * (https://proj4.org/operations/projections/eck4.html) projection method.
+ * (https://proj.org/operations/projections/eck4.html) projection method.
*
* There is no equivalent in EPSG.
*
@@ -3323,7 +3323,7 @@ ConversionNNPtr Conversion::createEckertIV(
// ---------------------------------------------------------------------------
/** \brief Instantiate a conversion based on the [Eckert V]
- * (https://proj4.org/operations/projections/eck5.html) projection method.
+ * (https://proj.org/operations/projections/eck5.html) projection method.
*
* There is no equivalent in EPSG.
*
@@ -3345,7 +3345,7 @@ ConversionNNPtr Conversion::createEckertV(const util::PropertyMap &properties,
// ---------------------------------------------------------------------------
/** \brief Instantiate a conversion based on the [Eckert VI]
- * (https://proj4.org/operations/projections/eck6.html) projection method.
+ * (https://proj.org/operations/projections/eck6.html) projection method.
*
* There is no equivalent in EPSG.
*
@@ -3366,7 +3366,7 @@ ConversionNNPtr Conversion::createEckertVI(
// ---------------------------------------------------------------------------
/** \brief Instantiate a conversion based on the [Equidistant Cylindrical]
- *(https://proj4.org/operations/projections/eqc.html) projection method.
+ *(https://proj.org/operations/projections/eqc.html) projection method.
*
* This is also known as the Equirectangular method, and in the particular case
* where the latitude of first parallel is 0.
@@ -3400,7 +3400,7 @@ ConversionNNPtr Conversion::createEquidistantCylindrical(
/** \brief Instantiate a conversion based on the [Equidistant Cylindrical
*(Spherical)]
- *(https://proj4.org/operations/projections/eqc.html) projection method.
+ *(https://proj.org/operations/projections/eqc.html) projection method.
*
* This is also known as the Equirectangular method, and in the particular case
* where the latitude of first parallel is 0.
@@ -3434,7 +3434,7 @@ ConversionNNPtr Conversion::createEquidistantCylindricalSpherical(
// ---------------------------------------------------------------------------
/** \brief Instantiate a conversion based on the [Gall (Stereographic)]
- * (https://proj4.org/operations/projections/gall.html) projection method.
+ * (https://proj.org/operations/projections/gall.html) projection method.
*
* There is no equivalent in EPSG.
*
@@ -3456,7 +3456,7 @@ ConversionNNPtr Conversion::createGall(const util::PropertyMap &properties,
// ---------------------------------------------------------------------------
/** \brief Instantiate a conversion based on the [Goode Homolosine]
- * (https://proj4.org/operations/projections/goode.html) projection method.
+ * (https://proj.org/operations/projections/goode.html) projection method.
*
* There is no equivalent in EPSG.
*
@@ -3477,7 +3477,7 @@ ConversionNNPtr Conversion::createGoodeHomolosine(
// ---------------------------------------------------------------------------
/** \brief Instantiate a conversion based on the [Interrupted Goode Homolosine]
- * (https://proj4.org/operations/projections/igh.html) projection method.
+ * (https://proj.org/operations/projections/igh.html) projection method.
*
* There is no equivalent in EPSG.
*
@@ -3503,7 +3503,7 @@ ConversionNNPtr Conversion::createInterruptedGoodeHomolosine(
// ---------------------------------------------------------------------------
/** \brief Instantiate a conversion based on the [Geostationary Satellite View]
- * (https://proj4.org/operations/projections/geos.html) projection method,
+ * (https://proj.org/operations/projections/geos.html) projection method,
* with the sweep angle axis of the viewing instrument being x
*
* There is no equivalent in EPSG.
@@ -3528,7 +3528,7 @@ ConversionNNPtr Conversion::createGeostationarySatelliteSweepX(
// ---------------------------------------------------------------------------
/** \brief Instantiate a conversion based on the [Geostationary Satellite View]
- * (https://proj4.org/operations/projections/geos.html) projection method,
+ * (https://proj.org/operations/projections/geos.html) projection method,
* with the sweep angle axis of the viewing instrument being y.
*
* There is no equivalent in EPSG.
@@ -3553,7 +3553,7 @@ ConversionNNPtr Conversion::createGeostationarySatelliteSweepY(
// ---------------------------------------------------------------------------
/** \brief Instantiate a conversion based on the [Gnomonic]
- *(https://proj4.org/operations/projections/gnom.html) projection method.
+ *(https://proj.org/operations/projections/gnom.html) projection method.
*
* There is no equivalent in EPSG.
*
@@ -3578,7 +3578,7 @@ ConversionNNPtr Conversion::createGnomonic(
/** \brief Instantiate a conversion based on the [Hotine Oblique Mercator
*(Variant A)]
- *(https://proj4.org/operations/projections/omerc.html) projection method
+ *(https://proj.org/operations/projections/omerc.html) projection method
*
* This is the variant with the no_uoff parameter, which corresponds to
* GDAL &gt;=2.3 Hotine_Oblique_Mercator projection.
@@ -3593,7 +3593,7 @@ ConversionNNPtr Conversion::createGnomonic(
* \note In the case where azimuthInitialLine = angleFromRectifiedToSkrewGrid =
*90deg,
* this maps to the [Swiss Oblique Mercator]
- *(https://proj4.org/operations/projections/somerc.html) formulas.
+ *(https://proj.org/operations/projections/somerc.html) formulas.
*
* @param properties See \ref general_properties of the conversion. If the name
* is not provided, it is automatically set.
@@ -3626,7 +3626,7 @@ ConversionNNPtr Conversion::createHotineObliqueMercatorVariantA(
/** \brief Instantiate a conversion based on the [Hotine Oblique Mercator
*(Variant B)]
- *(https://proj4.org/operations/projections/omerc.html) projection method
+ *(https://proj.org/operations/projections/omerc.html) projection method
*
* This is the variant without the no_uoff parameter, which corresponds to
* GDAL &gt;=2.3 Hotine_Oblique_Mercator_Azimuth_Center projection.
@@ -3639,7 +3639,7 @@ ConversionNNPtr Conversion::createHotineObliqueMercatorVariantA(
* \note In the case where azimuthInitialLine = angleFromRectifiedToSkrewGrid =
*90deg,
* this maps to the [Swiss Oblique Mercator]
- *(https://proj4.org/operations/projections/somerc.html) formulas.
+ *(https://proj.org/operations/projections/somerc.html) formulas.
*
* @param properties See \ref general_properties of the conversion. If the name
* is not provided, it is automatically set.
@@ -3672,7 +3672,7 @@ ConversionNNPtr Conversion::createHotineObliqueMercatorVariantB(
/** \brief Instantiate a conversion based on the [Hotine Oblique Mercator Two
*Point Natural Origin]
- *(https://proj4.org/operations/projections/omerc.html) projection method.
+ *(https://proj.org/operations/projections/omerc.html) projection method.
*
* There is no equivalent in EPSG.
*
@@ -3713,7 +3713,7 @@ ConversionNNPtr Conversion::createHotineObliqueMercatorTwoPointNaturalOrigin(
// ---------------------------------------------------------------------------
/** \brief Instantiate a conversion based on the [Laborde Oblique Mercator]
- *(https://proj4.org/operations/projections/labrd.html) projection method.
+ *(https://proj.org/operations/projections/labrd.html) projection method.
*
* This method is defined as [EPSG:9813]
* (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::9813)
@@ -3744,7 +3744,7 @@ ConversionNNPtr Conversion::createLabordeObliqueMercator(
/** \brief Instantiate a conversion based on the [International Map of the World
*Polyconic]
- *(https://proj4.org/operations/projections/imw_p.html) projection method.
+ *(https://proj.org/operations/projections/imw_p.html) projection method.
*
* There is no equivalent in EPSG.
*
@@ -3775,7 +3775,7 @@ ConversionNNPtr Conversion::createInternationalMapWorldPolyconic(
// ---------------------------------------------------------------------------
/** \brief Instantiate a conversion based on the [Krovak (north oriented)]
- *(https://proj4.org/operations/projections/krovak.html) projection method.
+ *(https://proj.org/operations/projections/krovak.html) projection method.
*
* This method is defined as [EPSG:1041]
* (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::1041)
@@ -3825,7 +3825,7 @@ ConversionNNPtr Conversion::createKrovakNorthOriented(
// ---------------------------------------------------------------------------
/** \brief Instantiate a conversion based on the [Krovak]
- *(https://proj4.org/operations/projections/krovak.html) projection method.
+ *(https://proj.org/operations/projections/krovak.html) projection method.
*
* This method is defined as [EPSG:9819]
* (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::9819)
@@ -3877,7 +3877,7 @@ Conversion::createKrovak(const util::PropertyMap &properties,
// ---------------------------------------------------------------------------
/** \brief Instantiate a conversion based on the [Lambert Azimuthal Equal Area]
- *(https://proj4.org/operations/projections/laea.html) projection method.
+ *(https://proj.org/operations/projections/laea.html) projection method.
*
* This method is defined as [EPSG:9820]
* (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::9820)
@@ -3902,7 +3902,7 @@ ConversionNNPtr Conversion::createLambertAzimuthalEqualArea(
// ---------------------------------------------------------------------------
/** \brief Instantiate a conversion based on the [Miller Cylindrical]
- *(https://proj4.org/operations/projections/mill.html) projection method.
+ *(https://proj.org/operations/projections/mill.html) projection method.
*
* There is no equivalent in EPSG.
*
@@ -3923,7 +3923,7 @@ ConversionNNPtr Conversion::createMillerCylindrical(
// ---------------------------------------------------------------------------
/** \brief Instantiate a conversion based on the [Mercator]
- *(https://proj4.org/operations/projections/merc.html) projection method.
+ *(https://proj.org/operations/projections/merc.html) projection method.
*
* This is the variant, also known as Mercator (1SP), defined with the scale
* factor. Note that latitude of natural origin (centerLat) is a parameter,
@@ -3953,7 +3953,7 @@ ConversionNNPtr Conversion::createMercatorVariantA(
// ---------------------------------------------------------------------------
/** \brief Instantiate a conversion based on the [Mercator]
- *(https://proj4.org/operations/projections/merc.html) projection method.
+ *(https://proj.org/operations/projections/merc.html) projection method.
*
* This is the variant, also known as Mercator (2SP), defined with the latitude
* of the first standard parallel (the second standard parallel is implicitly
@@ -3983,7 +3983,7 @@ ConversionNNPtr Conversion::createMercatorVariantB(
/** \brief Instantiate a conversion based on the [Popular Visualisation Pseudo
*Mercator]
- *(https://proj4.org/operations/projections/webmerc.html) projection method.
+ *(https://proj.org/operations/projections/webmerc.html) projection method.
*
* Also known as WebMercator. Mostly/only used for Projected CRS EPSG:3857
* (WGS 84 / Pseudo-Mercator)
@@ -4011,7 +4011,7 @@ ConversionNNPtr Conversion::createPopularVisualisationPseudoMercator(
// ---------------------------------------------------------------------------
/** \brief Instantiate a conversion based on the [Mollweide]
- * (https://proj4.org/operations/projections/moll.html) projection method.
+ * (https://proj.org/operations/projections/moll.html) projection method.
*
* There is no equivalent in EPSG.
*
@@ -4032,7 +4032,7 @@ ConversionNNPtr Conversion::createMollweide(
// ---------------------------------------------------------------------------
/** \brief Instantiate a conversion based on the [New Zealand Map Grid]
- * (https://proj4.org/operations/projections/nzmg.html) projection method.
+ * (https://proj.org/operations/projections/nzmg.html) projection method.
*
* This method is defined as [EPSG:9811]
* (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::9811)
@@ -4058,7 +4058,7 @@ ConversionNNPtr Conversion::createNewZealandMappingGrid(
/** \brief Instantiate a conversion based on the [Oblique Stereographic
*(Alternative)]
- *(https://proj4.org/operations/projections/sterea.html) projection method.
+ *(https://proj.org/operations/projections/sterea.html) projection method.
*
* This method is defined as [EPSG:9809]
* (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::9809)
@@ -4084,7 +4084,7 @@ ConversionNNPtr Conversion::createObliqueStereographic(
// ---------------------------------------------------------------------------
/** \brief Instantiate a conversion based on the [Orthographic]
- *(https://proj4.org/operations/projections/ortho.html) projection method.
+ *(https://proj.org/operations/projections/ortho.html) projection method.
*
* This method is defined as [EPSG:9840]
* (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::9840)
@@ -4111,7 +4111,7 @@ ConversionNNPtr Conversion::createOrthographic(
// ---------------------------------------------------------------------------
/** \brief Instantiate a conversion based on the [American Polyconic]
- *(https://proj4.org/operations/projections/poly.html) projection method.
+ *(https://proj.org/operations/projections/poly.html) projection method.
*
* This method is defined as [EPSG:9818]
* (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::9818)
@@ -4137,7 +4137,7 @@ ConversionNNPtr Conversion::createAmericanPolyconic(
/** \brief Instantiate a conversion based on the [Polar Stereographic (Variant
*A)]
- *(https://proj4.org/operations/projections/stere.html) projection method.
+ *(https://proj.org/operations/projections/stere.html) projection method.
*
* This method is defined as [EPSG:9810]
* (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::9810)
@@ -4166,7 +4166,7 @@ ConversionNNPtr Conversion::createPolarStereographicVariantA(
/** \brief Instantiate a conversion based on the [Polar Stereographic (Variant
*B)]
- *(https://proj4.org/operations/projections/stere.html) projection method.
+ *(https://proj.org/operations/projections/stere.html) projection method.
*
* This method is defined as [EPSG:9829]
* (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::9829)
@@ -4195,7 +4195,7 @@ ConversionNNPtr Conversion::createPolarStereographicVariantB(
// ---------------------------------------------------------------------------
/** \brief Instantiate a conversion based on the [Robinson]
- * (https://proj4.org/operations/projections/robin.html) projection method.
+ * (https://proj.org/operations/projections/robin.html) projection method.
*
* There is no equivalent in EPSG.
*
@@ -4216,7 +4216,7 @@ ConversionNNPtr Conversion::createRobinson(
// ---------------------------------------------------------------------------
/** \brief Instantiate a conversion based on the [Sinusoidal]
- * (https://proj4.org/operations/projections/sinu.html) projection method.
+ * (https://proj.org/operations/projections/sinu.html) projection method.
*
* There is no equivalent in EPSG.
*
@@ -4237,7 +4237,7 @@ ConversionNNPtr Conversion::createSinusoidal(
// ---------------------------------------------------------------------------
/** \brief Instantiate a conversion based on the [Stereographic]
- *(https://proj4.org/operations/projections/stere.html) projection method.
+ *(https://proj.org/operations/projections/stere.html) projection method.
*
* There is no equivalent in EPSG. This method implements the original "Oblique
* Stereographic" method described in "Snyder's Map Projections - A Working
@@ -4266,7 +4266,7 @@ ConversionNNPtr Conversion::createStereographic(
// ---------------------------------------------------------------------------
/** \brief Instantiate a conversion based on the [Van der Grinten]
- * (https://proj4.org/operations/projections/vandg.html) projection method.
+ * (https://proj.org/operations/projections/vandg.html) projection method.
*
* There is no equivalent in EPSG.
*
@@ -4287,7 +4287,7 @@ ConversionNNPtr Conversion::createVanDerGrinten(
// ---------------------------------------------------------------------------
/** \brief Instantiate a conversion based on the [Wagner I]
- * (https://proj4.org/operations/projections/wag1.html) projection method.
+ * (https://proj.org/operations/projections/wag1.html) projection method.
*
* There is no equivalent in EPSG.
*
@@ -4309,7 +4309,7 @@ ConversionNNPtr Conversion::createWagnerI(const util::PropertyMap &properties,
// ---------------------------------------------------------------------------
/** \brief Instantiate a conversion based on the [Wagner II]
- * (https://proj4.org/operations/projections/wag2.html) projection method.
+ * (https://proj.org/operations/projections/wag2.html) projection method.
*
* There is no equivalent in EPSG.
*
@@ -4330,7 +4330,7 @@ ConversionNNPtr Conversion::createWagnerII(
// ---------------------------------------------------------------------------
/** \brief Instantiate a conversion based on the [Wagner III]
- * (https://proj4.org/operations/projections/wag3.html) projection method.
+ * (https://proj.org/operations/projections/wag3.html) projection method.
*
* There is no equivalent in EPSG.
*
@@ -4354,7 +4354,7 @@ ConversionNNPtr Conversion::createWagnerIII(
// ---------------------------------------------------------------------------
/** \brief Instantiate a conversion based on the [Wagner IV]
- * (https://proj4.org/operations/projections/wag4.html) projection method.
+ * (https://proj.org/operations/projections/wag4.html) projection method.
*
* There is no equivalent in EPSG.
*
@@ -4375,7 +4375,7 @@ ConversionNNPtr Conversion::createWagnerIV(
// ---------------------------------------------------------------------------
/** \brief Instantiate a conversion based on the [Wagner V]
- * (https://proj4.org/operations/projections/wag5.html) projection method.
+ * (https://proj.org/operations/projections/wag5.html) projection method.
*
* There is no equivalent in EPSG.
*
@@ -4397,7 +4397,7 @@ ConversionNNPtr Conversion::createWagnerV(const util::PropertyMap &properties,
// ---------------------------------------------------------------------------
/** \brief Instantiate a conversion based on the [Wagner VI]
- * (https://proj4.org/operations/projections/wag6.html) projection method.
+ * (https://proj.org/operations/projections/wag6.html) projection method.
*
* There is no equivalent in EPSG.
*
@@ -4418,7 +4418,7 @@ ConversionNNPtr Conversion::createWagnerVI(
// ---------------------------------------------------------------------------
/** \brief Instantiate a conversion based on the [Wagner VII]
- * (https://proj4.org/operations/projections/wag7.html) projection method.
+ * (https://proj.org/operations/projections/wag7.html) projection method.
*
* There is no equivalent in EPSG.
*
@@ -4440,7 +4440,7 @@ ConversionNNPtr Conversion::createWagnerVII(
/** \brief Instantiate a conversion based on the [Quadrilateralized Spherical
*Cube]
- *(https://proj4.org/operations/projections/qsc.html) projection method.
+ *(https://proj.org/operations/projections/qsc.html) projection method.
*
* There is no equivalent in EPSG.
*
@@ -4464,7 +4464,7 @@ ConversionNNPtr Conversion::createQuadrilateralizedSphericalCube(
// ---------------------------------------------------------------------------
/** \brief Instantiate a conversion based on the [Spherical Cross-Track Height]
- *(https://proj4.org/operations/projections/sch.html) projection method.
+ *(https://proj.org/operations/projections/sch.html) projection method.
*
* There is no equivalent in EPSG.
*
@@ -4489,7 +4489,7 @@ ConversionNNPtr Conversion::createSphericalCrossTrackHeight(
// ---------------------------------------------------------------------------
/** \brief Instantiate a conversion based on the [Equal Earth]
- * (https://proj4.org/operations/projections/eqearth.html) projection method.
+ * (https://proj.org/operations/projections/eqearth.html) projection method.
*
* This method is defined as [EPSG:1078]
* (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::1078)
@@ -5886,7 +5886,7 @@ void Conversion::_exportToPROJString(
// ---------------------------------------------------------------------------
/** \brief Return whether a conversion is a [Universal Transverse Mercator]
- * (https://proj4.org/operations/projections/utm.html) conversion.
+ * (https://proj.org/operations/projections/utm.html) conversion.
*
* @param[out] zone UTM zone number between 1 and 60.
* @param[out] north true for UTM northern hemisphere, false for UTM southern
diff --git a/travis/deploy_website.sh b/travis/deploy_website.sh
index 387778be..01b92cbf 100755
--- a/travis/deploy_website.sh
+++ b/travis/deploy_website.sh
@@ -21,7 +21,7 @@ git config user.name "proj.4 deploybot"
# A few files we must manually create
echo "_site" > .gitignore
touch .nojekyll
-echo "proj4.org" > CNAME
+echo "proj.org" > CNAME
git add -A
git commit -m "update with results of commit https://github.com/OSGeo/proj.4/commit/$TRAVIS_COMMIT"