Decoding fix

threedi · Nov 29, 2022 · 2f7bf52 · 2f7bf52
1 parent 21f9e5f
commit 2f7bf52
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 10 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -2,14 +2,13 @@ Changelog of threedi-edits
 ===================================================
 
 1.2.1 (2022-11-15)
-----------------
+---------------------------------------------------
 
 - Versioning support for schema 0210.
 - FID column fix.
 - Updated sideview example.
 
-
 1.0 (2022-11-15)
-----------------
+---------------------------------------------------
 
 - Evolution from threedi-raster-edits (v0.27)
diff --git a/dist/threedi-edits-1.2.1.tar.gz b/dist/threedi-edits-1.2.1.tar.gz
diff --git a/dist/threedi_edits-1.2.1-py3-none-any.whl b/dist/threedi_edits-1.2.1-py3-none-any.whl
diff --git a/threedi_edits/examples/sideview.py b/threedi_edits/examples/sideview.py
@@ -136,14 +136,14 @@ def create(
         buffered_node = schema.nodes[node_id].geometry.buffer(0.00001)
         buffered_node = buffered_node.reproject(28992)
         clipped_channel = channel.clip(geometry=buffered_node).dissolve(quiet=True)
-        line = clipped_channel[0]
+        line = clipped_channel.first()
 
         if line.geometry.IsEmpty():
             output["oeverhoogte"].append([None, None])
             continue
 
         perpendicular_line = line.geometry.perpendicular_lines(0.5, 20)[0]
-        levee = levees.spatial_filter(perpendicular_line, return_vector=True)
+        levee = levees.spatial_subset(perpendicular_line)
         if levee.count > 0:
             if levee.count == 2:
                 output["oeverhoogte"].append(
@@ -152,7 +152,6 @@ def create(
                         levee[levee.fids[1]]["crest_level"],
                     ]
                 )
-                print(levee.fids, node_id)
             else:
                 output["oeverhoogte"].append(
                     [levee[levee.fids[0]]["crest_level"], None]
@@ -259,7 +258,7 @@ def create(
     selection_shape = (
         r"C:/Users/chris.kerklaan/Documents/Projecten/overijssels_kanaal/ovk.shp"
     )
-    output_name = r"C:\Users\chris.kerklaan\Documents\Projecten\overijssels_kanaal\processing/sideview_NVO_manning_03.png"
+    output_name = r"C:\Users\chris.kerklaan\Documents\Projecten\overijssels_kanaal\sideview_NVO_manning_0321.png"
     start_time = 120 * 3600
     start_node_id = 74507
     create(

diff --git a/threedi_edits/gis/vectorbase.py b/threedi_edits/gis/vectorbase.py
@@ -868,10 +868,9 @@ def _VSIFPrintfL(f, s):
 
 
 def _Esc(x):
-    if gdal.__version__ == "3.5.2":
+    if isinstance(x, (bytes, bytearray)):
         return gdal.EscapeString(x, gdal.CPLES_XML).decode("UTF-8")
-    else:
-        return gdal.EscapeString(x, gdal.CPLES_XML)
+    return gdal.EscapeString(x, gdal.CPLES_XML)
 
 
 class XMLWriter: