Add data source to geo node

Author: arneboockmeyer

.gitignore

@@ -4,3 +4,4 @@ __pycache__
 build/
 dist/
 venv
+.coverage

poetry.lock

@@ -18,6 +18,7 @@ black = "^22.12.0"
 pylint = "^2.15.10"
 pre-commit = "^3.0.0"
 pytest = "^8.0.0"
+coverage = "^7.10.1"
 
 [build-system]
 requires = ["poetry-core"]

pyproject.toml

@@ -16,10 +16,11 @@ class GeoNode(ABC, BaseElement):
     A GeoNode is characterized by it's x and y coordinates.
     """
 
-    def __init__(self, x, y, dbref_crs: str = "ER0", **kwargs):
+    def __init__(self, x, y, data_source: str = "unknown", dbref_crs: str = "ER0", **kwargs):
         super().__init__(**kwargs)
         self.x = x
         self.y = y
+        self.data_source = data_source
         self.dbref_crs = dbref_crs
 
     @abstractmethod
@@ -68,7 +69,7 @@ def to_wgs84(self) -> Wgs84GeoNode:
 
     def to_dbref(self) -> DbrefGeoNode:
         x, y = transform_wgs84_to_dbref(self.x, self.y, self.dbref_crs)
-        return DbrefGeoNode(x, y, self.dbref_crs, uuid=self.uuid)
+        return DbrefGeoNode(x, y, self.data_source, self.dbref_crs, uuid=self.uuid)
 
     def to_euclidean(self) -> EuclideanGeoNode:
         return self.to_dbref().to_euclidean()
@@ -81,7 +82,7 @@ def get_distance_to_other_geo_node(self, geo_node_b: GeoNode):
 
     def to_wgs84(self) -> Wgs84GeoNode:
         x, y = transform_dbref_to_wgs84(self.x, self.y, self.dbref_crs)
-        return Wgs84GeoNode(x, y, self.dbref_crs, uuid=self.uuid)
+        return Wgs84GeoNode(x, y, self.data_source, self.dbref_crs, uuid=self.uuid)
 
     def to_dbref(self) -> DbrefGeoNode:
         return self
@@ -91,7 +92,7 @@ def to_euclidean(self) -> EuclideanGeoNode:
         _x_shift = 4533770.0
         _y_shift = 5625780.0
         return EuclideanGeoNode(
-            self.x - _x_shift, self.y - _y_shift, self.dbref_crs, uuid=self.uuid
+            self.x - _x_shift, self.y - _y_shift, self.data_source, self.dbref_crs, uuid=self.uuid
         )
 
 
@@ -119,7 +120,7 @@ def to_wgs84(self) -> Wgs84GeoNode:
     def to_dbref(self) -> DbrefGeoNode:
         _x_shift = 4533770.0
         _y_shift = 5625780.0
-        return DbrefGeoNode(self.x + _x_shift, self.y + _y_shift, self.dbref_crs, uuid=self.uuid)
+        return DbrefGeoNode(self.x + _x_shift, self.y + _y_shift, self.data_source, self.dbref_crs, uuid=self.uuid)
 
     def to_euclidean(self) -> EuclideanGeoNode:
         return self

yaramo/geo_node.py

@@ -75,7 +75,8 @@ def _count_node_occurrences_in_edges(_node: Node):
                 if edge.is_node_connected(next_node) and not edge == previous_edge:
                     next_edge = edge
                     break
-
+            if next_edge is None:
+                raise ValueError("Next Edge not found.")
             edges_in_order.append(next_edge)
             next_node = next_edge.get_other_node(next_node)
             previous_edge = next_edge

yaramo/track.py

@@ -57,7 +57,7 @@ def __get_proj_dbref_str(coordinate_str: str):
             return CRS_CR0_STRING
         case "DR0":
             return CRS_DR0_STRING
-        case "ER0":
+        case "ER0" | "EA0":
             return CRS_ERO_STRING
         case "FR0":
             return CRS_FRO_STRING