ObjectNat 2.0.0__tar.gz → 2.0.1__tar.gz

{objectnat-2.0.0 → objectnat-2.0.1}/PKG-INFO

@@ -1,7 +1,7 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: ObjectNat
-Version: 2.0.0
-Summary: ObjectNat is an open-source library created for geospatial analysis created by IDU team
+Version: 2.0.1
+Summary: ObjectNat is an open-source library for object-level geospatial analysis on city networks, developed by the IDU team.
 Author-email: DDonnyy <63115678+DDonnyy@users.noreply.github.com>
 License-Expression: BSD-3-Clause
 License-File: LICENSE.txt
@@ -33,8 +33,8 @@ Object-oriented Network Analysis Tools
    :target: https://github.com/IDUclub/ObjectNat/actions/workflows/quality.yml
    :alt: Tests and coverage
 
-.. |badge-codecov| image:: https://codecov.io/gh/IDUclub/ObjectNat/graph/badge.svg?token=K6JFSJ02GU
-   :target: https://codecov.io/gh/IDUclub/ObjectNat
+.. |badge-coverage| image:: https://raw.githubusercontent.com/IDUclub/ObjectNat/python-coverage-comment-action-data/badge.svg
+   :target: https://github.com/IDUclub/ObjectNat/tree/python-coverage-comment-action-data
    :alt: Coverage
 
 .. |badge-license| image:: https://img.shields.io/badge/license-BSD--3--Clause-blue.svg
@@ -45,7 +45,7 @@ Object-oriented Network Analysis Tools
    :target: https://iduclub.github.io/ObjectNat/
    :alt: Docs
 
-|badge-black| |badge-pypi| |badge-ci| |badge-codecov| |badge-license| |badge-docs|
+|badge-black| |badge-pypi| |badge-ci| |badge-coverage| |badge-license| |badge-docs|
 
 `РИДМИ (Russian) <https://github.com/IDUclub/ObjectNat/blob/master/README_RU.rst>`__
 
@@ -59,6 +59,7 @@ Object-oriented Network Analysis Tools
 for spatial and network analysis in urban studies.
 The library provides tools for analyzing **accessibility**, **visibility**,
 **noise propagation**, and **service provision**.
+
 ----
 
 Key Features
@@ -120,7 +121,7 @@ Each feature includes a **Jupyter Notebook example** and **full documentation**.
 
    📘 `Example <https://iduclub.github.io/ObjectNat/methods/examples/noise.html>`__
    🔗 `Documentation <https://iduclub.github.io/ObjectNat/methods/noise.html>`__
-   🧠 `Detailed theory <https://github.com/DDonnyy/ObjectNat/wiki/Noise-simulation>`__
+   🧠 `Detailed theory <https://github.com/IDUclub/ObjectNat/wiki/Noise-simulation>`__
 
 ----
 
@@ -133,7 +134,7 @@ Graph-based ObjectNat methods consume ``iduedu.UrbanGraph`` directly; ObjectNat
 does not build NetworkX graphs internally.
 
 **IduEdu** is an open-source Python library designed for building and processing
-complex urban networks based on OpenStreetMap data.
+complex urban networks from OpenStreetMap and GTFS Schedule data.
 
 
 **IduEdu** can be installed via ``pip``::
@@ -188,6 +189,14 @@ Contacts
 
 ----
 
+Citing ObjectNat
+----------------
+
+If you use ObjectNat in research, please cite it. Citation metadata is kept in
+`CITATION.cff <https://github.com/IDUclub/ObjectNat/blob/master/CITATION.cff>`__; on GitHub,
+**Cite this repository** in the repository sidebar copies it as APA or BibTeX.
+Publications describing ObjectNat will be listed below.
+
 Publications
 ------------
 

{objectnat-2.0.0 → objectnat-2.0.1}/README.rst

@@ -16,8 +16,8 @@ Object-oriented Network Analysis Tools
    :target: https://github.com/IDUclub/ObjectNat/actions/workflows/quality.yml
    :alt: Tests and coverage
 
-.. |badge-codecov| image:: https://codecov.io/gh/IDUclub/ObjectNat/graph/badge.svg?token=K6JFSJ02GU
-   :target: https://codecov.io/gh/IDUclub/ObjectNat
+.. |badge-coverage| image:: https://raw.githubusercontent.com/IDUclub/ObjectNat/python-coverage-comment-action-data/badge.svg
+   :target: https://github.com/IDUclub/ObjectNat/tree/python-coverage-comment-action-data
    :alt: Coverage
 
 .. |badge-license| image:: https://img.shields.io/badge/license-BSD--3--Clause-blue.svg
