chart specs revamping

kauevestena · Oct 17, 2024 · 299c622 · 299c622
1 parent 892a30c
commit 299c622
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 18 deletions.
diff --git a/dashboard/statistics_generation.py b/dashboard/statistics_generation.py
@@ -4,6 +4,10 @@
 # add an option "--single" to generate a single chart specified as an string
 parser = argparse.ArgumentParser()
 parser.add_argument("--single", type=str, default=None)
+
+# add an argument to raise on failure:
+parser.add_argument("--to_raise", action="store_true")
+
 args = parser.parse_args()
 
 single_chart = args.single
@@ -119,6 +123,9 @@
                 )
                 error_report.write(chart_spec + "\n")
 
+                if args.to_raise:
+                    raise
+
 # the topbar for each category
 topbar = f"""
     

diff --git a/dashboard/statistics_specs.py b/dashboard/statistics_specs.py
@@ -67,7 +67,7 @@
             "function": create_barchartV2,
             "params": {
                 "input_gdf": gdfs_dict["sidewalks"],
-                "fieldname": "tactile_paving",
+                "fieldname": "width",
                 "title": "Sidewalks Width Values",
                 "str_to_append": " type",
                 "title_fontsize": 24,
@@ -90,7 +90,9 @@
             "params": {
                 "df": gdfs_dict["sidewalks"],
                 "column": "age",
-                "boxplot_title": "Sidewalks Age",
+                "boxplot_title": "Sidewalks Update Age (Years)",
+                "color_field": "smoothness",
+                "height": 200,
                 # "tooltip_fields": ["id"],
             },
             "title": "Update Age",
@@ -112,6 +114,8 @@
                 "df": gdfs_dict["sidewalks"],
                 "column": "n_revs",
                 "boxplot_title": "Sidewalks Number of Revisions",
+                "color_field": "smoothness",
+                "height": 200,
                 # "tooltip_fields": ["id"],
             },
             "title": "Number of Revisions",
@@ -198,8 +202,9 @@
             "params": {
                 "df": gdfs_dict["crossings"],
                 "column": "age",
-                "boxplot_title": "Crossings Age",
+                "boxplot_title": "Crossings Update Age (Years)",
                 "color_field": "crossing",
+                "height": 200,
                 # "tooltip_fields": ["id"],
             },
             "title": "Update Age",
@@ -210,6 +215,7 @@
                 "df": gdfs_dict["crossings"],
                 "column": "n_revs",
                 "color_field": "crossing",
+                "height": 200,
                 "boxplot_title": "Crossings Number of Revisions",
                 # "tooltip_fields": ["id"],
             },
@@ -286,8 +292,10 @@
             "params": {
                 "df": gdfs_dict["kerbs"],
                 "column": "age",
-                "boxplot_title": "Kerbs Age",
+                "boxplot_title": "Kerbs Update Age (Years)",
                 # "tooltip_fields": ["id"],
+                "color_field": "wheelchair",
+                "height": 200,
             },
             "title": "Update Age",
         },
@@ -306,6 +314,8 @@
                 "df": gdfs_dict["kerbs"],
                 "column": "n_revs",
                 "boxplot_title": "Kerbs Number of Revisions",
+                "color_field": "smoothness",
+                "height": 200,
                 # "tooltip_fields": ["id"],
             },
             "title": "Number of Revisions",
@@ -319,7 +329,7 @@
                 "fieldname": oswm_footway_fieldname,
                 "title": "Sub-category (Layer)",
             },
-            "title": "Incline Values",
+            "title": "Subcategory",
         },
         # "other_footways_surface": {
         #     "function": create_barchart,
@@ -330,17 +340,6 @@
         #     },
         #     "title": "Other Footways Surface",
         # },
-        "other_footways_surface": {
-            "function": create_barchartV2,
-            "params": {
-                "input_gdf": gdfs_dict["other_footways"],
-                "fieldname": "surface",
-                "title": "Other Footways Surface Type",
-                "str_to_append": " type",
-                "title_fontsize": 24,
-            },
-            "title": "Surface Type",
-        },
         "other_footways_smoothness_x_surface": {
             "function": create_double_scatter_bar,
             "params": {
@@ -357,6 +356,28 @@
             },
             "title": "Surface x Smoothness",
         },
+        "other_footways_surface": {
+            "function": create_barchartV2,
+            "params": {
+                "input_gdf": gdfs_dict["other_footways"],
+                "fieldname": "surface",
+                "title": "Other Footways Surface Type",
+                "str_to_append": " type",
+                "title_fontsize": 24,
+            },
+            "title": "Surface Type",
+        },
+        "other_footways_smoothness": {
+            "function": create_barchartV2,
+            "params": {
+                "input_gdf": gdfs_dict["other_footways"],
+                "fieldname": "smoothness",
+                "title": "Other Footways Smoothness",
+                "str_to_append": " type",
+                "title_fontsize": 24,
+            },
+            "title": "Smoothness",
+        },
         # "other_footways_yr_moth_update": {
         #     "function": create_barchart,
         #     "params": {
@@ -373,6 +394,7 @@
                 "column": "length(km)",
                 "boxplot_title": "Other Footways Length (km)",
                 "color_field": oswm_footway_fieldname,
+                "height": 200,
                 # "tooltip_fields": ["id"],
                 "maxbins": 50,
             },
@@ -383,8 +405,9 @@
             "params": {
                 "df": gdfs_dict["other_footways"],
                 "column": "age",
-                "boxplot_title": "Other Footways Age",
-                # "tooltip_fields": ["id"],
+                "boxplot_title": "Other Footways Update Age (Years)",
+                "color_field": oswm_footway_fieldname,
+                "height": 200,
             },
             "title": "Update Age",
         },
@@ -403,6 +426,8 @@
                 "df": gdfs_dict["other_footways"],
                 "column": "n_revs",
                 "boxplot_title": "Other Footways Number of Revisions",
+                "color_field": oswm_footway_fieldname,
+                "height": 200,
                 # "tooltip_fields": ["id"],
             },
             "title": "Number of Revisions",