LAST COMMITS FOR Stetl v2.1 RELEASE

geopython · Jan 9, 2023 · 831ff30 · 831ff30
1 parent 009e39f
commit 831ff30
Show file tree

Hide file tree

Showing 13 changed files with 1,570 additions and 1,534 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,13 +1,18 @@
 Changes
 =======
 
-v2.1 - aug, 2020
-----------------
+v2.2 - PLANNED
+--------------
 
-PLANNED.
+Leftovers from 2.2, also new GH Workflows for CI/CD and new Dockerfile.
+
+v2.1 - january 9, 2023
+----------------------
 
 See closed issues in Milestone 2.1: https://github.com/geopython/stetl/milestone/11?closed=1
 Mainly cleanup of Py3 migration issues, version upgrades for supporting libs (GDAL etc) and Dockerfile.
+Also many issues related to BAG v2 ETL, which uses the GDAL OGR BAGLV Driver, within NLExtract.
+See https://github.com/nlextract/NLExtract.
 
 v2.0 - april 11, 2019
 ---------------------

diff --git a/Dockerfile.test b/Dockerfile.test
@@ -1,4 +1,4 @@
-FROM geopython/stetl:local
+FROM geopython/stetl:latest
 
 WORKDIR /stetl
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -52,9 +52,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.1-dev'
+version = '2.1'
 # The full version, including alpha/beta/rc tags.
-release = '2.1-dev'
+release = '2.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/examples/basics/10_jinja2_templating/output/cities-gjson.gml b/examples/basics/10_jinja2_templating/output/cities-gjson.gml
@@ -42,7 +42,7 @@
                 <cities:name>Amsterdam</cities:name>
                 <cities:population>779808</cities:population>
                 <cities:geometry>
-                    <gml:Point srsName="urn:ogc:def:crs:EPSG::4258" gml:id="point-1"><gml:pos>52.3730454554572 4.89483636363636</gml:pos></gml:Point>
+                    <gml:Point srsName="urn:ogc:def:crs:EPSG::4258" gml:id="point-1"><gml:pos>4.89483636363636 52.3730454545455</gml:pos></gml:Point>
                 </cities:geometry>
             </cities:City>
         </gml:featureMember>
@@ -51,7 +51,7 @@
                 <cities:name>Bonn</cities:name>
                 <cities:population>327913</cities:population>
                 <cities:geometry>
-                    <gml:Point srsName="urn:ogc:def:crs:EPSG::4258" gml:id="point-2"><gml:pos>50.7345545463786 7.09981818181818</gml:pos></gml:Point>
+                    <gml:Point srsName="urn:ogc:def:crs:EPSG::4258" gml:id="point-2"><gml:pos>7.09981818181818 50.7345545454545</gml:pos></gml:Point>
                 </cities:geometry>
             </cities:City>
         </gml:featureMember>
@@ -60,7 +60,7 @@
                 <cities:name>Rome</cities:name>
                 <cities:population>2753000</cities:population>
                 <cities:geometry>
-                    <gml:Point srsName="urn:ogc:def:crs:EPSG::4258" gml:id="point-3"><gml:pos>41.8800000009378 12.52</gml:pos></gml:Point>
+                    <gml:Point srsName="urn:ogc:def:crs:EPSG::4258" gml:id="point-3"><gml:pos>12.52 41.88</gml:pos></gml:Point>
                 </cities:geometry>
             </cities:City>
         </gml:featureMember>

diff --git a/examples/basics/12_gdal_ogr/output/cities.dbf b/examples/basics/12_gdal_ogr/output/cities.dbf
diff --git a/examples/basics/3_shape/output/gmlcities.dbf b/examples/basics/3_shape/output/gmlcities.dbf
diff --git a/examples/basics/3_shape/output/gmlcities.prj b/examples/basics/3_shape/output/gmlcities.prj
@@ -1 +1 @@
-GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]
+GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]]
diff --git a/examples/basics/3_shape/temp/gmlcities.gfs b/examples/basics/3_shape/temp/gmlcities.gfs
@@ -6,7 +6,7 @@
     <GeometryElementPath>geometry</GeometryElementPath>
     <!--POINT-->
     <GeometryType>1</GeometryType>
-    <SRSName>GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]</SRSName>
+    <SRSName>urn:ogc:def:crs:EPSG:4326</SRSName>
     <DatasetSpecificInfo>
       <FeatureCount>3</FeatureCount>
       <ExtentXMin>4.90000</ExtentXMin>

diff --git a/examples/basics/8_wfs/etl.cfg b/examples/basics/8_wfs/etl.cfg
@@ -5,7 +5,7 @@ chains = input_wfs|output_std
 
 [input_wfs]
 class = stetl.inputs.httpinput.HttpInput
-url = https://geodata.nationaalgeoregister.nl/bag/wfs/v1_1
+url = https://service.pdok.nl/lv/bag/wfs/v2_0?'
 parameters = {
 		'service' : 'WFS',
 		'version' : '1.1.0',

diff --git a/examples/basics/runall-docker.log b/examples/basics/runall-docker.log
diff --git a/examples/basics/runall-docker.sh b/examples/basics/runall-docker.sh
@@ -10,7 +10,7 @@ for DIR_NAME in `echo [0-9]*`; do
 	echo "==== running etl.sh for example ${DIR_NAME} ===="
 
 	# Run with current dir mounted as work dir
-	BASE_CMD="docker run --rm -v $(pwd):/work -w /work geopython/stetl:local stetl -c etl.cfg"
+	BASE_CMD="docker run --rm -v $(pwd):/work -w /work geopython/stetl:latest stetl -c etl.cfg"
 
 	# Only exception is 6_cmdargs which has several
 	# extended stetl -a commandlines

diff --git a/examples/basics/runall.log b/examples/basics/runall.log
diff --git a/stetl/version.py b/stetl/version.py
@@ -1 +1 @@
-__version__ = "2.1.dev0"
+__version__ = "2.1"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]
		GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]]