@@ -28,7 +28,7 @@ Object-oriented Network Analysis Tools
    :target: https://iduclub.github.io/ObjectNat/
    :alt: Docs
 
-|badge-black| |badge-pypi| |badge-ci| |badge-codecov| |badge-license| |badge-docs|
+|badge-black| |badge-pypi| |badge-ci| |badge-coverage| |badge-license| |badge-docs|
 
 `РИДМИ (Russian) <https://github.com/IDUclub/ObjectNat/blob/master/README_RU.rst>`__
 
@@ -42,6 +42,7 @@ Object-oriented Network Analysis Tools
 for spatial and network analysis in urban studies.
 The library provides tools for analyzing **accessibility**, **visibility**,
 **noise propagation**, and **service provision**.
+
 ----
 
 Key Features
@@ -103,7 +104,7 @@ Each feature includes a **Jupyter Notebook example** and **full documentation**.
 
    📘 `Example <https://iduclub.github.io/ObjectNat/methods/examples/noise.html>`__
    🔗 `Documentation <https://iduclub.github.io/ObjectNat/methods/noise.html>`__
-   🧠 `Detailed theory <https://github.com/DDonnyy/ObjectNat/wiki/Noise-simulation>`__
+   🧠 `Detailed theory <https://github.com/IDUclub/ObjectNat/wiki/Noise-simulation>`__
 
 ----
 
@@ -116,7 +117,7 @@ Graph-based ObjectNat methods consume ``iduedu.UrbanGraph`` directly; ObjectNat
 does not build NetworkX graphs internally.
 
 **IduEdu** is an open-source Python library designed for building and processing
-complex urban networks based on OpenStreetMap data.
+complex urban networks from OpenStreetMap and GTFS Schedule data.
 
 
 **IduEdu** can be installed via ``pip``::
@@ -171,6 +172,14 @@ Contacts
 
 ----
 
+Citing ObjectNat
+----------------
+
+If you use ObjectNat in research, please cite it. Citation metadata is kept in
+`CITATION.cff <https://github.com/IDUclub/ObjectNat/blob/master/CITATION.cff>`__; on GitHub,
+**Cite this repository** in the repository sidebar copies it as APA or BibTeX.
+Publications describing ObjectNat will be listed below.
+
 Publications
 ------------
 

{objectnat-2.0.0 → objectnat-2.0.1}/objectnat/__init__.py

@@ -1,7 +1,7 @@
 """
 ObjectNat is an open-source library created for geospatial analysis created by IDU team.
 
-Homepage https://github.com/DDonnyy/ObjectNat.
+Homepage https://github.com/IDUclub/ObjectNat.
 """
 
 from ._config import config

objectnat-2.0.1/objectnat/_version.py

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

{objectnat-2.0.0 → objectnat-2.0.1}/objectnat/methods/accessibility/_utils.py

@@ -11,28 +11,41 @@ from shapely.ops import polygonize, unary_union
 from objectnat.methods.utils.geom_utils import polygons_to_multilinestring
 
 SteppedGeometryType = Literal["radius", "ways", "separate"] | None
+_WALK_ONLY_GRAPH_TYPES = {"intermodal", "walk"}
 
-# Graph types whose "ways" geometry must be built from pedestrian edges only.
-# On these graphs non-walk edges (transit legs) are straight lines between
-# distant stops; buffering them would create spurious corridors.
-_WALK_ONLY_WAYS_GRAPH_TYPES = {"intermodal", "walk"}
 
