teaching matsim about GK4 #21

eclipse-sumo · Mar 18, 2024 · 0861b6b · 0861b6b
1 parent a75f9ed
commit 0861b6b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/tests/tools/import/MATSim/bikes_walks/errors.tools b/tests/tools/import/MATSim/bikes_walks/errors.tools
@@ -1 +0,0 @@
-Warning: Could not interpret coordinate system 'GK4' (Invalid projection: GK4: (Internal Proj Error: proj_create: several objects matching this name: Pulkovo 1995 / Gauss-Kruger CM 45E, Pulkovo 1942 / Gauss-Kruger CM 45E, Pulkovo 1942 / 3-degree Gauss-Kruger CM 42E, Pulkovo 1942 / 3-degree Gauss-Kruger CM 45E, Pulkovo 1942 / 3-degree Gauss-Kruger CM 48E, ...))

diff --git a/tools/import/matsim/matsim_importPlans.py b/tools/import/matsim/matsim_importPlans.py
@@ -114,7 +114,7 @@ def main(options):
                 try:
                     import pyproj
                     try:
-                        prj = pyproj.Proj(projName)
+                        prj = pyproj.Proj("EPSG:31468" if projName == "GK4" else projName)
                     except pyproj.exceptions.CRSError as e:
                         print("Warning: Could not interpret coordinate system '%s' (%s)" % (
                             projName, e), file=sys.stderr)
@@ -155,19 +155,19 @@ def main(options):
                 if not item.end_time:
                     if item.start_time and item.max_dur:
                         item.end_time = sumolib.miscutils.humanReadableTime(
-                                sumolib.miscutils.parseTime(item.start_time) +
-                                sumolib.miscutils.parseTime(item.max_dur)
+                            sumolib.miscutils.parseTime(item.start_time) +
+                            sumolib.miscutils.parseTime(item.max_dur)
                         )
                     elif item.start_time:
                         item.end_time = sumolib.miscutils.humanReadableTime(
-                                sumolib.miscutils.parseTime(item.start_time) +
-                                sumolib.miscutils.parseTime(options.default_dur)
+                            sumolib.miscutils.parseTime(item.start_time) +
+                            sumolib.miscutils.parseTime(options.default_dur)
                         )
                     elif item.max_dur and leg:
                         item.end_time = sumolib.miscutils.humanReadableTime(
-                                sumolib.miscutils.parseTime(leg.dep_time) +
-                                sumolib.miscutils.parseTime(options.default_dur) +
-                                sumolib.miscutils.parseTime(item.max_dur)
+                            sumolib.miscutils.parseTime(leg.dep_time) +
+                            sumolib.miscutils.parseTime(options.default_dur) +
+                            sumolib.miscutils.parseTime(item.max_dur)
                         )
                 lastAct = item
                 durations.append(item.max_dur if item.max_dur else options.default_dur)