making it compatible with older shapely #12

tools/import/dxf/dxf2jupedsim.py

@@ -20,11 +20,12 @@
 import os
 import sys
 import warnings
+import itertools
+
 import numpy
 import ezdxf
 import pyproj
-import shapely
-import itertools
+from shapely.geometry import Polygon, LineString
 
 sys.path.append(os.path.join(os.environ["SUMO_HOME"], 'tools'))
 import sumolib  # noqa
@@ -61,10 +62,9 @@ def polygon_as_XML_element(polygon, typename, index, color, layer):
         print("Warning: polygon '%s' had some equal consecutive points removed: %s" % (polygonID, duplicates))
 
     # Check for simplicity and output hints.
-    simple = shapely.is_simple(shapely.Polygon(cleanPolygon))
-    if not simple:
+    if not Polygon(cleanPolygon).is_valid:
         print("Warning: polygon '%s' is not simple." % polygonID)
-        segments = list(map(shapely.LineString, zip(cleanPolygon[:-1], cleanPolygon[1:])))
+        segments = list(map(LineString, zip(cleanPolygon[:-1], cleanPolygon[1:])))
         intersect = False
         for segment1, segment2 in itertools.combinations(segments, 2):
             if segment1.crosses(segment2):

tools/requirements.txt

@@ -1,4 +1,3 @@
-shapely>=2.0.1
 ezdxf>=0.14.2
 fmpy>=0.3.5,!=0.3.17
 lxml>=4.5.0
@@ -13,4 +12,5 @@ pyperclip>=1.7.0
 pyproj>=2.5.0
 rtree>=0.9.4
 scipy>=1.3.3
+shapely>=1.8.0
 texttest>=4.2.1