Skip to content
This repository was archived by the owner on Jul 11, 2025. It is now read-only.

feat: data initialisation, criteria and assessment parameters refactor #67

Merged
merged 29 commits into from
Jun 4, 2025
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
90b2055
WIP on improving criteria parsing/defaults
PeterBaker0 May 21, 2025
f239fd1
Integrating helpers with job routes
PeterBaker0 May 21, 2025
25f2a24
Debug messages and adding out of bounds warnings
PeterBaker0 May 21, 2025
77b740f
WIP
PeterBaker0 May 21, 2025
c845043
Equivalent functionality done I think
PeterBaker0 May 22, 2025
844a688
Starting to deprecate, restructuring, documentation
PeterBaker0 May 22, 2025
cf88137
Working systemtically through optionality of criteria on a per region…
PeterBaker0 May 22, 2025
b4a38f6
Working through regional assessment candidate implementation
PeterBaker0 May 22, 2025
4e4e0a0
WIP
PeterBaker0 May 22, 2025
8baea13
Site assessment using new parameters
PeterBaker0 May 22, 2025
7662308
Pre-refactor, working
PeterBaker0 May 23, 2025
907ebfe
Refactoring to simplify - removing the struct hardcodes instead using…
PeterBaker0 May 23, 2025
0fa0b1a
WIP some minor errors after refactor
PeterBaker0 May 23, 2025
65610fd
Finishing refactor
PeterBaker0 May 23, 2025
d4334d0
Comment fixes
PeterBaker0 May 28, 2025
e379178
Cleanup!
PeterBaker0 May 29, 2025
d88a439
Refactoring code around - working again
PeterBaker0 May 29, 2025
22521bd
Couple of fixes
PeterBaker0 May 29, 2025
f5f5188
Update src/assessment_methods/apply_criteria.jl
PeterBaker0 May 29, 2025
a120194
PR changes
PeterBaker0 May 30, 2025
75bb861
Merge pull request #68 from open-AIMS/feat/cleanup-old-func
PeterBaker0 May 30, 2025
25aa2c5
Removing suitability threshold
PeterBaker0 Jun 3, 2025
4ed8251
Adding other display information
PeterBaker0 Jun 3, 2025
4a52f66
Addming min/max tooltip
PeterBaker0 Jun 3, 2025
1de582f
Changing descriptoin to subtitle
PeterBaker0 Jun 3, 2025
b87b738
Filled in criteria metadata
ConnectedSystems Jun 3, 2025
9bc1892
Update src/utility/regions_criteria_setup.jl
ConnectedSystems Jun 3, 2025
e9da7a3
Merge pull request #71 from open-AIMS/takuya/slider-info
ConnectedSystems Jun 4, 2025
49de9a6
Merge pull request #70 from open-AIMS/feat/adding-more-slider-info
PeterBaker0 Jun 4, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 15 additions & 18 deletions src/ReefGuideAPI.jl
Original file line number Diff line number Diff line change
Expand Up @@ -24,35 +24,27 @@ using
HTTP,
Oxygen

include("job_worker/Worker.jl")
# Worker system
include("job_worker/index.jl")

# Utilities and helpers for assessments
include("utility/index.jl")

include("Middleware.jl")
include("admin.jl")
include("file_io.jl")
include("server_cache.jl")

# TODO Remove these due to deprecation
include("job_management/JobInterface.jl")
include("job_management/DiskService.jl")

include("criteria_assessment/criteria.jl")
include("criteria_assessment/query_thresholds.jl")
include("criteria_assessment/regional_assessment.jl")
include("criteria_assessment/site_identification.jl")

include("site_assessment/common_functions.jl")
include("site_assessment/best_fit_polygons.jl")

function get_regions()
# TODO: Comes from config?
regions = String[
"Townsville-Whitsunday",
"Cairns-Cooktown",
"Mackay-Capricorn",
"FarNorthern"
]

return regions
end
include("criteria_assessment/tiles.jl")

function get_auth_router(config::Dict)
# Setup auth middleware - depends on config.toml - can return identity func
Expand All @@ -63,11 +55,12 @@ end
function start_server(config_path)
@info "Launching server... please wait"

warmup_cache(config_path)

@info "Parsing configuration from $(config_path)..."
config = TOML.parsefile(config_path)

@info "Initialising regional data and setting up tile cache"
initialise_data_with_cache(config)

@info "Setting up auth middleware and router."
auth = get_auth_router(config)

Expand Down Expand Up @@ -110,13 +103,17 @@ This is a blocking operation until the worker times out.
function start_worker()
@info "Initializing worker from environment variables..."
worker = create_worker_from_env()
@info "Parsing TOML config"
config = TOML.parsefile(worker.config.config_path)
@info "Loading regional data"
initialise_data_with_cache(config)
@info "Starting worker loop from ReefGuideAPI.jl"
start(worker)
@info "Worker closed itself..."
end

export
RegionalCriteria,
OldRegionalCriteria,
criteria_data_map

# Methods to assess/identify deployment "plots" of reef.
Expand Down
50 changes: 0 additions & 50 deletions src/criteria_assessment/_generators_dev.jl

This file was deleted.

144 changes: 0 additions & 144 deletions src/criteria_assessment/criteria.jl

This file was deleted.

Loading
Loading