ObjectNat 0.1.1__tar.gz → 0.1.3__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.


This version of ObjectNat might be problematic. Click here for more details.

@@ -1,18 +1,17 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: ObjectNat
3
- Version: 0.1.1
3
+ Version: 0.1.3
4
4
  Summary: ObjectNat is an open-source library created for geospatial analysis created by IDU team
5
5
  License: BSD-3-Clause
6
6
  Author: Danila
7
7
  Author-email: 63115678+DDonnyy@users.noreply.github.com
8
- Requires-Python: >=3.9,<4.0
8
+ Requires-Python: >=3.10,<4.0
9
9
  Classifier: License :: OSI Approved :: BSD License
10
10
  Classifier: Programming Language :: Python :: 3
11
- Classifier: Programming Language :: Python :: 3.9
12
11
  Classifier: Programming Language :: Python :: 3.10
13
12
  Classifier: Programming Language :: Python :: 3.11
14
13
  Classifier: Programming Language :: Python :: 3.12
15
- Requires-Dist: dongraphio (>=0.3.9,<0.4.0)
14
+ Requires-Dist: dongraphio (>=0.3.12,<0.4.0)
16
15
  Requires-Dist: geopandas (>=0.14.3,<0.15.0)
17
16
  Requires-Dist: joblib (>=1.4.2,<2.0.0)
18
17
  Requires-Dist: networkit (>=11.0,<12.0)
@@ -1,6 +1,6 @@
1
1
  [tool.poetry]
2
2
  name = "ObjectNat"
3
- version = "0.1.1"
3
+ version = "0.1.3"
4
4
  description = "ObjectNat is an open-source library created for geospatial analysis created by IDU team"
5
5
  license = "BSD-3-Clause"
6
6
  authors = ["Danila <63115678+DDonnyy@users.noreply.github.com>"]
@@ -9,7 +9,7 @@ readme = "README.md"
9
9
  packages = [{ include = "objectnat", from = "src" }]
10
10
 
11
11
  [tool.poetry.dependencies]
12
- python = "^3.9"
12
+ python = "^3.10"
13
13
  geopandas = "^0.14.3"
14
14
  tqdm = "^4.66.2"
15
15
  networkit = "^11.0"
@@ -17,7 +17,7 @@ numpy = "^1.23.5"
17
17
  pandas = "^2.2.0"
18
18
  networkx = "^3.2.1"
19
19
  population-restorator = "^0.2.3"
20
- dongraphio = "^0.3.9"
20
+ dongraphio = "^0.3.12"
21
21
  provisio = "^0.1.7"
22
22
  joblib = "^1.4.2"
23
23
  pandarallel = "^1.6.5"
@@ -1,4 +1,4 @@
1
- __version__ = "0.1.1"
1
+ __version__ = "0.1.3"
2
2
 
3
3
  from dongraphio.enums import GraphType
4
4
 
@@ -2,6 +2,7 @@ from typing import Literal
2
2
 
3
3
  import geopandas as gpd
4
4
  import networkx as nx
5
+ import pandas as pd
5
6
  from dongraphio import GraphType
6
7
 
7
8
  from .isochrones import get_accessibility_isochrones
@@ -94,7 +95,11 @@ def get_isochrone_zone_coverage(
94
95
  """
95
96
  assert services.crs == city_graph.graph["crs"], "CRS not match"
96
97
  points = services.geometry.representative_point()
97
- isochrone_res = get_accessibility_isochrones(
98
+ iso, routes, stops = get_accessibility_isochrones(
98
99
  points, graph_type, weight_value, weight_type, city_graph, points.crs.to_epsg()
99
100
  )
100
- return isochrone_res
101
+ services_ = services.copy()
102
+ iso = gpd.GeoDataFrame(
103
+ pd.concat([iso.drop(columns=["point", "point_number"]), services_.drop(columns=["geometry"])], axis=1)
104
+ )
105
+ return iso, routes, stops
File without changes
File without changes