ssb-sgis 1.3.5__py3-none-any.whl → 1.3.6__py3-none-any.whl

sgis/geopandas_tools/conversion.py

@@ -67,7 +67,7 @@ def to_geoseries(obj: Any, crs: Any | None = None) -> GeoSeries:
             # pandas objects
             index = obj.index
         else:
-            # list
+            # list (has method 'index')
             index = None
     except AttributeError:
         index = None

sgis/geopandas_tools/duplicates.py

@@ -38,8 +38,9 @@ def update_geometries(
 ) -> GeoDataFrame:
     """Puts geometries on top of each other rowwise.
 
-    Since this operation is done rowwise, it's important to
-    first sort the GeoDataFrame approriately. See example below.
+    IMPORTANT: Since this operation is done rowwise, meaning the top rows
+    are put on top of bottommore rows, it is important to first sort the
+    GeoDataFrame approriately. See examples below.
 
     Args:
         gdf: The GeoDataFrame to be updated.
@@ -63,6 +64,22 @@ def update_geometries(
 
     Example:
     --------
+    Create some overlapping circles and update the geometries based on area.
+    Sorting the data small to large might be the appropriate choice if you want to keep all details
+    in the coverage and the data has no attributes that should be given priority over another.
+
+    >>> coords = [(0, 0), (0, 1), (1, 1), (1, 0)]
+    >>> buffers = [0.9, 1.3, 0.7, 1.1]
+    >>> circles = sg.to_gdf(coords)
+    >>> circles["geometry"] = circles["geometry"].buffer(buffers)
+    >>> updated_smallest_first = sg.update_geometries(sg.sort_small_first(circles))
+    >>> updated_largest_first = sg.update_geometries(sg.sort_large_first(circles))
+    >>> sg.explore(circles, updated_smallest_first, updated_largest_first, tiles=["dark"])
+
+    If you want to prioritize geometries based on attributes,
+
+    >>> circles["hva"] = ["skog", "elv", "bro", "tunnel"]
+
     Create two circles and get the overlap.
 
     >>> import sgis as sg
@@ -123,7 +140,7 @@ def update_geometries(
     )
 
     geom_col = copied._geometry_column_name
-    index_mapper = {i: idx for i, idx in enumerate(copied.index)}
+    index_mapper = dict(enumerate(copied.index))
     copied = copied.reset_index(drop=True)
 
     left, right = rtree_runner.run(

sgis/geopandas_tools/general.py

@@ -828,16 +828,21 @@ def make_edge_coords_cols(gdf: GeoDataFrame) -> GeoDataFrame:
     Returns:
         A GeoDataFrame with new columns 'source_coords' and 'target_coords'
     """
+    if not gdf.index.is_unique:
+        index_mapper = dict(enumerate(gdf.index))
+        gdf = gdf.reset_index(drop=True)
+    else:
+        index_mapper = None
     try:
         gdf, endpoints = _prepare_make_edge_cols_simple(gdf)
     except ValueError:
         gdf, endpoints = _prepare_make_edge_cols(gdf)
 
-    coords = [(geom.x, geom.y) for geom in endpoints.geometry]
-    gdf["source_coords"], gdf["target_coords"] = (
-        coords[0::2],
-        coords[1::2],
-    )
+    gdf["source_coords"] = endpoints.groupby(level=0).first()
+    gdf["target_coords"] = endpoints.groupby(level=0).last()
+
+    if index_mapper is not None:
+        gdf.index = gdf.index.map(index_mapper)
 
     return gdf
 
