eflips-eval 1.2.2__tar.gz → 1.3.0__tar.gz

{eflips_eval-1.2.2 → eflips_eval-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: eflips-eval
-Version: 1.2.2
+Version: 1.3.0
 Summary: 
 Author: Ludger Heide
 Author-email: ludger.heide@lhtechnologies.de
@@ -10,9 +10,12 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: dash-cytoscape (>=1.0.1,<2.0.0)
-Requires-Dist: eflips-model (>=2.3.0,<4.0.0)
+Requires-Dist: eflips-model (>=2.3.0,<5.0.0)
+Requires-Dist: folium (>=0.17.0,<0.18.0)
 Requires-Dist: pandas (>=2.1.4,<3.0.0)
 Requires-Dist: plotly (>=5.19.0,<6.0.0)
+Requires-Dist: seaborn (>=0.13.2,<0.14.0)
+Requires-Dist: shapely (>=2.0.5,<3.0.0)
 Description-Content-Type: text/markdown
 
 [![Unit Tests](https://github.com/mpm-tu-berlin/eflips-eval/actions/workflows/unittests.yml/badge.svg)](https://github.com/mpm-tu-berlin/eflips-eval/actions/workflows/unittests.yml) 

{eflips_eval-1.2.2 → eflips_eval-1.3.0}/eflips/eval/input/prepare.py

@@ -5,6 +5,7 @@ from typing import Dict, List
 import pandas as pd
 import sqlalchemy
 from eflips.model import Rotation, Trip, Route
+from shapely import wkb  # type: ignore
 
 
 def rotation_info(
@@ -98,6 +99,98 @@ def rotation_info(
     return df
 
 
+def geographic_trip_plot(
+    scenario_id: int,
+    session: sqlalchemy.orm.session.Session,
+    rotation_ids: None | int | List[int] = None,
+) -> pd.DataFrame:
+    """
+    This function creates a dataframe that can be used to visualize the geographic distribution of rotations. It creates
+    a dataframe with one row for each trip and the following columns:
+
+    - rotation_id: the id of the rotation
+    - rotation_name: the name of the rotation
+    - vehicle_type_id: the id of the vehicle type
+    - vehicle_type_name: the name of the vehicle type
+    - originating_depot_id: the id of the originating depot
+    - originating_depot_name: the name of the originating depot
+    - distance: the distance of the route
+    - coordinates: An array of *(lon, lat)* tuples with the coordinates of the route - the shape if set, otherwise the stops
+    - line_name: the name of the line, which is the first part of the rotation name. Used for sorting
+
+    :param scenario_id:
+    :param session:
+    :param rotation_ids:
+    :return: a pandas DataFrame
+    """
+    rotations_q = session.query(Rotation).filter(Rotation.scenario_id == scenario_id)
+    if rotation_ids is not None:
+        if isinstance(rotation_ids, int):
+            rotation_ids = [rotation_ids]
+        rotations_q = rotations_q.filter(Rotation.id.in_(rotation_ids))
+    rotations_q = rotations_q.options(
+        sqlalchemy.orm.joinedload(Rotation.trips)
+        .joinedload(Trip.route)
+        .joinedload(Route.line)
+    )
+    rotations_q = rotations_q.options(
+        sqlalchemy.orm.joinedload(Rotation.vehicle_type),
+    )
+    rotations_q = rotations_q.options(
+        sqlalchemy.orm.joinedload(Rotation.trips)
+        .joinedload(Trip.route)
+        .joinedload(Route.departure_station),
+    )
+
+    result: List[Dict[str, int | float | str | datetime]] = []
+    for rotation in rotations_q:
+        origin_depot_id = rotation.trips[0].route.departure_station_id
+        origin_depot_name = rotation.trips[0].route.departure_station.name
+        line_name = rotation.trips[0].route.line.name
+        vehicle_type_id = rotation.vehicle_type_id
+        vehicle_type_name = rotation.vehicle_type.name
+
+        for trip in rotation.trips:
+            # Obtain the coordinates of the route
+            if trip.route.geom is not None:
+                raise NotImplementedError(
+                    "Geometries are not yet supported. Check if the code below 'just works'."
+                    "If not, you need to implement the conversion to coordinates."
+                )
+                line_geom = wkb.loads(bytes(trip.route.geom.data))
+                line_coords = [(point.y, point.x) for point in line_geom.coords]
+            else:
+                line_coords = []
+                point_geom = wkb.loads(bytes(trip.route.departure_station.geom.data))
+                lon, lat = point_geom.x, point_geom.y
+                line_coords.append((lat, lon))
+                for assoc in trip.route.assoc_route_stations:
+                    if assoc.location is not None:
+                        station_coordinates = wkb.loads(bytes(assoc.location.data))
+                    else:
+                        station_coordinates = wkb.loads(bytes(assoc.station.geom.data))
+                    lon, lat = station_coordinates.x, station_coordinates.y
+                    line_coords.append((lat, lon))
+                point_geom = wkb.loads(bytes(trip.route.arrival_station.geom.data))
+                lon, lat = point_geom.x, point_geom.y
+                line_coords.append((lat, lon))
+
+            result.append(
+                {
+                    "rotation_id": rotation.id,
+                    "rotation_name": rotation.name,
+                    "vehicle_type_id": vehicle_type_id,
+                    "vehicle_type_name": vehicle_type_name,
+                    "originating_depot_id": origin_depot_id,
+                    "originating_depot_name": origin_depot_name,
+                    "distance": trip.route.distance,
+                    "coordinates": line_coords,
+                    "line_name": line_name,
+                }
+            )
+    return pd.DataFrame(result)
+
+
 def single_rotation_info(
     rotation_id: int,
     session: sqlalchemy.orm.session.Session,

{eflips_eval-1.2.2 → eflips_eval-1.3.0}/eflips/eval/input/visualize.py

@@ -1,7 +1,9 @@
 import dash_cytoscape as cyto  # type: ignore
+import folium  # type: ignore
 import pandas as pd
 import plotly.express as px  # type: ignore
 import plotly.graph_objs as go  # type: ignore
+import seaborn as sns  # type: ignore
 from eflips.model import TripType
 
 
@@ -55,6 +57,58 @@ def rotation_info(prepared_data: pd.DataFrame) -> go.Figure:
     return fig
 
 
+def geographic_trip_plot(prepared_data: pd.DataFrame) -> folium.Map:
+    """
+    This function visualizes the trips on a map using folium. The trips are lines between the departure and arrival
+    stations.
+
+
+
+    :param prepared_data: A Pandas dataframe with the following columns:
+            - rotation_id: the id of the rotation
+            - rotation_name: the name of the rotation
+            - vehicle_type_id: the id of the vehicle type
+            - vehicle_type_name: the name of the vehicle type
+            - originating_depot_id: the id of the originating depot
+            - originating_depot_name: the name of the originating depot
+            - distance: the distance of the route
+            - coordinates: An array of *(lon, lat)* tuples with the coordinates of the route - the shape if set, otherwise the stops
+            - line_name: the name of the line, which is the first part of the rotation name. Used for sorting
+    :return: A folium map object
+    """
+    # Use seaborn to create a color palette for each originating depot
+    palette = sns.color_palette(
+        "husl", n_colors=len(prepared_data["originating_depot_id"].unique())
+    )
+    colors = {}
+    for depot_name in prepared_data["originating_depot_name"].unique():
+        color = palette.pop(0)
+        # Turn the color into a hex string
+        color = "#{:02x}{:02x}{:02x}".format(*[int(c * 255) for c in color])
+        colors[depot_name] = color
+
+    # Obtain the mean latitude and longitude for the map center
+    lat_center = (
+        prepared_data["coordinates"]
+        .apply(lambda x: sum([c[0] for c in x]) / len(x))
+        .mean()
+    )
+    lon_center = (
+        prepared_data["coordinates"]
+        .apply(lambda x: sum([c[1] for c in x]) / len(x))
+        .mean()
+    )
+
+    map = folium.Map(
+        location=[lat_center, lon_center], zoom_start=11, tiles="Cartodb dark_matter"
+    )
+    for i, row in prepared_data.iterrows():
+        color = colors[row["originating_depot_name"]]
+        pl = folium.PolyLine(row["coordinates"], color=color, weight=2.5, opacity=1)
+        map.add_child(pl)
+    return map
+
+
 def single_rotation_info(prepared_data: pd.DataFrame) -> cyto.Cytoscape:
     """
     This plots a single rotation as a network graph. The nodes are the stops and the edges are the trips between the

{eflips_eval-1.2.2 → eflips_eval-1.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "eflips-eval"
-version = "1.2.2"
+version = "1.3.0"
 description = ""
 authors = [
     "Ludger Heide <ludger.heide@lhtechnologies.de>",
@@ -13,10 +13,13 @@ include= ["LICENSE.md"]
 
 [tool.poetry.dependencies]
 python = "^3.10"
-eflips-model = ">=2.3.0,<4.0.0"
+eflips-model = ">=2.3.0,<5.0.0"
 pandas = "^2.1.4"
 plotly = "^5.19.0"
 dash-cytoscape = "^1.0.1"
+shapely = "^2.0.5"
+folium = "^0.17.0"
+seaborn = "^0.13.2"
 
 [tool.poetry.group.dev.dependencies]
 mypy = "^1.7.1"