Prefix *.pol files with dk_sdfe_, and tune FO, NKG and ISL init files to point to TIFF files

12 files changed, 42 insertions, 52 deletions

diff --git a/dk_sdfe/DK b/dk_sdfe/DK
index d0b4ae9..6ae974f 100644
--- a/dk_sdfe/DK
+++ b/dk_sdfe/DK
@@ -41,8 +41,8 @@
 #------------------------------------------------------------------------------------------------------
 #  Vertical datums
 #------------------------------------------------------------------------------------------------------
-<DVR90> proj=vgridshift grids=dvr90.gtx            # current
-<DNN>   proj=vgridshift grids=dnn.gtx              # historical
+<DVR90> proj=vgridshift grids=dk_sdfe_dvr90.tof            # current
+<DNN>   proj=vgridshift grids=dk_sdfe_dnn.tif              # historical
 #------------------------------------------------------------------------------------------------------
 
 
@@ -290,7 +290,7 @@ expect      883653.4932  6111473.4226
 <UTM32_ED50_L>
     proj=pipeline
     step init=DK:_TC32_TD32
-    step init=DK_general.pol:TC32_L inv
+    step init=dk_sdfe_DK_general.pol:TC32_L inv
 #------------------------------------------------------------------------------------------------------
 <gie>
 operation   init=DK:UTM32_ED50_L
@@ -325,7 +325,7 @@ expect      12.001173940  55.000628676      # Authoritative value, obtained from
 #------------------------------------------------------------------------------------------------------
 <UTM32_ED50_B> proj=pipeline  ellps=GRS80
      step init=DK:_TC32_TD32
-     step init=DK_bornholm.pol:UTM32_ED50_B     # no inv here, due to polynomial swap in DK_bornholm.pol
+     step init=dk_sdfe_DK_bornholm.pol:UTM32_ED50_B     # no inv here, due to polynomial swap in DK_bornholm.pol
 #------------------------------------------------------------------------------------------------------
 <gie>
 operation   init=DK:UTM32_ED50_B
@@ -376,7 +376,7 @@ expect      15.001111641   55.000603892    # Authoritative value, obtained from
 #------------------------------------------------------------------------------------------------------
 <S45B>  proj=pipeline no_defs
         step   init=DK:_TC32_TD32
-        step   init=DK_bornholm.pol:TC32_B inv
+        step   init=dk_sdfe_DK_bornholm.pol:TC32_B inv
 #------------------------------------------------------------------------------------------------------
 <gie>
 operation   init=DK:S45B
@@ -393,7 +393,7 @@ expect      42915.0596  37569.1876    # Authoritative value, obtained from KMSTr
 #------------------------------------------------------------------------------------------------------
 <S34J>  proj=pipeline  ellps=GRS80
         step   init=DK:_TC32_TD32
-        step   init=DK_jutland.pol:TC32_L inv
+        step   init=dk_sdfe_DK_jutland.pol:TC32_L inv
 #------------------------------------------------------------------------------------------------------
 <gie>
 operation   init=DK:S34J
@@ -410,7 +410,7 @@ expect      263190.2497  286078.3847
 #------------------------------------------------------------------------------------------------------
 <S34S>  proj=pipeline  ellps=GRS80
         step   init=DK:_TC32_TD32
-        step   init=DK_zealand.pol:TC32_L inv
+        step   init=dk_sdfe_DK_zealand.pol:TC32_L inv
 #------------------------------------------------------------------------------------------------------
 <gie>
 operation   init=DK:S34S
@@ -429,7 +429,7 @@ expect      76425.6474  143042.0038
 #------------------------------------------------------------------------------------------------------
 <SB> proj=pipeline  no_defs
         step init=DK:UTM32_ED50_L
-        step init=DK_bridges.pol:UTM32_ED50_L inv   # tol = 0.5 mm
+        step init=dk_sdfe_DK_bridges.pol:UTM32_ED50_L inv   # tol = 0.5 mm
 #------------------------------------------------------------------------------------------------------
 <gie>
 operation   init=DK:SB
@@ -456,7 +456,7 @@ expect      10.891109758 55.319726643
 #------------------------------------------------------------------------------------------------------
 <DKS>  proj=pipeline  no_defs
        step   init=DK:S34S
-       step   init=DK_bridges.pol:S34S inv
+       step   init=dk_sdfe_DK_bridges.pol:S34S inv
 #------------------------------------------------------------------------------------------------------
 <gie>
 operation   init=DK:DKS
