diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2020-04-19 17:30:24 +0200 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2020-04-21 23:05:59 +0200 |
| commit | 47458427c9a8e1bded36d5eb803153adf6ace0d2 (patch) | |
| tree | 5b492954020b6b23cfb98312b5ff1df2dca04031 | |
| parent | 5142bfbf72f859832df3da691dc3e7488839b53c (diff) | |
| download | PROJ-47458427c9a8e1bded36d5eb803153adf6ace0d2.tar.gz PROJ-47458427c9a8e1bded36d5eb803153adf6ace0d2.zip | |
gie: implement a strict mode with <gie-strict> </gie-strict> (fixes #2158)
In that mode:
* All non-comment/decoration lines must start with a valid tag
* Commands split on several lines should be terminated with " \"
34 files changed, 953 insertions, 883 deletions
diff --git a/docs/source/apps/gie.rst b/docs/source/apps/gie.rst index af6f528e..a1c7cb56 100644 --- a/docs/source/apps/gie.rst +++ b/docs/source/apps/gie.rst @@ -324,6 +324,33 @@ gie command language expect 0 110579.9 </gie> + +Strict mode +*********** + +.. versionadded:: 7.1 + +A stricter variant of normal gie syntax can be used by wrapping gie commands +between ``<gie-strict>`` and ``</gie-strict>``. In strict mode, comment lines +must start with a sharp character. Unknown commands will be considered as an error. +A command can still be split on several lines, but intermediate lines must +end with the space character followed by backslash to mark the continuation. + + .. code-block:: console + + <gie-strict> + # This is a comment. The following line with multiple repeated characters too + ------------------------------------------------- + # A command on several lines must use " \" continuation + operation proj=hgridshift +grids=nzgd2kgrid0005.gsb \ + ellps=GRS80 + tolerance 1 mm + ignore pjd_err_failed_to_load_grid + accept 172.999892181021551 -45.001620431954613 + expect 173 -45 + </gie-strict> + + Background ********** diff --git a/src/apps/gie.cpp b/src/apps/gie.cpp index d9907776..6ce0ab18 100644 --- a/src/apps/gie.cpp +++ b/src/apps/gie.cpp @@ -123,7 +123,7 @@ Thomas Knudsen, thokn@sdfe.dk, 2017-10-01/2017-10-08 /* Package for flexible format I/O - ffio */ typedef struct ffio { FILE *f; - const char **tags; + const char * const *tags; const char *tag; char *args; char *next_args; @@ -133,23 +133,24 @@ typedef struct ffio { size_t argc; size_t lineno, next_lineno; size_t level; + bool strict_mode; } ffio; static int get_inp (ffio *G); static int skip_to_next_tag (ffio *G); static int step_into_gie_block (ffio *G); -static int locate_tag (ffio *G, const char *tag); static int nextline (ffio *G); static int at_end_delimiter (ffio *G); static const char *at_tag (ffio *G); static int at_decorative_element (ffio *G); static ffio *ffio_destroy (ffio *G); -static ffio *ffio_create (const char **tags, size_t n_tags, size_t max_record_size); +static ffio *ffio_create (const char * const *tags, size_t n_tags, size_t max_record_size); -static const char *gie_tags[] = { +static const char * const gie_tags[] = { "<gie>", "operation", "crs_src", "crs_dst", "use_proj4_init_rules", "accept", "expect", "roundtrip", "banner", "verbose", - "direction", "tolerance", "ignore", "require_grid", "echo", "skip", "</gie>" + "direction", "tolerance", "ignore", "require_grid", "echo", "skip", "</gie>", + "<gie-strict>", "</gie-strict>", }; static const size_t n_gie_tags = sizeof gie_tags / sizeof gie_tags[0]; @@ -426,7 +427,12 @@ static int process_file (const char *fname) { if (F->level==0) return errmsg (-3, "File '%s':Missing '<gie>' cmnd - bye!\n", fname); if (F->level && F->level%2) - return errmsg (-4, "File '%s':Missing '</gie>' cmnd - bye!\n", fname); + { + if( F->strict_mode ) + return errmsg (-4, "File '%s':Missing '</gie-strict>' cmnd - bye!\n", fname); + else + return errmsg (-4, "File '%s':Missing '</gie>' cmnd - bye!\n", fname); + } return 0; } @@ -1267,7 +1273,7 @@ See the PROJ ".gie" test suites for examples of supported formatting. /***************************************************************************************/ -static ffio *ffio_create (const char **tags, size_t n_tags, size_t max_record_size) { +static ffio *ffio_create (const char * const *tags, size_t n_tags, size_t max_record_size) { /**************************************************************************************** Constructor for the ffio object. ****************************************************************************************/ @@ -1396,24 +1402,6 @@ Read next line of input file. Returns 1 on success, 0 on failure. } - -/***************************************************************************************/ -static int locate_tag (ffio *G, const char *tag) { -/**************************************************************************************** -Find start-of-line tag (currently only used to search for for <gie>, but any tag -valid). - -Returns 1 on success, 0 on failure. -****************************************************************************************/ - size_t n = strlen (tag); - while (0!=strncmp (tag, G->next_args, n)) - if (0==nextline (G)) - return 0; - return 1; -} - - - /***************************************************************************************/ static int step_into_gie_block (ffio *G) { /**************************************************************************************** @@ -1423,22 +1411,25 @@ Make sure we're inside a <gie>-block. Return 1 on success, 0 otherwise. if (G->level % 2) return 1; - if (0==locate_tag (G, "<gie>")) - return 0; - - while (0!=strncmp ("<gie>", G->next_args, 5)) { - G->next_args[0] = 0; - if (feof (G->f)) - return 0; - if (nullptr==fgets (G->next_args, (int) G->next_args_size - 1, G->f)) + while (strncmp (G->next_args, "<gie>", strlen("<gie>")) != 0 && + strncmp (G->next_args, "<gie-strict>", strlen("<gie-strict>")) != 0 ) + { + if (0==nextline (G)) return 0; - pj_chomp (G->next_args); - G->next_lineno++; } + G->level++; - /* We're ready at the start - now step into the block */ - return nextline (G); + if( strncmp (G->next_args, "<gie-strict>", strlen("<gie-strict>")) == 0 ) + { + G->strict_mode = true; + return 0; + } + else + { + /* We're ready at the start - now step into the block */ + return nextline (G); + } } @@ -1514,8 +1505,54 @@ whitespace etc. The block is stored in G->args. Returns 1 on success, 0 otherwis ****************************************************************************************/ G->args[0] = 0; + // Special parsing in strict_mode: + // - All non-comment/decoration lines must start with a valid tag + // - Commands split on several lines should be terminated with " \" + if( G->strict_mode ) + { + while( nextline(G) ) + { + G->lineno = G->next_lineno; + if( G->next_args[0] == 0 || at_decorative_element(G) ) { + continue; + } + G->tag = at_tag (G); + if (nullptr==G->tag) + { + another_failure(); + fprintf (T.fout, "unsupported command line %d: %s\n", (int)G->lineno, G->next_args); + return 0; + } + + append_args (G); + pj_shrink (G->args); + while( G->args[0] != '\0' && G->args[strlen(G->args)-1] == '\\' ) + { + G->args[strlen(G->args)-1] = 0; + if( !nextline(G) ) + { + return 0; + } + G->lineno = G->next_lineno; + append_args (G); + pj_shrink (G->args); + } + if ( 0==strcmp (G->tag, "</gie-strict>")) { + G->level++; + G->strict_mode = false; + } + return 1; + } + return 0; + } + if (0==skip_to_next_tag (G)) + { + // If we just entered <gie-strict>, re-enter to read the first command + if( G->strict_mode ) + return get_inp(G); return 0; + } G->tag = at_tag (G); if (nullptr==G->tag) diff --git a/test/gie/4D-API_cs2cs-style.gie b/test/gie/4D-API_cs2cs-style.gie index 1dd2ae54..ade75907 100644 --- a/test/gie/4D-API_cs2cs-style.gie +++ b/test/gie/4D-API_cs2cs-style.gie @@ -11,22 +11,22 @@ but provided through a different interface. =============================================================================== -<gie> +<gie-strict> ------------------------------------------------------------------------------- -Test the handling of the +towgs84 parameter. +# Test the handling of the +towgs84 parameter. ------------------------------------------------------------------------------- -(additional tests of the towgs84 handling can be found in DHDN_ETRS89.gie) +# (additional tests of the towgs84 handling can be found in DHDN_ETRS89.gie) ------------------------------------------------------------------------------- ------------------------------------------------------------------------------- -This example is from Lotti Jivall: "Simplified transformations from -ITRF2008/IGS08 to ETRS89 for maritime applications" (see also more_builtins.gie) +# This example is from Lotti Jivall: "Simplified transformations from +# ITRF2008/IGS08 to ETRS89 for maritime applications" (see also more_builtins.gie) ------------------------------------------------------------------------------- -operation proj=geocent - towgs84 = 0.676780, 0.654950, -0.528270, - -0.022742, 0.012667, 0.022704, +operation proj=geocent \ + towgs84 = 0.676780, 0.654950, -0.528270, \ + -0.022742, 0.012667, 0.022704, \ -0.01070 ------------------------------------------------------------------------------- tolerance 1 um @@ -40,10 +40,10 @@ direction inverse ------------------------------------------------------------------------------- -This example is a random point, transformed from ED50 to ETRS89 using KMStrans2. +# This example is a random point, transformed from ED50 to ETRS89 using KMStrans2. ------------------------------------------------------------------------------- -operation proj=latlong ellps=intl - towgs84 = -081.07030, -089.36030, -115.75260, +operation proj=latlong ellps=intl \ + towgs84 = -081.07030, -089.36030, -115.75260, \ 000.48488, 000.02436, 000.41321, -0.540645 ------------------------------------------------------------------------------- tolerance 25 mm @@ -57,7 +57,7 @@ expect 16.8210462130 55.1705688946 29.0317 ------------------------------------------------------------------------------- operation proj=latlong nadgrids=ntf_r93.gsb ellps=GRS80 ------------------------------------------------------------------------------- -This functionality is also tested in more_builtins.gie +# This functionality is also tested in more_builtins.gie ------------------------------------------------------------------------------- tolerance 1 mm accept 2.25 46.5 @@ -95,11 +95,11 @@ expect 12.5 55.5 0 ------------------------------------------------------------------------------- -Same as the two above, but also do axis swapping. +# Same as the two above, but also do axis swapping. ------------------------------------------------------------------------------- -NOTE: A number of the tests below are commented out. The actually do the -right thing, but the gie distance computation is not yet able to cope -with "unusual" axis orders +# NOTE: A number of the tests below are commented out. The actually do the +# right thing, but the gie distance computation is not yet able to cope +# with "unusual" axis orders ------------------------------------------------------------------------------- operation proj=latlong geoidgrids=egm96_15.gtx axis=neu ellps=GRS80 ------------------------------------------------------------------------------- @@ -132,7 +132,7 @@ expect 12.5 55.5 0 ------------------------------------------------------------------------------- -Some more complex axis swapping. +# Some more complex axis swapping. ------------------------------------------------------------------------------- operation proj=latlong geoidgrids=egm96_15.gtx axis=nue ellps=GRS80 ------------------------------------------------------------------------------- @@ -157,26 +157,26 @@ expect -7424275.1946 -36.3941 1391493.6349 0.0000 ------------------------------------------------------------------------------- -A test case from a comment by Github user c0nk +# A test case from a comment by Github user c0nk ------------------------------------------------------------------------------- -operation proj=somerc - lat_0=46.95240555555556 lon_0=7.439583333333333 k_0=1 - x_0=2600000 y_0=1200000 ellps=bessel +operation proj=somerc \ + lat_0=46.95240555555556 lon_0=7.439583333333333 k_0=1 \ + x_0=2600000 y_0=1200000 ellps=bessel \ towgs84=674.374,15.056,405.346 ------------------------------------------------------------------------------- tolerance 20 cm accept 7.438632495 46.951082877 expect 2600000.0 1200000.0 ------------------------------------------------------------------------------- -Same test, but now implemented as a pipeline. This is for testing a nasty bug, -where, at the end of pipeline creation, a false warning about missing ellps was -left behind from the creation of the Helmert step (now repaired in pj_init). +# Same test, but now implemented as a pipeline. This is for testing a nasty bug, +# where, at the end of pipeline creation, a false warning about missing ellps was +# left behind from the creation of the Helmert step (now repaired in pj_init). ------------------------------------------------------------------------------- -operation proj=pipeline - step proj=cart ellps=WGS84 - step proj=helmert x=674.37400 y=15.05600 z=405.34600 inv - step proj=cart ellps=bessel inv - step proj=somerc lat_0=46.95240555555556 lon_0=7.439583333333333 +operation proj=pipeline \ + step proj=cart ellps=WGS84 \ + step proj=helmert x=674.37400 y=15.05600 z=405.34600 inv \ + step proj=cart ellps=bessel inv \ + step proj=somerc lat_0=46.95240555555556 lon_0=7.439583333333333 \ k_0=1 x_0=2600000 y_0=1200000 ellps=bessel units=m ------------------------------------------------------------------------------- tolerance 20 cm @@ -186,7 +186,7 @@ expect 2600000.0 1200000.0 ------------------------------------------------------------------------------- -Make sure that transient errors are returned correctly. +# Make sure that transient errors are returned correctly. ------------------------------------------------------------------------------- operation +proj=geos +lon_0=0.00 +lat_0=0.00 +a=6378169.00 +b=6356583.80 +h=35785831.0 ------------------------------------------------------------------------------- @@ -200,7 +200,7 @@ accept 85.05493299 46.5261074 0 0 expect failure ------------------------------------------------------------------------------- -Test that Google's Web Mercator works as intended (see #834 for details). +# Test that Google's Web Mercator works as intended (see #834 for details). ------------------------------------------------------------------------------- use_proj4_init_rules true operation proj=pipeline step init=epsg:26915 inv step init=epsg:3857 @@ -214,7 +214,7 @@ expect -10370728.80 5552839.74 0 ------------------------------------------------------------------------------- ------------------------------------------------------------------------------- -Test Google's Web Mercator with +proj=webmerc +ellps=WGS84 +# Test Google's Web Mercator with +proj=webmerc +ellps=WGS84 ------------------------------------------------------------------------------- use_proj4_init_rules true operation proj=pipeline step init=epsg:26915 inv step proj=webmerc datum=WGS84 @@ -228,7 +228,7 @@ expect -10370728.80 5552839.74 0 ------------------------------------------------------------------------------- ------------------------------------------------------------------------------- -Web Mercator test data from EPSG Guidance Note 7-2, p. 44. +# Web Mercator test data from EPSG Guidance Note 7-2, p. 44. ------------------------------------------------------------------------------- operation proj=webmerc +ellps=WGS84 tolerance 1 cm @@ -241,11 +241,11 @@ expect -11169055.58 2800000.00 ------------------------------------------------------------------------------- ------------------------------------------------------------------------------- -Test that +datum parameters are handled correctly in pipelines. -See #872 for details. +# Test that +datum parameters are handled correctly in pipelines. +# See #872 for details. ------------------------------------------------------------------------------- -operation +proj=pipeline - +step +proj=longlat +datum=GGRS87 +inv +operation +proj=pipeline \ + +step +proj=longlat +datum=GGRS87 +inv \ +step +proj=longlat +datum=WGS84 ------------------------------------------------------------------------------- tolerance 20 cm @@ -255,11 +255,11 @@ expect 23.729194873180 37.986398897578 31.289740102 ------------------------------------------------------------------------------- -Test that +towgs84=0,0,0 parameter is handled as still implying cart -transformation +# Test that +towgs84=0,0,0 parameter is handled as still implying cart +# transformation ------------------------------------------------------------------------------- -operation +proj=pipeline - +step +proj=utm +zone=11 +ellps=clrk66 +towgs84=0,0,0 +inv +operation +proj=pipeline \ + +step +proj=utm +zone=11 +ellps=clrk66 +towgs84=0,0,0 +inv \ +step +proj=utm +zone=11 +datum=WGS84 ------------------------------------------------------------------------------- @@ -269,45 +269,45 @@ expect 440719.958709357 3751294.2109841 -4.44340920541435 ------------------------------------------------------------------------------- ------------------------------------------------------------------------------- -Test that pipelines with unit mismatch between steps can't be constructed. +# Test that pipelines with unit mismatch between steps can't be constructed. ------------------------------------------------------------------------------- -operation +proj=pipeline - +step +proj=merc +operation +proj=pipeline \ + +step +proj=merc \ +step +proj=merc expect failure pjd_err_malformed_pipeline -operation +proj=pipeline - +step +proj=latlong - +step +proj=merc +operation +proj=pipeline \ + +step +proj=latlong \ + +step +proj=merc \ +step +proj=helmert +x=200 +y=100 expect failure pjd_err_malformed_pipeline -operation +proj=pipeline - +step +proj=merc +ellps=WGS84 +operation +proj=pipeline \ + +step +proj=merc +ellps=WGS84 \ +step +proj=unitconvert +xy_in=m +xy_out=km accept 12 56 expect 1335.8339 7522.963 ------------------------------------------------------------------------------- ------------------------------------------------------------------------------- -Test Pipeline Coordinate Stack +# Test Pipeline Coordinate Stack ------------------------------------------------------------------------------- -operation +proj=pipeline - +step +proj=push +v_1 - +step +proj=utm +zone=32 - +step +proj=utm +zone=33 +inv +operation +proj=pipeline \ + +step +proj=push +v_1 \ + +step +proj=utm +zone=32 \ + +step +proj=utm +zone=33 +inv \ +step +proj=pop +v_1 accept 12 56 0 2020 expect 12 56 0 2020 roundtrip 10 -#operation +proj=pipeline - +step +proj=latlon # dummy step - +step +proj=push +v_1 - +step +proj=utm +zone=32 - +step +proj=utm +zone=33 +inv - +step +proj=pop +v_1 +operation +proj=pipeline \ + +step +proj=latlon \ # dummy step + +step +proj=push +v_1 \ + +step +proj=utm +zone=32 \ + +step +proj=utm +zone=33 +inv \ + +step +proj=pop +v_1 \ +step +proj=affine # dummy step accept 12 56 0 2020 @@ -315,41 +315,41 @@ expect 12 56 0 2020 roundtrip 10 # push value to stack without popping it again -operation +proj=pipeline - +step +proj=push +v_1 - +step +proj=utm +zone=32 +operation +proj=pipeline \ + +step +proj=push +v_1 \ + +step +proj=utm +zone=32 \ +step +proj=utm +zone=33 +inv accept 12 56 0 2020 expect 18 56 0 2020 # test that multiple pushes and pops works -operation +proj=pipeline - +step +proj=push +v_1 - +step +proj=utm +zone=32 - +step +proj=push +v_1 - +step +proj=utm +zone=33 +inv - +step +proj=utm +zone=34 - +step +proj=pop +v_1 - +step +proj=utm +zone=32 +inv +operation +proj=pipeline \ + +step +proj=push +v_1 \ + +step +proj=utm +zone=32 \ + +step +proj=push +v_1 \ + +step +proj=utm +zone=33 +inv \ + +step +proj=utm +zone=34 \ + +step +proj=pop +v_1 \ + +step +proj=utm +zone=32 +inv \ +step +proj=pop +v_1 accept 12 56 0 2020 expect 12 56 0 2020 # pop from empty stack -operation +proj=pipeline - +step +proj=utm +zone=32 - +step +proj=utm +zone=33 +inv +operation +proj=pipeline \ + +step +proj=utm +zone=32 \ + +step +proj=utm +zone=33 +inv \ +step +proj=pop +v_1 accept 12 56 0 2020 expect 18 56 0 2020 -operation +proj=pipeline - +step +proj=push +v_2 - +step +inv +proj=eqearth - +step +proj=laea +operation +proj=pipeline \ + +step +proj=push +v_2 \ + +step +inv +proj=eqearth \ + +step +proj=laea \ +step +proj=pop +v_2 accept 900000 6000000 0 2020 @@ -358,11 +358,11 @@ expect 896633.0226 6000000 0 2020 # Datum shift in cartesian space but keeping the height # (simulates a datum-shift with affin since ISO19111 code # currrently obfuscates proj-strings using cart/helmert/invcart) -operation +proj=pipeline +ellps=GRS80 - +step +proj=push +v_3 - +step +proj=cart - +step +proj=affine +xoff=1000 +yoff=2000 +xoff=3000 - +step +proj=cart +inv +operation +proj=pipeline +ellps=GRS80 \ + +step +proj=push +v_3 \ + +step +proj=cart \ + +step +proj=affine +xoff=1000 +yoff=2000 +xoff=3000 \ + +step +proj=cart +inv \ +step +proj=pop +v_3 tolerance 50 cm @@ -379,11 +379,10 @@ accept 12 56 0 0 expect 12 56 0 0 ------------------------------------------------------------------------------- -Test Pipeline +omit_inv +# Test Pipeline +omit_inv ------------------------------------------------------------------------------- -operation +proj=pipeline - +step +proj=affine +xoff=1 +yoff=1 +omit_inv +operation +proj=pipeline +step +proj=affine +xoff=1 +yoff=1 +omit_inv accept 2 49 0 0 expect 3 50 0 0 @@ -393,8 +392,7 @@ accept 2 49 0 0 expect 2 49 0 0 -operation +proj=pipeline - +step +inv +proj=affine +xoff=1 +yoff=1 +omit_inv +operation +proj=pipeline +step +inv +proj=affine +xoff=1 +yoff=1 +omit_inv accept 2 49 0 0 expect 1 48 0 0 @@ -404,11 +402,10 @@ accept 2 49 0 0 expect 2 49 0 0 ------------------------------------------------------------------------------- -Test Pipeline +omit_fwd +# Test Pipeline +omit_fwd ------------------------------------------------------------------------------- -operation +proj=pipeline - +step +proj=affine +xoff=1 +yoff=1 +omit_fwd +operation +proj=pipeline +step +proj=affine +xoff=1 +yoff=1 +omit_fwd accept 2 49 0 0 expect 2 49 0 0 @@ -418,8 +415,7 @@ accept 2 49 0 0 expect 1 48 0 0 -operation +proj=pipeline - +step +inv +proj=affine +xoff=1 +yoff=1 +omit_fwd +operation +proj=pipeline +step +inv +proj=affine +xoff=1 +yoff=1 +omit_fwd accept 2 49 0 0 expect 2 49 0 0 @@ -429,8 +425,8 @@ accept 2 49 0 0 expect 3 50 0 0 ------------------------------------------------------------------------------- -Test bugfix of https://github.com/OSGeo/proj.4/issues/1002 -(do not interpolate nodata values) +# Test bugfix of https://github.com/OSGeo/proj.4/issues/1002 +# (do not interpolate nodata values) ------------------------------------------------------------------------------- operation +proj=latlong +ellps=WGS84 +geoidgrids=tests/test_nodata.gtx ------------------------------------------------------------------------------- @@ -439,7 +435,7 @@ expect 4.05 52.1 -10 ------------------------------------------------------------------------------- ------------------------------------------------------------------------------- -Test null grid with vgridshift +# Test null grid with vgridshift ------------------------------------------------------------------------------- operation proj=vgridshift grids=tests/test_nodata.gtx,null ellps=GRS80 ------------------------------------------------------------------------------- @@ -452,13 +448,13 @@ expect 4.05 -52.1 0 ------------------------------------------------------------------------------- ------------------------------------------------------------------------------- -Test bug fix of https://github.com/OSGeo/proj.4/issues/1025. -Using geocent in the new API with a custom ellipsoid should return coordinates -that correspond to that particular ellipsoid and not WGS84 as demonstrated in -the bug report. +# Test bug fix of https://github.com/OSGeo/proj.4/issues/1025. +# Using geocent in the new API with a custom ellipsoid should return coordinates +# that correspond to that particular ellipsoid and not WGS84 as demonstrated in +# the bug report. ------------------------------------------------------------------------------- -operation +proj=pipeline +step - +proj=longlat +a=3396190 +b=3376200 +inv +step +operation +proj=pipeline +step \ + +proj=longlat +a=3396190 +b=3376200 +inv +step \ +proj=geocent +a=3396190 +b=3376200 +lon_0=0 +units=m accept 0.0 0.0 0.0 expect 3396190.0 0.0 0.0 @@ -471,7 +467,7 @@ roundtrip 1 ------------------------------------------------------------------------------- -Check that geocent and cart take into account to_meter (#1053) +# Check that geocent and cart take into account to_meter (#1053) ------------------------------------------------------------------------------- operation +proj=geocent +a=1000 +b=1000 +to_meter=1000 @@ -485,7 +481,7 @@ expect 0 1 0 roundtrip 1 ------------------------------------------------------------------------------- -Check that vunits / vto_meter is honored +# Check that vunits / vto_meter is honored ------------------------------------------------------------------------------- operation +proj=longlat +a=1 +b=1 +vto_meter=1000 @@ -522,14 +518,14 @@ expect 0 0 1 roundtrip 1 ------------------------------------------------------------------------------- -Check that proj_create() returns a generic error when an exception is caught -in the creation of a PJ object. +# Check that proj_create() returns a generic error when an exception is caught +# in the creation of a PJ object. ------------------------------------------------------------------------------- operation this is a bogus CRS meant to trigger a generic error in proj_create() expect failure errno generic error ------------------------------------------------------------------------------- -Test proj=set +# Test proj=set ------------------------------------------------------------------------------- operation +proj=set @@ -546,4 +542,4 @@ direction inverse accept 1 2 3 4 expect 10 20 30 40 -</gie> +</gie-strict> diff --git a/test/gie/DHDN_ETRS89.gie b/test/gie/DHDN_ETRS89.gie index 0ab577b8..0e88ad5d 100644 --- a/test/gie/DHDN_ETRS89.gie +++ b/test/gie/DHDN_ETRS89.gie @@ -1,9 +1,9 @@ -<gie> +<gie-strict> ------------------------------------------------------------------------------- operation proj=latlong datum=potsdam ellps=bessel ------------------------------------------------------------------------------- -DE_DHDN (BeTA, 2007) to ETRS89 using NTv2 grid. epsg:15948 +#DE_DHDN (BeTA, 2007) to ETRS89 using NTv2 grid. epsg:15948 ------------------------------------------------------------------------------- tolerance 1 mm @@ -79,11 +79,11 @@ expect 7.532530252396 47.665765608135 # ETRS89_Lat-Lon ------------------------------------------------------------------------------- -operation proj=latlong +operation proj=latlong \ towgs84=598.1,73.7,418.2,0.202,0.045,-2.455,6.7 ellps=bessel ------------------------------------------------------------------------------- -DE_DHDN to ETRS89 using deprecated 7 parameter Helmert transform. The results -agree at the 3 m level. +# DE_DHDN to ETRS89 using deprecated 7 parameter Helmert transform. The results +# agree at the 3 m level. ------------------------------------------------------------------------------- require_grid BETA2007.gsb @@ -158,7 +158,7 @@ expect 7.249209260581 49.332249456364 # ETRS89_Lat-Lon accept 7.533333333333 47.666666666667 # DE_DHDN_Lat-Lon expect 7.532530252396 47.665765608135 # ETRS89_Lat-Lon ------------------------------------------------------------------------------- -</gie> +</gie-strict> diff --git a/test/gie/GDA.gie b/test/gie/GDA.gie index beec7c9c..a21b37e4 100644 --- a/test/gie/GDA.gie +++ b/test/gie/GDA.gie @@ -18,17 +18,17 @@ myself - it probably should come from official AU sources. Thomas Knudsen, thokn@sdfe.dk, 2017-11-27 ----------------------------------------------------------------------------------- -<gie> +<gie-strict> ----------------------------------------------------------------------------------- -GDA94 to GDA2020 +# GDA94 to GDA2020 ----------------------------------------------------------------------------------- -Just the Helmert transformation, to verify that we are within 100 um +# Just the Helmert transformation, to verify that we are within 100 um ----------------------------------------------------------------------------------- -operation proj=helmert - convention=coordinate_frame - x = 0.06155 rx = -0.0394924 - y = -0.01087 ry = -0.0327221 +operation proj=helmert \ + convention=coordinate_frame \ + x = 0.06155 rx = -0.0394924 \ + y = -0.01087 ry = -0.0327221 \ z = -0.04019 rz = -0.0328979 s = -0.009994 ----------------------------------------------------------------------------------- @@ -39,17 +39,17 @@ expect -4052052.7379 4212835.9897 -2545104.5898 ----------------------------------------------------------------------------------- -GDA94 to GDA2020 +# GDA94 to GDA2020 ----------------------------------------------------------------------------------- -All the way from geographic-to-cartesian-and-back-to-geographic +# All the way from geographic-to-cartesian-and-back-to-geographic ----------------------------------------------------------------------------------- -operation proj = pipeline ellps=GRS80; - step proj = cart; - step proj = helmert - convention=coordinate_frame - x = 0.06155; rx = -0.0394924; - y = -0.01087; ry = -0.0327221; - z = -0.04019; rz = -0.0328979; s = -0.009994; +operation proj = pipeline ellps=GRS80; \ + step proj = cart; \ + step proj = helmert \ + convention=coordinate_frame \ + x = 0.06155; rx = -0.0394924; \ + y = -0.01087; ry = -0.0327221; \ + z = -0.04019; rz = -0.0328979; s = -0.009994; \ step proj = cart inv; ----------------------------------------------------------------------------------- tolerance 2 mm @@ -59,16 +59,14 @@ expect 133.8855216 -23.67011014 603.2489 0 # Alice Springs GDA2020 ----------------------------------------------------------------------------------- -ITRF2014@2018 to GDA2020 - Test point ALIC (Alice Springs) +# ITRF2014@2018 to GDA2020 - Test point ALIC (Alice Springs) ----------------------------------------------------------------------------------- -Just the Helmert transformation, to verify that we are within 100 um +# Just the Helmert transformation, to verify that we are within 100 um ----------------------------------------------------------------------------------- -operation proj = helmert exact convention=coordinate_frame - - x = 0 rx = 0 dx = 0 drx = 0.00150379 - y = 0 ry = 0 dy = 0 dry = 0.00118346 - z = 0 rz = 0 dz = 0 drz = 0.00120716 - +operation proj = helmert exact convention=coordinate_frame \ + x = 0 rx = 0 dx = 0 drx = 0.00150379 \ + y = 0 ry = 0 dy = 0 dry = 0.00118346 \ + z = 0 rz = 0 dz = 0 drz = 0.00120716 \ s = 0 ds = 0 t_epoch=2020.0 ----------------------------------------------------------------------------------- tolerance 40 um @@ -76,4 +74,4 @@ accept -4052052.6588 4212835.9938 -2545104.6946 2018.0 # ITRF2014@2018. expect -4052052.7373 4212835.9835 -2545104.5867 # GDA2020 ----------------------------------------------------------------------------------- -</gie> +</gie-strict> diff --git a/test/gie/adams_hemi.gie b/test/gie/adams_hemi.gie index ae6176fd..b31c3581 100644 --- a/test/gie/adams_hemi.gie +++ b/test/gie/adams_hemi.gie @@ -1,7 +1,7 @@ -<gie> +<gie-strict> ------------------------------------------------------------ -This gie file was automatically generated using libproject -where the adams_hemi code was adapted from +# This gie file was automatically generated using libproject +#where the adams_hemi code was adapted from ------------------------------------------------------------ ------------------------------------------------------------ @@ -2117,4 +2117,4 @@ expect failure errno -14 accept 180.9080349563 107.0582862622 expect failure errno -14 -</gie> +</gie-strict> diff --git a/test/gie/adams_ws1.gie b/test/gie/adams_ws1.gie index cb7bb26f..fa9da8c6 100644 --- a/test/gie/adams_ws1.gie +++ b/test/gie/adams_ws1.gie @@ -1,7 +1,8 @@ -<gie> +<gie-strict> + ------------------------------------------------------------ -This gie file was automatically generated using libproject -where the adams_ws1 code was adapted from +# This gie file was automatically generated using libproject +# where the adams_ws1 code was adapted from ------------------------------------------------------------ ------------------------------------------------------------ @@ -2117,4 +2118,4 @@ expect failure errno -14 accept 180.9197969760 110.0988929845 expect failure errno -14 -</gie> +</gie-strict> diff --git a/test/gie/adams_ws2.gie b/test/gie/adams_ws2.gie index 134148da..c2ff193f 100644 --- a/test/gie/adams_ws2.gie +++ b/test/gie/adams_ws2.gie @@ -1,8 +1,9 @@ -<gie> +<gie-strict> + ------------------------------------------------------------ -This gie file was initially generated from "random" test points -got by using libproject where the adams_ws2 code was adapted from -It can be edited. +# This gie file was initially generated from "random" test points +# got by using libproject where the adams_ws2 code was adapted from +# It can be edited. ------------------------------------------------------------ ------------------------------------------------------------ @@ -2119,7 +2120,7 @@ accept 180.2003062924 109.9750225424 expect failure errno -14 ------------------------------------------------------------------------------- -Test inverse +# Test inverse ------------------------------------------------------------------------------- operation +proj=adams_ws2 +ellps=WGS84 ------------------------------------------------------------------------------- @@ -2172,4 +2173,4 @@ direction inverse accept 0.000005801264 16722285.492330472916 expect failure errno non_convergent -</gie> +</gie-strict> diff --git a/test/gie/axisswap.gie b/test/gie/axisswap.gie index a44a61a6..86ad6dec 100644 --- a/test/gie/axisswap.gie +++ b/test/gie/axisswap.gie @@ -2,7 +2,7 @@ Tests for the axisswap operation ------------------------------------------------------------------------------- -<gie> +<gie-strict> operation proj=axisswap order=1,2,3,4 tolerance 0.000001 m @@ -70,21 +70,19 @@ tolerance 0.000001 m accept 1 2 3 4 expect -2 -1 -3 4 -operation proj=pipeline - step proj=latlong +ellps=WGS84 - step proj=axisswap +operation proj=pipeline \ + step proj=latlong +ellps=WGS84 \ + step proj=axisswap \ order=1,2,3,4 - angularunits tolerance 0.00001 m accept 12 55 0 0 expect 12 55 0 0 -operation proj=pipeline - step proj=latlong +ellps=WGS84 - step proj=axisswap +operation proj=pipeline \ + step proj=latlong +ellps=WGS84 \ + step proj=axisswap \ order=-2,-1,3,4 - angularunits tolerance 0.00001 m accept 12 55 0 0 @@ -108,4 +106,4 @@ expect failure pjd_err_axis operation proj=axisswap order=1,2,3,5 expect failure pjd_err_axis -</gie> +</gie-strict> diff --git a/test/gie/builtins.gie b/test/gie/builtins.gie index 5b4d496d..6e5b326f 100644 --- a/test/gie/builtins.gie +++ b/test/gie/builtins.gie @@ -10,12 +10,27 @@ See more_builtins.gie for some test cases with a more human touch. =============================================================================== +# First test non strict gie + <gie> +operation +proj=aea + +ellps=GRS80 +lat_1=0 +lat_2=2 +tolerance 0.1 mm +accept 2 1 +expect 222571.608757106 110653.326743030 + +unknown_keyword + +</gie> + + +<gie-strict> + =============================================================================== -Albers Equal Area - Conic Sph&Ell - lat_1= lat_2= +# Albers Equal Area +# Conic Sph&Ell +# lat_1= lat_2= =============================================================================== ------------------------------------------------------------------------------- operation +proj=aea +ellps=GRS80 +lat_1=0 +lat_2=2 @@ -78,14 +93,14 @@ operation +proj=aea +a=9999999 +b=.9 +lat_2=1 expect failure errno invalid_eccentricity =============================================================================== -Azimuthal Equidistant - Azi, Sph&Ell - lat_0 guam +# Azimuthal Equidistant +# Azi, Sph&Ell +# lat_0 guam =============================================================================== ------------------------------------------------------------------------------- -Test equatorial aspect of the spherical azimuthal equidistant. Test data from -Snyder pp. 196-197, table 30. +# Test equatorial aspect of the spherical azimuthal equidistant. Test data from +# Snyder pp. 196-197, table 30. ------------------------------------------------------------------------------- operation +proj=aeqd +R=1 +lat_0=0 ------------------------------------------------------------------------------- @@ -114,8 +129,8 @@ accept 180 0 expect failure errno tolerance_condition ------------------------------------------------------------------------------- -Test equatorial aspect of the ellipsoidal azimuthal equidistant. Test data from -Snyder pp. 196-197, table 30. +# Test equatorial aspect of the ellipsoidal azimuthal equidistant. Test data from +# Snyder pp. 196-197, table 30. ------------------------------------------------------------------------------- operation +proj=aeqd +ellps=GRS80 +lat_0=0 ------------------------------------------------------------------------------- @@ -161,7 +176,7 @@ roundtrip 1 ------------------------------------------------------------------------------- # Test the Modified Azimuthal Equidistant / EPSG 9832. Test data from the EPSG -Guidance Note 7 part 2, April 2018, p. 85 +# Guidance Note 7 part 2, April 2018, p. 85 ------------------------------------------------------------------------------- operation +proj=aeqd +ellps=clrk66 +lat_0=9.546708325068591 +lon_0=138.1687444500492 +x_0=40000.00 +y_0=60000.00 ------------------------------------------------------------------------------- @@ -176,9 +191,9 @@ expect 138.19303001104092 9.596525859439623 ------------------------------------------------------------------------------- # Test the azimuthal equidistant modified for Guam. Test data from the EPSG -Guidance Note 7 part 2, September 2016, p. 85 +# Guidance Note 7 part 2, September 2016, p. 85 ------------------------------------------------------------------------------- -operation +proj=aeqd +guam +ellps=clrk66 +x_0=50000.00 +y_0=50000.00 +operation +proj=aeqd +guam +ellps=clrk66 +x_0=50000.00 +y_0=50000.00 \ +lon_0=144.74875069444445 +lat_0=13.47246633333333 ------------------------------------------------------------------------------- tolerance 1 cm @@ -191,8 +206,8 @@ accept 37712.48 35242.00 expect 144.635331291666660 13.33903846111111 ------------------------------------------------------------------------------- -Test northern polar aspect of the ellipsoidal azimuthal equidistant. Test data -from Snyder p. 198, table 31. +# Test northern polar aspect of the ellipsoidal azimuthal equidistant. Test data +# from Snyder p. 198, table 31. ------------------------------------------------------------------------------- operation +proj=aeqd +ellps=intl +lat_0=90 ------------------------------------------------------------------------------- @@ -211,8 +226,8 @@ expect 0 -2_233_100.9 roundtrip 100 ------------------------------------------------------------------------------- -Test southern polar aspect of the ellipsoidal azimuthal equidistant. Test data -from Snyder p. 198, table 31. +# Test southern polar aspect of the ellipsoidal azimuthal equidistant. Test data +# from Snyder p. 198, table 31. ------------------------------------------------------------------------------- operation +proj=aeqd +ellps=intl +lat_0=-90 ------------------------------------------------------------------------------- @@ -231,7 +246,7 @@ expect 0 2_233_100.9 roundtrip 100 ------------------------------------------------------------------------------- -Test northern polar aspect of the spherical azimuthal equidistant. +# Test northern polar aspect of the spherical azimuthal equidistant. ------------------------------------------------------------------------------- operation +proj=aeqd +R=1 +lat_0=90 ------------------------------------------------------------------------------- @@ -249,7 +264,7 @@ accept 90 0 expect 1.5708 0 roundtrip 100 accept 45 45 -expext 0.5554 -0.5554 +expect 0.5554 -0.5554 roundtrip 100 #point opposite of projection center is undefined @@ -264,7 +279,7 @@ accept 0 3.14159265359 expect 180 -90 ------------------------------------------------------------------------------- -Test sourthnern polar aspect of the spherical azimuthal equidistant. +# Test sourthnern polar aspect of the spherical azimuthal equidistant. ------------------------------------------------------------------------------- operation +proj=aeqd +R=1 +lat_0=-90 ------------------------------------------------------------------------------- @@ -282,7 +297,7 @@ accept 90 0 expect 1.5708 0 roundtrip 100 accept 45 -45 -expext 0.5554 -0.5554 +expect 0.5554 0.5554 roundtrip 100 #point opposite of projection center is undefined @@ -291,7 +306,7 @@ expect failure errno tolerance_condition ------------------------------------------------------------------------------- -Test oblique aspect of the spherical azimuthal equidistant. +# Test oblique aspect of the spherical azimuthal equidistant. ------------------------------------------------------------------------------- operation +proj=aeqd +R=1 +lat_0=45 ------------------------------------------------------------------------------- @@ -316,7 +331,7 @@ expect 0.0000 0.7854 roundtrip 100 ------------------------------------------------------------------------------- -Test oblique aspect of the ellipsoidal azimuthal equidistant. +# Test oblique aspect of the ellipsoidal azimuthal equidistant. ------------------------------------------------------------------------------- operation +proj=aeqd +ellps=GRS80 +lat_0=45 ------------------------------------------------------------------------------- @@ -341,9 +356,9 @@ expect 0.0000 5017021.3514 roundtrip 100 =============================================================================== -Airy - Misc Sph, no inv. - no_cut lat_b= +# Airy +# Misc Sph, no inv. +# no_cut lat_b= =============================================================================== ------------------------------------------------------------------------------- @@ -360,7 +375,7 @@ accept -2 -1 expect -189109.886908621 -94583.752387504 ------------------------------------------------------------------------------- -Test north polar aspect +# Test north polar aspect ------------------------------------------------------------------------------- operation +proj=airy +R=1 +lat_0=90 ------------------------------------------------------------------------------- @@ -374,7 +389,7 @@ expect failure errno tolerance_condition ------------------------------------------------------------------------------- -Test south polar aspect +# Test south polar aspect ------------------------------------------------------------------------------- operation +proj=airy +R=1 +lat_0=-90 ------------------------------------------------------------------------------- @@ -387,7 +402,7 @@ accept 0 90 expect failure errno tolerance_condition ------------------------------------------------------------------------------- -Test oblique aspect +# Test oblique aspect ------------------------------------------------------------------------------- operation +proj=airy +R=1 +lon_0=45 +lat_0=45 ------------------------------------------------------------------------------- @@ -395,13 +410,13 @@ tolerance 0.1 mm accept 45 45 expect 0 0 accept 0 0 -expext -0.7336 -0.5187 +expect -0.7336 -0.5187 accept -45 -45 expect failure errno tolerance_condition ------------------------------------------------------------------------------- -Test that coordinates on the opposing hemisphere are projected when using -+no_cut. +# Test that coordinates on the opposing hemisphere are projected when using +# +no_cut. ------------------------------------------------------------------------------- operation +proj=airy +R=1 +lat_0=-90 +no_cut ------------------------------------------------------------------------------- @@ -411,7 +426,7 @@ expect 0 1.5677 ------------------------------------------------------------------------------- -Test the +lat_b parameter +# Test the +lat_b parameter ------------------------------------------------------------------------------- operation +proj=airy +R=1 +lat_b=89.99999999 # check tolerance ------------------------------------------------------------------------------- @@ -434,8 +449,8 @@ accept -180 0 expect failure errno tolerance_condition =============================================================================== -Aitoff - Misc Sph +# Aitoff +# Misc Sph =============================================================================== ------------------------------------------------------------------------------- @@ -463,8 +478,8 @@ expect -0.001790493 -0.000895247 =============================================================================== -Mod. Stereographic of Alaska - Azi(mod) +# Mod. Stereographic of Alaska +# Azi(mod) =============================================================================== ------------------------------------------------------------------------------- @@ -515,8 +530,8 @@ expect -144.734239827 60.193564733 =============================================================================== -Apian Globular I - Misc Sph, no inv. +# Apian Globular I +# Misc Sph, no inv. =============================================================================== ------------------------------------------------------------------------------- @@ -534,8 +549,8 @@ expect -223374.577355253 -111701.072127637 =============================================================================== -August Epicycloidal - Misc Sph, no inv. +# August Epicycloidal +# Misc Sph, no inv. =============================================================================== ------------------------------------------------------------------------------- @@ -553,8 +568,8 @@ expect -223404.978180972 -111722.340289763 =============================================================================== -Bacon Globular - Misc Sph, no inv. +# Bacon Globular +# Misc Sph, no inv. =============================================================================== ------------------------------------------------------------------------------- @@ -572,8 +587,8 @@ expect -223334.132555965 -175450.725922666 =============================================================================== -Bipolar conic of western hemisphere - Conic Sph. +# Bipolar conic of western hemisphere +# Conic Sph. =============================================================================== ------------------------------------------------------------------------------- @@ -624,8 +639,8 @@ expect -73.034503807 17.246835092 =============================================================================== -Boggs Eumorphic - PCyl., no inv., Sph. +# Boggs Eumorphic +# PCyl., no inv., Sph. =============================================================================== ------------------------------------------------------------------------------- @@ -643,9 +658,9 @@ expect -211949.700808182 -117720.998305411 =============================================================================== -Bonne (Werner lat_1=90) - Conic Sph&Ell - lat_1= +# Bonne (Werner lat_1=90) +# Conic Sph&Ell +# lat_1= =============================================================================== ------------------------------------------------------------------------------- @@ -717,8 +732,8 @@ accept 0 0 expect 0 90 =============================================================================== -Cal Coop Ocean Fish Invest Lines/Stations - Cyl, Sph&Ell +# Cal Coop Ocean Fish Invest Lines/Stations +# Cyl, Sph&Ell =============================================================================== ------------------------------------------------------------------------------- @@ -784,8 +799,8 @@ roundtrip 100 =============================================================================== -Cassini - Cyl, Sph&Ell +# Cassini +# Cyl, Sph&Ell =============================================================================== ------------------------------------------------------------------------------- @@ -835,15 +850,15 @@ accept -200 -100 expect -0.001790493 -0.000895247 =============================================================================== -Central Conic - Sph - lat_1 +# Central Conic +# Sph +# lat_1 =============================================================================== ------------------------------------------------------------------------------- -operation +proj=pipeline +R=6390000 - +step +proj=ccon +lat_1=52 +lat_0=52 +lon_0=19 +x_0=330000 +y_0=-350000 - +step +proj=axisswap +order=1,-2 +operation +proj=pipeline +R=6390000 \ + +step +proj=ccon +lat_1=52 +lat_0=52 +lon_0=19 +x_0=330000 +y_0=-350000 \ + +step +proj=axisswap +order=1,-2 ------------------------------------------------------------------------------- tolerance 0.1 mm accept 24 55 @@ -869,8 +884,8 @@ expect 19.000000000000000000 52.000000000000000000 =============================================================================== -Central Cylindrical - Cyl, Sph +# Central Cylindrical +# Cyl, Sph =============================================================================== ------------------------------------------------------------------------------- @@ -898,9 +913,9 @@ expect -0.001790493 -0.000895247 =============================================================================== -Equal Area Cylindrical - Cyl, Sph&Ell - lat_ts= +# Equal Area Cylindrical +# Cyl, Sph&Ell +# lat_ts= =============================================================================== ------------------------------------------------------------------------------- @@ -951,9 +966,9 @@ expect -0.001790493 -0.000895247 =============================================================================== -Chamberlin Trimetric - Misc Sph, no inv. - lat_1= lon_1= lat_2= lon_2= lat_3= lon_3= +# Chamberlin Trimetric +# Misc Sph, no inv. +# lat_1= lon_1= lat_2= lon_2= lat_3= lon_3= =============================================================================== ------------------------------------------------------------------------------- @@ -971,8 +986,8 @@ expect -251312.289116443 223402.142197287 =============================================================================== -Collignon - PCyl, Sph. +# Collignon +# PCyl, Sph. =============================================================================== ------------------------------------------------------------------------------- @@ -1000,8 +1015,8 @@ expect -0.001586769 -0.001010182 =============================================================================== -Compact Miller - Cyl., Sph. +# Compact Miller +# Cyl., Sph. =============================================================================== ------------------------------------------------------------------------------- @@ -1029,8 +1044,8 @@ expect -0.001790493 -0.000904107 =============================================================================== -Craster Parabolic (Putnins P4) - PCyl., Sph. +# Craster Parabolic (Putnins P4) +# PCyl., Sph. =============================================================================== ------------------------------------------------------------------------------- @@ -1058,8 +1073,8 @@ expect -0.001832259 -0.000874839 =============================================================================== -Denoyer Semi-Elliptical - PCyl., no inv., Sph. +# Denoyer Semi-Elliptical +# PCyl., no inv., Sph. =============================================================================== ------------------------------------------------------------------------------- @@ -1077,8 +1092,8 @@ expect -223377.422876954 -111701.072127637 =============================================================================== -Eckert I - PCyl., Sph. +# Eckert I +# PCyl., Sph. =============================================================================== ------------------------------------------------------------------------------- @@ -1106,8 +1121,8 @@ expect -0.001943415 -0.000971702 =============================================================================== -Eckert II - PCyl. Sph. +# Eckert II +# PCyl. Sph. =============================================================================== ------------------------------------------------------------------------------- @@ -1135,8 +1150,8 @@ expect -0.001943415 -0.000824804 =============================================================================== -Eckert III - PCyl, Sph. +# Eckert III +# PCyl, Sph. =============================================================================== ------------------------------------------------------------------------------- @@ -1164,8 +1179,8 @@ expect -0.002120241 -0.001060120 =============================================================================== -Eckert IV - PCyl, Sph. +# Eckert IV +# PCyl, Sph. =============================================================================== ------------------------------------------------------------------------------- @@ -1193,8 +1208,8 @@ expect -0.002120241 -0.000756015 =============================================================================== -Eckert V - PCyl, Sph. +# Eckert V +# PCyl, Sph. =============================================================================== ------------------------------------------------------------------------------- @@ -1222,8 +1237,8 @@ expect -0.002029979 -0.001014989 =============================================================================== -Eckert VI - PCyl, Sph. +# Eckert VI +# PCyl, Sph. =============================================================================== ------------------------------------------------------------------------------- @@ -1251,9 +1266,9 @@ expect -0.002029979 -0.000789630 =============================================================================== -Equidistant Cylindrical (Plate Carree) - Cyl, Sph - lat_ts=[, lat_0=0] +# Equidistant Cylindrical (Plate Carree) +# Cyl, Sph +# lat_ts=[, lat_0=0] =============================================================================== ------------------------------------------------------------------------------- @@ -1281,9 +1296,9 @@ expect -0.001790493 -0.000895247 =============================================================================== -Equidistant Conic - Conic, Sph&Ell - lat_1= lat_2= +# Equidistant Conic +# Conic, Sph&Ell +# lat_1= lat_2= =============================================================================== ------------------------------------------------------------------------------- @@ -1348,9 +1363,9 @@ operation +proj=eqdc +R=1 +lat_1=1e-9 expect failure errno conic_lat_equal =============================================================================== -Euler - Conic, Sph - lat_1= and lat_2= +# Euler +# Conic, Sph +# lat_1= and lat_2= =============================================================================== ------------------------------------------------------------------------------- @@ -1401,10 +1416,10 @@ expect -0.001790143 -0.000895247 =============================================================================== -Extended Transverse Mercator - Cyl, Sph - lat_ts=(0) -lat_0=(0) +# Extended Transverse Mercator +# Cyl, Sph +# lat_ts=(0) +# lat_0=(0) =============================================================================== ------------------------------------------------------------------------------- @@ -1432,8 +1447,8 @@ expect -0.001796631 -0.000904369 =============================================================================== -Fahey - Pcyl, Sph. +# Fahey +# Pcyl, Sph. =============================================================================== ------------------------------------------------------------------------------- @@ -1461,8 +1476,8 @@ expect -0.002185789 -0.000984246 =============================================================================== -Foucaut - PCyl., Sph. +# Foucaut +# PCyl., Sph. =============================================================================== ------------------------------------------------------------------------------- @@ -1513,8 +1528,8 @@ expect -0.001790493 -0.000895247 =============================================================================== -Foucaut Sinusoidal - PCyl., Sph. +# Foucaut Sinusoidal +# PCyl., Sph. =============================================================================== ------------------------------------------------------------------------------- @@ -1542,8 +1557,8 @@ expect -0.001790493 -0.000895247 =============================================================================== -Gall (Gall Stereographic) - Cyl, Sph +# Gall (Gall Stereographic) +# Cyl, Sph =============================================================================== ------------------------------------------------------------------------------- @@ -1571,7 +1586,7 @@ expect -0.002532140 -0.001048847 =============================================================================== -Geocentric +# Geocentric =============================================================================== @@ -1599,9 +1614,9 @@ tolerance 0.1 mm =============================================================================== -Geostationary Satellite View - Azi, Sph&Ell - h= +# Geostationary Satellite View +# Azi, Sph&Ell +# h= =============================================================================== ------------------------------------------------------------------------------- @@ -1663,8 +1678,8 @@ expect failure errno invalid_h =============================================================================== -Ginsburg VIII (TsNIIGAiK) - PCyl, Sph., no inv. +# Ginsburg VIII (TsNIIGAiK) +# PCyl, Sph., no inv. =============================================================================== ------------------------------------------------------------------------------- @@ -1682,9 +1697,9 @@ expect -194350.250939590 -111703.907635335 =============================================================================== -General Sinusoidal Series - PCyl, Sph. - m= n= +# General Sinusoidal Series +# PCyl, Sph. +# m= n= =============================================================================== ------------------------------------------------------------------------------- @@ -1712,13 +1727,13 @@ expect -0.001790493 -0.000895247 =============================================================================== -Gnomonic - Azi, Sph. +# Gnomonic +# Azi, Sph. =============================================================================== ------------------------------------------------------------------------------- -Test material from Snyder p. 168, table 26. -Tests the equatorial aspect of the projection. +# Test material from Snyder p. 168, table 26. +# Tests the equatorial aspect of the projection. ------------------------------------------------------------------------------- operation +proj=gnom +R=1 ------------------------------------------------------------------------------- @@ -1763,7 +1778,7 @@ expect 0 90 ------------------------------------------------------------------------------- -Test the northern polar aspect of the gnonomic projection +# Test the northern polar aspect of the gnonomic projection ------------------------------------------------------------------------------- operation +proj=gnom +R=1 +lat_0=90 ------------------------------------------------------------------------------- @@ -1780,7 +1795,7 @@ accept 90 0 expect failure errno tolerance_condition ------------------------------------------------------------------------------- -Test the southern polar aspect of the gnonomic projection +# Test the southern polar aspect of the gnonomic projection ------------------------------------------------------------------------------- operation +proj=gnom +R=1 +lat_0=-90 ------------------------------------------------------------------------------- @@ -1797,7 +1812,7 @@ accept 90 0 expect failure errno tolerance_condition ------------------------------------------------------------------------------- -Test the oblique aspect of the gnonomic projection +# Test the oblique aspect of the gnonomic projection ------------------------------------------------------------------------------- operation +proj=gnom +R=1 +lat_0=45 ------------------------------------------------------------------------------- @@ -1815,8 +1830,8 @@ accept 0 -45 expect failure errno tolerance_condition =============================================================================== -Goode Homolosine - PCyl, Sph. +# Goode Homolosine +# PCyl, Sph. =============================================================================== ------------------------------------------------------------------------------- @@ -1844,8 +1859,8 @@ expect -0.001790493 -0.000895247 =============================================================================== -Mod. Stereographic of 48 U.S. - Azi(mod) +# Mod. Stereographic of 48 U.S. +# Azi(mod) =============================================================================== ------------------------------------------------------------------------------- @@ -1873,8 +1888,8 @@ expect -95.002606473 35.005424705 =============================================================================== -Mod. Stereographic of 50 U.S. - Azi(mod) +# Mod. Stereographic of 50 U.S. +# Azi(mod) =============================================================================== ------------------------------------------------------------------------------- @@ -1929,9 +1944,9 @@ expect -75.446820242 34.185406226 =============================================================================== -Hammer & Eckert-Greifendorff - Misc Sph, - W= M= +# Hammer & Eckert-Greifendorff +# Misc Sph, +# W= M= =============================================================================== ------------------------------------------------------------------------------- @@ -1965,8 +1980,8 @@ accept -180 0 expect failure errno tolerance_condition =============================================================================== -Hatano Asymmetrical Equal Area - PCyl, Sph. +# Hatano Asymmetrical Equal Area +# PCyl, Sph. =============================================================================== ------------------------------------------------------------------------------- @@ -1994,8 +2009,8 @@ expect -0.002106462 -0.000760958 =============================================================================== -HEALPix - Sph., Ellps. +# HEALPix +# Sph., Ellps. =============================================================================== ------------------------------------------------------------------------------- @@ -2069,9 +2084,9 @@ expect -2 -1 =============================================================================== -rHEALPix - Sph., Ellps. - north_square= south_square= +# rHEALPix +# Sph., Ellps. +# north_square= south_square= =============================================================================== ------------------------------------------------------------------------------- @@ -2141,8 +2156,8 @@ expect 135 50 =============================================================================== -Interrupted Goode Homolosine - PCyl, Sph. +# Interrupted Goode Homolosine +# PCyl, Sph. =============================================================================== ------------------------------------------------------------------------------- @@ -2170,9 +2185,9 @@ expect -0.001790496 -0.000895247 =============================================================================== -International Map of the World Polyconic - Mod. Polyconic, Ell - lat_1= and lat_2= [lon_1=] +# International Map of the World Polyconic +# Mod. Polyconic, Ell +# lat_1= and lat_2= [lon_1=] =============================================================================== ------------------------------------------------------------------------------- @@ -2219,8 +2234,8 @@ expect 0.000898315284 0.000000000000 =============================================================================== -Icosahedral Snyder Equal Area - Sph +# Icosahedral Snyder Equal Area +# Sph =============================================================================== ------------------------------------------------------------------------------- @@ -2241,8 +2256,8 @@ accept 0 0 expect failure =============================================================================== -Kavraisky V - PCyl., Sph. +# Kavraisky V +# PCyl., Sph. =============================================================================== ------------------------------------------------------------------------------- @@ -2293,8 +2308,8 @@ expect -0.001989440 -0.000805721 =============================================================================== -Kavraisky VII - PCyl, Sph. +# Kavraisky VII +# PCyl, Sph. =============================================================================== ------------------------------------------------------------------------------- @@ -2322,8 +2337,8 @@ expect -0.002067483 -0.000895247 =============================================================================== -Krovak - PCyl., Ellps. +# Krovak +# PCyl., Ellps. =============================================================================== ------------------------------------------------------------------------------- @@ -2359,9 +2374,9 @@ operation +proj=krovak +lat_0=-90 expect failure errno invalid_arg =============================================================================== -Laborde - Cyl, Sph - Special for Madagascar +# Laborde +# Cyl, Sph +# Special for Madagascar =============================================================================== ------------------------------------------------------------------------------- @@ -2393,8 +2408,8 @@ accept 0 0 expect failure errno lat_0_is_zero =============================================================================== -Lambert Azimuthal Equal Area - Azi, Sph&Ell +# Lambert Azimuthal Equal Area +# Azi, Sph&Ell =============================================================================== ------------------------------------------------------------------------------- @@ -2450,7 +2465,7 @@ accept -200 -100 expect -0.001790493 -0.000895247 ------------------------------------------------------------------------------- -Test oblique aspect of the spherical form +# Test oblique aspect of the spherical form ------------------------------------------------------------------------------- operation +proj=laea +R=1 +lat_0=45 ------------------------------------------------------------------------------- @@ -2476,7 +2491,7 @@ accept 0 10 expect failure errno tolerance_condition ------------------------------------------------------------------------------- -Test oblique aspect of the ellipsoidal form +# Test oblique aspect of the ellipsoidal form ------------------------------------------------------------------------------- operation +proj=laea +ellps=GRS80 +lat_0=45 ------------------------------------------------------------------------------- @@ -2502,7 +2517,7 @@ accept 0 0 expect 0 45 ------------------------------------------------------------------------------- -Test south polar aspect for the spherical form +# Test south polar aspect for the spherical form ------------------------------------------------------------------------------- operation +proj=laea +R=1 +lat_0=-90 ------------------------------------------------------------------------------- @@ -2523,7 +2538,7 @@ accept 45 45 roundtrip 100 ------------------------------------------------------------------------------- -Test south polar aspect for the ellipsoidal form +# Test south polar aspect for the ellipsoidal form ------------------------------------------------------------------------------- operation +proj=laea +ellps=GRS80 +lat_0=-90 ------------------------------------------------------------------------------- @@ -2549,7 +2564,7 @@ accept 0 0 expect 0 -90 ------------------------------------------------------------------------------- -Test north polar aspect for the spherical form +# Test north polar aspect for the spherical form ------------------------------------------------------------------------------- operation +proj=laea +R=1 +lat_0=90 ------------------------------------------------------------------------------- @@ -2570,7 +2585,7 @@ accept 45 45 roundtrip 100 ------------------------------------------------------------------------------- -Test north polar aspect +# Test north polar aspect ------------------------------------------------------------------------------- operation +proj=laea +ellps=GRS80 +lat_0=90 ------------------------------------------------------------------------------- @@ -2591,15 +2606,15 @@ accept 45 45 roundtrip 100 ------------------------------------------------------------------------------- -Test error in projection setup +# Test error in projection setup ------------------------------------------------------------------------------- operation +proj=laea +ellps=GRS80 +lat_0=91 expect failure errno lat_larger_than_90 =============================================================================== -Lagrange - Misc Sph, no inv. - W= lat_1= +# Lagrange +# Misc Sph, no inv. +# W= lat_1= =============================================================================== ------------------------------------------------------------------------------- @@ -2663,8 +2678,8 @@ accept 0 -89.9999999 expect 0 -2 =============================================================================== -Larrivee - Misc Sph, no inv. +# Larrivee +# Misc Sph, no inv. =============================================================================== ------------------------------------------------------------------------------- @@ -2682,8 +2697,8 @@ expect -223393.637624201 -111707.215961256 =============================================================================== -Laskowski - Misc Sph, no inv. +# Laskowski +# Misc Sph, no inv. =============================================================================== ------------------------------------------------------------------------------- @@ -2700,9 +2715,9 @@ accept -2 -1 expect -217928.275907355 -112144.329220142 =============================================================================== -Lambert Conformal Conic - Conic, Sph&Ell - lat_1= and lat_2= or lat_0, k_0= +# Lambert Conformal Conic +# Conic, Sph&Ell +# lat_1= and lat_2= or lat_0, k_0= =============================================================================== ------------------------------------------------------------------------------- @@ -2729,7 +2744,7 @@ accept -200 -100 expect -0.001796358 -0.000904233 ------------------------------------------------------------------------------- -Tests with +k_0 (Lambert Conformal Conic 2SP Michigan). +# Tests with +k_0 (Lambert Conformal Conic 2SP Michigan). ------------------------------------------------------------------------------- operation +proj=lcc +ellps=GRS80 +lat_1=0.5 +lat_2=2 +k_0=1.0000382 ------------------------------------------------------------------------------- @@ -2755,8 +2770,8 @@ expect -0.001796290 -0.000904199 ------------------------------------------------------------------------------- -Test various corner cases, spherical projection and one standard -parallel to improve test coverage. +# Test various corner cases, spherical projection and one standard +# parallel to improve test coverage. ------------------------------------------------------------------------------- operation +proj=lcc +ellps=GRS80 +lat_1=0.5 +lat_2=2 ------------------------------------------------------------------------------- @@ -2867,9 +2882,9 @@ operation +proj=lcc +ellps=sphere +lat_2=91 expect failure errno lat_larger_than_90 =============================================================================== -Lambert Conformal Conic Alternative - Conic, Sph&Ell - lat_0= +# Lambert Conformal Conic Alternative +# Conic, Sph&Ell +# lat_0= =============================================================================== ------------------------------------------------------------------------------- @@ -2897,9 +2912,9 @@ expect -0.001796902 0.999095633 =============================================================================== -Lambert Equal Area Conic - Conic, Sph&Ell - lat_1= south +# Lambert Equal Area Conic +# Conic, Sph&Ell +# lat_1= south =============================================================================== ------------------------------------------------------------------------------- @@ -2950,8 +2965,8 @@ expect -0.001790479 -0.000895264 =============================================================================== -Lee Oblated Stereographic - Azi(mod) +# Lee Oblated Stereographic +# Azi(mod) =============================================================================== ------------------------------------------------------------------------------- @@ -2979,8 +2994,8 @@ expect -165.002520561 -10.001241120 =============================================================================== -Loximuthal - PCyl Sph +# Loximuthal +# PCyl Sph =============================================================================== ------------------------------------------------------------------------------- @@ -3008,9 +3023,9 @@ expect -0.001790561 0.499104753 =============================================================================== -Space oblique for LANDSAT - Cyl, Sph&Ell - lsat= path= +# Space oblique for LANDSAT +# Cyl, Sph&Ell +# lsat= path= =============================================================================== ------------------------------------------------------------------------------- @@ -3044,8 +3059,8 @@ accept 0 1e10 expect failure errno invalid_x_or_y =============================================================================== -McBryde-Thomas Flat-Polar Sine (No. 1) - PCyl., Sph. +# McBryde-Thomas Flat-Polar Sine (No. 1) +# PCyl., Sph. =============================================================================== ------------------------------------------------------------------------------- @@ -3096,8 +3111,8 @@ expect -0.001952689 -0.000820885 =============================================================================== -McBryde-Thomas Flat-Pole Sine (No. 2) - Cyl., Sph. +# McBryde-Thomas Flat-Pole Sine (No. 2) +# Cyl., Sph. =============================================================================== ------------------------------------------------------------------------------- @@ -3125,8 +3140,8 @@ expect -0.002011971 -0.000796712 =============================================================================== -McBride-Thomas Flat-Polar Parabolic - Cyl., Sph. +# McBride-Thomas Flat-Polar Parabolic +# Cyl., Sph. =============================================================================== ------------------------------------------------------------------------------- @@ -3154,8 +3169,8 @@ expect -0.001933954 -0.000828837 =============================================================================== -McBryde-Thomas Flat-Polar Quartic - Cyl., Sph. +# McBryde-Thomas Flat-Polar Quartic +# Cyl., Sph. =============================================================================== ------------------------------------------------------------------------------- @@ -3183,8 +3198,8 @@ expect -0.001910106 -0.000839185 =============================================================================== -McBryde-Thomas Flat-Polar Sinusoidal - PCyl, Sph. +# McBryde-Thomas Flat-Polar Sinusoidal +# PCyl, Sph. =============================================================================== ------------------------------------------------------------------------------- @@ -3212,9 +3227,9 @@ expect -0.001953415 -0.000820580 =============================================================================== -Mercator - Cyl, Sph&Ell - lat_ts= +# Mercator +# Cyl, Sph&Ell +# lat_ts= =============================================================================== ------------------------------------------------------------------------------- @@ -3267,7 +3282,7 @@ expect -0.001790493 -0.000895247 ------------------------------------------------------------------------------- operation +proj=merc +R=1 ------------------------------------------------------------------------------- -Test the numerical stability of the inverse spherical Mercator +# Test the numerical stability of the inverse spherical Mercator ------------------------------------------------------------------------------- tolerance 1e-15 m accept 0 1e-15 @@ -3275,8 +3290,8 @@ expect 0 1e-15 =============================================================================== -Miller Oblated Stereographic - Azi(mod) +# Miller Oblated Stereographic +# Azi(mod) =============================================================================== ------------------------------------------------------------------------------- @@ -3304,8 +3319,8 @@ expect 19.997963628 17.999031632 =============================================================================== -Miller Cylindrical - Cyl, Sph +# Miller Cylindrical +# Cyl, Sph =============================================================================== ------------------------------------------------------------------------------- @@ -3333,9 +3348,9 @@ expect -0.001790493 -0.000895247 =============================================================================== -Space oblique for MISR - Cyl, Sph&Ell - path= +# Space oblique for MISR +# Cyl, Sph&Ell +# path= =============================================================================== ------------------------------------------------------------------------------- @@ -3386,8 +3401,8 @@ expect 127.761566096 -0.001716231 =============================================================================== -Mollweide - PCyl., Sph. +# Mollweide +# PCyl., Sph. =============================================================================== ------------------------------------------------------------------------------- @@ -3415,9 +3430,9 @@ expect -0.001988738 -0.000806005 =============================================================================== -Murdoch I - Conic, Sph - lat_1= and lat_2= +# Murdoch I +# Conic, Sph +# lat_1= and lat_2= =============================================================================== ------------------------------------------------------------------------------- @@ -3468,9 +3483,9 @@ expect -0.001790118 -0.000895247 =============================================================================== -Murdoch II - Conic, Sph - lat_1= and lat_2= +# Murdoch II +# Conic, Sph +# lat_1= and lat_2= =============================================================================== ------------------------------------------------------------------------------- @@ -3521,9 +3536,9 @@ expect -0.001790220 -0.000894821 =============================================================================== -Murdoch III - Conic, Sph - lat_1= and lat_2= +# Murdoch III +# Conic, Sph +# lat_1= and lat_2= =============================================================================== ------------------------------------------------------------------------------- @@ -3574,8 +3589,8 @@ expect -0.001790118 -0.000895247 =============================================================================== -Natural Earth - PCyl., Sph. +# Natural Earth +# PCyl., Sph. =============================================================================== ------------------------------------------------------------------------------- @@ -3603,8 +3618,8 @@ expect -0.002056383 -0.000888824 =============================================================================== -Natural Earth 2 - PCyl., Sph. +# Natural Earth 2 +# PCyl., Sph. =============================================================================== ------------------------------------------------------------------------------- @@ -3632,8 +3647,8 @@ expect -0.002113449 -0.000884780 =============================================================================== -Nell - PCyl., Sph. +# Nell +# PCyl., Sph. =============================================================================== ------------------------------------------------------------------------------- @@ -3661,8 +3676,8 @@ expect -0.001790493 -0.000895247 =============================================================================== -Nell-Hammer - PCyl., Sph. +# Nell-Hammer +# PCyl., Sph. =============================================================================== ------------------------------------------------------------------------------- @@ -3690,8 +3705,8 @@ expect -0.001790493 -0.000895247 =============================================================================== -Nicolosi Globular - Misc Sph, no inv. +# Nicolosi Globular +# Misc Sph, no inv. =============================================================================== ------------------------------------------------------------------------------- @@ -3709,9 +3724,9 @@ expect -223374.561814140 -111732.553988545 =============================================================================== -Near-sided perspective - Azi, Sph - h= +# Near-sided perspective +# Azi, Sph +# h= =============================================================================== ------------------------------------------------------------------------------- @@ -3738,7 +3753,7 @@ accept -200 -100 expect -0.001790493 -0.000895247 ------------------------------------------------------------------------------- -Test north polar aspect +# Test north polar aspect ------------------------------------------------------------------------------- operation +proj=nsper +R=1 +h=3 +lat_0=90 ------------------------------------------------------------------------------- @@ -3758,7 +3773,7 @@ accept 0 2 # projected coordinate is outside the sphere expect failure errno tolerance_condition ------------------------------------------------------------------------------- -Test south polar aspect +# Test south polar aspect ------------------------------------------------------------------------------- operation +proj=nsper +R=1 +h=3 +lat_0=-90 ------------------------------------------------------------------------------- @@ -3798,8 +3813,8 @@ expect failure errno invalid_h =============================================================================== -New Zealand Map Grid - fixed Earth +# New Zealand Map Grid +# fixed Earth =============================================================================== ------------------------------------------------------------------------------- @@ -3827,12 +3842,12 @@ expect 134.333684316 -61.621553676 =============================================================================== -General Oblique Transformation - Misc Sph - o_proj= plus parameters for projection - o_lat_p= o_lon_p= (new pole) or - o_alpha= o_lon_c= o_lat_c= or - o_lon_1= o_lat_1= o_lon_2= o_lat_2= +# General Oblique Transformation +# Misc Sph +# o_proj= plus parameters for projection +# o_lat_p= o_lon_p= (new pole) or +# o_alpha= o_lon_c= o_lat_c= or +# o_lon_1= o_lat_1= o_lon_2= o_lat_2= =============================================================================== ------------------------------------------------------------------------------- @@ -3864,9 +3879,9 @@ operation +proj=ob_tran +R=6400000 +o_proj +o_proj=ob_tran expect failure errno pjd_err_failed_to_find_proj =============================================================================== -Oblique Cylindrical Equal Area - Cyl, Sphlonc= alpha= or - lat_1= lat_2= lon_1= lon_2= +# Oblique Cylindrical Equal Area +# Cyl, Sphlonc= alpha= or +# lat_1= lat_2= lon_1= lon_2= =============================================================================== ------------------------------------------------------------------------------- @@ -3892,7 +3907,7 @@ expect 179.999104753 -0.001790493 accept -200 -100 expect -179.999104753 -0.001790493 -Direction North +# Direction North ------------------------------------------------------------------------------- operation +proj=ocea +a=6400000 +lat_1=45 +lat_2=45.0000001 +lon_1=0 +lon_2=0 ------------------------------------------------------------------------------- @@ -3908,7 +3923,7 @@ accept 2 1 expect 19994423.837934091687 223322.760576728586 -Direction South +# Direction South ------------------------------------------------------------------------------- operation +proj=ocea +a=6400000 +lat_1=45 +lat_2=44.999999 +lon_1=0 +lon_2=0 ------------------------------------------------------------------------------- @@ -3924,7 +3939,7 @@ accept 2 1 expect 111769.145040585790 -223322.760576727480 -Direction East +# Direction East ------------------------------------------------------------------------------- operation +proj=ocea +a=6400000 +lat_1=45 +lat_2=45 +lon_1=0 +lon_2=1e-8 ------------------------------------------------------------------------------- @@ -3940,7 +3955,7 @@ accept 2 1 expect 9742698.935838246718 4443057.188599349000 -Direction West +# Direction West ------------------------------------------------------------------------------- operation +proj=ocea +a=6400000 +lat_1=45 +lat_2=45 +lon_1=0 +lon_2=-1e-8 ------------------------------------------------------------------------------- @@ -3956,7 +3971,7 @@ accept 2 1 expect 10363494.047136424109 -4443057.188599349000 -Direction North-East +# Direction North-East ------------------------------------------------------------------------------- operation +proj=ocea +a=6400000 +lat_1=45 +lat_2=45.00001 +lon_1=0 +lon_2=1e-5 ------------------------------------------------------------------------------- @@ -3973,9 +3988,9 @@ accept 2 1 expect 18596261.668446537107 2747542.17330662999 =============================================================================== -Oblated Equal Area - Misc Sph - n= m= theta= +# Oblated Equal Area +# Misc Sph +# n= m= theta= =============================================================================== ------------------------------------------------------------------------------- @@ -4003,10 +4018,10 @@ expect -0.001741186 -0.000987727 =============================================================================== -Oblique Mercator - Cyl, Sph&Ell no_rot - alpha= [gamma=] [no_off] lonc= or - lon_1= lat_1= lon_2= lat_2= +# Oblique Mercator +# Cyl, Sph&Ell no_rot +# alpha= [gamma=] [no_off] lonc= or +# lon_1= lat_1= lon_2= lat_2= =============================================================================== ------------------------------------------------------------------------------- @@ -4064,7 +4079,7 @@ expect failure errno invalid_x_or_y -Direction North-East +# Direction North-East ------------------------------------------------------------------------------- operation +proj=omerc +a=6400000 +lat_0=45 +lat_1=45 +lat_2=45.00001 +lon_1=0 +lon_2=1e-5 ------------------------------------------------------------------------------- @@ -4107,8 +4122,8 @@ expect failure errno lat_larger_than_90 =============================================================================== -Ortelius Oval - Misc Sph, no inv. +# Ortelius Oval +# Misc Sph, no inv. =============================================================================== ------------------------------------------------------------------------------- @@ -4126,14 +4141,14 @@ expect -223374.577355253 -111701.072127637 =============================================================================== -Orthographic - Azi, Sph. +# Orthographic +# Azi, Sph. =============================================================================== ------------------------------------------------------------------------------- -Test the equatorial aspect of the Orthopgraphic projection. +# Test the equatorial aspect of the Orthopgraphic projection. -Test data from Snyder (1987), table 22, p. 151. +# Test data from Snyder (1987), table 22, p. 151. ------------------------------------------------------------------------------- operation +proj=ortho +R=1 +lat_0=0 +lon_0=0 ------------------------------------------------------------------------------- @@ -4160,7 +4175,7 @@ accept 40 70 expect 0.2198 0.9397 roundtrip 100 accept 50 60 -expext 0.3830 0.8660 +expect 0.3830 0.8660 roundtrip 100 accept 60 50 expect 0.5567 0.7660 @@ -4183,9 +4198,9 @@ expect failure errno tolerance_condition ------------------------------------------------------------------------------- -Test the oblique aspect of the Orthopgraphic projection. +# Test the oblique aspect of the Orthopgraphic projection. -Test data from Snyder (1987), table 23, pp. 152-153. +# Test data from Snyder (1987), table 23, pp. 152-153. ------------------------------------------------------------------------------- operation +proj=ortho +R=1 +lat_0=40 +lon_0=0 ------------------------------------------------------------------------------- @@ -4217,7 +4232,7 @@ expect failure errno tolerance_condition ------------------------------------------------------------------------------- -Test the north polar aspect of the Orthopgraphic projection. +# Test the north polar aspect of the Orthopgraphic projection. ------------------------------------------------------------------------------- operation +proj=ortho +R=1 +lat_0=90 +lon_0=0 ------------------------------------------------------------------------------- @@ -4247,7 +4262,7 @@ accept 2 2 expect failure errno tolerance_condition ------------------------------------------------------------------------------- -Test the south polar aspect of the Orthopgraphic projection. +# Test the south polar aspect of the Orthopgraphic projection. ------------------------------------------------------------------------------- operation +proj=ortho +R=1 +lat_0=-90 +lon_0=0 ------------------------------------------------------------------------------- @@ -4283,9 +4298,9 @@ accept 0.70710678118 0.7071067812 expect 45 0 =============================================================================== -Perspective Conic - Conic, Sph - lat_1= and lat_2= +# Perspective Conic +# Conic, Sph +# lat_1= and lat_2= =============================================================================== ------------------------------------------------------------------------------- @@ -4336,8 +4351,8 @@ expect -0.001790220 -0.000894897 =============================================================================== -Patterson Cylindrical - Cyl. +# Patterson Cylindrical +# Cyl. =============================================================================== ------------------------------------------------------------------------------- @@ -4365,8 +4380,8 @@ expect -0.001790493 -0.000882190 =============================================================================== -Polyconic (American) - Conic, Sph&Ell +# Polyconic (American) +# Conic, Sph&Ell =============================================================================== ------------------------------------------------------------------------------- @@ -4417,8 +4432,8 @@ expect -0.001790493 -0.000895247 =============================================================================== -Putnins P1 - PCyl, Sph. +# Putnins P1 +# PCyl, Sph. =============================================================================== ------------------------------------------------------------------------------- @@ -4446,8 +4461,8 @@ expect -0.001889802 -0.000944901 =============================================================================== -Putnins P2 - PCyl., Sph. +# Putnins P2 +# PCyl., Sph. =============================================================================== ------------------------------------------------------------------------------- @@ -4475,8 +4490,8 @@ expect -0.001889802 -0.000848202 =============================================================================== -Putnins P3 - PCyl., Sph. +# Putnins P3 +# PCyl., Sph. =============================================================================== ------------------------------------------------------------------------------- @@ -4504,8 +4519,8 @@ expect -0.002244050 -0.001122025 =============================================================================== -Putnins P3' - PCyl., Sph. +# Putnins P3' +# PCyl., Sph. =============================================================================== ------------------------------------------------------------------------------- @@ -4533,8 +4548,8 @@ expect -0.002244050 -0.001122025 =============================================================================== -Putnins P4' - PCyl., Sph. +# Putnins P4' +# PCyl., Sph. =============================================================================== ------------------------------------------------------------------------------- @@ -4562,8 +4577,8 @@ expect -0.002048528 -0.000782480 =============================================================================== -Putnins P5 - PCyl., Sph. +# Putnins P5 +# PCyl., Sph. =============================================================================== ------------------------------------------------------------------------------- @@ -4591,8 +4606,8 @@ expect -0.001766713 -0.000883357 =============================================================================== -Putnins P5' - PCyl., Sph. +# Putnins P5' +# PCyl., Sph. =============================================================================== ------------------------------------------------------------------------------- @@ -4620,8 +4635,8 @@ expect -0.001766713 -0.000883357 =============================================================================== -Putnins P6 - PCyl., Sph. +# Putnins P6 +# PCyl., Sph. =============================================================================== ------------------------------------------------------------------------------- @@ -4649,8 +4664,8 @@ expect -0.001766713 -0.000907296 =============================================================================== -Putnins P6' - PCyl., Sph. +# Putnins P6' +# PCyl., Sph. =============================================================================== ------------------------------------------------------------------------------- @@ -4678,8 +4693,8 @@ expect -0.002019551 -0.000793716 =============================================================================== -Quartic Authalic - PCyl., Sph. +# Quartic Authalic +# PCyl., Sph. =============================================================================== ------------------------------------------------------------------------------- @@ -4730,8 +4745,8 @@ expect -0.001790493 -0.000895247 =============================================================================== -Quadrilateralized Spherical Cube - Azi, Sph. +# Quadrilateralized Spherical Cube +# Azi, Sph. =============================================================================== ------------------------------------------------------------------------------- @@ -4782,8 +4797,8 @@ expect -0.001316827 -0.000604493 =============================================================================== -Robinson - PCyl., Sph. +# Robinson +# PCyl., Sph. =============================================================================== ------------------------------------------------------------------------------- @@ -4838,8 +4853,8 @@ expect failure errno lat_or_lon_exceed_limit =============================================================================== -Roussilhe Stereographic - Azi., Ellps. +# Roussilhe Stereographic +# Azi., Ellps. =============================================================================== ------------------------------------------------------------------------------- @@ -4867,9 +4882,9 @@ expect -0.001796631 -0.000904369 =============================================================================== -Rectangular Polyconic - Conic, Sph., no inv. - lat_ts= +# Rectangular Polyconic +# Conic, Sph., no inv. +# lat_ts= =============================================================================== ------------------------------------------------------------------------------- @@ -4887,8 +4902,8 @@ expect -223368.098302014 -111769.110486991 =============================================================================== -Sinusoidal (Sanson-Flamsteed) - PCyl, Sph&Ell +# Sinusoidal (Sanson-Flamsteed) +# PCyl, Sph&Ell =============================================================================== ------------------------------------------------------------------------------- @@ -4939,9 +4954,9 @@ expect -0.001790493 -0.000895247 =============================================================================== -Swiss. Obl. Mercator - Cyl, Ell - For CH1903 +# Swiss. Obl. Mercator +# Cyl, Ell +# For CH1903 =============================================================================== ------------------------------------------------------------------------------- @@ -4992,9 +5007,9 @@ expect -0.001790493 -0.000895247 =============================================================================== -Stereographic - Azi, Sph&Ell - lat_ts= +# Stereographic +# Azi, Sph&Ell +# lat_ts= =============================================================================== ------------------------------------------------------------------------------- @@ -5045,8 +5060,8 @@ expect -0.001790493 -0.000895247 =============================================================================== -Oblique Stereographic Alternative - Azimuthal, Sph&Ell +# Oblique Stereographic Alternative +# Azimuthal, Sph&Ell =============================================================================== ------------------------------------------------------------------------------- @@ -5154,9 +5169,9 @@ operation +proj=sterea +a=9999 +b=.9 +lat_0=73 expect failure =============================================================================== -Gauss-Schreiber Transverse Mercator (aka Gauss-Laborde Reunion) - Cyl, Sph&Ell - lat_0= lon_0= k_0= +# Gauss-Schreiber Transverse Mercator (aka Gauss-Laborde Reunion) +# Cyl, Sph&Ell +# lat_0= lon_0= k_0= =============================================================================== ------------------------------------------------------------------------------- @@ -5184,8 +5199,8 @@ expect -0.001790493 -0.000895247 =============================================================================== -Transverse Central Cylindrical - Cyl, Sph, no inv. +# Transverse Central Cylindrical +# Cyl, Sph, no inv. =============================================================================== ------------------------------------------------------------------------------- @@ -5203,8 +5218,8 @@ expect -223458.844192458 -111769.145040586 =============================================================================== -Transverse Cylindrical Equal Area - Cyl, Sph +# Transverse Cylindrical Equal Area +# Cyl, Sph =============================================================================== ------------------------------------------------------------------------------- @@ -5232,8 +5247,8 @@ expect -0.001790493 -0.000895247 =============================================================================== -Times - Cyl, Sph +# Times +# Cyl, Sph =============================================================================== ------------------------------------------------------------------------------- @@ -5265,9 +5280,9 @@ expect -45.000000000 -30.000000000 =============================================================================== -Tissot - Conic, Sph - lat_1= and lat_2= +# Tissot +# Conic, Sph +# lat_1= and lat_2= =============================================================================== ------------------------------------------------------------------------------- @@ -5318,8 +5333,8 @@ expect -0.001790143 0.511651393 =============================================================================== -Transverse Mercator - Cyl, Sph&Ell +# Transverse Mercator +# Cyl, Sph&Ell =============================================================================== ------------------------------------------------------------------------------- @@ -5377,7 +5392,7 @@ expect failure errno invalid_x_or_y =============================================================================== -Test Transverse Mercator +algo +# Test Transverse Mercator +algo =============================================================================== ------------------------------------------------------------------------------- @@ -5472,8 +5487,8 @@ expect 58302.0560 9446554.0371 roundtrip 1 =============================================================================== -Tobler-Mercator - Cyl, Sph +# Tobler-Mercator +# Cyl, Sph =============================================================================== ------------------------------------------------------------------------------- @@ -5520,7 +5535,7 @@ expect -2 -80 ------------------------------------------------------------------------------- operation +proj=tobmerc +R=1 ------------------------------------------------------------------------------- -Test the numerical stability of the inverse spherical Tobler-Mercator +# Test the numerical stability of the inverse spherical Tobler-Mercator ------------------------------------------------------------------------------- tolerance 1e-15 m accept 0 1e-15 @@ -5529,7 +5544,7 @@ expect 0 1e-15 ------------------------------------------------------------------------------- operation +proj=tobmerc +ellps=sphere ------------------------------------------------------------------------------- -Test expected failure at the poles: +# Test expected failure at the poles: ------------------------------------------------------------------------------- accept 0 90 expect failure errno tolerance_condition @@ -5539,9 +5554,9 @@ expect failure errno tolerance_condition =============================================================================== -Two Point Equidistant - Misc Sph - lat_1= lon_1= lat_2= lon_2= +# Two Point Equidistant +# Misc Sph +# lat_1= lon_1= lat_2= lon_2= =============================================================================== ------------------------------------------------------------------------------- @@ -5596,9 +5611,9 @@ operation +proj=tpeqd +a=6400000 +lat_1=90 +lat_2=90 +lon_1=0 +lon_2=1 expect failure =============================================================================== -Tilted perspective - Azi, Sph - tilt= azi= h= +# Tilted perspective +# Azi, Sph +# tilt= azi= h= =============================================================================== ------------------------------------------------------------------------------- @@ -5651,9 +5666,9 @@ expect -0.001790432 -0.000841228 =============================================================================== -Universal Polar Stereographic - Azi, Ell - south +# Universal Polar Stereographic +# Azi, Ell +# south =============================================================================== ------------------------------------------------------------------------------- @@ -5685,9 +5700,9 @@ operation +proj=ups +a=6400000 expect failure errno ellipsoid_use_required =============================================================================== -Urmaev V - PCyl., Sph., no inv. - n= q= alpha= +# Urmaev V +# PCyl., Sph., no inv. +# n= q= alpha= =============================================================================== ------------------------------------------------------------------------------- @@ -5707,9 +5722,9 @@ operation +proj=urm5 +a=6400000 +n=1 +alpha=90 expect failure errno lat_0_or_alpha_eq_90 =============================================================================== -Urmaev Flat-Polar Sinusoidal - PCyl, Sph. - n= +# Urmaev Flat-Polar Sinusoidal +# PCyl, Sph. +# n= =============================================================================== ------------------------------------------------------------------------------- @@ -5737,9 +5752,9 @@ expect -0.002040721 -0.000785474 =============================================================================== -Universal Transverse Mercator (UTM) - Cyl, Ell - zone= south +# Universal Transverse Mercator (UTM) +# Cyl, Ell +# zone= south =============================================================================== ------------------------------------------------------------------------------- @@ -5783,8 +5798,8 @@ operation +proj=utm +a=6400000 +zone=30 expect failure errno ellipsoid_use_required =============================================================================== -van der Grinten (I) - Misc Sph +# van der Grinten (I) +# Misc Sph =============================================================================== ------------------------------------------------------------------------------- @@ -5820,8 +5835,8 @@ expect failure errno tolerance_condition =============================================================================== -van der Grinten II - Misc Sph, no inv. +# van der Grinten II +# Misc Sph, no inv. =============================================================================== ------------------------------------------------------------------------------- @@ -5839,8 +5854,8 @@ expect -223395.247850437 -111718.491037226 =============================================================================== -van der Grinten III - Misc Sph, no inv. +# van der Grinten III +# Misc Sph, no inv. =============================================================================== ------------------------------------------------------------------------------- @@ -5858,8 +5873,8 @@ expect -223395.249552831 -111704.519904421 =============================================================================== -van der Grinten IV - Misc Sph, no inv. +# van der Grinten IV +# Misc Sph, no inv. =============================================================================== ------------------------------------------------------------------------------- @@ -5877,9 +5892,9 @@ expect -223374.577294355 -111701.195484154 =============================================================================== -Vitkovsky I - Conic, Sph - lat_1= and lat_2= +# Vitkovsky I +# Conic, Sph +# lat_1= and lat_2= =============================================================================== ------------------------------------------------------------------------------- @@ -5930,8 +5945,8 @@ expect -0.001790066 -0.000895247 =============================================================================== -Wagner I (Kavraisky VI) - PCyl, Sph. +# Wagner I (Kavraisky VI) +# PCyl, Sph. =============================================================================== ------------------------------------------------------------------------------- @@ -5959,8 +5974,8 @@ expect -0.002040721 -0.000785474 =============================================================================== -Wagner II - PCyl., Sph. +# Wagner II +# PCyl., Sph. =============================================================================== ------------------------------------------------------------------------------- @@ -5988,9 +6003,9 @@ expect -0.001936024 -0.000827958 =============================================================================== -Wagner III - PCyl., Sph. - lat_ts= +# Wagner III +# PCyl., Sph. +# lat_ts= =============================================================================== ------------------------------------------------------------------------------- @@ -6018,8 +6033,8 @@ expect -0.001790493 -0.000895247 =============================================================================== -Wagner IV - PCyl., Sph. +# Wagner IV +# PCyl., Sph. =============================================================================== ------------------------------------------------------------------------------- @@ -6047,8 +6062,8 @@ expect -0.002074503 -0.000772683 =============================================================================== -Wagner V - PCyl., Sph. +# Wagner V +# PCyl., Sph. =============================================================================== ------------------------------------------------------------------------------- @@ -6076,8 +6091,8 @@ expect -0.001968072 -0.000721216 =============================================================================== -Wagner VI - PCyl, Sph. +# Wagner VI +# PCyl, Sph. =============================================================================== ------------------------------------------------------------------------------- @@ -6105,8 +6120,8 @@ expect -0.001889802 -0.000944901 =============================================================================== -Wagner VII - Misc Sph, no inv. +# Wagner VII +# Misc Sph, no inv. =============================================================================== ------------------------------------------------------------------------------- @@ -6124,8 +6139,8 @@ expect -198601.876957312 -125637.045714171 =============================================================================== -Werenskiold I - PCyl., Sph. +# Werenskiold I +# PCyl., Sph. =============================================================================== ------------------------------------------------------------------------------- @@ -6153,9 +6168,9 @@ expect -0.001790493 -0.000683918 =============================================================================== -Winkel I - PCyl., Sph. - lat_ts= +# Winkel I +# PCyl., Sph. +# lat_ts= =============================================================================== ------------------------------------------------------------------------------- @@ -6183,9 +6198,9 @@ expect -0.001790493 -0.000895247 =============================================================================== -Winkel II - PCyl., Sph., no inv. - lat_1= +# Winkel II +# PCyl., Sph., no inv. +# lat_1= =============================================================================== ------------------------------------------------------------------------------- @@ -6203,9 +6218,9 @@ expect -223387.396433786 -124752.032797445 =============================================================================== -Winkel Tripel - Misc Sph - lat_1 +# Winkel Tripel +# Misc Sph +# lat_1 =============================================================================== ------------------------------------------------------------------------------- @@ -6231,4 +6246,4 @@ expect -0.001790493 0.000895247 accept -200 -100 expect -0.001790493 -0.000895247 -</gie> +</gie-strict> diff --git a/test/gie/deformation.gie b/test/gie/deformation.gie index b6616f52..cda2e5ac 100644 --- a/test/gie/deformation.gie +++ b/test/gie/deformation.gie @@ -9,16 +9,16 @@ The input coordinate is located at lon=60, lam=-160 - somewhere in Alaska. =============================================================================== -<gie> +<gie-strict> ------------------------------------------------------------------------------- -Test with an extract of nkgrf03vel_realigned with ctable2+gtx +# Test with an extract of nkgrf03vel_realigned with ctable2+gtx ------------------------------------------------------------------------------- -operation +proj=pipeline - +step +proj=cart +ellps=GRS80 - +step +proj=deformation - +xy_grids=tests/nkgrf03vel_realigned_xy_extract.ct2 - +z_grids=tests/nkgrf03vel_realigned_z_extract.gtx +ellps=GRS80 +dt=1 +operation +proj=pipeline \ + +step +proj=cart +ellps=GRS80 \ + +step +proj=deformation \ + +xy_grids=tests/nkgrf03vel_realigned_xy_extract.ct2 \ + +z_grids=tests/nkgrf03vel_realigned_z_extract.gtx +ellps=GRS80 +dt=1 \ +step +proj=cart +ellps=GRS80 +inv ------------------------------------------------------------------------------- tolerance 0.05 mm @@ -27,12 +27,12 @@ expect 21.5000000049 62.9999999937 0.0083 roundtrip 5 ------------------------------------------------------------------------------- -Test with an extract of nkgrf03vel_realigned with GeoTIFF +# Test with an extract of nkgrf03vel_realigned with GeoTIFF ------------------------------------------------------------------------------- -operation +proj=pipeline - +step +proj=cart +ellps=GRS80 - +step +proj=deformation - +grids=tests/nkgrf03vel_realigned_extract.tif +ellps=GRS80 +dt=1 +operation +proj=pipeline \ + +step +proj=cart +ellps=GRS80 \ + +step +proj=deformation \ + +grids=tests/nkgrf03vel_realigned_extract.tif +ellps=GRS80 +dt=1 \ +step +proj=cart +ellps=GRS80 +inv ------------------------------------------------------------------------------- tolerance 0.05 mm @@ -41,9 +41,9 @@ expect 21.5000000049 62.9999999937 0.0083 roundtrip 5 ------------------------------------------------------------------------------- -Test the +dt parameter +# Test the +dt parameter ------------------------------------------------------------------------------- -operation +proj=deformation +xy_grids=alaska +z_grids=egm96_15.gtx +operation +proj=deformation +xy_grids=alaska +z_grids=egm96_15.gtx \ +ellps=GRS80 +dt=16.0 # 2016.0 - 2000.0 ------------------------------------------------------------------------------- tolerance 0.1 mm @@ -61,9 +61,9 @@ expect failure errno grid_area ------------------------------------------------------------------------------- -Test using both horizontal and vertical grids +# Test using both horizontal and vertical grids ------------------------------------------------------------------------------- -operation +proj=deformation +operation +proj=deformation \ +xy_grids=alaska +z_grids=egm96_15.gtx +t_epoch=2016.0 +ellps=GRS80 ------------------------------------------------------------------------------- tolerance 0.1 mm @@ -74,19 +74,17 @@ expect -3004295.7000 -1093474.2097 5500477.3397 2000.0 roundtrip 5 ------------------------------------------------------------------------------- -operation proj=deformation xy_grids=alaska +dt=1.0 - ellps=GRS80 +operation proj=deformation xy_grids=alaska +dt=1.0 ellps=GRS80 expect failure pjd_err_no_args -operation proj=deformation z_grids=egm96_15.gtx +dt=1.0 - ellps=GRS80 +operation proj=deformation z_grids=egm96_15.gtx +dt=1.0 ellps=GRS80 expect failure pjd_err_no_args -operation proj=deformation xy_grids=nonexisting z_grids=egm96_15.gtx +operation proj=deformation xy_grids=nonexisting z_grids=egm96_15.gtx \ +dt=1.0 ellps=GRS80 expect failure pjd_err_failed_to_load_grid -operation proj=deformation xy_grids=alaska z_grids=nonexisting +operation proj=deformation xy_grids=alaska z_grids=nonexisting \ +dt=1.0 ellps=GRS80 expect failure pjd_err_failed_to_load_grid @@ -172,4 +170,4 @@ expect -147.0 64.0 0.0 3011.0 roundtrip 100 -</gie> +</gie-strict> diff --git a/test/gie/ellipsoid.gie b/test/gie/ellipsoid.gie index 09effd06..5e0049f7 100644 --- a/test/gie/ellipsoid.gie +++ b/test/gie/ellipsoid.gie @@ -5,10 +5,10 @@ Test pj_ellipsoid, the reimplementation of pj_ell_set =============================================================================== -<gie> +<gie-strict> ------------------------------------------------------------------------------- -First a spherical example +# First a spherical example ------------------------------------------------------------------------------- operation proj=merc R=6400000 ------------------------------------------------------------------------------- @@ -22,7 +22,7 @@ expect 1340412.8655316452 7387101.1430967357 ------------------------------------------------------------------------------- -Then an explicitly defined ellipsoidal example +# Then an explicitly defined ellipsoidal example ------------------------------------------------------------------------------- operation proj=merc a=6400000 rf=297 ------------------------------------------------------------------------------- @@ -36,7 +36,7 @@ expect 1340412.8655316452 7351803.9151705895 ------------------------------------------------------------------------------- -Then try using a built in ellipsoid +# Then try using a built in ellipsoid ------------------------------------------------------------------------------- operation proj=merc ellps=GRS80 ------------------------------------------------------------------------------- @@ -50,7 +50,7 @@ expect 1335833.8895192828 7326837.7148738774 ------------------------------------------------------------------------------- -Then try to fail deliberately +# Then try to fail deliberately ------------------------------------------------------------------------------- operation proj=merc ellps=GRS80000000000 expect failure errno unknown_ellp_param @@ -78,7 +78,7 @@ expect failure ------------------------------------------------------------------------------- -Finally test the spherification functionality +# Finally test the spherification functionality ------------------------------------------------------------------------------- operation proj=merc ellps=GRS80 R_A tolerance 10 nm @@ -122,7 +122,7 @@ operation proj=merc a=1E77 R_lat_a=90 b=1 expect failure ------------------------------------------------------------------------------- -This one from testvarious failed at first version of the pull request +# This one from testvarious failed at first version of the pull request ------------------------------------------------------------------------------- operation proj=healpix a=1 lon_0=0 ellps=WGS84 ------------------------------------------------------------------------------- @@ -133,7 +133,7 @@ expect -1.56904 0 ------------------------------------------------------------------------------- ------------------------------------------------------------------------------- -Shape parameters +# Shape parameters ------------------------------------------------------------------------------- operation proj=utm zone=32 ellps=GRS80 rf=0 expect failure errno rev_flattening_is_zero @@ -178,7 +178,7 @@ expect 700416.5900 5669475.8884 ------------------------------------------------------------------------------- ------------------------------------------------------------------------------- -Test that flattening can be set to zero +# Test that flattening can be set to zero ------------------------------------------------------------------------------- operation proj=merc +a=1.0 +f=0.0 ------------------------------------------------------------------------------- @@ -187,4 +187,4 @@ expect 0.20944 1.18505 ------------------------------------------------------------------------------- -</gie> +</gie-strict> diff --git a/test/gie/geotiff_grids.gie b/test/gie/geotiff_grids.gie index a0d2a05b..b71ed774 100644 --- a/test/gie/geotiff_grids.gie +++ b/test/gie/geotiff_grids.gie @@ -4,7 +4,7 @@ Test GeoTIFF grids =============================================================================== -<gie> +<gie-strict> # Those first tests using +proj=vgridshift only test the capability of reading # correctly a value from various formulations of GeoTIFF file, hence only the @@ -333,15 +333,15 @@ expect failure errno failed_to_load_grid # IGNF:LAMBE to IGNF:LAMB93 using xyzgridshift operation ------------------------------------------------------------------------------- -operation +proj=pipeline - +step +inv +proj=lcc +lat_1=46.8 +lat_0=46.8 +lon_0=0 - +k_0=0.99987742 +x_0=600000 +y_0=2200000 +ellps=clrk80ign +pm=paris - +step +proj=push +v_3 - +step +proj=cart +ellps=clrk80ign - +step +proj=xyzgridshift +grids=tests/subset_of_gr3df97a.tif +grid_ref=output_crs +ellps=GRS80 - +step +proj=cart +ellps=GRS80 +inv - +step +proj=pop +v_3 - +step +proj=lcc +lat_0=46.5 +lon_0=3 +lat_1=49 +lat_2=44 +operation +proj=pipeline \ + +step +inv +proj=lcc +lat_1=46.8 +lat_0=46.8 +lon_0=0 \ + +k_0=0.99987742 +x_0=600000 +y_0=2200000 +ellps=clrk80ign +pm=paris \ + +step +proj=push +v_3 \ + +step +proj=cart +ellps=clrk80ign \ + +step +proj=xyzgridshift +grids=tests/subset_of_gr3df97a.tif +grid_ref=output_crs +ellps=GRS80 \ + +step +proj=cart +ellps=GRS80 +inv \ + +step +proj=pop +v_3 \ + +step +proj=lcc +lat_0=46.5 +lon_0=3 +lat_1=49 +lat_2=44 \ +x_0=700000 +y_0=6600000 +ellps=GRS80 ------------------------------------------------------------------------------- tolerance 1 mm @@ -354,4 +354,4 @@ roundtrip 1 ------------------------------------------------------------------------------- -</gie> +</gie-strict> diff --git a/test/gie/guyou.gie b/test/gie/guyou.gie index 804cdb7c..f311c173 100644 --- a/test/gie/guyou.gie +++ b/test/gie/guyou.gie @@ -1,7 +1,7 @@ -<gie> +<gie-strict> ------------------------------------------------------------ -This gie file was automatically generated using libproject -where the guyou code was adapted from +# This gie file was automatically generated using libproject +# where the guyou code was adapted from ------------------------------------------------------------ ------------------------------------------------------------ @@ -2130,4 +2130,4 @@ accept 0 -90 expect 0 -1.85407 ------------------------------------------------------------ -</gie> +</gie-strict> diff --git a/test/gie/more_builtins.gie b/test/gie/more_builtins.gie index 323b85c1..3847c87e 100644 --- a/test/gie/more_builtins.gie +++ b/test/gie/more_builtins.gie @@ -8,10 +8,10 @@ intends to exercise corner cases. =============================================================================== -<gie> +<gie-strict> ------------------------------------------------------------------------------- -Two ob_tran tests from data/testvarious +# Two ob_tran tests from data/testvarious ------------------------------------------------------------------------------- operation +proj=ob_tran +o_proj=moll +R=6378137.0 +o_lon_p=0 +o_lat_p=0 +lon_0=180 ------------------------------------------------------------------------------- @@ -32,10 +32,10 @@ expect -1384841.18787 7581707.88240 ------------------------------------------------------------------------------- -Two tests from PJ_molodensky.c +# Two tests from PJ_molodensky.c ------------------------------------------------------------------------------- -operation proj=molodensky a=6378160 rf=298.25 - da=-23 df=-8.120449e-8 dx=-134 dy=-48 dz=149 +operation proj=molodensky a=6378160 rf=298.25 \ + da=-23 df=-8.120449e-8 dx=-134 dy=-48 dz=149 \ abridged ------------------------------------------------------------------------------- tolerance 2 m @@ -45,9 +45,9 @@ expect 144.968 -37.79848 46.378 0 roundtrip 100 1 m ------------------------------------------------------------------------------- -Same thing once more, but this time unabridged +# Same thing once more, but this time unabridged ------------------------------------------------------------------------------- -operation proj=molodensky a=6378160 rf=298.25 +operation proj=molodensky a=6378160 rf=298.25 \ da=-23 df=-8.120449e-8 dx=-134 dy=-48 dz=149 ------------------------------------------------------------------------------- tolerance 2 m @@ -58,9 +58,9 @@ expect 144.968 -37.79848 46.378 0 roundtrip 100 1 m ------------------------------------------------------------------------------- ------------------------------------------------------------------------------- -Molodensky with all 0 parameters +# Molodensky with all 0 parameters ------------------------------------------------------------------------------- -operation proj=molodensky a=6378160 rf=298.25 +operation proj=molodensky a=6378160 rf=298.25 \ da=0 df=0 dx=0 dy=0 dz=0 ------------------------------------------------------------------------------- tolerance 1 mm @@ -71,7 +71,7 @@ expect 144.9667 -37.8 50 0 roundtrip 1 ------------------------------------------------------------------------------- ------------------------------------------------------------------------------- -Test error cases of molodensky +# Test error cases of molodensky ------------------------------------------------------------------------------- # No arguments operation proj=molodensky a=6378160 rf=298.25 @@ -83,7 +83,7 @@ expect failure errno missing_arg ------------------------------------------------------------------------------- -Tests for PJ_bertin1953.c +# Tests for PJ_bertin1953.c ------------------------------------------------------------------------------- operation proj=bertin1953 +R=1 ------------------------------------------------------------------------------- @@ -121,12 +121,12 @@ expect 2.162845830414 -0.046534568425 ------------------------------------------------------------------------------- -Some tests from PJ_pipeline.c +# Some tests from PJ_pipeline.c ------------------------------------------------------------------------------- -Forward-reverse geo->utm->geo (4D functions) +# Forward-reverse geo->utm->geo (4D functions) ------------------------------------------------------------------------------- -operation proj=pipeline zone=32 step - proj=utm ellps=GRS80 step +operation proj=pipeline zone=32 step \ + proj=utm ellps=GRS80 step \ proj=utm ellps=GRS80 inv ------------------------------------------------------------------------------- tolerance 0.1 mm @@ -134,15 +134,15 @@ tolerance 0.1 mm accept 12 55 0 0 expect 12 55 0 0 -Now the inverse direction (still same result: the pipeline is symmetrical) +# Now the inverse direction (still same result: the pipeline is symmetrical) direction inverse expect 12 55 0 0 ------------------------------------------------------------------------------- -And now the back-to-back situation utm->geo->utm (4D functions) +# And now the back-to-back situation utm->geo->utm (4D functions) ------------------------------------------------------------------------------- -operation proj=pipeline zone=32 ellps=GRS80 step - proj=utm inv step +operation proj=pipeline zone=32 ellps=GRS80 step \ + proj=utm inv step \ proj=utm ------------------------------------------------------------------------------- accept 691875.63214 6098907.82501 0 0 @@ -150,10 +150,10 @@ expect 691875.63214 6098907.82501 0 0 direction inverse expect 691875.63214 6098907.82501 0 0 ------------------------------------------------------------------------------- -Forward-reverse geo->utm->geo (3D functions) +# Forward-reverse geo->utm->geo (3D functions) ------------------------------------------------------------------------------- -operation proj=pipeline zone=32 step - proj=utm ellps=GRS80 step +operation proj=pipeline zone=32 step \ + proj=utm ellps=GRS80 step \ proj=utm ellps=GRS80 inv ------------------------------------------------------------------------------- tolerance 0.1 mm @@ -161,15 +161,15 @@ tolerance 0.1 mm accept 12 55 0 expect 12 55 0 -Now the inverse direction (still same result: the pipeline is symmetrical) +# Now the inverse direction (still same result: the pipeline is symmetrical) direction inverse expect 12 55 0 ------------------------------------------------------------------------------- -And now the back-to-back situation utm->geo->utm (3D functions) +# And now the back-to-back situation utm->geo->utm (3D functions) ------------------------------------------------------------------------------- -operation proj=pipeline zone=32 ellps=GRS80 step - proj=utm inv step +operation proj=pipeline zone=32 ellps=GRS80 step \ + proj=utm inv step \ proj=utm ------------------------------------------------------------------------------- accept 691875.63214 6098907.82501 0 @@ -177,7 +177,7 @@ expect 691875.63214 6098907.82501 0 direction inverse expect 691875.63214 6098907.82501 0 ------------------------------------------------------------------------------- -Test a corner case: A rather pointless one-step pipeline geo->utm +# Test a corner case: A rather pointless one-step pipeline geo->utm ------------------------------------------------------------------------------- operation proj=pipeline step proj=utm zone=32 ellps=GRS80 ------------------------------------------------------------------------------- @@ -187,13 +187,13 @@ direction inverse accept 691875.63214 6098907.82501 0 0 expect 12 55 0 0 ------------------------------------------------------------------------------- -Finally test a pipeline with more than one init step +# Finally test a pipeline with more than one init step ------------------------------------------------------------------------------- use_proj4_init_rules true -operation proj=pipeline - step init=epsg:25832 inv - step init=epsg:25833 - step init=epsg:25833 inv +operation proj=pipeline \ + step init=epsg:25832 inv \ + step init=epsg:25833 \ + step init=epsg:25833 inv \ step init=epsg:25832 ------------------------------------------------------------------------------- accept 691875.63214 6098907.82501 0 0 @@ -202,30 +202,30 @@ direction inverse accept 12 55 0 0 expect 12 55 0 0 ------------------------------------------------------------------------------- -Test a few inversion scenarios (urm5 has no inverse operation) +# Test a few inversion scenarios (urm5 has no inverse operation) ------------------------------------------------------------------------------- -operation proj=pipeline step +operation proj=pipeline step \ proj=urm5 n=0.5 inv expect failure pjd_err_malformed_pipeline -operation proj=pipeline inv step +operation proj=pipeline inv step \ proj=urm5 n=0.5 expect failure pjd_err_malformed_pipeline -operation proj=pipeline inv step +operation proj=pipeline inv step \ proj=urm5 n=0.5 ellps=WGS84 inv accept 12 56 expect 1215663.2814182492 5452209.5424045017 -operation proj=pipeline step +operation proj=pipeline step \ proj=urm5 ellps=WGS84 n=0.5 accept 12 56 expect 1215663.2814182492 5452209.5424045017 ------------------------------------------------------------------------------- -Test various failing scenarios. +# Test various failing scenarios. ------------------------------------------------------------------------------- -operation proj=pipeline step - proj=pipeline step +operation proj=pipeline step \ + proj=pipeline step \ proj=merc expect failure pjd_err_malformed_pipeline @@ -237,7 +237,7 @@ expect failure pjd_err_malformed_pipeline ------------------------------------------------------------------------------- -Some tests from PJ_vgridshift.c +# Some tests from PJ_vgridshift.c ------------------------------------------------------------------------------- operation proj=vgridshift grids=egm96_15.gtx ellps=GRS80 ------------------------------------------------------------------------------- @@ -265,11 +265,11 @@ expect -540 0 -20.756538510 roundtrip 100 1 nm ------------------------------------------------------------------------------- -Fail on purpose: +grids parameter is mandatory +# Fail on purpose: +grids parameter is mandatory operation proj=vgridshift expect failure errno no_args -Fail on purpose: open non-existing grid +# Fail on purpose: open non-existing grid operation proj=vgridshift grids=nonexistinggrid.gtx expect failure errno failed_to_load_grid ------------------------------------------------------------------------------- @@ -281,7 +281,7 @@ accept 12.5 55.5 0 0 expect 12.5 55.5 3.6021305084228516 0 ------------------------------------------------------------------------------- -Some tests from PJ_hgridshift.c +# Some tests from PJ_hgridshift.c ------------------------------------------------------------------------------- operation proj=hgridshift +grids=ntf_r93.gsb ellps=GRS80 ------------------------------------------------------------------------------- @@ -308,10 +308,10 @@ expect failure errno no_args ------------------------------------------------------------------------------- -Tests for LCC 2SP Michigan (from PJ_lcc.c) +# Tests for LCC 2SP Michigan (from PJ_lcc.c) ------------------------------------------------------------------------------- -This test is taken from EPSG guidance note 7-2 (version 54, August 2018, -page 25) +# This test is taken from EPSG guidance note 7-2 (version 54, August 2018, +# page 25) ------------------------------------------------------------------------------- operation +proj=lcc +ellps=clrk66 +lat_1=44d11'N +lat_2=45d42'N +x_0=609601.2192 +lon_0=84d20'W +lat_0=43d19'N +k_0=1.0000382 +units=us-ft ------------------------------------------------------------------------------- @@ -326,16 +326,16 @@ expect 83d10'W 43d45'N ------------------------------------------------------------------------------- -A number of tests from PJ_helmert.c +# A number of tests from PJ_helmert.c ------------------------------------------------------------------------------- ------------------------------------------------------------------------------- -This example is from Lotti Jivall: "Simplified transformations from -ITRF2008/IGS08 to ETRS89 for maritime applications" +# This example is from Lotti Jivall: "Simplified transformations from +# ITRF2008/IGS08 to ETRS89 for maritime applications" ------------------------------------------------------------------------------- -operation proj=helmert convention=coordinate_frame - x=0.67678 y=0.65495 z=-0.52827 +operation proj=helmert convention=coordinate_frame \ + x=0.67678 y=0.65495 z=-0.52827 \ rx=-0.022742 ry=0.012667 rz=0.022704 s=-0.01070 ------------------------------------------------------------------------------- tolerance 1 um @@ -345,11 +345,11 @@ expect 3565285.41342351 855948.67986759 5201382.72939791 ------------------------------------------------------------------------------- -This example is a random point, transformed from ED50 to ETRS89 using KMStrans2 +# This example is a random point, transformed from ED50 to ETRS89 using KMStrans2 ------------------------------------------------------------------------------- -operation proj=helmert exact convention=coordinate_frame - x=-081.0703 rx=-0.48488 - y=-089.3603 ry=-0.02436 +operation proj=helmert exact convention=coordinate_frame \ + x=-081.0703 rx=-0.48488 \ + y=-089.3603 ry=-0.02436 \ z=-115.7526 rz=-0.41321 s=-0.540645 ------------------------------------------------------------------------------- tolerance 1 um @@ -359,17 +359,16 @@ expect 3494909.84026368 1056506.78938633 5212265.66699761 ------------------------------------------------------------------------------- -This example is a coordinate from the geodetic observatory in Onsala, -Sweden transformed from ITRF2000 @ 2017.0 to ITRF93 @ 2017.0. +# This example is a coordinate from the geodetic observatory in Onsala, +# Sweden transformed from ITRF2000 @ 2017.0 to ITRF93 @ 2017.0. -The test coordinate was transformed using GNSStrans, using transformation -parameters published by ITRF: ftp://itrf.ensg.ign.fr/pub/itrf/ITRF.TP +# The test coordinate was transformed using GNSStrans, using transformation +# parameters published by ITRF: ftp://itrf.ensg.ign.fr/pub/itrf/ITRF.TP ------------------------------------------------------------------------------- -operation proj=helmert convention=position_vector - x = 0.0127 dx = -0.0029 rx = -0.00039 drx = -0.00011 - y = 0.0065 dy = -0.0002 ry = 0.00080 dry = -0.00019 - z = -0.0209 dz = -0.0006 rz = -0.00114 drz = 0.00007 - +operation proj=helmert convention=position_vector \ + x = 0.0127 dx = -0.0029 rx = -0.00039 drx = -0.00011 \ + y = 0.0065 dy = -0.0002 ry = 0.00080 dry = -0.00019 \ + z = -0.0209 dz = -0.0006 rz = -0.00114 drz = 0.00007 \ s = 0.00195 ds = 0.00001 t_epoch = 1988.0 ------------------------------------------------------------------------------- tolerance 0.03 mm @@ -379,16 +378,16 @@ expect 3370658.18890 711877.42370 5349787.12430 2017.0 # ITRF93@2017.0 ------------------------------------------------------------------------------- -This example is from "A mathematical relationship between NAD27 and NAD83 (91) -State Plane coordinates in Southeastern Wisconsin": -http://www.sewrpc.org/SEWRPCFiles/Publications/TechRep/tr-034-Mathematical-Relationship-Between-NAD27-and-NAD83-91-State-Plane-Coordinates-Southeastern-Wisconsin.pdf +# This example is from "A mathematical relationship between NAD27 and NAD83 (91) +# State Plane coordinates in Southeastern Wisconsin": +# http://www.sewrpc.org/SEWRPCFiles/Publications/TechRep/tr-034-Mathematical-Relationship-Between-NAD27-and-NAD83-91-State-Plane-Coordinates-Southeastern-Wisconsin.pdf -The test data is taken from p. 29. Here we are using point 203 and converting it -from NAD27 (ft) -> NAD83 (m). The paper reports a difference of 0.0014 m from -measured to computed coordinates, hence the test tolerance is set accordingly. +# The test data is taken from p. 29. Here we are using point 203 and converting it +# from NAD27 (ft) -> NAD83 (m). The paper reports a difference of 0.0014 m from +# measured to computed coordinates, hence the test tolerance is set accordingly. ------------------------------------------------------------------------------- -operation proj=helmert convention=coordinate_frame - x=-9597.3572 y=.6112 +operation proj=helmert convention=coordinate_frame \ + x=-9597.3572 y=.6112 \ s=0.304794780637 theta=-1.244048 ------------------------------------------------------------------------------- tolerance 1 mm @@ -398,16 +397,16 @@ expect 766563.675 165282.277 0 ------------------------------------------------------------------------------- -Finally test the 4D-capabilities of the proj.h API, especially that the -rotation matrix is updated when necessary. +# Finally test the 4D-capabilities of the proj.h API, especially that the +# rotation matrix is updated when necessary. -Test coordinates from GNSStrans. +# Test coordinates from GNSStrans. ------------------------------------------------------------------------------- -operation proj=helmert convention=position_vector - x = 0.01270 dx =-0.0029 rx =-0.00039 drx =-0.00011 - y = 0.00650 dy =-0.0002 ry = 0.00080 dry =-0.00019 - z =-0.0209 dz =-0.0006 rz =-0.00114 drz = 0.00007 - s = 0.00195 ds = 0.00001 +operation proj=helmert convention=position_vector \ + x = 0.01270 dx =-0.0029 rx =-0.00039 drx =-0.00011 \ + y = 0.00650 dy =-0.0002 ry = 0.00080 dry =-0.00019 \ + z =-0.0209 dz =-0.0006 rz =-0.00114 drz = 0.00007 \ + s = 0.00195 ds = 0.00001 \ t_epoch=1988.0 ------------------------------------------------------------------------------- tolerance 0.1 mm @@ -418,7 +417,7 @@ expect 3370658.18087 711877.42750 5349787.12648 2018.0 ------------------------------------------------------------------------------- ------------------------------------------------------------------------------- -Test error cases of helmert +# Test error cases of helmert ------------------------------------------------------------------------------- # A rotational term implies an explicit convention to be specified operation proj=helmert rx=1 @@ -445,12 +444,12 @@ accept 0 0 expect failure errno 22 ------------------------------------------------------------------------------- -Molodensky-Badekas from IOGP Guidance 7.2, Transformation from La Canoa to REGVEN -between geographic 2D coordinate reference systems (EPSG Dataset transformation code 1771). -Here just taking the Cartesian step of the transformation. +# Molodensky-Badekas from IOGP Guidance 7.2, Transformation from La Canoa to REGVEN +# between geographic 2D coordinate reference systems (EPSG Dataset transformation code 1771). +# Here just taking the Cartesian step of the transformation. ------------------------------------------------------------------------------- -operation proj=molobadekas convention=coordinate_frame - x=-270.933 y=115.599 z=-360.226 rx=-5.266 ry=-1.238 rz=2.381 +operation proj=molobadekas convention=coordinate_frame \ + x=-270.933 y=115.599 z=-360.226 rx=-5.266 ry=-1.238 rz=2.381 \ s=-5.109 px=2464351.59 py=-5783466.61 pz=974809.81 ------------------------------------------------------------------------------- tolerance 1 cm @@ -460,7 +459,7 @@ expect 2550138.45 -5749799.87 1054530.82 ------------------------------------------------------------------------------- ------------------------------------------------------------------------------- -Test error cases of molobadekas +# Test error cases of molobadekas ------------------------------------------------------------------------------- # Missing convention @@ -469,7 +468,7 @@ expect failure errno missing_arg ------------------------------------------------------------------------------- -geocentric latitude +# geocentric latitude ------------------------------------------------------------------------------- operation proj=geoc ellps=GRS80 accept 12 55 0 0 @@ -487,7 +486,7 @@ expect 12 89.999999999989996 0 0 ------------------------------------------------------------------------------- ------------------------------------------------------------------------------- -geocentric latitude using old +geoc flag +# geocentric latitude using old +geoc flag ------------------------------------------------------------------------------- operation proj=pipeline step proj=longlat ellps=GRS80 geoc inv accept 12 55 0 0 @@ -498,7 +497,7 @@ roundtrip 1 ------------------------------------------------------------------------------- -some less used options +# some less used options ------------------------------------------------------------------------------- operation proj=utm ellps=GRS80 zone=32 to_meter=0 expect failure errno unit_factor_less_than_0 @@ -517,8 +516,8 @@ expect 69187.5632 609890.7825 ------------------------------------------------------------------------------- ------------------------------------------------------------------------------- -Test that gie can read DMS style coordinates as well as coordinates where _ -is used as a thousands separator. +# Test that gie can read DMS style coordinates as well as coordinates where _ +# is used as a thousands separator. ------------------------------------------------------------------------------- operation +step +proj=latlong +ellps=WGS84 ------------------------------------------------------------------------------- @@ -544,8 +543,8 @@ expect 0.0 0.0 -operation +proj=pipeline - +step +proj=latlong +datum=NAD27 +inv +operation +proj=pipeline \ + +step +proj=latlong +datum=NAD27 +inv \ +step +units=us-ft +init=nad27:3901 tolerance 1 mm @@ -557,7 +556,7 @@ expect 2_000_000.000 561_019.077 0.0 ------------------------------------------------------------------------------- ------------------------------------------------------------------------------- -Some tests from PJ_eqearth.c +# Some tests from PJ_eqearth.c ------------------------------------------------------------------------------- operation +proj=eqearth +ellps=WGS84 ------------------------------------------------------------------------------- @@ -677,7 +676,7 @@ expect 0 -90 ------------------------------------------------------------------------------- -Test for PJ_affine +# Test for PJ_affine ------------------------------------------------------------------------------- ------------------------------------------------------------------------------- operation +proj=geogoffset @@ -867,4 +866,4 @@ expect 5.875 55.375 0 ------------------------------------------------------------------------------- -</gie> +</gie-strict> diff --git a/test/gie/peirce_q.gie b/test/gie/peirce_q.gie index 7c609455..99f4ed05 100644 --- a/test/gie/peirce_q.gie +++ b/test/gie/peirce_q.gie @@ -1,7 +1,7 @@ -<gie> +<gie-strict> ------------------------------------------------------------ -This gie file was automatically generated using libproject -where the peirce_q code was adapted from +# This gie file was automatically generated using libproject +# where the peirce_q code was adapted from ------------------------------------------------------------ ------------------------------------------------------------ @@ -2117,4 +2117,4 @@ expect failure errno -14 accept 180.7137917600 105.8174218935 expect failure errno -14 -</gie> +</gie-strict> diff --git a/test/gie/unitconvert.gie b/test/gie/unitconvert.gie index f763959b..9c7a9e4a 100644 --- a/test/gie/unitconvert.gie +++ b/test/gie/unitconvert.gie @@ -2,7 +2,7 @@ Tests for the unitconvert operation ------------------------------------------------------------------------------- -<gie> +<gie-strict> operation proj=unitconvert xy_in=m xy_out=dm z_in=cm z_out=mm tolerance 0.1 @@ -67,4 +67,4 @@ expect failure operation proj=unitconvert z_out=1e400 expect failure -</gie> +</gie-strict> diff --git a/test/gigs/5101.1-jhs.gie b/test/gigs/5101.1-jhs.gie index efef9fcf..e3fcff6e 100644 --- a/test/gigs/5101.1-jhs.gie +++ b/test/gigs/5101.1-jhs.gie @@ -4,13 +4,13 @@ Test 5101 (part 1), Transverse Mercator, v2-0_2011-06-28, recommended JHS formul -------------------------------------------------------------------------------- -<gie> +<gie-strict> use_proj4_init_rules true -------------------------------------------------------------------------------- -operation +proj=pipeline - +step +init=epsg:4326 +inv +operation +proj=pipeline \ + +step +init=epsg:4326 +inv \ +step +proj=etmerc +lat_0=49 +lon_0=-2 +k_0=0.9996012717 +x_0=400000 +y_0=-100000 +ellps=WGS84 +units=m +no_def -------------------------------------------------------------------------------- tolerance 0.03 m @@ -250,8 +250,8 @@ accept 8.0 60.0 expect 956351.967 1166164.18 -------------------------------------------------------------------------------- -operation +proj=pipeline - +step +proj=etmerc +lat_0=49 +lon_0=-2 +k_0=0.9996012717 +x_0=400000 +y_0=-100000 +ellps=WGS84 +units=m +no_def +inv +operation +proj=pipeline \ + +step +proj=etmerc +lat_0=49 +lon_0=-2 +k_0=0.9996012717 +x_0=400000 +y_0=-100000 +ellps=WGS84 +units=m +no_def +inv \ +step +init=epsg:4326 -------------------------------------------------------------------------------- tolerance 0.03 m @@ -491,8 +491,8 @@ accept 956351.967 1166164.18 expect 8.0 60.0 -------------------------------------------------------------------------------- -operation +proj=pipeline - +step +init=epsg:4326 +inv +operation +proj=pipeline \ + +step +init=epsg:4326 +inv \ +step +proj=etmerc +lat_0=49 +lon_0=-2 +k_0=0.9996012717 +x_0=400000 +y_0=-100000 +ellps=WGS84 +units=m +no_def -------------------------------------------------------------------------------- tolerance 0.006 m @@ -731,4 +731,4 @@ tolerance 0.006 m accept 8.0 60.0 roundtrip 1000 -</gie> +</gie-strict> diff --git a/test/gigs/5101.2-jhs.gie b/test/gigs/5101.2-jhs.gie index 3f6218ba..76c72b6f 100644 --- a/test/gigs/5101.2-jhs.gie +++ b/test/gigs/5101.2-jhs.gie @@ -4,13 +4,13 @@ Test 5101 (part 2), Transverse Mercator, v2-0_2011-06-28, recommended JHS formul -------------------------------------------------------------------------------- -<gie> +<gie-strict> use_proj4_init_rules true -------------------------------------------------------------------------------- -operation +proj=pipeline - +step +init=epsg:4326 +inv +operation +proj=pipeline \ + +step +init=epsg:4326 +inv \ +step +init=epsg:32631 -------------------------------------------------------------------------------- tolerance 0.03 m @@ -106,8 +106,8 @@ accept 8.0 60.0 expect 778711.23 6661953.041 -------------------------------------------------------------------------------- -operation +proj=pipeline - +step +init=epsg:32631 +inv +operation +proj=pipeline \ + +step +init=epsg:32631 +inv \ +step +init=epsg:4326 -------------------------------------------------------------------------------- tolerance 0.03 m @@ -203,8 +203,8 @@ accept 778711.23 6661953.041 expect 8.0 60.0 -------------------------------------------------------------------------------- -operation +proj=pipeline - +step +init=epsg:4326 +inv +operation +proj=pipeline \ + +step +init=epsg:4326 +inv \ +step +init=epsg:32631 -------------------------------------------------------------------------------- tolerance 0.006 m @@ -299,4 +299,4 @@ tolerance 0.006 m accept 8.0 60.0 roundtrip 1000 -</gie> +</gie-strict> diff --git a/test/gigs/5101.3-jhs.gie b/test/gigs/5101.3-jhs.gie index 05b902be..f3434597 100644 --- a/test/gigs/5101.3-jhs.gie +++ b/test/gigs/5101.3-jhs.gie @@ -4,13 +4,13 @@ Test 5101 (part 3), Transverse Mercator, v2-0_2011-06-28, recommended JHS formul -------------------------------------------------------------------------------- -<gie> +<gie-strict> use_proj4_init_rules true -------------------------------------------------------------------------------- -operation +proj=pipeline - +step +init=epsg:4283 +inv +operation +proj=pipeline \ + +step +init=epsg:4283 +inv \ +step +init=epsg:28354 -------------------------------------------------------------------------------- tolerance 0.03 m @@ -106,8 +106,8 @@ accept 149 -60 expect 945493.565 3321588.377 -------------------------------------------------------------------------------- -operation +proj=pipeline - +step +init=epsg:28354 +inv +operation +proj=pipeline \ + +step +init=epsg:28354 +inv \ +step +init=epsg:4283 -------------------------------------------------------------------------------- tolerance 0.03 m @@ -203,8 +203,8 @@ accept 945493.565 3321588.377 expect 149 -60 -------------------------------------------------------------------------------- -operation +proj=pipeline - +step +init=epsg:4283 +inv +operation +proj=pipeline \ + +step +init=epsg:4283 +inv \ +step +init=epsg:28354 -------------------------------------------------------------------------------- tolerance 0.006 m @@ -299,4 +299,4 @@ tolerance 0.006 m accept 149 -60 roundtrip 1000 -</gie> +</gie-strict> diff --git a/test/gigs/5101.4-jhs-etmerc.gie b/test/gigs/5101.4-jhs-etmerc.gie index a4f28a4a..a50905d4 100644 --- a/test/gigs/5101.4-jhs-etmerc.gie +++ b/test/gigs/5101.4-jhs-etmerc.gie @@ -4,13 +4,13 @@ Test 5101 (part 4), Transverse Mercator, v2-0_2011-06-28, recommended JHS formul -------------------------------------------------------------------------------- -<gie> +<gie-strict> use_proj4_init_rules true -------------------------------------------------------------------------------- -operation +proj=pipeline - +step +init=epsg:4190 +inv +operation +proj=pipeline \ + +step +init=epsg:4190 +inv \ +step +proj=etmerc +lat_0=-90 +lon_0=-60 +k=1 +x_0=5500000 +y_0=0 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m -------------------------------------------------------------------------------- tolerance 0.03 m @@ -106,8 +106,8 @@ accept -57.0000158 -40.0002087 expect 5756200.0 5568100.0 -------------------------------------------------------------------------------- -operation +proj=pipeline - +step +proj=etmerc +lat_0=-90 +lon_0=-60 +k=1 +x_0=5500000 +y_0=0 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +inv +operation +proj=pipeline \ + +step +proj=etmerc +lat_0=-90 +lon_0=-60 +k=1 +x_0=5500000 +y_0=0 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +inv \ +step +init=epsg:4190 -------------------------------------------------------------------------------- tolerance 0.03 m @@ -203,8 +203,8 @@ accept 5756200.0 5568100.0 expect -57.0000158 -40.0002087 -------------------------------------------------------------------------------- -operation +proj=pipeline - +step +init=epsg:4190 +inv +operation +proj=pipeline \ + +step +init=epsg:4190 +inv \ +step +proj=etmerc +lat_0=-90 +lon_0=-60 +k=1 +x_0=5500000 +y_0=0 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m -------------------------------------------------------------------------------- tolerance 0.006 m @@ -299,4 +299,4 @@ tolerance 0.006 m accept -57.0000158 -40.0002087 roundtrip 1000 -</gie> +</gie-strict> diff --git a/test/gigs/5102.1.gie b/test/gigs/5102.1.gie index 33bf3bac..3d9de743 100644 --- a/test/gigs/5102.1.gie +++ b/test/gigs/5102.1.gie @@ -4,13 +4,13 @@ Test 5102, Lambert Conic Conformal (1SP), v2-0_2011-06-28. -------------------------------------------------------------------------------- -<gie> +<gie-strict> use_proj4_init_rules true -------------------------------------------------------------------------------- -operation +proj=pipeline - +step +init=epsg:4230 +inv +operation +proj=pipeline \ + +step +init=epsg:4230 +inv \ +step +init=epsg:2192 -------------------------------------------------------------------------------- tolerance 0.03 m @@ -90,8 +90,8 @@ accept 11 53 expect 1183924.412 2923146.858 -------------------------------------------------------------------------------- -operation +proj=pipeline - +step +init=epsg:2192 +inv +operation +proj=pipeline \ + +step +init=epsg:2192 +inv \ +step +init=epsg:4230 -------------------------------------------------------------------------------- tolerance 0.03 m @@ -171,8 +171,8 @@ accept 1183924.412 2923146.858 expect 11 53 -------------------------------------------------------------------------------- -operation +proj=pipeline - +step +init=epsg:4230 +inv +operation +proj=pipeline \ + +step +init=epsg:4230 +inv \ +step +init=epsg:2192 -------------------------------------------------------------------------------- tolerance 0.006 m @@ -251,4 +251,4 @@ tolerance 0.006 m accept 11 53 roundtrip 1000 -</gie> +</gie-strict> diff --git a/test/gigs/5103.1.gie b/test/gigs/5103.1.gie index 73b7d0ca..b194e2e0 100644 --- a/test/gigs/5103.1.gie +++ b/test/gigs/5103.1.gie @@ -4,13 +4,13 @@ Test 5103 (part 1), Lambert Conic Conformal (2SP), v2-0_2011-06-28. -------------------------------------------------------------------------------- -<gie> +<gie-strict> use_proj4_init_rules true -------------------------------------------------------------------------------- -operation +proj=pipeline - +step +init=epsg:4313 +inv +operation +proj=pipeline \ + +step +init=epsg:4313 +inv \ +step +init=epsg:31370 tolerance 30 mm @@ -77,8 +77,8 @@ expect 595117.95 430202.63 -------------------------------------------------------------------------------- -operation proj=pipeline - step init=epsg:31370 inv +operation proj=pipeline \ + step init=epsg:31370 inv \ step init=epsg:4313 tolerance 30 mm @@ -144,8 +144,8 @@ accept 595117.95 430202.63 expect 11 53 -------------------------------------------------------------------------------- -operation +proj=pipeline towgs84=0,0,0 # turn off dual datum shift - +step +init=epsg:4313 +inv +operation +proj=pipeline towgs84=0,0,0 \ # turn off dual datum shift + +step +init=epsg:4313 +inv \ +step +init=epsg:31370 tolerance 6 mm @@ -210,4 +210,4 @@ roundtrip 1000 accept 11 53 roundtrip 1000 -</gie> +</gie-strict> diff --git a/test/gigs/5103.2.gie b/test/gigs/5103.2.gie index b32c2758..4419a6cc 100644 --- a/test/gigs/5103.2.gie +++ b/test/gigs/5103.2.gie @@ -4,13 +4,13 @@ Test 5103 (part 2), Lambert Conic Conformal (2SP), v2-0_2011-06-28. -------------------------------------------------------------------------------- -<gie> +<gie-strict> use_proj4_init_rules true -------------------------------------------------------------------------------- -operation +proj=pipeline - +step +init=epsg:4152 +inv +operation +proj=pipeline \ + +step +init=epsg:4152 +inv \ +step +init=epsg:2921 -------------------------------------------------------------------------------- tolerance 0.03 m @@ -54,8 +54,8 @@ accept -102 41 expect 4257435.06 3666924.89 -------------------------------------------------------------------------------- -operation +proj=pipeline - +step +init=epsg:2921 +inv +operation +proj=pipeline \ + +step +init=epsg:2921 +inv \ +step +init=epsg:4152 -------------------------------------------------------------------------------- tolerance 0.03 m @@ -99,8 +99,8 @@ accept 4257435.06 3666924.89 expect -102 41 -------------------------------------------------------------------------------- -operation +proj=pipeline - +step +init=epsg:4152 +inv +operation +proj=pipeline \ + +step +init=epsg:4152 +inv \ +step +init=epsg:2921 -------------------------------------------------------------------------------- tolerance 0.006 m @@ -143,4 +143,4 @@ tolerance 0.006 m accept -102 41 roundtrip 1000 -</gie> +</gie-strict> diff --git a/test/gigs/5103.3.gie b/test/gigs/5103.3.gie index d486ec04..e73ede45 100644 --- a/test/gigs/5103.3.gie +++ b/test/gigs/5103.3.gie @@ -4,13 +4,13 @@ Test 5103 (part 3), Lambert Conic Conformal (2SP), v2-0_2011-06-28. -------------------------------------------------------------------------------- -<gie> +<gie-strict> use_proj4_init_rules true -------------------------------------------------------------------------------- -operation +proj=pipeline - +step +init=epsg:4152 +inv +operation +proj=pipeline \ + +step +init=epsg:4152 +inv \ +step +init=epsg:3568 -------------------------------------------------------------------------------- tolerance 0.03 m @@ -54,8 +54,8 @@ accept -102 41 expect 4257426.54 3666917.56 -------------------------------------------------------------------------------- -operation +proj=pipeline - +step +init=epsg:3568 +inv +operation +proj=pipeline \ + +step +init=epsg:3568 +inv \ +step +init=epsg:4152 -------------------------------------------------------------------------------- tolerance 0.03 m @@ -99,8 +99,8 @@ accept 4257426.54 3666917.56 expect -102 41 -------------------------------------------------------------------------------- -operation +proj=pipeline - +step +init=epsg:4152 +inv +operation +proj=pipeline \ + +step +init=epsg:4152 +inv \ +step +init=epsg:3568 -------------------------------------------------------------------------------- tolerance 0.006 m @@ -143,4 +143,4 @@ tolerance 0.006 m accept -102 41 roundtrip 1000 -</gie> +</gie-strict> diff --git a/test/gigs/5105.2.gie b/test/gigs/5105.2.gie index daf86433..d24c739d 100644 --- a/test/gigs/5105.2.gie +++ b/test/gigs/5105.2.gie @@ -4,13 +4,13 @@ Test 5105 (part 2), Oblique Mercator (variant B), v2-0_2011-06-28. -------------------------------------------------------------------------------- -<gie> +<gie-strict> use_proj4_init_rules true -------------------------------------------------------------------------------- -operation +proj=pipeline - +step +init=epsg:4237 +inv +operation +proj=pipeline \ + +step +init=epsg:4237 +inv \ +step +init=epsg:23700 -------------------------------------------------------------------------------- tolerance 0.05 m @@ -62,8 +62,8 @@ accept 16.36 45.5 expect 439836.709 20816.456 -------------------------------------------------------------------------------- -operation +proj=pipeline - +step +init=epsg:23700 +inv +operation +proj=pipeline \ + +step +init=epsg:23700 +inv \ +step +init=epsg:4237 -------------------------------------------------------------------------------- tolerance 0.05 m @@ -115,8 +115,8 @@ accept 439836.709 20816.456 expect 16.36 45.5 -------------------------------------------------------------------------------- -operation +proj=pipeline - +step +init=epsg:4237 +inv +operation +proj=pipeline \ + +step +init=epsg:4237 +inv \ +step +init=epsg:23700 -------------------------------------------------------------------------------- tolerance 0.006 m @@ -167,4 +167,4 @@ tolerance 0.006 m accept 16.36 45.5 roundtrip 1000 -</gie> +</gie-strict> diff --git a/test/gigs/5106.gie b/test/gigs/5106.gie index 9082c0e7..fd23b109 100644 --- a/test/gigs/5106.gie +++ b/test/gigs/5106.gie @@ -4,13 +4,13 @@ Test 5106, Hotine Oblique Mercator (variant A), v2-0_2011-06-28. -------------------------------------------------------------------------------- -<gie> +<gie-strict> use_proj4_init_rules true -------------------------------------------------------------------------------- -operation +proj=pipeline - +step +init=epsg:4742 +inv +operation +proj=pipeline \ + +step +init=epsg:4742 +inv \ +step +init=epsg:3376 -------------------------------------------------------------------------------- tolerance 0.05 m @@ -106,8 +106,8 @@ accept 114 6 expect 479068.802 663798.63 -------------------------------------------------------------------------------- -operation +proj=pipeline - +step +init=epsg:3376 +inv +operation +proj=pipeline \ + +step +init=epsg:3376 +inv \ +step +init=epsg:4742 -------------------------------------------------------------------------------- tolerance 0.05 m @@ -203,8 +203,8 @@ accept 479068.802 663798.63 expect 114 6 -------------------------------------------------------------------------------- -operation +proj=pipeline - +step +init=epsg:4742 +inv +operation +proj=pipeline \ + +step +init=epsg:4742 +inv \ +step +init=epsg:3376 -------------------------------------------------------------------------------- tolerance 0.006 m @@ -299,4 +299,4 @@ tolerance 0.006 m accept 114 6 roundtrip 1000 -</gie> +</gie-strict> diff --git a/test/gigs/5107.gie b/test/gigs/5107.gie index d3f1df79..917b8016 100644 --- a/test/gigs/5107.gie +++ b/test/gigs/5107.gie @@ -4,13 +4,13 @@ Test 5107, American Polyconic, v2-0_2011-06-28. -------------------------------------------------------------------------------- -<gie> +<gie-strict> use_proj4_init_rules true -------------------------------------------------------------------------------- -operation +proj=pipeline - +step +init=epsg:4674 +inv +operation +proj=pipeline \ + +step +init=epsg:4674 +inv \ +step +proj=poly +lat_0=0 +lon_0=-54 +x_0=5000000 +y_0=10000000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m -------------------------------------------------------------------------------- tolerance 0.05 m @@ -66,8 +66,8 @@ accept -30 -22.5 expect 7458947.70133 7313327.31691 -------------------------------------------------------------------------------- -operation +proj=pipeline - +step +proj=poly +lat_0=0 +lon_0=-54 +x_0=5000000 +y_0=10000000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +inv +operation +proj=pipeline \ + +step +proj=poly +lat_0=0 +lon_0=-54 +x_0=5000000 +y_0=10000000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +inv \ +step +init=epsg:4674 -------------------------------------------------------------------------------- tolerance 0.05 m @@ -123,8 +123,8 @@ accept 7458947.70133 7313327.31691 expect -30 -22.5 -------------------------------------------------------------------------------- -operation +proj=pipeline - +step +init=epsg:4674 +inv +operation +proj=pipeline \ + +step +init=epsg:4674 +inv \ +step +proj=poly +lat_0=0 +lon_0=-54 +x_0=5000000 +y_0=10000000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m -------------------------------------------------------------------------------- tolerance 0.006 m @@ -179,4 +179,4 @@ tolerance 0.006 m accept -30 -22.5 roundtrip 1000 -</gie> +</gie-strict> diff --git a/test/gigs/5109.gie b/test/gigs/5109.gie index da42109a..457c903c 100644 --- a/test/gigs/5109.gie +++ b/test/gigs/5109.gie @@ -4,13 +4,13 @@ Test 5109, Albers Equal Area, v2-0_2011-06-28. -------------------------------------------------------------------------------- -<gie> +<gie-strict> use_proj4_init_rules true -------------------------------------------------------------------------------- -operation +proj=pipeline - +step +init=epsg:4283 +inv +operation +proj=pipeline \ + +step +init=epsg:4283 +inv \ +step +init=epsg:3577 -------------------------------------------------------------------------------- tolerance 0.05 m @@ -66,8 +66,8 @@ accept 170 -60 expect 2656914.716 -6784621.89 -------------------------------------------------------------------------------- -operation +proj=pipeline - +step +init=epsg:3577 +inv +operation +proj=pipeline \ + +step +init=epsg:3577 +inv \ +step +init=epsg:4283 -------------------------------------------------------------------------------- tolerance 0.05 m @@ -123,8 +123,8 @@ accept 2656914.716 -6784621.89 expect 170 -60 -------------------------------------------------------------------------------- -operation +proj=pipeline - +step +init=epsg:4283 +inv +operation +proj=pipeline \ + +step +init=epsg:4283 +inv \ +step +init=epsg:3577 -------------------------------------------------------------------------------- tolerance 0.006 m @@ -179,4 +179,4 @@ tolerance 0.006 m accept 170 -60 roundtrip 1000 -</gie> +</gie-strict> diff --git a/test/gigs/5111.1.gie b/test/gigs/5111.1.gie index decb7f9f..09cc4c0c 100644 --- a/test/gigs/5111.1.gie +++ b/test/gigs/5111.1.gie @@ -10,13 +10,13 @@ Test 5111 (part 1), Mercator (variant A), v2-0_2011-06-28. <3001> +proj=merc +lon_0=110 +k=0.997 +x_0=3900000 +y_0=900000 +ellps=bessel +towgs84=-377,681,-50,0,0,0,0 +units=m <> -<gie> +<gie-strict> use_proj4_init_rules true -------------------------------------------------------------------------------- -operation +proj=pipeline towgs84=0,0,0 - +step +init=epsg:4211 +inv +operation +proj=pipeline towgs84=0,0,0 \ + +step +init=epsg:4211 +inv \ +step +init=epsg:3001 -------------------------------------------------------------------------------- tolerance 0.05 m @@ -160,8 +160,8 @@ accept -69.0 -2.0 expect -15964105.84 679490.65 -------------------------------------------------------------------------------- -operation +proj=pipeline towgs84=0,0,0 - +step +init=epsg:3001 +inv +operation +proj=pipeline towgs84=0,0,0 \ + +step +init=epsg:3001 +inv \ +step +init=epsg:4211 -------------------------------------------------------------------------------- tolerance 0.05 m @@ -305,8 +305,8 @@ accept -15964105.84 679490.65 expect -69.0 -2.0 -------------------------------------------------------------------------------- -operation +proj=pipeline towgs84=0,0,0 - +step +init=epsg:4211 +inv +operation +proj=pipeline towgs84=0,0,0 \ + +step +init=epsg:4211 +inv \ +step +init=epsg:3001 -------------------------------------------------------------------------------- tolerance 0.006 m @@ -449,4 +449,4 @@ tolerance 0.006 m accept -69.0 -2.0 roundtrip 1000 -</gie> +</gie-strict> diff --git a/test/gigs/5112.gie b/test/gigs/5112.gie index ab5c0be8..02e3c920 100644 --- a/test/gigs/5112.gie +++ b/test/gigs/5112.gie @@ -4,13 +4,13 @@ Test 5112, Mercator (variant B), v2-0_2011-06-28. -------------------------------------------------------------------------------- -<gie> +<gie-strict> use_proj4_init_rules true -------------------------------------------------------------------------------- -operation proj=pipeline - step init=epsg:4284 inv +operation proj=pipeline \ + step init=epsg:4284 inv \ step init=epsg:3388 tolerance 50 mm @@ -31,8 +31,8 @@ accept 67.0 -41.0 expect 1325634.35 -3709687.25 -------------------------------------------------------------------------------- -operation proj=pipeline - step init=epsg:3388 inv +operation proj=pipeline \ + step init=epsg:3388 inv \ step init=epsg:4284 tolerance 50 mm @@ -53,8 +53,8 @@ accept 1325634.35 -3709687.25 expect 67.0 -41.0 -------------------------------------------------------------------------------- -operation proj=pipeline towgs84=0,0,0 - step init=epsg:4284 inv +operation proj=pipeline towgs84=0,0,0 \ + step init=epsg:4284 inv \ step init=epsg:3388 tolerance 6 mm @@ -74,4 +74,4 @@ roundtrip 1000 accept 67.0 -41.0 roundtrip 1000 -</gie> +</gie-strict> diff --git a/test/gigs/5113.gie b/test/gigs/5113.gie index fdb4c381..c7ee6737 100644 --- a/test/gigs/5113.gie +++ b/test/gigs/5113.gie @@ -4,13 +4,13 @@ Test 5113, Transverse Mercator (South Oriented), v2-0_2011-06-28. -------------------------------------------------------------------------------- -<gie> +<gie-strict> use_proj4_init_rules true -------------------------------------------------------------------------------- -operation +proj=pipeline - +step +init=epsg:4148 +inv +operation +proj=pipeline \ + +step +init=epsg:4148 +inv \ +step +init=epsg:2049 -------------------------------------------------------------------------------- tolerance 0.03 m @@ -34,8 +34,8 @@ accept 19.5 -35.0 expect 136937.65 3875621.18 -------------------------------------------------------------------------------- -operation +proj=pipeline - +step +init=epsg:2049 +inv +operation +proj=pipeline \ + +step +init=epsg:2049 +inv \ +step +init=epsg:4148 -------------------------------------------------------------------------------- tolerance 0.03 m @@ -59,8 +59,8 @@ accept 136937.65 3875621.18 expect 19.5 -35.0 -------------------------------------------------------------------------------- -operation +proj=pipeline - +step +init=epsg:4148 +inv +operation +proj=pipeline \ + +step +init=epsg:4148 +inv \ +step +init=epsg:2049 -------------------------------------------------------------------------------- tolerance 0.006 m @@ -83,4 +83,4 @@ tolerance 0.006 m accept 19.5 -35.0 roundtrip 1000 -</gie> +</gie-strict> diff --git a/test/gigs/5201.gie b/test/gigs/5201.gie index 7d8f3bfe..504921d0 100644 --- a/test/gigs/5201.gie +++ b/test/gigs/5201.gie @@ -10,13 +10,13 @@ Test 5201, Geographic Geocentric conversions, v2.0_2011-09-28. (EPSG 4979 - WGS8 <4326> +proj=longlat +datum=WGS84 <> -<gie> +<gie-strict> use_proj4_init_rules true -------------------------------------------------------------------------------- -operation +proj=pipeline - +step +init=epsg:4978 +inv +operation +proj=pipeline \ + +step +init=epsg:4978 +inv \ +step +init=epsg:4326 -------------------------------------------------------------------------------- tolerance 0.01 m @@ -128,8 +128,8 @@ accept -2187336.719 -112 -5970149.093 expect -179.99706624 -70.00224647 -1039.2896 -------------------------------------------------------------------------------- -operation +proj=pipeline - +step +init=epsg:4326 +inv +operation +proj=pipeline \ + +step +init=epsg:4326 +inv \ +step +init=epsg:4978 -------------------------------------------------------------------------------- tolerance 0.01 m @@ -241,8 +241,8 @@ accept -179.99706624 -70.00224647 -1039.2896 expect -2187336.719 -112 -5970149.093 -------------------------------------------------------------------------------- -operation +proj=pipeline - +step +init=epsg:4978 +inv +operation +proj=pipeline \ + +step +init=epsg:4978 +inv \ +step +init=epsg:4326 -------------------------------------------------------------------------------- tolerance 0.01 m @@ -353,4 +353,4 @@ tolerance 0.01 m accept -2187336.719 -112 -5970149.093 roundtrip 1000 -</gie> +</gie-strict> diff --git a/test/gigs/5208.gie b/test/gigs/5208.gie index 1c28b26c..5ff492c4 100644 --- a/test/gigs/5208.gie +++ b/test/gigs/5208.gie @@ -20,13 +20,13 @@ To be on the safe side we, use 0.01 m as the tolerance. -<gie> +<gie-strict> use_proj4_init_rules true -------------------------------------------------------------------------------- -operation +proj=pipeline - +step +init=epsg:4275 +inv +operation +proj=pipeline\ + +step +init=epsg:4275 +inv\ +step +init=epsg:4807 -------------------------------------------------------------------------------- tolerance 0.01 m @@ -86,8 +86,8 @@ accept 11 53 expect 8.66277083 53 -------------------------------------------------------------------------------- -operation +proj=pipeline - +step +init=epsg:4807 +inv +operation +proj=pipeline \ + +step +init=epsg:4807 +inv \ +step +init=epsg:4275 -------------------------------------------------------------------------------- tolerance 0.01 m @@ -147,8 +147,8 @@ accept 8.66277083 53 expect 11 53 -------------------------------------------------------------------------------- -operation +proj=pipeline - +step +init=epsg:4275 +inv +operation +proj=pipeline \ + +step +init=epsg:4275 +inv \ +step +init=epsg:4807 -------------------------------------------------------------------------------- tolerance 0.01 m @@ -207,4 +207,4 @@ tolerance 0.01 m accept 11 53 roundtrip 1000 -</gie> +</gie-strict> |