ssb-sgis 0.1.5__py3-none-any.whl → 0.1.6__py3-none-any.whl

sgis/networkanalysis/_points.py

@@ -36,24 +36,6 @@ class Points:
             for temp_idx, idx in zip(self.gdf.temp_idx, self.gdf.index, strict=True)
         }
 
-    def _get_n_missing(
-        self,
-        results: GeoDataFrame | DataFrame,
-        col: str,
-    ) -> None:
-        """
-        Get number of missing values for each point after a network analysis.
-
-        Args:
-            results: (Geo)DataFrame resulting from od_cost_matrix, get_route,
-                get_k_routes, get_route_frequencies or service_area.
-            col: id column of the results. Either 'origin' or 'destination'.
-        """
-        self.gdf["missing"] = self.gdf["temp_idx"].map(
-            results.groupby(col).count().iloc[:, 0]
-            - results.dropna().groupby(col).count().iloc[:, 0]
-        )
-
     @staticmethod
     def _convert_distance_to_weight(distances, rules):
         """Meters to minutes based on 'weight_to_nodes_' attribute of the rules."""

sgis/networkanalysis/directednetwork.py

@@ -11,7 +11,7 @@ from .network import Network
 
 
 class DirectedNetwork(Network):
-    """Subclass of Network with methods for making the network directed.
+    """Class for preparing line data for directed network analysis.
 
     Can be used as the 'network' parameter in the NetworkAnalysis class for directed
     network analysis.
@@ -19,7 +19,7 @@ class DirectedNetwork(Network):
     The DirectedNetwork class differs from the Network base class in two ways:
     1) using a DirectedNetwork in the NetworkAnalysis class means the network graph
     will be directed, meaning you can only travel in one direction on each line.
-    2) the class offers methods for making the network directed, mainly the
+    2) the class holds methods for making the network directed, mainly the
     'make_directed_network' method, which reverses lines going the wrong direction
     and duplicates and flips lines going both directions. It also creates a 'minute'
     column.

sgis/networkanalysis/network.py

@@ -105,7 +105,7 @@ class Network:
 
     >>> len(nw.gdf)
     85638
-    >>> nw = nw.close_network_holes(max_distance=1.5, fillna=0)
+    >>> nw = nw.close_network_holes(max_distance=1.5, max_angle=90, fillna=0)
     >>> len(nw.gdf)
     86929
 
@@ -612,6 +612,21 @@ class Network:
 
         return True
 
+    def get_edges(self) -> list[tuple[str, str]]:
+        return [
+            (str(source), str(target))
+            for source, target in zip(
+                self.gdf["source"], self.gdf["target"], strict=True
+            )
+        ]
+
+    @staticmethod
+    def _create_edge_ids(
+        edges: list[tuple[str, str]], weights: list[float]
+    ) -> list[str]:
+        """Edge identifiers represented with source and target ids and the weight."""
+        return [f"{s}_{t}_{w}" for (s, t), w in zip(edges, weights, strict=True)]
+
     def _update_nodes_if(self):
         if not self._nodes_are_up_to_date():
             self._make_node_ids()
@@ -653,27 +668,3 @@ class Network:
 
     def __len__(self):
         return len(self.gdf)
-
-
-# TODO: put these a better place:
-
-
-def _edge_ids(
-    gdf: GeoDataFrame | list[tuple[int, int]], weight: str | list[float]
-) -> list[str]:
-    """Quite messy way to deal with different input types."""
-    if isinstance(gdf, GeoDataFrame):
-        return _edge_id_template(
-            zip(gdf["source"], gdf["target"], strict=True),
-            weight_arr=gdf[weight],
-        )
-    if isinstance(gdf, list):
-        return _edge_id_template(gdf, weight_arr=weight)
-
-
-def _edge_id_template(*source_target_arrs, weight_arr):
-    """Edge identifiers represented with source and target ids and the weight."""
-    return [
-        f"{s}_{t}_{w}"
-        for (s, t), w in zip(*source_target_arrs, weight_arr, strict=True)
-    ]