Merge pull request #287 from OpenGeoscience/mbta-ridership

MBTA ridership data

Author: annehaley

geoinsight/core/tasks/networks.py

@@ -95,12 +95,13 @@ def create_network(vector_data, network_options):
                         and str(v).lower() != "nan"
                     },
                 )
-            from_node_obj.vector_feature = VectorFeature.objects.create(
-                vector_data=vector_data,
-                geometry=from_node_obj.location,
-                properties=from_node_obj.metadata,
-            )
-            from_node_obj.save()
+            if from_node_obj.vector_feature is None:
+                from_node_obj.vector_feature = VectorFeature.objects.create(
+                    vector_data=vector_data,
+                    geometry=from_node_obj.location,
+                    properties=from_node_obj.metadata,
+                )
+                from_node_obj.save()
 
             if i < len(route_nodes) - 1:
                 next_node = route_nodes.iloc[i + 1]
@@ -130,12 +131,13 @@ def create_network(vector_data, network_options):
                             and str(v).lower() != "nan"
                         },
                     )
-                to_node_obj.vector_feature = VectorFeature.objects.create(
-                    vector_data=vector_data,
-                    geometry=to_node_obj.location,
-                    properties=to_node_obj.metadata,
-                )
-                to_node_obj.save()
+                if to_node_obj.vector_feature is None:
+                    to_node_obj.vector_feature = VectorFeature.objects.create(
+                        vector_data=vector_data,
+                        geometry=to_node_obj.location,
+                        properties=to_node_obj.metadata,
+                    )
+                    to_node_obj.save()
 
                 route_points_start_index = route_points_reprojected.index[
                     route_points_reprojected["geometry"] == cutoff_points[current_node_name]

sample_data/boston_floods/ingest_mbta.py

@@ -1,6 +1,11 @@
 from __future__ import annotations
 
-from geoinsight.core.models import VectorFeature
+import io
+
+import pandas as pd
+import requests
+
+from geoinsight.core.models import NetworkNode, VectorData, VectorFeature
 
 LINE_COLORS = {
     "RED": "#D31414",
@@ -10,6 +15,14 @@
     "SILVER": "#7B8B86",
 }
 
+RIDERSHIP_DATA_URL = "https://data.kitware.com/api/v1/item/69938a5d92fec64197f41dc3/download"
+
+
+STATION_NAME_ABBREVIATIONS = {
+    "Northeastern University": "Northeastern",
+    "Massachusetts Avenue": "Massachusetts Ave",
+}
+
 
 def convert_dataset(dataset, options):
     # Run standard conversion task first
@@ -21,6 +34,7 @@ def convert_dataset(dataset, options):
     )
 
     # Post-processing
+
     # For each associated vector feature, add style properties
     # To color features by the LINE property
     for feature in VectorFeature.objects.filter(vector_data__dataset=dataset):
@@ -35,3 +49,29 @@ def convert_dataset(dataset, options):
             }
             feature.properties = feature.properties | default_style
             feature.save()
+
+    # Add ridership data to stations
+    response = requests.get(RIDERSHIP_DATA_URL, timeout=1000)
+    ridership_data = pd.read_csv(io.StringIO(response.text.replace("\r", "")))
+    for _, station in ridership_data.iterrows():
+        station_name = station.loc["stop_name"].replace("'", "")
+        if station_name in STATION_NAME_ABBREVIATIONS:
+            station_name = STATION_NAME_ABBREVIATIONS[station_name]
+        total_offs = int(station.loc["total_offs"])
+        node_matches = NetworkNode.objects.filter(
+            network__vector_data__dataset=dataset, metadata__STATION__iexact=station_name
+        )
+        if node_matches.count():
+            new = {"total_ridership": total_offs}
+            node = node_matches.first()
+            node.metadata = node.metadata | new
+            node.save()
+            feature = node.vector_feature
+            feature.properties = feature.properties | new
+            feature.save()
+        else:
+            print(f"Could not find node for {station_name}")
+
+    # Update vector data summary
+    for vector in VectorData.objects.filter(dataset=dataset):
+        vector.get_summary(cache=False)

web/src/components/sidebars/LegendPanel.vue

@@ -46,10 +46,10 @@ function getColormapPreviews(layer: Layer) {
                 ]
             }
         }
-        if (discrete && colorBy && colormap && colorConfig.colormap) {
-            const propsSpec = vector?.summary?.properties;
-            if (propsSpec) {
-                const colorByProp = propsSpec[colorBy]
+        const propsSpec = vector?.summary?.properties;
+        if (propsSpec && colorBy) {
+            const colorByProp = propsSpec[colorBy]
+            if (discrete && colormap && colorConfig.colormap) {
                 const valueSet = Array.from(new Set(colorByProp.value_set.filter((v) => v)))
                 const sortedValues = valueSet.sort((a: any, b: any) => a - b)
                 const markers = colormapMarkersSubsample(colormap, colorConfig.colormap, nColors)
@@ -61,6 +61,8 @@ function getColormapPreviews(layer: Layer) {
                         }
                     }
                 })
+            } else if (!discrete && colorByProp.range) {
+                range = colorByProp.range
             }
         }
         return {