diff options
| -rw-r--r-- | .cirrus.yml | 2 | ||||
| -rw-r--r-- | Dockerfile | 10 | ||||
| -rw-r--r-- | appveyor.yml | 2 | ||||
| -rw-r--r-- | docs/source/download.rst | 44 | ||||
| -rw-r--r-- | docs/source/install.rst | 6 | ||||
| -rw-r--r-- | docs/source/resource_files.rst | 2 | ||||
| -rw-r--r-- | test/gie/more_builtins.gie | 2 | ||||
| -rwxr-xr-x | travis/install.sh | 2 | ||||
| -rwxr-xr-x | travis/mingw32/install.sh | 2 |
9 files changed, 36 insertions, 36 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 5d440f83..f1ff7a2e 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -18,7 +18,7 @@ task: pkginstall_script: - pkg install -y autoconf automake libtool pkgconf sqlite3 wget unzip ccache gmake download_grid_script: - - wget http://download.osgeo.org/proj/proj-datumgrid-1.8.zip + - wget https://download.osgeo.org/proj/proj-datumgrid-1.8.zip - (cd data && unzip -o ../proj-datumgrid-1.8.zip) configure_script: - ./autogen.sh @@ -37,11 +37,11 @@ RUN apt-get update; \ # Put this first as this is rarely changing RUN \ mkdir -p /usr/share/proj; \ - curl -LOs http://download.osgeo.org/proj/proj-datumgrid-1.8.zip && unzip -j -u -o proj-datumgrid-1.8.zip -d /usr/share/proj; \ - curl -LOs http://download.osgeo.org/proj/proj-datumgrid-europe-1.2.zip && unzip -j -u -o proj-datumgrid-europe-1.2.zip -d /usr/share/proj; \ - curl -LOs http://download.osgeo.org/proj/proj-datumgrid-oceania-1.0.zip && unzip -j -u -o proj-datumgrid-oceania-1.0.zip -d /usr/share/proj; \ - curl -LOs http://download.osgeo.org/proj/proj-datumgrid-world-1.0.zip && unzip -j -u -o proj-datumgrid-world-1.0.zip -d /usr/share/proj; \ - curl -LOs http://download.osgeo.org/proj/proj-datumgrid-north-america-1.2.zip && unzip -j -u -o proj-datumgrid-north-america-1.2.zip -d /usr/share/proj; \ + curl -LOs https://download.osgeo.org/proj/proj-datumgrid-1.8.zip && unzip -j -u -o proj-datumgrid-1.8.zip -d /usr/share/proj; \ + curl -LOs https://download.osgeo.org/proj/proj-datumgrid-europe-1.2.zip && unzip -j -u -o proj-datumgrid-europe-1.2.zip -d /usr/share/proj; \ + curl -LOs https://download.osgeo.org/proj/proj-datumgrid-oceania-1.0.zip && unzip -j -u -o proj-datumgrid-oceania-1.0.zip -d /usr/share/proj; \ + curl -LOs https://download.osgeo.org/proj/proj-datumgrid-world-1.0.zip && unzip -j -u -o proj-datumgrid-world-1.0.zip -d /usr/share/proj; \ + curl -LOs https://download.osgeo.org/proj/proj-datumgrid-north-america-1.2.zip && unzip -j -u -o proj-datumgrid-north-america-1.2.zip -d /usr/share/proj; \ rm *.zip COPY --from=builder /build/usr/share/proj/ /usr/share/proj/ diff --git a/appveyor.yml b/appveyor.yml index 1c3bf94a..81a35814 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -47,7 +47,7 @@ test_script: - echo test_script - set PROJ_LIB=%PROJ_DIR%\share\proj - cd %PROJ_LIB% - - curl -O http://download.osgeo.org/proj/proj-datumgrid-1.8.zip + - curl -O https://download.osgeo.org/proj/proj-datumgrid-1.8.zip - 7z e -aoa -y proj-datumgrid-1.8.zip - cd %PROJ_BUILD% - ctest -V -C Release diff --git a/docs/source/download.rst b/docs/source/download.rst index e972101e..a95efae2 100644 --- a/docs/source/download.rst +++ b/docs/source/download.rst @@ -41,26 +41,26 @@ Past Releases * **2018-03-01** `proj-datumgrid-europe-1.0.zip`_ * **2018-03-01** `proj-datumgrid-north-america-1.0.zip`_ -.. _`proj-6.1.0.tar.gz`: http://download.osgeo.org/proj/proj-6.1.0.tar.gz -.. _`proj-6.0.0.tar.gz`: http://download.osgeo.org/proj/proj-6.0.0.tar.gz -.. _`proj-5.2.0.tar.gz`: http://download.osgeo.org/proj/proj-5.2.0.tar.gz -.. _`proj-5.1.0.tar.gz`: http://download.osgeo.org/proj/proj-5.1.0.tar.gz -.. _`proj-5.0.1.tar.gz`: http://download.osgeo.org/proj/proj-5.0.1.tar.gz -.. _`proj-5.0.0.tar.gz`: http://download.osgeo.org/proj/proj-5.0.0.tar.gz -.. _`proj-4.9.1.tar.gz`: http://download.osgeo.org/proj/proj-4.9.1.tar.gz -.. _`proj-4.9.2.tar.gz`: http://download.osgeo.org/proj/proj-4.9.2.tar.gz -.. _`proj-4.9.3.tar.gz`: http://download.osgeo.org/proj/proj-4.9.3.tar.gz -.. _`proj-datumgrid-1.6.zip`: http://download.osgeo.org/proj/proj-datumgrid-1.6.zip -.. _`proj-datumgrid-1.7.zip`: http://download.osgeo.org/proj/proj-datumgrid-1.7.zip -.. _`proj-datumgrid-1.8.zip`: http://download.osgeo.org/proj/proj-datumgrid-1.8.zip -.. _`proj-datumgrid-europe-1.0.zip`: http://download.osgeo.org/proj/proj-datumgrid-europe-1.0.zip -.. _`proj-datumgrid-europe-1.1.zip`: http://download.osgeo.org/proj/proj-datumgrid-europe-1.1.zip -.. _`proj-datumgrid-europe-1.2.zip`: http://download.osgeo.org/proj/proj-datumgrid-europe-1.2.zip -.. _`proj-datumgrid-europe-1.3.zip`: http://download.osgeo.org/proj/proj-datumgrid-europe-1.3.zip -.. _`proj-datumgrid-north-america-1.0.zip`: http://download.osgeo.org/proj/proj-datumgrid-north-america-1.0.zip -.. _`proj-datumgrid-north-america-1.1.zip`: http://download.osgeo.org/proj/proj-datumgrid-north-america-1.1.zip -.. _`proj-datumgrid-north-america-1.2.zip`: http://download.osgeo.org/proj/proj-datumgrid-north-america-1.2.zip -.. _`proj-datumgrid-oceania-1.0.zip`: http://download.osgeo.org/proj/proj-datumgrid-oceania-1.0.zip -.. _`proj-datumgrid-world-1.0.zip`: http://download.osgeo.org/proj/proj-datumgrid-world-1.0.zip -.. _`md5`: http://download.osgeo.org/proj/proj-6.1.0.tar.gz.md5 +.. _`proj-6.1.0.tar.gz`: https://download.osgeo.org/proj/proj-6.1.0.tar.gz +.. _`proj-6.0.0.tar.gz`: https://download.osgeo.org/proj/proj-6.0.0.tar.gz +.. _`proj-5.2.0.tar.gz`: https://download.osgeo.org/proj/proj-5.2.0.tar.gz +.. _`proj-5.1.0.tar.gz`: https://download.osgeo.org/proj/proj-5.1.0.tar.gz +.. _`proj-5.0.1.tar.gz`: https://download.osgeo.org/proj/proj-5.0.1.tar.gz +.. _`proj-5.0.0.tar.gz`: https://download.osgeo.org/proj/proj-5.0.0.tar.gz +.. _`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-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 +.. _`proj-datumgrid-europe-1.0.zip`: https://download.osgeo.org/proj/proj-datumgrid-europe-1.0.zip +.. _`proj-datumgrid-europe-1.1.zip`: https://download.osgeo.org/proj/proj-datumgrid-europe-1.1.zip +.. _`proj-datumgrid-europe-1.2.zip`: https://download.osgeo.org/proj/proj-datumgrid-europe-1.2.zip +.. _`proj-datumgrid-europe-1.3.zip`: https://download.osgeo.org/proj/proj-datumgrid-europe-1.3.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-oceania-1.0.zip`: https://download.osgeo.org/proj/proj-datumgrid-oceania-1.0.zip +.. _`proj-datumgrid-world-1.0.zip`: https://download.osgeo.org/proj/proj-datumgrid-world-1.0.zip +.. _`md5`: https://download.osgeo.org/proj/proj-6.1.0.tar.gz.md5 .. _`proj.pdf`: https://raw.githubusercontent.com/OSGeo/proj.4/gh-pages/proj.pdf diff --git a/docs/source/install.rst b/docs/source/install.rst index c050b86a..a8dc56be 100644 --- a/docs/source/install.rst +++ b/docs/source/install.rst @@ -67,11 +67,11 @@ including proj. For those who are more inclined to the command line, steps 2--10 above can be accomplished by executing the following command:: - C:\temp\osgeo4w-setup-x86-64.exe -q -k -r -A -s http://download.osgeo.org/osgeo4w/ -a x86_64 -P proj + C:\temp\osgeo4w-setup-x86-64.exe -q -k -r -A -s https://download.osgeo.org/osgeo4w/ -a x86_64 -P proj .. _`OSGeo4W`: https://trac.osgeo.org/osgeo4w/ -.. _`32 bit`: http://download.osgeo.org/osgeo4w/osgeo4w-setup-x86.exe -.. _`64 bit`: http://download.osgeo.org/osgeo4w/osgeo4w-setup-x86_64.exe +.. _`32 bit`: https://download.osgeo.org/osgeo4w/osgeo4w-setup-x86.exe +.. _`64 bit`: https://download.osgeo.org/osgeo4w/osgeo4w-setup-x86_64.exe Linux -------------------------------------------------------------------------------- diff --git a/docs/source/resource_files.rst b/docs/source/resource_files.rst index 0bd0c02e..43a5716d 100644 --- a/docs/source/resource_files.rst +++ b/docs/source/resource_files.rst @@ -170,7 +170,7 @@ As GDAL uses NAD83/WGS84 as a pivot datum, the sense of the HPGN datum shift off This was confirmed against the `NGS HPGN calculator <http://www.ngs.noaa.gov/cgi-bin/nadcon2.prl>`__. -The grids are available at http://download.osgeo.org/proj/hpgn_ntv2.zip +The grids are available at https://download.osgeo.org/proj/hpgn_ntv2.zip HTDP +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ diff --git a/test/gie/more_builtins.gie b/test/gie/more_builtins.gie index 75ba55e9..53513d49 100644 --- a/test/gie/more_builtins.gie +++ b/test/gie/more_builtins.gie @@ -242,7 +242,7 @@ Some tests from PJ_vgridshift.c operation proj=vgridshift grids=egm96_15.gtx ellps=GRS80 ------------------------------------------------------------------------------- Appears there is a difference between the egm96_15.gtx distributed by OSGeo4W, -and the one from http://download.osgeo.org/proj/vdatum/egm96_15/egm96_15.gtx +and the one from https://download.osgeo.org/proj/vdatum/egm96_15/egm96_15.gtx N(12.5, 55.5) = -36.021305084228515625 (download.osgeo.org) N(12.5, 55.5) = -35.880001068115234000 (OSGeo4W) This is annoying, but must be handled elsewhere. We jump through the hoop by diff --git a/travis/install.sh b/travis/install.sh index 334dcda3..d0bc3743 100755 --- a/travis/install.sh +++ b/travis/install.sh @@ -14,7 +14,7 @@ fi echo "NPROC=${NPROC}" # Download grid files -wget http://download.osgeo.org/proj/proj-datumgrid-1.8.zip +wget https://download.osgeo.org/proj/proj-datumgrid-1.8.zip # prepare build files ./autogen.sh diff --git a/travis/mingw32/install.sh b/travis/mingw32/install.sh index 80d591f4..af7761c3 100755 --- a/travis/mingw32/install.sh +++ b/travis/mingw32/install.sh @@ -31,7 +31,7 @@ find /tmp/proj_autoconf_install test/unit/test_cpp_api.exe cd .. # Now with grids -wget http://download.osgeo.org/proj/proj-datumgrid-1.5.zip +wget https://download.osgeo.org/proj/proj-datumgrid-1.5.zip cd data unzip -o ../proj-datumgrid-1.5.zip cd .. |