Merge pull request #56 from open-AIMS/cache-null-sites

Cache null sites

Author: ConnectedSystems

src/criteria_assessment/criteria.jl

@@ -230,8 +230,12 @@ function setup_region_routes(config, auth)
         # Specifically clear from memory to invoke garbage collector
         assessed = nothing
 
-        if size(best_sites, 1) == 0
-            return json(nothing)
+        if nrow(best_sites) == 0
+            open(suitable_sites_fn, "w") do f
+                JSON.print(f, nothing)
+            end
+
+            return file(suitable_sites_fn)
         end
 
         output_geojson(suitable_sites_fn, best_sites)

src/criteria_assessment/tiles.jl

@@ -182,23 +182,22 @@ function setup_tile_routes(config, auth)
         reg = qp["region"]
         rtype = qp["rtype"]
 
-        criteria_names, lbs, ubs = remove_rugosity(reg, parse_criteria_query(qp)...)
-
         # Calculate tile bounds
         lon_min, lon_max, lat_max, lat_min = _tile_bounds(z, x, y)
+        lons, lats = (lon_min, lon_max), (lat_max, lat_min)
         @debug "Thread $(thread_id) - $(now()) : Calculated bounds (z/x/y, lon bounds, lat bounds): $z $x $y | $(_tile_to_lon_lat(z, x, y)) | ($(lon_min), $(lon_max)), ($(lat_min), $(lat_max))"
 
-        # Extract relevant data based on tile coordinates
-        @debug "Thread $(thread_id) - $(now()) : Extracting tile data"
-        mask_data = threshold_mask(
-            reg_assess_data[reg],
-            Symbol(rtype),
-            CriteriaBounds.(criteria_names, lbs, ubs),
-            (lon_min, lon_max),
-            (lat_min, lat_max)
+        # Check if request is within target region
+        # return empty tile if not.
+        lookup = getfield(reg_assess_data[reg], Symbol(:valid_, rtype))
+        lat1, lat2 = lats[1] > lats[2] ? (lats[2], lats[1]) : (lats[1], lats[2])
+
+        within_search = (
+            (lons[1] .<= lookup.lons .<= lons[2]) .&
+            (lat1 .<= lookup.lats .<= lat2)
         )
 
-        if any(size(mask_data) .== 0)
+        if !any(within_search)
             no_data_path = cache_filename(
                 Dict("no_data" => "none"), config, "no_data", "png"
             )
@@ -207,6 +206,34 @@ function setup_tile_routes(config, auth)
             return file(no_data_path; headers=TILE_HEADERS)
         end
 
+        # TODO: Re-use pre-existing cache for entire region if available
+        # Get mask data if available
+        # assessed_fn = cache_filename(
+        #     extract_criteria(qp, suitability_criteria()), config, "$(reg)_suitable", "tiff"
+        # )
+
+        # TODO: Use previously generated results
+        # assessed_fn = assess_region(config, qp, reg, rtype, reg_assess_data)
+        # if isfile(assessed_fn)
+        #     # assessed = Raster(assessed_fn; lazy=true)
+        #     # Load regional data, subset to area of interest and assess
+        #     mask_data =
+        # else
+        #     # Otherwise, assess the target area directly
+        # end
+
+        criteria_names, lbs, ubs = remove_rugosity(reg, parse_criteria_query(qp)...)
+
+        # Extract relevant data based on tile coordinates
+        @debug "Thread $(thread_id) - $(now()) : Extracting tile data"
+        mask_data = threshold_mask(
+            reg_assess_data[reg],
+            Symbol(rtype),
+            CriteriaBounds.(criteria_names, lbs, ubs),
+            (lon_min, lon_max),
+            (lat_min, lat_max)
+        )
+
         @debug "Thread $(thread_id) - Extracted data size: $(size(mask_data))"
 
         @debug "Thread $(thread_id) - $(now()) : Creating PNG (with transparency)"

src/site_assessment/common_functions.jl

@@ -224,6 +224,10 @@ containing only sites with scores greater than the `surr_threshold` specified in
 `identify_edge_aligned_sites()` (default=0.6).
 """
 function filter_sites(res_df::DataFrame)::DataFrame
+    if nrow(res_df) == 0
+        return res_df
+    end
+
     res_df.row_ID = 1:size(res_df, 1)
     ignore_list = Int64[]