Perform local lat/lon check against GeoTIFF coverage masks to check for nodata before fetching from Rasdaman

luts.py

@@ -6,6 +6,11 @@
 
 bbox_offset = 0.000000001
 
+# Coverages with non-EPSG:3338 projections
+geotiff_projections = {
+    "hsia_arctic_production": "EPSG:3572",
+}
+
 landcover_names = {
     0: {"type": "No Data at this location.", "color": "#ffffff"},
     1: {"type": "Temperate or sub-polar needleleaf forest", "color": "#003d00"},

routes/beetles.py

@@ -367,9 +367,14 @@ def run_point_fetch_all_beetles(lat, lon):
     Returns:
         JSON-like dict of beetle risk for a single lat / lon point.
     """
-    validation = validate_latlon(lat, lon)
+    validation = validate_latlon(lat, lon, [beetle_coverage_id])
     if validation == 400:
         return render_template("400/bad_request.html"), 400
+    if validation == 404:
+        return (
+            render_template("404/no_data.html"),
+            404,
+        )
     if validation == 422:
         return (
             render_template(

routes/cmip6.py

@@ -259,7 +259,9 @@ def run_fetch_cmip6_monthly_point_data(lat, lon, start_year=None, end_year=None)
     if validation == 400:
         return render_template("400/bad_request.html"), 400
     cmip6_bbox = construct_latlon_bbox_from_coverage_bounds(metadata)
-    within_bounds = validate_latlon_in_bboxes(lat, lon, [cmip6_bbox])
+    within_bounds = validate_latlon_in_bboxes(
+        lat, lon, [cmip6_bbox], [cmip6_monthly_coverage_id]
+    )
     if within_bounds == 422:
         return (
             render_template(

routes/degree_days.py

@@ -384,7 +384,12 @@ def run_fetch_dd_point_data(
     Returns:
         JSON-like dict of requested degree day data
     """
-    validation = validate_latlon(lat, lon)
+    if var_ep in var_ep_lu.keys():
+        cov_id_str = var_ep_lu[var_ep]["cov_id_str"]
+    else:
+        return render_template("400/bad_request.html"), 400
+
+    validation = validate_latlon(lat, lon, [cov_id_str])
     if validation == 400:
         return render_template("400/bad_request.html"), 400
     if validation == 422:
@@ -394,25 +399,26 @@ def run_fetch_dd_point_data(
             ),
             422,
         )
+    elif validation == 404:
+        return (
+            render_template("404/no_data.html"),
+            404,
+        )
     x, y = project_latlon(lat, lon, 3338)
 
     if None not in [start_year, end_year]:
         valid_year = validate_years(int(start_year), int(end_year))
         if valid_year is not True:
             return valid_year
 
-    if var_ep in var_ep_lu.keys():
-        cov_id_str = var_ep_lu[var_ep]["cov_id_str"]
-        try:
-            point_data = asyncio.run(
-                fetch_dd_point_data(x, y, cov_id_str, start_year, end_year)
-            )
-        except Exception as exc:
-            if hasattr(exc, "status") and exc.status == 404:
-                return render_template("404/no_data.html"), 404
-            return render_template("500/server_error.html"), 500
-    else:
-        return render_template("400/bad_request.html"), 400
+    try:
+        point_data = asyncio.run(
+            fetch_dd_point_data(x, y, cov_id_str, start_year, end_year)
+        )
+    except Exception as exc:
+        if hasattr(exc, "status") and exc.status == 404:
+            return render_template("404/no_data.html"), 404
+        return render_template("500/server_error.html"), 500
 
     # if preview, return unabridged tidy package as CSV
     # the preview arg is only used for CSV generation and should never occur with additional request args

routes/hydrology.py

@@ -362,9 +362,14 @@ def hydro_about():
 
 @routes.route("/hydrology/point/<lat>/<lon>")
 def run_get_hydrology_point_data(lat, lon, summarize=None, preview=None):
-    validation = validate_latlon(lat, lon)
+    validation = validate_latlon(lat, lon, [hydrology_coverage_id])
     if validation == 400:
         return render_template("400/bad_request.html"), 400