@@ -855,19 +860,22 @@ def make_edge_wkt_cols(gdf: GeoDataFrame) -> GeoDataFrame:
     Returns:
         A GeoDataFrame with new columns 'source_wkt' and 'target_wkt'
     """
+    if not gdf.index.is_unique:
+        index_mapper = dict(enumerate(gdf.index))
+        gdf = gdf.reset_index(drop=True)
+    else:
+        index_mapper = None
     try:
         gdf, endpoints = _prepare_make_edge_cols_simple(gdf)
     except ValueError:
         gdf, endpoints = _prepare_make_edge_cols(gdf)
 
-    wkt_geom = [
-        f"POINT ({x} {y})" for x, y in zip(endpoints.x, endpoints.y, strict=True)
-    ]
-    gdf["source_wkt"], gdf["target_wkt"] = (
-        wkt_geom[0::2],
-        wkt_geom[1::2],
-    )
+    endpoints = endpoints.force_2d()
+    gdf["source_wkt"] = endpoints.groupby(level=0).first().to_wkt()
+    gdf["target_wkt"] = endpoints.groupby(level=0).last().to_wkt()
 
+    if index_mapper is not None:
+        gdf.index = gdf.index.map(index_mapper)
     return gdf
 
 
@@ -889,18 +897,16 @@ def _prepare_make_edge_cols(lines: GeoDataFrame) -> tuple[GeoDataFrame, GeoDataF
                 "Try using: to_single_geom_type(gdf, 'lines')."
             )
 
-    geom_col = lines._geometry_column_name
-
     # some LineStrings are in fact rings and must be removed manually
     lines, _ = split_out_circles(lines)
 
-    endpoints = lines[geom_col].boundary.explode(ignore_index=True)
+    endpoints = lines.geometry.boundary.explode(ignore_index=False)
 
     if len(lines) and len(endpoints) / len(lines) != 2:
         raise ValueError(
             "The lines should have only two endpoints each. "
             "Try splitting multilinestrings with explode.",
-            lines[geom_col],
+            lines.geometry,
         )
 
     return lines, endpoints
@@ -910,7 +916,7 @@ def _prepare_make_edge_cols_simple(
     lines: GeoDataFrame,
 ) -> tuple[GeoDataFrame, GeoDataFrame]:
     """Faster version of _prepare_make_edge_cols."""
-    endpoints = lines[lines._geometry_column_name].boundary.explode(ignore_index=True)
+    endpoints = lines.geometry.boundary.explode(ignore_index=False)
 
     if len(lines) and len(endpoints) / len(lines) != 2:
         raise ValueError(

sgis/geopandas_tools/point_operations.py

@@ -5,12 +5,15 @@ import pandas as pd
 from geopandas import GeoDataFrame
 from geopandas import GeoSeries
 from shapely import distance
-from shapely import union_all
 from shapely.ops import nearest_points
 
+from ..conf import _get_instance
+from ..conf import config
+from ..geopandas_tools.conversion import to_geoseries
 from ..geopandas_tools.geometry_types import get_geom_type
 from ..geopandas_tools.geometry_types import to_single_geom_type
 from ..geopandas_tools.polygon_operations import PolygonsAsRings
+from ..geopandas_tools.runners import RTreeQueryRunner
 
 
 def snap_within_distance(
@@ -19,6 +22,8 @@ def snap_within_distance(
     max_distance: int | float,
     *,
     distance_col: str | None = None,
+    n_jobs: int = 1,
+    rtree_runner: RTreeQueryRunner | None = None,
 ) -> GeoDataFrame | GeoSeries:
     """Snaps points to nearest geometry if within given distance.
 
