map fix; doc template url

progenetix · Feb 1, 2024 · f1ffa1b · f1ffa1b
1 parent f8e3085
commit f1ffa1b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/docs/plotting.md b/docs/plotting.md
@@ -70,9 +70,9 @@ if not indicated.
 
 ##### Examples
 
-The examples below link to `progenetix.org`.
+The examples below link to {{config.api_site_label}}.
 
-* [/services/collationplots/?filters=NCIT:C35562,NCIT:C3709](https://progenetix.org/services/collationplots/?filters=NCIT:C35562,NCIT:C3709)
+* [/services/collationplots/?filters=NCIT:C35562,NCIT:C3709]({{config.api_web_root}}/services/collationplots/?filters=NCIT:C35562,NCIT:C3709)
     - a combination of 2 histograms
 * [/services/collationplots?filters=NCIT:C35562,NCIT:C3709&datasetIds=progenetix,cellz](https://progenetix.org/services/collationplots?filters=NCIT:C35562,NCIT:C3709&datasetIds=progenetix,cellz)
     - a combination of 2 histograms

diff --git a/mkdocs.yaml b/mkdocs.yaml
@@ -4,6 +4,9 @@ site_author: Michael Baudis
 repo_name: byconaut
 repo_url: https://github.com/progenetix/byconaut
 
+api_site_label: progenetix.org
+api_web_root: https://progenetix.org
+
 ###############################################################################
 
 nav:

diff --git a/services/geolocations.py b/services/geolocations.py
@@ -46,7 +46,7 @@ def geolocations():
     services_db = byc.get("services_db")
     geo_coll = byc.get("geolocs_coll")
 
-    if "file" in byc["form_data"]:
+    if "inputfile" in byc["form_data"]:
         results = read_geomarker_table_web(byc)
     else:
         query, geo_pars = geo_query(byc)

diff --git a/services/lib/geomap_utils.py b/services/lib/geomap_utils.py
@@ -13,7 +13,7 @@ def read_geomarker_table_web(byc):
 
     geolocs = []
 
-    f_a = byc["form_data"].get("file", "")
+    f_a = byc["form_data"].get("inputfile", "")
 
     if not "http" in f_a:
         return geolocs
@@ -191,7 +191,7 @@ def __update_geo_plot_params_from_form(byc):
 
     p_p = byc["geoloc_definitions"].get("plot_params", {})
 
-    p_p.update({"file": byc["form_data"].get("file", "")})
+    p_p.update({"inputfile": byc["form_data"].get("inputfile", "")})
 
     for p_p_k, p_p_v in p_p.items():