Skip to content

Commit

Permalink
Merge pull request #34 from jjimenezshaw/upgrade-proj-9.5.1
Browse files Browse the repository at this point in the history
Upgrade to PROJ 9.5.1
  • Loading branch information
jjimenezshaw authored Dec 2, 2024
2 parents ea53c02 + d8eba70 commit 538c9df
Show file tree
Hide file tree
Showing 72 changed files with 1,032 additions and 380 deletions.
380 changes: 280 additions & 100 deletions crslist.json

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,12 @@
</head>

<body onload="load()">
<h1>CRS Explorer - PROJ <span id="proj_version">9.5.0</span> codes</h1>
<h1>CRS Explorer - PROJ <span id="proj_version">9.5.1</span> codes</h1>
<div>
<label for="version">PROJ version: </label>
<select name="version" id="version" onchange="versionChanged(this)">
<option value="latest">latest</option>
<option value="9.5.1">9.5.1</option>
<option value="9.5.0">9.5.0</option>
<option value="9.4.1">9.4.1</option>
<option value="9.4.0">9.4.0</option>
Expand Down
15 changes: 8 additions & 7 deletions metadata.txt
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
pyproj info:
pyproj: 3.6.1
PROJ: 9.5.0
pyproj: 3.7.0
PROJ (runtime): 9.5.1
PROJ (compiled): 9.5.1
data dir: /usr/share/proj/
user_data_dir: /tmp/proj
PROJ DATA (recommended version): 1.19
PROJ DATA (recommended version): 1.20
PROJ Database: 1.4
EPSG Database: v11.016 [2024-08-31]
ESRI Database: ArcGIS Pro 3.3 [2024-08-16]
EPSG Database: v11.022 [2024-11-05]
ESRI Database: ArcGIS Pro 3.4 [2024-11-04]
IGNF Database: 3.1.0 [2019-05-24]

System:
python: 3.10.12 (main, Jul 29 2024, 16:56:48) [GCC 11.4.0]
python: 3.10.12 (main, Nov 6 2024, 20:22:13) [GCC 11.4.0]
executable: /home/venv/bin/python3
machine: Linux-6.5.0-1025-azure-x86_64-with-glibc2.35

Python deps:
certifi: 2024.8.30
Cython: None
setuptools: 59.6.0
pip: 24.2
pip: 24.3.1
14 changes: 7 additions & 7 deletions scripts/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
ARG VERSION
FROM ghcr.io/osgeo/proj:$VERSION
FROM ghcr.io/osgeo/proj:${VERSION:-9.5.0}

ARG PYPROJ_VERSION 3.3.0
ENV PYPROJ_VERSION $PYPROJ_VERSION
ENV PYPROJ_VERSIONi=$PYPROJ_VERSION

ENV PROJ_DIR /usr/
ENV PROJ_DATA /usr/share/proj/
ENV PROJ_DIR=/usr/
ENV PROJ_DATA=/usr/share/proj/

ENV VIRTUAL_ENV /home/venv
ENV PATH $VIRTUAL_ENV/bin:$PATH
ENV VIRTUAL_ENV=/home/venv
ENV PATH=$VIRTUAL_ENV/bin:$PATH

ENV DEST_DIR /home/dist
ENV DEST_DIR=/home/dist

WORKDIR /home/

Expand Down
4 changes: 2 additions & 2 deletions scripts/gen_file.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ set -Eeuo pipefail
echo 'Set first argument to "addgit" if you want to add wkt files automatically'

# indicate DOCKER PROJ version
PROJ_VERSION=9.5.0
PYPROJ_VERSION=3.6.1
PROJ_VERSION=9.5.1
PYPROJ_VERSION=3.7.0
TAG="crs-explorer:$PROJ_VERSION"

