ObjectNat 1.3.2__tar.gz → 1.3.3__tar.gz

{objectnat-1.3.2 → objectnat-1.3.3}/PKG-INFO

@@ -1,8 +1,9 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: ObjectNat
-Version: 1.3.2
+Version: 1.3.3
 Summary: ObjectNat is an open-source library created for geospatial analysis created by IDU team
 License: BSD-3-Clause
+License-File: LICENSE.txt
 Author: DDonnyy
 Author-email: 63115678+DDonnyy@users.noreply.github.com
 Requires-Python: >=3.11,<3.13

{objectnat-1.3.2 → objectnat-1.3.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ObjectNat"
-version = "1.3.2"
+version = "1.3.3"
 description = "ObjectNat is an open-source library created for geospatial analysis created by IDU team"
 license = "BSD-3-Clause"
 authors = ["DDonnyy <63115678+DDonnyy@users.noreply.github.com>"]

{objectnat-1.3.2 → objectnat-1.3.3}/src/objectnat/_api.py

@@ -1,14 +1,14 @@
-# pylint: disable=unused-import,wildcard-import,unused-wildcard-import
-
-from .methods.coverage_zones import get_graph_coverage, get_radius_coverage, get_stepped_graph_coverage
-from .methods.isochrones import get_accessibility_isochrone_stepped, get_accessibility_isochrones
-from .methods.noise import calculate_simplified_noise_frame, simulate_noise
-from .methods.point_clustering import get_clusters_polygon
-from .methods.provision import clip_provision, get_service_provision, recalculate_links
-from .methods.utils import gdf_to_graph, graph_to_gdf
-from .methods.visibility import (
-    calculate_visibility_catchment_area,
-    get_visibilities_from_points,
-    get_visibility,
-    get_visibility_accurate,
-)
+# pylint: disable=unused-import,wildcard-import,unused-wildcard-import
+
+from .methods.coverage_zones import get_graph_coverage, get_radius_coverage, get_stepped_graph_coverage
+from .methods.isochrones import get_accessibility_isochrone_stepped, get_accessibility_isochrones
+from .methods.noise import calculate_simplified_noise_frame, simulate_noise
+from .methods.point_clustering import get_clusters_polygon
+from .methods.provision import clip_provision, get_service_provision, recalculate_links
+from .methods.utils import gdf_to_graph, graph_to_gdf
+from .methods.visibility import (
+    calculate_visibility_catchment_area,
+    get_visibilities_from_points,
+    get_visibility,
+    get_visibility_accurate,
+)

objectnat-1.3.3/src/objectnat/_version.py

@@ -0,0 +1 @@
+VERSION = "1.3.3"

{objectnat-1.3.2 → objectnat-1.3.3}/src/objectnat/methods/coverage_zones/__init__.py

@@ -1,3 +1,3 @@
-from .graph_coverage import get_graph_coverage
-from .radius_voronoi_coverage import get_radius_coverage
-from .stepped_coverage import get_stepped_graph_coverage
+from .graph_coverage import get_graph_coverage
+from .radius_voronoi_coverage import get_radius_coverage
+from .stepped_coverage import get_stepped_graph_coverage

{objectnat-1.3.2 → objectnat-1.3.3}/src/objectnat/methods/isochrones/__init__.py

@@ -1 +1 @@
-from .isochrones import get_accessibility_isochrones, get_accessibility_isochrone_stepped
+from .isochrones import get_accessibility_isochrones, get_accessibility_isochrone_stepped

{objectnat-1.3.2 → objectnat-1.3.3}/src/objectnat/methods/isochrones/isochrone_utils.py

@@ -1,167 +1,167 @@
-from typing import Literal
-
-import geopandas as gpd
-import networkx as nx
-import numpy as np
-import pandas as pd
-from pyproj.exceptions import CRSError
-from shapely.ops import polygonize
-
-from objectnat import config
-from objectnat.methods.utils.geom_utils import polygons_to_multilinestring
-from objectnat.methods.utils.graph_utils import get_closest_nodes_from_gdf, remove_weakly_connected_nodes
-
-logger = config.logger
-
-
-def _validate_inputs(
-    points: gpd.GeoDataFrame, weight_value: float, weight_type: Literal["time_min", "length_meter"], nx_graph: nx.Graph
-) -> tuple[str, str]:
-    """Validate common inputs for accessibility functions."""
-    if weight_value <= 0:
-        raise ValueError("Weight value must be greater than 0")
-    if weight_type not in ["time_min", "length_meter"]:
-        raise UserWarning("Weight type should be either 'time_min' or 'length_meter'")
-
-    try:
-        local_crs = nx_graph.graph["crs"]
-    except KeyError as exc:
-        raise ValueError("Graph does not have crs attribute") from exc
-    try:
-        graph_type = nx_graph.graph["type"]
-    except KeyError as exc:
-        raise ValueError("Graph does not have type attribute") from exc
-
-    try:
-        points.to_crs(local_crs, inplace=True)
-    except CRSError as e:
-        raise CRSError(f"Graph crs ({local_crs}) has invalid format.") from e
-
-    return local_crs, graph_type
-
-
-def _prepare_graph_and_nodes(
-    points: gpd.GeoDataFrame, nx_graph: nx.Graph, graph_type: str, weight_type: str, weight_value: float
-) -> tuple[nx.Graph, gpd.GeoDataFrame, pd.DataFrame, float]:
-    """Prepare graph and calculate nearest nodes with distances."""
-    nx_graph = remove_weakly_connected_nodes(nx_graph)
-    distances, nearest_nodes = get_closest_nodes_from_gdf(points, nx_graph)
-    points["nearest_node"] = nearest_nodes
-
-    dist_nearest = pd.DataFrame(data=distances, index=nearest_nodes, columns=["dist"]).drop_duplicates()
-
-    # Calculate speed adjustment if needed
-    speed = 0
-    if graph_type in ["walk", "intermodal"] and weight_type == "time_min":
-        try:
-            speed = nx_graph.graph["walk_speed"]
-        except KeyError:
-            logger.warning("There is no walk_speed in graph, set to the default speed - 83.33 m/min")
-            speed = 83.33
-        dist_nearest = dist_nearest / speed
-    elif weight_type == "time_min":
-        speed = 20 * 1000 / 60
-        dist_nearest = dist_nearest / speed
-
-    if (dist_nearest > weight_value).all().all():
-        raise RuntimeError(
-            "The point(s) lie further from the graph than weight_value, it's impossible to "
-            "construct isochrones. Check the coordinates of the point(s)/their projection"
-        )
-
-    return nx_graph, points, dist_nearest, speed
-
-
-def _process_pt_data(
-    nodes: gpd.GeoDataFrame, edges: gpd.GeoDataFrame, graph_type: str
-) -> tuple[gpd.GeoDataFrame, gpd.GeoDataFrame] | tuple[None, None]:
-    """Process public transport data if available."""
-    if "type" in nodes.columns and "platform" in nodes["type"].unique():
-        pt_nodes = nodes[(nodes["type"] != "platform") & (~nodes["type"].isna())]
-        if graph_type == "intermodal":
-            edges = edges[~edges["type"].isin(["walk", "boarding"])]
-        pt_nodes = pt_nodes[["type", "route", "geometry"]]
-        edges = edges[["type", "route", "geometry"]]
-        return pt_nodes, edges
-    return None, None
-
-
-def _calculate_distance_matrix(
-    nx_graph: nx.Graph,
-    nearest_nodes: np.ndarray,
-    weight_type: str,
-    weight_value: float,
-    dist_nearest: pd.DataFrame,
-) -> tuple[pd.DataFrame, nx.Graph]:
-    """Calculate distance matrix from nearest nodes."""
-
-    data = {}
-    for source in nearest_nodes:
-        dist = nx.single_source_dijkstra_path_length(nx_graph, source, weight=weight_type, cutoff=weight_value)
-        data.update({source: dist})
-
-    dist_matrix = pd.DataFrame.from_dict(data, orient="index")
-    dist_matrix = dist_matrix.add(dist_nearest.dist, axis=0)
-    dist_matrix = dist_matrix.mask(dist_matrix > weight_value, np.nan)
-    dist_matrix.dropna(how="all", inplace=True)
-    dist_matrix.dropna(how="all", axis=1, inplace=True)
-
-    subgraph = nx_graph.subgraph(dist_matrix.columns.to_list())
-
-    return dist_matrix, subgraph
-
-
-def _create_isochrones_gdf(
-    points: gpd.GeoDataFrame,
-    results: list,
-    dist_matrix: pd.DataFrame,
-    local_crs: str,
-    weight_type: str,
-    weight_value: float,
-) -> gpd.GeoDataFrame:
-    """Create final isochrones GeoDataFrame."""
-    isochrones = gpd.GeoDataFrame(geometry=results, index=dist_matrix.index, crs=local_crs)
-    isochrones = (
-        points.drop(columns="geometry")
-        .merge(isochrones, left_on="nearest_node", right_index=True, how="left")
-        .drop(columns="nearest_node")
-    )
-    isochrones = gpd.GeoDataFrame(isochrones, geometry="geometry", crs=local_crs)
-    isochrones["weight_type"] = weight_type
-    isochrones["weight_value"] = weight_value
-    return isochrones
-
-
-def create_separated_dist_polygons(
-    points: gpd.GeoDataFrame, weight_value, weight_type, step, speed
-) -> gpd.GeoDataFrame:
-    points["dist"] = points["dist"].clip(lower=0.1)
-    steps = np.arange(0, weight_value + step, step)
-    if steps[-1] > weight_value:
-        steps[-1] = weight_value  # Ensure last step doesn't exceed weight_value
-    for i in range(len(steps) - 1):
-        min_dist = steps[i]
-        max_dist = steps[i + 1]
-        nodes_in_step = points["dist"].between(min_dist, max_dist, inclusive="left")
-        nodes_in_step = nodes_in_step[nodes_in_step].index
-        if not nodes_in_step.empty:
-            buffer_size = (max_dist - points.loc[nodes_in_step, "dist"]) * 0.7
-            if weight_type == "time_min":
-                buffer_size = buffer_size * speed
-            points.loc[nodes_in_step, "buffer_size"] = buffer_size
-    points.geometry = points.geometry.buffer(points["buffer_size"])
-    points["dist"] = np.minimum(np.ceil(points["dist"] / step) * step, weight_value)
-    points = points.dissolve(by="dist", as_index=False)
-    polygons = gpd.GeoDataFrame(
-        geometry=list(polygonize(points.geometry.apply(polygons_to_multilinestring).union_all())),
-        crs=points.crs,
-    )
-    polygons_points = polygons.copy()
-    polygons_points.geometry = polygons.representative_point()
-    stepped_polygons = polygons_points.sjoin(points, predicate="within").reset_index()
-    stepped_polygons = stepped_polygons.groupby("index").agg({"dist": "mean"})
-    stepped_polygons["dist"] = np.minimum(np.floor(stepped_polygons["dist"] / step) * step, weight_value)
-    stepped_polygons["geometry"] = polygons
-    stepped_polygons = gpd.GeoDataFrame(stepped_polygons, geometry="geometry", crs=points.crs).reset_index(drop=True)
-    stepped_polygons = stepped_polygons.dissolve(by="dist", as_index=False).explode(ignore_index=True)
-    return stepped_polygons
+from typing import Literal
+
+import geopandas as gpd
+import networkx as nx
+import numpy as np
+import pandas as pd
+from pyproj.exceptions import CRSError
+from shapely.ops import polygonize
+
+from objectnat import config
+from objectnat.methods.utils.geom_utils import polygons_to_multilinestring
+from objectnat.methods.utils.graph_utils import get_closest_nodes_from_gdf, remove_weakly_connected_nodes
+
+logger = config.logger
+
+
+def _validate_inputs(
+    points: gpd.GeoDataFrame, weight_value: float, weight_type: Literal["time_min", "length_meter"], nx_graph: nx.Graph
+) -> tuple[str, str]:
+    """Validate common inputs for accessibility functions."""
+    if weight_value <= 0:
+        raise ValueError("Weight value must be greater than 0")
+    if weight_type not in ["time_min", "length_meter"]:
+        raise UserWarning("Weight type should be either 'time_min' or 'length_meter'")
+
+    try:
+        local_crs = nx_graph.graph["crs"]
+    except KeyError as exc:
+        raise ValueError("Graph does not have crs attribute") from exc
+    try:
+        graph_type = nx_graph.graph["type"]
+    except KeyError as exc:
+        raise ValueError("Graph does not have type attribute") from exc
+
+    try:
+        points.to_crs(local_crs, inplace=True)
+    except CRSError as e:
+        raise CRSError(f"Graph crs ({local_crs}) has invalid format.") from e
+
+    return local_crs, graph_type
+
+
+def _prepare_graph_and_nodes(
+    points: gpd.GeoDataFrame, nx_graph: nx.Graph, graph_type: str, weight_type: str, weight_value: float
+) -> tuple[nx.Graph, gpd.GeoDataFrame, pd.DataFrame, float]:
+    """Prepare graph and calculate nearest nodes with distances."""
+    nx_graph = remove_weakly_connected_nodes(nx_graph)
+    distances, nearest_nodes = get_closest_nodes_from_gdf(points, nx_graph)
+    points["nearest_node"] = nearest_nodes
+
+    dist_nearest = pd.DataFrame(data=distances, index=nearest_nodes, columns=["dist"]).drop_duplicates()
+
+    # Calculate speed adjustment if needed
+    speed = 0
+    if graph_type in ["walk", "intermodal"] and weight_type == "time_min":
+        try:
+            speed = nx_graph.graph["walk_speed"]
+        except KeyError:
+            logger.warning("There is no walk_speed in graph, set to the default speed - 83.33 m/min")
+            speed = 83.33
+        dist_nearest = dist_nearest / speed
+    elif weight_type == "time_min":
+        speed = 20 * 1000 / 60
+        dist_nearest = dist_nearest / speed
+
+    if (dist_nearest > weight_value).all().all():
+        raise RuntimeError(
+            "The point(s) lie further from the graph than weight_value, it's impossible to "
+            "construct isochrones. Check the coordinates of the point(s)/their projection"
+        )
+
+    return nx_graph, points, dist_nearest, speed
+
+
+def _process_pt_data(
+    nodes: gpd.GeoDataFrame, edges: gpd.GeoDataFrame, graph_type: str
+) -> tuple[gpd.GeoDataFrame, gpd.GeoDataFrame] | tuple[None, None]:
+    """Process public transport data if available."""
+    if "type" in nodes.columns and "platform" in nodes["type"].unique():
+        pt_nodes = nodes[(nodes["type"] != "platform") & (~nodes["type"].isna())]
+        if graph_type == "intermodal":
+            edges = edges[~edges["type"].isin(["walk", "boarding"])]
+        pt_nodes = pt_nodes[["type", "route", "geometry"]]
+        edges = edges[["type", "route", "geometry"]]
+        return pt_nodes, edges
+    return None, None
+
+
+def _calculate_distance_matrix(
+    nx_graph: nx.Graph,
+    nearest_nodes: np.ndarray,
+    weight_type: str,
+    weight_value: float,
+    dist_nearest: pd.DataFrame,
+) -> tuple[pd.DataFrame, nx.Graph]:
+    """Calculate distance matrix from nearest nodes."""
+
+    data = {}
+    for source in nearest_nodes:
+        dist = nx.single_source_dijkstra_path_length(nx_graph, source, weight=weight_type, cutoff=weight_value)
+        data.update({source: dist})
+
+    dist_matrix = pd.DataFrame.from_dict(data, orient="index")
+    dist_matrix = dist_matrix.add(dist_nearest.dist, axis=0)
+    dist_matrix = dist_matrix.mask(dist_matrix > weight_value, np.nan)
+    dist_matrix.dropna(how="all", inplace=True)
+    dist_matrix.dropna(how="all", axis=1, inplace=True)
+
+    subgraph = nx_graph.subgraph(dist_matrix.columns.to_list())
+
+    return dist_matrix, subgraph
+
+
+def _create_isochrones_gdf(
+    points: gpd.GeoDataFrame,
+    results: list,
+    dist_matrix: pd.DataFrame,
+    local_crs: str,
+    weight_type: str,
+    weight_value: float,
+) -> gpd.GeoDataFrame:
+    """Create final isochrones GeoDataFrame."""
+    isochrones = gpd.GeoDataFrame(geometry=results, index=dist_matrix.index, crs=local_crs)
+    isochrones = (
+        points.drop(columns="geometry")
+        .merge(isochrones, left_on="nearest_node", right_index=True, how="left")
+        .drop(columns="nearest_node")
+    )
+    isochrones = gpd.GeoDataFrame(isochrones, geometry="geometry", crs=local_crs)
+    isochrones["weight_type"] = weight_type
+    isochrones["weight_value"] = weight_value
+    return isochrones
+
+
+def create_separated_dist_polygons(
+    points: gpd.GeoDataFrame, weight_value, weight_type, step, speed
+) -> gpd.GeoDataFrame:
+    points["dist"] = points["dist"].clip(lower=0.1)
+    steps = np.arange(0, weight_value + step, step)
+    if steps[-1] > weight_value:
+        steps[-1] = weight_value  # Ensure last step doesn't exceed weight_value
+    for i in range(len(steps) - 1):
+        min_dist = steps[i]
+        max_dist = steps[i + 1]
+        nodes_in_step = points["dist"].between(min_dist, max_dist, inclusive="left")
+        nodes_in_step = nodes_in_step[nodes_in_step].index
+        if not nodes_in_step.empty:
+            buffer_size = (max_dist - points.loc[nodes_in_step, "dist"]) * 0.7
+            if weight_type == "time_min":
+                buffer_size = buffer_size * speed
+            points.loc[nodes_in_step, "buffer_size"] = buffer_size
+    points.geometry = points.geometry.buffer(points["buffer_size"])
+    points["dist"] = np.minimum(np.ceil(points["dist"] / step) * step, weight_value)
+    points = points.dissolve(by="dist", as_index=False)
+    polygons = gpd.GeoDataFrame(
+        geometry=list(polygonize(points.geometry.apply(polygons_to_multilinestring).union_all())),
+        crs=points.crs,
+    )
+    polygons_points = polygons.copy()
+    polygons_points.geometry = polygons.representative_point()
+    stepped_polygons = polygons_points.sjoin(points, predicate="within").reset_index()
+    stepped_polygons = stepped_polygons.groupby("index").agg({"dist": "mean"})
+    stepped_polygons["dist"] = np.minimum(np.floor(stepped_polygons["dist"] / step) * step, weight_value)
+    stepped_polygons["geometry"] = polygons
+    stepped_polygons = gpd.GeoDataFrame(stepped_polygons, geometry="geometry", crs=points.crs).reset_index(drop=True)
+    stepped_polygons = stepped_polygons.dissolve(by="dist", as_index=False).explode(ignore_index=True)
+    return stepped_polygons

{objectnat-1.3.2 → objectnat-1.3.3}/src/objectnat/methods/noise/__init__.py

@@ -1,3 +1,3 @@
-from .noise_simulation import simulate_noise
-from .noise_reduce import dist_to_target_db, green_noise_reduce_db
-from .noise_simulation_simplified import calculate_simplified_noise_frame
+from .noise_simulation import simulate_noise
+from .noise_reduce import dist_to_target_db, green_noise_reduce_db
+from .noise_simulation_simplified import calculate_simplified_noise_frame

{objectnat-1.3.2 → objectnat-1.3.3}/src/objectnat/methods/noise/noise_init_data.py

@@ -1,10 +1,10 @@
-import pandas as pd
-
-data = {
-    30: {63: 0, 125: 0.0002, 250: 0.0009, 500: 0.003, 1000: 0.0075, 2000: 0.014, 4000: 0.025, 8000: 0.064},
-    20: {63: 0, 125: 0.0003, 250: 0.0011, 500: 0.0028, 1000: 0.0052, 2000: 0.0096, 4000: 0.025, 8000: 0.083},
-    10: {63: 0, 125: 0.0004, 250: 0.001, 500: 0.002, 1000: 0.0039, 2000: 0.01, 4000: 0.035, 8000: 0.125},
-    0: {63: 0, 125: 0.0004, 250: 0.0008, 500: 0.0017, 1000: 0.0049, 2000: 0.017, 4000: 0.058, 8000: 0.156},
-}
-
-air_resist_ratio = pd.DataFrame(data)
+import pandas as pd
+
+data = {
+    30: {63: 0, 125: 0.0002, 250: 0.0009, 500: 0.003, 1000: 0.0075, 2000: 0.014, 4000: 0.025, 8000: 0.064},
+    20: {63: 0, 125: 0.0003, 250: 0.0011, 500: 0.0028, 1000: 0.0052, 2000: 0.0096, 4000: 0.025, 8000: 0.083},
+    10: {63: 0, 125: 0.0004, 250: 0.001, 500: 0.002, 1000: 0.0039, 2000: 0.01, 4000: 0.035, 8000: 0.125},
+    0: {63: 0, 125: 0.0004, 250: 0.0008, 500: 0.0017, 1000: 0.0049, 2000: 0.017, 4000: 0.058, 8000: 0.156},
+}
+
+air_resist_ratio = pd.DataFrame(data)