fixing auto zooming and parsing

Author: mwang87

app.py

@@ -884,6 +884,8 @@
             html.Br(),
             html.A("LCMS XIC by Formula - QC Amitryptiline", href='/?usi=mzspec%3AMSV000085852%3AQC_0&usi2=&xicmz=&xic_formula=C20H23N&xic_tolerance=0.01&xic_ppm_tolerance=20&xic_tolerance_unit=Da&xic_rt_window=&xic_norm=False&xic_file_grouping=FILE&xic_integration_type=AUC&show_ms2_markers=True&ms2_identifier=None&show_lcms_2nd_map=False&map_plot_zoom=%7B"autosize"%3A+true%7D&polarity_filtering=None&polarity_filtering2=None&tic_option=TIC'),
             html.Br(),
+            html.A("LCMS auto zoomed by URL", href='/?xicmz=271.0315%3B278.1902%3B279.0909%3B285.0205%3B311.0805%3B314.1381&xic_formula=&xic_peptide=&xic_tolerance=0.5&xic_ppm_tolerance=10&xic_tolerance_unit=Da&xic_rt_window=&xic_norm=False&xic_file_grouping=FILE&xic_integration_type=AUC&show_ms2_markers=True&ms2_identifier=None&show_lcms_2nd_map=False&map_plot_zoom=%7B"xaxis.range%5B0%5D"%3A+3.225196497160058%2C+"xaxis.range%5B1%5D"%3A+3.4834247492797554%2C+"yaxis.range%5B0%5D"%3A+521.8432333663449%2C+"yaxis.range%5B1%5D"%3A+615.6041749343235%7D&polarity_filtering=None&polarity_filtering2=None&tic_option=TIC&overlay_usi=None&overlay_mz=row+m%2Fz&overlay_rt=row+retention+time&overlay_color=&overlay_size=&feature_finding_type=Off#{"usi":%20"mzspec:MSV000085852:QC_0",%20"usi2":%20""}'),
+            html.Br(),
             html.A("LCMS auto zoomed by scan in USI", href="/?usi=mzspec:MSV000085852:QC_0:scan:2277"),
             html.Br(),
             html.A("Thermo Q Exactive LCMS", href="/?usi=mzspec%3AMSV000084951%3AAH22&xicmz=870.9543493652343&xic_tolerance=0.5&xic_norm=False&show_ms2_markers=True&ms2_identifier=None"),
@@ -1951,7 +1953,7 @@ def draw_file(url_search, usi, map_selection, show_ms2_markers, polarity_filter,
     import sys
     print(triggered_id, file=sys.stderr)
     print(url_search, file=sys.stderr)
-    print("MAP SELECTION XXXXXXXXXX", map_selection, current_map_selection, triggered_id, usi, file=sys.stderr)
+    print("MAP SELECTION XXXXXXXXXX", map_selection, current_map_selection, highlight_box, triggered_id, usi, file=sys.stderr)
 
     # We have to do a bit of convoluted object, if {'autosize': True}, that means loading from the URL
     try:

test/test.py

@@ -51,4 +51,13 @@ def test_tic():
     for record in df.to_dict(orient="records"):
         print(record["usi"])
         remote_link, local_filename = utils._resolve_usi(record["usi"])
-        tic._tic_file_slow(local_filename)
+        tic._tic_file_slow(local_filename)
+
+def test_url_parsing():
+    params_string = '?xicmz=271.0315%3B278.1902%3B279.0909%3B285.0205%3B311.0805%3B314.1381&xic_formula=&xic_peptide=&xic_tolerance=0.5&xic_ppm_tolerance=10&xic_tolerance_unit=Da&xic_rt_window=&xic_norm=False&xic_file_grouping=FILE&xic_integration_type=AUC&show_ms2_markers=True&ms2_identifier=None&show_lcms_2nd_map=False&map_plot_zoom=%7B%22xaxis.range%5B0%5D%22%3A+3.225196497160058%2C+%22xaxis.range%5B1%5D%22%3A+3.4834247492797554%2C+%22yaxis.range%5B0%5D%22%3A+521.8432333663449%2C+%22yaxis.range%5B1%5D%22%3A+615.6041749343235%7D&polarity_filtering=None&polarity_filtering2=None&tic_option=TIC&overlay_usi=None&overlay_mz=row+m%2Fz&overlay_rt=row+retention+time&overlay_color=&overlay_size=&feature_finding_type=Off'
+
+    param_value = utils._get_param_from_url(params_string, "#", "map_plot_zoom", "{}")
+    print(param_value)
+
+    current_map_selection, highlight_box = utils._resolve_map_plot_selection(params_string, "")
+    print(current_map_selection)

utils.py

@@ -380,7 +380,7 @@ def _resolve_map_plot_selection(url_search, usi):
 
     # Lets start off with taking the url bounds
     try:
-        current_map_selection = json.loads(_get_param_from_url(url_search, "map_plot_zoom", "{}"))
+        current_map_selection = json.loads(_get_param_from_url(url_search, "", "map_plot_zoom", "{}"))
     except:
         pass