feat: replace "sustainable modes" to NSM+PT

Author: rebecamurillo

src/sum_impact_assessment/utils/modal_split.py

@@ -14,7 +14,7 @@
     "NSM": ["NSM"],
     "Private": ["PRIVATE"],
     "Public transport": ["PUBLIC_TRANSPORT"],
-    "Sustainable modes": ["NSM", "PUBLIC_TRANSPORT"],
+    "PT+NSM": ["NSM", "PUBLIC_TRANSPORT"],
 }
 
 

tests/test_jobs/test_kpi_measures_analysis_job.py

@@ -544,7 +544,7 @@ def test_run_kpi_impact_analysis_expands_modal_split_into_three_modes(
             KPIGroupImpactOutput(
                 id="3__public_transport", name="Modal Split - Public transport", kpi_ids=["15"]),
             KPIGroupImpactOutput(
-                id="3__sustainable_modes", name="Modal Split - Sustainable modes", kpi_ids=["15"]),
+                id="3__sustainable_modes", name="Modal Split - PT+NSM", kpi_ids=["15"]),
         ]
 
         input_snapshot, successful_results, error_results = KpiMeasuresAnalysisJob.run_kpi_impact_analysis(
@@ -565,12 +565,12 @@ def test_run_kpi_impact_analysis_expands_modal_split_into_three_modes(
         assert "Modal Split - NSM" in analyzed_names
         assert "Modal Split - Private" in analyzed_names
         assert "Modal Split - Public transport" in analyzed_names
-        assert "Modal Split - Sustainable modes" in analyzed_names
+        assert "Modal Split - PT+NSM" in analyzed_names
 
         analyzed_groups = [call.args[0]
                            for call in mock_analyzer.run_analysis_group.call_args_list]
         sustainable_group = next(
-            g for g in analyzed_groups if g.name == "Modal Split - Sustainable modes"
+            g for g in analyzed_groups if g.name == "Modal Split - PT+NSM"
         )
         assert sorted(sustainable_group.transport_mode_type_filter) == [
             "nsm", "public_transport"]
@@ -637,7 +637,7 @@ def test_run_kpi_impact_analysis_modal_split_only_nsm_keeps_nsm_and_sustainable_
     ):
         """
         Given Modal Split analysis and only NSM KPI data in living labs,
-        then only NSM and Sustainable modes sub-groups are analyzed.
+        then only NSM and PT+NSM sub-groups are analyzed.
         """
         mock_db = Mock()
 
@@ -691,7 +691,7 @@ def test_run_kpi_impact_analysis_modal_split_only_nsm_keeps_nsm_and_sustainable_
             KPIGroupImpactOutput(
                 id="3__nsm", name="Modal Split - NSM", kpi_ids=["15"]),
             KPIGroupImpactOutput(
-                id="3__sustainable_modes", name="Modal Split - Sustainable modes", kpi_ids=["15"]),
+                id="3__sustainable_modes", name="Modal Split - PT+NSM", kpi_ids=["15"]),
         ]
 
         input_snapshot, successful_results, error_results = KpiMeasuresAnalysisJob.run_kpi_impact_analysis(
@@ -707,7 +707,7 @@ def test_run_kpi_impact_analysis_modal_split_only_nsm_keeps_nsm_and_sustainable_
         assert len(error_results) == 0
         assert mock_analyzer.run_analysis_group.call_count == 2
         assert "Modal Split - NSM" in analyzed_names
-        assert "Modal Split - Sustainable modes" in analyzed_names
+        assert "Modal Split - PT+NSM" in analyzed_names
         assert "Modal Split - Private" not in analyzed_names
         assert "Modal Split - Public transport" not in analyzed_names
 
@@ -826,7 +826,7 @@ def test_run_kpi_impact_analysis_modal_split_all_transport_modes_filters_output_
         assert "Modal Split - NSM" in result_by_group_name
         assert "Modal Split - Private" in result_by_group_name
         assert "Modal Split - Public transport" in result_by_group_name
-        assert "Modal Split - Sustainable modes" in result_by_group_name
+        assert "Modal Split - PT+NSM" in result_by_group_name
 
         nsm_modes = {
             kpi["transport_mode_type"]
@@ -842,7 +842,7 @@ def test_run_kpi_impact_analysis_modal_split_all_transport_modes_filters_output_
         }
         sustainable_modes = {
             kpi["transport_mode_type"]
-            for kpi in result_by_group_name["Modal Split - Sustainable modes"]["living_labs_analysis"][0]["kpis"]
+            for kpi in result_by_group_name["Modal Split - PT+NSM"]["living_labs_analysis"][0]["kpis"]
         }
 
         assert nsm_modes == {"NSM"}
@@ -853,7 +853,7 @@ def test_run_kpi_impact_analysis_modal_split_all_transport_modes_filters_output_
         assert mock_run_ridge_regression.call_count == 4
 
         # Call order follows modal split subgroup constant order:
-        # NSM[0], Private[1], Public transport[2], Sustainable modes[3].
+        # NSM[0], Private[1], Public transport[2], PT+NSM[3].
         # With autospec on an instance method, call args are: (self, X, y, ...)
         _, nsm_call_X, nsm_call_y = mock_run_ridge_regression.call_args_list[0].args[:3]