Skip to content

Commit 1dcde3f

Browse files
phaarnesphaarnes
committed
Merge remote-tracking branch 'origin/master' into fix/vert-to-vert-operations-chaining
2 parents 811f783 + c5c3a86 commit 1dcde3f

28 files changed

Lines changed: 263 additions & 81 deletions

‎.github/workflows/docker.yml‎

Lines changed: 50 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ on:
55
paths-ignore:
66
- 'docs/**'
77
branches-ignore: ["dependabot/**"]
8+
tags:
9+
- '*'
810
pull_request:
911
paths-ignore:
1012
- 'docs/**'
@@ -99,6 +101,8 @@ jobs:
99101
VERSION=sha-${GITHUB_SHA::8}
100102
if [[ $GITHUB_REF == refs/tags/* ]]; then
101103
VERSION=${GITHUB_REF/refs\/tags\//}
104+
# 9.8.0-x --> 9.8.0
105+
VERSION=$(echo $VERSION | sed "s/-.*//" )
102106
fi
103107
echo "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
104108
echo "VERSION=${VERSION}" >> $GITHUB_OUTPUT
@@ -109,6 +113,7 @@ jobs:
109113
ARCH=amd64
110114
fi
111115
echo "ARCH=$ARCH" >> $GITHUB_OUTPUT
116+
112117
- name: Build docs image
113118
uses: docker/build-push-action@v6
114119
if: matrix.container == 'proj-docs'
@@ -131,6 +136,21 @@ jobs:
131136
org.opencontainers.image.revision=${{ github.sha }}
132137
org.opencontainers.image.version=${{ steps.prep.outputs.VERSION }}
133138
org.opencontainers.image.created=${{ steps.prep.outputs.BUILD_DATE }}
139+
140+
- name: Prepare tags
141+
id: prep_tags
142+
run: |
143+
TAGS="docker.io/osgeo/${{ matrix.container }}:${{ steps.prep.outputs.VERSION }}-${{ steps.prep.outputs.ARCH }}
144+
ghcr.io/osgeo/${{ matrix.container }}:${{ steps.prep.outputs.VERSION }}-${{ steps.prep.outputs.ARCH }}"
145+
if [ "${GITHUB_REF}" = "refs/heads/master" ]; then
146+
TAGS="$TAGS
147+
docker.io/osgeo/${{ matrix.container }}:latest-${{ steps.prep.outputs.ARCH }}
148+
ghcr.io/osgeo/${{ matrix.container }}:latest-${{ steps.prep.outputs.ARCH }}"
149+
fi
150+
echo "tags<<EOF" >> $GITHUB_OUTPUT
151+
echo "$TAGS" >> $GITHUB_OUTPUT
152+
echo "EOF" >> $GITHUB_OUTPUT
153+
134154
- name: Build image
135155
uses: docker/build-push-action@v6
136156
id: push
@@ -141,11 +161,7 @@ jobs:
141161
context: .
142162
file: ${{ matrix.dockerfile }}
143163
platforms: linux/${{ steps.prep.outputs.ARCH }}
144-
tags: |
145-
docker.io/osgeo/${{ matrix.container }}:${{ steps.prep.outputs.VERSION }}-${{ steps.prep.outputs.ARCH }}
146-
docker.io/osgeo/${{ matrix.container }}:latest-${{ steps.prep.outputs.ARCH }}
147-
ghcr.io/osgeo/${{ matrix.container }}:${{ steps.prep.outputs.VERSION }}-${{ steps.prep.outputs.ARCH }}
148-
ghcr.io/osgeo/${{ matrix.container }}:latest-${{ steps.prep.outputs.ARCH }}
164+
tags: ${{ steps.prep_tags.outputs.tags }}
149165
labels: |
150166
org.opencontainers.image.title=${{ github.event.repository.name }}
151167
org.opencontainers.image.description=${{ github.event.repository.description }}
@@ -189,16 +205,38 @@ jobs:
189205
username: ${{ secrets.DOCKER_USERNAME }}
190206
password: ${{ secrets.DOCKER_PASSWORD }}
191207

208+
- name: Prepare
209+
id: prep
210+
run: |
211+
VERSION=sha-${GITHUB_SHA::8}
212+
if [[ $GITHUB_REF == refs/tags/* ]]; then
213+
VERSION=${GITHUB_REF/refs\/tags\//}
214+
# 9.8.0-x --> 9.8.0
215+
VERSION=$(echo $VERSION | sed "s/-.*//" )
216+
fi
217+
echo "VERSION=${VERSION}" >> $GITHUB_OUTPUT
218+
192219
- name: Create and push multi-platform manifest
193220
if: env.PUSH_PACKAGES == 'true'
194221
run: |
195222
docker buildx imagetools create \
196-
-t ghcr.io/osgeo/proj:latest \
197-
ghcr.io/osgeo/proj:latest-amd64 \
198-
ghcr.io/osgeo/proj:latest-arm64
223+
-t ghcr.io/osgeo/proj:${{ steps.prep.outputs.VERSION }} \
224+
ghcr.io/osgeo/proj:${{ steps.prep.outputs.VERSION }}-amd64 \
225+
ghcr.io/osgeo/proj:${{ steps.prep.outputs.VERSION }}-arm64
199226
200227
docker buildx imagetools create \
201-
-t osgeo/proj:latest \
202-
osgeo/proj:latest-amd64 \
203-
osgeo/proj:latest-arm64
204-
228+
-t osgeo/proj:${{ steps.prep.outputs.VERSION }} \
229+
osgeo/proj:${{ steps.prep.outputs.VERSION }}-amd64 \
230+
osgeo/proj:${{ steps.prep.outputs.VERSION }}-arm64
231+
232+
if [ "${GITHUB_REF}" = "refs/heads/master" ]; then
233+
docker buildx imagetools create \
234+
-t ghcr.io/osgeo/proj:latest \
235+
ghcr.io/osgeo/proj:latest-amd64 \
236+
ghcr.io/osgeo/proj:latest-arm64
237+
238+
docker buildx imagetools create \
239+
-t osgeo/proj:latest \
240+
osgeo/proj:latest-amd64 \
241+
osgeo/proj:latest-arm64
242+
fi

‎data/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ set(ALL_SQL_IN "${CMAKE_CURRENT_BINARY_DIR}/all.sql.in")
3131
set(PROJ_DB "${CMAKE_CURRENT_BINARY_DIR}/proj.db")
3232
include(sql_filelist.cmake)
3333

34-
set(PROJ_DB_SQL_EXPECTED_MD5 "770eaeb370526e8a2b4bd5e5b56c1dd6")
34+
set(PROJ_DB_SQL_EXPECTED_MD5 "56b3283d1be4ef0ae80eb270582daeff")
3535

3636
add_custom_command(
3737
OUTPUT ${PROJ_DB}

‎data/sql/conversion.sql‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2231,6 +2231,8 @@ INSERT INTO "conversion" VALUES('EPSG','11358','Montana Phillips 83 (meter)','Se
22312231
INSERT INTO "usage" VALUES('EPSG','25297','conversion','EPSG','11358','EPSG','4848','EPSG','1029');
22322232
INSERT INTO "conversion" VALUES('EPSG','11359','Montana Phillips 83 (international foot)','For authoritative metric definition see code 11358. Working unit is International feet (note: not US Survey feet).','EPSG','9807','Transverse Mercator','EPSG','8801','Latitude of natural origin',46.45,'EPSG','9110','EPSG','8802','Longitude of natural origin',-107.39,'EPSG','9110','EPSG','8805','Scale factor at natural origin',1.00011,'EPSG','9201','EPSG','8806','False easting',574146.9816,'EPSG','9002','EPSG','8807','False northing',0.0,'EPSG','9002',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);
22332233
INSERT INTO "usage" VALUES('EPSG','25298','conversion','EPSG','11359','EPSG','4848','EPSG','1029');
2234+
INSERT INTO "conversion" VALUES('EPSG','11389','Heathrow Airport GIS Grid 2026','Approximation of Heathrow Airport Grid. ''Azimuth at projection centre'' parameter given by information source as 0°17''56.64382"W.','EPSG','1130','Local Orthographic','EPSG','8811','Latitude of projection centre',51.2812396806,'EPSG','9110','EPSG','8812','Longitude of projection centre',-0.2705963708,'EPSG','9110','EPSG','8813','Azimuth at projection centre',359.420335618,'EPSG','9110','EPSG','8815','Scale factor at projection centre',1.000002816,'EPSG','9201','EPSG','8816','Easting at projection centre',7334.818,'EPSG','9001','EPSG','8817','Northing at projection centre',5637.421,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,0);
2235+
INSERT INTO "usage" VALUES('EPSG','25448','conversion','EPSG','11389','EPSG','4796','EPSG','1189');
22342236
INSERT INTO "conversion" VALUES('EPSG','11401','Iowa CS27 North zone','','EPSG','9802','Lambert Conic Conformal (2SP)','EPSG','8821','Latitude of false origin',41.3,'EPSG','9110','EPSG','8822','Longitude of false origin',-93.3,'EPSG','9110','EPSG','8823','Latitude of 1st standard parallel',43.16,'EPSG','9110','EPSG','8824','Latitude of 2nd standard parallel',42.04,'EPSG','9110','EPSG','8826','Easting at false origin',2000000.0,'EPSG','9003','EPSG','8827','Northing at false origin',0.0,'EPSG','9003',NULL,NULL,NULL,NULL,NULL,NULL,0);
22352237
INSERT INTO "usage" VALUES('EPSG','11165','conversion','EPSG','11401','EPSG','2198','EPSG','1142');
22362238
INSERT INTO "conversion" VALUES('EPSG','11402','Iowa CS27 South zone','','EPSG','9802','Lambert Conic Conformal (2SP)','EPSG','8821','Latitude of false origin',40.0,'EPSG','9110','EPSG','8822','Longitude of false origin',-93.3,'EPSG','9110','EPSG','8823','Latitude of 1st standard parallel',41.47,'EPSG','9110','EPSG','8824','Latitude of 2nd standard parallel',40.37,'EPSG','9110','EPSG','8826','Easting at false origin',2000000.0,'EPSG','9003','EPSG','8827','Northing at false origin',0.0,'EPSG','9003',NULL,NULL,NULL,NULL,NULL,NULL,0);

‎data/sql/engineering_crs.sql‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,5 @@ INSERT INTO "engineering_crs" VALUES('EPSG','5817','Tombak LNG plant',NULL,'EPSG
3030
INSERT INTO "usage" VALUES('EPSG','4260','engineering_crs','EPSG','5817','EPSG','2362','EPSG','1029');
3131
INSERT INTO "engineering_crs" VALUES('EPSG','6715','Christmas Island Grid 1985',NULL,'EPSG','4400','EPSG','1134',0);
3232
INSERT INTO "usage" VALUES('EPSG','4925','engineering_crs','EPSG','6715','EPSG','4169','EPSG','1056');
33+
INSERT INTO "engineering_crs" VALUES('EPSG','11378','Heathrow Airport Grid',NULL,'EPSG','4400','EPSG','1452',0);
34+
INSERT INTO "usage" VALUES('EPSG','25471','engineering_crs','EPSG','11378','EPSG','4796','EPSG','1142');

‎data/sql/engineering_datum.sql‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
INSERT INTO "engineering_datum" VALUES('EPSG','1134','Christmas Island Datum 1985','1985-01-01',NULL,NULL,0);
44
INSERT INTO "usage" VALUES('EPSG','13186','engineering_datum','EPSG','1134','EPSG','4169','EPSG','1056');
5+
INSERT INTO "engineering_datum" VALUES('EPSG','1452','Heathrow Airport Grid',NULL,NULL,NULL,0);
6+
INSERT INTO "usage" VALUES('EPSG','25470','engineering_datum','EPSG','1452','EPSG','4796','EPSG','1142');
57
INSERT INTO "engineering_datum" VALUES('EPSG','9300','Astra Minas',NULL,NULL,NULL,0);
68
INSERT INTO "usage" VALUES('EPSG','13850','engineering_datum','EPSG','9300','EPSG','1265','EPSG','1216');
79
INSERT INTO "engineering_datum" VALUES('EPSG','9301','Barcelona',NULL,NULL,NULL,0);

‎data/sql/extent.sql‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3773,6 +3773,7 @@ INSERT INTO "extent" VALUES('EPSG','4792','Uganda - south of equator and west of
37733773
INSERT INTO "extent" VALUES('EPSG','4793','Liberia - east of 12°W','Liberia - onshore, and offshore east of 12°W.',1.02,8.52,-12.0,-7.36,0);
37743774
INSERT INTO "extent" VALUES('EPSG','4794','Liberia - west of 12°W','Liberia - offshore west of 12°W.',3.12,6.4,-13.59,-12.0,0);
37753775
INSERT INTO "extent" VALUES('EPSG','4795','Europe - Nordic and Baltic countries','Denmark, Estonia, Finland, Latvia, Lithuania, and Sweden - onshore and offshore; Norway - onshore, nearshore, and offshore southeast of a line joining Haugesund and the western limit of the Norway-Denmark maritime boundary.',53.89,71.39,3.24,31.77,0);
3776+
INSERT INTO "extent" VALUES('EPSG','4796','UK - Heathrow','UK - Heathrow airport and surrounding area.',51.42,51.52,-0.56,-0.37,0);
37763777
INSERT INTO "extent" VALUES('EPSG','4797','Georgia - west of 42°E','Georgia - west of 42°E - onshore and offshore.',41.43,43.59,38.97,42.0,0);
37773778
INSERT INTO "extent" VALUES('EPSG','4798','Georgia - east of 42°E','Georgia - east of 42°E - onshore and offshore.',41.04,43.24,41.99,46.72,0);
37783779
INSERT INTO "extent" VALUES('EPSG','4799','UK - Oxford to Cambridge','United Kingdom (UK) - on or related to the East West Rail (Phases 2 and 3) route from Oxford to Cambridge via Bicester, Bletchley and Bedford, including the route from Claydon Junction to Aylesbury and Princes Risborough.',51.7,52.33,-1.43,0.27,0);

‎data/sql/geodetic_datum_ensemble_member.sql‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ INSERT INTO "geodetic_datum_ensemble_member" VALUES('EPSG','6258','EPSG','6765',
6060
INSERT INTO "geodetic_datum_ensemble_member" VALUES('EPSG','6258','EPSG','6619',56);
6161
INSERT INTO "geodetic_datum_ensemble_member" VALUES('EPSG','6258','EPSG','1449',57);
6262
INSERT INTO "geodetic_datum_ensemble_member" VALUES('EPSG','6258','EPSG','1453',58);
63+
INSERT INTO "geodetic_datum_ensemble_member" VALUES('EPSG','6258','EPSG','1403',59);
6364
INSERT INTO "geodetic_datum_ensemble_member" VALUES('EPSG','6326','EPSG','1166',1);
6465
INSERT INTO "geodetic_datum_ensemble_member" VALUES('EPSG','6326','EPSG','1152',2);
6566
INSERT INTO "geodetic_datum_ensemble_member" VALUES('EPSG','6326','EPSG','1153',3);

‎data/sql/helmert_transformation.sql‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,8 @@ INSERT INTO "helmert_transformation" VALUES('PROJ','ETRS89_TO_ETRS89-CHE[CHTRF95
120120
INSERT INTO "usage" VALUES('PROJ','ETRS89_TO_ETRS89-CHE[CHTRF95]_USAGE','helmert_transformation','PROJ','ETRS89_TO_ETRS89-CHE[CHTRF95]','EPSG','1286','EPSG','1024');
121121
INSERT INTO "helmert_transformation" VALUES('PROJ','ETRS89_TO_ETRS89-LUX[ETRF2000]','ETRS89 to ETRS89-LUX [ETRF2000]','Accuracy 0.1 m, from datum ensemble definition','EPSG','9603','Geocentric translations (geog2D domain)','EPSG','4258','EPSG','11393',0.1,0.0,0.0,0.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,'',0);
122122
INSERT INTO "usage" VALUES('PROJ','ETRS89_TO_ETRS89-LUX[ETRF2000]_USAGE','helmert_transformation','PROJ','ETRS89_TO_ETRS89-LUX[ETRF2000]','EPSG','1146','EPSG','1024');
123+
INSERT INTO "helmert_transformation" VALUES('PROJ','ETRS89_TO_NKG_ETRF14','ETRS89 to NKG_ETRF14','Accuracy 0.1 m, from datum ensemble definition','EPSG','9603','Geocentric translations (geog2D domain)','EPSG','4258','EPSG','10807',0.1,0.0,0.0,0.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,'',0);
124+
INSERT INTO "usage" VALUES('PROJ','ETRS89_TO_NKG_ETRF14_USAGE','helmert_transformation','PROJ','ETRS89_TO_NKG_ETRF14','EPSG','4795','EPSG','1024');
123125
INSERT INTO "helmert_transformation" VALUES('PROJ','WGS84_TO_WGS84_TRANSIT','WGS 84 to WGS 84 (Transit)','Accuracy 2.0 m, from datum ensemble definition','EPSG','9603','Geocentric translations (geog2D domain)','EPSG','4326','EPSG','8888',2.0,0.0,0.0,0.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,'',0);
124126
INSERT INTO "usage" VALUES('PROJ','WGS84_TO_WGS84_TRANSIT_USAGE','helmert_transformation','PROJ','WGS84_TO_WGS84_TRANSIT','EPSG','1262','EPSG','1024');
125127
INSERT INTO "helmert_transformation" VALUES('PROJ','WGS84_TO_WGS84_G730','WGS 84 to WGS 84 (G730)','Accuracy 2.0 m, from datum ensemble definition','EPSG','9603','Geocentric translations (geog2D domain)','EPSG','4326','EPSG','9053',2.0,0.0,0.0,0.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,'',0);

‎data/sql/metadata.sql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
INSERT INTO "metadata" VALUES('DATABASE.LAYOUT.VERSION.MAJOR', 1);
1010
INSERT INTO "metadata" VALUES('DATABASE.LAYOUT.VERSION.MINOR', 6);
1111

12-
INSERT INTO "metadata" VALUES('EPSG.VERSION', 'v12.051');
13-
INSERT INTO "metadata" VALUES('EPSG.DATE', '2026-02-28');
12+
INSERT INTO "metadata" VALUES('EPSG.VERSION', 'v12.053');
13+
INSERT INTO "metadata" VALUES('EPSG.DATE', '2026-03-06');
1414

1515
-- The value of ${PROJ_VERSION} is substituted at build time by the actual
1616
-- value.

‎data/sql/other_transformation.sql‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -866,6 +866,8 @@ INSERT INTO "other_transformation" VALUES('EPSG','11313','NKG_ETRF14 to ETRS89-L
866866
INSERT INTO "usage" VALUES('EPSG','25099','other_transformation','EPSG','11313','EPSG','1139','EPSG','1027');
867867
INSERT INTO "other_transformation" VALUES('EPSG','11316','NKG_ETRF14 to ETRS89-LVA [LKS-2020] (2)','Nordic Geodetic Commission (NKG) 2020 transformation. Replaces NKG2008 transformation. Because the difference in coordinates between NKG_ETRF14 and LKS-2020 is small (under a decimetre), although the interpolation CRS is given as NKG_ETRF14, any realization of ETRS89 (including ETRF2014 and LKS-2020) may be used as the interpolation CRS. Scale difference in ppb where 1/billion = 1E-9.','EPSG','1143','Position Vector (geocen) & Geocen translations NEU velocities (gtg)','EPSG','10805','EPSG','10303',0.002,'EPSG','8605','X-axis translation',-0.03958,'EPSG','9001','EPSG','8606','Y-axis translation',-0.05079,'EPSG','9001','EPSG','8607','Z-axis translation',0.05751,'EPSG','9001','EPSG','8608','X-axis rotation',-1.70334,'EPSG','1031','EPSG','8609','Y-axis rotation',1.7302,'EPSG','1031','EPSG','8610','Z-axis rotation',1.3038,'EPSG','1031','EPSG','8611','Scale difference',-2.789,'EPSG','1028','EPSG','1068','Source epoch',2000.0,'EPSG','1029','EPSG','1069','Target epoch',2020.28,'EPSG','1029','EPSG','1050','Point motion velocity grid file','NKG_RF17vel.tif','EPSG','10807','NKG2020',0);
868868
INSERT INTO "usage" VALUES('EPSG','25135','other_transformation','EPSG','11316','EPSG','1139','EPSG','1027');
869+
INSERT INTO "other_transformation" VALUES('EPSG','11388','OSGB36 / British National Grid to Heathrow Airport Grid (1)','Defines Heathrow Airport Grid absolute position and orientation, so considered error-free.','EPSG','9621','Similarity transformation','EPSG','27700','EPSG','11378',0.0,'EPSG','8621','Ordinate 1 of evaluation point in target CRS',-504786.4675,'EPSG','9001','EPSG','8622','Ordinate 2 of evaluation point in target CRS',-156728.1037,'EPSG','9001','EPSG','1061','Scale factor for source CRS axes',1.000259617024,'EPSG','9201','EPSG','8614','Rotation angle of source CRS axes',0.026361909134441,'EPSG','9101',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,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'HAL-Gbr LHR',0);
870+
INSERT INTO "usage" VALUES('EPSG','25468','other_transformation','EPSG','11388','EPSG','4796','EPSG','1142');
869871
INSERT INTO "other_transformation" VALUES('EPSG','15487','TWD67 / TM2 zone 121 to TWD97 / TM2 zone 121 (1)','Derived at Hu Tzu Shan (23°59''N, 120°58''E). Residuals increase to maximum of 6.4m as distance increases from this point.','EPSG','9656','Cartesian Grid Offsets','EPSG','3828','EPSG','3826',7.0,'EPSG','8728','Easting offset',828.589,'EPSG','9001','EPSG','8729','Northing offset',-206.915,'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,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'asafi-Twn',0);
870872
INSERT INTO "usage" VALUES('EPSG','11498','other_transformation','EPSG','15487','EPSG','3982','EPSG','1045');
871873
INSERT INTO "other_transformation" VALUES('EPSG','15596','Tokyo + JSLD height to WGS 84 (7)','','EPSG','9618','Geographic2D with Height Offsets','EPSG','7414','EPSG','4979',1.0,'EPSG','8601','Latitude offset',7.94,'EPSG','9104','EPSG','8602','Longitude offset',-13.97,'EPSG','9104','EPSG','8604','Geoid height',26.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,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'GSI-Jpn 452142',0);

0 commit comments

Comments
 (0)