fix: proper easting/northing notation

Author: FelixAbrahamsson

kmm/positions/geodetic.py

@@ -3,7 +3,6 @@
 
 from kmm.positions.positions import Positions
 
-
 tm = projections.make_transverse_mercator("SWEREF_99_TM")
 
 
@@ -12,16 +11,17 @@ def geodetic(positions: Positions):
     if len(dataframe) == 0:
         dataframe = dataframe.assign(longitude=[], latitude=[])
     else:
-        latitude, longitude = zip(*[
-            tm.grid_to_geodetic(coordinate.sweref99_tm_x, coordinate.sweref99_tm_y)
-            for coordinate in dataframe[["sweref99_tm_x", "sweref99_tm_y"]].itertuples()
-        ])
+        latitude, longitude = zip(
+            *[
+                tm.grid_to_geodetic(coordinate.northing, coordinate.easting)
+                for coordinate in dataframe[["northing", "easting"]].itertuples()
+            ]
+        )
         dataframe = dataframe.assign(longitude=longitude, latitude=latitude)
     return positions.replace(dataframe=dataframe)
 
 
 def test_geodetic():
-
     positions = Positions.from_path("tests/ascending_B.kmm2")
     df = geodetic(positions).dataframe
     assert ((df["latitude"] < 68) & (df["latitude"] > 55)).all()

kmm/positions/read_kmm.py

@@ -1,6 +1,7 @@
+from pathlib import Path
+
 import numpy as np
 import pandas as pd
-from pathlib import Path
 from pydantic import validate_arguments
 
 
@@ -22,8 +23,8 @@ def read_kmm(path: Path):
                 "3?",
                 "4?",
                 "5?",
-                "sweref99_tm_x",
-                "sweref99_tm_y",
+                "northing",
+                "easting",
                 "8?",
                 "9?",
             ],
@@ -32,8 +33,8 @@ def read_kmm(path: Path):
                 kilometer=np.int32,
                 meter=np.int32,
                 track_lane=str,
-                sweref99_tm_x=np.float32,
-                sweref99_tm_y=np.float32,
+                northing=np.float32,
+                easting=np.float32,
             ),
         )
     except Exception as e:

kmm/positions/read_kmm2.py

@@ -19,8 +19,8 @@
     "2?",
     "3?",
     "4?",
-    "sweref99_tm_x",
-    "sweref99_tm_y",
+    "northing",
+    "easting",
     "contact_wire_material",
     "rail_model",
     "sliper_model",
@@ -40,14 +40,13 @@
     kilometer=np.int32,
     meter=np.int32,
     track_lane=str,
-    sweref99_tm_x=np.float32,
-    sweref99_tm_y=np.float32,
+    northing=np.float32,
+    easting=np.float32,
 )
 
 
 @validate_arguments
 def read_kmm2(path: Path):
-
     skiprows = [
         index
         for index, line in enumerate(path.read_text(encoding="latin1").splitlines())