apmtools 0.2.10__tar.gz → 0.2.12__tar.gz

{apmtools-0.2.10 → apmtools-0.2.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: apmtools
-Version: 0.2.010
+Version: 0.2.012
 Summary: A collection of tools for processing air pollution monitoring data
 Project-URL: Homepage, https://github.com/federlorenz/apmtools
 Author-email: Federico Lorenzetti <lorenzetti.federico@gmail.com>

{apmtools-0.2.10 → apmtools-0.2.12}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "apmtools"
-version = "0.2.010"
+version = "0.2.012"
 authors = [
   { name="Federico Lorenzetti", email="lorenzetti.federico@gmail.com" },
 ]

{apmtools-0.2.10 → apmtools-0.2.12}/src/apmtools/classes.py

@@ -792,6 +792,8 @@ class Dataset(DictionaryPlus):
                 app.append(float(v.m["parameters"]["SampledVolumeOffset"].strip(
                 ))/1000 if "SampledVolumeOffset" in v.m["parameters"].keys() else float(v.m["parameters"]["SampledVolume"].strip())/1000)
                 df.loc[len(df)] = app
+                
+            df = df.sort_values(axis=1,by="identifier")
             df.to_csv(f"{directory}filter_summary.csv", index=False)
         else:
             print("No Upas files detected in Dataset")

{apmtools-0.2.10 → apmtools-0.2.12}/src/apmtools/shiny/summary.py

@@ -570,15 +570,19 @@ def create_summary_app(
                 if group_columns:
                     group_column = "__plot_group"
                     line_columns = [x_column, group_column, *y_columns]
-                    if identifier_column is not None:
-                        line_columns.append(identifier_column)
+                    line_group_column = identifier_column or section_column
+                    if line_group_column is not None:
+                        line_columns.append(line_group_column)
+
+                    # Keep whichever column controls line segmentation as an
+                    # id_var during melt(). Otherwise pandas drops it and
+                    # Plotly cannot resolve line_group (e.g. __line_section).
+                    id_vars = [x_column, group_column]
+                    if line_group_column is not None:
+                        id_vars.append(line_group_column)
+
                     long_df = plot_df[line_columns].melt(
-                        id_vars=[
-                            x_column,
-                            group_column,
-                            *([identifier_column]
-                              if identifier_column is not None else []),
-                        ],
+                        id_vars=id_vars,
                         var_name="variable",
                         value_name="value",
                     )
@@ -587,7 +591,7 @@ def create_summary_app(
                         x=x_column,
                         y="value",
                         color=group_column,
-                        line_group=identifier_column or section_column,
+                        line_group=line_group_column,
                         facet_row="variable" if len(y_columns) > 1 else None,
                     )
                 elif identifier_column is not None: