Skip to content

Commit

Permalink
files.geojson: make sure to have a version_removed property for remov…
Browse files Browse the repository at this point in the history 
…ed files
  • Loading branch information
@rouault
rouault committed Apr 25, 2024
1 parent 0104169 commit 5e84d79
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 5 deletions.
5 changes: 4 additions & 1 deletion CONTRIBUTING.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,5 +137,8 @@ After rebuilding the PROJ database (`make`), you can check the output of `src/pr
## How to remove a file

* Edit copyright_and_licenses.csv to indicate the version in which it is removed
* Open files.geojson and move the corresponding entry to files_removed.geojson
in the "version_removed" column
* Open files.geojson, move the corresponding entry to files_removed.geojson,
and add a "version_removed" property to the entry (identical to the one added
in the "version_removed" column of the .csv file)
* Remove the grid name in `travis/expected_main.lst`
4 changes: 2 additions & 2 deletions files.geojson
View file
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@
{ "type": "Feature", "properties": { "url": "https://cdn.proj.org/za_cdngi_README.txt", "name": "za_cdngi_README.txt", "source": "Chief Directorate: National Geospatial Information (CD:NGI)", "source_country": "South Africa", "source_id": "za_cdngi", "source_url": "http://www.ngi.gov.za/", "file_size": 734, "sha256sum": "947ce63e507bfc5fd0fc0b9f08b57c119a8f38c52bdd50ba385624bab799a5d3", "version_added": "1.8" }, "geometry": null },
{ "type": "Feature", "properties": { "url": "https://cdn.proj.org/za_cdngi_sageoid2010.tif", "name": "za_cdngi_sageoid2010.tif", "area_of_use": "South Africa", "type": "VERTICAL_OFFSET_GEOGRAPHIC_TO_VERTICAL", "source_crs_code": "EPSG:7910", "source_crs_name": "ITRF2005", "target_crs_code": "EPSG:9279", "target_crs_name": "SA LLD height", "source": "Chief Directorate: National Geospatial Information (CD:NGI)", "source_country": "South Africa", "source_id": "za_cdngi", "source_url": "http://www.ngi.gov.za/", "description": "ITRF2005 (EPSG:7910) to SA LLD height (EPSG:9279)", "file_size": 302096, "sha256sum": "3e13e63b3c4b8f09792898bfaf6f8510f9a590d3af366f8eec169d2acbc59a1e", "version_added": "1.8" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 16.0, -35.0 ], [ 33.0, -35.0 ], [ 33.0, -22.0 ], [ 16.0, -22.0 ], [ 16.0, -35.0 ] ] ] } },
{ "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/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/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", "version_removed": "1.10" }, "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", "version_removed": "1.17" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 7.0, 54.0 ], [ 17.0, 54.0 ], [ 17.0, 58.0 ], [ 7.0, 58.0 ], [ 7.0, 54.0 ] ] ] } }
]
}
4 changes: 2 additions & 2 deletions files_removed.geojson
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +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/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/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", "version_removed": "1.10" }, "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", "version_removed": "1.17" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 7.0, 54.0 ], [ 17.0, 54.0 ], [ 17.0, 58.0 ], [ 7.0, 58.0 ], [ 7.0, 54.0 ] ] ] } }
]
}

5 changes: 5 additions & 0 deletions regenerate_index_html.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ def __init__(self):
info = InfoFromCSV()
info.version_added = version_added
info.version_removed = version_removed
assert filename not in info_csv
info_csv[filename] = info

total_size = 0
Expand Down Expand Up @@ -342,4 +343,8 @@ def __init__(self):
for src_entry in files_removed_lyr:
new_entry = ogr.Feature(lyr.GetLayerDefn())
new_entry.SetFrom(src_entry)
filename = new_entry["name"]
assert new_entry.IsFieldSetAndNotNull("version_removed"), filename
assert filename in info_csv
assert new_entry["version_removed"] == info_csv[filename].version_removed, (filename, new_entry["version_removed"], info_csv[filename].version_removed)
lyr.CreateFeature(new_entry)

0 comments on commit 5e84d79

Please sign in to comment.