+def geometry_edges(urban_graph: UrbanGraph) -> gpd.GeoDataFrame:
+    """Return the edges that shape accessibility geometry.
 
-def road_edges_for_ways(urban_graph: UrbanGraph) -> gpd.GeoDataFrame:
-    """Return the edge subset used to build ``geometry_type="ways"`` geometry.
-
-    For intermodal/walk graphs only pedestrian (``type == "walk"``) edges are
-    kept, so transit legs do not distort the resulting shape. Other graph types
-    (or graphs without a ``type`` column) use every edge.
+    Walk and intermodal graphs use their pedestrian (``type == "walk"``) edges; other
+    graphs, or graphs without a ``type`` column, use every edge.
     """
     edges = urban_graph.edges_gdf
-    if urban_graph.type in _WALK_ONLY_WAYS_GRAPH_TYPES and "type" in edges.columns:
+    if urban_graph.type in _WALK_ONLY_GRAPH_TYPES and "type" in edges.columns:
         walk_edges = edges[edges["type"] == "walk"]
         if not walk_edges.empty:
             return walk_edges
     return edges
 
 
+def select_geometry_nodes(urban_graph: UrbanGraph, reachable_graph_nodes_gdf: gpd.GeoDataFrame) -> gpd.GeoDataFrame:
+    """Keep the reachable nodes that shape geometry, one per location.
+
+    Only endpoints of :func:`geometry_edges` are kept, unless none of them is reachable,
+    and nodes sharing a location are collapsed onto the smallest ``dist``. Several route
+    nodes can sit on one stop; a Voronoi cell shared by them would otherwise be assigned
+    to every band they fall in.
+    """
+    edges = geometry_edges(urban_graph)
+    nodes = reachable_graph_nodes_gdf
+    on_geometry_edges = nodes.index.isin(edges["u"]) | nodes.index.isin(edges["v"])
+    if on_geometry_edges.any():
+        nodes = nodes.loc[on_geometry_edges]
+    ordered = nodes.iloc[np.argsort(nodes["dist"].to_numpy(dtype=float), kind="stable")]
+    location = pd.MultiIndex.from_arrays([ordered.geometry.x.to_numpy(), ordered.geometry.y.to_numpy()])
+    return ordered.iloc[np.flatnonzero(~location.duplicated())]
+
+
 def build_voronoi_cells(
     urban_graph: UrbanGraph,
     reachable_graph_nodes_gdf: gpd.GeoDataFrame,
@@ -42,15 +55,16 @@ def build_voronoi_cells(
     clip_geom=None,
 ) -> gpd.GeoDataFrame:
     reachable_node_index = pd.Index(reachable_graph_nodes_gdf.index)
+    edges = geometry_edges(urban_graph)
     if clip_geom is None:
-        edges = urban_graph.edges_gdf[["u", "v"]]
         edges_near_reachable = edges[edges["u"].isin(reachable_node_index) | edges["v"].isin(reachable_node_index)]
         neighbor_nodes = pd.Index(edges_near_reachable["u"]).append(pd.Index(edges_near_reachable["v"])).unique()
         boundary_nodes = neighbor_nodes.difference(reachable_node_index)
         voronoi_node_index = reachable_node_index.append(boundary_nodes).unique()
     else:
-        clip_mask = urban_graph.nodes_gdf.geometry.intersects(clip_geom)
-        voronoi_node_index = urban_graph.nodes_gdf.index[clip_mask].append(reachable_node_index).unique()
+        nodes = urban_graph.nodes_gdf
+        site_mask = (nodes.index.isin(edges["u"]) | nodes.index.isin(edges["v"])) & nodes.geometry.intersects(clip_geom)
+        voronoi_node_index = nodes.index[site_mask].append(reachable_node_index).unique()
     voronoi_nodes = urban_graph.nodes_gdf.loc[voronoi_node_index, ["geometry"]]
     voronois = gpd.GeoDataFrame(geometry=list(voronoi_nodes.geometry.voronoi_polygons()), crs=local_crs)
     reachable_cell_index = reachable_graph_nodes_gdf.reset_index(names="node").sjoin(voronois, how="inner")
@@ -119,7 +133,7 @@ def build_ways_clip_geometry(
         speed_m_per_min=speed_m_per_min,
     )
     reachable_node_index = pd.Index(reachable_graph_nodes_gdf.index)
-    edges = road_edges_for_ways(urban_graph)
+    edges = geometry_edges(urban_graph)
     edge_mask = edges["u"].isin(reachable_node_index) | edges["v"].isin(reachable_node_index)
     if not edge_mask.any():
         return GeometryCollection()
@@ -226,6 +240,7 @@ def build_stepped_accessibility_geometry(
     if reachable_graph_nodes_gdf.empty:
         return gpd.GeoDataFrame()
 
+    reachable_graph_nodes_gdf = select_geometry_nodes(urban_graph, reachable_graph_nodes_gdf)
     speed_m_per_min = edge_speed_m_per_min(urban_graph) if weight_type == "time_min" else None
 
     if geometry_type == "separate":

{objectnat-2.0.0 → objectnat-2.0.1}/objectnat/methods/accessibility/coverage.py

@@ -13,6 +13,7 @@ from objectnat.methods.accessibility._utils import (
     build_voronoi_cells,
     build_ways_clip_geometry,
     edge_speed_m_per_min,
+    select_geometry_nodes,
 )
 
 
@@ -104,6 +105,8 @@ def get_graph_coverage(
     Notes:
         - For a directed graph the search runs on the reversed edges, so a zone
           describes the area from which its source can be reached.
+        - On walk and intermodal graphs the zones are built from nodes reachable on foot,
+          so route nodes sharing a stop cannot give one place to several sources.
         - An empty ``GeoDataFrame`` is returned when nothing is reachable.
     """
 