@@ -33,6 +38,9 @@ def snap_within_distance(
         distance_col: Name of column with the snap distance. Defaults to
             'snap_distance'. Set to None to not get any distance column. This will make
             the function a bit faster.
+        n_jobs: Number of workers.
+        rtree_runner: Optionally debug/manipulate the spatial indexing operations.
+            See the 'runners' module for example implementations.
 
     Returns:
         A GeoDataFrame or GeoSeries with the points snapped to the nearest point in the
@@ -80,22 +88,31 @@ def snap_within_distance(
     """
     to = _polygons_to_rings(to)
 
+    if not isinstance(to, GeoSeries):
+        to = to_geoseries(to)
+
     if not distance_col and not isinstance(points, GeoDataFrame):
         return _shapely_snap(
             points=points,
-            to=to,
+            to=to.values,
             max_distance=max_distance,
+            rtree_runner=rtree_runner,
+            n_jobs=n_jobs,
         )
-    elif not isinstance(points, GeoDataFrame):
-        points = points.to_frame()
 
     copied = points.copy()
 
-    copied.geometry = _shapely_snap(
-        points=copied.geometry.values,
-        to=to,
+    snapped = _shapely_snap(
+        points=copied.geometry,
+        to=to.values,
         max_distance=max_distance,
+        rtree_runner=rtree_runner,
+        n_jobs=n_jobs,
     )
+    if isinstance(copied, GeoSeries):
+        copied = snapped.to_frame("geometry")
+    else:
+        copied.geometry = snapped
 
     if distance_col:
         copied[distance_col] = copied.distance(points)
@@ -111,6 +128,8 @@ def snap_all(
     to: GeoDataFrame | GeoSeries,
     *,
     distance_col: str | None = None,
+    n_jobs: int = 1,
+    rtree_runner: RTreeQueryRunner | None = None,
 ) -> GeoDataFrame | GeoSeries:
     """Snaps points to the nearest geometry.
 
@@ -121,6 +140,9 @@ def snap_all(
         points: The GeoDataFrame of points to snap.
         to: The GeoDataFrame to snap to.
         distance_col: Name of column with the snap distance. Defaults to None.
+        n_jobs: Number of workers.
+        rtree_runner: Optionally debug/manipulate the spatial indexing operations.
+            See the 'runners' module for example implementations.
 
     Returns:
         A GeoDataFrame or GeoSeries with the points snapped to the nearest point in the
@@ -159,30 +181,15 @@ def snap_all(
     0  POINT (2.00000 2.00000)       2.828427
     1  POINT (2.00000 2.00000)       1.414214
     """
-    to = _polygons_to_rings(to)
-
-    if not isinstance(points, GeoDataFrame):
-        return _shapely_snap(
-            points=points,
-            to=to,
-            max_distance=None,
-        )
-
-    copied = points.copy()
-
-    copied.geometry = _shapely_snap(
-        points=copied.geometry.values,
-        to=to,
+    return snap_within_distance(
+        points,
+        to,
         max_distance=None,
+        distance_col=distance_col,
+        rtree_runner=rtree_runner,
+        n_jobs=n_jobs,
     )
 
-    if distance_col:
-        copied[distance_col] = copied.distance(points)
-        copied[distance_col] = np.where(
-            copied[distance_col] == 0, pd.NA, copied[distance_col]
-        )
-    return copied
-
 
 def _polygons_to_rings(gdf: GeoDataFrame) -> GeoDataFrame:
     if get_geom_type(gdf) == "polygon":
@@ -197,17 +204,19 @@ def _polygons_to_rings(gdf: GeoDataFrame) -> GeoDataFrame:
 
 def _shapely_snap(
     points: np.ndarray | GeoSeries,
-    to: GeoSeries | GeoDataFrame,
+    to: np.ndarray | GeoSeries,
+    *,
+    rtree_runner: RTreeQueryRunner | None,
+    n_jobs: int,
     max_distance: int | float | None = None,
 ) -> GeoSeries:
-    try:
-        unioned = union_all(to.geometry.values)
-    except AttributeError:
-        unioned = union_all(to)
+    if rtree_runner is None:
+        rtree_runner = _get_instance(config, "rtree_runner", n_jobs=n_jobs)
 
-    nearest = nearest_points(points, unioned)[1]
+    nearest_indices = rtree_runner.run(points, to, method="nearest")
+    nearest = nearest_points(points, to[nearest_indices])[1]
 
-    if not max_distance:
+    if max_distance is None:
         return nearest
 
     distances = distance(points, nearest)
@@ -219,6 +228,6 @@ def _shapely_snap(
     )
 
     if isinstance(points, GeoSeries):
-        return GeoSeries(points, crs=points.crs, index=points.index, name=points.name)
+        return GeoSeries(snapped, crs=points.crs, index=points.index, name=points.name)
 
     return points.__class__(snapped)

sgis/geopandas_tools/runners.py

@@ -177,10 +177,16 @@ def _strtree_query(
 ):
     tree = STRtree(arr2)
     func = getattr(tree, method)
-    left, right = func(arr1, **kwargs)
+    results = func(arr1, **kwargs)
+    if results.ndim == 2:
+        left, right = results
+    else:
+        left = results
     if indices1 is not None:
         index_mapper1 = {i: x for i, x in enumerate(indices1)}
         left = np.array([index_mapper1[i] for i in left])
+    if results.ndim == 1:
+        return left
     if indices2 is not None:
         index_mapper2 = {i: x for i, x in enumerate(indices2)}
         right = np.array([index_mapper2[i] for i in right])
@@ -228,6 +234,11 @@ class RTreeQueryRunner(AbstractRunner):
                     )
                     for chunk in chunks
                 )
+            results = np.concatenate(results)
+            if results.ndim == 2:
+                left, right = results
+                return left, right
+            return results
             left = np.concatenate([x[0] for x in results])
             right = np.concatenate([x[1] for x in results])
             return left, right
@@ -248,6 +259,11 @@ class RTreeQueryRunner(AbstractRunner):
                     )
                     for chunk in chunks
                 )
+            results = np.concatenate(results)
+            if results.ndim == 2:
+                left, right = results
+                return left, right
+            return results
             left = np.concatenate([x[0] for x in results])
             right = np.concatenate([x[1] for x in results])
             return left, right

sgis/networkanalysis/_od_cost_matrix.py

@@ -1,10 +1,12 @@
+from collections.abc import Iterable
+
 import geopandas as gpd
 import numpy as np
 import pandas as pd
+import shapely
 from geopandas import GeoDataFrame
 from igraph import Graph
 from pandas import DataFrame
-from shapely import shortest_line
 
 
 def _od_cost_matrix(
@@ -32,82 +34,43 @@ def _od_cost_matrix(
         )
         results = rowwise_df.merge(results, on=["origin", "destination"], how="left")
 
-    results["wkt_ori"] = results["origin"].map(origins.geometry)
-    results["wkt_des"] = results["destination"].map(destinations.geometry)
-
-    results.loc[results.wkt_ori == results.wkt_des, weight] = 0
+    results["geom_ori"] = results["origin"].map(origins.geometry)
+    results["geom_des"] = results["destination"].map(destinations.geometry)
 
     # straight lines between origin and destination
     if lines:
-        results["geometry"] = shortest_line(results["wkt_ori"], results["wkt_des"])
+        results["geometry"] = shapely.shortest_line(
+            results["geom_ori"], results["geom_des"]
+        )
         results = gpd.GeoDataFrame(results, geometry="geometry", crs=25833)
 
-    results = results.drop(["wkt_ori", "wkt_des"], axis=1, errors="ignore")
+    results.loc[
+        shapely.to_wkb(results["geom_ori"]) == shapely.to_wkb(results["geom_des"]),
+        weight,
+    ] = 0
 
-    return results.reset_index(drop=True)
+    return results.drop(["geom_ori", "geom_des"], axis=1, errors="ignore").reset_index(
+        drop=True
+    )
 
 
 def _get_od_df(
-    graph: Graph, origins: GeoDataFrame, destinations: GeoDataFrame, weight_col: str
+    graph: Graph, origins: Iterable[str], destinations: Iterable[str], weight_col: str
 ) -> pd.DataFrame:
     distances: list[list[float]] = graph.distances(
         weights="weight",
         source=origins,
         target=destinations,
+        algorithm="dijkstra",
     )
 
-    ori_idx, des_idx, costs = [], [], []
-    for i, f_idx in enumerate(origins):
-        for j, t_idx in enumerate(destinations):
-            ori_idx.append(f_idx)
-            des_idx.append(t_idx)
-            costs.append(distances[i][j])
-
-    return (
-        pd.DataFrame(
-            data={"origin": ori_idx, "destination": des_idx, weight_col: costs}
-        )
-        .replace([np.inf, -np.inf], np.nan)
-        .reset_index(drop=True)
+    costs = np.array(
+        [distances[i][j] for j in range(len(destinations)) for i in range(len(origins))]
     )
+    costs[(costs == np.inf) | (costs == -np.inf)] = np.nan
+    ori_idx = np.array([x for _ in range(len(destinations)) for x in origins])
+    des_idx = np.array([x for x in destinations for _ in range(len(origins))])
 
-
-def _get_one_od_df(
-    graph: Graph, origins: GeoDataFrame, destinations: GeoDataFrame, weight_col: str
-) -> pd.DataFrame:
-    distances: list[list[float]] = graph.distances(
-        weights="weight",
-        source=origins,
-        target=destinations,
+    return pd.DataFrame(
+        data={"origin": ori_idx, "destination": des_idx, weight_col: costs}
     )
-
-    ori_idx, des_idx, costs = [], [], []
-    for i, f_idx in enumerate(origins):
-        for j, t_idx in enumerate(destinations):
-            ori_idx.append(f_idx)
-            des_idx.append(t_idx)
-            costs.append(distances[i][j])
-
-    return (
-        pd.DataFrame(
-            data={"origin": ori_idx, "destination": des_idx, weight_col: costs}
-        )
-        .replace([np.inf, -np.inf], np.nan)
-        .reset_index(drop=True)
-    )
-
-
-# def _get_od_df(
-#     graph: Graph,
-#     origins: GeoDataFrame,
-#     destinations: GeoDataFrame,
-#     weight_col: str,
-# ) -> pd.DataFrame:
-#     from ..parallel.parallel import Parallel
-
-#     results: list[pd.DataFrame] = Parallel(40, backend="loky").map(
-#         _get_one_od_df,
-#         [origins[origins.index == i] for i in origins.index.unique()],
-#         kwargs=dict(graph=graph, destinations=destinations, weight_col=weight_col),
-#     )
-#     return pd.concat(results, ignore_index=True)

sgis/networkanalysis/networkanalysis.py

@@ -1396,8 +1396,6 @@ class NetworkAnalysis:
                 directed=self.rules.directed,
             )
 
-            self._add_missing_vertices()
-
             self._graph_updated_count += 1
 
         self._update_wkts()
@@ -1438,6 +1436,7 @@ class NetworkAnalysis:
         weights = weights + weights_start
 
         if self.destinations is None:
+            edges, weights = self._add_fake_edges(edges, weights)
             edge_ids = self.network._create_edge_ids(edges, weights)
             return edges, weights, edge_ids
 
@@ -1450,10 +1449,29 @@ class NetworkAnalysis:
         edges = edges + edges_end
         weights = weights + weights_end
 
+        edges, weights = self._add_fake_edges(edges, weights)
         edge_ids = self.network._create_edge_ids(edges, weights)
 
         return edges, weights, edge_ids
 
+    def _add_fake_edges(self, edges, weights):
+        """Add edges for origins and destinations to not get error in igraph because of non-existing nodes."""
+        nodes = {x[0] for x in edges} | {x[1] for x in edges}
+
+        fake_edges = [
+            (idx, idx)
+            for idx in list(self.origins.gdf["temp_idx"])
+            + list(
+                self.destinations.gdf["temp_idx"]
+                if self.destinations is not None
+                else []
+            )
+            if idx not in nodes
+        ]
+        edges = edges + fake_edges
+        weights = weights + [0 for _ in fake_edges]
+        return edges, weights
+
     def _split_lines(self) -> None:
         if self.destinations is not None:
             points = pd.concat(
@@ -1497,31 +1515,6 @@ class NetworkAnalysis:
         ).drop("temp_idx__", axis=1)
         del self.network._not_splitted
 
-    def _add_missing_vertices(self):
-        """Adds the missing points.
-
-        Nodes that had no nodes within the search_tolerance are added to the graph.
-        To not get an error when running the distance calculation.
-        """
-        # TODO: either check if any() beforehand, or add fictional edges before
-        # making the graph, to make things faster
-        # (this method took 64.660 out of 500 seconds)
-        self.graph.add_vertices(
-            [
-                idx
-                for idx in self.origins.gdf["temp_idx"]
-                if idx not in self.graph.vs["name"]
-            ]
-        )
-        if self.destinations is not None:
-            self.graph.add_vertices(
-                [
-                    idx
-                    for idx in self.destinations.gdf["temp_idx"]
-                    if idx not in self.graph.vs["name"]
-                ]
-            )
-
     @staticmethod
     def _make_graph(
         edges: list[tuple[str, ...]] | np.ndarray[tuple[str, ...]],
@@ -1530,10 +1523,8 @@ class NetworkAnalysis:
         directed: bool,
     ) -> Graph:
         """Creates an igraph Graph from a list of edges and weights."""
-        assert len(edges) == len(weights)
-
+        assert len(edges) == len(weights) == len(edge_ids)
         graph = igraph.Graph.TupleList(edges, directed=directed)
-
         graph.es["weight"] = weights
         graph.es["src_tgt_wt"] = edge_ids
         graph.es["edge_tuples"] = edges

{ssb_sgis-1.3.5.dist-info → ssb_sgis-1.3.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ssb-sgis
-Version: 1.3.5
+Version: 1.3.6
 Summary: GIS functions used at Statistics Norway.
 Home-page: https://github.com/statisticsnorway/ssb-sgis
 License: MIT

{ssb_sgis-1.3.5.dist-info → ssb_sgis-1.3.6.dist-info}/RECORD

@@ -7,17 +7,17 @@ sgis/geopandas_tools/bounds.py,sha256=Os9o4EZ1ax38reW-9cdJzgKHoX2il9lUEIZ7wc5CpB
 sgis/geopandas_tools/buffer_dissolve_explode.py,sha256=z9HvakazR_prXH862e8-gEe7UFbeI4rRTbUaBgPeMBk,19552
 sgis/geopandas_tools/centerlines.py,sha256=Q65Sx01SeAlulBEd9oaZkB2maBBNdLcJwAbTILg4SPU,11848
 sgis/geopandas_tools/cleaning.py,sha256=fST0xFztmyn-QUOAfvjZmu7aO_zPiolWK7gd7TR6ffI,24393
-sgis/geopandas_tools/conversion.py,sha256=iX954YEpobmn_R1Ecx_zDU1RlWq_67pfbzMXtwTH04I,24162
-sgis/geopandas_tools/duplicates.py,sha256=TDDM4u1n7SIkyJrOfl1Lno92AmUPqtXBHsj1IUKC0hI,14992
-sgis/geopandas_tools/general.py,sha256=DTQM8p-krgR3gA3miP931eCrxDCpF1ya7dRiMy3K_bs,44099
+sgis/geopandas_tools/conversion.py,sha256=viZz9t1Gi-8nJ9GwZlCVvObXO52VTODkTZ_F3b0gLek,24183
+sgis/geopandas_tools/duplicates.py,sha256=AU8J2X3sUuohRDsQOc9TA5K0k2KHDlGLbvb6eMSQvvc,15893
+sgis/geopandas_tools/general.py,sha256=B4houRK2zDrlarhihQs4w6ITfh6UZHhUciB120bbniI,44447
 sgis/geopandas_tools/geocoding.py,sha256=sZjUW52ULhQWDLmU51C9_itBePkDuWkp8swvYaiYmJk,679
 sgis/geopandas_tools/geometry_types.py,sha256=ijQDbQaZPqPGjBl707H4yooNXpk21RXyatI7itnvqLk,7603
 sgis/geopandas_tools/neighbors.py,sha256=VZGOwwC3-C6KpwLQ3j0K5cOVInmckxIXoGMqPGkemk4,17606
 sgis/geopandas_tools/overlay.py,sha256=uR9troLM9amo-z5Bs6jhPtFbr0RrDFsW-WJpeuQ4WSQ,23522
-sgis/geopandas_tools/point_operations.py,sha256=JM4hvfIVxZaZdGNlGzcCurrKzkgC_b9hzbFYN42f9WY,6972
+sgis/geopandas_tools/point_operations.py,sha256=R_39MoMIMsTB0mxmWibZxfUoUZUriuOoxjMNC8mFCds,7624
 sgis/geopandas_tools/polygon_operations.py,sha256=v-B9IgbFfm4dVHKPyzvmnNiqVCdtl9ddpCsQpZZ-9sU,49284
 sgis/geopandas_tools/polygons_as_rings.py,sha256=BX_GZS6F9I4NbEpiOlNBd7zywJjdfdJVi_MkeONBuiM,14941
-sgis/geopandas_tools/runners.py,sha256=J4lH0RXYDYTLVeQFgNv8gEY0E97QGIQ4zPW5vfoxgDU,12979
+sgis/geopandas_tools/runners.py,sha256=ZVJnUoJAgc0K_UNIIBOwUWaQDCKCzebygGMu2Fdw6LA,13470
 sgis/geopandas_tools/sfilter.py,sha256=CZ_-c4t1CQCwJ7RHCKo1Na9u-aAg18xXnJAMiUqoaj8,10411
 sgis/geopandas_tools/utils.py,sha256=X0pRvB1tWgV_0BCrRS1HU9LtLGnZCpvVPxyqM9JGb0Y,1415
 sgis/helpers.py,sha256=4N6vFWQ3TYVzRHNcWY_fNa_GkFuaZB3vtCkkFND-qs0,9628
@@ -39,7 +39,7 @@ sgis/maps/tilesources.py,sha256=F4mFHxPwkiPJdVKzNkScTX6xbJAMIUtlTq4mQ83oguw,1746
 sgis/maps/wms.py,sha256=sCVpKxH1Rsd14GECW7BFh8yaWngpVWYvw9Yhuez1yW8,12482
 sgis/networkanalysis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sgis/networkanalysis/_get_route.py,sha256=3m5xQdQqGtt51vcI5fcmYQAOQCeBtL6sorDoPxBNf84,7818
-sgis/networkanalysis/_od_cost_matrix.py,sha256=zkyPX7ObT996ahaFJ2oI0D0SqQWbWyfy_qLtXwValPg,3434
+sgis/networkanalysis/_od_cost_matrix.py,sha256=u2UtgZ0GvvCE1PNvKpB3lM35RCcFKXqtC3NLYWX_jmA,2348
 sgis/networkanalysis/_points.py,sha256=128QEepBGAyI5XakMUVvNyOnJE0Ts7hvGiVUt1YTXiU,4439
 sgis/networkanalysis/_service_area.py,sha256=-xSdiZrZ3uqAhd4ZaBY8a8fMJjN09MPoYxlVMXm3UZk,5642
 sgis/networkanalysis/closing_network_holes.py,sha256=FYZ677nRwLmDkP6bQ1ssQ_h29RzAG463U4xmbu5ksfg,14572
@@ -47,7 +47,7 @@ sgis/networkanalysis/cutting_lines.py,sha256=ZQAt0cufaPeNAEqUzp-imu26AIL9S5-lw6X
 sgis/networkanalysis/directednetwork.py,sha256=Mrc2zHip4P5RNxnyffKm-xU832AVQeSHz-YZueAc0pM,11413
 sgis/networkanalysis/finding_isolated_networks.py,sha256=Wg4ILhm7uS9RLOGcL0WN8uZBMJYjdljJc8L5DU5nIPY,3754
 sgis/networkanalysis/network.py,sha256=zV9bAbVdTgTohg2o2RFGy2uhOJrd3Ma57hwIAStxMAQ,7847
-sgis/networkanalysis/networkanalysis.py,sha256=P2kqE1kBxabBnv4h6ort1IiO4W0XlsJn5DrT7IbeG5w,68651
+sgis/networkanalysis/networkanalysis.py,sha256=5LFCapexrkO97ZyAV2-0lwEPHfVQrdQ4Q1A2eRQBOVo,68498
 sgis/networkanalysis/networkanalysisrules.py,sha256=na26iZTpnlwwIEEGswoqMH4W1ZOLN2GIvACZbxn8GPw,12958
 sgis/networkanalysis/nodes.py,sha256=atFSpqz-_uJHMrf6MC0zhrrcWIydRMFZrsaHC2xr1GU,3374
 sgis/networkanalysis/traveling_salesman.py,sha256=Jjo6bHY4KJ-eK0LycyTy0sWxZjgITs5MBllZ_G9FhTE,5655
@@ -61,7 +61,7 @@ sgis/raster/indices.py,sha256=efJmgfPg_VuSzXFosXV661IendF8CwPFWtMhyP4TMUg,222
 sgis/raster/regex.py,sha256=4idTJ9vFtsGtbxcjJrx2VrpJJuDMP3bLdqF93Vc_cmY,3752
 sgis/raster/sentinel_config.py,sha256=nySDqn2R8M6W8jguoBeSAK_zzbAsqmaI59i32446FwY,1268
 sgis/raster/zonal.py,sha256=D4Gyptw-yOLTCO41peIuYbY-DANsJCG19xXDlf1QAz4,2299
-ssb_sgis-1.3.5.dist-info/LICENSE,sha256=np3IfD5m0ZUofn_kVzDZqliozuiO6wrktw3LRPjyEiI,1073
-ssb_sgis-1.3.5.dist-info/METADATA,sha256=TbqucBYChWXB_Xw2eFf9PZwQoguEWeKGav18lFbhUfI,11495
-ssb_sgis-1.3.5.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-ssb_sgis-1.3.5.dist-info/RECORD,,
+ssb_sgis-1.3.6.dist-info/LICENSE,sha256=np3IfD5m0ZUofn_kVzDZqliozuiO6wrktw3LRPjyEiI,1073
+ssb_sgis-1.3.6.dist-info/METADATA,sha256=M-4XAxb5WFhaHhbzq4IIb2oE0Ww8gNhbJSqFKjoPnSs,11495
+ssb_sgis-1.3.6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+ssb_sgis-1.3.6.dist-info/RECORD,,