Skip to content

Commit

Permalink
Merge pull request #48 from rouault/fi_nls_tin
Browse files Browse the repository at this point in the history
Add fi_nls/ with tinshift models for Finland coordinate transformations
  • Loading branch information
rouault committed Oct 23, 2020
2 parents f40c845 + ff94288 commit 7d20936
Show file tree
Hide file tree
Showing 12 changed files with 66 additions and 1 deletion.
1 change: 1 addition & 0 deletions CMakeLists.txt
Expand Up @@ -33,6 +33,7 @@ set(CPACK_SOURCE_INSTALLED_DIRECTORIES
"${CMAKE_CURRENT_SOURCE_DIR}/es_ign/" "."
"${CMAKE_CURRENT_SOURCE_DIR}/es_cat_icgc/" "."
"${CMAKE_CURRENT_SOURCE_DIR}/eur_nkg/" "."
"${CMAKE_CURRENT_SOURCE_DIR}/fi_nls/" "."
"${CMAKE_CURRENT_SOURCE_DIR}/fr_ign/" "."
"${CMAKE_CURRENT_SOURCE_DIR}/is_lmi/" "."
"${CMAKE_CURRENT_SOURCE_DIR}/nc_dittt/" "."
Expand Down
1 change: 1 addition & 0 deletions README.DATA
Expand Up @@ -64,6 +64,7 @@ For example us_noaa for files originating from US NOAA.
* [es_ign: Spain IGN](https://github.com/OSGeo/PROJ-data/blob/master/es_ign/)
* [es_cat_icgc: Spain Catalonia ICGC](https://github.com/OSGeo/PROJ-data/blob/master/es_cat_icgc/)
* [eur_nkg: Nordic Geodetic Commission](https://github.com/OSGeo/PROJ-data/blob/master/eur_nkg/)
* [fi_nls: National Land Survey](https://github.com/OSGeo/PROJ-data/blob/master/fi_nls/)
* [fr_ign: France IGN](https://github.com/OSGeo/PROJ-data/blob/master/fr_ign/)
* [is_lmi: Iceland LMI](https://github.com/OSGeo/PROJ-data/blob/master/is_lmi/)
* [nl_nsgi: Nederlandse Samenwerking Geodetische Infrastructuur (NSGI)](https://github.com/OSGeo/PROJ-data/blob/master/nl_nsgi/)
Expand Down
6 changes: 6 additions & 0 deletions agency.json
Expand Up @@ -95,6 +95,12 @@
"agency":"The Nordic Geodetic Commission",
"url": "http://www.nordicgeodeticcommission.com/"
},
{
"id": "fi_nls",
"country": "Finland",
"agency":"National Land Survey of Finland (MML)",
"url": "https://www.maanmittauslaitos.fi"
},
{
"id": "fr_ign",
"country": "France",
Expand Down
4 changes: 4 additions & 0 deletions copyright_and_licenses.csv
Expand Up @@ -89,6 +89,10 @@ es_ign_README.txt,Disclaimed,Public domain
es_ign_SPED2ETV2.tif,"2009, Instituto Geográfico Nacional (IGN) Spain",CC-BY-4.0
eur_nkg_nkgrf03vel_realigned.tif,Nordic Geodetic Commission,CC-BY-4.0
eur_nkg_README.txt,Disclaimed,Public domain
fi_nls_n43_n60.json,National Land Survey of Finland,CC-BY-4.0
fi_nls_n60_n2000.json,National Land Survey of Finland,CC-BY-4.0
fi_nls_README.txt,Disclaimed,Public domain
fi_nls_ykj_etrs35fin.json,National Land Survey of Finland,CC-BY-4.0
FO,Agency for Data Supply and Efficiency (SDFE),CC-BY-4.0
fr_ign_CGVD2013RGSPM06.tif,Institut National Geographique (IGN) France,Open License France - https://www.etalab.gouv.fr/wp-content/uploads/2014/05/Open_Licence.pdf
fr_ign_gg10_sbv2.tif,Institut National Geographique (IGN) France,Open License France - https://www.etalab.gouv.fr/wp-content/uploads/2014/05/Open_Licence.pdf
Expand Down
1 change: 1 addition & 0 deletions fi_nls/.github/README.md
36 changes: 36 additions & 0 deletions fi_nls/fi_nls_README.txt
@@ -0,0 +1,36 @@
# fi_nls_README.txt

The files in this section result from the conversion of datasets originating
from [National Land Survey of Finland](https://www.maanmittauslaitos.fi)

## Triangulated models

### Finland: KKJ / Finland Uniform Coordinate System to ETRS35FIN

*Source*: [National Land Survey of Finland](https://www.maanmittauslaitos.fi)
*Format*: JSON converted from text files
*License*: [Creative Commons Attribution 4.0](https://creativecommons.org/licenses/by/4.0/)

Triangulation to transform coordinates from YKJ (EPSG:2393), with easting/northing order, to ETRS35FIN (EPSG:3067)

* fi_nls_ykj_etrs35fin.json

### Finland: N43 height -> N60 height

*Source*: [National Land Survey of Finland](https://www.maanmittauslaitos.fi)
*Format*: JSON converted from text files
*License*: [Creative Commons Attribution 4.0](https://creativecommons.org/licenses/by/4.0/)

Triangulation to transform N43 height (EPSG:8675) to N60 height (EPSG:5717), with interpolation CRS being YKJ (EPSG:2393), with easting/northing order

* fi_nls_n43_n60.json

### Finland: N60 height -> N2000 height

*Source*: [National Land Survey of Finland](https://www.maanmittauslaitos.fi)
*Format*: JSON converted from text files
*License*: [Creative Commons Attribution 4.0](https://creativecommons.org/licenses/by/4.0/)

Triangulation to transform N60 height (EPSG:5717) to N2000 height(EPSG:3900), with interpolation CRS being YKJ (EPSG:2393), with easting/northing order

* fi_nls_n60_n2000.json
1 change: 1 addition & 0 deletions fi_nls/fi_nls_n43_n60.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions fi_nls/fi_nls_n60_n2000.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions fi_nls/fi_nls_ykj_etrs35fin.json

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions files.geojson
Expand Up @@ -94,6 +94,10 @@
{ "type": "Feature", "properties": { "url": "https://cdn.proj.org/eur_nkg_README.txt", "name": "eur_nkg_README.txt", "source": "The Nordic Geodetic Commission", "source_country": "Europe", "source_id": "eur_nkg", "source_url": "http://www.nordicgeodeticcommission.com/", "file_size": 1630, "sha256sum": "ac461df0e6487e97d47836c4e05561fc08a232b85812a91fb4fb97667b480a38" }, "geometry": null },
{ "type": "Feature", "properties": { "url": "https://cdn.proj.org/NKG", "name": "NKG", "source": "The Nordic Geodetic Commission", "source_country": "Europe", "source_id": "eur_nkg", "source_url": "http://www.nordicgeodeticcommission.com/", "file_size": 7515, "sha256sum": "d5fa2d2e0c2089cf01972d7ad8662f3843a8ff63bf0068199a2c1146b81afc25" }, "geometry": null },
{ "type": "Feature", "properties": { "url": "https://cdn.proj.org/eur_nkg_nkgrf03vel_realigned.tif", "name": "eur_nkg_nkgrf03vel_realigned.tif", "area_of_use": "Nordic and Baltic countries", "type": "VELOCITY", "source_crs_name": "Unknown based on GRS80", "source": "The Nordic Geodetic Commission", "source_country": "Europe", "source_id": "eur_nkg", "source_url": "http://www.nordicgeodeticcommission.com/", "description": "Deformation model covering the Nordic and Baltic countries. Used in transformations between global reference frames and the local realisations of ETRS89 in the Nordic and Baltic countries", "file_size": 362495, "sha256sum": "a646bd863c427c7623eb2b365878351bab9a0a9b67aa6792b2dd31c3ef58e0b9" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 3.0, 53.0 ], [ 40.0, 53.0 ], [ 40.0, 73.0 ], [ 3.0, 73.0 ], [ 3.0, 53.0 ] ] ] } },
{ "type": "Feature", "properties": { "url": "https://cdn.proj.org/fi_nls_README.txt", "name": "fi_nls_README.txt", "source": "National Land Survey of Finland (MML)", "source_country": "Finland", "source_id": "fi_nls", "source_url": "https://www.maanmittauslaitos.fi", "file_size": 1490, "sha256sum": "2ce68c637b7a824d96c13707943286e2c81bf69120e05647b53a2d0a84ed7428" }, "geometry": null },
{ "type": "Feature", "properties": { "url": "https://cdn.proj.org/fi_nls_n43_n60.json", "name": "fi_nls_n43_n60.json", "source": "National Land Survey of Finland (MML)", "source_country": "Finland", "source_id": "fi_nls", "source_url": "https://www.maanmittauslaitos.fi", "file_size": 185632, "sha256sum": "5144863ab22f985ab08b3ac4d9e7732ee77a0d5d88bba4d378329f6abf81e16a" }, "geometry": null },
{ "type": "Feature", "properties": { "url": "https://cdn.proj.org/fi_nls_n60_n2000.json", "name": "fi_nls_n60_n2000.json", "source": "National Land Survey of Finland (MML)", "source_country": "Finland", "source_id": "fi_nls", "source_url": "https://www.maanmittauslaitos.fi", "file_size": 42284, "sha256sum": "c62b5fa28c84f89371e9459a83b0b9b171c8d7ccf0126d2515b3dd608e19faa4" }, "geometry": null },
{ "type": "Feature", "properties": { "url": "https://cdn.proj.org/fi_nls_ykj_etrs35fin.json", "name": "fi_nls_ykj_etrs35fin.json", "source": "National Land Survey of Finland (MML)", "source_country": "Finland", "source_id": "fi_nls", "source_url": "https://www.maanmittauslaitos.fi", "file_size": 65661, "sha256sum": "c5597fc92ca93ac27fb06fbe0879c4ef0573bc88c4b13c5b11c6643508835beb" }, "geometry": null },
{ "type": "Feature", "properties": { "url": "https://cdn.proj.org/fr_ign_README.txt", "name": "fr_ign_README.txt", "source": "IGN France", "source_country": "France", "source_id": "fr_ign", "source_url": "http://www.ign.fr/", "file_size": 5259, "sha256sum": "8eced0b6635c877a59880b4bd157cdf4ee875f8f104bd4ee6790182286af6848" }, "geometry": null },
{ "type": "Feature", "properties": { "url": "https://cdn.proj.org/fr_ign_CGVD2013RGSPM06.tif", "name": "fr_ign_CGVD2013RGSPM06.tif", "area_of_use": "France - Saint-Pierre et Miquelon", "type": "VERTICAL_OFFSET_GEOGRAPHIC_TO_VERTICAL", "source_crs_code": "EPSG:4466", "source_crs_name": "RGSPM06", "target_crs_code": "EPSG:6647", "target_crs_name": "CGVD2013(CGG2013) height", "source": "IGN France", "source_country": "France", "source_id": "fr_ign", "source_url": "http://www.ign.fr/", "description": "RGSPM06 (EPSG:4466) to CGVD2013(CGG2013) height (EPSG:6647)", "file_size": 2615, "sha256sum": "ae264da1e06c7d6f7177aa68db463ea9e7614e53805edc1d8596ea78881d6429" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ -56.55, 46.45 ], [ -55.95, 46.45 ], [ -55.95, 47.2833333 ], [ -56.55, 47.2833333 ], [ -56.55, 46.45 ] ] ] } },
{ "type": "Feature", "properties": { "url": "https://cdn.proj.org/fr_ign_RAC09.tif", "name": "fr_ign_RAC09.tif", "area_of_use": "France - Corsica", "type": "VERTICAL_OFFSET_GEOGRAPHIC_TO_VERTICAL", "source_crs_code": "EPSG:4965", "source_crs_name": "RGF93", "target_crs_code": "EPSG:5721", "target_crs_name": "NGF-IGN78 height", "source": "IGN France", "source_country": "France", "source_id": "fr_ign", "source_url": "http://www.ign.fr/", "description": "RGF93 (EPSG:4965) to NGF-IGN78 height (EPSG:5721)", "file_size": 8597, "sha256sum": "a1519cc41df3e1a6dbd8135782cca0cd6359f0cb5ec5e52cb531e4f567e59cdd" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 8.4166667, 41.2 ], [ 9.7166667, 41.2 ], [ 9.7166667, 43.2 ], [ 8.4166667, 43.2 ], [ 8.4166667, 41.2 ] ] ] } },
Expand Down
7 changes: 6 additions & 1 deletion index.html
Expand Up @@ -566,6 +566,11 @@ <h2>Content</h2>
<li><a style="word-break: break-word" href="eur_nkg_README.txt">eur_nkg_README.txt</a>. Last modified: 2020-01-24</li>
<li><a style="word-break: break-word" href="NKG">NKG</a>. Last modified: 2020-06-02</li>
<li><a style="word-break: break-word" href="eur_nkg_nkgrf03vel_realigned.tif">eur_nkg_nkgrf03vel_realigned.tif</a> - Nordic and Baltic countries - Deformation model covering the Nordic and Baltic countries. Used in transformations between global reference frames and the local realisations of ETRS89 in the Nordic and Baltic countries. Last modified: 2020-01-24</li>
</ul><hr><h3><a href="https://www.maanmittauslaitos.fi">National Land Survey of Finland (MML)</a></h3><ul>
<li><a style="word-break: break-word" href="fi_nls_README.txt">fi_nls_README.txt</a>. Last modified: 2020-10-23</li>
<li><a style="word-break: break-word" href="fi_nls_n43_n60.json">fi_nls_n43_n60.json</a>. Last modified: 2020-10-23</li>
<li><a style="word-break: break-word" href="fi_nls_n60_n2000.json">fi_nls_n60_n2000.json</a>. Last modified: 2020-10-23</li>
<li><a style="word-break: break-word" href="fi_nls_ykj_etrs35fin.json">fi_nls_ykj_etrs35fin.json</a>. Last modified: 2020-10-23</li>
</ul><hr><h3><a href="http://www.ign.fr/">IGN France</a></h3><ul>
<li><a style="word-break: break-word" href="fr_ign_README.txt">fr_ign_README.txt</a>. Last modified: 2020-01-24</li>
<li><a style="word-break: break-word" href="fr_ign_CGVD2013RGSPM06.tif">fr_ign_CGVD2013RGSPM06.tif</a> - France - Saint-Pierre et Miquelon - RGSPM06 (EPSG:4466) to CGVD2013(CGG2013) height (EPSG:6647). Last modified: 2020-01-24</li>
Expand Down Expand Up @@ -844,7 +849,7 @@ <h2>Content</h2>
<li><a style="word-break: break-word" href="us_noaa_wyhpgn.tif">us_noaa_wyhpgn.tif</a> - USA - Wyoming - NAD83 (EPSG:4269) to NAD83(HARN) (EPSG:4152). Last modified: 2020-01-24</li>
</ul>
<p>
Total size of content: 499 MB
Total size of content: 500 MB
</p>

<h2>Logs</h2>
Expand Down
4 changes: 4 additions & 0 deletions travis/expected_main.lst
Expand Up @@ -89,6 +89,10 @@ es_ign_README.txt
es_ign_SPED2ETV2.tif
eur_nkg_nkgrf03vel_realigned.tif
eur_nkg_README.txt
fi_nls_n43_n60.json
fi_nls_n60_n2000.json
fi_nls_README.txt
fi_nls_ykj_etrs35fin.json
FO
fr_ign_CGVD2013RGSPM06.tif
fr_ign_gg10_sbv2.tif
Expand Down

0 comments on commit 7d20936

Please sign in to comment.