# prepare destination
Expand Down
132 changes: 102 additions & 30 deletions sitemap.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33834,6 +33834,12 @@
<url>
<loc>https://crs-explorer.proj.org/wkt2/EPSG/10571.txt</loc>
</url>
<url>
<loc>https://crs-explorer.proj.org/wkt1/EPSG/10588.txt</loc>
</url>
<url>
<loc>https://crs-explorer.proj.org/wkt2/EPSG/10588.txt</loc>
</url>
<url>
<loc>https://crs-explorer.proj.org/wkt1/EPSG/10592.txt</loc>
</url>
Expand Down Expand Up @@ -33972,6 +33978,66 @@
<url>
<loc>https://crs-explorer.proj.org/wkt2/EPSG/10665.txt</loc>
</url>
<url>
<loc>https://crs-explorer.proj.org/wkt1/EPSG/10669.txt</loc>
</url>
<url>
<loc>https://crs-explorer.proj.org/wkt2/EPSG/10669.txt</loc>
</url>
<url>
<loc>https://crs-explorer.proj.org/wkt1/EPSG/10670.txt</loc>
</url>
<url>
<loc>https://crs-explorer.proj.org/wkt2/EPSG/10670.txt</loc>
</url>
<url>
<loc>https://crs-explorer.proj.org/wkt1/EPSG/10671.txt</loc>
</url>
<url>
<loc>https://crs-explorer.proj.org/wkt2/EPSG/10671.txt</loc>
</url>
<url>
<loc>https://crs-explorer.proj.org/wkt1/EPSG/10672.txt</loc>
</url>
<url>
<loc>https://crs-explorer.proj.org/wkt2/EPSG/10672.txt</loc>
</url>
<url>
<loc>https://crs-explorer.proj.org/wkt1/EPSG/10673.txt</loc>
</url>
<url>
<loc>https://crs-explorer.proj.org/wkt2/EPSG/10673.txt</loc>
</url>
<url>
<loc>https://crs-explorer.proj.org/wkt1/EPSG/10674.txt</loc>
</url>
<url>
<loc>https://crs-explorer.proj.org/wkt2/EPSG/10674.txt</loc>
</url>
<url>
<loc>https://crs-explorer.proj.org/wkt1/EPSG/10678.txt</loc>
</url>
<url>
<loc>https://crs-explorer.proj.org/wkt2/EPSG/10678.txt</loc>
</url>
<url>
<loc>https://crs-explorer.proj.org/wkt1/EPSG/10679.txt</loc>
</url>
<url>
<loc>https://crs-explorer.proj.org/wkt2/EPSG/10679.txt</loc>
</url>
<url>
<loc>https://crs-explorer.proj.org/wkt1/EPSG/10686.txt</loc>
</url>
<url>
<loc>https://crs-explorer.proj.org/wkt2/EPSG/10686.txt</loc>
</url>
<url>
<loc>https://crs-explorer.proj.org/wkt1/EPSG/10687.txt</loc>
</url>
<url>
<loc>https://crs-explorer.proj.org/wkt2/EPSG/10687.txt</loc>
</url>
<url>
<loc>https://crs-explorer.proj.org/wkt1/EPSG/10731.txt</loc>
</url>
Expand Down Expand Up @@ -45126,36 +45192,6 @@
<url>
<loc>https://crs-explorer.proj.org/wkt2/ESRI/4812.txt</loc>
</url>
<url>
<loc>https://crs-explorer.proj.org/wkt1/ESRI/10481.txt</loc>
</url>
<url>
<loc>https://crs-explorer.proj.org/wkt2/ESRI/10481.txt</loc>
</url>
<url>
<loc>https://crs-explorer.proj.org/wkt1/ESRI/10516.txt</loc>
</url>
<url>
<loc>https://crs-explorer.proj.org/wkt2/ESRI/10516.txt</loc>
</url>
<url>
<loc>https://crs-explorer.proj.org/wkt1/ESRI/10731.txt</loc>
</url>
<url>
<loc>https://crs-explorer.proj.org/wkt2/ESRI/10731.txt</loc>
</url>
<url>
<loc>https://crs-explorer.proj.org/wkt1/ESRI/10732.txt</loc>
</url>
<url>
<loc>https://crs-explorer.proj.org/wkt2/ESRI/10732.txt</loc>
</url>
<url>
<loc>https://crs-explorer.proj.org/wkt1/ESRI/10733.txt</loc>
</url>
<url>
<loc>https://crs-explorer.proj.org/wkt2/ESRI/10733.txt</loc>
</url>
<url>
<loc>https://crs-explorer.proj.org/wkt1/ESRI/20062.txt</loc>
</url>
Expand Down Expand Up @@ -58140,6 +58176,30 @@
<url>
<loc>https://crs-explorer.proj.org/wkt2/ESRI/103977.txt</loc>
</url>
<url>
<loc>https://crs-explorer.proj.org/wkt1/ESRI/103978.txt</loc>
</url>
<url>
<loc>https://crs-explorer.proj.org/wkt2/ESRI/103978.txt</loc>
</url>
<url>
<loc>https://crs-explorer.proj.org/wkt1/ESRI/103979.txt</loc>
</url>
<url>
<loc>https://crs-explorer.proj.org/wkt2/ESRI/103979.txt</loc>
</url>
<url>
<loc>https://crs-explorer.proj.org/wkt1/ESRI/103980.txt</loc>
</url>
<url>
<loc>https://crs-explorer.proj.org/wkt2/ESRI/103980.txt</loc>
</url>
<url>
<loc>https://crs-explorer.proj.org/wkt1/ESRI/103981.txt</loc>
</url>
<url>
<loc>https://crs-explorer.proj.org/wkt2/ESRI/103981.txt</loc>
</url>
<url>
<loc>https://crs-explorer.proj.org/wkt1/ESRI/104000.txt</loc>
</url>
Expand Down Expand Up @@ -62478,6 +62538,18 @@
<url>
<loc>https://crs-explorer.proj.org/wkt2/ESRI/115931.txt</loc>
</url>
<url>
<loc>https://crs-explorer.proj.org/wkt1/ESRI/115932.txt</loc>
</url>
<url>
<loc>https://crs-explorer.proj.org/wkt2/ESRI/115932.txt</loc>
</url>
<url>
<loc>https://crs-explorer.proj.org/wkt1/ESRI/115933.txt</loc>
</url>
<url>
<loc>https://crs-explorer.proj.org/wkt2/ESRI/115933.txt</loc>
</url>
<url>
<loc>https://crs-explorer.proj.org/wkt1/IAU_2015/1000.txt</loc>
</url>
Expand Down
7 changes: 7 additions & 0 deletions wkt1/EPSG/10588.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
VERT_CS["CGVD28(HTv2.0) height",
VERT_DATUM["Canadian Geodetic Vertical Datum of 1928 (Height Transformation version 2.0)",2005,
AUTHORITY["EPSG","1384"]],
UNIT["metre",1,
AUTHORITY["EPSG","9001"]],
AXIS["Gravity-related height",UP],
AUTHORITY["EPSG","10588"]]
13 changes: 13 additions & 0 deletions wkt1/EPSG/10669.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
GEOCCS["RGM23",
DATUM["Mayotte_Geodetic_Reference_Frame_2023",
SPHEROID["GRS 1980",6378137,298.257222101,
AUTHORITY["EPSG","7019"]],
AUTHORITY["EPSG","1389"]],
PRIMEM["Greenwich",0,
AUTHORITY["EPSG","8901"]],
UNIT["metre",1,
AUTHORITY["EPSG","9001"]],
AXIS["Geocentric X",OTHER],
AXIS["Geocentric Y",OTHER],
AXIS["Geocentric Z",NORTH],
AUTHORITY["EPSG","10669"]]
3 changes: 3 additions & 0 deletions wkt1/EPSG/10670.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Error: EPSG:10670 cannot be written as WKT1_GDAL
type: GEOGRAPHIC_3D_CRS
name: RGM23
10 changes: 10 additions & 0 deletions wkt1/EPSG/10671.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
GEOGCS["RGM23",
DATUM["Mayotte_Geodetic_Reference_Frame_2023",
SPHEROID["GRS 1980",6378137,298.257222101,
AUTHORITY["EPSG","7019"]],
AUTHORITY["EPSG","1389"]],
PRIMEM["Greenwich",0,
AUTHORITY["EPSG","8901"]],
UNIT["degree",0.0174532925199433,
AUTHORITY["EPSG","9122"]],
AUTHORITY["EPSG","10671"]]
3 changes: 3 additions & 0 deletions wkt1/EPSG/10672.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Error: EPSG:10672 cannot be written as WKT1_GDAL
type: GEOGRAPHIC_3D_CRS
name: RGM23 (lon-lat)
10 changes: 10 additions & 0 deletions wkt1/EPSG/10673.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
GEOGCS["RGM23 (lon-lat)",
DATUM["Mayotte_Geodetic_Reference_Frame_2023",
SPHEROID["GRS 1980",6378137,298.257222101,
AUTHORITY["EPSG","7019"]],
AUTHORITY["EPSG","1389"]],
PRIMEM["Greenwich",0,
AUTHORITY["EPSG","8901"]],
UNIT["degree",0.0174532925199433,
AUTHORITY["EPSG","9122"]],
AUTHORITY["EPSG","10673"]]
16 changes: 8 additions & 8 deletions wkt1/ESRI/10731.txt → wkt1/EPSG/10674.txt
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
PROJCS["ETRS89_DREF91_2016_UTM_zone_31N",
GEOGCS["ETRS89/DREF91/2016",
DATUM["ETRS89_DREF91_Realization_2016",
PROJCS["RGM23 / UTM zone 38S",
GEOGCS["RGM23",
DATUM["Mayotte_Geodetic_Reference_Frame_2023",
SPHEROID["GRS 1980",6378137,298.257222101,
AUTHORITY["EPSG","7019"]],
AUTHORITY["EPSG","1353"]],
AUTHORITY["EPSG","1389"]],
PRIMEM["Greenwich",0,
AUTHORITY["EPSG","8901"]],
UNIT["degree",0.0174532925199433,
AUTHORITY["EPSG","9122"]],
AUTHORITY["EPSG","10284"]],
AUTHORITY["EPSG","10671"]],
PROJECTION["Transverse_Mercator"],
PARAMETER["latitude_of_origin",0],
PARAMETER["central_meridian",3],
PARAMETER["central_meridian",45],
PARAMETER["scale_factor",0.9996],
PARAMETER["false_easting",500000],
PARAMETER["false_northing",0],
PARAMETER["false_northing",10000000],
UNIT["metre",1,
AUTHORITY["EPSG","9001"]],
AXIS["Easting",EAST],
AXIS["Northing",NORTH],
AUTHORITY["ESRI","10731"]]
AUTHORITY["EPSG","10674"]]
7 changes: 7 additions & 0 deletions wkt1/EPSG/10678.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
VERT_CS["BSCD2000 depth",
VERT_DATUM["Baltic Sea Chart Datum 2000",2005,
AUTHORITY["EPSG","1390"]],
UNIT["metre",1,
AUTHORITY["EPSG","9001"]],
AXIS["Depth",DOWN],
AUTHORITY["EPSG","10678"]]
19 changes: 19 additions & 0 deletions wkt1/EPSG/10679.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
COMPD_CS["ETRS89 + BSCD2000 depth",
GEOGCS["ETRS89",
DATUM["European_Terrestrial_Reference_System_1989",
SPHEROID["GRS 1980",6378137,298.257222101,
AUTHORITY["EPSG","7019"]],
AUTHORITY["EPSG","6258"]],
PRIMEM["Greenwich",0,
AUTHORITY["EPSG","8901"]],
UNIT["degree",0.0174532925199433,
AUTHORITY["EPSG","9122"]],
AUTHORITY["EPSG","4258"]],
VERT_CS["BSCD2000 depth",
VERT_DATUM["Baltic Sea Chart Datum 2000",2005,
AUTHORITY["EPSG","1390"]],
UNIT["metre",1,
AUTHORITY["EPSG","9001"]],
AXIS["Depth",DOWN],
AUTHORITY["EPSG","10678"]],
AUTHORITY["EPSG","10679"]]
19 changes: 19 additions & 0 deletions wkt1/EPSG/10686.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
COMPD_CS["Slovenia 1996 + SVS2000 height",
GEOGCS["Slovenia 1996",
DATUM["Slovenia_Geodetic_Datum_1996",
SPHEROID["GRS 1980",6378137,298.257222101,
AUTHORITY["EPSG","7019"]],
AUTHORITY["EPSG","6765"]],
PRIMEM["Greenwich",0,
AUTHORITY["EPSG","8901"]],
UNIT["degree",0.0174532925199433,
AUTHORITY["EPSG","9122"]],
AUTHORITY["EPSG","4765"]],
VERT_CS["SVS2000 height",
VERT_DATUM["Slovenian Vertical System 2000",2005,
AUTHORITY["EPSG","5177"]],
UNIT["metre",1,
AUTHORITY["EPSG","9001"]],
AXIS["Gravity-related height",UP],
AUTHORITY["EPSG","5779"]],
AUTHORITY["EPSG","10686"]]
Loading

0 comments on commit 538c9df

Please sign in to comment.