Fix: export map search filter

Author: andrea-chirillano

tasks/task_runners.py

@@ -676,16 +676,13 @@ def add_metadata(z, theme):
         mapping_filter = mapping
         if job.unfiltered:
             mapping_filter = None
-        userinfo = job.userinfo
-
         if "geojson" in export_formats:
             geojson = Galaxy(
                 settings.RAW_DATA_API_URL,
                 geom,
                 mapping=mapping_filter,
                 file_name=valid_name,
                 access_token=settings.RAW_DATA_ACCESS_TOKEN,
-                userinfo=userinfo,
             )
             start_task("geojson")
 
@@ -696,7 +693,6 @@ def add_metadata(z, theme):
                 mapping=mapping_filter,
                 file_name=valid_name,
                 access_token=settings.RAW_DATA_ACCESS_TOKEN,
-                userinfo=userinfo,
             )
             start_task("fgb")
 
@@ -717,7 +713,6 @@ def add_metadata(z, theme):
                 mapping=mapping_filter,
                 file_name=valid_name,
                 access_token=settings.RAW_DATA_ACCESS_TOKEN,
-                userinfo=userinfo,
             )
             start_task("sql")
 
@@ -728,7 +723,6 @@ def add_metadata(z, theme):
                 mapping=mapping_filter,
                 file_name=valid_name,
                 access_token=settings.RAW_DATA_ACCESS_TOKEN,
-                userinfo=userinfo,
             )
             # geopackage = tabular.Geopackage(join(stage_dir,valid_name),mapping)
             # tabular_outputs.append(geopackage)
@@ -741,7 +735,6 @@ def add_metadata(z, theme):
                 mapping=mapping_filter,
                 file_name=valid_name,
                 access_token=settings.RAW_DATA_ACCESS_TOKEN,
-                userinfo=userinfo,
             )
             start_task("shp")
 
@@ -752,7 +745,6 @@ def add_metadata(z, theme):
                 mapping=mapping_filter,
                 file_name=valid_name,
                 access_token=settings.RAW_DATA_ACCESS_TOKEN,
-                userinfo=userinfo,
             )
             # kml = tabular.Kml(join(stage_dir,valid_name),mapping)
             # tabular_outputs.append(kml)
@@ -917,7 +909,6 @@ def add_metadata(z, theme):
                     mapping=mapping_filter,
                     file_name=valid_name,
                     access_token=settings.RAW_DATA_ACCESS_TOKEN,
-                    userinfo=userinfo,
                 )
                 start_task("mbtiles")
                 LOG.debug(
@@ -929,8 +920,6 @@ def add_metadata(z, theme):
                 response_back = mbtiles.fetch(
                     "mbtiles",
                     all_feature_filter_json=all_feature_filter_json,
-                    min_zoom=job.mbtiles_minzoom,
-                    max_zoom=job.mbtiles_maxzoom,
                 )
                 write_file_size(response_back)
                 LOG.debug(
@@ -950,7 +939,6 @@ def add_metadata(z, theme):
                     mapping=mapping_filter,
                     file_name=valid_name,
                     access_token=settings.RAW_DATA_ACCESS_TOKEN,
-                    userinfo=userinfo,
                 )
                 start_task("pmtiles")
                 LOG.debug(
@@ -962,8 +950,6 @@ def add_metadata(z, theme):
                 response_back = pmtiles.fetch(
                     "pmtiles",
                     all_feature_filter_json=all_feature_filter_json,
-                    min_zoom=job.mbtiles_minzoom,
-                    max_zoom=job.mbtiles_maxzoom,
                 )
                 write_file_size(response_back)
                 LOG.debug(
@@ -983,7 +969,6 @@ def add_metadata(z, theme):
                     mapping=mapping_filter,
                     file_name=valid_name,
                     access_token=settings.RAW_DATA_ACCESS_TOKEN,
-                    userinfo=userinfo,
                 )
                 start_task("mvt")
                 LOG.debug("Raw Data API fetch started for mvt run: {0}".format(run_uid))
@@ -993,8 +978,6 @@ def add_metadata(z, theme):
                 response_back = mvt.fetch(
                     "mvt",
                     all_feature_filter_json=all_feature_filter_json,
-                    min_zoom=job.mbtiles_minzoom,
-                    max_zoom=job.mbtiles_maxzoom,
                 )
                 write_file_size(response_back)
                 LOG.debug("Raw Data API fetch ended for mvt run: {0}".format(run_uid))

ui/app/actions/aoi/searchToolbarActions.js

@@ -3,16 +3,17 @@ import isEqual from "lodash/isEqual";
 
 import { selectAuthToken } from "../../selectors";
 
+const isHankoAuth = token => token === "hanko-cookie-auth";
+
 export const getGeonames = query => (dispatch, getState) => {
   const token = selectAuthToken(getState());
 
   dispatch({ type: "FETCHING_GEONAMES" });
 
   return axios({
     baseURL: window.EXPORTS_API_URL,
-    headers: {
-      Authorization: `Bearer ${token}`
-    },
+    headers: isHankoAuth(token) ? {} : { Authorization: `Bearer ${token}` },
+    withCredentials: isHankoAuth(token),
     params: {
       q: query
     },
@@ -44,9 +45,8 @@ export const getNominatim = params => (dispatch, getState) => {
 
   return axios({
     baseURL: window.EXPORTS_API_URL,
-    headers: {
-      Authorization: `Bearer ${token}`
-    },
+    headers: isHankoAuth(token) ? {} : { Authorization: `Bearer ${token}` },
+    withCredentials: isHankoAuth(token),
     params: params,
     url: "/api/request_nominatim"
   })