gtfs-parser 0.2.0__tar.gz → 0.2.2__tar.gz

{gtfs_parser-0.2.0 → gtfs_parser-0.2.2}/PKG-INFO

@@ -1,14 +1,17 @@
 Metadata-Version: 2.1
 Name: gtfs_parser
-Version: 0.2.0
+Version: 0.2.2
 Summary: parse and aggregate GTFS
 Home-page: https://github.com/MIERUNE
 License: MIT
 Author: MIERUNE Inc.
-Requires-Python: ==3.9.*
+Requires-Python: >=3.9.0
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: pandas (>=1.3.3)
 Project-URL: Repository, https://github.com/MIERUNE/gtfs-parser
 Description-Content-Type: text/markdown

{gtfs_parser-0.2.0 → gtfs_parser-0.2.2}/gtfs_parser/parse.py

@@ -14,13 +14,15 @@ def read_stops(gtfs: GTFS, ignore_no_route=False) -> list:
         list: [description]
     """
     # get unique list of route_id related to each stop
-    stop_trip_route_df = gtfs.stop_times[["trip_id", "stop_id"]].join(
-        gtfs.trips["route_id"].reindex(gtfs.trips["trip_id"]),
+    stop_trip_route_df = pd.merge(
+        gtfs.stop_times[["trip_id", "stop_id"]],
+        gtfs.trips[["trip_id", "route_id"]],
         on="trip_id",
     )
     stop_route_df = stop_trip_route_df[["stop_id", "route_id"]].drop_duplicates()
-    route_ids_on_stops = stop_route_df.groupby("stop_id")["route_id"].apply(list).rename("route_ids")
-
+    route_ids_on_stops = (
+        stop_route_df.groupby("stop_id")["route_id"].apply(list).rename("route_ids")
+    )
     # outer join route_ids to stop
     route_stop = gtfs.stops.join(route_ids_on_stops, on="stop_id", how="left")
 
@@ -74,17 +76,24 @@ def read_routes(gtfs: GTFS, ignore_shapes=False) -> list:
 
 def __read_route_shapes(gtfs):
     # get_shapeids_on route
-    shape_ids_on_routes = gtfs.trips[["route_id", "shape_id"]].drop_duplicates().dropna(
-        subset=["shape_id"]
-    ).sort_values(["route_id", "shape_id"])
+    shape_ids_on_routes = (
+        gtfs.trips[["route_id", "shape_id"]]
+        .drop_duplicates()
+        .dropna(subset=["shape_id"])
+        .sort_values(["route_id", "shape_id"])
+    )
 
     # get shape coordinate
     shapes_df = gtfs.shapes.copy()
-    shapes_df["shape_pt"] = list(zip(shapes_df["shape_pt_lon"], shapes_df["shape_pt_lat"]))
+    shapes_df["shape_pt"] = list(
+        zip(shapes_df["shape_pt_lon"], shapes_df["shape_pt_lat"])
+    )
     shapes_df = shapes_df.sort_values(["shape_id", "shape_pt_sequence"])
-    shape_lines = shapes_df.groupby("shape_id")["shape_pt"].apply(
-        lambda x: x.tolist()
-    ).rename("line")
+    shape_lines = (
+        shapes_df.groupby("shape_id")["shape_pt"]
+        .apply(lambda x: x.tolist())
+        .rename("line")
+    )
 
     # merge
     route_line_df = pd.merge(shape_ids_on_routes, shape_lines, on="shape_id")
@@ -98,11 +107,13 @@ def __read_route_shapes(gtfs):
     ]
     if len(unloaded_shape_lines) > 0:
         # fill id, name with shape_id, line to multiline
-        multiline_df = pd.DataFrame({
-            "route_id": None,
-            "route_name": unloaded_shape_lines.index,
-            "multiline": unloaded_shape_lines.apply(lambda x: [x])
-        })
+        multiline_df = pd.DataFrame(
+            {
+                "route_id": None,
+                "route_name": unloaded_shape_lines.index,
+                "multiline": unloaded_shape_lines.apply(lambda x: [x]),
+            }
+        )
 
         unloaded_features = __route_multiline_df_to_features(multiline_df)
         features.extend(unloaded_features)
@@ -112,15 +123,19 @@ def __read_route_shapes(gtfs):
 def __read_routes_ignore_shapes(gtfs):
     # generate stop patterns
     sorted_stop_times = gtfs.stop_times.sort_values(["trip_id", "stop_sequence"])
-    trip_stop_pattern = sorted_stop_times.groupby("trip_id")["stop_id"].agg(tuple).rename("stop_pattern")
+    trip_stop_pattern = (
+        sorted_stop_times.groupby("trip_id")["stop_id"]
+        .agg(tuple)
+        .rename("stop_pattern")
+    )
 
     # unique stop pattens by route_id
     route_trip_stop_pattern = pd.merge(
-        trip_stop_pattern,
-        gtfs.trips[["trip_id", "route_id"]],
-        on='trip_id'
+        trip_stop_pattern, gtfs.trips[["trip_id", "route_id"]], on="trip_id"
     )
-    route_stop_patterns = route_trip_stop_pattern[["route_id", "stop_pattern"]].drop_duplicates()
+    route_stop_patterns = route_trip_stop_pattern[
+        ["route_id", "stop_pattern"]
+    ].drop_duplicates()
 
     # explode stop patterns to stop ids
     route_stop_patterns["stop_id"] = route_stop_patterns["stop_pattern"]
@@ -130,7 +145,7 @@ def __read_routes_ignore_shapes(gtfs):
     stop_geoms = pd.Series(
         data=zip(gtfs.stops["stop_lon"], gtfs.stops["stop_lat"]),
         name="stop_pt",
-        index=gtfs.stops["stop_id"]
+        index=gtfs.stops["stop_id"],
     )
 
     # join geomtry to route stops
@@ -142,15 +157,19 @@ def __read_routes_ignore_shapes(gtfs):
     ).sort_values("order")
 
     # Point -> LineString: group by route_id and stop_pattern
-    route_lines = route_stop_geoms.groupby(["route_id", "stop_pattern"])["stop_pt"].agg(list)
+    route_lines = route_stop_geoms.groupby(["route_id", "stop_pattern"])["stop_pt"].agg(
+        list
+    )
     return __route_lines_to_features(route_lines, gtfs.routes)
 
 
 def __route_lines_to_features(route_lines, routes):
     # group by route_id into MultiLineString
-    multilines = route_lines.groupby(['route_id']).apply(
-        lambda x: x.tolist()
-    ).rename("multiline")
+    multilines = (
+        route_lines.groupby(["route_id"])
+        .apply(lambda x: x.tolist())
+        .rename("multiline")
+    )
     # join route_id and route_name
     multiline_df = pd.merge(
         multilines,

{gtfs_parser-0.2.0 → gtfs_parser-0.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "gtfs_parser"
-version = "0.2.0"
+version = "0.2.2"
 description = "parse and aggregate GTFS"
 authors = ["MIERUNE Inc.", "Kanahiro IGUCHI"]
 license = "MIT"
@@ -10,7 +10,7 @@ readme = "README.md"
 packages = [{include = "gtfs_parser"}]
 
 [tool.poetry.dependencies]
-python = "3.9.*"
+python = ">=3.9.0"
 pandas = ">=1.3.3"