Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Argentinian geoid model #104

Merged
merged 7 commits into from
Jun 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 2.6)

project(PROJ_DATA)
set(PROJ_DATA_VERSION_MAJOR 1)
set(PROJ_DATA_VERSION_MINOR 14)
set(PROJ_DATA_VERSION_MINOR 15)

set(CPACK_SOURCE_GENERATOR "TGZ;ZIP")
set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 0)
Expand All @@ -17,6 +17,7 @@ set(CPACK_INSTALL_COMMANDS
)
set(CPACK_SOURCE_INSTALLED_DIRECTORIES
"${CMAKE_BINARY_DIR}/tmp/" "."
"${CMAKE_CURRENT_SOURCE_DIR}/ar_ign/" "."
"${CMAKE_CURRENT_SOURCE_DIR}/at_bev/" "."
"${CMAKE_CURRENT_SOURCE_DIR}/au_ga/" "."
"${CMAKE_CURRENT_SOURCE_DIR}/au_icsm/" "."
Expand Down
1 change: 1 addition & 0 deletions README.DATA
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ However for clarity of this repository, we have organized them by producer / age
Each file is in a subdirectory whose name follows {country_code}_{agency_name}.
For example us_noaa for files originating from US NOAA.

* [ar_ign: Argentina IGN](https://github.com/OSGeo/PROJ-data/blob/master/ar_ign/)
* [at_bev: Austria BEV](https://github.com/OSGeo/PROJ-data/blob/master/at_bev/)
* [au_ga: Australia Geoscience Australia](https://github.com/OSGeo/PROJ-data/blob/master/au_ga/)
* [au_icsm: Australia ICSM](https://github.com/OSGeo/PROJ-data/blob/master/au_icsm/)
Expand Down
6 changes: 6 additions & 0 deletions agency.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
[
{
"id": "ar_ign",
"country": "Argentina",
"agency": "Instituto Geográfico Nacional (IGN)",
"url": "https://www.ign.gob.ar"
},
{
"id": "at_bev",
"country": "Austria",
Expand Down
1 change: 1 addition & 0 deletions ar_ign/.github/README.md
Binary file added ar_ign/ar_ign_GEOIDE-Ar16.tif
Binary file not shown.
21 changes: 21 additions & 0 deletions ar_ign/ar_ign_README.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# ar_ign_README.txt

The files in this section result from the conversion of datasets originating
from [IGN](https://www.ign.gob.ar/)

## Included grids

### Argentinian vertical grid:

*Source*: [IGN](https://www.ign.gob.ar/NuestrasActividades/Geodesia/Geoide-Ar16/DocumentacionTecnica)
*Format*: GeoTIFF converted from 'AAIGrid' (adjusted)
*License*: [Creative Commons Attribution 4.0](https://creativecommons.org/licenses/by/4.0/)
*Credit*: (c) Instituto Geográfico Nacional - Argentina
*Horizontal CRS*: EPSG:5342 (POSGAR 2007)

Vertical transformation for Geoid model GEOIDE-Ar16. Used to make the transition
from heights in vertical CRS SRVN16 height (EPSG:9255)
to heights above the ellipsoid in POSGAR 2007 (EPSG:5342).

* ar_ign_GEOIDE-Ar16.tif

41 changes: 41 additions & 0 deletions ar_ign/build_GEOIDE-Ar16.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
#!/bin/bash -e

# Usage:
# PROJ_DATA_DIR=/path/to/PROJ-data ./build_GEOIDE-Ar16.sh

# Setup build directory
mkdir -p build

# Copy input file into build directory
wget https://dnsg.ign.gob.ar/apps/geoidear/documentos/GEOIDE-Ar16.gri -P ./build/
orig=GEOIDE-Ar16.gri
input=GEOIDE-Ar16.asc
output=ar_ign_GEOIDE-Ar16.tif
awk '/^ .*$/ {print "NCOLS "($4-$3)/$6+1 "\nNROWS "($2-$1)/$5+1 "\nXLLCENTER "$3 "\nYLLCENTER "$1 "\nCELLSIZE "$6} /^-?[0-9].*$/ {print $0}' ./build/$orig > ./build/$input
# produces this header
#NCOLS 1440
#NROWS 2220
#XLLCENTER -76.0000000000
#YLLCENTER -57.0007400000
#CELLSIZE 0.01666700000000000

head ./build/$input

docker run --user $(id -u):$(id -g) --workdir $PWD \
--rm -v /home:/home ghcr.io/osgeo/gdal:alpine-normal-latest \
sh -c " \
# Call vertoffset_grid_to_gtiff-script
python3 ${PROJ_DATA_DIR}/grid_tools/vertoffset_grid_to_gtiff.py \
--type GEOGRAPHIC_TO_VERTICAL \
--parameter-name geoid_undulation \
--source-crs \"EPSG:5342\" \
--target-crs \"EPSG:9255\" \
--description \"POSGAR 2007 (EPSG:5342) to SRVN16 height (EPSG:9255). Converted from $orig\" \
--area-of-use \"Argentina - onshore\" \
--copyright \"Derived from work by IGN Argentina. CC-BY-4.0 https://creativecommons.org/licenses/by/4.0/\" \
./build/$input ./$output && \
# Show info
gdalinfo ./$output "

# Remove build directory
rm -rf build
2 changes: 2 additions & 0 deletions copyright_and_licenses.csv
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
filename,copyright,license,version_added,version_removed
ar_ign_GEOIDE-Ar16.tif,Instituto Geográfico Nacional (IGN) Argentina,CC-BY-4.0,1.15,
ar_ign_README.txt,Disclaimed,Public domain,1.15,
at_bev_AT_GIS_GRID.tif,Austria Bundesamt für Eich- und Vermessungswessen (BEV),CC-BY-4.0,,
at_bev_AT_GIS_GRID_2021_09_28.tif,Austria Bundesamt für Eich- und Vermessungswessen (BEV),CC-BY-4.0,1.12,
at_bev_GEOID_BESSEL_Oesterreich.tif,Austria Bundesamt für Eich- und Vermessungswessen (BEV),CC-BY-4.0,,
Expand Down
2 changes: 2 additions & 0 deletions files.geojson
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
"type": "FeatureCollection",
"name": "files",
"features": [
{ "type": "Feature", "properties": { "url": "https://cdn.proj.org/ar_ign_README.txt", "name": "ar_ign_README.txt", "source": "Instituto Geográfico Nacional (IGN)", "source_country": "Argentina", "source_id": "ar_ign", "source_url": "https://www.ign.gob.ar", "file_size": 756, "sha256sum": "4df6e6e9ab6bb673c6a609f7cb49a3b8c2090092a9d06d989953fdfd9651df7e", "version_added": "1.15" }, "geometry": null },
{ "type": "Feature", "properties": { "url": "https://cdn.proj.org/ar_ign_GEOIDE-Ar16.tif", "name": "ar_ign_GEOIDE-Ar16.tif", "area_of_use": "Argentina - onshore", "type": "VERTICAL_OFFSET_GEOGRAPHIC_TO_VERTICAL", "source_crs_code": "EPSG:5342", "source_crs_name": "POSGAR 2007", "target_crs_code": "EPSG:9255", "target_crs_name": "SRVN16 height", "source": "Instituto Geográfico Nacional (IGN)", "source_country": "Argentina", "source_id": "ar_ign", "source_url": "https://www.ign.gob.ar", "description": "POSGAR 2007 (EPSG:5342) to SRVN16 height (EPSG:9255)", "file_size": 6422288, "sha256sum": "5781d63c97f1348a6a4a3adf68dd98f2b9b0430271a0ce45d8e0b002394875a6", "version_added": "1.15" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ -76.0, -57.00074 ], [ -52.016187, -57.00074 ], [ -52.016187, -20.016667 ], [ -76.0, -20.016667 ], [ -76.0, -57.00074 ] ] ] } },
{ "type": "Feature", "properties": { "url": "https://cdn.proj.org/at_bev_README.txt", "name": "at_bev_README.txt", "source": "Austria Bundesamt für Eich- und Vermessungswessen", "source_country": "Austria", "source_id": "at_bev", "source_url": "http://www.bev.gv.at/portal/page?_pageid=713,2157075&_dad=portal&_schema=PORTAL", "file_size": 3200, "sha256sum": "7fbec3bdc1680dd2cea0da2ca599e719dfd429471ec469ab1567f0ccc59f398a" }, "geometry": null },
{ "type": "Feature", "properties": { "url": "https://cdn.proj.org/at_bev_AT_GIS_GRID.tif", "name": "at_bev_AT_GIS_GRID.tif", "area_of_use": "Austria", "type": "HORIZONTAL_OFFSET", "source_crs_code": "EPSG:4312", "source_crs_name": "MGI", "target_crs_code": "EPSG:4258", "target_crs_name": "ETRS89", "source": "Austria Bundesamt für Eich- und Vermessungswessen", "source_country": "Austria", "source_id": "at_bev", "source_url": "http://www.bev.gv.at/portal/page?_pageid=713,2157075&_dad=portal&_schema=PORTAL", "description": "MGI (EPSG:4312) to ETRS89 (EPSG:4258)", "file_size": 216878, "sha256sum": "852d58612498f7ef08541e65f25f52f2a7f35f6020fd7e8250f7fa6eaa5ac599" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 9.5, 46.35 ], [ 17.1625, 46.35 ], [ 17.1625, 49.05 ], [ 9.5, 49.05 ], [ 9.5, 46.35 ] ] ] } },
{ "type": "Feature", "properties": { "url": "https://cdn.proj.org/at_bev_AT_GIS_GRID_2021_09_28.tif", "name": "at_bev_AT_GIS_GRID_2021_09_28.tif", "area_of_use": "Austria", "type": "HORIZONTAL_OFFSET", "source_crs_code": "EPSG:4312", "source_crs_name": "MGI", "target_crs_code": "EPSG:4258", "target_crs_name": "ETRS89", "source": "Austria Bundesamt für Eich- und Vermessungswessen", "source_country": "Austria", "source_id": "at_bev", "source_url": "http://www.bev.gv.at/portal/page?_pageid=713,2157075&_dad=portal&_schema=PORTAL", "description": "MGI (EPSG:4312) to ETRS89 (EPSG:4258)", "file_size": 13759571, "sha256sum": "c5862ce7ad4c16b1c234838d3dd4945bc641057d4238b02cb71a2077811ad30f", "version_added": "1.12" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 9.4, 46.3 ], [ 17.2711111, 46.3 ], [ 17.2711111, 49.1 ], [ 9.4, 49.1 ], [ 9.4, 46.3 ] ] ] } },
Expand Down
5 changes: 4 additions & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,9 @@ <h2>Content</h2>
<p>The bucket contains the following files:</p>
<ul>
<li><a href="README.DATA">README.DATA</a></li>
</ul><hr><h3><a href="https://www.ign.gob.ar">Instituto Geográfico Nacional (IGN)</a></h3><ul>
<li><a style="word-break: break-word" href="ar_ign_README.txt">ar_ign_README.txt</a>. Last modified: 2023-06-20</li>
<li><a style="word-break: break-word" href="ar_ign_GEOIDE-Ar16.tif">ar_ign_GEOIDE-Ar16.tif</a> - Argentina - onshore - POSGAR 2007 (EPSG:5342) to SRVN16 height (EPSG:9255). Size: 6.1 MB. Last modified: 2023-06-20</li>
</ul><hr><h3><a href="http://www.bev.gv.at/portal/page?_pageid=713,2157075&amp;_dad=portal&amp;_schema=PORTAL">Austria Bundesamt für Eich- und Vermessungswessen</a></h3><ul>
<li><a style="word-break: break-word" href="at_bev_README.txt">at_bev_README.txt</a>. Last modified: 2022-11-08</li>
<li><a style="word-break: break-word" href="at_bev_AT_GIS_GRID.tif">at_bev_AT_GIS_GRID.tif</a> - Austria - MGI (EPSG:4312) to ETRS89 (EPSG:4258). Last modified: 2020-01-24</li>
Expand Down Expand Up @@ -928,7 +931,7 @@ <h2>Content</h2>
<li><a style="word-break: break-word" href="za_cdngi_sageoid2010.tif">za_cdngi_sageoid2010.tif</a> - South Africa - ITRF2005 (EPSG:7910) to SA LLD height (EPSG:9279). Last modified: 2021-10-18</li>
</ul>
<p>
Total size of content: 688 MB
Total size of content: 694 MB
</p>

<h2>Logs</h2>
Expand Down
2 changes: 2 additions & 0 deletions travis/expected_main.lst
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
ar_ign_GEOIDE-Ar16.tif
ar_ign_README.txt
at_bev_AT_GIS_GRID.tif
at_bev_AT_GIS_GRID_2021_09_28.tif
at_bev_GEOID_BESSEL_Oesterreich.tif
Expand Down