Add bounded terrain and flood analysis
This commit is contained in:
@@ -10,7 +10,7 @@ from .operations import VectorSelectionBBox
|
||||
class FloodHazardAcquireRequest(BaseModel):
|
||||
bbox: VectorSelectionBBox
|
||||
area_id: UUID | None = None
|
||||
product_key: str = "pluvial_current_t100"
|
||||
product_key: str = "pluviaal_current_t100"
|
||||
resolution_m: float | None = Field(default=None, ge=2.0, le=20.0)
|
||||
force_refresh: bool = False
|
||||
|
||||
|
||||
@@ -340,7 +340,7 @@ def test_theme_failures_name_the_source_and_reason() -> None:
|
||||
hook = (root / "frontend/src/hooks/useMapThemeSelectionInsights.ts").read_text(encoding="utf-8")
|
||||
|
||||
assert "queries[index]?.dataset?.name" in hook
|
||||
assert "queries[index]?.thematicProductKey" in hook
|
||||
assert "queries[index]?.acquisition?.displayName" in hook
|
||||
assert "reason: formatError(item.reason" in hook
|
||||
assert "failure.dataset}: ${failure.reason}" in hook
|
||||
|
||||
|
||||
@@ -10,21 +10,22 @@ def read(path: str) -> str:
|
||||
|
||||
def test_flanders_workspace_exposes_governed_thematic_products_on_demand() -> None:
|
||||
workspace = read("frontend/src/components/map/MapWorkspace.tsx")
|
||||
product_hook = read("frontend/src/hooks/useThematicRasterProducts.ts")
|
||||
product_hook = read("frontend/src/hooks/useOfficialRasterProducts.ts")
|
||||
selection_hook = read("frontend/src/hooks/useMapThemeSelectionInsights.ts")
|
||||
api = read("frontend/src/services/api/datasets.ts")
|
||||
|
||||
assert "activeScopeProject?.name === FLANDERS_WORKSPACE_PROJECT_NAME" in workspace
|
||||
assert "new Map<DataThemeId, ThematicRasterProductRead>" in workspace
|
||||
assert "new Map<DataThemeId, OnDemandRasterProduct>" in workspace
|
||||
assert "'Op aanvraag'" in workspace
|
||||
assert "theme.id === 'space_occupation'" in workspace
|
||||
assert "setActiveThemeId(fallbackTheme.id)" in workspace
|
||||
assert "return `referentiejaar ${observationYear}`" in workspace
|
||||
assert "thematicProductKey: thematicProduct.key" in workspace
|
||||
assert "kind: 'thematic_raster'" in workspace
|
||||
assert "productKey: onDemandProduct.productKey" in workspace
|
||||
assert "datasetsApi.listThematicRasterProducts" in product_hook
|
||||
assert "datasetsApi.acquireThematicRaster" in selection_hook
|
||||
assert "datasetsApi.selectThematicRaster" in selection_hook
|
||||
assert "datasetsApi.get(selectedProjectId, acquisition.output_dataset_id)" in selection_hook
|
||||
assert "datasetsApi.get(selectedProjectId, acquisitionJob.output_dataset_id)" in selection_hook
|
||||
assert "/datasets/thematic-raster/acquire" in api
|
||||
|
||||
|
||||
@@ -35,18 +36,18 @@ def test_selection_runs_all_available_themes_and_refreshes_persisted_datasets()
|
||||
|
||||
assert "for (const theme of DATA_THEMES)" in workspace
|
||||
assert "await loadThemeInsights(bbox, availableThemes, areaId)" in workspace
|
||||
assert "!regionalPartitionedThemeActive && !onDemandThematicThemeActive" in workspace
|
||||
assert "!regionalPartitionedThemeActive && !onDemandRasterThemeActive" in workspace
|
||||
assert "onRefreshProjectData" in workspace
|
||||
assert "selectedProjectId ? loadProjectData(selectedProjectId)" in app
|
||||
assert "successful.some((item) => item.thematicProductKey)" in selection_hook
|
||||
assert "successful.some((item) => item.acquisition)" in selection_hook
|
||||
assert "await onDatasetsChanged()" in selection_hook
|
||||
|
||||
|
||||
def test_regional_on_demand_rasters_require_a_bounded_drawn_selection() -> None:
|
||||
workspace = read("frontend/src/components/map/MapWorkspace.tsx")
|
||||
|
||||
assert "regionalOnDemandThematicThemeActive" in workspace
|
||||
assert "regionalRasterThemeActive || regionalOnDemandThematicThemeActive" in workspace
|
||||
assert "regionalOnDemandRasterThemeActive" in workspace
|
||||
assert "regionalRasterThemeActive || regionalOnDemandRasterThemeActive" in workspace
|
||||
assert "Teken een begrensde rechthoek voor een regionale rasteranalyse." in workspace
|
||||
assert "officiële Vlaamse rasters worden begrensd opgehaald, bewaard en hergebruikt" in workspace
|
||||
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
from pathlib import Path
|
||||
|
||||
from app.schemas.flood_hazard import FloodHazardAcquireRequest
|
||||
from app.schemas.operations import VectorSelectionBBox
|
||||
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[2]
|
||||
|
||||
|
||||
def read(path: str) -> str:
|
||||
return (ROOT / path).read_text(encoding="utf-8")
|
||||
|
||||
|
||||
def test_official_raster_catalog_hook_loads_all_governed_registries() -> None:
|
||||
hook = read("frontend/src/hooks/useOfficialRasterProducts.ts")
|
||||
|
||||
assert "datasetsApi.listThematicRasterProducts" in hook
|
||||
assert "datasetsApi.listDhmvProducts" in hook
|
||||
assert "datasetsApi.listFloodHazardProducts" in hook
|
||||
assert "Promise.all([" in hook
|
||||
|
||||
|
||||
def test_map_selection_can_acquire_dhmv_and_flood_hazard_products() -> None:
|
||||
selection_hook = read("frontend/src/hooks/useMapThemeSelectionInsights.ts")
|
||||
workspace = read("frontend/src/components/map/MapWorkspace.tsx")
|
||||
|
||||
assert "'thematic_raster' | 'dhmv' | 'flood_hazard'" in selection_hook
|
||||
assert "datasetsApi.acquireDhmv" in selection_hook
|
||||
assert "datasetsApi.acquireFloodHazard" in selection_hook
|
||||
assert "datasetsApi.acquireThematicRaster" in selection_hook
|
||||
assert 'aria-label="Hoogtemodel"' in workspace
|
||||
assert 'aria-label="Overstromingsscenario"' in workspace
|
||||
assert "product.display_name" in workspace
|
||||
assert "DTM meet het maaiveld; DSM bevat ook gebouwen en vegetatie." in workspace
|
||||
assert "geen actuele waterstand" in workspace
|
||||
|
||||
|
||||
def test_default_flood_hazard_product_exists_in_the_governed_registry() -> None:
|
||||
request = FloodHazardAcquireRequest(
|
||||
bbox=VectorSelectionBBox(min_x=5.0, min_y=51.0, max_x=5.01, max_y=51.01),
|
||||
)
|
||||
|
||||
assert request.product_key == "pluviaal_current_t100"
|
||||
Reference in New Issue
Block a user