@@ -149,6 +152,8 @@ def get_graph_coverage(
     if reachable_graph_nodes_gdf.empty:
         return gpd.GeoDataFrame()
 
+    reachable_graph_nodes_gdf = select_geometry_nodes(urban_graph, reachable_graph_nodes_gdf)
+
     if geometry_type == "radius":
         speed_m_per_min = edge_speed_m_per_min(urban_graph) if weight_type == "time_min" else None
         clip_zone = build_radius_clip_geometry(
@@ -285,6 +290,8 @@ def get_stepped_graph_coverage(
     Notes:
         - For a directed graph the search runs on the reversed edges; for an
           undirected graph on the original symmetric adjacency.
+        - On walk and intermodal graphs the bands are built from nodes reachable on foot,
+          so transit route nodes on a stop do not paint it with a later band.
         - An empty ``GeoDataFrame`` is returned when nothing is reachable.
     """
 

{objectnat-2.0.0 → objectnat-2.0.1}/objectnat/methods/accessibility/isochrones.py

@@ -12,6 +12,7 @@ from objectnat.methods.accessibility._utils import (
     build_stepped_accessibility_geometry,
     build_ways_clip_geometry,
     edge_speed_m_per_min,
+    select_geometry_nodes,
 )
 
 
@@ -98,6 +99,9 @@ def get_graph_isochrones(
         - For ``geometry_type="ways"`` the search budget is slightly extended so
           road edges are not clipped short of the boundary.
         - Origins with no reachable nodes are dropped from the result.
+        - On walk and intermodal graphs the geometry is built from nodes reachable on
+          foot; transit route nodes, whose distance includes the wait to board, only
+          carry the search.
     """
 
     if geometry_type not in {"radius", "ways", "separate"}:
@@ -144,6 +148,7 @@ def get_graph_isochrones(
         reachable_graph_nodes_gdf = urban_graph.nodes_gdf.loc[pd.Index(reachable_nodes.index), ["geometry"]].join(
             reachable_nodes, how="left"
         )
+        reachable_graph_nodes_gdf = select_geometry_nodes(urban_graph, reachable_graph_nodes_gdf)
         if geometry_type == "radius":
             geom = build_radius_clip_geometry(
                 reachable_graph_nodes_gdf,
@@ -271,6 +276,9 @@ def get_stepped_graph_isochrones(
         - Multiple origins are processed together: the bands describe the
           combined reachability of all origins (each node keeps the distance to
           its nearest origin).
+        - On walk and intermodal graphs the bands are built from nodes reachable on
+          foot, so a stop is drawn in the band it is walked to, not in the bands of the
+          waits for the vehicles that call there.
         - An empty ``GeoDataFrame`` is returned when nothing is reachable.
     """
 

{objectnat-2.0.0 → objectnat-2.0.1}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "ObjectNat"
 dynamic = ["version"]
-description = "ObjectNat is an open-source library created for geospatial analysis created by IDU team"
+description = "ObjectNat is an open-source library for object-level geospatial analysis on city networks, developed by the IDU team."
 readme = "README.rst"
 requires-python = ">=3.11,<3.13"
 license = "BSD-3-Clause"
@@ -119,6 +119,7 @@ skip = ["__init__.py"]
 [tool.coverage.run]
 branch = true
 source = ["objectnat"]
+relative_files = true
 
 [tool.coverage.report]
 # Floor set below the ~85% baseline (2026-07-10) so runs stay green despite
@@ -137,12 +138,12 @@ testpaths = ["tests"]
 #
 # The next version is derived from Conventional Commit messages since the last
 # tag: feat -> minor, fix/perf -> patch, feat!/BREAKING CHANGE -> major.
-# The release workflow runs after CI succeeds on master, bumps
-# objectnat/_version.py, updates CHANGELOG.md, commits, tags vX.Y.Z, and
-# publishes. See CONTRIBUTING.md.
+# In the official repository, the release workflow runs after Tests and Coverage
+# succeeds on master, bumps objectnat/_version.py, updates CHANGELOG.md, commits,
+# tags vX.Y.Z, and publishes. See CONTRIBUTING.md.
 # ---------------------------------------------------------------------------
 [tool.semantic_release]
-version_variables = ["objectnat/_version.py:VERSION"]
+version_variables = ["objectnat/_version.py:VERSION", "CITATION.cff:version"]
 tag_format = "v{version}"
 commit_message = "chore(release): v{version} [skip ci]\n\nAutomated release, see CHANGELOG.md."
 build_command = "python -m pip install uv && uv build"
@@ -171,4 +172,5 @@ minor_tags = ["feat"]
 patch_tags = ["fix", "perf"]
 
 [tool.semantic_release.changelog]
+mode = "update"
 exclude_commit_patterns = ['''^chore\(release\):.*''']

objectnat-2.0.0/objectnat/_version.py

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