changeset 2:5ecef27d7adc draft

planemo upload for repository https://github.com/galaxyecology/tools-ecology/tree/master/tools/gdal commit d2c064afb4680f459012473e4de8653079e32c15
author ecology
date Thu, 13 Jun 2019 11:28:51 -0400
parents 34b3877c6ba4
children 913cab85ce1e
files gdal_macros.xml gdalinfo.xml test-data/stere_advanced_info.txt test-data/stere_info.json
diffstat 4 files changed, 47 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/gdal_macros.xml	Wed Feb 27 14:15:07 2019 -0500
+++ b/gdal_macros.xml	Thu Jun 13 11:28:51 2019 -0400
@@ -1,5 +1,5 @@
 <macros>
-    <token name="@VERSION@">2.4.0</token>  
+    <token name="@VERSION@">3.0.0</token>  
     <xml name="gdal_requirements">
         <requirements>
             <requirement type="package" version="@VERSION@">gdal</requirement>
--- a/gdalinfo.xml	Wed Feb 27 14:15:07 2019 -0500
+++ b/gdalinfo.xml	Thu Jun 13 11:28:51 2019 -0400
@@ -62,7 +62,6 @@
             </when>
         </conditional>
     </inputs>
-
     <outputs>
         <data name="outputDefault" format="txt" label="Default info file">
             <filter>format == "default"</filter>
@@ -74,14 +73,13 @@
             <filter>subdataset == "subd_y"</filter>
         </data>
     </outputs>
-
     <tests>
         <test>
             <param name="input1" value="stere.tif"/>
             <param name="format" value="json" />
             <param name="subdataset" value="subd_n" />
             <param name="advanced" value="simple"/>
-            <output name="outputJson" file="stere_info.json" lines_diff="6"/>
+            <output name="outputJson" file="stere_info.json" lines_diff="4"/>
         </test>
         <test>
             <param name="input1" value="stere.tif"/>
@@ -95,7 +93,6 @@
             <output name="outputDefault" file="stere_advanced_info.txt" lines_diff="6"/>
         </test>
     </tests>
