diff --git a/copyright_and_licenses.csv b/copyright_and_licenses.csv index 8255bcb..d4ed1c5 100644 --- a/copyright_and_licenses.csv +++ b/copyright_and_licenses.csv @@ -92,7 +92,7 @@ dk_sdfe_DK_general.pol,Agency for Data Supply and Efficiency (SDFE),CC-BY-4.0,, dk_sdfe_DK_jutland.pol,Agency for Data Supply and Efficiency (SDFE),CC-BY-4.0,, dk_sdfe_DK_zealand.pol,Agency for Data Supply and Efficiency (SDFE),CC-BY-4.0,, dk_sdfe_dnn.tif,Agency for Data Supply and Efficiency (SDFE),CC-BY-4.0,, -dk_sdfe_dvr90.tif,Agency for Data Supply and Efficiency (SDFE),CC-BY-4.0,, +dk_sdfe_dvr90.tif,Agency for Data Supply and Efficiency (SDFE),CC-BY-4.0,,1.17 dk_sdfe_FO_fk89.pol,Agency for Data Supply and Efficiency (SDFE),CC-BY-4.0,, dk_sdfe_fvr09.tif,Agency for Data Supply and Efficiency (SDFE),CC-BY-4.0,, dk_sdfe_gvr2000.tif,Agency for Data Supply and Efficiency (SDFE),CC-BY-4.0,, diff --git a/dk_sdfe/DK b/dk_sdfe/DK index df324ab..478ba92 100644 --- a/dk_sdfe/DK +++ b/dk_sdfe/DK @@ -4,9 +4,10 @@ # #------------------------------------------------------------------------------------------------------ # -# This file is Work-In-Progress, and should not be used without great testing care. It is -# currently provided for informational and testing purposes, but will in due course become -# the official definition and implementation of transformations to and from Danish systems. +# This file is legacy Work-In-Progress, and should not be used. It is has previously +# been provided for informational and testing purposes. +# +# WARNING: THIS FILE WILL BE REMOVED IN THE NEAR FUTURE! # # Revision history: # ----------------- @@ -32,16 +33,21 @@ # for PROJ 5.0.0 release. # Thomas Knudsen # +# 2023-01-04 Removed DVR90 as it is now fully implemented in +# the EPSG registry. In general this file should +# not be used anymore and it will be removed in the +# near future. +# Kristian Evers +# #------------------------------------------------------------------------------------------------------ - +version=1.0.0 +origin=SDFE +lastupdate=2018-02-26 + +version=2.0.0 +origin=SDFI +lastupdate=2023-01-04 #------------------------------------------------------------------------------------------------------ # Vertical datums #------------------------------------------------------------------------------------------------------ - proj=vgridshift grids=dk_sdfe_dvr90.tif # current proj=vgridshift grids=dk_sdfe_dnn.tif # historical #------------------------------------------------------------------------------------------------------ @@ -53,9 +59,6 @@ proj=utm zone=32 ellps=GRS80 units=m no_defs proj=utm zone=33 ellps=GRS80 units=m no_defs - proj=pipeline step init=DK:DVR90 step init=DK:UTM32N - proj=pipeline step init=DK:DVR90 step init=DK:UTM33N - proj=pipeline step init=DK:DNN step init=DK:UTM32N proj=pipeline step init=DK:DNN step init=DK:UTM33N #------------------------------------------------------------------------------------------------------ @@ -76,11 +79,6 @@ expect 691875.6321 6098907.8250 proj=etmerc lat_0=0 lon_0=11.75 k=0.99998 x_0=600000 y_0=-5000000 ellps=GRS80 units=m no_defs proj=etmerc lat_0=0 lon_0=15 k=1 x_0=800000 y_0=-5000000 ellps=GRS80 units=m no_defs - proj=pipeline step init=DK:DVR90 step init=DK:DKTM1 - proj=pipeline step init=DK:DVR90 step init=DK:DKTM2 - proj=pipeline step init=DK:DVR90 step init=DK:DKTM3 - proj=pipeline step init=DK:DVR90 step init=DK:DKTM4 - proj=pipeline step init=DK:DNN step init=DK:DKTM1 proj=pipeline step init=DK:DNN step init=DK:DKTM2 proj=pipeline step init=DK:DNN step init=DK:DKTM3 @@ -97,10 +95,6 @@ expect 691875.6321 6098907.8250 proj=etmerc lat_0=0 lon_0=9.5 k=0.99995 x_0=200000 y_0=0 ellps=GRS80 units=m no_defs proj=etmerc lat_0=0 lon_0=12 k=0.99995 x_0=500000 y_0=0 ellps=GRS80 units=m no_defs - proj=pipeline step init=DK:DVR90 step init=DK:KP2000B - proj=pipeline step init=DK:DVR90 step init=DK:KP2000J - proj=pipeline step init=DK:DVR90 step init=DK:KP2000S - proj=pipeline step init=DK:DNN step init=DK:KP2000B proj=pipeline step init=DK:DNN step init=DK:KP2000J proj=pipeline step init=DK:DNN step init=DK:KP2000S diff --git a/dk_sdfe/dk_sdfe_README.txt b/dk_sdfe/dk_sdfe_README.txt index 76e82c4..3ad8e6e 100644 --- a/dk_sdfe/dk_sdfe_README.txt +++ b/dk_sdfe/dk_sdfe_README.txt @@ -14,17 +14,6 @@ from [Agency for Data Supply and Efficiency](https://github.com/NordicGeodesy/No Transform local height system DVR90 (EPSG:5799) to ETRS89 ellipsoidal heights (EPSG:4937). The horizontal grid coordinates are referenced to ETRS89. -* dk_sdfe_dvr90.tif - -### Denmark: DNN heights -> ETRS89 ellipsoidal heights - -*Source*: [Agency for Data Supply and Efficiency](https://github.com/NordicGeodesy/NordicTransformations) -*Format*: GeoTIFF converted from GTX -*License*: [Creative Commons Attribution 4.0](https://creativecommons.org/licenses/by/4.0/) - -Transform local height system DNN (EPSG:5733) to ETRS89 ellipsoidal heights (EPSG:4937). The horizontal -grid coordinates are referenced to ETRS89. - * dk_sdfe_dnn.tif ### Faroe Islands: FVR09 heights -> ETRS89 ellipsoidal heights diff --git a/dk_sdfe/dk_sdfe_dvr90.tif b/dk_sdfe/dk_sdfe_dvr90.tif deleted file mode 100644 index 0e2e5f4..0000000 Binary files a/dk_sdfe/dk_sdfe_dvr90.tif and /dev/null differ diff --git a/files.geojson b/files.geojson index 5ceb9ab..e31a9f2 100644 --- a/files.geojson +++ b/files.geojson @@ -97,7 +97,6 @@ { "type": "Feature", "properties": { "url": "https://cdn.proj.org/dk_sdfe_DK_zealand.pol", "name": "dk_sdfe_DK_zealand.pol", "source": "Danish Agency for Data Supply and Efficiency", "source_country": "Denmark", "source_id": "dk_sdfe", "source_url": "https://github.com/NordicGeodesy/NordicTransformations", "file_size": 8138, "sha256sum": "cd02992e723e76dbf5ba7170ccaf83e1c302c514e60b16281b79652ad7107b25" }, "geometry": null }, { "type": "Feature", "properties": { "url": "https://cdn.proj.org/dk_sdfe_FO_fk89.pol", "name": "dk_sdfe_FO_fk89.pol", "source": "Danish Agency for Data Supply and Efficiency", "source_country": "Denmark", "source_id": "dk_sdfe", "source_url": "https://github.com/NordicGeodesy/NordicTransformations", "file_size": 8430, "sha256sum": "0b6b18973eb630f1788325404ffd1f3df802b5c0ee902722714cdbeed4a8779d" }, "geometry": null }, { "type": "Feature", "properties": { "url": "https://cdn.proj.org/dk_sdfe_dnn.tif", "name": "dk_sdfe_dnn.tif", "area_of_use": "Denmark", "type": "VERTICAL_OFFSET_GEOGRAPHIC_TO_VERTICAL", "source_crs_code": "EPSG:4937", "source_crs_name": "ETRS89", "target_crs_code": "EPSG:5733", "target_crs_name": "DNN height", "source": "Danish Agency for Data Supply and Efficiency", "source_country": "Denmark", "source_id": "dk_sdfe", "source_url": "https://github.com/NordicGeodesy/NordicTransformations", "description": "ETRS89 (EPSG:4937) to DNN height (EPSG:5733)", "file_size": 1888720, "sha256sum": "4c7da68e1ca635af45e23c099e897404be30b566d97258670933a4213885d88c" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 7.901, 54.499 ], [ 15.303, 54.499 ], [ 15.303, 57.799 ], [ 7.901, 57.799 ], [ 7.901, 54.499 ] ] ] } }, -{ "type": "Feature", "properties": { "url": "https://cdn.proj.org/dk_sdfe_dvr90.tif", "name": "dk_sdfe_dvr90.tif", "area_of_use": "Denmark", "type": "VERTICAL_OFFSET_GEOGRAPHIC_TO_VERTICAL", "source_crs_code": "EPSG:4937", "source_crs_name": "ETRS89", "target_crs_code": "EPSG:5799", "target_crs_name": "DVR90 height", "source": "Danish Agency for Data Supply and Efficiency", "source_country": "Denmark", "source_id": "dk_sdfe", "source_url": "https://github.com/NordicGeodesy/NordicTransformations", "description": "ETRS89 (EPSG:4937) to DVR90 height (EPSG:5799)", "file_size": 331904, "sha256sum": "a086b9db3a7009df10a27c8f109e0965412642d6560c30125ab5039b7fc4effb" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 7.0, 54.0 ], [ 17.0, 54.0 ], [ 17.0, 58.0 ], [ 7.0, 58.0 ], [ 7.0, 54.0 ] ] ] } }, { "type": "Feature", "properties": { "url": "https://cdn.proj.org/dk_sdfe_fvr09.tif", "name": "dk_sdfe_fvr09.tif", "area_of_use": "Faroe Islands", "type": "VERTICAL_OFFSET_GEOGRAPHIC_TO_VERTICAL", "source_crs_code": "EPSG:4937", "source_crs_name": "ETRS89", "target_crs_code": "EPSG:5317", "target_crs_name": "FVR09 height", "source": "Danish Agency for Data Supply and Efficiency", "source_country": "Denmark", "source_id": "dk_sdfe", "source_url": "https://github.com/NordicGeodesy/NordicTransformations", "description": "ETRS89 (EPSG:4937) to FVR09 height (EPSG:5317)", "file_size": 184138, "sha256sum": "85d2033cb9c96ab16b49365aeeb652350732f4f33f661faa5e9b7d420b18ed40" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ -9.0, 61.0 ], [ -5.0, 61.0 ], [ -5.0, 63.0 ], [ -9.0, 63.0 ], [ -9.0, 61.0 ] ] ] } }, { "type": "Feature", "properties": { "url": "https://cdn.proj.org/dk_sdfe_gvr2000.tif", "name": "dk_sdfe_gvr2000.tif", "area_of_use": "Greenland", "type": "VERTICAL_OFFSET_GEOGRAPHIC_TO_VERTICAL", "source_crs_code": "EPSG:4909", "source_crs_name": "GR96", "target_crs_code": "EPSG:8266", "target_crs_name": "GVR2000 height", "source": "Danish Agency for Data Supply and Efficiency", "source_country": "Denmark", "source_id": "dk_sdfe", "source_url": "https://github.com/NordicGeodesy/NordicTransformations", "description": "GR96 (EPSG:4909) to GVR2000 height (EPSG:8266)", "file_size": 743471, "sha256sum": "ab2f408fbd16e27cefaa8a123a45fab36ccd1c87dcf75925ce8c4ea30b073172" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ -75.0, 59.0 ], [ -10.0, 59.0 ], [ -10.0, 84.0 ], [ -75.0, 84.0 ], [ -75.0, 59.0 ] ] ] } }, { "type": "Feature", "properties": { "url": "https://cdn.proj.org/dk_sdfe_gvr2016.tif", "name": "dk_sdfe_gvr2016.tif", "area_of_use": "Greenland", "type": "VERTICAL_OFFSET_GEOGRAPHIC_TO_VERTICAL", "source_crs_code": "EPSG:4909", "source_crs_name": "GR96", "target_crs_code": "EPSG:8267", "target_crs_name": "GVR2016 height", "source": "Danish Agency for Data Supply and Efficiency", "source_country": "Denmark", "source_id": "dk_sdfe", "source_url": "https://github.com/NordicGeodesy/NordicTransformations", "description": "GR96 (EPSG:4909) to GVR2016 height (EPSG:8267)", "file_size": 7114024, "sha256sum": "4810524d01cdbc0939c11b9a4be0bdfe22024cbae616512ec6037235c41c930e" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ -77.015, 58.0 ], [ -6.975, 58.0 ], [ -6.975, 85.0 ], [ -77.015, 85.0 ], [ -77.015, 58.0 ] ] ] } }, diff --git a/files_removed.geojson b/files_removed.geojson index 81c375d..f78f91d 100644 --- a/files_removed.geojson +++ b/files_removed.geojson @@ -2,7 +2,8 @@ "type": "FeatureCollection", "features": [ { "type": "Feature", "properties": { "url": "https://cdn.proj.org/au_ga_AGQG_20191107.tif", "name": "au_ga_AGQG_20191107.tif", "area_of_use": "Australia", "type": "VERTICAL_OFFSET_GEOGRAPHIC_TO_VERTICAL", "source_crs_code": "EPSG:7843", "source_crs_name": "GDA2020", "target_crs_code": "EPSG:9458", "target_crs_name": "AVWS height", "source": "Geoscience Australia", "source_country": "Australia", "source_id": "au_ga", "source_url": "http://www.ga.gov.au", "description": "GDA2020 (EPSG:7843) to AVWS height (EPSG:9458)", "file_size": 60878523, "sha256sum": "c06f24dae030587cc2556a316782ade83b6d91f1b8d03922ddd0ce58f3868baa", "version_removed": "1.7" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 93.0083333, -61.0083333 ], [ 174.0083333, -61.0083333 ], [ 174.0083333, -8.0083333 ], [ 93.0083333, -8.0083333 ], [ 93.0083333, -61.0083333 ] ] ] } }, -{ "type": "Feature", "properties": { "url": "https://cdn.proj.org/nl_nsgi_naptrans2018.tif", "name": "nl_nsgi_naptrans2018.tif", "area_of_use": "Netherlands", "type": "VERTICAL_OFFSET_GEOGRAPHIC_TO_VERTICAL", "source_crs_code": "EPSG:4937", "source_crs_name": "ETRS89", "target_crs_code": "EPSG:5709", "target_crs_name": "NAP height", "source": "Nederlandse Samenwerking Geodetische Infrastructuur (NSGI)", "source_country": "Netherlands", "source_id": "nl_nsgi", "source_url": "https://www.nsgi.nl/", "description": "ETRS89 (EPSG:4937) to NAP height (EPSG:5709)", "file_size": 249014, "sha256sum": "98679fe0401d13ffa8dbd78a4e7f5790fb3409fa005f5cfd020dcc537af2f243" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 2.0, 50.0 ], [ 8.0, 50.0 ], [ 8.0, 56.0 ], [ 2.0, 56.0 ], [ 2.0, 50.0 ] ] ] } } +{ "type": "Feature", "properties": { "url": "https://cdn.proj.org/nl_nsgi_naptrans2018.tif", "name": "nl_nsgi_naptrans2018.tif", "area_of_use": "Netherlands", "type": "VERTICAL_OFFSET_GEOGRAPHIC_TO_VERTICAL", "source_crs_code": "EPSG:4937", "source_crs_name": "ETRS89", "target_crs_code": "EPSG:5709", "target_crs_name": "NAP height", "source": "Nederlandse Samenwerking Geodetische Infrastructuur (NSGI)", "source_country": "Netherlands", "source_id": "nl_nsgi", "source_url": "https://www.nsgi.nl/", "description": "ETRS89 (EPSG:4937) to NAP height (EPSG:5709)", "file_size": 249014, "sha256sum": "98679fe0401d13ffa8dbd78a4e7f5790fb3409fa005f5cfd020dcc537af2f243" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 2.0, 50.0 ], [ 8.0, 50.0 ], [ 8.0, 56.0 ], [ 2.0, 56.0 ], [ 2.0, 50.0 ] ] ] } }, +{ "type": "Feature", "properties": { "url": "https://cdn.proj.org/dk_sdfe_dvr90.tif", "name": "dk_sdfe_dvr90.tif", "area_of_use": "Denmark", "type": "VERTICAL_OFFSET_GEOGRAPHIC_TO_VERTICAL", "source_crs_code": "EPSG:4937", "source_crs_name": "ETRS89", "target_crs_code": "EPSG:5799", "target_crs_name": "DVR90 height", "source": "Danish Agency for Data Supply and Efficiency", "source_country": "Denmark", "source_id": "dk_sdfe", "source_url": "https://github.com/NordicGeodesy/NordicTransformations", "description": "ETRS89 (EPSG:4937) to DVR90 height (EPSG:5799)", "file_size": 331904, "sha256sum": "a086b9db3a7009df10a27c8f109e0965412642d6560c30125ab5039b7fc4effb" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 7.0, 54.0 ], [ 17.0, 54.0 ], [ 17.0, 58.0 ], [ 7.0, 58.0 ], [ 7.0, 54.0 ] ] ] } } ] } - + diff --git a/travis/expected_main.lst b/travis/expected_main.lst index ea89147..fab948c 100644 --- a/travis/expected_main.lst +++ b/travis/expected_main.lst @@ -91,7 +91,6 @@ dk_sdfe_DK_general.pol dk_sdfe_DK_jutland.pol dk_sdfe_DK_zealand.pol dk_sdfe_dnn.tif -dk_sdfe_dvr90.tif dk_sdfe_FO_fk89.pol dk_sdfe_fvr09.tif dk_sdfe_gvr2000.tif