@@ -473,7 +473,7 @@ expect      112779.7960  275908.0748   # Authoritative value, obtained from KMST
 #------------------------------------------------------------------------------------------------------
 <GS>  proj=pipeline  ellps=GRS80
     step   init=DK:UTM32_ED50_L
-    step   init=DK_general.pol:GS
+    step   init=dk_sdfe_DK_general.pol:GS
 #------------------------------------------------------------------------------------------------------
 <GEO_GS> proj=pipeline  ellps=GRS80
     step   init=DK:GS
@@ -508,7 +508,7 @@ expect      10  57
 #------------------------------------------------------------------------------------------------------
 <GSB>  proj=pipeline  ellps=GRS80
     step   init=DK:UTM33_ED50_B
-    step   init=DK_bornholm.pol:GSB
+    step   init=dk_sdfe_DK_bornholm.pol:GSB
 #------------------------------------------------------------------------------------------------------
 <GEO_GSB> proj=pipeline  ellps=GRS80       #
     step   init=DK:GSB
@@ -534,7 +534,7 @@ expect      15  55
 #------------------------------------------------------------------------------------------------------
 <KK>  proj=pipeline no_defs
       step   init=DK:S34S
-      step   init=DK_zealand.pol:KK
+      step   init=dk_sdfe_DK_zealand.pol:KK
 #------------------------------------------------------------------------------------------------------
 <gie>
 operation   init=DK:KK
@@ -564,7 +564,7 @@ expect      12.5  55.7
 #------------------------------------------------------------------------------------------------------
 <OS>  proj=pipeline ellps=GRS80
     step   init=DK:S34J
-    step   init=DK_jutland.pol:OS
+    step   init=dk_sdfe_DK_jutland.pol:OS
     step   proj=axisswap order=2,1
 #------------------------------------------------------------------------------------------------------
 <gie>
diff --git a/dk_sdfe/FO b/dk_sdfe/FO
index 095d869..9b04d2d 100644
--- a/dk_sdfe/FO
+++ b/dk_sdfe/FO
@@ -20,7 +20,7 @@
 #  2018-08-29  Added FK89
 #              Kristian Evers <kreve@sdfe.dk>,Thomas Knudsen <thokn@sdfe.dk>
 #
-<FVR09> +proj=vgridshift +grids=fvr09.gtx
+<FVR09> +proj=vgridshift +grids=dk_sdfe_fvr09.tif
 
 <UTM29N> +proj=utm +zone=29 +ellps=GRS80 +units=m +no_defs
 <UTM29N_FVR09> +proj=pipeline +step +init=FO:FVR09 +step +init=FO:UTM29N
@@ -32,7 +32,7 @@
 
 <FK89>  proj=pipeline
     step proj=utm ellps=GRS80 zone=29
-    step init=FO_fk89.pol:UTM29_FK89
+    step init=dk_sdfe_FO_fk89.pol:UTM29_FK89
 
 <gie>
 operation   init=FO:FK89