+    if validation == 404:
+        return (
+            render_template("404/no_data.html"),
+            404,
+        )
     if validation == 422:
         return (
             render_template(

routes/indicators.py

@@ -350,7 +350,9 @@ def run_fetch_cmip6_indicators_point_data(lat, lon):
     if validation == 400:
         return render_template("400/bad_request.html"), 400
     cmip6_bbox = construct_latlon_bbox_from_coverage_bounds(cmip6_metadata)
-    within_bounds = validate_latlon_in_bboxes(lat, lon, [cmip6_bbox])
+    within_bounds = validate_latlon_in_bboxes(
+        lat, lon, [cmip6_bbox], [cmip6_indicators_coverage_id]
+    )
     if within_bounds == 422:
         return (
             render_template(
@@ -399,9 +401,14 @@ def run_fetch_base_indicators_point_data(lat, lon):
     Notes:
         example request: http://localhost:5000/indicators/base/point/65.06/-146.16
     """
-    validation = validate_latlon(lat, lon)
+    validation = validate_latlon(lat, lon, [indicators_coverage_id])
     if validation == 400:
         return render_template("400/bad_request.html"), 400
+    if validation == 404:
+        return (
+            render_template("404/no_data.html"),
+            404,
+        )
     if validation == 422:
         return (
             render_template(

routes/landfastice.py

@@ -98,7 +98,17 @@ def run_point_fetch_all_landfastice(lat, lon):
     # now construct bboxes to check if the point is within any coverage extent
     beaufort_bbox = construct_latlon_bbox_from_coverage_bounds(beaufort_meta)
     chukchi_bbox = construct_latlon_bbox_from_coverage_bounds(chukchi_meta)
-    within_bounds = validate_latlon_in_bboxes(lat, lon, [beaufort_bbox, chukchi_bbox])
+    within_bounds = validate_latlon_in_bboxes(
+        lat,
+        lon,
+        [beaufort_bbox, chukchi_bbox],
+        [beaufort_daily_slie_id, chukchi_daily_slie_id],
+    )
+    if within_bounds == 404:
+        return (
+            render_template("404/no_data.html"),
+            404,
+        )
     if within_bounds == 422:
         return (
             render_template(

routes/permafrost.py

@@ -475,9 +475,14 @@ async def fetch_gipl_1km_point_data(x, y, start_year, end_year, summarize, ncr):
 async def run_fetch_gipl_1km_point_data(
     lat, lon, start_year=None, end_year=None, summarize=None, preview=None, ncr=False
 ):
-    validation = validate_latlon(lat, lon)
+    validation = validate_latlon(lat, lon, coverages=[gipl_1km_coverage_id])
     if validation == 400:
         return render_template("400/bad_request.html"), 400
+    if validation == 404:
+        return (
+            render_template("404/no_data.html"),
+            404,
+        )
     if validation == 422:
         return (
             render_template(

routes/seaice.py

@@ -74,9 +74,14 @@ def run_point_fetch_all_seaice(lat, lon):
     Returns:
         JSON-like dict of sea ice concentration data
     """
-    validation = validate_seaice_latlon(lat, lon)
+    validation = validate_seaice_latlon(lat, lon, [seaice_coverage_id])
     if validation == 400:
         return render_template("400/bad_request.html"), 400
+    if validation == 404:
+        return (
+            render_template("404/no_data.html"),
+            404,
+        )
     if validation == 422:
         return (
             render_template(

routes/snow.py

@@ -157,9 +157,14 @@ def run_point_fetch_all_sfe(lat, lon, summarize=None, preview=None):
     Returns:
         JSON-like dict of SFE data
     """
-    validation = validate_latlon(lat, lon)
+    validation = validate_latlon(lat, lon, [sfe_coverage_id])
     if validation == 400:
         return render_template("400/bad_request.html"), 400
+    if validation == 404:
+        return (
+            render_template("404/no_data.html"),
+            404,
+        )
     if validation == 422:
         return (
             render_template(

routes/taspr.py

@@ -1073,9 +1073,6 @@ def run_fetch_mmm_point_data(var_ep, lat, lon, cov_id, start_year, end_year):
     Returns:
         JSON-like dict of data at provided latitude and longitude
     """
-    if validate_latlon(lat, lon) is not True:
-        return None
-
     x, y = project_latlon(lat, lon, 3338)
 
     point_data_list = asyncio.run(
@@ -1092,7 +1089,7 @@ def run_fetch_mmm_point_data(var_ep, lat, lon, cov_id, start_year, end_year):
     return point_pkg
 
 
-async def run_fetch_tas_2km_point_data(lat, lon):
+async def run_fetch_tas_2km_point_data(lat, lon, coverages):
     """Run the async tas/pr data requesting for a single point
     and return data as json
 
@@ -1103,16 +1100,11 @@ async def run_fetch_tas_2km_point_data(lat, lon):
     Returns:
         JSON-like dict of data at provided latitude and longitude
     """
-    if validate_latlon(lat, lon) is not True:
-        return None
-
     x, y = project_latlon(lat, lon, 3338)
 
     tasks = []
-    for coverage in ["historical", "projected"]:
-        tasks.append(
-            asyncio.create_task(fetch_wcs_point_data(x, y, f"tas_2km_{coverage}"))
-        )
+    for coverage in coverages:
+        tasks.append(asyncio.create_task(fetch_wcs_point_data(x, y, coverage)))
     results = await asyncio.gather(*tasks)
 
     point_pkg = package_tas_2km_point_data(results)
@@ -1133,8 +1125,7 @@ def run_fetch_var_point_data(var_ep, lat, lon):
     Returns:
         JSON-like dict of data at provided latitude and longitude
     """
-    if validate_latlon(lat, lon) is not True:
-        return None
+    cov_ids, summary_decades = make_fetch_args()
 
     varname = var_ep_lu[var_ep]
     # get the coordinate value for the specified variable
@@ -1150,7 +1141,6 @@ def run_fetch_var_point_data(var_ep, lat, lon):
     # order of listing: CRU (1950-2009), AR5 2040-2069 summary,
     #     AR5 2070-2099 summary, AR5 seasonal data
     # query CRU baseline summary
-    cov_ids, summary_decades = make_fetch_args()
     point_data_list = asyncio.run(
         fetch_point_data(x, y, var_coord, cov_ids, summary_decades)
     )
@@ -1456,17 +1446,6 @@ def mmm_point_data_endpoint(
         example request: http://localhost:5000/jan/65.0628/-146.1627
     """
 
-    validation = validate_latlon(lat, lon)
-    if validation == 400:
-        return render_template("400/bad_request.html"), 400
-    if validation == 422:
-        return (
-            render_template(
-                "422/invalid_latlon.html", west_bbox=WEST_BBOX, east_bbox=EAST_BBOX
-            ),
-            422,
-        )
-
     if month is not None:
         if month == "jan":
             cov_id = "jan_min_max_mean_temp"
@@ -1487,6 +1466,22 @@ def mmm_point_data_endpoint(
         if validation == 400:
             return render_template("400/bad_request.html"), 400
 
+    validation = validate_latlon(lat, lon, [cov_id])
+    if validation == 400:
+        return render_template("400/bad_request.html"), 400
+    if validation == 404:
+        return (
+            render_template("404/no_data.html"),
+            404,
+        )
+    if validation == 422:
+        return (
+            render_template(
+                "422/invalid_latlon.html", west_bbox=WEST_BBOX, east_bbox=EAST_BBOX
+            ),
+            422,
+        )
+
     # validate request args before fetching data
     if len(request.args) == 0:
         pass  # no additional request args will be passed to the run_fetch_mmm_point_data function
@@ -1584,9 +1579,15 @@ def tas_2km_point_data_endpoint(lat, lon):
         example request: http://localhost:5000/tas2km/point/65.0628/-146.1627
     """
 
-    validation = validate_latlon(lat, lon)
+    coverages = ["tas_2km_historical", "tas_2km_projected"]
+    validation = validate_latlon(lat, lon, coverages)
     if validation == 400:
         return render_template("400/bad_request.html"), 400
+    if validation == 404:
+        return (
+            render_template("404/no_data.html"),
+            404,
+        )
     if validation == 422:
         return (
             render_template(
@@ -1605,7 +1606,7 @@ def tas_2km_point_data_endpoint(lat, lon):
             return render_template("400/bad_request.html"), 400
 
     try:
-        point_pkg = asyncio.run(run_fetch_tas_2km_point_data(lat, lon))
+        point_pkg = asyncio.run(run_fetch_tas_2km_point_data(lat, lon, coverages))
     except Exception as exc:
         if hasattr(exc, "status") and exc.status == 404:
             return render_template("404/no_data.html"), 404
@@ -1637,9 +1638,15 @@ def point_data_endpoint(lat, lon):
         example request: http://localhost:5000/temperature/point/65.0628/-146.1627
     """
 
-    validation = validate_latlon(lat, lon)
+    cov_ids, _ = make_fetch_args()
+    validation = validate_latlon(lat, lon, cov_ids)
     if validation == 400:
         return render_template("400/bad_request.html"), 400
+    if validation == 404:
+        return (
+            render_template("404/no_data.html"),
+            404,
+        )
     if validation == 422:
         return (
             render_template(
@@ -1745,9 +1752,14 @@ def taspr_area_data_endpoint(var_id):
 
 @routes.route("/precipitation/frequency/point/<lat>/<lon>")
 def proj_precip_point(lat, lon):
-    validation = validate_latlon(lat, lon)
+    validation = validate_latlon(lat, lon, [dot_precip_coverage_id])
     if validation == 400:
         return render_template("400/bad_request.html"), 400
+    if validation == 404:
+        return (
+            render_template("404/no_data.html"),
+            404,
+        )
     if validation == 422:
         return (
             render_template(

routes/wet_days_per_year.py

@@ -306,9 +306,14 @@ def run_fetch_wet_days_per_year_point_data(
     Notes:
         example request: http://localhost:5000/mmm/wet_days_per_year/all/65/-147
     """
-    validation = validate_latlon(lat, lon)
+    validation = validate_latlon(lat, lon, ["wet_days_per_year"])
     if validation == 400:
         return render_template("400/bad_request.html"), 400
+    if validation == 404:
+        return (
+            render_template("404/no_data.html"),
+            404,
+        )
     if validation == 422:
         return (
             render_template(