From 115ebacf9bd115786151d5609ac5dd2ee9f31b15 Mon Sep 17 00:00:00 2001
From: Wouter <wouter.visscher@gmail.com>
Date: Wed, 28 Feb 2024 12:20:59 +0100
Subject: [PATCH] Bestrans fix (#26)

* Fix time dependent BES transformation

* Update usage for BES

* prep 1.1.1 release

---------

Co-authored-by: lhuisman <l.huisman@geopinie.nl>
---
 README.md                                     |  6 ++--
 sql/nl_nsgi_20_datum_and_crs.sql              |  4 +--
 sql/nl_nsgi_30_local_transformations.sql      |  4 +--
 ...nsgi_60_time_dependent_transformations.sql | 34 +++++++++----------
 validate/Dockerfile                           |  2 +-
 5 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/README.md b/README.md
index 4556cea..8d377d4 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@ layer on top of PROJ; for instance use it with
 ### Build
 
 ```bash
-docker build -t ghcr.io/geodetischeinfrastructuur/transformations:1.1.0 .
+docker build -t ghcr.io/geodetischeinfrastructuur/transformations:1.1.1 .
 ```
 
 ### Run
@@ -62,13 +62,13 @@ docker build -t ghcr.io/geodetischeinfrastructuur/transformations:1.1.0 .
 To start an interactive terminal inside the container run:
 
 ```bash
-docker run -it --rm --name nsgi-proj ghcr.io/geodetischeinfrastructuur/transformations:1.1.0
+docker run -it --rm --name nsgi-proj ghcr.io/geodetischeinfrastructuur/transformations:1.1.1
 ```
 
 To invoke `projinfo` from your current terminal sessions run:
 
 ```bash
-docker run --rm --name nsgi-proj ghcr.io/geodetischeinfrastructuur/transformations:1.1.0 projinfo
+docker run --rm --name nsgi-proj ghcr.io/geodetischeinfrastructuur/transformations:1.1.1 projinfo
 ```
 
 ## Test
diff --git a/sql/nl_nsgi_20_datum_and_crs.sql b/sql/nl_nsgi_20_datum_and_crs.sql
index f10f556..83b82e6 100644
--- a/sql/nl_nsgi_20_datum_and_crs.sql
+++ b/sql/nl_nsgi_20_datum_and_crs.sql
@@ -695,7 +695,7 @@ VALUES
         'Saba2020_GEOGRAPHIC_3D_USAGE',
         'geodetic_crs',
         'NSGI',
-        'Bonaire2004_GEOGRAPHIC_3D',
+        'Saba2020_GEOGRAPHIC_3D',
         'EPSG',
         '3805',
         'EPSG',
@@ -761,7 +761,7 @@ VALUES
         'St_Eustatius2020_GEOGRAPHIC_3D_USAGE',
         'geodetic_crs',
         'NSGI',
-        'Bonaire2004_GEOGRAPHIC_3D',
+        'St_Eustatius2020_GEOGRAPHIC_3D',
         'EPSG',
         '3805',
         'EPSG',
diff --git a/sql/nl_nsgi_30_local_transformations.sql b/sql/nl_nsgi_30_local_transformations.sql
index 5431305..6d8b4ab 100644
--- a/sql/nl_nsgi_30_local_transformations.sql
+++ b/sql/nl_nsgi_30_local_transformations.sql
@@ -526,7 +526,7 @@ VALUES
         'geoid_like',
         0,
         NULL,
-        'https://github.com/GeodetischeInfrastructuur/transformations/releases/download/1.1.0/bq_nsgi_bongeo2004.tif',
+        'https://github.com/GeodetischeInfrastructuur/transformations/releases/download/1.1.1/bq_nsgi_bongeo2004.tif',
         1,
         1,
         NULL
@@ -539,7 +539,7 @@ VALUES
         'geoid_like',
         0,
         NULL,
-        'https://github.com/GeodetischeInfrastructuur/transformations/releases/download/1.1.0/nllat2018.gtx',
+        'https://github.com/GeodetischeInfrastructuur/transformations/releases/download/1.1.1/nllat2018.gtx',
         1,
         1,
         NULL
diff --git a/sql/nl_nsgi_60_time_dependent_transformations.sql b/sql/nl_nsgi_60_time_dependent_transformations.sql
index caa29da..51c15fa 100644
--- a/sql/nl_nsgi_60_time_dependent_transformations.sql
+++ b/sql/nl_nsgi_60_time_dependent_transformations.sql
@@ -95,11 +95,11 @@ VALUES
         '2010.0',
         'EPSG',
         '1029',
-        '',
-        '',
-        '',
-        '',
-        '',
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
         'EUREF-Eur 2000',
         '0'
     ),
@@ -114,7 +114,7 @@ VALUES
         'NSGI',
         'Saba2020_GEOGRAPHIC_3D',
         'EPSG',
-        '7912',
+        '7789',
         '0.1',
         '0.0',
         '0.0',
@@ -145,11 +145,11 @@ VALUES
         '2020.0',
         'EPSG',
         '1029',
-        '',
-        '',
-        '',
-        '',
-        '',
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
         'BESTRANS',
         '0'
     ),
@@ -164,7 +164,7 @@ VALUES
         'NSGI',
         'St_Eustatius2020_GEOGRAPHIC_3D',
         'EPSG',
-        '7912',
+        '7789',
         '0.1',
         '0.0',
         '0.0',
@@ -195,11 +195,11 @@ VALUES
         '2020.0',
         'EPSG',
         '1029',
-        '',
-        '',
-        '',
-        '',
-        '',
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
         'BESTRANS',
         '0'
     );
diff --git a/validate/Dockerfile b/validate/Dockerfile
index dcade24..839ad5f 100644
--- a/validate/Dockerfile
+++ b/validate/Dockerfile
@@ -8,4 +8,4 @@ RUN apt-get update && \
 RUN pip install pyproj==3.6.1
 
 # COPY the transformation grids, the modified proj.db and all the other proj files
-COPY --from=ghcr.io/geodetischeinfrastructuur/transformations:1.1.0 /usr/share/proj/ /usr/local/lib/python3.11/site-packages/pyproj/proj_dir/share/proj/
+COPY --from=ghcr.io/geodetischeinfrastructuur/transformations:1.1.1 /usr/share/proj/ /usr/local/lib/python3.11/site-packages/pyproj/proj_dir/share/proj/