diff --git a/dk_sdfe/DK_bornholm.pol b/dk_sdfe/dk_sdfe_DK_bornholm.pol
index 4ee916d..4ee916d 100644
--- a/dk_sdfe/DK_bornholm.pol
+++ b/dk_sdfe/dk_sdfe_DK_bornholm.pol
diff --git a/dk_sdfe/DK_bridges.pol b/dk_sdfe/dk_sdfe_DK_bridges.pol
index a7ed4dc..a7ed4dc 100644
--- a/dk_sdfe/DK_bridges.pol
+++ b/dk_sdfe/dk_sdfe_DK_bridges.pol
diff --git a/dk_sdfe/DK_general.pol b/dk_sdfe/dk_sdfe_DK_general.pol
index 5e4f981..5e4f981 100644
--- a/dk_sdfe/DK_general.pol
+++ b/dk_sdfe/dk_sdfe_DK_general.pol
diff --git a/dk_sdfe/DK_jutland.pol b/dk_sdfe/dk_sdfe_DK_jutland.pol
index 36439a4..36439a4 100644
--- a/dk_sdfe/DK_jutland.pol
+++ b/dk_sdfe/dk_sdfe_DK_jutland.pol
diff --git a/dk_sdfe/DK_zealand.pol b/dk_sdfe/dk_sdfe_DK_zealand.pol
index fbe40ac..fbe40ac 100644
--- a/dk_sdfe/DK_zealand.pol
+++ b/dk_sdfe/dk_sdfe_DK_zealand.pol
diff --git a/dk_sdfe/FO_fk89.pol b/dk_sdfe/dk_sdfe_FO_fk89.pol
index 62dde11..62dde11 100644
--- a/dk_sdfe/FO_fk89.pol
+++ b/dk_sdfe/dk_sdfe_FO_fk89.pol
diff --git a/dk_sdfe/dk_sdfe_README.txt b/dk_sdfe/dk_sdfe_README.txt
index 60432bd..76e82c4 100644
--- a/dk_sdfe/dk_sdfe_README.txt
+++ b/dk_sdfe/dk_sdfe_README.txt
@@ -50,16 +50,16 @@ Denmark. All definitions in the init file uses the local ETRS89 reference
 frame as a pivot datum. More information can be found in the
 [NordicTransformations](https://github.com/NordicGeodesy/NordicTransformations)
 repository. While the `.pol` files are init-files they are not supposed to be
-by themselves. The exist purely as helper files for the `DK` init-file.
+by themselves. The exist purely as helper files for the `dk_sdfe_DK` init-file.
 The `.pol` files holds polynomial constants used for transformations between
 Danish legacy coordinate reference systems and ETRS89.
 
 * DK
-* DK_bornholm.pol
-* DK_bridges.pol
-* DK_general.pol
-* DK_jutland.pol
-* DK_zealand.pol
+* dk_sdfe_DK_bornholm.pol
+* dk_sdfe_DK_bridges.pol
+* dk_sdfe_DK_general.pol
+* dk_sdfe_DK_jutland.pol
+* dk_sdfe_DK_zealand.pol
 
 ### The Faroe Islands: System definitions related to ETRS89
 
diff --git a/eur_nkg/NKG b/eur_nkg/NKG
index 080779a..3b11e24 100644
--- a/eur_nkg/NKG
+++ b/eur_nkg/NKG
@@ -38,8 +38,7 @@
 
     # NKG_ETRF00@2000.0 -> ETRF00@t_obs
     step    proj = deformation t_epoch = 2000.0
-            xy_grids = nkgrf03vel_realigned_xy.ct2
-            z_grids  = nkgrf03vel_realigned_z.gtx
+            grids = nkgrf03vel_realigned.tif
 
 
     # ETRF00@t_obs -> ITRF2000@t_obs
@@ -54,8 +53,7 @@
 
     # NKG_ETRF00@2000.0 -> ETRF00@t_obs
     step    proj = deformation t_epoch = 2000.0
-            xy_grids = nkgrf03vel_realigned_xy.ct2
-            z_grids  = nkgrf03vel_realigned_z.gtx
+            grids = nkgrf03vel_realigned.tif
 
     # ETRF00@t_obs -> ITRF2000@t_obs
     step    init = NKG:ITRF2000_ETRF2000 inv
@@ -85,8 +83,7 @@
      step init = NKG:_P1DK
 
      step proj = deformation dt = -5.296
-          xy_grids = nkgrf03vel_realigned_xy.ct2
-           z_grids = nkgrf03vel_realigned_z.gtx
+          grids = nkgrf03vel_realigned.tif
 
      step proj=cart inv
 
@@ -96,8 +93,7 @@
      step init = NKG:_P1EE
 
      step proj = deformation dt = -2.44
-          xy_grids = nkgrf03vel_realigned_xy.ct2
-           z_grids = nkgrf03vel_realigned_z.gtx
+          grids = nkgrf03vel_realigned.tif
 
      step proj = cart inv
 
@@ -112,8 +108,7 @@
      step init = NKG:_P1FI
 
      step proj = deformation dt = -3
-          xy_grids = nkgrf03vel_realigned_xy.ct2
-           z_grids = nkgrf03vel_realigned_z.gtx
+          grids = nkgrf03vel_realigned.tif
 
     step proj=cart inv
 
@@ -123,8 +118,7 @@
      step init = NKG:_P1LV
 
      step proj = deformation dt = -7.25
-          xy_grids = nkgrf03vel_realigned_xy.ct2
-           z_grids = nkgrf03vel_realigned_z.gtx
+          grids = nkgrf03vel_realigned.tif
 
      step proj = cart inv
 
@@ -134,8 +128,7 @@
      step init = NKG:_P1LT
 
      step proj = deformation  dt = 3.75
-          xy_grids = nkgrf03vel_realigned_xy.ct2
-           z_grids = nkgrf03vel_realigned_z.gtx
+          grids = nkgrf03vel_realigned.tif
 
     step proj=cart inv
 
@@ -145,8 +138,7 @@
      step init = NKG:_P1NO
 
      step proj = deformation  dt = -5
-          xy_grids = nkgrf03vel_realigned_xy.ct2
-           z_grids = nkgrf03vel_realigned_z.gtx
+          grids = nkgrf03vel_realigned.tif
 
     step proj=cart inv
 
@@ -156,8 +148,7 @@
      step init = NKG:_P1SE
 
      step proj = deformation -0.5
-          xy_grids = nkgrf03vel_realigned_xy.ct2
-           z_grids = nkgrf03vel_realigned_z.gtx
+          grids = nkgrf03vel_realigned.tif
 
      step proj = cart inv
 
diff --git a/is_lmi/ISL b/is_lmi/ISL
index 1f699ac..5cb69d1 100644
--- a/is_lmi/ISL
+++ b/is_lmi/ISL
@@ -23,18 +23,18 @@
 #  Vertical datum 
 #--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
-<ISH2004> proj=vgridshift grids=Icegeoid_ISN2004.gtx  # current, geoid height calculated using ISN2004 datum
+<ISH2004> proj=vgridshift grids=is_lmi_Icegeoid_ISN2004.tif  # current, geoid height calculated using ISN2004 datum
 #--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-<ISN93_ISH2004> proj=vgridshift grids=Icegeoid_ISN93.gtx  # Icegeoid_ISN2004.gtx plus corrections for vertical difference between ISN93 and ISN2004.
-<ISN2016_ISH2004> proj=vgridshift grids=Icegeoid_ISN2016.gtx  # Icegeoid_ISN2004.gtx plus corrections for vertical difference between ISN2016 and ISN2004.
+<ISN93_ISH2004> proj=vgridshift grids=is_lmi_Icegeoid_ISN93.tif  # Icegeoid_ISN2004.tif plus corrections for vertical difference between ISN93 and ISN2004.
+<ISN2016_ISH2004> proj=vgridshift grids=is_lmi_Icegeoid_ISN2016.tif  # Icegeoid_ISN2004.tif plus corrections for vertical difference between ISN2016 and ISN2004.
 
 #--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 #  Deformation grids 
 #--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-<ISN93_16h> proj=hgridshift grids=ISN93_ISN2016.gsb
+<ISN93_16h> proj=hgridshift grids=ISN93_ISN2016.tif
 <ISN93_16v> proj=vgridshift grids=ISN93_ISN2016.gtx 
 
-<ISN04_16h> proj=hgridshift grids=ISN2004_ISN2016.gsb
+<ISN04_16h> proj=hgridshift grids=ISN2004_ISN2016.tif
 <ISN04_16v> proj=vgridshift grids=ISN2004_ISN2016.gtx
 
 <D_93_16> 
@@ -51,8 +51,7 @@
 #  Velocity model
 #----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 #
-# xy_grids=ISN_vel_beta.ct2 
-# z_grids=ISN_vel_beta.gtx
+# grids=ISN_vel_beta.tif
 #
 #----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
diff --git a/travis/expected_main.lst b/travis/expected_main.lst
index 65af947..db36924 100644
--- a/travis/expected_main.lst
+++ b/travis/expected_main.lst
@@ -59,23 +59,23 @@ de_lgl_bw_README.txt
 de_lgvl_saarland_README.txt
 de_lgvl_saarland_SeTa2016.tif
 DK
-DK_bornholm.pol
-DK_bridges.pol
-DK_general.pol
-DK_jutland.pol
+dk_sdfe_DK_bornholm.pol
+dk_sdfe_DK_bridges.pol
+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
 dk_sdfe_gvr2016.tif
 dk_sdfe_README.txt
-DK_zealand.pol
 es_cat_icgc_100800401.tif
 es_cat_icgc_README.txt
 eur_nkg_nkgrf03vel_realigned.tif
 eur_nkg_README.txt
 FO
-FO_fk89.pol
 fr_ign_CGVD2013RGSPM06.tif
 fr_ign_gg10_sbv2.tif
 fr_ign_gg10_smv2.tif