-
     <help><![CDATA[
 ==========================
 Gdalinfo
--- a/test-data/stere_advanced_info.txt	Wed Feb 27 14:15:07 2019 -0500
+++ b/test-data/stere_advanced_info.txt	Thu Jun 13 11:28:51 2019 -0400
@@ -1,28 +1,50 @@
 Driver: GTiff/GeoTIFF
-Files: /tmp/tmpqeQqf5/files/000/dataset_4.dat
+Files: /tmp/tmpxQwYm4/files/000/dataset_5.dat
 Size is 273, 265
 Coordinate System is:
-PROJCS["unnamed",
-    GEOGCS["WGS 84",
+PROJCRS["unnamed",
+    BASEGEOGCRS["WGS 84",
         DATUM["unknown",
-            SPHEROID["WGS84",6378137,298.257223563]],
-        PRIMEM["Greenwich",0],
-        UNIT["degree",0.0174532925199433]],
-    PROJECTION["Stereographic"],
-    PARAMETER["latitude_of_origin",71.4],
-    PARAMETER["central_meridian",28.9],
-    PARAMETER["scale_factor",1],
-    PARAMETER["false_easting",0],
-    PARAMETER["false_northing",0],
-    UNIT["metre",1,
-        AUTHORITY["EPSG","9001"]]]
+            ELLIPSOID["WGS84",6378137,298.257223563,
+                LENGTHUNIT["metre",1,
+                    ID["EPSG",9001]]]],
+        PRIMEM["Greenwich",0,
+            ANGLEUNIT["degree",0.0174532925199433,
+                ID["EPSG",9122]]]],
+    CONVERSION["unnamed",
+        METHOD["Stereographic"],
+        PARAMETER["Latitude of natural origin",71.4,
+            ANGLEUNIT["degree",0.0174532925199433],
+            ID["EPSG",8801]],
+        PARAMETER["Longitude of natural origin",28.9,
+            ANGLEUNIT["degree",0.0174532925199433],
+            ID["EPSG",8802]],
+        PARAMETER["Scale factor at natural origin",1,
+            SCALEUNIT["unity",1],
+            ID["EPSG",8805]],
+        PARAMETER["False easting",0,
+            LENGTHUNIT["metre",1],
+            ID["EPSG",8806]],
+        PARAMETER["False northing",0,
+            LENGTHUNIT["metre",1],
+            ID["EPSG",8807]]],
+    CS[Cartesian,2],
+        AXIS["easting",east,
+            ORDER[1],
+            LENGTHUNIT["metre",1,
+                ID["EPSG",9001]]],
+        AXIS["northing",north,
+            ORDER[2],
+            LENGTHUNIT["metre",1,
+                ID["EPSG",9001]]]]
+Data axis to CRS axis mapping: 1,2
 Origin = (-64455.359436834092776,72521.133364936860744)
 Pixel Size = (500.000000000000000,-500.000000000000000)
 Metadata:
   AREA_OR_POINT=Area
 Metadata (DERIVED_SUBDATASETS):
-  DERIVED_SUBDATASET_1_NAME=DERIVED_SUBDATASET:LOGAMPLITUDE:/tmp/tmpqeQqf5/files/000/dataset_4.dat
-  DERIVED_SUBDATASET_1_DESC=log10 of amplitude of input bands from /tmp/tmpqeQqf5/files/000/dataset_4.dat
+  DERIVED_SUBDATASET_1_NAME=DERIVED_SUBDATASET:LOGAMPLITUDE:/tmp/tmpxQwYm4/files/000/dataset_5.dat
+  DERIVED_SUBDATASET_1_DESC=log10 of amplitude of input bands from /tmp/tmpxQwYm4/files/000/dataset_5.dat
 Image Structure Metadata:
   INTERLEAVE=PIXEL
 Corner Coordinates:
--- a/test-data/stere_info.json	Wed Feb 27 14:15:07 2019 -0500
+++ b/test-data/stere_info.json	Thu Jun 13 11:28:51 2019 -0400
@@ -1,16 +1,20 @@
 {
-  "description":"\/tmp\/tmpqeQqf5\/files\/000\/dataset_4.dat",
+  "description":"\/tmp\/tmpxQwYm4\/files\/000\/dataset_5.dat",
   "driverShortName":"GTiff",
   "driverLongName":"GeoTIFF",
   "files":[
-    "\/tmp\/tmpqeQqf5\/files\/000\/dataset_4.dat"
+    "\/tmp\/tmpxQwYm4\/files\/000\/dataset_5.dat"
   ],
   "size":[
     273,
     265
   ],
   "coordinateSystem":{
-    "wkt":"PROJCS[\"unnamed\",\n    GEOGCS[\"WGS 84\",\n        DATUM[\"unknown\",\n            SPHEROID[\"WGS84\",6378137,298.257223563]],\n        PRIMEM[\"Greenwich\",0],\n        UNIT[\"degree\",0.0174532925199433]],\n    PROJECTION[\"Stereographic\"],\n    PARAMETER[\"latitude_of_origin\",71.4],\n    PARAMETER[\"central_meridian\",28.9],\n    PARAMETER[\"scale_factor\",1],\n    PARAMETER[\"false_easting\",0],\n    PARAMETER[\"false_northing\",0],\n    UNIT[\"metre\",1,\n        AUTHORITY[\"EPSG\",\"9001\"]]]"
+    "wkt":"PROJCRS[\"unnamed\",\n    BASEGEOGCRS[\"WGS 84\",\n        DATUM[\"unknown\",\n            ELLIPSOID[\"WGS84\",6378137,298.257223563,\n                LENGTHUNIT[\"metre\",1,\n                    ID[\"EPSG\",9001]]]],\n        PRIMEM[\"Greenwich\",0,\n            ANGLEUNIT[\"degree\",0.0174532925199433,\n                ID[\"EPSG\",9122]]]],\n    CONVERSION[\"unnamed\",\n        METHOD[\"Stereographic\"],\n        PARAMETER[\"Latitude of natural origin\",71.4,\n            ANGLEUNIT[\"degree\",0.0174532925199433],\n            ID[\"EPSG\",8801]],\n        PARAMETER[\"Longitude of natural origin\",28.9,\n            ANGLEUNIT[\"degree\",0.0174532925199433],\n            ID[\"EPSG\",8802]],\n        PARAMETER[\"Scale factor at natural origin\",1,\n            SCALEUNIT[\"unity\",1],\n            ID[\"EPSG\",8805]],\n        PARAMETER[\"False easting\",0,\n            LENGTHUNIT[\"metre\",1],\n            ID[\"EPSG\",8806]],\n        PARAMETER[\"False northing\",0,\n            LENGTHUNIT[\"metre\",1],\n            ID[\"EPSG\",8807]]],\n    CS[Cartesian,2],\n        AXIS[\"easting\",east,\n            ORDER[1],\n            LENGTHUNIT[\"metre\",1,\n                ID[\"EPSG\",9001]]],\n        AXIS[\"northing\",north,\n            ORDER[2],\n            LENGTHUNIT[\"metre\",1,\n                ID[\"EPSG\",9001]]]]",
+    "dataAxisToSRSAxisMapping":[
+      1,
+      2
+    ]
   },
   "geoTransform":[
     -64455.3594368340927758,