From 5f9d5ea101cc3f02324c3b91d7c1171109e2d96c Mon Sep 17 00:00:00 2001 From: Hans Kallekleiv <16436291+HansKallekleiv@users.noreply.github.com> Date: Sun, 5 Nov 2023 18:28:36 +0100 Subject: [PATCH 01/14] Surface Matrix --- backend/.vscode/launch.json | 16 -- .../primary/routers/surface/converters.py | 31 ++- .../backend/primary/routers/surface/router.py | 92 ++++++- .../primary/routers/surface/schemas.py | 15 ++ .../services/sumo_access/surface_access.py | 6 +- frontend/src/api/index.ts | 1 + frontend/src/api/models/EnsembleParameter.ts | 4 +- .../models/EnsembleParameterDescription.ts | 4 +- .../src/api/models/EnsembleScalarResponse.ts | 4 +- frontend/src/api/models/GraphUserPhoto.ts | 2 +- frontend/src/api/models/Observations.ts | 4 +- frontend/src/api/models/PolygonsMeta.ts | 6 +- frontend/src/api/models/RftObservation.ts | 2 +- frontend/src/api/models/RftObservations.ts | 2 +- frontend/src/api/models/StratigraphicUnit.ts | 4 +- .../models/SummaryVectorDateObservation.ts | 2 +- .../api/models/SummaryVectorObservations.ts | 2 +- frontend/src/api/models/SurfaceDataPng.ts | 19 ++ frontend/src/api/models/SurfaceMeta.ts | 14 +- frontend/src/api/models/UserInfo.ts | 4 +- frontend/src/api/models/WellBorePick.ts | 2 +- .../WellBorePicksAndStratigraphicUnits.ts | 4 +- .../src/api/models/WellCompletionsZone.ts | 2 +- frontend/src/api/services/SurfaceService.ts | 71 ++++++ frontend/src/modules/Grid3D/view.tsx | 2 +- .../src/modules/MapMatrix/_utils/isoString.ts | 19 ++ .../ensembleIdentSelectWithButtons.tsx | 69 ++++++ .../components/ensembleStageSelect.tsx | 109 +++++++++ .../components/previousNextButtons.tsx | 38 +++ .../components/singleSelectWithButtons.tsx | 34 +++ .../components/surfaceAttributeTypeSelect.tsx | 77 ++++++ .../components/surfaceColorSelect.tsx | 33 +++ .../MapMatrix/components/surfaceSelect.tsx | 205 ++++++++++++++++ .../components/surfaceSpecificationLabel.tsx | 80 +++++++ .../MapMatrix/components/syncSettings.tsx | 39 +++ .../hooks/useEnsembleSetSurfaceMetaQuery.ts | 68 ++++++ .../hooks/useSurfaceDataAsPngQuery.ts | 82 +++++++ .../MapMatrix/hooks/useSurfaceReducer.ts | 94 ++++++++ frontend/src/modules/MapMatrix/loadModule.tsx | 10 + .../MapMatrix/reducers/surfaceReducer.ts | 117 +++++++++ .../src/modules/MapMatrix/registerModule.ts | 5 + frontend/src/modules/MapMatrix/settings.tsx | 134 +++++++++++ frontend/src/modules/MapMatrix/state.ts | 9 + frontend/src/modules/MapMatrix/types.ts | 56 +++++ frontend/src/modules/MapMatrix/view.tsx | 226 ++++++++++++++++++ .../src/modules/SubsurfaceMap/_utils/color.ts | 19 -- .../src/modules/SubsurfaceMap/_utils/index.ts | 10 - frontend/src/modules/SubsurfaceMap/state.ts | 3 +- frontend/src/modules/SubsurfaceMap/view.tsx | 47 ++-- .../Surface/subsurfaceMapUtils.ts} | 35 +++ .../_shared/Surface/surfaceDirectory.ts | 35 +++ frontend/src/modules/registerAllModules.ts | 1 + nginx.conf | 2 +- 53 files changed, 1849 insertions(+), 122 deletions(-) delete mode 100644 backend/.vscode/launch.json create mode 100644 frontend/src/api/models/SurfaceDataPng.ts create mode 100644 frontend/src/modules/MapMatrix/_utils/isoString.ts create mode 100644 frontend/src/modules/MapMatrix/components/ensembleIdentSelectWithButtons.tsx create mode 100644 frontend/src/modules/MapMatrix/components/ensembleStageSelect.tsx create mode 100644 frontend/src/modules/MapMatrix/components/previousNextButtons.tsx create mode 100644 frontend/src/modules/MapMatrix/components/singleSelectWithButtons.tsx create mode 100644 frontend/src/modules/MapMatrix/components/surfaceAttributeTypeSelect.tsx create mode 100644 frontend/src/modules/MapMatrix/components/surfaceColorSelect.tsx create mode 100644 frontend/src/modules/MapMatrix/components/surfaceSelect.tsx create mode 100644 frontend/src/modules/MapMatrix/components/surfaceSpecificationLabel.tsx create mode 100644 frontend/src/modules/MapMatrix/components/syncSettings.tsx create mode 100644 frontend/src/modules/MapMatrix/hooks/useEnsembleSetSurfaceMetaQuery.ts create mode 100644 frontend/src/modules/MapMatrix/hooks/useSurfaceDataAsPngQuery.ts create mode 100644 frontend/src/modules/MapMatrix/hooks/useSurfaceReducer.ts create mode 100644 frontend/src/modules/MapMatrix/loadModule.tsx create mode 100644 frontend/src/modules/MapMatrix/reducers/surfaceReducer.ts create mode 100644 frontend/src/modules/MapMatrix/registerModule.ts create mode 100644 frontend/src/modules/MapMatrix/settings.tsx create mode 100644 frontend/src/modules/MapMatrix/state.ts create mode 100644 frontend/src/modules/MapMatrix/types.ts create mode 100644 frontend/src/modules/MapMatrix/view.tsx delete mode 100644 frontend/src/modules/SubsurfaceMap/_utils/color.ts delete mode 100644 frontend/src/modules/SubsurfaceMap/_utils/index.ts rename frontend/src/modules/{SubsurfaceMap/_utils/subsurfaceMap.ts => _shared/Surface/subsurfaceMapUtils.ts} (82%) diff --git a/backend/.vscode/launch.json b/backend/.vscode/launch.json deleted file mode 100644 index 6f7bb14f7..000000000 --- a/backend/.vscode/launch.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "configurations": [ - { - "name": "Python: Remote Attach", - "type": "python", - "request": "attach", - "connect": { "host": "localhost", "port": 5678 }, - "pathMappings": [ - { - "localRoot": "${workspaceFolder}", - "remoteRoot": "/home/appuser/backend" - } - ] - } - ] -} diff --git a/backend/src/backend/primary/routers/surface/converters.py b/backend/src/backend/primary/routers/surface/converters.py index 5b6a48f3f..81a562627 100644 --- a/backend/src/backend/primary/routers/surface/converters.py +++ b/backend/src/backend/primary/routers/surface/converters.py @@ -1,4 +1,5 @@ from typing import List +import base64 import numpy as np import xtgeo @@ -9,6 +10,8 @@ from src.services.sumo_access.surface_types import XtgeoSurfaceIntersectionPolyline, XtgeoSurfaceIntersectionResult from src.services.utils.b64 import b64_encode_float_array_as_float32 from src.services.utils.surface_to_float32 import surface_to_float32_numpy_array +from src.services.utils.surface_to_png import surface_to_png_bytes_optimized +from src.services.utils.surface_orientation import calc_surface_orientation_for_colormap_layer from . import schemas @@ -26,7 +29,7 @@ def resample_property_surface_to_mesh_surface( return mesh_surface -def to_api_surface_data(xtgeo_surf: xtgeo.RegularSurface) -> schemas.SurfaceData: +def to_api_surface_data_as_float32(xtgeo_surf: xtgeo.RegularSurface) -> schemas.SurfaceData: """ Create API SurfaceData from xtgeo regular surface """ @@ -52,6 +55,32 @@ def to_api_surface_data(xtgeo_surf: xtgeo.RegularSurface) -> schemas.SurfaceData ) +def to_api_surface_data_as_png(xtgeo_surf: xtgeo.RegularSurface) -> schemas.SurfaceDataPng: + """ + Create API SurfaceData from xtgeo regular surface + """ + + png_bytes: bytes = surface_to_png_bytes_optimized(xtgeo_surf) + base64_data = base64.b64encode(png_bytes).decode("ascii") + + surf_orient = calc_surface_orientation_for_colormap_layer(xtgeo_surf) + + return schemas.SurfaceDataPng( + x_min_surf_orient=surf_orient.x_min, + x_max_surf_orient=surf_orient.x_max, + y_min_surf_orient=surf_orient.y_min, + y_max_surf_orient=surf_orient.y_max, + x_min=xtgeo_surf.xmin, + x_max=xtgeo_surf.xmax, + y_min=xtgeo_surf.ymin, + y_max=xtgeo_surf.ymax, + val_min=xtgeo_surf.values.min(), + val_max=xtgeo_surf.values.max(), + rot_deg=surf_orient.rot_around_xmin_ymax_deg, + base64_encoded_image=f"{base64_data}", + ) + + def to_api_surface_directory( sumo_surface_dir: List[SumoSurfaceMeta], stratigraphical_names: List[StratigraphicSurface] ) -> List[schemas.SurfaceMeta]: diff --git a/backend/src/backend/primary/routers/surface/router.py b/backend/src/backend/primary/routers/surface/router.py index 4ac930c5a..35be99019 100644 --- a/backend/src/backend/primary/routers/surface/router.py +++ b/backend/src/backend/primary/routers/surface/router.py @@ -5,8 +5,12 @@ from src.services.sumo_access.surface_access import SurfaceAccess from src.services.smda_access.stratigraphy_access import StratigraphyAccess -from src.services.smda_access.stratigraphy_utils import sort_stratigraphic_names_by_hierarchy -from src.services.smda_access.mocked_drogon_smda_access import _mocked_stratigraphy_access +from src.services.smda_access.stratigraphy_utils import ( + sort_stratigraphic_names_by_hierarchy, +) +from src.services.smda_access.mocked_drogon_smda_access import ( + _mocked_stratigraphy_access, +) from src.services.utils.statistic_function import StatisticFunction from src.services.utils.authenticated_user import AuthenticatedUser from src.services.utils.perf_timer import PerfTimer @@ -68,14 +72,17 @@ async def get_realization_surface_data( access = await SurfaceAccess.from_case_uuid(authenticated_user.get_sumo_access_token(), case_uuid, ensemble_name) xtgeo_surf = await access.get_realization_surface_data_async( - real_num=realization_num, name=name, attribute=attribute, time_or_interval_str=time_or_interval + real_num=realization_num, + name=name, + attribute=attribute, + time_or_interval_str=time_or_interval, ) perf_metrics.record_lap("get-surf") if not xtgeo_surf: raise HTTPException(status_code=404, detail="Surface not found") - surf_data_response = converters.to_api_surface_data(xtgeo_surf) + surf_data_response = converters.to_api_surface_data_as_float32(xtgeo_surf) perf_metrics.record_lap("convert") LOGGER.info(f"Loaded realization surface in: {perf_metrics.to_string()}") @@ -113,7 +120,78 @@ async def get_statistical_surface_data( if not xtgeo_surf: raise HTTPException(status_code=404, detail="Could not find or compute surface") - surf_data_response: schemas.SurfaceData = converters.to_api_surface_data(xtgeo_surf) + surf_data_response: schemas.SurfaceData = converters.to_api_surface_data_as_float32(xtgeo_surf) + perf_metrics.record_lap("convert") + + LOGGER.debug(f"Calculated statistical surface in: {perf_metrics.to_string()}") + + return surf_data_response + + +@router.get("/realization_surface_data_as_png/") +async def get_realization_surface_data_as_png( + response: Response, + authenticated_user: AuthenticatedUser = Depends(AuthHelper.get_authenticated_user), + case_uuid: str = Query(description="Sumo case uuid"), + ensemble_name: str = Query(description="Ensemble name"), + realization_num: int = Query(description="Realization number"), + name: str = Query(description="Surface name"), + attribute: str = Query(description="Surface attribute"), + time_or_interval: Optional[str] = Query(None, description="Time point or time interval string"), +) -> schemas.SurfaceDataPng: + perf_metrics = PerfMetrics(response) + + access = await SurfaceAccess.from_case_uuid(authenticated_user.get_sumo_access_token(), case_uuid, ensemble_name) + xtgeo_surf = await access.get_realization_surface_data_async( + real_num=realization_num, + name=name, + attribute=attribute, + time_or_interval_str=time_or_interval, + ) + perf_metrics.record_lap("get-surf") + + if not xtgeo_surf: + raise HTTPException(status_code=404, detail="Surface not found") + + surf_data_response = converters.to_api_surface_data_as_png(xtgeo_surf) + perf_metrics.record_lap("convert") + + LOGGER.debug(f"Loaded realization surface in: {perf_metrics.to_string()}") + + return surf_data_response + + +@router.get("/statistical_surface_data_as_png/") +async def get_statistical_surface_data_as_png( + response: Response, + authenticated_user: AuthenticatedUser = Depends(AuthHelper.get_authenticated_user), + case_uuid: str = Query(description="Sumo case uuid"), + ensemble_name: str = Query(description="Ensemble name"), + statistic_function: schemas.SurfaceStatisticFunction = Query(description="Statistics to calculate"), + name: str = Query(description="Surface name"), + attribute: str = Query(description="Surface attribute"), + time_or_interval: Optional[str] = Query(None, description="Time point or time interval string"), +) -> schemas.SurfaceDataPng: + perf_metrics = PerfMetrics(response) + + access = await SurfaceAccess.from_case_uuid(authenticated_user.get_sumo_access_token(), case_uuid, ensemble_name) + + service_stat_func_to_compute = StatisticFunction.from_string_value(statistic_function) + if service_stat_func_to_compute is None: + raise HTTPException(status_code=404, detail="Invalid statistic requested") + + xtgeo_surf = await access.get_statistical_surface_data_async( + statistic_function=service_stat_func_to_compute, + name=name, + attribute=attribute, + time_or_interval_str=time_or_interval, + ) + perf_metrics.record_lap("sumo-calc") + + if not xtgeo_surf: + raise HTTPException(status_code=404, detail="Could not find or compute surface") + + surf_data_response = converters.to_api_surface_data_as_png(xtgeo_surf) perf_metrics.record_lap("convert") LOGGER.info(f"Calculated statistical surface in: {perf_metrics.to_string()}") @@ -158,7 +236,7 @@ async def get_property_surface_resampled_to_static_surface( resampled_surface = converters.resample_property_surface_to_mesh_surface(xtgeo_surf_mesh, xtgeo_surf_property) perf_metrics.record_lap("resample") - surf_data_response: schemas.SurfaceData = converters.to_api_surface_data(resampled_surface) + surf_data_response: schemas.SurfaceData = converters.to_api_surface_data_as_float32(resampled_surface) perf_metrics.record_lap("convert") LOGGER.info(f"Loaded property surface in: {perf_metrics.to_string()}") @@ -201,7 +279,7 @@ async def get_property_surface_resampled_to_statistical_static_surface( resampled_surface = converters.resample_property_surface_to_mesh_surface(xtgeo_surf_mesh, xtgeo_surf_property) - surf_data_response = converters.to_api_surface_data(resampled_surface) + surf_data_response = converters.to_api_surface_data_as_float32(resampled_surface) LOGGER.info(f"Loaded property surface and created image, total time: {timer.elapsed_ms()}ms") diff --git a/backend/src/backend/primary/routers/surface/schemas.py b/backend/src/backend/primary/routers/surface/schemas.py index 2a2b7338c..8e62bbc0d 100644 --- a/backend/src/backend/primary/routers/surface/schemas.py +++ b/backend/src/backend/primary/routers/surface/schemas.py @@ -116,3 +116,18 @@ class SurfaceRealizationSampleValues(BaseModel): class PointSetXY(BaseModel): x_points: list[float] y_points: list[float] + + +class SurfaceDataPng(BaseModel): + x_min_surf_orient: float + x_max_surf_orient: float + y_min_surf_orient: float + y_max_surf_orient: float + x_min: float + x_max: float + y_min: float + y_max: float + val_min: float + val_max: float + rot_deg: float + base64_encoded_image: str diff --git a/backend/src/services/sumo_access/surface_access.py b/backend/src/services/sumo_access/surface_access.py index 90f7a8ab3..351ba8ebe 100644 --- a/backend/src/services/sumo_access/surface_access.py +++ b/backend/src/services/sumo_access/surface_access.py @@ -100,7 +100,11 @@ async def get_realization_surface_intersection_async( return _make_intersection(surface, xtgeo_fencespec) async def get_realization_surface_data_async( - self, real_num: int, name: str, attribute: str, time_or_interval_str: Optional[str] = None + self, + real_num: int, + name: str, + attribute: str, + time_or_interval_str: Optional[str] = None, ) -> Optional[xtgeo.RegularSurface]: """ Get surface data for a realization surface diff --git a/frontend/src/api/index.ts b/frontend/src/api/index.ts index 9e0df87e7..e88a6f0c3 100644 --- a/frontend/src/api/index.ts +++ b/frontend/src/api/index.ts @@ -55,6 +55,7 @@ export type { SummaryVectorDateObservation as SummaryVectorDateObservation_api } export type { SummaryVectorObservations as SummaryVectorObservations_api } from './models/SummaryVectorObservations'; export { SurfaceAttributeType as SurfaceAttributeType_api } from './models/SurfaceAttributeType'; export type { SurfaceData as SurfaceData_api } from './models/SurfaceData'; +export type { SurfaceDataPng as SurfaceDataPng_api } from './models/SurfaceDataPng'; export type { SurfaceIntersectionCumulativeLengthPolyline as SurfaceIntersectionCumulativeLengthPolyline_api } from './models/SurfaceIntersectionCumulativeLengthPolyline'; export type { SurfaceIntersectionData as SurfaceIntersectionData_api } from './models/SurfaceIntersectionData'; export type { SurfaceMeta as SurfaceMeta_api } from './models/SurfaceMeta'; diff --git a/frontend/src/api/models/EnsembleParameter.ts b/frontend/src/api/models/EnsembleParameter.ts index 684b518a5..3f4bdbd66 100644 --- a/frontend/src/api/models/EnsembleParameter.ts +++ b/frontend/src/api/models/EnsembleParameter.ts @@ -10,8 +10,8 @@ export type EnsembleParameter = { is_logarithmic: boolean; is_numerical: boolean; is_constant: boolean; - group_name: (string | null); - descriptive_name: (string | null); + group_name?: (string | null); + descriptive_name?: (string | null); realizations: Array; values: (Array | Array); }; diff --git a/frontend/src/api/models/EnsembleParameterDescription.ts b/frontend/src/api/models/EnsembleParameterDescription.ts index eae024cc4..13d114bf9 100644 --- a/frontend/src/api/models/EnsembleParameterDescription.ts +++ b/frontend/src/api/models/EnsembleParameterDescription.ts @@ -4,8 +4,8 @@ /* eslint-disable */ export type EnsembleParameterDescription = { name: string; - group_name: (string | null); - descriptive_name: (string | null); + group_name?: (string | null); + descriptive_name?: (string | null); is_numerical: boolean; }; diff --git a/frontend/src/api/models/EnsembleScalarResponse.ts b/frontend/src/api/models/EnsembleScalarResponse.ts index 10d7766ab..17b4e68c7 100644 --- a/frontend/src/api/models/EnsembleScalarResponse.ts +++ b/frontend/src/api/models/EnsembleScalarResponse.ts @@ -8,7 +8,7 @@ export type EnsembleScalarResponse = { realizations: Array; values: Array; - name: (string | null); - unit: (string | null); + name?: (string | null); + unit?: (string | null); }; diff --git a/frontend/src/api/models/GraphUserPhoto.ts b/frontend/src/api/models/GraphUserPhoto.ts index bd7d316d0..3b0605393 100644 --- a/frontend/src/api/models/GraphUserPhoto.ts +++ b/frontend/src/api/models/GraphUserPhoto.ts @@ -3,6 +3,6 @@ /* tslint:disable */ /* eslint-disable */ export type GraphUserPhoto = { - avatar_b64str: (string | null); + avatar_b64str?: (string | null); }; diff --git a/frontend/src/api/models/Observations.ts b/frontend/src/api/models/Observations.ts index 01ce18918..24984301b 100644 --- a/frontend/src/api/models/Observations.ts +++ b/frontend/src/api/models/Observations.ts @@ -8,7 +8,7 @@ import type { SummaryVectorObservations } from './SummaryVectorObservations'; * A collection of observations associated with a field/case/ensemble */ export type Observations = { - summary: Array; - rft: Array; + summary?: Array; + rft?: Array; }; diff --git a/frontend/src/api/models/PolygonsMeta.ts b/frontend/src/api/models/PolygonsMeta.ts index a9555a693..7aa58d919 100644 --- a/frontend/src/api/models/PolygonsMeta.ts +++ b/frontend/src/api/models/PolygonsMeta.ts @@ -6,9 +6,9 @@ import type { PolygonsAttributeType } from './PolygonsAttributeType'; export type PolygonsMeta = { name: string; name_is_stratigraphic_offical: boolean; - stratigraphic_identifier: (string | null); - relative_stratigraphic_level: (number | null); - parent_stratigraphic_identifier: (string | null); + stratigraphic_identifier?: (string | null); + relative_stratigraphic_level?: (number | null); + parent_stratigraphic_identifier?: (string | null); attribute_name: string; attribute_type: PolygonsAttributeType; }; diff --git a/frontend/src/api/models/RftObservation.ts b/frontend/src/api/models/RftObservation.ts index b66453be1..40caf3a7d 100644 --- a/frontend/src/api/models/RftObservation.ts +++ b/frontend/src/api/models/RftObservation.ts @@ -17,7 +17,7 @@ */ export type RftObservation = { value: number; - comment: (string | null); + comment?: (string | null); error: number; zone: string; md_msl: number; diff --git a/frontend/src/api/models/RftObservations.ts b/frontend/src/api/models/RftObservations.ts index bb1d9a650..a0e68608f 100644 --- a/frontend/src/api/models/RftObservations.ts +++ b/frontend/src/api/models/RftObservations.ts @@ -15,7 +15,7 @@ import type { RftObservation } from './RftObservation'; export type RftObservations = { well: string; date: string; - comment: (string | null); + comment?: (string | null); observations: Array; }; diff --git a/frontend/src/api/models/StratigraphicUnit.ts b/frontend/src/api/models/StratigraphicUnit.ts index 614eb722c..1c23618a3 100644 --- a/frontend/src/api/models/StratigraphicUnit.ts +++ b/frontend/src/api/models/StratigraphicUnit.ts @@ -15,10 +15,10 @@ export type StratigraphicUnit = { stratUnitType: string; topAge: number; baseAge: number; - stratUnitParent: (string | null); + stratUnitParent?: (string | null); colorR: number; colorG: number; colorB: number; - lithologyType: (number | string); + lithologyType?: (number | string); }; diff --git a/frontend/src/api/models/SummaryVectorDateObservation.ts b/frontend/src/api/models/SummaryVectorDateObservation.ts index e9df49f20..742a41c37 100644 --- a/frontend/src/api/models/SummaryVectorDateObservation.ts +++ b/frontend/src/api/models/SummaryVectorDateObservation.ts @@ -7,7 +7,7 @@ */ export type SummaryVectorDateObservation = { date: string; - comment: (string | null); + comment?: (string | null); value: number; error: number; label: string; diff --git a/frontend/src/api/models/SummaryVectorObservations.ts b/frontend/src/api/models/SummaryVectorObservations.ts index fe4f1798d..03971b5ce 100644 --- a/frontend/src/api/models/SummaryVectorObservations.ts +++ b/frontend/src/api/models/SummaryVectorObservations.ts @@ -8,7 +8,7 @@ import type { SummaryVectorDateObservation } from './SummaryVectorDateObservatio */ export type SummaryVectorObservations = { vector_name: string; - comment: (string | null); + comment?: (string | null); observations: Array; }; diff --git a/frontend/src/api/models/SurfaceDataPng.ts b/frontend/src/api/models/SurfaceDataPng.ts new file mode 100644 index 000000000..e7ba9336f --- /dev/null +++ b/frontend/src/api/models/SurfaceDataPng.ts @@ -0,0 +1,19 @@ +/* generated using openapi-typescript-codegen -- do no edit */ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ +export type SurfaceDataPng = { + x_min_surf_orient: number; + x_max_surf_orient: number; + y_min_surf_orient: number; + y_max_surf_orient: number; + x_min: number; + x_max: number; + y_min: number; + y_max: number; + val_min: number; + val_max: number; + rot_deg: number; + base64_encoded_image: string; +}; + diff --git a/frontend/src/api/models/SurfaceMeta.ts b/frontend/src/api/models/SurfaceMeta.ts index 3179789a2..b9b70e643 100644 --- a/frontend/src/api/models/SurfaceMeta.ts +++ b/frontend/src/api/models/SurfaceMeta.ts @@ -7,15 +7,15 @@ import type { SurfaceAttributeType } from './SurfaceAttributeType'; export type SurfaceMeta = { name: string; name_is_stratigraphic_offical: boolean; - stratigraphic_identifier: (string | null); - relative_stratigraphic_level: (number | null); - parent_stratigraphic_identifier: (string | null); - stratigraphic_feature: (StratigraphicFeature | null); + stratigraphic_identifier?: (string | null); + relative_stratigraphic_level?: (number | null); + parent_stratigraphic_identifier?: (string | null); + stratigraphic_feature?: (StratigraphicFeature | null); attribute_name: string; attribute_type: SurfaceAttributeType; - iso_date_or_interval: (string | null); + iso_date_or_interval?: (string | null); is_observation: boolean; - value_min: (number | null); - value_max: (number | null); + value_min?: (number | null); + value_max?: (number | null); }; diff --git a/frontend/src/api/models/UserInfo.ts b/frontend/src/api/models/UserInfo.ts index 80c837b11..70a0dc863 100644 --- a/frontend/src/api/models/UserInfo.ts +++ b/frontend/src/api/models/UserInfo.ts @@ -4,8 +4,8 @@ /* eslint-disable */ export type UserInfo = { username: string; - display_name: (string | null); - avatar_b64str: (string | null); + display_name?: (string | null); + avatar_b64str?: (string | null); has_sumo_access: boolean; has_smda_access: boolean; }; diff --git a/frontend/src/api/models/WellBorePick.ts b/frontend/src/api/models/WellBorePick.ts index bb2c04482..0ced07b00 100644 --- a/frontend/src/api/models/WellBorePick.ts +++ b/frontend/src/api/models/WellBorePick.ts @@ -16,7 +16,7 @@ export type WellBorePick = { mdMsl: number; uniqueWellboreIdentifier: string; pickIdentifier: string; - confidence: (string | null); + confidence?: (string | null); depthReferencePoint: string; mdUnit: string; }; diff --git a/frontend/src/api/models/WellBorePicksAndStratigraphicUnits.ts b/frontend/src/api/models/WellBorePicksAndStratigraphicUnits.ts index eabf74a2a..c8991bfaa 100644 --- a/frontend/src/api/models/WellBorePicksAndStratigraphicUnits.ts +++ b/frontend/src/api/models/WellBorePicksAndStratigraphicUnits.ts @@ -5,7 +5,7 @@ import type { StratigraphicUnit } from './StratigraphicUnit'; import type { WellBorePick } from './WellBorePick'; export type WellBorePicksAndStratigraphicUnits = { - wellbore_picks: Array; - stratigraphic_units: Array; + wellbore_picks?: Array; + stratigraphic_units?: Array; }; diff --git a/frontend/src/api/models/WellCompletionsZone.ts b/frontend/src/api/models/WellCompletionsZone.ts index 5a6ad3568..09b68796d 100644 --- a/frontend/src/api/models/WellCompletionsZone.ts +++ b/frontend/src/api/models/WellCompletionsZone.ts @@ -4,6 +4,6 @@ /* eslint-disable */ export type WellCompletionsZone = { name: string; - subzones: (Array | null); + subzones?: (Array | null); }; diff --git a/frontend/src/api/services/SurfaceService.ts b/frontend/src/api/services/SurfaceService.ts index 4c08e331d..49196e5e4 100644 --- a/frontend/src/api/services/SurfaceService.ts +++ b/frontend/src/api/services/SurfaceService.ts @@ -5,6 +5,7 @@ import type { Body_post_get_surface_intersection } from '../models/Body_post_get_surface_intersection'; import type { Body_post_sample_surface_in_points } from '../models/Body_post_sample_surface_in_points'; import type { SurfaceData } from '../models/SurfaceData'; +import type { SurfaceDataPng } from '../models/SurfaceDataPng'; import type { SurfaceIntersectionData } from '../models/SurfaceIntersectionData'; import type { SurfaceMeta } from '../models/SurfaceMeta'; import type { SurfaceRealizationSampleValues } from '../models/SurfaceRealizationSampleValues'; @@ -107,6 +108,76 @@ export class SurfaceService { }, }); } + /** + * Get Realization Surface Data As Png + * @param caseUuid Sumo case uuid + * @param ensembleName Ensemble name + * @param realizationNum Realization number + * @param name Surface name + * @param attribute Surface attribute + * @param timeOrInterval Time point or time interval string + * @returns SurfaceDataPng Successful Response + * @throws ApiError + */ + public getRealizationSurfaceDataAsPng( + caseUuid: string, + ensembleName: string, + realizationNum: number, + name: string, + attribute: string, + timeOrInterval?: (string | null), + ): CancelablePromise { + return this.httpRequest.request({ + method: 'GET', + url: '/surface/realization_surface_data_as_png/', + query: { + 'case_uuid': caseUuid, + 'ensemble_name': ensembleName, + 'realization_num': realizationNum, + 'name': name, + 'attribute': attribute, + 'time_or_interval': timeOrInterval, + }, + errors: { + 422: `Validation Error`, + }, + }); + } + /** + * Get Statistical Surface Data As Png + * @param caseUuid Sumo case uuid + * @param ensembleName Ensemble name + * @param statisticFunction Statistics to calculate + * @param name Surface name + * @param attribute Surface attribute + * @param timeOrInterval Time point or time interval string + * @returns SurfaceDataPng Successful Response + * @throws ApiError + */ + public getStatisticalSurfaceDataAsPng( + caseUuid: string, + ensembleName: string, + statisticFunction: SurfaceStatisticFunction, + name: string, + attribute: string, + timeOrInterval?: (string | null), + ): CancelablePromise { + return this.httpRequest.request({ + method: 'GET', + url: '/surface/statistical_surface_data_as_png/', + query: { + 'case_uuid': caseUuid, + 'ensemble_name': ensembleName, + 'statistic_function': statisticFunction, + 'name': name, + 'attribute': attribute, + 'time_or_interval': timeOrInterval, + }, + errors: { + 422: `Validation Error`, + }, + }); + } /** * Get Property Surface Resampled To Static Surface * @param caseUuid Sumo case uuid diff --git a/frontend/src/modules/Grid3D/view.tsx b/frontend/src/modules/Grid3D/view.tsx index 06afb2eb4..30480b63b 100644 --- a/frontend/src/modules/Grid3D/view.tsx +++ b/frontend/src/modules/Grid3D/view.tsx @@ -8,7 +8,7 @@ import { createNorthArrowLayer, createWellBoreHeaderLayer, createWellboreTrajectoryLayer, -} from "@modules/SubsurfaceMap/_utils"; +} from "@modules/_shared/Surface/subsurfaceMapUtils"; import { useFieldWellsTrajectoriesQuery } from "@modules/_shared/WellBore/queryHooks"; import SubsurfaceViewer from "@webviz/subsurface-viewer"; import { ViewAnnotation } from "@webviz/subsurface-viewer/dist/components/ViewAnnotation"; diff --git a/frontend/src/modules/MapMatrix/_utils/isoString.ts b/frontend/src/modules/MapMatrix/_utils/isoString.ts new file mode 100644 index 000000000..0ee90dc9a --- /dev/null +++ b/frontend/src/modules/MapMatrix/_utils/isoString.ts @@ -0,0 +1,19 @@ +export function isoStringToDateLabel(input: string): string { + const date = input.split("T")[0]; + return `${date}`; +} + +export function isoIntervalStringToDateLabel(input: string): string { + const [start, end] = input.split("/"); + const startDate = start.split("T")[0]; + const endDate = end.split("T")[0]; + return `${startDate}/${endDate}`; +} + +export function isoStringToDateOrIntervalLabel(input: string): string { + if (input.includes("/")) { + return isoIntervalStringToDateLabel(input); + } else { + return isoStringToDateLabel(input); + } +} diff --git a/frontend/src/modules/MapMatrix/components/ensembleIdentSelectWithButtons.tsx b/frontend/src/modules/MapMatrix/components/ensembleIdentSelectWithButtons.tsx new file mode 100644 index 000000000..a13ed70ff --- /dev/null +++ b/frontend/src/modules/MapMatrix/components/ensembleIdentSelectWithButtons.tsx @@ -0,0 +1,69 @@ +import React from "react"; + +import { EnsembleIdent } from "@framework/EnsembleIdent"; +import { EnsembleSet } from "@framework/EnsembleSet"; +import { Dropdown } from "@lib/components/Dropdown"; +import { IconButton } from "@lib/components/IconButton"; +import ArrowCircleLeftIcon from "@mui/icons-material/ArrowCircleLeft"; +import ArrowCircleRightIcon from "@mui/icons-material/ArrowCircleRight"; + +export type EnsembleIdentSelectWithButtonsProps = { + name: string; + ensembleIdents: EnsembleIdent[]; + value: EnsembleIdent | null; + ensembleSet: EnsembleSet; + onChange?: (values: EnsembleIdent | null) => void; +}; +export const EnsembleIdentSelectWithButtons: React.FC = (props) => { + // Check if ensembleIdents are in in ensembleSet + const availableEnsembles = props.ensembleSet + .getEnsembleArr() + .filter((ensemble) => props.ensembleIdents.includes(ensemble.getIdent())); + + const availableEnsembleOptions = availableEnsembles.map((ensemble) => ({ + value: ensemble.getIdent().toString(), + label: ensemble.getDisplayName(), + })); + const handleSelectionChange = (identString: string) => { + const ensembleIdent = EnsembleIdent.fromString(identString); + props.onChange?.(ensembleIdent); + }; + + const changeSelection = (direction: "prev" | "next") => { + const availableEnsembleIdentStrings = availableEnsembleOptions.map((option) => option.value); + const currentIndex = availableEnsembleIdentStrings.indexOf(props.value?.toString() ?? ""); + let nextIndex = direction === "next" ? currentIndex + 1 : currentIndex - 1; + + if (nextIndex >= availableEnsembleIdentStrings.length) { + nextIndex = 0; + } else if (nextIndex < 0) { + nextIndex = availableEnsembleIdentStrings.length - 1; + } + + const nextValue = availableEnsembleIdentStrings[nextIndex]; + handleSelectionChange(nextValue); + }; + + return ( + + {props.name} + + + + +
+ changeSelection("prev")}> + + + changeSelection("next")}> + + +
+ + + ); +}; diff --git a/frontend/src/modules/MapMatrix/components/ensembleStageSelect.tsx b/frontend/src/modules/MapMatrix/components/ensembleStageSelect.tsx new file mode 100644 index 000000000..da34bda99 --- /dev/null +++ b/frontend/src/modules/MapMatrix/components/ensembleStageSelect.tsx @@ -0,0 +1,109 @@ +import React from "react"; + +import { SurfaceStatisticFunction_api } from "@api"; +import { Dropdown } from "@lib/components/Dropdown"; + +import { PrevNextButtonsProps } from "./previousNextButtons"; + +import { EnsembleStage, EnsembleStageType } from "../types"; + +export type EnsembleStageSelectProps = { + stage: EnsembleStageType; + availableRealizationNums: number[]; + realizationNum: number; + statisticFunction: SurfaceStatisticFunction_api; + disableRealizationPicker?: boolean; + onChange(stage: EnsembleStage): void; +}; +export const StatisticFunctionToStringMapping = { + [SurfaceStatisticFunction_api.MEAN]: "Mean", + [SurfaceStatisticFunction_api.MIN]: "Min", + [SurfaceStatisticFunction_api.MAX]: "Max", + [SurfaceStatisticFunction_api.STD]: "StdDev", + [SurfaceStatisticFunction_api.P10]: "P10", + [SurfaceStatisticFunction_api.P50]: "P50", + [SurfaceStatisticFunction_api.P90]: "P90", +}; + +export const EnsembleStageSelect: React.FC = (props) => { + function handleRealizationNumChange(realNum: string) { + props.onChange({ + ensembleStage: EnsembleStageType.Realization, + realizationNum: parseInt(realNum), + }); + } + function handleStageChange(stage: string) { + if (stage == EnsembleStageType.Statistics) { + props.onChange({ + ensembleStage: EnsembleStageType.Statistics, + statisticFunction: SurfaceStatisticFunction_api.MEAN, + realizationNums: [], + }); + } + // if (stage == EnsembleStageType.Observation) { + // props.onChange({ + // ensembleStage: EnsembleStageType.Observation, + // }); + // } + if (stage == EnsembleStageType.Realization) { + props.onChange({ + ensembleStage: EnsembleStageType.Realization, + realizationNum: props.realizationNum ? props.realizationNum : props.availableRealizationNums[0] ?? 0, + }); + } + } + const realizationOptions = props.availableRealizationNums.map((num) => ({ + label: num.toString(), + value: num.toString(), + })); + const stageOptions = Object.keys(EnsembleStageType).map((stage) => ({ label: stage, value: stage })); + const statisticOptions = Object.values(SurfaceStatisticFunction_api).map((val: SurfaceStatisticFunction_api) => { + return { value: val, label: StatisticFunctionToStringMapping[val] }; + }); + return ( + + Stage + +
+ +
+ {props.stage == EnsembleStageType.Realization && ( +
+ +
+ )} + {props.stage == EnsembleStageType.Statistics && ( +
+ + props.onChange({ + ensembleStage: EnsembleStageType.Statistics, + statisticFunction: stat as SurfaceStatisticFunction_api, + realizationNums: [], + }) + } + /> +
+ )} + + + + {props.stage == EnsembleStageType.Realization && ( + option.value.toString())} + value={props.realizationNum?.toString()} + /> + )} + + + ); +}; diff --git a/frontend/src/modules/MapMatrix/components/previousNextButtons.tsx b/frontend/src/modules/MapMatrix/components/previousNextButtons.tsx new file mode 100644 index 000000000..81a822fc2 --- /dev/null +++ b/frontend/src/modules/MapMatrix/components/previousNextButtons.tsx @@ -0,0 +1,38 @@ +import React from "react"; + +import { IconButton } from "@lib/components/IconButton"; +import ArrowCircleLeftIcon from "@mui/icons-material/ArrowCircleLeft"; +import ArrowCircleRightIcon from "@mui/icons-material/ArrowCircleRight"; + +export type PrevNextButtonsProps = { + onChange: (value: string) => void; + options: string[]; + value: string; + disabled?: boolean; +}; +export const PrevNextButtonsProps: React.FC = (props) => { + const changeSelection = (direction: "prev" | "next") => { + const currentIndex = props.options.indexOf(props.value); + let nextIndex = direction === "next" ? currentIndex + 1 : currentIndex - 1; + + if (nextIndex >= props.options.length) { + nextIndex = 0; + } else if (nextIndex < 0) { + nextIndex = props.options.length - 1; + } + + const nextValue = props.options[nextIndex]; + props.onChange(nextValue); + }; + + return ( +
+ changeSelection("prev")}> + + + changeSelection("next")}> + + +
+ ); +}; diff --git a/frontend/src/modules/MapMatrix/components/singleSelectWithButtons.tsx b/frontend/src/modules/MapMatrix/components/singleSelectWithButtons.tsx new file mode 100644 index 000000000..e9217ff1b --- /dev/null +++ b/frontend/src/modules/MapMatrix/components/singleSelectWithButtons.tsx @@ -0,0 +1,34 @@ +import React from "react"; + +import { Dropdown } from "@lib/components/Dropdown"; + +import { PrevNextButtonsProps } from "./previousNextButtons"; + +export type SingleSelectWithButtonsProps = { + name: string; + options: string[]; + value: string; + labelFunction?: (value: string) => string; + onChange?: (values: string) => void; +}; +export const SingleSelectWithButtons: React.FC = (props) => { + const selectOptions = props.options.map((option) => ({ + value: option, + label: props.labelFunction?.(option) ?? option, + })); + const handleSelectionChange = (selectedValue: string) => { + props.onChange?.(selectedValue); + }; + + return ( + + {props.name} + + + + + + + + ); +}; diff --git a/frontend/src/modules/MapMatrix/components/surfaceAttributeTypeSelect.tsx b/frontend/src/modules/MapMatrix/components/surfaceAttributeTypeSelect.tsx new file mode 100644 index 000000000..9df4e5cf4 --- /dev/null +++ b/frontend/src/modules/MapMatrix/components/surfaceAttributeTypeSelect.tsx @@ -0,0 +1,77 @@ +import React from "react"; + +import { SurfaceAttributeType_api } from "@api"; +import { Dropdown } from "@lib/components/Dropdown"; +import { Label } from "@lib/components/Label"; +import { TimeType } from "@modules/_shared/Surface"; + +const SurfaceAttributeTypeToStringMapping = { + [SurfaceAttributeType_api.DEPTH]: "Depth surfaces", + [SurfaceAttributeType_api.TIME]: "Time surfaces", + [SurfaceAttributeType_api.PROPERTY]: "Extracted grid properties", + [SurfaceAttributeType_api.SEISMIC]: "Seismic attributes", + [SurfaceAttributeType_api.THICKNESS]: "Thickness surfaces??", + [SurfaceAttributeType_api.ISOCHORE]: "Isochores", + [SurfaceAttributeType_api.FLUID_CONTACT]: "Fluid contacts", +}; + +export type SurfaceAttributeTypeSelectProps = { + onAttributeChange(attributeType: SurfaceAttributeType_api): void; + onTimeModeChange(timeMode: TimeType): void; + timeMode: TimeType; + attributeType: SurfaceAttributeType_api; +}; +export const SurfaceAttributeTypeSelect: React.FC = (props) => { + function handleTimeModeChange(val: string) { + props.onTimeModeChange(val as TimeType); + } + + function handleSurfaceAttributeTypeChange(val: string) { + const newSurfaceAttributeType = val as SurfaceAttributeType_api; + if ( + (newSurfaceAttributeType === SurfaceAttributeType_api.DEPTH || + newSurfaceAttributeType === SurfaceAttributeType_api.TIME) && + props.timeMode !== TimeType.None + ) { + props.onTimeModeChange(TimeType.None); + } + if (newSurfaceAttributeType === SurfaceAttributeType_api.SEISMIC && props.timeMode === TimeType.None) { + props.onTimeModeChange(TimeType.TimePoint); + } + props.onAttributeChange(newSurfaceAttributeType); + } + return ( +
+
+ +
+ +
+ ); +}; diff --git a/frontend/src/modules/MapMatrix/components/surfaceColorSelect.tsx b/frontend/src/modules/MapMatrix/components/surfaceColorSelect.tsx new file mode 100644 index 000000000..b7fe6bc6d --- /dev/null +++ b/frontend/src/modules/MapMatrix/components/surfaceColorSelect.tsx @@ -0,0 +1,33 @@ +import React from "react"; + +import { Label } from "@lib/components/Label"; +import { RadioGroup } from "@lib/components/RadioGroup"; +import { ColorScaleGradientType } from "@lib/utils/ColorScale"; + +export type SurfaceColorSelectProps = { + colorScaleGradientType: ColorScaleGradientType; + onColorGradientTypeChange(colorGradientType: ColorScaleGradientType): void; +}; +const ColorScaleGradientTypeToStringMapping = { + [ColorScaleGradientType.Sequential]: "Sequential", + [ColorScaleGradientType.Diverging]: "Diverging", +}; +export const SurfaceColorSelect: React.FC = (props) => { + function handleColorScaleGradientTypeChange(event: React.ChangeEvent) { + props.onColorGradientTypeChange(event.target.value as ColorScaleGradientType); + } + return ( + <> + + + ); +}; diff --git a/frontend/src/modules/MapMatrix/components/surfaceSelect.tsx b/frontend/src/modules/MapMatrix/components/surfaceSelect.tsx new file mode 100644 index 000000000..f68d9b167 --- /dev/null +++ b/frontend/src/modules/MapMatrix/components/surfaceSelect.tsx @@ -0,0 +1,205 @@ +import React from "react"; + +import { SurfaceAttributeType_api, SurfaceStatisticFunction_api } from "@api"; +import { EnsembleIdent } from "@framework/EnsembleIdent"; +import { EnsembleSet } from "@framework/EnsembleSet"; +import { IconButton } from "@lib/components/IconButton"; +import { SurfaceDirectory, TimeType } from "@modules/_shared/Surface"; +import { Remove } from "@mui/icons-material"; + +import { isEqual } from "lodash"; + +import { EnsembleIdentSelectWithButtons } from "./ensembleIdentSelectWithButtons"; +import { EnsembleStageSelect } from "./ensembleStageSelect"; +import { SingleSelectWithButtons } from "./singleSelectWithButtons"; + +import { isoStringToDateOrIntervalLabel } from "../_utils/isoString"; +import { EnsembleSetSurfaceMetas } from "../hooks/useEnsembleSetSurfaceMetaQuery"; +import { EnsembleStage, EnsembleStageType, SurfaceSpecification, SyncedSettings } from "../types"; + +export type SurfaceSelectProps = { + index: number; + surfaceMetas: EnsembleSetSurfaceMetas; + surfaceSpecification: SurfaceSpecification; + ensembleIdents: EnsembleIdent[]; + timeType: TimeType; + attributeType: SurfaceAttributeType_api; + syncedSettings: SyncedSettings; + onChange: (surfaceSpecification: SurfaceSpecification) => void; + onRemove: (uuid: string) => void; + ensembleSet: EnsembleSet; +}; + +export const SurfaceSelect: React.FC = (props) => { + let computedEnsembleIdent = props.surfaceSpecification.ensembleIdent; + + if (!computedEnsembleIdent || !props.ensembleIdents.some((el) => el.equals(computedEnsembleIdent))) { + computedEnsembleIdent = props.ensembleIdents[0]; + } + + const ensembleSurfaceMetadata = computedEnsembleIdent + ? props.surfaceMetas.data.find((ensembleSurfaceSet) => + ensembleSurfaceSet.ensembleIdent?.equals(computedEnsembleIdent) + ) + : undefined; + + const ensembleSurfaceDirectory = new SurfaceDirectory({ + surfaceMetas: ensembleSurfaceMetadata?.surfaceMetas ?? [], + timeType: props.timeType, + includeAttributeTypes: [props.attributeType], + }); + + let computedSurfaceName = props.surfaceSpecification.surfaceName; + if (!computedSurfaceName || !ensembleSurfaceDirectory.getSurfaceNames(null).includes(computedSurfaceName)) { + computedSurfaceName = ensembleSurfaceDirectory.getSurfaceNames(null)[0]; + } + + let computedSurfaceAttribute = props.surfaceSpecification.surfaceAttribute; + if ( + !computedSurfaceAttribute || + !ensembleSurfaceDirectory.getAttributeNames(computedSurfaceName).includes(computedSurfaceAttribute) + ) { + computedSurfaceAttribute = ensembleSurfaceDirectory.getAttributeNames(computedSurfaceName)[0]; + } + let computedTimeOrInterval = props.surfaceSpecification.surfaceTimeOrInterval; + if ( + !computedTimeOrInterval || + !ensembleSurfaceDirectory + .getTimeOrIntervalStrings(computedSurfaceName, computedSurfaceAttribute) + .includes(computedTimeOrInterval) + ) { + computedTimeOrInterval = ensembleSurfaceDirectory.getTimeOrIntervalStrings( + computedSurfaceName, + computedSurfaceAttribute + )[0]; + } + let computedRealizationNum = props.surfaceSpecification.realizationNum; + let availableRealizationNums: number[] = []; + + if (computedEnsembleIdent) { + const ensemble = props.ensembleSet.findEnsemble(computedEnsembleIdent); + availableRealizationNums = ensemble?.getRealizations().map((real) => real) ?? []; + } + + if (!computedRealizationNum || !availableRealizationNums.includes(computedRealizationNum)) { + computedRealizationNum = availableRealizationNums[0]; + } + + const valueRange = ensembleSurfaceDirectory.getValueRange(computedSurfaceName, computedSurfaceAttribute, null); + let computedValueMin: number | null = valueRange.min; + let computedValueMax: number | null = valueRange.max; + if ( + props.surfaceSpecification.statisticFunction === SurfaceStatisticFunction_api.STD && + props.surfaceSpecification.ensembleStage === EnsembleStageType.Statistics + ) { + computedValueMin = null; + computedValueMax = null; + } + const computedSurfaceSpecification: SurfaceSpecification = { + ensembleIdent: computedEnsembleIdent, + surfaceName: computedSurfaceName, + surfaceAttribute: computedSurfaceAttribute, + surfaceTimeOrInterval: computedTimeOrInterval, + realizationNum: computedRealizationNum, + ensembleStage: props.surfaceSpecification.ensembleStage, + statisticFunction: props.surfaceSpecification.statisticFunction, + colorMin: computedValueMin, + colorMax: computedValueMax, + uuid: props.surfaceSpecification.uuid, + }; + + if (!isEqual(props.surfaceSpecification, computedSurfaceSpecification)) { + props.onChange(computedSurfaceSpecification); + } + function handleEnsembleSelectionChange(ensembleIdent: EnsembleIdent | null) { + props.onChange({ ...props.surfaceSpecification, ensembleIdent }); + } + + function handleSurfaceNameChange(surfaceName: string) { + props.onChange({ ...props.surfaceSpecification, surfaceName }); + } + function handleSurfaceAttributeChange(surfaceAttribute: string) { + props.onChange({ ...props.surfaceSpecification, surfaceAttribute }); + } + function handleSurfaceTimeOrIntervalChange(surfaceTimeOrInterval: string) { + props.onChange({ ...props.surfaceSpecification, surfaceTimeOrInterval }); + } + function handleEnsembleStageChange(ensembleStage: EnsembleStage) { + if (ensembleStage.ensembleStage == EnsembleStageType.Statistics) { + props.onChange({ + ...props.surfaceSpecification, + ...{ ensembleStage: ensembleStage.ensembleStage, statisticFunction: ensembleStage.statisticFunction }, + }); + } + // if (ensembleStage.ensembleStage == EnsembleStageType.Observation) { + // props.onChange({ ...props.surfaceSpecification, ...{ ensembleStage: ensembleStage.ensembleStage } }); + // } + if (ensembleStage.ensembleStage == EnsembleStageType.Realization) { + props.onChange({ + ...props.surfaceSpecification, + ...{ ensembleStage: ensembleStage.ensembleStage, realizationNum: ensembleStage.realizationNum }, + }); + } + } + function handleRemove() { + props.onRemove(props.surfaceSpecification.uuid); + } + return ( + <> + + {`Surface ${props.index + 1}`} + + + + + + + + {(!props.syncedSettings.ensemble || props.index == 0) && ( + + )} + {(!props.syncedSettings.name || props.index == 0) && ( + + )} + {(!props.syncedSettings.attribute || props.index == 0) && ( + + )} + {(!props.syncedSettings.timeOrInterval || props.index == 0) && props.timeType !== TimeType.None && ( + + )} + + + ); +}; diff --git a/frontend/src/modules/MapMatrix/components/surfaceSpecificationLabel.tsx b/frontend/src/modules/MapMatrix/components/surfaceSpecificationLabel.tsx new file mode 100644 index 000000000..95ac49b4d --- /dev/null +++ b/frontend/src/modules/MapMatrix/components/surfaceSpecificationLabel.tsx @@ -0,0 +1,80 @@ +import React from "react"; + +import "animate.css"; + +import { StatisticFunctionToStringMapping } from "./ensembleStageSelect"; + +import { isoStringToDateOrIntervalLabel } from "../_utils/isoString"; +import { EnsembleStageType, SurfaceSpecification } from "../types"; + +export type SurfaceSpecificationLabelProps = { + surfaceSpecification?: SurfaceSpecification; +}; +type Animations = { + surfaceName?: string; + surfaceAttribute?: string; + surfaceTimeOrInterval?: string; + realizationNum?: string; + statisticFunction?: string; +}; +export const SurfaceSpecificationLabel: React.FC = ({ surfaceSpecification }) => { + const [animations, setAnimations] = React.useState({}); + const prevSurfaceSpecification = React.useRef(surfaceSpecification); + + const checkAndAnimate = (key: keyof SurfaceSpecification) => { + return !prevSurfaceSpecification.current || + (surfaceSpecification && surfaceSpecification[key] !== prevSurfaceSpecification.current[key]) + ? "bg-green-200 animate__animated animate__fadeIn" + : " bg-transparent "; + }; + + React.useEffect(() => { + if (surfaceSpecification) { + const newAnimations = { + surfaceName: checkAndAnimate("surfaceName"), + surfaceAttribute: checkAndAnimate("surfaceAttribute"), + surfaceTimeOrInterval: checkAndAnimate("surfaceTimeOrInterval"), + realizationNum: checkAndAnimate("realizationNum"), + statisticFunction: checkAndAnimate("statisticFunction"), + }; + + setAnimations(newAnimations); + prevSurfaceSpecification.current = surfaceSpecification; + + const timer = setTimeout(() => setAnimations({}), 2000); + return () => clearTimeout(timer); + } + }, [surfaceSpecification]); + const baseClassNames = "m-0 border border-gray-300 p-1 max-w-sm text-gray-800 text-sm"; + return ( +
+ {surfaceSpecification ? ( + <> +
+ {surfaceSpecification.surfaceName} +
+
+ {surfaceSpecification.surfaceAttribute} +
+ {surfaceSpecification.surfaceTimeOrInterval && ( +
+ {isoStringToDateOrIntervalLabel(surfaceSpecification.surfaceTimeOrInterval)} +
+ )} + {surfaceSpecification.ensembleStage === EnsembleStageType.Realization && ( +
+ {`Real: ${surfaceSpecification.realizationNum}`} +
+ )} + {surfaceSpecification.ensembleStage === EnsembleStageType.Statistics && ( +
+ {`${StatisticFunctionToStringMapping[surfaceSpecification.statisticFunction]}`} +
+ )} + + ) : ( +
No surface found
+ )} +
+ ); +}; diff --git a/frontend/src/modules/MapMatrix/components/syncSettings.tsx b/frontend/src/modules/MapMatrix/components/syncSettings.tsx new file mode 100644 index 000000000..b27357463 --- /dev/null +++ b/frontend/src/modules/MapMatrix/components/syncSettings.tsx @@ -0,0 +1,39 @@ +import React from "react"; + +import { Switch } from "@lib/components/Switch"; + +import { SyncedSettings } from "../types"; + +type SyncSettingsProps = { + syncedSettings: SyncedSettings; + onChange: (syncedSettings: SyncedSettings) => void; +}; + +export const syncedSettingsLabels: { [key in keyof SyncedSettings]: string } = { + ensemble: "Ensemble", + name: "Name", + attribute: "Surface attribute", + timeOrInterval: "Time or Interval", + realizationNum: "Realization", +}; + +export const SyncSettings: React.FC = (props) => { + function handleSyncedSettingsChange(key: keyof SyncedSettings, value: boolean) { + const updatedSyncedSettings = { ...props.syncedSettings, [key]: value }; + props.onChange(updatedSyncedSettings); + } + + return ( + <> + {Object.keys(props.syncedSettings).map((key) => ( +
+ handleSyncedSettingsChange(key as keyof SyncedSettings, e.target.checked)} + /> + {syncedSettingsLabels[key as keyof SyncedSettings]} +
+ ))} + + ); +}; diff --git a/frontend/src/modules/MapMatrix/hooks/useEnsembleSetSurfaceMetaQuery.ts b/frontend/src/modules/MapMatrix/hooks/useEnsembleSetSurfaceMetaQuery.ts new file mode 100644 index 000000000..21f2aa085 --- /dev/null +++ b/frontend/src/modules/MapMatrix/hooks/useEnsembleSetSurfaceMetaQuery.ts @@ -0,0 +1,68 @@ +import { SurfaceMeta_api } from "@api"; +import { apiService } from "@framework/ApiService"; +import { EnsembleIdent } from "@framework/EnsembleIdent"; +import { UseQueryResult, useQueries } from "@tanstack/react-query"; + +const STALE_TIME = 60 * 1000; +const CACHE_TIME = 60 * 1000; +type EnsembleSurfaceMetas = { + ensembleIdent: EnsembleIdent; + surfaceMetas?: SurfaceMeta_api[]; +}; +export type EnsembleSetSurfaceMetas = { + data: EnsembleSurfaceMetas[]; + isFetching: boolean; +}; +function intersectEnsembleSetSurfaceMetas(ensembleSurfaceMetas: EnsembleSurfaceMetas[]): EnsembleSurfaceMetas[] { + if (!ensembleSurfaceMetas || ensembleSurfaceMetas.length === 0) { + return []; + } + + const surfaceMetaCountMap = new Map(); + + for (const ensembleSurfaceMeta of ensembleSurfaceMetas) { + for (const surfaceMeta of ensembleSurfaceMeta.surfaceMetas ?? []) { + const key = `${surfaceMeta.name}-${surfaceMeta.attribute_name}-${surfaceMeta.iso_date_or_interval}`; + surfaceMetaCountMap.set(key, (surfaceMetaCountMap.get(key) ?? 0) + 1); + } + } + + const filteredSurfaceMetas = ensembleSurfaceMetas[0].surfaceMetas?.filter((surfaceMeta) => { + const key = `${surfaceMeta.name}-${surfaceMeta.attribute_name}-${surfaceMeta.iso_date_or_interval}`; + return surfaceMetaCountMap.get(key) === ensembleSurfaceMetas.length; + }); + + return ensembleSurfaceMetas + .map((ensembleSurfaceMeta) => ({ + ensembleIdent: ensembleSurfaceMeta.ensembleIdent, + surfaceMetas: filteredSurfaceMetas, + })) + .filter( + (ensembleSurfaceMeta) => ensembleSurfaceMeta.surfaceMetas && ensembleSurfaceMeta.surfaceMetas.length > 0 + ); +} + +export function useEnsembleSetSurfaceMetaQuery(ensembleIdents: EnsembleIdent[]): EnsembleSetSurfaceMetas { + return useQueries({ + queries: ensembleIdents.map((ensembleIdent) => ({ + queryKey: ["getSurfaceDirectory", ensembleIdent?.toString()], + queryFn: () => { + const caseUuid = ensembleIdent?.getCaseUuid(); + const ensembleName = ensembleIdent?.getEnsembleName(); + return apiService.surface.getSurfaceDirectory(caseUuid ?? "", ensembleName ?? ""); + }, + staleTime: STALE_TIME, + gcTime: CACHE_TIME, + enabled: Boolean(ensembleIdent), + })), + combine: (results: UseQueryResult>[]) => ({ + data: intersectEnsembleSetSurfaceMetas( + results.map((result, index) => ({ + ensembleIdent: ensembleIdents[index], + surfaceMetas: result.data, + })) + ), + isFetching: results.some((result) => result.isFetching), + }), + }); +} diff --git a/frontend/src/modules/MapMatrix/hooks/useSurfaceDataAsPngQuery.ts b/frontend/src/modules/MapMatrix/hooks/useSurfaceDataAsPngQuery.ts new file mode 100644 index 000000000..c0bbab8a1 --- /dev/null +++ b/frontend/src/modules/MapMatrix/hooks/useSurfaceDataAsPngQuery.ts @@ -0,0 +1,82 @@ +import { SurfaceDataPng_api } from "@api"; +import { apiService } from "@framework/ApiService"; +import { SurfaceAddress } from "@modules/_shared/Surface"; +import { QueryKey, useQueries } from "@tanstack/react-query"; + +const STALE_TIME = 60 * 1000; +const CACHE_TIME = 60 * 1000; + +export type IndexedSurfaceDatas = { + data: Array<{ + index: number; + surfaceData: SurfaceDataPng_api | null; + }>; + isFetching: boolean; +}; + +export function useSurfaceDataSetQueryByAddresses(surfaceAddresses: SurfaceAddress[]): IndexedSurfaceDatas { + const queryResults = useQueries({ + queries: surfaceAddresses.map((surfAddr: SurfaceAddress) => { + let queryKey: QueryKey = ["dummy"]; + let queryFn: () => Promise; + + if (surfAddr.addressType === "realization") { + queryKey = [ + "getRealizationSurfaceDataAsPng", + surfAddr.caseUuid, + surfAddr.ensemble, + surfAddr.realizationNum, + surfAddr.name, + surfAddr.attribute, + surfAddr.isoDateOrInterval, + ]; + queryFn = () => + apiService.surface.getRealizationSurfaceDataAsPng( + surfAddr.caseUuid, + surfAddr.ensemble, + surfAddr.realizationNum, + surfAddr.name, + surfAddr.attribute, + surfAddr.isoDateOrInterval + ); + } else { + queryKey = [ + "getStatisticalSurfaceDataAsPng", + surfAddr.caseUuid, + surfAddr.ensemble, + surfAddr.statisticFunction, + surfAddr.name, + surfAddr.attribute, + surfAddr.isoDateOrInterval, + ]; + queryFn = () => + apiService.surface.getStatisticalSurfaceDataAsPng( + surfAddr.caseUuid, + surfAddr.ensemble, + surfAddr.statisticFunction, + surfAddr.name, + surfAddr.attribute, + surfAddr.isoDateOrInterval + ); + } + return { + queryKey, + queryFn, + staleTime: STALE_TIME, + gcTime: CACHE_TIME, + }; + }), + }); + + const data: IndexedSurfaceDatas["data"] = queryResults.map((result, index) => ({ + index: index, + surfaceData: result.data ?? null, + })); + + const isFetching = queryResults.some((result) => result.isFetching); + + return { + data, + isFetching, + }; +} diff --git a/frontend/src/modules/MapMatrix/hooks/useSurfaceReducer.ts b/frontend/src/modules/MapMatrix/hooks/useSurfaceReducer.ts new file mode 100644 index 000000000..e8e26d5b8 --- /dev/null +++ b/frontend/src/modules/MapMatrix/hooks/useSurfaceReducer.ts @@ -0,0 +1,94 @@ +import { useReducer } from "react"; + +import { SurfaceAttributeType_api } from "@api"; +import { EnsembleIdent } from "@framework/EnsembleIdent"; +import { ColorScaleGradientType } from "@lib/utils/ColorScale"; +import { TimeType } from "@modules/_shared/Surface"; + +import { SurfaceReducerActionType, surfaceDispatcher } from "../reducers/surfaceReducer"; +import { SurfaceReducerState, SurfaceSpecification, SyncedSettings } from "../types"; + +export const initialSurfaceReducerState: SurfaceReducerState = { + ensembleIdents: [], + surfaceSpecifications: [], + syncedSettings: { + ensemble: false, + name: false, + attribute: false, + timeOrInterval: false, + realizationNum: false, + }, + timeMode: TimeType.None, + attributeType: SurfaceAttributeType_api.DEPTH, + colorScaleGradientType: ColorScaleGradientType.Sequential, +}; + +export const useSurfaceReducer = () => { + const [state, dispatch] = useReducer(surfaceDispatcher, initialSurfaceReducerState); + + const setEnsembleIdents = (ensembleIdents: EnsembleIdent[]) => { + dispatch({ + type: SurfaceReducerActionType.SetEnsembleIdents, + payload: { ensembleIdents }, + }); + }; + const addSurface = (surfaceSpecification: SurfaceSpecification) => { + dispatch({ + type: SurfaceReducerActionType.AddSurface, + payload: surfaceSpecification, + }); + }; + + const removeSurface = (id: string) => { + dispatch({ + type: SurfaceReducerActionType.RemoveSurface, + payload: { id }, + }); + }; + + const setSurface = (surfaceSpecification: SurfaceSpecification) => { + dispatch({ + type: SurfaceReducerActionType.SetSurface, + payload: { surfaceSpecification }, + }); + }; + + const setSyncedSettings = (syncedSettings: SyncedSettings) => { + dispatch({ + type: SurfaceReducerActionType.SetSyncedSettings, + payload: { syncedSettings }, + }); + }; + + const setTimeMode = (timeMode: TimeType) => { + dispatch({ + type: SurfaceReducerActionType.SetTimeMode, + payload: { timeMode }, + }); + }; + + const setAttributeType = (attributeType: SurfaceAttributeType_api) => { + dispatch({ + type: SurfaceReducerActionType.SetAttributeType, + payload: { attributeType }, + }); + }; + const setColorScaleGradientType = (colorScaleGradientType: ColorScaleGradientType) => { + dispatch({ + type: SurfaceReducerActionType.SetColorScaleGradientType, + payload: { colorScaleGradientType }, + }); + }; + + return { + state, + setEnsembleIdents, + addSurface, + removeSurface, + setSurface, + setSyncedSettings, + setTimeMode, + setAttributeType, + setColorScaleGradientType, + }; +}; diff --git a/frontend/src/modules/MapMatrix/loadModule.tsx b/frontend/src/modules/MapMatrix/loadModule.tsx new file mode 100644 index 000000000..4bebc05e9 --- /dev/null +++ b/frontend/src/modules/MapMatrix/loadModule.tsx @@ -0,0 +1,10 @@ +import { ModuleRegistry } from "@framework/ModuleRegistry"; + +import { settings } from "./settings"; +import { State, defaultState } from "./state"; +import { view } from "./view"; + +const module = ModuleRegistry.initModule("MapMatrix", defaultState); + +module.viewFC = view; +module.settingsFC = settings; diff --git a/frontend/src/modules/MapMatrix/reducers/surfaceReducer.ts b/frontend/src/modules/MapMatrix/reducers/surfaceReducer.ts new file mode 100644 index 000000000..e0238ed58 --- /dev/null +++ b/frontend/src/modules/MapMatrix/reducers/surfaceReducer.ts @@ -0,0 +1,117 @@ +import { SurfaceAttributeType_api } from "@api"; +import { EnsembleIdent } from "@framework/EnsembleIdent"; +import { ColorScaleGradientType } from "@lib/utils/ColorScale"; +import { TimeType } from "@modules/_shared/Surface"; + +import { SurfaceReducerState, SurfaceSpecification, SyncedSettings } from "../types"; + +export enum SurfaceReducerActionType { + SetEnsembleIdents, + AddSurface, + RemoveSurface, + SetSurface, + SetSyncedSettings, + SetTimeMode, + SetAttributeType, + SetColorScaleGradientType, +} +type SurfaceReducerPayload = { + [SurfaceReducerActionType.SetEnsembleIdents]: { ensembleIdents: EnsembleIdent[] }; + [SurfaceReducerActionType.AddSurface]: SurfaceSpecification; + [SurfaceReducerActionType.RemoveSurface]: { id: string }; + [SurfaceReducerActionType.SetSurface]: { surfaceSpecification: SurfaceSpecification }; + [SurfaceReducerActionType.SetSyncedSettings]: { syncedSettings: SyncedSettings }; + [SurfaceReducerActionType.SetTimeMode]: { timeMode: TimeType }; + [SurfaceReducerActionType.SetAttributeType]: { attributeType: SurfaceAttributeType_api }; + [SurfaceReducerActionType.SetColorScaleGradientType]: { colorScaleGradientType: ColorScaleGradientType }; +}; +type SurfaceReducerActions = { + [T in SurfaceReducerActionType]: { + type: T; + payload: SurfaceReducerPayload[T]; + }; +}[SurfaceReducerActionType]; + +export function surfaceDispatcher(state: SurfaceReducerState, action: SurfaceReducerActions) { + if (action.type === SurfaceReducerActionType.SetEnsembleIdents) { + return { + ...state, + ensembleIdents: action.payload.ensembleIdents, + }; + } + if (action.type === SurfaceReducerActionType.AddSurface) { + return { + ...state, + surfaceSpecifications: [...state.surfaceSpecifications, action.payload], + }; + } + if (action.type === SurfaceReducerActionType.RemoveSurface) { + return { + ...state, + surfaceSpecifications: state.surfaceSpecifications.filter((surface) => surface.uuid !== action.payload.id), + }; + } + if (action.type === SurfaceReducerActionType.SetSurface) { + const updatedSurfaceSpecifications = state.surfaceSpecifications.map((surface) => + surface.uuid === action.payload.surfaceSpecification.uuid ? action.payload.surfaceSpecification : surface + ); + synchronizeSurfaceSpecifications(updatedSurfaceSpecifications, state.syncedSettings); + return { + ...state, + surfaceSpecifications: updatedSurfaceSpecifications, + }; + } + if (action.type === SurfaceReducerActionType.SetSyncedSettings) { + synchronizeSurfaceSpecifications(state.surfaceSpecifications, action.payload.syncedSettings); + return { + ...state, + syncedSettings: action.payload.syncedSettings, + surfaceSpecifications: state.surfaceSpecifications, + }; + } + if (action.type === SurfaceReducerActionType.SetTimeMode) { + return { + ...state, + timeMode: action.payload.timeMode, + }; + } + if (action.type === SurfaceReducerActionType.SetAttributeType) { + return { + ...state, + attributeType: action.payload.attributeType, + }; + } + if (action.type === SurfaceReducerActionType.SetColorScaleGradientType) { + return { + ...state, + colorScaleGradientType: action.payload.colorScaleGradientType, + }; + } + return state; +} + +function synchronizeSurfaceSpecifications( + surfaceSpecifications: SurfaceSpecification[], + syncedSettings: SyncedSettings +) { + const firstSurfaceSpecification = surfaceSpecifications[0]; + surfaceSpecifications.forEach((surface, index) => { + if (index !== 0) { + if (syncedSettings.ensemble) { + surface.ensembleIdent = firstSurfaceSpecification.ensembleIdent; + } + if (syncedSettings.name) { + surface.surfaceName = firstSurfaceSpecification.surfaceName; + } + if (syncedSettings.attribute) { + surface.surfaceAttribute = firstSurfaceSpecification.surfaceAttribute; + } + if (syncedSettings.timeOrInterval) { + surface.surfaceTimeOrInterval = firstSurfaceSpecification.surfaceTimeOrInterval; + } + if (syncedSettings.realizationNum) { + surface.realizationNum = firstSurfaceSpecification.realizationNum; + } + } + }); +} diff --git a/frontend/src/modules/MapMatrix/registerModule.ts b/frontend/src/modules/MapMatrix/registerModule.ts new file mode 100644 index 000000000..da7e491a5 --- /dev/null +++ b/frontend/src/modules/MapMatrix/registerModule.ts @@ -0,0 +1,5 @@ +import { ModuleRegistry } from "@framework/ModuleRegistry"; + +import { State } from "./state"; + +ModuleRegistry.registerModule({ moduleName: "MapMatrix", defaultTitle: "Map Matrix" }); diff --git a/frontend/src/modules/MapMatrix/settings.tsx b/frontend/src/modules/MapMatrix/settings.tsx new file mode 100644 index 000000000..390fd3ec2 --- /dev/null +++ b/frontend/src/modules/MapMatrix/settings.tsx @@ -0,0 +1,134 @@ +import React from "react"; + +import { SurfaceStatisticFunction_api } from "@api"; +import { ModuleFCProps } from "@framework/Module"; +import { useEnsembleSet } from "@framework/WorkbenchSession"; +import { MultiEnsembleSelect } from "@framework/components/MultiEnsembleSelect"; +import { Button } from "@lib/components/Button"; +import { CircularProgress } from "@lib/components/CircularProgress"; +import { CollapsibleGroup } from "@lib/components/CollapsibleGroup"; +import { Label } from "@lib/components/Label"; + +import { v4 as uuidv4 } from "uuid"; + +import { SurfaceAttributeTypeSelect } from "./components/surfaceAttributeTypeSelect"; +import { SurfaceColorSelect } from "./components/surfaceColorSelect"; +import { SurfaceSelect } from "./components/surfaceSelect"; +import { SyncSettings } from "./components/syncSettings"; +import { useEnsembleSetSurfaceMetaQuery } from "./hooks/useEnsembleSetSurfaceMetaQuery"; +import { useSurfaceReducer } from "./hooks/useSurfaceReducer"; +import { State } from "./state"; +import { EnsembleStageType, SurfaceSpecification, SyncedSettings } from "./types"; + +export function settings({ moduleContext, workbenchSession }: ModuleFCProps) { + const ensembleSet = useEnsembleSet(workbenchSession); + + const reducer = useSurfaceReducer(); + + const ensembleSetSurfaceMetas = useEnsembleSetSurfaceMetaQuery(reducer.state.ensembleIdents); + + function handleSyncedSettingsChange(syncedSettings: SyncedSettings) { + reducer.setSyncedSettings(syncedSettings); + } + function handleAddSurface() { + let newSurface: SurfaceSpecification = { + ensembleIdent: null, + surfaceName: null, + surfaceAttribute: null, + surfaceTimeOrInterval: null, + realizationNum: null, + uuid: uuidv4(), + statisticFunction: SurfaceStatisticFunction_api.MEAN, + ensembleStage: EnsembleStageType.Realization, + colorMin: 0, + colorMax: 0, + }; + + if (reducer.state.surfaceSpecifications.length) { + newSurface = { + ...reducer.state.surfaceSpecifications[reducer.state.surfaceSpecifications.length - 1], + uuid: newSurface.uuid, + }; + } + reducer.addSurface(newSurface); + } + function handleSurfaceSelectChange(surfaceSpecification: SurfaceSpecification) { + reducer.setSurface(surfaceSpecification); + } + function handleRemoveSurface(uuid: string) { + reducer.removeSurface(uuid); + } + + React.useEffect( + function propogateSurfaceSpecificationsToView() { + moduleContext.getStateStore().setValue("surfaceSpecifications", reducer.state.surfaceSpecifications); + }, + [reducer.state.surfaceSpecifications] + ); + React.useEffect( + function propogateColorPaletteTypeToView() { + moduleContext.getStateStore().setValue("colorScaleGradientType", reducer.state.colorScaleGradientType); + }, + [reducer.state.colorScaleGradientType] + ); + + return ( + <> + + + + + + + + + + + +
+ +
+ + + {reducer.state.surfaceSpecifications.map((surfaceSpec, index) => ( + + ))} + +
+ + ); +} diff --git a/frontend/src/modules/MapMatrix/state.ts b/frontend/src/modules/MapMatrix/state.ts new file mode 100644 index 000000000..723adbd93 --- /dev/null +++ b/frontend/src/modules/MapMatrix/state.ts @@ -0,0 +1,9 @@ +import { ColorScaleGradientType } from "@lib/utils/ColorScale"; + +import { SurfaceSpecification } from "./types"; + +export const defaultState: State = { + surfaceSpecifications: [], + colorScaleGradientType: ColorScaleGradientType.Sequential, +}; +export type State = { surfaceSpecifications: SurfaceSpecification[]; colorScaleGradientType: ColorScaleGradientType }; diff --git a/frontend/src/modules/MapMatrix/types.ts b/frontend/src/modules/MapMatrix/types.ts new file mode 100644 index 000000000..d23919903 --- /dev/null +++ b/frontend/src/modules/MapMatrix/types.ts @@ -0,0 +1,56 @@ +import { SurfaceAttributeType_api, SurfaceStatisticFunction_api } from "@api"; +import { EnsembleIdent } from "@framework/EnsembleIdent"; +import { ColorScaleGradientType } from "@lib/utils/ColorScale"; +import { TimeType } from "@modules/_shared/Surface"; + +export type SurfaceReducerState = { + ensembleIdents: EnsembleIdent[]; + surfaceSpecifications: SurfaceSpecification[]; + syncedSettings: SyncedSettings; + timeMode: TimeType; + attributeType: SurfaceAttributeType_api; + colorScaleGradientType: ColorScaleGradientType; +}; + +export type SurfaceSpecification = { + ensembleIdent: EnsembleIdent | null; + surfaceName: string | null; + surfaceAttribute: string | null; + surfaceTimeOrInterval: string | null; + realizationNum: number | null; + uuid: string; + statisticFunction: SurfaceStatisticFunction_api; + ensembleStage: EnsembleStageType; + colorMin: number | null; + colorMax: number | null; +}; +export type SyncedSettings = { + ensemble: boolean; + name: boolean; + attribute: boolean; + timeOrInterval: boolean; + realizationNum: boolean; +}; + +export enum EnsembleStageType { + Statistics = "Statistics", + Realization = "Realization", + // Observation = "Observation", +} + +export type EnsembleStatisticStage = { + ensembleStage: EnsembleStageType.Statistics; + statisticFunction: SurfaceStatisticFunction_api; + realizationNums: number[]; +}; + +export type EnsembleRealizationStage = { + ensembleStage: EnsembleStageType.Realization; + realizationNum: number; +}; +// export type EnsembleObservationStage = { +// ensembleStage: EnsembleStageType.Observation; +// realizationNum?: number; // The observation might be tied to a realization (e.g., depth converted) +// }; + +export type EnsembleStage = EnsembleStatisticStage | EnsembleRealizationStage; //| EnsembleObservationStage; diff --git a/frontend/src/modules/MapMatrix/view.tsx b/frontend/src/modules/MapMatrix/view.tsx new file mode 100644 index 000000000..1689ab28e --- /dev/null +++ b/frontend/src/modules/MapMatrix/view.tsx @@ -0,0 +1,226 @@ +import React from "react"; + +import { SurfaceDataPng_api } from "@api"; +import { View } from "@deck.gl/core/typed"; +import { ContinuousLegend } from "@emerson-eps/color-tables"; +import { colorTablesObj } from "@emerson-eps/color-tables"; +import { ModuleFCProps } from "@framework/Module"; +import { useViewStatusWriter } from "@framework/StatusWriter"; +import { IconButton } from "@lib/components/IconButton"; +import { SyncedSubsurfaceViewer } from "@modules/SubsurfaceMap/components/SyncedSubsurfaceViewer"; +import { SurfaceAddress } from "@modules/_shared/Surface"; +import { SurfaceAddressFactory } from "@modules/_shared/Surface"; +// import { shouldUpdateViewPortBounds } from "@modules/_shared/Surface/subsurfaceMapUtils"; +import { createContinuousColorScaleForMap } from "@modules/_shared/Surface/subsurfaceMapUtils"; +import { Home } from "@mui/icons-material"; +import { ViewportType, ViewsType } from "@webviz/subsurface-viewer"; +import { ViewFooter } from "@webviz/subsurface-viewer/dist/components/ViewFooter"; + +import { isEqual } from "lodash"; + +import { SurfaceSpecificationLabel } from "./components/surfaceSpecificationLabel"; +import { IndexedSurfaceDatas, useSurfaceDataSetQueryByAddresses } from "./hooks/useSurfaceDataAsPngQuery"; +import { State } from "./state"; +import { EnsembleStageType, SurfaceSpecification } from "./types"; + +export function view({ moduleContext, workbenchServices, workbenchSettings }: ModuleFCProps) { + const [viewportBounds, setviewPortBounds] = React.useState<[number, number, number, number] | undefined>(undefined); + const surfaceSpecifications = moduleContext.useStoreValue("surfaceSpecifications"); + const surfaceAddresses = createSurfaceAddressesFromSpecifications(surfaceSpecifications); + const surfaceDataSetQueryByAddresses = useSurfaceDataSetQueryByAddresses(surfaceAddresses); + + const statusWriter = useViewStatusWriter(moduleContext); + statusWriter.setLoading(surfaceDataSetQueryByAddresses.isFetching); + + const [prevSurfaceDataSetQueryByAddresses, setPrevSurfaceDataSetQueryByAddresses] = + React.useState(null); + + let surfaceDataSet: Array<{ + index: number; + surfaceData: SurfaceDataPng_api | null; + }> = []; + if ( + !surfaceDataSetQueryByAddresses.isFetching && + !isEqual(prevSurfaceDataSetQueryByAddresses, surfaceDataSetQueryByAddresses) + ) { + setPrevSurfaceDataSetQueryByAddresses(surfaceDataSetQueryByAddresses); + surfaceDataSet = surfaceDataSetQueryByAddresses.data; + } else if (prevSurfaceDataSetQueryByAddresses) { + surfaceDataSet = prevSurfaceDataSetQueryByAddresses.data; + } + + const colorScaleGradientType = moduleContext.useStoreValue("colorScaleGradientType"); + const surfaceColorScale = workbenchSettings.useContinuousColorScale({ + gradientType: colorScaleGradientType, + }); + const colorTables = createContinuousColorScaleForMap(surfaceColorScale); + const views: ViewsType = makeEmptySurfaceViews(surfaceDataSet.length ?? 1); + const viewAnnotations: JSX.Element[] = []; + const layers: Record[] = [ + { + "@@type": "Axes2DLayer", + id: "axes-layer2D", + marginH: 80, + marginV: 30, + isLeftRuler: true, + isRightRuler: false, + isBottomRuler: false, + isTopRuler: true, + backgroundColor: [255, 255, 255, 255], + }, + ]; + + surfaceDataSet.forEach((surface, index) => { + const colorMin = surfaceSpecifications[index].colorMin ?? null; + const colorMax = surfaceSpecifications[index].colorMax ?? null; + const valueMin = surface?.surfaceData?.val_min ?? 0; + const valueMax = surface?.surfaceData?.val_max ?? 0; + if (surface.surfaceData) { + const newBounds: [number, number, number, number] = [ + surface.surfaceData.x_min, + surface.surfaceData.y_min, + surface.surfaceData.x_max, + surface.surfaceData.y_max, + ]; + if (!viewportBounds) { + setviewPortBounds(newBounds); + } + + layers.push( + createSurfaceImageLayer(`surface-${index}`, surface.surfaceData, valueMin, valueMax, colorMin, colorMax) + ); + views.viewports[index] = { + id: `${index}view`, + show3D: false, + isSync: true, + layerIds: ["axes-layer2D", `surface-${index}`], + name: `Surface ${index}`, + }; + } + viewAnnotations.push( + makeViewAnnotation( + `${index}view`, + surfaceSpecifications[index], + colorTables, + colorMin || valueMin, + colorMax || valueMax + ) + ); + }); + + return ( +
+
+ + {viewAnnotations} + +
+
+ setviewPortBounds(undefined)}> + + +
+
+ ); +} +function makeViewAnnotation( + id: string, + surfaceSpecification: SurfaceSpecification, + colorTables: colorTablesObj[], + colorMin: number, + colorMax: number +): JSX.Element { + return ( + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + /* @ts-expect-error */ + + <> + + + + + + + ); +} + +function createSurfaceImageLayer( + id: string, + surfaceData: SurfaceDataPng_api, + valueMin: number | null, + valueMax: number | null, + colorMin: number | null, + colorMax: number | null +): Record { + return { + "@@type": "ColormapLayer", + id: id, + image: `data:image/png;base64,${surfaceData.base64_encoded_image}`, + bounds: [ + surfaceData.x_min_surf_orient, + surfaceData.y_min_surf_orient, + surfaceData.x_max_surf_orient, + surfaceData.y_max_surf_orient, + ], + rotDeg: surfaceData.rot_deg, + valueRange: [valueMin, valueMax], + colorMapRange: [colorMin, colorMax], + colorMapName: "Continuous", + }; +} + +function makeEmptySurfaceViews(numSubplots: number): ViewsType { + const numColumns = Math.ceil(Math.sqrt(numSubplots)); + const numRows = Math.ceil(numSubplots / numColumns); + const viewPorts: ViewportType[] = []; + for (let index = 0; index < numSubplots; index++) { + viewPorts.push({ + id: `${index}view`, + show3D: false, + isSync: true, + layerIds: [`surface-${index}`], + name: `Surface ${index}`, + }); + } + return { layout: [numRows, numColumns], showLabel: true, viewports: viewPorts }; +} + +function createSurfaceAddressesFromSpecifications(surfaceSpecifications: SurfaceSpecification[]): SurfaceAddress[] { + const surfaceAddresses: SurfaceAddress[] = []; + surfaceSpecifications.forEach((surface) => { + if (surface.ensembleIdent && surface.surfaceName && surface.surfaceAttribute) { + const factory = new SurfaceAddressFactory( + surface.ensembleIdent?.getCaseUuid(), + surface.ensembleIdent?.getEnsembleName(), + surface.surfaceName, + surface.surfaceAttribute, + surface.surfaceTimeOrInterval + ); + if (surface.ensembleStage === EnsembleStageType.Realization && surface.realizationNum !== null) { + const surfaceAddress = factory.createRealizationAddress(surface.realizationNum); + surfaceAddresses.push(surfaceAddress); + } + if (surface.ensembleStage === EnsembleStageType.Statistics) { + const surfaceAddress = factory.createStatisticalAddress(surface.statisticFunction); + surfaceAddresses.push(surfaceAddress); + } + } + }); + return surfaceAddresses; +} diff --git a/frontend/src/modules/SubsurfaceMap/_utils/color.ts b/frontend/src/modules/SubsurfaceMap/_utils/color.ts deleted file mode 100644 index de26d9938..000000000 --- a/frontend/src/modules/SubsurfaceMap/_utils/color.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { colorTablesObj } from "@emerson-eps/color-tables"; -import { ColorScale } from "@lib/utils/ColorScale"; - -import { Color, Rgb, parse } from "culori"; - -export function createContinuousColorScaleForMap(colorScale: ColorScale): colorTablesObj[] { - const hexColors = colorScale.getPlotlyColorScale(); - const rgbArr: [number, number, number, number][] = []; - hexColors.forEach((hexColor) => { - const color: Color | undefined = parse(hexColor[1]); // Returns object with r, g, b items for hex strings - - if (color && "r" in color && "g" in color && "b" in color) { - const rgbColor = color as Rgb; - rgbArr.push([hexColor[0], rgbColor.r * 255, rgbColor.g * 255, rgbColor.b * 255]); - } - }); - - return [{ name: "Continuous", discrete: false, colors: rgbArr }]; -} diff --git a/frontend/src/modules/SubsurfaceMap/_utils/index.ts b/frontend/src/modules/SubsurfaceMap/_utils/index.ts deleted file mode 100644 index defa64dda..000000000 --- a/frontend/src/modules/SubsurfaceMap/_utils/index.ts +++ /dev/null @@ -1,10 +0,0 @@ -export { - createSurfaceMeshLayer, - createWellboreTrajectoryLayer, - createSurfacePolygonsLayer, - createNorthArrowLayer, - createAxesLayer, - createWellBoreHeaderLayer, -} from "./subsurfaceMap"; -export type { SurfaceMeta, SurfaceMeshLayerSettings, ViewSettings } from "./subsurfaceMap"; -export { createContinuousColorScaleForMap } from "./color"; diff --git a/frontend/src/modules/SubsurfaceMap/state.ts b/frontend/src/modules/SubsurfaceMap/state.ts index 810f1b7d6..e818be9e6 100644 --- a/frontend/src/modules/SubsurfaceMap/state.ts +++ b/frontend/src/modules/SubsurfaceMap/state.ts @@ -1,7 +1,6 @@ import { PolygonsAddress } from "@modules/_shared/Polygons/polygonsAddress"; import { SurfaceAddress } from "@modules/_shared/Surface"; - -import { SurfaceMeshLayerSettings, ViewSettings } from "./_utils"; +import { SurfaceMeshLayerSettings, ViewSettings } from "@modules/_shared/Surface/subsurfaceMapUtils"; export interface state { meshSurfaceAddress: SurfaceAddress | null; diff --git a/frontend/src/modules/SubsurfaceMap/view.tsx b/frontend/src/modules/SubsurfaceMap/view.tsx index afbbab0ec..7b9578ef5 100644 --- a/frontend/src/modules/SubsurfaceMap/view.tsx +++ b/frontend/src/modules/SubsurfaceMap/view.tsx @@ -11,9 +11,8 @@ import { ColorScaleGradientType } from "@lib/utils/ColorScale"; import { usePolygonsDataQueryByAddress } from "@modules/_shared/Polygons"; import { useFieldWellsTrajectoriesQuery } from "@modules/_shared/WellBore/queryHooks"; import { useSurfaceDataQueryByAddress } from "@modules_shared/Surface"; -import { ViewAnnotation } from "@webviz/subsurface-viewer/dist/components/ViewAnnotation"; - import { + Bounds, SurfaceMeta, createAxesLayer, createContinuousColorScaleForMap, @@ -22,39 +21,14 @@ import { createSurfacePolygonsLayer, createWellBoreHeaderLayer, createWellboreTrajectoryLayer, -} from "./_utils"; + shouldUpdateViewPortBounds, +} from "@modules_shared/Surface/subsurfaceMapUtils"; +import { ViewAnnotation } from "@webviz/subsurface-viewer/dist/components/ViewAnnotation"; + import { SyncedSubsurfaceViewer } from "./components/SyncedSubsurfaceViewer"; import { usePropertySurfaceDataByQueryAddress } from "./queryHooks"; import { state } from "./state"; -type Bounds = [number, number, number, number]; - -const updateViewPortBounds = ( - existingViewPortBounds: Bounds | undefined, - resetBounds: boolean, - surfaceMeta: SurfaceMeta -): Bounds => { - const updatedBounds: Bounds = [surfaceMeta.x_min, surfaceMeta.y_min, surfaceMeta.x_max, surfaceMeta.y_max]; - - if (!existingViewPortBounds || resetBounds) { - console.debug("updateViewPortBounds: no existing bounds, returning updated bounds"); - return updatedBounds; - } - - // Check if bounds overlap - if ( - existingViewPortBounds[2] < updatedBounds[0] || // existing right edge is to the left of updated left edge - existingViewPortBounds[0] > updatedBounds[2] || // existing left edge is to the right of updated right edge - existingViewPortBounds[3] < updatedBounds[1] || // existing bottom edge is above updated top edge - existingViewPortBounds[1] > updatedBounds[3] // existing top edge is below updated bottom edge - ) { - console.debug("updateViewPortBounds: bounds don't overlap, returning updated bounds"); - return updatedBounds; // Return updated bounds since they don't overlap - } - - // Otherwise, return the existing bounds - return existingViewPortBounds; -}; //----------------------------------------------------------------------------------------------------------- export function View({ moduleContext, workbenchSettings, workbenchServices }: ModuleFCProps) { const myInstanceIdStr = moduleContext.getInstanceIdString(); @@ -130,8 +104,15 @@ export function View({ moduleContext, workbenchSettings, workbenchServices }: Mo React.useEffect(() => { if (meshSurfDataQuery.data) { const newSurfaceMetaData: SurfaceMeta = { ...meshSurfDataQuery.data }; - - setviewPortBounds(updateViewPortBounds(viewportBounds, resetBounds, newSurfaceMetaData)); + const newBounds: Bounds = [ + newSurfaceMetaData.x_min, + newSurfaceMetaData.y_min, + newSurfaceMetaData.x_max, + newSurfaceMetaData.y_max, + ]; + if (resetBounds || shouldUpdateViewPortBounds(viewportBounds, newBounds)) { + setviewPortBounds(newBounds); + } toggleResetBounds(false); const axesLayer: Record = createAxesLayer([ diff --git a/frontend/src/modules/SubsurfaceMap/_utils/subsurfaceMap.ts b/frontend/src/modules/_shared/Surface/subsurfaceMapUtils.ts similarity index 82% rename from frontend/src/modules/SubsurfaceMap/_utils/subsurfaceMap.ts rename to frontend/src/modules/_shared/Surface/subsurfaceMapUtils.ts index 47aebafe8..8be82b3ef 100644 --- a/frontend/src/modules/SubsurfaceMap/_utils/subsurfaceMap.ts +++ b/frontend/src/modules/_shared/Surface/subsurfaceMapUtils.ts @@ -1,5 +1,40 @@ import { PolygonData_api, WellBoreTrajectory_api } from "@api"; +import { colorTablesObj } from "@emerson-eps/color-tables"; +import { ColorScale } from "@lib/utils/ColorScale"; +import { Color, Rgb, parse } from "culori"; + +export function createContinuousColorScaleForMap(colorScale: ColorScale): colorTablesObj[] { + const hexColors = colorScale.getPlotlyColorScale(); + const rgbArr: [number, number, number, number][] = []; + hexColors.forEach((hexColor) => { + const color: Color | undefined = parse(hexColor[1]); // Returns object with r, g, b items for hex strings + + if (color && "r" in color && "g" in color && "b" in color) { + const rgbColor = color as Rgb; + rgbArr.push([hexColor[0], rgbColor.r * 255, rgbColor.g * 255, rgbColor.b * 255]); + } + }); + + return [{ name: "Continuous", discrete: false, colors: rgbArr }]; +} +export type Bounds = [number, number, number, number]; +export const shouldUpdateViewPortBounds = (existingViewPortBounds: Bounds | undefined, newBounds: Bounds): boolean => { + if (!existingViewPortBounds) { + return true; + } + // Check if bounds overlap, update if not + if ( + existingViewPortBounds[2] < newBounds[0] || + existingViewPortBounds[0] > newBounds[2] || + existingViewPortBounds[3] < newBounds[1] || + existingViewPortBounds[1] > newBounds[3] + ) { + return true; + } + + return false; +}; export type SurfaceMeshLayerSettings = { contours?: boolean | number[]; gridLines?: boolean; diff --git a/frontend/src/modules/_shared/Surface/surfaceDirectory.ts b/frontend/src/modules/_shared/Surface/surfaceDirectory.ts index 50afa31ad..92f7870dd 100644 --- a/frontend/src/modules/_shared/Surface/surfaceDirectory.ts +++ b/frontend/src/modules/_shared/Surface/surfaceDirectory.ts @@ -122,7 +122,39 @@ export class SurfaceDirectory { }); return [...timeOrIntervalsSet].sort(); } + //Get min and max value + public getValueRange( + requireSurfaceName: string | null, + requireAttributeName: string | null, + requireTimeOrIntervalString: string | null + ): { min: number; max: number } { + let filteredList = this._surfaceList; + + if (requireSurfaceName || requireAttributeName || requireTimeOrIntervalString) { + filteredList = filteredList.filter((surface) => { + const matchedOnSurfName = !requireSurfaceName || surface.name === requireSurfaceName; + const matchedOnAttrName = !requireAttributeName || surface.attribute_name === requireAttributeName; + const matchedOnTimeOrIntervalString = + !requireTimeOrIntervalString || surface.iso_date_or_interval === requireTimeOrIntervalString; + return matchedOnSurfName && matchedOnAttrName && matchedOnTimeOrIntervalString; + }); + } + if (filteredList.length === 0) { + return { min: 0, max: 0 }; + } + + //Get min and max values, ignoring items with null values. Those are not included in the range. Setting default to 0 + const filteredListWithValues = filteredList.filter( + (surface) => surface.value_min !== null && surface.value_max !== null + ); + const minValues = filteredListWithValues.map((surface) => surface.value_min ?? Number.POSITIVE_INFINITY); + const maxValues = filteredListWithValues.map((surface) => surface.value_max ?? Number.NEGATIVE_INFINITY); + + const min = filteredListWithValues.length > 0 ? Math.min(...minValues) : 0; + const max = filteredListWithValues.length > 0 ? Math.max(...maxValues) : 0; + return { min, max }; + } // Checks if a given name and attribute pair exists. public nameAttributePairExists(surfaceName: string | null, attributeName: string | null): boolean { if (!attributeName || !surfaceName) return false; @@ -131,6 +163,9 @@ export class SurfaceDirectory { ); } + public getSurfaceMetas(): SurfaceMeta_api[] { + return this._surfaceList; + } // // Get min/max value for a given surface name and attribute. // public getMinMax( // stratigraphicName: string | null, diff --git a/frontend/src/modules/registerAllModules.ts b/frontend/src/modules/registerAllModules.ts index 2f1fd4115..c3832c136 100644 --- a/frontend/src/modules/registerAllModules.ts +++ b/frontend/src/modules/registerAllModules.ts @@ -5,6 +5,7 @@ import "./Grid3D/registerModule"; import "./Grid3DIntersection/registerModule"; import "./InplaceVolumetrics/registerModule"; import "./Map/registerModule"; +import "./MapMatrix/registerModule"; import "./ParameterDistributionMatrix/registerModule"; import "./Pvt/registerModule"; import "./Rft/registerModule"; diff --git a/nginx.conf b/nginx.conf index 0d9a0aea7..a481a8671 100644 --- a/nginx.conf +++ b/nginx.conf @@ -57,7 +57,7 @@ http { proxy_http_version 1.1; root /usr/share/nginx/dist; add_header Cache-Control "no-cache"; - add_header Content-Security-Policy "default-src 'self'; style-src 'self' 'unsafe-inline' https://cdn.eds.equinor.com; script-src 'self' 'unsafe-eval' blob:; font-src https://cdn.eds.equinor.com; img-src 'self' data:; form-action 'self'; base-uri 'none'; frame-ancestors 'none';"; + add_header Content-Security-Policy "default-src 'self'; connect-src 'self' data:; style-src 'self' 'unsafe-inline' https://cdn.eds.equinor.com; script-src 'self' 'unsafe-eval' blob:; font-src https://cdn.eds.equinor.com; img-src 'self' data:; form-action 'self'; base-uri 'none'; frame-ancestors 'none';"; add_header X-Content-Type-Options "nosniff"; add_header X-Frame-Options "DENY"; add_header X-XSS-Protection "1; mode=block"; From fd32853154999ec1936bd53d4613996ace1d9bfc Mon Sep 17 00:00:00 2001 From: Hans Kallekleiv <16436291+HansKallekleiv@users.noreply.github.com> Date: Tue, 20 Feb 2024 13:16:35 +0100 Subject: [PATCH 02/14] wip --- .../backend/primary/routers/surface/router.py | 32 ++++++++ .../services/sumo_access/surface_access.py | 51 ++++++++++++ frontend/src/api/models/EnsembleParameter.ts | 4 +- .../models/EnsembleParameterDescription.ts | 4 +- .../src/api/models/EnsembleScalarResponse.ts | 4 +- frontend/src/api/models/GraphUserPhoto.ts | 2 +- frontend/src/api/models/Observations.ts | 4 +- frontend/src/api/models/PolygonsMeta.ts | 6 +- frontend/src/api/models/RftObservation.ts | 2 +- frontend/src/api/models/RftObservations.ts | 2 +- frontend/src/api/models/StratigraphicUnit.ts | 4 +- .../models/SummaryVectorDateObservation.ts | 2 +- .../api/models/SummaryVectorObservations.ts | 2 +- frontend/src/api/models/SurfaceMeta.ts | 14 ++-- frontend/src/api/models/UserInfo.ts | 4 +- frontend/src/api/models/WellBorePick.ts | 2 +- .../WellBorePicksAndStratigraphicUnits.ts | 4 +- .../src/api/models/WellCompletionsZone.ts | 2 +- frontend/src/api/services/SurfaceService.ts | 32 ++++++++ frontend/src/framework/WorkbenchSettings.ts | 6 +- .../colorPaletteSettings.tsx | 6 +- .../components/colorPaletteSelect.tsx | 44 ++++++++++ .../MapMatrix/components/colorRangeSelect.tsx | 82 +++++++++++++++++++ .../components/ensembleStageSelect.tsx | 15 ++-- .../components/surfaceAttributeTypeSelect.tsx | 51 ++++-------- .../components/surfaceColorSelect.tsx | 33 -------- .../MapMatrix/components/surfaceSelect.tsx | 71 +++++++++++----- .../MapMatrix/components/syncSettings.tsx | 2 + .../hooks/useSurfaceDataAsPngQuery.ts | 19 ++++- .../MapMatrix/hooks/useSurfaceReducer.ts | 22 ++--- .../MapMatrix/reducers/surfaceReducer.ts | 61 +++++++++----- frontend/src/modules/MapMatrix/settings.tsx | 30 +++---- frontend/src/modules/MapMatrix/state.ts | 5 +- frontend/src/modules/MapMatrix/types.ts | 37 ++++++--- frontend/src/modules/MapMatrix/view.tsx | 42 ++++++---- .../src/modules/_shared/Surface/queryHooks.ts | 1 + .../_shared/Surface/subsurfaceMapUtils.ts | 37 ++++++++- .../modules/_shared/Surface/surfaceAddress.ts | 21 ++++- 38 files changed, 539 insertions(+), 223 deletions(-) create mode 100644 frontend/src/modules/MapMatrix/components/colorPaletteSelect.tsx create mode 100644 frontend/src/modules/MapMatrix/components/colorRangeSelect.tsx delete mode 100644 frontend/src/modules/MapMatrix/components/surfaceColorSelect.tsx diff --git a/backend/src/backend/primary/routers/surface/router.py b/backend/src/backend/primary/routers/surface/router.py index 35be99019..7f5e3f45d 100644 --- a/backend/src/backend/primary/routers/surface/router.py +++ b/backend/src/backend/primary/routers/surface/router.py @@ -199,6 +199,38 @@ async def get_statistical_surface_data_as_png( return surf_data_response +@router.get("/observation_surface_data_as_png/") +async def get_observation_surface_data_as_png( + response: Response, + authenticated_user: AuthenticatedUser = Depends(AuthHelper.get_authenticated_user), + case_uuid: str = Query(description="Sumo case uuid"), + ensemble_name: str = Query(description="Ensemble name"), + name: str = Query(description="Surface name"), + attribute: str = Query(description="Surface attribute"), + time_or_interval: Optional[str] = Query(None, description="Time point or time interval string"), +) -> schemas.SurfaceDataPng: + perf_metrics = PerfMetrics(response) + + access = await SurfaceAccess.from_case_uuid(authenticated_user.get_sumo_access_token(), case_uuid, ensemble_name) + + xtgeo_surf = await access.get_observation_surface_data_async( + name=name, + attribute=attribute, + time_or_interval_str=time_or_interval, + ) + perf_metrics.record_lap("sumo-calc") + + if not xtgeo_surf: + raise HTTPException(status_code=404, detail="Could not find or compute surface") + + surf_data_response = converters.to_api_surface_data_as_png(xtgeo_surf) + perf_metrics.record_lap("convert") + + LOGGER.info(f"Observed surface in: {perf_metrics.to_string()}") + + return surf_data_response + + # pylint: disable=too-many-arguments @router.get("/property_surface_resampled_to_static_surface/") async def get_property_surface_resampled_to_static_surface( diff --git a/backend/src/services/sumo_access/surface_access.py b/backend/src/services/sumo_access/surface_access.py index 351ba8ebe..ab882cf7b 100644 --- a/backend/src/services/sumo_access/surface_access.py +++ b/backend/src/services/sumo_access/surface_access.py @@ -173,6 +173,57 @@ async def get_realization_surface_data_async( return xtgeo_surf + async def get_observation_surface_data_async( + self, + name: str, + attribute: str, + time_or_interval_str: Optional[str] = None, + ) -> Optional[xtgeo.RegularSurface]: + """ + Get surface data for an observed surface + """ + + if time_or_interval_str is None: + time_filter = TimeFilter(TimeType.NONE) + + else: + timestamp_arr = time_or_interval_str.split("/", 1) + if len(timestamp_arr) == 0 or len(timestamp_arr) > 2: + raise ValueError("time_or_interval_str must contain a single timestamp or interval") + if len(timestamp_arr) == 1: + time_filter = TimeFilter( + TimeType.TIMESTAMP, + start=timestamp_arr[0], + end=timestamp_arr[0], + exact=True, + ) + else: + time_filter = TimeFilter( + TimeType.INTERVAL, + start=timestamp_arr[0], + end=timestamp_arr[1], + exact=True, + ) + # Remove this once Sumo enforces tagname (tagname-unset) + # https://github.com/equinor/webviz/issues/433 + tagname = attribute if attribute != "Unknown" else "" + surface_collection = self._case.surfaces.filter( + stage="case", # Should get these from dataio, + name=name, + tagname=tagname, + time=time_filter, + ) + + surf_count = await surface_collection.length_async() + if surf_count == 0: + return None + + sumo_surf: Surface = await surface_collection.getitem_async(0) + byte_stream: BytesIO = await sumo_surf.blob_async + xtgeo_surf = xtgeo.surface_from_file(byte_stream) + + return xtgeo_surf + async def get_statistical_surface_data_async( self, statistic_function: StatisticFunction, diff --git a/frontend/src/api/models/EnsembleParameter.ts b/frontend/src/api/models/EnsembleParameter.ts index 3f4bdbd66..684b518a5 100644 --- a/frontend/src/api/models/EnsembleParameter.ts +++ b/frontend/src/api/models/EnsembleParameter.ts @@ -10,8 +10,8 @@ export type EnsembleParameter = { is_logarithmic: boolean; is_numerical: boolean; is_constant: boolean; - group_name?: (string | null); - descriptive_name?: (string | null); + group_name: (string | null); + descriptive_name: (string | null); realizations: Array; values: (Array | Array); }; diff --git a/frontend/src/api/models/EnsembleParameterDescription.ts b/frontend/src/api/models/EnsembleParameterDescription.ts index 13d114bf9..eae024cc4 100644 --- a/frontend/src/api/models/EnsembleParameterDescription.ts +++ b/frontend/src/api/models/EnsembleParameterDescription.ts @@ -4,8 +4,8 @@ /* eslint-disable */ export type EnsembleParameterDescription = { name: string; - group_name?: (string | null); - descriptive_name?: (string | null); + group_name: (string | null); + descriptive_name: (string | null); is_numerical: boolean; }; diff --git a/frontend/src/api/models/EnsembleScalarResponse.ts b/frontend/src/api/models/EnsembleScalarResponse.ts index 17b4e68c7..10d7766ab 100644 --- a/frontend/src/api/models/EnsembleScalarResponse.ts +++ b/frontend/src/api/models/EnsembleScalarResponse.ts @@ -8,7 +8,7 @@ export type EnsembleScalarResponse = { realizations: Array; values: Array; - name?: (string | null); - unit?: (string | null); + name: (string | null); + unit: (string | null); }; diff --git a/frontend/src/api/models/GraphUserPhoto.ts b/frontend/src/api/models/GraphUserPhoto.ts index 3b0605393..bd7d316d0 100644 --- a/frontend/src/api/models/GraphUserPhoto.ts +++ b/frontend/src/api/models/GraphUserPhoto.ts @@ -3,6 +3,6 @@ /* tslint:disable */ /* eslint-disable */ export type GraphUserPhoto = { - avatar_b64str?: (string | null); + avatar_b64str: (string | null); }; diff --git a/frontend/src/api/models/Observations.ts b/frontend/src/api/models/Observations.ts index 24984301b..01ce18918 100644 --- a/frontend/src/api/models/Observations.ts +++ b/frontend/src/api/models/Observations.ts @@ -8,7 +8,7 @@ import type { SummaryVectorObservations } from './SummaryVectorObservations'; * A collection of observations associated with a field/case/ensemble */ export type Observations = { - summary?: Array; - rft?: Array; + summary: Array; + rft: Array; }; diff --git a/frontend/src/api/models/PolygonsMeta.ts b/frontend/src/api/models/PolygonsMeta.ts index 7aa58d919..a9555a693 100644 --- a/frontend/src/api/models/PolygonsMeta.ts +++ b/frontend/src/api/models/PolygonsMeta.ts @@ -6,9 +6,9 @@ import type { PolygonsAttributeType } from './PolygonsAttributeType'; export type PolygonsMeta = { name: string; name_is_stratigraphic_offical: boolean; - stratigraphic_identifier?: (string | null); - relative_stratigraphic_level?: (number | null); - parent_stratigraphic_identifier?: (string | null); + stratigraphic_identifier: (string | null); + relative_stratigraphic_level: (number | null); + parent_stratigraphic_identifier: (string | null); attribute_name: string; attribute_type: PolygonsAttributeType; }; diff --git a/frontend/src/api/models/RftObservation.ts b/frontend/src/api/models/RftObservation.ts index 40caf3a7d..b66453be1 100644 --- a/frontend/src/api/models/RftObservation.ts +++ b/frontend/src/api/models/RftObservation.ts @@ -17,7 +17,7 @@ */ export type RftObservation = { value: number; - comment?: (string | null); + comment: (string | null); error: number; zone: string; md_msl: number; diff --git a/frontend/src/api/models/RftObservations.ts b/frontend/src/api/models/RftObservations.ts index a0e68608f..bb1d9a650 100644 --- a/frontend/src/api/models/RftObservations.ts +++ b/frontend/src/api/models/RftObservations.ts @@ -15,7 +15,7 @@ import type { RftObservation } from './RftObservation'; export type RftObservations = { well: string; date: string; - comment?: (string | null); + comment: (string | null); observations: Array; }; diff --git a/frontend/src/api/models/StratigraphicUnit.ts b/frontend/src/api/models/StratigraphicUnit.ts index 1c23618a3..614eb722c 100644 --- a/frontend/src/api/models/StratigraphicUnit.ts +++ b/frontend/src/api/models/StratigraphicUnit.ts @@ -15,10 +15,10 @@ export type StratigraphicUnit = { stratUnitType: string; topAge: number; baseAge: number; - stratUnitParent?: (string | null); + stratUnitParent: (string | null); colorR: number; colorG: number; colorB: number; - lithologyType?: (number | string); + lithologyType: (number | string); }; diff --git a/frontend/src/api/models/SummaryVectorDateObservation.ts b/frontend/src/api/models/SummaryVectorDateObservation.ts index 742a41c37..e9df49f20 100644 --- a/frontend/src/api/models/SummaryVectorDateObservation.ts +++ b/frontend/src/api/models/SummaryVectorDateObservation.ts @@ -7,7 +7,7 @@ */ export type SummaryVectorDateObservation = { date: string; - comment?: (string | null); + comment: (string | null); value: number; error: number; label: string; diff --git a/frontend/src/api/models/SummaryVectorObservations.ts b/frontend/src/api/models/SummaryVectorObservations.ts index 03971b5ce..fe4f1798d 100644 --- a/frontend/src/api/models/SummaryVectorObservations.ts +++ b/frontend/src/api/models/SummaryVectorObservations.ts @@ -8,7 +8,7 @@ import type { SummaryVectorDateObservation } from './SummaryVectorDateObservatio */ export type SummaryVectorObservations = { vector_name: string; - comment?: (string | null); + comment: (string | null); observations: Array; }; diff --git a/frontend/src/api/models/SurfaceMeta.ts b/frontend/src/api/models/SurfaceMeta.ts index b9b70e643..3179789a2 100644 --- a/frontend/src/api/models/SurfaceMeta.ts +++ b/frontend/src/api/models/SurfaceMeta.ts @@ -7,15 +7,15 @@ import type { SurfaceAttributeType } from './SurfaceAttributeType'; export type SurfaceMeta = { name: string; name_is_stratigraphic_offical: boolean; - stratigraphic_identifier?: (string | null); - relative_stratigraphic_level?: (number | null); - parent_stratigraphic_identifier?: (string | null); - stratigraphic_feature?: (StratigraphicFeature | null); + stratigraphic_identifier: (string | null); + relative_stratigraphic_level: (number | null); + parent_stratigraphic_identifier: (string | null); + stratigraphic_feature: (StratigraphicFeature | null); attribute_name: string; attribute_type: SurfaceAttributeType; - iso_date_or_interval?: (string | null); + iso_date_or_interval: (string | null); is_observation: boolean; - value_min?: (number | null); - value_max?: (number | null); + value_min: (number | null); + value_max: (number | null); }; diff --git a/frontend/src/api/models/UserInfo.ts b/frontend/src/api/models/UserInfo.ts index 70a0dc863..80c837b11 100644 --- a/frontend/src/api/models/UserInfo.ts +++ b/frontend/src/api/models/UserInfo.ts @@ -4,8 +4,8 @@ /* eslint-disable */ export type UserInfo = { username: string; - display_name?: (string | null); - avatar_b64str?: (string | null); + display_name: (string | null); + avatar_b64str: (string | null); has_sumo_access: boolean; has_smda_access: boolean; }; diff --git a/frontend/src/api/models/WellBorePick.ts b/frontend/src/api/models/WellBorePick.ts index 0ced07b00..bb2c04482 100644 --- a/frontend/src/api/models/WellBorePick.ts +++ b/frontend/src/api/models/WellBorePick.ts @@ -16,7 +16,7 @@ export type WellBorePick = { mdMsl: number; uniqueWellboreIdentifier: string; pickIdentifier: string; - confidence?: (string | null); + confidence: (string | null); depthReferencePoint: string; mdUnit: string; }; diff --git a/frontend/src/api/models/WellBorePicksAndStratigraphicUnits.ts b/frontend/src/api/models/WellBorePicksAndStratigraphicUnits.ts index c8991bfaa..eabf74a2a 100644 --- a/frontend/src/api/models/WellBorePicksAndStratigraphicUnits.ts +++ b/frontend/src/api/models/WellBorePicksAndStratigraphicUnits.ts @@ -5,7 +5,7 @@ import type { StratigraphicUnit } from './StratigraphicUnit'; import type { WellBorePick } from './WellBorePick'; export type WellBorePicksAndStratigraphicUnits = { - wellbore_picks?: Array; - stratigraphic_units?: Array; + wellbore_picks: Array; + stratigraphic_units: Array; }; diff --git a/frontend/src/api/models/WellCompletionsZone.ts b/frontend/src/api/models/WellCompletionsZone.ts index 09b68796d..5a6ad3568 100644 --- a/frontend/src/api/models/WellCompletionsZone.ts +++ b/frontend/src/api/models/WellCompletionsZone.ts @@ -4,6 +4,6 @@ /* eslint-disable */ export type WellCompletionsZone = { name: string; - subzones?: (Array | null); + subzones: (Array | null); }; diff --git a/frontend/src/api/services/SurfaceService.ts b/frontend/src/api/services/SurfaceService.ts index 49196e5e4..ea638403d 100644 --- a/frontend/src/api/services/SurfaceService.ts +++ b/frontend/src/api/services/SurfaceService.ts @@ -178,6 +178,38 @@ export class SurfaceService { }, }); } + /** + * Get Observation Surface Data As Png + * @param caseUuid Sumo case uuid + * @param ensembleName Ensemble name + * @param name Surface name + * @param attribute Surface attribute + * @param timeOrInterval Time point or time interval string + * @returns SurfaceDataPng Successful Response + * @throws ApiError + */ + public getObservationSurfaceDataAsPng( + caseUuid: string, + ensembleName: string, + name: string, + attribute: string, + timeOrInterval?: (string | null), + ): CancelablePromise { + return this.httpRequest.request({ + method: 'GET', + url: '/surface/observation_surface_data_as_png/', + query: { + 'case_uuid': caseUuid, + 'ensemble_name': ensembleName, + 'name': name, + 'attribute': attribute, + 'time_or_interval': timeOrInterval, + }, + errors: { + 422: `Validation Error`, + }, + }); + } /** * Get Property Surface Resampled To Static Surface * @param caseUuid Sumo case uuid diff --git a/frontend/src/framework/WorkbenchSettings.ts b/frontend/src/framework/WorkbenchSettings.ts index 5dc7fff74..ca5528bd2 100644 --- a/frontend/src/framework/WorkbenchSettings.ts +++ b/frontend/src/framework/WorkbenchSettings.ts @@ -30,7 +30,7 @@ export enum ColorScaleDiscreteSteps { Diverging = "diverging", } -const defaultColorPalettes = [ +export const defaultColorPalettes = [ new ColorPalette({ name: "Retro Metro", colors: ["#ea5545", "#f46a9b", "#ef9b20", "#edbf33", "#ede15b", "#bdcf32", "#87bc45", "#27aeef", "#b33dc6"], @@ -85,7 +85,7 @@ const defaultColorPalettes = [ }), ]; -const defaultContinuousSequentialColorPalettes = [ +export const defaultContinuousSequentialColorPalettes = [ new ColorPalette({ name: "Blue to Yellow", colors: ["#115f9a", "#1984c5", "#22a7f0", "#48b5c4", "#76c68f", "#a6d75b", "#c9e52f", "#d0ee11", "#f4f100"], @@ -113,7 +113,7 @@ const defaultContinuousSequentialColorPalettes = [ }), ]; -const defaultContinuousDivergingColorPalettes = [ +export const defaultContinuousDivergingColorPalettes = [ new ColorPalette({ name: "Berlin", colors: ["#b9c6ff", "#2f799d", "#150e0d", "#944834", "#ffeded"], diff --git a/frontend/src/framework/internal/components/LeftSettingsPanel/private-components/colorPaletteSettings.tsx b/frontend/src/framework/internal/components/LeftSettingsPanel/private-components/colorPaletteSettings.tsx index 145347036..b82e8e422 100644 --- a/frontend/src/framework/internal/components/LeftSettingsPanel/private-components/colorPaletteSettings.tsx +++ b/frontend/src/framework/internal/components/LeftSettingsPanel/private-components/colorPaletteSettings.tsx @@ -17,7 +17,7 @@ import { resolveClassNames } from "@lib/utils/resolveClassNames"; import { convertRemToPixels } from "@lib/utils/screenUnitConversions"; import { ExpandMore, Palette } from "@mui/icons-material"; -enum ColorPaletteSelectorType { +export enum ColorPaletteSelectorType { Categorical = "categorical", Continuous = "continuous", Discrete = "discrete", @@ -73,7 +73,7 @@ const ColorPaletteItem: React.FC = (props) => { ); }; -type ColorPaletteSelectorProps = { +export type ColorPaletteSelectorProps = { colorPalettes: ColorPalette[]; selectedColorPaletteId: string; onChange?: (colorPalette: ColorPalette) => void; @@ -81,7 +81,7 @@ type ColorPaletteSelectorProps = { steps?: number; }; -const ColorPaletteSelector: React.FC = (props) => { +export const ColorPaletteSelector: React.FC = (props) => { const [open, setOpen] = React.useState(false); const [selectedColorPalette, setSelectedColorPalette] = React.useState( props.colorPalettes.find((el) => el.getId() === props.selectedColorPaletteId) || props.colorPalettes[0] diff --git a/frontend/src/modules/MapMatrix/components/colorPaletteSelect.tsx b/frontend/src/modules/MapMatrix/components/colorPaletteSelect.tsx new file mode 100644 index 000000000..9a4958629 --- /dev/null +++ b/frontend/src/modules/MapMatrix/components/colorPaletteSelect.tsx @@ -0,0 +1,44 @@ +import React from "react"; + +import { + defaultContinuousDivergingColorPalettes, + defaultContinuousSequentialColorPalettes, +} from "@framework/WorkbenchSettings"; +import { + ColorPaletteSelector, + ColorPaletteSelectorType, +} from "@framework/internal/components/LeftSettingsPanel/private-components/colorPaletteSettings"; +import { ColorPalette } from "@lib/utils/ColorPalette"; + +type ColorPaletteSelectProps = { + colorPaletteId: string; + + onChange: (colorPaletteId: string) => void; +}; +export const ColorPaletteSelect: React.FC = (props) => { + // const [selectedColorPaletteId, setSelectedColorPaletteId] = React.useState(props.initialColorPaletteId); + + const handleSelectionChange = (colorPalette: ColorPalette) => { + console.log(colorPalette.getId()); + props.onChange?.(colorPalette.getId()); + }; + return ( + <> + + Color palette + + + + + + + ); +}; diff --git a/frontend/src/modules/MapMatrix/components/colorRangeSelect.tsx b/frontend/src/modules/MapMatrix/components/colorRangeSelect.tsx new file mode 100644 index 000000000..a1dae1144 --- /dev/null +++ b/frontend/src/modules/MapMatrix/components/colorRangeSelect.tsx @@ -0,0 +1,82 @@ +import React from "react"; + +import { Checkbox } from "@lib/components/Checkbox"; +import { Input } from "@lib/components/Input"; + +type ColorRangeSelectProps = { + valueMin: number; + valueMax: number; + onChange: (valueRange: [number, number]) => void; +}; +export const ColorRangeSelect: React.FC = (props) => { + const [useMin, setUseMin] = React.useState(false); + const [useMax, setUseMax] = React.useState(false); + + const [colorMin, setColorMin] = React.useState(props.valueMin); + const [colorMax, setColorMax] = React.useState(props.valueMax); + const [dataMin, setDataMin] = React.useState(props.valueMin); + const [dataMax, setDataMax] = React.useState(props.valueMax); + + if (dataMin !== props.valueMin) { + setDataMin(props.valueMin); + } + if (dataMax !== props.valueMax) { + setDataMax(props.valueMax); + } + const displayedMin = useMin ? colorMin : props.valueMin; + const displayedMax = useMax ? colorMax : props.valueMax; + + React.useEffect(() => { + const min = useMin ? colorMin : props.valueMin; + const max = useMax ? colorMax : props.valueMax; + props.onChange([min, max]); + }, [colorMin, useMin, colorMax, useMax, dataMin, dataMax]); + return ( + + Color range + +
+ setUseMin(e.target.checked)} checked={useMin} /> + +
Min
+
+ { + setColorMin(parseFloat(e.target.value)); + }} + /> +
+
+ setUseMax(e.target.checked)} checked={useMax} /> +
+
Max
+
+ { + setColorMax(parseFloat(e.target.value)); + }} + /> +
+
+ + + ); +}; + +function roundToSignificantFigures(num: number, n: number): number { + if (num === 0) return 0; + + const d = Math.ceil(Math.log10(num < 0 ? -num : num)); + const power = n - d; + const magnitude = Math.pow(10, power); + const shifted = Math.round(num * magnitude); + return shifted / magnitude; +} diff --git a/frontend/src/modules/MapMatrix/components/ensembleStageSelect.tsx b/frontend/src/modules/MapMatrix/components/ensembleStageSelect.tsx index da34bda99..7bd646dda 100644 --- a/frontend/src/modules/MapMatrix/components/ensembleStageSelect.tsx +++ b/frontend/src/modules/MapMatrix/components/ensembleStageSelect.tsx @@ -40,11 +40,11 @@ export const EnsembleStageSelect: React.FC = (props) = realizationNums: [], }); } - // if (stage == EnsembleStageType.Observation) { - // props.onChange({ - // ensembleStage: EnsembleStageType.Observation, - // }); - // } + if (stage == EnsembleStageType.Observation) { + props.onChange({ + ensembleStage: EnsembleStageType.Observation, + }); + } if (stage == EnsembleStageType.Realization) { props.onChange({ ensembleStage: EnsembleStageType.Realization, @@ -67,7 +67,7 @@ export const EnsembleStageSelect: React.FC = (props) =
- {props.stage == EnsembleStageType.Realization && ( + {props.stage === EnsembleStageType.Realization && (
= (props) = />
)} - {props.stage == EnsembleStageType.Statistics && ( + {props.stage === EnsembleStageType.Statistics && (
= (props) = />
)} + {props.stage === EnsembleStageType.Observation &&
} diff --git a/frontend/src/modules/MapMatrix/components/surfaceAttributeTypeSelect.tsx b/frontend/src/modules/MapMatrix/components/surfaceAttributeTypeSelect.tsx index 9df4e5cf4..ac603d491 100644 --- a/frontend/src/modules/MapMatrix/components/surfaceAttributeTypeSelect.tsx +++ b/frontend/src/modules/MapMatrix/components/surfaceAttributeTypeSelect.tsx @@ -3,40 +3,29 @@ import React from "react"; import { SurfaceAttributeType_api } from "@api"; import { Dropdown } from "@lib/components/Dropdown"; import { Label } from "@lib/components/Label"; -import { TimeType } from "@modules/_shared/Surface"; +import { SurfaceTimeType } from "@modules/_shared/Surface"; + +import { SurfaceAttributeType } from "../types"; const SurfaceAttributeTypeToStringMapping = { - [SurfaceAttributeType_api.DEPTH]: "Depth surfaces", - [SurfaceAttributeType_api.TIME]: "Time surfaces", - [SurfaceAttributeType_api.PROPERTY]: "Extracted grid properties", - [SurfaceAttributeType_api.SEISMIC]: "Seismic attributes", - [SurfaceAttributeType_api.THICKNESS]: "Thickness surfaces??", - [SurfaceAttributeType_api.ISOCHORE]: "Isochores", - [SurfaceAttributeType_api.FLUID_CONTACT]: "Fluid contacts", + [SurfaceAttributeType.DEPTH_TIME]: "Depth/Time", + [SurfaceAttributeType.PROPERTY]: "Property", }; - export type SurfaceAttributeTypeSelectProps = { - onAttributeChange(attributeType: SurfaceAttributeType_api): void; - onTimeModeChange(timeMode: TimeType): void; - timeMode: TimeType; - attributeType: SurfaceAttributeType_api; + onAttributeChange(attributeType: SurfaceAttributeType): void; + onTimeModeChange(timeMode: SurfaceTimeType): void; + timeMode: SurfaceTimeType; + attributeType: SurfaceAttributeType; }; export const SurfaceAttributeTypeSelect: React.FC = (props) => { function handleTimeModeChange(val: string) { - props.onTimeModeChange(val as TimeType); + props.onTimeModeChange(val as SurfaceTimeType); } function handleSurfaceAttributeTypeChange(val: string) { - const newSurfaceAttributeType = val as SurfaceAttributeType_api; - if ( - (newSurfaceAttributeType === SurfaceAttributeType_api.DEPTH || - newSurfaceAttributeType === SurfaceAttributeType_api.TIME) && - props.timeMode !== TimeType.None - ) { - props.onTimeModeChange(TimeType.None); - } - if (newSurfaceAttributeType === SurfaceAttributeType_api.SEISMIC && props.timeMode === TimeType.None) { - props.onTimeModeChange(TimeType.TimePoint); + const newSurfaceAttributeType = val as SurfaceAttributeType; + if (newSurfaceAttributeType === SurfaceAttributeType.DEPTH_TIME && props.timeMode !== SurfaceTimeType.None) { + props.onTimeModeChange(SurfaceTimeType.None); } props.onAttributeChange(newSurfaceAttributeType); } @@ -45,7 +34,7 @@ export const SurfaceAttributeTypeSelect: React.FC diff --git a/frontend/src/modules/MapMatrix/components/surfaceColorSelect.tsx b/frontend/src/modules/MapMatrix/components/surfaceColorSelect.tsx deleted file mode 100644 index b7fe6bc6d..000000000 --- a/frontend/src/modules/MapMatrix/components/surfaceColorSelect.tsx +++ /dev/null @@ -1,33 +0,0 @@ -import React from "react"; - -import { Label } from "@lib/components/Label"; -import { RadioGroup } from "@lib/components/RadioGroup"; -import { ColorScaleGradientType } from "@lib/utils/ColorScale"; - -export type SurfaceColorSelectProps = { - colorScaleGradientType: ColorScaleGradientType; - onColorGradientTypeChange(colorGradientType: ColorScaleGradientType): void; -}; -const ColorScaleGradientTypeToStringMapping = { - [ColorScaleGradientType.Sequential]: "Sequential", - [ColorScaleGradientType.Diverging]: "Diverging", -}; -export const SurfaceColorSelect: React.FC = (props) => { - function handleColorScaleGradientTypeChange(event: React.ChangeEvent) { - props.onColorGradientTypeChange(event.target.value as ColorScaleGradientType); - } - return ( - <> - - - ); -}; diff --git a/frontend/src/modules/MapMatrix/components/surfaceSelect.tsx b/frontend/src/modules/MapMatrix/components/surfaceSelect.tsx index f68d9b167..acd9cc830 100644 --- a/frontend/src/modules/MapMatrix/components/surfaceSelect.tsx +++ b/frontend/src/modules/MapMatrix/components/surfaceSelect.tsx @@ -1,29 +1,37 @@ import React from "react"; -import { SurfaceAttributeType_api, SurfaceStatisticFunction_api } from "@api"; import { EnsembleIdent } from "@framework/EnsembleIdent"; import { EnsembleSet } from "@framework/EnsembleSet"; import { IconButton } from "@lib/components/IconButton"; -import { SurfaceDirectory, TimeType } from "@modules/_shared/Surface"; +import { SurfaceDirectory, SurfaceTimeType } from "@modules/_shared/Surface"; import { Remove } from "@mui/icons-material"; import { isEqual } from "lodash"; +import { ColorPaletteSelect } from "./colorPaletteSelect"; +import { ColorRangeSelect } from "./colorRangeSelect"; import { EnsembleIdentSelectWithButtons } from "./ensembleIdentSelectWithButtons"; import { EnsembleStageSelect } from "./ensembleStageSelect"; import { SingleSelectWithButtons } from "./singleSelectWithButtons"; import { isoStringToDateOrIntervalLabel } from "../_utils/isoString"; import { EnsembleSetSurfaceMetas } from "../hooks/useEnsembleSetSurfaceMetaQuery"; -import { EnsembleStage, EnsembleStageType, SurfaceSpecification, SyncedSettings } from "../types"; +import { + EnsembleStage, + EnsembleStageType, + SurfaceAttributeType, + SurfaceAttributeTypeToApi, + SurfaceSpecification, + SyncedSettings, +} from "../types"; export type SurfaceSelectProps = { index: number; surfaceMetas: EnsembleSetSurfaceMetas; surfaceSpecification: SurfaceSpecification; ensembleIdents: EnsembleIdent[]; - timeType: TimeType; - attributeType: SurfaceAttributeType_api; + timeType: SurfaceTimeType; + attributeType: SurfaceAttributeType; syncedSettings: SyncedSettings; onChange: (surfaceSpecification: SurfaceSpecification) => void; onRemove: (uuid: string) => void; @@ -46,7 +54,7 @@ export const SurfaceSelect: React.FC = (props) => { const ensembleSurfaceDirectory = new SurfaceDirectory({ surfaceMetas: ensembleSurfaceMetadata?.surfaceMetas ?? [], timeType: props.timeType, - includeAttributeTypes: [props.attributeType], + includeAttributeTypes: SurfaceAttributeTypeToApi[props.attributeType], }); let computedSurfaceName = props.surfaceSpecification.surfaceName; @@ -86,15 +94,16 @@ export const SurfaceSelect: React.FC = (props) => { } const valueRange = ensembleSurfaceDirectory.getValueRange(computedSurfaceName, computedSurfaceAttribute, null); - let computedValueMin: number | null = valueRange.min; - let computedValueMax: number | null = valueRange.max; - if ( - props.surfaceSpecification.statisticFunction === SurfaceStatisticFunction_api.STD && - props.surfaceSpecification.ensembleStage === EnsembleStageType.Statistics - ) { - computedValueMin = null; - computedValueMax = null; - } + let computedValueMin: number = valueRange.min; + let computedValueMax: number = valueRange.max; + let computedColorPaletteId: string = props.surfaceSpecification.colorPaletteId ?? ""; + // if ( + // props.surfaceSpecification.statisticFunction === SurfaceStatisticFunction_api.STD && + // props.surfaceSpecification.ensembleStage === EnsembleStageType.Statistics + // ) { + // computedValueMin = null; + // computedValueMax = null; + // } const computedSurfaceSpecification: SurfaceSpecification = { ensembleIdent: computedEnsembleIdent, surfaceName: computedSurfaceName, @@ -103,8 +112,8 @@ export const SurfaceSelect: React.FC = (props) => { realizationNum: computedRealizationNum, ensembleStage: props.surfaceSpecification.ensembleStage, statisticFunction: props.surfaceSpecification.statisticFunction, - colorMin: computedValueMin, - colorMax: computedValueMax, + colorRange: props.surfaceSpecification.colorRange, + colorPaletteId: props.surfaceSpecification.colorPaletteId, uuid: props.surfaceSpecification.uuid, }; @@ -131,9 +140,9 @@ export const SurfaceSelect: React.FC = (props) => { ...{ ensembleStage: ensembleStage.ensembleStage, statisticFunction: ensembleStage.statisticFunction }, }); } - // if (ensembleStage.ensembleStage == EnsembleStageType.Observation) { - // props.onChange({ ...props.surfaceSpecification, ...{ ensembleStage: ensembleStage.ensembleStage } }); - // } + if (ensembleStage.ensembleStage == EnsembleStageType.Observation) { + props.onChange({ ...props.surfaceSpecification, ...{ ensembleStage: ensembleStage.ensembleStage } }); + } if (ensembleStage.ensembleStage == EnsembleStageType.Realization) { props.onChange({ ...props.surfaceSpecification, @@ -141,13 +150,21 @@ export const SurfaceSelect: React.FC = (props) => { }); } } + function handleColorRangeChange(colorRange: [number, number]) { + props.onChange({ ...props.surfaceSpecification, colorRange }); + } + function handleColorPaletteIdChange(colorPaletteId: string) { + props.onChange({ ...props.surfaceSpecification, colorPaletteId }); + } function handleRemove() { props.onRemove(props.surfaceSpecification.uuid); } + const name = props.index === 0 ? "Surface 1 / Main" : `Surface ${props.index + 1}`; + return ( <> - {`Surface ${props.index + 1}`} + {name} @@ -180,7 +197,7 @@ export const SurfaceSelect: React.FC = (props) => { onChange={handleSurfaceAttributeChange} /> )} - {(!props.syncedSettings.timeOrInterval || props.index == 0) && props.timeType !== TimeType.None && ( + {(!props.syncedSettings.timeOrInterval || props.index == 0) && props.timeType !== SurfaceTimeType.None && ( = (props) => { realizationNum={computedRealizationNum} onChange={handleEnsembleStageChange} /> + {(!props.syncedSettings.colorRange || props.index == 0) && ( + + )} + {(!props.syncedSettings.colorPaletteId || props.index == 0) && ( + + )} ); }; diff --git a/frontend/src/modules/MapMatrix/components/syncSettings.tsx b/frontend/src/modules/MapMatrix/components/syncSettings.tsx index b27357463..0b9c47c02 100644 --- a/frontend/src/modules/MapMatrix/components/syncSettings.tsx +++ b/frontend/src/modules/MapMatrix/components/syncSettings.tsx @@ -15,6 +15,8 @@ export const syncedSettingsLabels: { [key in keyof SyncedSettings]: string } = { attribute: "Surface attribute", timeOrInterval: "Time or Interval", realizationNum: "Realization", + colorRange: "Color range", + colorPaletteId: "Color palette", }; export const SyncSettings: React.FC = (props) => { diff --git a/frontend/src/modules/MapMatrix/hooks/useSurfaceDataAsPngQuery.ts b/frontend/src/modules/MapMatrix/hooks/useSurfaceDataAsPngQuery.ts index c0bbab8a1..3235f05e6 100644 --- a/frontend/src/modules/MapMatrix/hooks/useSurfaceDataAsPngQuery.ts +++ b/frontend/src/modules/MapMatrix/hooks/useSurfaceDataAsPngQuery.ts @@ -39,7 +39,7 @@ export function useSurfaceDataSetQueryByAddresses(surfaceAddresses: SurfaceAddre surfAddr.attribute, surfAddr.isoDateOrInterval ); - } else { + } else if (surfAddr.addressType === "statistical") { queryKey = [ "getStatisticalSurfaceDataAsPng", surfAddr.caseUuid, @@ -58,6 +58,23 @@ export function useSurfaceDataSetQueryByAddresses(surfaceAddresses: SurfaceAddre surfAddr.attribute, surfAddr.isoDateOrInterval ); + } else { + queryKey = [ + "getObservationSurfaceDataAsPng", + surfAddr.caseUuid, + surfAddr.ensemble, + surfAddr.name, + surfAddr.attribute, + surfAddr.isoDateOrInterval, + ]; + queryFn = () => + apiService.surface.getObservationSurfaceDataAsPng( + surfAddr.caseUuid, + surfAddr.ensemble, + surfAddr.name, + surfAddr.attribute, + surfAddr.isoDateOrInterval + ); } return { queryKey, diff --git a/frontend/src/modules/MapMatrix/hooks/useSurfaceReducer.ts b/frontend/src/modules/MapMatrix/hooks/useSurfaceReducer.ts index e8e26d5b8..aabff162e 100644 --- a/frontend/src/modules/MapMatrix/hooks/useSurfaceReducer.ts +++ b/frontend/src/modules/MapMatrix/hooks/useSurfaceReducer.ts @@ -3,10 +3,10 @@ import { useReducer } from "react"; import { SurfaceAttributeType_api } from "@api"; import { EnsembleIdent } from "@framework/EnsembleIdent"; import { ColorScaleGradientType } from "@lib/utils/ColorScale"; -import { TimeType } from "@modules/_shared/Surface"; +import { SurfaceTimeType } from "@modules/_shared/Surface"; import { SurfaceReducerActionType, surfaceDispatcher } from "../reducers/surfaceReducer"; -import { SurfaceReducerState, SurfaceSpecification, SyncedSettings } from "../types"; +import { SurfaceAttributeType, SurfaceReducerState, SurfaceSpecification, SyncedSettings } from "../types"; export const initialSurfaceReducerState: SurfaceReducerState = { ensembleIdents: [], @@ -17,10 +17,11 @@ export const initialSurfaceReducerState: SurfaceReducerState = { attribute: false, timeOrInterval: false, realizationNum: false, + colorRange: false, + colorPaletteId: false, }, - timeMode: TimeType.None, - attributeType: SurfaceAttributeType_api.DEPTH, - colorScaleGradientType: ColorScaleGradientType.Sequential, + timeMode: SurfaceTimeType.None, + attributeType: SurfaceAttributeType.PROPERTY, }; export const useSurfaceReducer = () => { @@ -60,25 +61,19 @@ export const useSurfaceReducer = () => { }); }; - const setTimeMode = (timeMode: TimeType) => { + const setTimeMode = (timeMode: SurfaceTimeType) => { dispatch({ type: SurfaceReducerActionType.SetTimeMode, payload: { timeMode }, }); }; - const setAttributeType = (attributeType: SurfaceAttributeType_api) => { + const setAttributeType = (attributeType: SurfaceAttributeType) => { dispatch({ type: SurfaceReducerActionType.SetAttributeType, payload: { attributeType }, }); }; - const setColorScaleGradientType = (colorScaleGradientType: ColorScaleGradientType) => { - dispatch({ - type: SurfaceReducerActionType.SetColorScaleGradientType, - payload: { colorScaleGradientType }, - }); - }; return { state, @@ -89,6 +84,5 @@ export const useSurfaceReducer = () => { setSyncedSettings, setTimeMode, setAttributeType, - setColorScaleGradientType, }; }; diff --git a/frontend/src/modules/MapMatrix/reducers/surfaceReducer.ts b/frontend/src/modules/MapMatrix/reducers/surfaceReducer.ts index e0238ed58..dfce90b43 100644 --- a/frontend/src/modules/MapMatrix/reducers/surfaceReducer.ts +++ b/frontend/src/modules/MapMatrix/reducers/surfaceReducer.ts @@ -1,9 +1,9 @@ import { SurfaceAttributeType_api } from "@api"; import { EnsembleIdent } from "@framework/EnsembleIdent"; import { ColorScaleGradientType } from "@lib/utils/ColorScale"; -import { TimeType } from "@modules/_shared/Surface"; +import { SurfaceTimeType } from "@modules/_shared/Surface"; -import { SurfaceReducerState, SurfaceSpecification, SyncedSettings } from "../types"; +import { SurfaceAttributeType, SurfaceReducerState, SurfaceSpecification, SyncedSettings } from "../types"; export enum SurfaceReducerActionType { SetEnsembleIdents, @@ -13,7 +13,6 @@ export enum SurfaceReducerActionType { SetSyncedSettings, SetTimeMode, SetAttributeType, - SetColorScaleGradientType, } type SurfaceReducerPayload = { [SurfaceReducerActionType.SetEnsembleIdents]: { ensembleIdents: EnsembleIdent[] }; @@ -21,9 +20,8 @@ type SurfaceReducerPayload = { [SurfaceReducerActionType.RemoveSurface]: { id: string }; [SurfaceReducerActionType.SetSurface]: { surfaceSpecification: SurfaceSpecification }; [SurfaceReducerActionType.SetSyncedSettings]: { syncedSettings: SyncedSettings }; - [SurfaceReducerActionType.SetTimeMode]: { timeMode: TimeType }; - [SurfaceReducerActionType.SetAttributeType]: { attributeType: SurfaceAttributeType_api }; - [SurfaceReducerActionType.SetColorScaleGradientType]: { colorScaleGradientType: ColorScaleGradientType }; + [SurfaceReducerActionType.SetTimeMode]: { timeMode: SurfaceTimeType }; + [SurfaceReducerActionType.SetAttributeType]: { attributeType: SurfaceAttributeType }; }; type SurfaceReducerActions = { [T in SurfaceReducerActionType]: { @@ -55,18 +53,20 @@ export function surfaceDispatcher(state: SurfaceReducerState, action: SurfaceRed const updatedSurfaceSpecifications = state.surfaceSpecifications.map((surface) => surface.uuid === action.payload.surfaceSpecification.uuid ? action.payload.surfaceSpecification : surface ); - synchronizeSurfaceSpecifications(updatedSurfaceSpecifications, state.syncedSettings); + return { ...state, - surfaceSpecifications: updatedSurfaceSpecifications, + surfaceSpecifications: synchronizeSurfaceSpecifications(updatedSurfaceSpecifications, state.syncedSettings), }; } if (action.type === SurfaceReducerActionType.SetSyncedSettings) { - synchronizeSurfaceSpecifications(state.surfaceSpecifications, action.payload.syncedSettings); return { ...state, syncedSettings: action.payload.syncedSettings, - surfaceSpecifications: state.surfaceSpecifications, + surfaceSpecifications: synchronizeSurfaceSpecifications( + state.surfaceSpecifications, + action.payload.syncedSettings + ), }; } if (action.type === SurfaceReducerActionType.SetTimeMode) { @@ -81,12 +81,7 @@ export function surfaceDispatcher(state: SurfaceReducerState, action: SurfaceRed attributeType: action.payload.attributeType, }; } - if (action.type === SurfaceReducerActionType.SetColorScaleGradientType) { - return { - ...state, - colorScaleGradientType: action.payload.colorScaleGradientType, - }; - } + return state; } @@ -94,24 +89,46 @@ function synchronizeSurfaceSpecifications( surfaceSpecifications: SurfaceSpecification[], syncedSettings: SyncedSettings ) { + if (surfaceSpecifications.length === 0) { + return surfaceSpecifications; + } const firstSurfaceSpecification = surfaceSpecifications[0]; - surfaceSpecifications.forEach((surface, index) => { + + // Create a new array with updated objects to ensure changes are detected + const updatedSurfaceSpecifications = surfaceSpecifications.map((surface, index) => { if (index !== 0) { + const updatedSurface = { ...surface }; // Create a shallow copy if (syncedSettings.ensemble) { - surface.ensembleIdent = firstSurfaceSpecification.ensembleIdent; + updatedSurface.ensembleIdent = firstSurfaceSpecification.ensembleIdent; } if (syncedSettings.name) { - surface.surfaceName = firstSurfaceSpecification.surfaceName; + updatedSurface.surfaceName = firstSurfaceSpecification.surfaceName; } if (syncedSettings.attribute) { - surface.surfaceAttribute = firstSurfaceSpecification.surfaceAttribute; + updatedSurface.surfaceAttribute = firstSurfaceSpecification.surfaceAttribute; } if (syncedSettings.timeOrInterval) { - surface.surfaceTimeOrInterval = firstSurfaceSpecification.surfaceTimeOrInterval; + updatedSurface.surfaceTimeOrInterval = firstSurfaceSpecification.surfaceTimeOrInterval; } if (syncedSettings.realizationNum) { - surface.realizationNum = firstSurfaceSpecification.realizationNum; + updatedSurface.realizationNum = firstSurfaceSpecification.realizationNum; + } + if (syncedSettings.colorRange) { + updatedSurface.colorRange = firstSurfaceSpecification.colorRange; } + if (syncedSettings.colorPaletteId) { + console.log( + "Color did change", + updatedSurface.colorPaletteId, + firstSurfaceSpecification.colorPaletteId, + index + ); + updatedSurface.colorPaletteId = firstSurfaceSpecification.colorPaletteId; + } + return updatedSurface; } + return surface; }); + + return updatedSurfaceSpecifications; // Return the new array for state update } diff --git a/frontend/src/modules/MapMatrix/settings.tsx b/frontend/src/modules/MapMatrix/settings.tsx index 390fd3ec2..fcfd21163 100644 --- a/frontend/src/modules/MapMatrix/settings.tsx +++ b/frontend/src/modules/MapMatrix/settings.tsx @@ -8,11 +8,11 @@ import { Button } from "@lib/components/Button"; import { CircularProgress } from "@lib/components/CircularProgress"; import { CollapsibleGroup } from "@lib/components/CollapsibleGroup"; import { Label } from "@lib/components/Label"; +import { ColorScaleGradientType } from "@lib/utils/ColorScale"; import { v4 as uuidv4 } from "uuid"; import { SurfaceAttributeTypeSelect } from "./components/surfaceAttributeTypeSelect"; -import { SurfaceColorSelect } from "./components/surfaceColorSelect"; import { SurfaceSelect } from "./components/surfaceSelect"; import { SyncSettings } from "./components/syncSettings"; import { useEnsembleSetSurfaceMetaQuery } from "./hooks/useEnsembleSetSurfaceMetaQuery"; @@ -20,13 +20,18 @@ import { useSurfaceReducer } from "./hooks/useSurfaceReducer"; import { State } from "./state"; import { EnsembleStageType, SurfaceSpecification, SyncedSettings } from "./types"; -export function settings({ moduleContext, workbenchSession }: ModuleFCProps) { +export function settings({ moduleContext, workbenchSession, workbenchSettings }: ModuleFCProps) { const ensembleSet = useEnsembleSet(workbenchSession); const reducer = useSurfaceReducer(); const ensembleSetSurfaceMetas = useEnsembleSetSurfaceMetaQuery(reducer.state.ensembleIdents); - + const defaultColorScale = workbenchSettings + .useContinuousColorScale({ + gradientType: ColorScaleGradientType.Sequential, + }) + .getColorPalette() + .getId(); function handleSyncedSettingsChange(syncedSettings: SyncedSettings) { reducer.setSyncedSettings(syncedSettings); } @@ -40,8 +45,8 @@ export function settings({ moduleContext, workbenchSession }: ModuleFCProps @@ -90,14 +89,7 @@ export function settings({ moduleContext, workbenchSession }: ModuleFCProps - - - - - +
diff --git a/frontend/src/modules/MapMatrix/state.ts b/frontend/src/modules/MapMatrix/state.ts index 723adbd93..42683f3dc 100644 --- a/frontend/src/modules/MapMatrix/state.ts +++ b/frontend/src/modules/MapMatrix/state.ts @@ -1,9 +1,6 @@ -import { ColorScaleGradientType } from "@lib/utils/ColorScale"; - import { SurfaceSpecification } from "./types"; export const defaultState: State = { surfaceSpecifications: [], - colorScaleGradientType: ColorScaleGradientType.Sequential, }; -export type State = { surfaceSpecifications: SurfaceSpecification[]; colorScaleGradientType: ColorScaleGradientType }; +export type State = { surfaceSpecifications: SurfaceSpecification[] }; diff --git a/frontend/src/modules/MapMatrix/types.ts b/frontend/src/modules/MapMatrix/types.ts index d23919903..beb137e8c 100644 --- a/frontend/src/modules/MapMatrix/types.ts +++ b/frontend/src/modules/MapMatrix/types.ts @@ -1,15 +1,26 @@ import { SurfaceAttributeType_api, SurfaceStatisticFunction_api } from "@api"; import { EnsembleIdent } from "@framework/EnsembleIdent"; import { ColorScaleGradientType } from "@lib/utils/ColorScale"; -import { TimeType } from "@modules/_shared/Surface"; +import { SurfaceTimeType } from "@modules/_shared/Surface"; +export enum SurfaceAttributeType { + DEPTH_TIME = "Depth and time maps", + PROPERTY = "Attribute maps", +} +export const SurfaceAttributeTypeToApi = { + [SurfaceAttributeType.DEPTH_TIME]: [SurfaceAttributeType_api.DEPTH, SurfaceAttributeType_api.TIME], + [SurfaceAttributeType.PROPERTY]: [ + SurfaceAttributeType_api.PROPERTY, + SurfaceAttributeType_api.SEISMIC, + SurfaceAttributeType_api.ISOCHORE, + ], +}; export type SurfaceReducerState = { ensembleIdents: EnsembleIdent[]; surfaceSpecifications: SurfaceSpecification[]; syncedSettings: SyncedSettings; - timeMode: TimeType; - attributeType: SurfaceAttributeType_api; - colorScaleGradientType: ColorScaleGradientType; + timeMode: SurfaceTimeType; + attributeType: SurfaceAttributeType; }; export type SurfaceSpecification = { @@ -21,8 +32,8 @@ export type SurfaceSpecification = { uuid: string; statisticFunction: SurfaceStatisticFunction_api; ensembleStage: EnsembleStageType; - colorMin: number | null; - colorMax: number | null; + colorRange: [number, number] | null; + colorPaletteId: string | null; }; export type SyncedSettings = { ensemble: boolean; @@ -30,12 +41,14 @@ export type SyncedSettings = { attribute: boolean; timeOrInterval: boolean; realizationNum: boolean; + colorRange: boolean; + colorPaletteId: boolean; }; export enum EnsembleStageType { Statistics = "Statistics", Realization = "Realization", - // Observation = "Observation", + Observation = "Observation", } export type EnsembleStatisticStage = { @@ -48,9 +61,9 @@ export type EnsembleRealizationStage = { ensembleStage: EnsembleStageType.Realization; realizationNum: number; }; -// export type EnsembleObservationStage = { -// ensembleStage: EnsembleStageType.Observation; -// realizationNum?: number; // The observation might be tied to a realization (e.g., depth converted) -// }; +export type EnsembleObservationStage = { + ensembleStage: EnsembleStageType.Observation; + realizationNum?: number; // The observation might be tied to a realization (e.g., depth converted) +}; -export type EnsembleStage = EnsembleStatisticStage | EnsembleRealizationStage; //| EnsembleObservationStage; +export type EnsembleStage = EnsembleStatisticStage | EnsembleRealizationStage | EnsembleObservationStage; diff --git a/frontend/src/modules/MapMatrix/view.tsx b/frontend/src/modules/MapMatrix/view.tsx index 1689ab28e..c26784ab3 100644 --- a/frontend/src/modules/MapMatrix/view.tsx +++ b/frontend/src/modules/MapMatrix/view.tsx @@ -10,8 +10,7 @@ import { IconButton } from "@lib/components/IconButton"; import { SyncedSubsurfaceViewer } from "@modules/SubsurfaceMap/components/SyncedSubsurfaceViewer"; import { SurfaceAddress } from "@modules/_shared/Surface"; import { SurfaceAddressFactory } from "@modules/_shared/Surface"; -// import { shouldUpdateViewPortBounds } from "@modules/_shared/Surface/subsurfaceMapUtils"; -import { createContinuousColorScaleForMap } from "@modules/_shared/Surface/subsurfaceMapUtils"; +import { createSubsurfaceMapColorPalettes } from "@modules/_shared/Surface/subsurfaceMapUtils"; import { Home } from "@mui/icons-material"; import { ViewportType, ViewsType } from "@webviz/subsurface-viewer"; import { ViewFooter } from "@webviz/subsurface-viewer/dist/components/ViewFooter"; @@ -49,11 +48,6 @@ export function view({ moduleContext, workbenchServices, workbenchSettings }: Mo surfaceDataSet = prevSurfaceDataSetQueryByAddresses.data; } - const colorScaleGradientType = moduleContext.useStoreValue("colorScaleGradientType"); - const surfaceColorScale = workbenchSettings.useContinuousColorScale({ - gradientType: colorScaleGradientType, - }); - const colorTables = createContinuousColorScaleForMap(surfaceColorScale); const views: ViewsType = makeEmptySurfaceViews(surfaceDataSet.length ?? 1); const viewAnnotations: JSX.Element[] = []; const layers: Record[] = [ @@ -69,10 +63,10 @@ export function view({ moduleContext, workbenchServices, workbenchSettings }: Mo backgroundColor: [255, 255, 255, 255], }, ]; - + const colorTables = createSubsurfaceMapColorPalettes(); surfaceDataSet.forEach((surface, index) => { - const colorMin = surfaceSpecifications[index].colorMin ?? null; - const colorMax = surfaceSpecifications[index].colorMax ?? null; + const colorRange = surfaceSpecifications[index].colorRange ?? [null, null]; + const valueMin = surface?.surfaceData?.val_min ?? 0; const valueMax = surface?.surfaceData?.val_max ?? 0; if (surface.surfaceData) { @@ -87,7 +81,15 @@ export function view({ moduleContext, workbenchServices, workbenchSettings }: Mo } layers.push( - createSurfaceImageLayer(`surface-${index}`, surface.surfaceData, valueMin, valueMax, colorMin, colorMax) + createSurfaceImageLayer( + `surface-${index}`, + surface.surfaceData, + valueMin, + valueMax, + colorRange[0], + colorRange[1], + surfaceSpecifications[index].colorPaletteId ?? "" + ) ); views.viewports[index] = { id: `${index}view`, @@ -102,8 +104,8 @@ export function view({ moduleContext, workbenchServices, workbenchSettings }: Mo `${index}view`, surfaceSpecifications[index], colorTables, - colorMin || valueMin, - colorMax || valueMax + colorRange[0] || valueMin, + colorRange[1] || valueMax ) ); }); @@ -144,9 +146,10 @@ function makeViewAnnotation( <> { return { "@@type": "ColormapLayer", @@ -180,8 +184,8 @@ function createSurfaceImageLayer( ], rotDeg: surfaceData.rot_deg, valueRange: [valueMin, valueMax], - colorMapRange: [colorMin, colorMax], - colorMapName: "Continuous", + colorMapRange: [colorMin ?? valueMin, colorMax ?? valueMax], + colorMapName: colorPaletteId, }; } @@ -220,6 +224,10 @@ function createSurfaceAddressesFromSpecifications(surfaceSpecifications: Surface const surfaceAddress = factory.createStatisticalAddress(surface.statisticFunction); surfaceAddresses.push(surfaceAddress); } + if (surface.ensembleStage === EnsembleStageType.Observation) { + const surfaceAddress = factory.createObservationAddress(); + surfaceAddresses.push(surfaceAddress); + } } }); return surfaceAddresses; diff --git a/frontend/src/modules/_shared/Surface/queryHooks.ts b/frontend/src/modules/_shared/Surface/queryHooks.ts index f7efaec98..d2142e145 100644 --- a/frontend/src/modules/_shared/Surface/queryHooks.ts +++ b/frontend/src/modules/_shared/Surface/queryHooks.ts @@ -85,3 +85,4 @@ export function useSurfaceDataQueryByAddress(surfAddr: SurfaceAddress | null): U enabled: Boolean(surfAddr), }); } +0 \ No newline at end of file diff --git a/frontend/src/modules/_shared/Surface/subsurfaceMapUtils.ts b/frontend/src/modules/_shared/Surface/subsurfaceMapUtils.ts index 8be82b3ef..a709c471e 100644 --- a/frontend/src/modules/_shared/Surface/subsurfaceMapUtils.ts +++ b/frontend/src/modules/_shared/Surface/subsurfaceMapUtils.ts @@ -1,6 +1,11 @@ import { PolygonData_api, WellBoreTrajectory_api } from "@api"; import { colorTablesObj } from "@emerson-eps/color-tables"; -import { ColorScale } from "@lib/utils/ColorScale"; +import { + defaultContinuousDivergingColorPalettes, + defaultContinuousSequentialColorPalettes, +} from "@framework/WorkbenchSettings"; +import { ColorPalette } from "@lib/utils/ColorPalette"; +import { ColorScale, ColorScaleGradientType, ColorScaleType } from "@lib/utils/ColorScale"; import { Color, Rgb, parse } from "culori"; @@ -18,6 +23,36 @@ export function createContinuousColorScaleForMap(colorScale: ColorScale): colorT return [{ name: "Continuous", discrete: false, colors: rgbArr }]; } +function createColorScale(colorPalette: ColorPalette): ColorScale { + const colorScale = new ColorScale({ + type: ColorScaleType.Continuous, + colorPalette: colorPalette, + gradientType: ColorScaleGradientType.Sequential, + steps: 10, + }); + return colorScale; +} + +export function createSubsurfaceMapColorPalettes(): colorTablesObj[] { + const colorPalettes = [...defaultContinuousSequentialColorPalettes, ...defaultContinuousDivergingColorPalettes]; + const colorTables: colorTablesObj[] = []; + colorPalettes.forEach((colorPalette) => { + const colorScale = createColorScale(colorPalette); + const hexColors = colorScale.getPlotlyColorScale(); + const rgbArr: [number, number, number, number][] = []; + hexColors.forEach((hexColor, index) => { + const color: Color | undefined = parse(hexColor[1]); // Returns object with r, g, b items for hex strings + + if (color && "r" in color && "g" in color && "b" in color) { + const rgbColor = color as Rgb; + rgbArr.push([index, rgbColor.r * 255, rgbColor.g * 255, rgbColor.b * 255]); + } + }); + colorTables.push({ name: colorPalette.getId(), discrete: true, colors: rgbArr }); + }); + return colorTables; +} + export type Bounds = [number, number, number, number]; export const shouldUpdateViewPortBounds = (existingViewPortBounds: Bounds | undefined, newBounds: Bounds): boolean => { if (!existingViewPortBounds) { diff --git a/frontend/src/modules/_shared/Surface/surfaceAddress.ts b/frontend/src/modules/_shared/Surface/surfaceAddress.ts index dcfaca3b2..052cb5253 100644 --- a/frontend/src/modules/_shared/Surface/surfaceAddress.ts +++ b/frontend/src/modules/_shared/Surface/surfaceAddress.ts @@ -20,7 +20,16 @@ export interface StatisticalSurfaceAddress { statisticFunction: SurfaceStatisticFunction_api; } -export type SurfaceAddress = RealizationSurfaceAddress | StatisticalSurfaceAddress; +export interface ObservationSurfaceAddress { + addressType: "observation"; + caseUuid: string; + ensemble: string; + name: string; + attribute: string; + isoDateOrInterval: string | null; +} + +export type SurfaceAddress = RealizationSurfaceAddress | StatisticalSurfaceAddress | ObservationSurfaceAddress; export function makeSurfaceAddressString(addr: SurfaceAddress): string { const valueArr = Object.values(addr); @@ -66,4 +75,14 @@ export class SurfaceAddressFactory { statisticFunction: statFunction, }; } + createObservationAddress(): ObservationSurfaceAddress { + return { + addressType: "observation", + caseUuid: this._caseUuid, + ensemble: this._ensemble, + name: this._name, + attribute: this._attribute, + isoDateOrInterval: this._isoDateOrInterval, + }; + } } From de4bf10a28ec964b0e21782bf56168c92df2a5aa Mon Sep 17 00:00:00 2001 From: Hans Kallekleiv <16436291+HansKallekleiv@users.noreply.github.com> Date: Tue, 20 Feb 2024 14:58:27 +0100 Subject: [PATCH 03/14] wip --- .../components/colorPaletteSelect.tsx | 4 -- .../components/surfaceSpecificationLabel.tsx | 3 ++ frontend/src/modules/MapMatrix/view.tsx | 47 +++++-------------- .../_shared/Surface/subsurfaceMapUtils.ts | 28 +++++++++++ 4 files changed, 44 insertions(+), 38 deletions(-) diff --git a/frontend/src/modules/MapMatrix/components/colorPaletteSelect.tsx b/frontend/src/modules/MapMatrix/components/colorPaletteSelect.tsx index 9a4958629..270906796 100644 --- a/frontend/src/modules/MapMatrix/components/colorPaletteSelect.tsx +++ b/frontend/src/modules/MapMatrix/components/colorPaletteSelect.tsx @@ -12,14 +12,10 @@ import { ColorPalette } from "@lib/utils/ColorPalette"; type ColorPaletteSelectProps = { colorPaletteId: string; - onChange: (colorPaletteId: string) => void; }; export const ColorPaletteSelect: React.FC = (props) => { - // const [selectedColorPaletteId, setSelectedColorPaletteId] = React.useState(props.initialColorPaletteId); - const handleSelectionChange = (colorPalette: ColorPalette) => { - console.log(colorPalette.getId()); props.onChange?.(colorPalette.getId()); }; return ( diff --git a/frontend/src/modules/MapMatrix/components/surfaceSpecificationLabel.tsx b/frontend/src/modules/MapMatrix/components/surfaceSpecificationLabel.tsx index 95ac49b4d..0e6336c7a 100644 --- a/frontend/src/modules/MapMatrix/components/surfaceSpecificationLabel.tsx +++ b/frontend/src/modules/MapMatrix/components/surfaceSpecificationLabel.tsx @@ -71,6 +71,9 @@ export const SurfaceSpecificationLabel: React.FC {`${StatisticFunctionToStringMapping[surfaceSpecification.statisticFunction]}`}
)} + {surfaceSpecification.ensembleStage === EnsembleStageType.Observation && ( +
Observation
+ )} ) : (
No surface found
diff --git a/frontend/src/modules/MapMatrix/view.tsx b/frontend/src/modules/MapMatrix/view.tsx index c26784ab3..586f54130 100644 --- a/frontend/src/modules/MapMatrix/view.tsx +++ b/frontend/src/modules/MapMatrix/view.tsx @@ -10,7 +10,7 @@ import { IconButton } from "@lib/components/IconButton"; import { SyncedSubsurfaceViewer } from "@modules/SubsurfaceMap/components/SyncedSubsurfaceViewer"; import { SurfaceAddress } from "@modules/_shared/Surface"; import { SurfaceAddressFactory } from "@modules/_shared/Surface"; -import { createSubsurfaceMapColorPalettes } from "@modules/_shared/Surface/subsurfaceMapUtils"; +import { createSubsurfaceMapColorPalettes, createSurfaceImageLayer } from "@modules/_shared/Surface/subsurfaceMapUtils"; import { Home } from "@mui/icons-material"; import { ViewportType, ViewsType } from "@webviz/subsurface-viewer"; import { ViewFooter } from "@webviz/subsurface-viewer/dist/components/ViewFooter"; @@ -81,15 +81,20 @@ export function view({ moduleContext, workbenchServices, workbenchSettings }: Mo } layers.push( - createSurfaceImageLayer( - `surface-${index}`, - surface.surfaceData, + createSurfaceImageLayer({ + id: `surface-${index}`, + base64ImageString: surface.surfaceData.base64_encoded_image, + xMin: surface.surfaceData.x_min_surf_orient, + yMin: surface.surfaceData.y_min_surf_orient, + xMax: surface.surfaceData.x_max_surf_orient, + yMax: surface.surfaceData.y_max_surf_orient, + rotDeg: surface.surfaceData.rot_deg, valueMin, valueMax, - colorRange[0], - colorRange[1], - surfaceSpecifications[index].colorPaletteId ?? "" - ) + colorMin: colorRange[0], + colorMax: colorRange[1], + colorPaletteId: surfaceSpecifications[index].colorPaletteId ?? "", + }) ); views.viewports[index] = { id: `${index}view`, @@ -163,32 +168,6 @@ function makeViewAnnotation( ); } -function createSurfaceImageLayer( - id: string, - surfaceData: SurfaceDataPng_api, - valueMin: number | null, - valueMax: number | null, - colorMin: number | null, - colorMax: number | null, - colorPaletteId: string -): Record { - return { - "@@type": "ColormapLayer", - id: id, - image: `data:image/png;base64,${surfaceData.base64_encoded_image}`, - bounds: [ - surfaceData.x_min_surf_orient, - surfaceData.y_min_surf_orient, - surfaceData.x_max_surf_orient, - surfaceData.y_max_surf_orient, - ], - rotDeg: surfaceData.rot_deg, - valueRange: [valueMin, valueMax], - colorMapRange: [colorMin ?? valueMin, colorMax ?? valueMax], - colorMapName: colorPaletteId, - }; -} - function makeEmptySurfaceViews(numSubplots: number): ViewsType { const numColumns = Math.ceil(Math.sqrt(numSubplots)); const numRows = Math.ceil(numSubplots / numColumns); diff --git a/frontend/src/modules/_shared/Surface/subsurfaceMapUtils.ts b/frontend/src/modules/_shared/Surface/subsurfaceMapUtils.ts index a709c471e..273cb64a7 100644 --- a/frontend/src/modules/_shared/Surface/subsurfaceMapUtils.ts +++ b/frontend/src/modules/_shared/Surface/subsurfaceMapUtils.ts @@ -121,6 +121,7 @@ export function createAxesLayer( bounds: bounds, }; } + export function createSurfaceMeshLayer( surfaceMeta: SurfaceMeta, mesh_data: number[], @@ -148,6 +149,33 @@ export function createSurfaceMeshLayer( colorMapName: "Continuous", }; } +type SurfaceImageLayerOptions = { + id: string; + base64ImageString: string; + xMin: number; + yMin: number; + xMax: number; + yMax: number; + rotDeg: number; + valueMin: number | null; + valueMax: number | null; + colorMin: number | null; + colorMax: number | null; + colorPaletteId: string; +}; +export function createSurfaceImageLayer(options: SurfaceImageLayerOptions): Record { + return { + "@@type": "ColormapLayer", + id: options.id, + image: `data:image/png;base64,${options.base64ImageString}`, + bounds: [options.xMin, options.yMin, options.xMax, options.yMax], + rotDeg: options.rotDeg, + valueRange: [options.valueMin, options.valueMax], + colorMapRange: [options.colorMin ?? options.valueMin, options.colorMax ?? options.valueMax], + colorMapName: options.colorPaletteId, + }; +} + export function createSurfacePolygonsLayer(surfacePolygons: PolygonData_api[]): Record { const features: Record[] = surfacePolygons.map((polygon) => { return surfacePolygonsToGeojson(polygon); From fcec5e45dd7a24af96847d4b654c7efa0875b97c Mon Sep 17 00:00:00 2001 From: Hans Kallekleiv <16436291+HansKallekleiv@users.noreply.github.com> Date: Tue, 20 Feb 2024 17:23:45 +0100 Subject: [PATCH 04/14] Bump subsurface-viewer --- frontend/package-lock.json | 1997 +++++-------------- frontend/package.json | 4 +- frontend/src/modules/Grid3D/view.tsx | 1 - frontend/src/modules/SubsurfaceMap/view.tsx | 2 - 4 files changed, 525 insertions(+), 1479 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 67998246d..7df973af8 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -14,7 +14,7 @@ "@mui/icons-material": "^5.14.9", "@tanstack/react-query": "^5.0.5", "@tanstack/react-query-devtools": "^5.4.2", - "@webviz/subsurface-viewer": "^0.3.1", + "@webviz/subsurface-viewer": "^0.16.3", "@webviz/well-completions-plot": "^0.0.1-alpha.1", "animate.css": "^4.1.1", "axios": "^1.6.5", @@ -85,6 +85,7 @@ "version": "2.2.1", "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz", "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==", + "dev": true, "dependencies": { "@jridgewell/gen-mapping": "^0.3.0", "@jridgewell/trace-mapping": "^0.3.9" @@ -128,6 +129,7 @@ "version": "7.23.5", "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.5.tgz", "integrity": "sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==", + "dev": true, "engines": { "node": ">=6.9.0" } @@ -136,6 +138,7 @@ "version": "7.23.7", "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.7.tgz", "integrity": "sha512-+UpDgowcmqe36d4NwqvKsyPMlOLNGMsfMmQ5WGCu+siCe3t3dfe9njrzGfdN4qq+bcNUt0+Vw6haRxBOycs4dw==", + "dev": true, "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.23.5", @@ -164,12 +167,14 @@ "node_modules/@babel/core/node_modules/convert-source-map": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", - "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==" + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true }, "node_modules/@babel/generator": { "version": "7.23.6", "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz", "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==", + "dev": true, "dependencies": { "@babel/types": "^7.23.6", "@jridgewell/gen-mapping": "^0.3.2", @@ -180,22 +185,11 @@ "node": ">=6.9.0" } }, - "node_modules/@babel/helper-annotate-as-pure": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz", - "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==", - "peer": true, - "dependencies": { - "@babel/types": "^7.22.5" - }, - "engines": { - "node": ">=6.9.0" - } - }, "node_modules/@babel/helper-compilation-targets": { "version": "7.23.6", "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz", "integrity": "sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==", + "dev": true, "dependencies": { "@babel/compat-data": "^7.23.5", "@babel/helper-validator-option": "^7.23.5", @@ -211,6 +205,7 @@ "version": "7.22.20", "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz", "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==", + "dev": true, "engines": { "node": ">=6.9.0" } @@ -219,6 +214,7 @@ "version": "7.23.0", "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz", "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==", + "dev": true, "dependencies": { "@babel/template": "^7.22.15", "@babel/types": "^7.23.0" @@ -231,6 +227,7 @@ "version": "7.22.5", "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz", "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==", + "dev": true, "dependencies": { "@babel/types": "^7.22.5" }, @@ -253,6 +250,7 @@ "version": "7.23.3", "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz", "integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==", + "dev": true, "dependencies": { "@babel/helper-environment-visitor": "^7.22.20", "@babel/helper-module-imports": "^7.22.15", @@ -271,6 +269,7 @@ "version": "7.22.5", "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz", "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==", + "dev": true, "engines": { "node": ">=6.9.0" } @@ -279,6 +278,7 @@ "version": "7.22.5", "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz", "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==", + "dev": true, "dependencies": { "@babel/types": "^7.22.5" }, @@ -290,6 +290,7 @@ "version": "7.22.6", "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz", "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==", + "dev": true, "dependencies": { "@babel/types": "^7.22.5" }, @@ -317,6 +318,7 @@ "version": "7.23.5", "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz", "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==", + "dev": true, "engines": { "node": ">=6.9.0" } @@ -325,6 +327,7 @@ "version": "7.23.7", "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.7.tgz", "integrity": "sha512-6AMnjCoC8wjqBzDHkuqpa7jAKwvMo4dC+lr/TFBz+ucfulO1XMpDnwWPGBNwClOKZ8h6xn5N81W/R5OrcKtCbQ==", + "dev": true, "dependencies": { "@babel/template": "^7.22.15", "@babel/traverse": "^7.23.7", @@ -351,6 +354,7 @@ "version": "7.23.6", "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.6.tgz", "integrity": "sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==", + "dev": true, "bin": { "parser": "bin/babel-parser.js" }, @@ -358,156 +362,6 @@ "node": ">=6.0.0" } }, - "node_modules/@babel/plugin-syntax-async-generators": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", - "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-bigint": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz", - "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-class-properties": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", - "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.12.13" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-import-meta": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz", - "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.10.4" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-json-strings": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", - "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-jsx": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz", - "integrity": "sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==", - "peer": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-logical-assignment-operators": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", - "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.10.4" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", - "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-numeric-separator": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", - "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.10.4" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-object-rest-spread": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", - "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-optional-catch-binding": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", - "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-optional-chaining": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", - "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-top-level-await": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", - "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.14.5" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, "node_modules/@babel/plugin-transform-react-jsx-self": { "version": "7.23.3", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.23.3.tgz", @@ -539,9 +393,9 @@ } }, "node_modules/@babel/runtime": { - "version": "7.22.15", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.15.tgz", - "integrity": "sha512-T0O+aa+4w0u06iNmapipJXMV4HoUir03hpx3/YqXXhu9xim3w+dVphjFWl1OH8NbZHw5Lbm9k45drDkgq2VNNA==", + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.9.tgz", + "integrity": "sha512-0CX6F+BI2s9dkUqr08KFrAIZgNFj75rdBU/DjCyYLIaV/quFjkk6T+EJ2LkZHyZTbEV4L5p97mNkUsHl2wLFAw==", "dependencies": { "regenerator-runtime": "^0.14.0" }, @@ -553,6 +407,7 @@ "version": "7.22.15", "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", + "dev": true, "dependencies": { "@babel/code-frame": "^7.22.13", "@babel/parser": "^7.22.15", @@ -566,6 +421,7 @@ "version": "7.23.7", "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.7.tgz", "integrity": "sha512-tY3mM8rH9jM0YHFGyfC0/xf+SB5eKUu7HPj7/k3fpi9dAlsMc5YbQvDi0Sh2QTPXqMhyaAtzAr807TIyfQrmyg==", + "dev": true, "dependencies": { "@babel/code-frame": "^7.23.5", "@babel/generator": "^7.23.6", @@ -607,12 +463,6 @@ "findup": "bin/findup.js" } }, - "node_modules/@choojs/findup/node_modules/commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", - "peer": true - }, "node_modules/@danmarshall/deckgl-typings": { "version": "4.9.12", "resolved": "https://registry.npmjs.org/@danmarshall/deckgl-typings/-/deckgl-typings-4.9.12.tgz", @@ -625,13 +475,13 @@ } }, "node_modules/@deck.gl/aggregation-layers": { - "version": "8.9.22", - "resolved": "https://registry.npmjs.org/@deck.gl/aggregation-layers/-/aggregation-layers-8.9.22.tgz", - "integrity": "sha512-cw2duTxcZI0i0+295ivo/tsLffB6GPhuwkCYhqrVfO61JsK9GFuISGB7C5tMcfSOSxzgN6JwNA4fJEK1bCGozQ==", + "version": "8.9.34", + "resolved": "https://registry.npmjs.org/@deck.gl/aggregation-layers/-/aggregation-layers-8.9.34.tgz", + "integrity": "sha512-/JEDlj5MNFX8yHWPO5ljooGMdA2EPuZydbT6wrQD1WMydgp8dcEF+zVRLXTDWH1Mq+HLj6JHT1IhENHXN5TZFA==", "dependencies": { "@babel/runtime": "^7.0.0", - "@luma.gl/constants": "^8.5.20", - "@luma.gl/shadertools": "^8.5.20", + "@luma.gl/constants": "^8.5.21", + "@luma.gl/shadertools": "^8.5.21", "@math.gl/web-mercator": "^3.6.2", "d3-hexbin": "^0.2.1" }, @@ -641,56 +491,17 @@ "@luma.gl/core": "^8.0.0" } }, - "node_modules/@deck.gl/carto": { - "version": "8.9.22", - "resolved": "https://registry.npmjs.org/@deck.gl/carto/-/carto-8.9.22.tgz", - "integrity": "sha512-sfSmzUtXrhvMX5JaFiIpQtmfqVHRxcVIxnSZz6F5Q7DtvBhjNMEt3jq3qJ3IWH0EyxX0Xu+HMjmw6ScnsVAcXQ==", - "dependencies": { - "@babel/runtime": "^7.0.0", - "@loaders.gl/gis": "^3.4.2", - "@loaders.gl/loader-utils": "^3.4.2", - "@loaders.gl/mvt": "^3.4.2", - "@loaders.gl/tiles": "^3.4.2", - "@luma.gl/constants": "^8.5.20", - "@math.gl/web-mercator": "^3.6.2", - "cartocolor": "^4.0.2", - "d3-array": "^3.2.0", - "d3-color": "^3.1.0", - "d3-format": "^3.1.0", - "d3-scale": "^4.0.0", - "h3-js": "^3.7.0", - "moment-timezone": "^0.5.33", - "pbf": "^3.2.1", - "quadbin": "^0.1.9" - }, - "peerDependencies": { - "@deck.gl/aggregation-layers": "^8.0.0", - "@deck.gl/core": "^8.0.0", - "@deck.gl/extensions": "^8.0.0", - "@deck.gl/geo-layers": "^8.0.0", - "@deck.gl/layers": "^8.0.0", - "@loaders.gl/core": "^3.4.2" - } - }, - "node_modules/@deck.gl/carto/node_modules/d3-format": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.0.tgz", - "integrity": "sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==", - "engines": { - "node": ">=12" - } - }, "node_modules/@deck.gl/core": { - "version": "8.9.22", - "resolved": "https://registry.npmjs.org/@deck.gl/core/-/core-8.9.22.tgz", - "integrity": "sha512-HnUPB6qKgRfKQ3Dstw6vlI7+fyO9Ni4gukh8ysQM94mw89BRLkVcuQV0XvlzbbojrG1Z6QpC7KZmodW0y5o2og==", + "version": "8.9.34", + "resolved": "https://registry.npmjs.org/@deck.gl/core/-/core-8.9.34.tgz", + "integrity": "sha512-VDne26NevBBvD9Xq6pIBuBt2ffZhzW1COU3IogqhJLhejECiC3RQhWtDRWQqUZpQYKTU2SlyKZcu+Nj7kaLBWA==", "dependencies": { "@babel/runtime": "^7.0.0", - "@loaders.gl/core": "^3.4.2", - "@loaders.gl/images": "^3.4.2", - "@luma.gl/constants": "^8.5.20", - "@luma.gl/core": "^8.5.20", - "@luma.gl/webgl": "^8.5.20", + "@loaders.gl/core": "^3.4.13", + "@loaders.gl/images": "^3.4.13", + "@luma.gl/constants": "^8.5.21", + "@luma.gl/core": "^8.5.21", + "@luma.gl/webgl": "^8.5.21", "@math.gl/core": "^3.6.2", "@math.gl/sun": "^3.6.2", "@math.gl/web-mercator": "^3.6.2", @@ -703,12 +514,12 @@ } }, "node_modules/@deck.gl/extensions": { - "version": "8.9.22", - "resolved": "https://registry.npmjs.org/@deck.gl/extensions/-/extensions-8.9.22.tgz", - "integrity": "sha512-MYyWjnf94Ibs3BNfTIq/oJJLrNMWUpS2+qkmkQie03EGeO7/wJ9BAQAXWYdFdrbvCykw60mLBX78a68+XLvbmQ==", + "version": "8.9.34", + "resolved": "https://registry.npmjs.org/@deck.gl/extensions/-/extensions-8.9.34.tgz", + "integrity": "sha512-at2CSs1TXgOM035LWf+fk03r8yXMnokFBVd0QXlECj1izdBvehvhC7npgpqUJooKg0UMWmqUYkUH3uSrkfyIeA==", "dependencies": { "@babel/runtime": "^7.0.0", - "@luma.gl/shadertools": "^8.5.20" + "@luma.gl/shadertools": "^8.5.21" }, "peerDependencies": { "@deck.gl/core": "^8.0.0", @@ -720,21 +531,21 @@ } }, "node_modules/@deck.gl/geo-layers": { - "version": "8.9.22", - "resolved": "https://registry.npmjs.org/@deck.gl/geo-layers/-/geo-layers-8.9.22.tgz", - "integrity": "sha512-/P6kGxlWhfRPAaG0UDklANTQpQGevAE1zGTOyFVYEAMyRBws/CetLCq5rKfYibTjWBa5FO2U0u837HzG0PJRUw==", + "version": "8.9.34", + "resolved": "https://registry.npmjs.org/@deck.gl/geo-layers/-/geo-layers-8.9.34.tgz", + "integrity": "sha512-oXOdNByo8QHNrqjREeIX0btVzsj3aFzJcplatBpdLg6vr/iV8ZdsbRv8WO4CJJI3N6oVKIug2gHWogdIjpxHTg==", "dependencies": { "@babel/runtime": "^7.0.0", - "@loaders.gl/3d-tiles": "^3.4.2", - "@loaders.gl/gis": "^3.4.2", - "@loaders.gl/loader-utils": "^3.4.2", - "@loaders.gl/mvt": "^3.4.2", - "@loaders.gl/schema": "^3.4.2", - "@loaders.gl/terrain": "^3.4.2", - "@loaders.gl/tiles": "^3.4.2", - "@loaders.gl/wms": "^3.4.2", - "@luma.gl/constants": "^8.5.20", - "@luma.gl/experimental": "^8.5.20", + "@loaders.gl/3d-tiles": "^3.4.13", + "@loaders.gl/gis": "^3.4.13", + "@loaders.gl/loader-utils": "^3.4.13", + "@loaders.gl/mvt": "^3.4.13", + "@loaders.gl/schema": "^3.4.13", + "@loaders.gl/terrain": "^3.4.13", + "@loaders.gl/tiles": "^3.4.13", + "@loaders.gl/wms": "^3.4.13", + "@luma.gl/constants": "^8.5.21", + "@luma.gl/experimental": "^8.5.21", "@math.gl/core": "^3.6.2", "@math.gl/culling": "^3.6.2", "@math.gl/web-mercator": "^3.6.2", @@ -747,28 +558,14 @@ "@deck.gl/extensions": "^8.0.0", "@deck.gl/layers": "^8.0.0", "@deck.gl/mesh-layers": "^8.0.0", - "@loaders.gl/core": "^3.4.2", + "@loaders.gl/core": "^3.4.13", "@luma.gl/core": "^8.0.0" } }, - "node_modules/@deck.gl/google-maps": { - "version": "8.9.22", - "resolved": "https://registry.npmjs.org/@deck.gl/google-maps/-/google-maps-8.9.22.tgz", - "integrity": "sha512-x+9yqxkjLN0P5uKxYB6GEaM0KV2djBotvHX0BaHL9LbyWzdAvGJP1kmTg4SOpi0I7XG8jdkoca/tAZ2yy7A9RQ==", - "dependencies": { - "@babel/runtime": "^7.0.0" - }, - "peerDependencies": { - "@deck.gl/core": "^8.0.0", - "@luma.gl/constants": "^8.5.0", - "@luma.gl/core": "^8.5.0", - "@math.gl/core": "^3.6.0" - } - }, "node_modules/@deck.gl/json": { - "version": "8.9.22", - "resolved": "https://registry.npmjs.org/@deck.gl/json/-/json-8.9.22.tgz", - "integrity": "sha512-rYFZqp7mW8XvExtLAfGiAxTV7oLPaLmPVDPTYmMU2owSkfGYE3q6YvwqzHq37k5/5jLfJMA0cZy1fQrfJW3+gg==", + "version": "8.9.34", + "resolved": "https://registry.npmjs.org/@deck.gl/json/-/json-8.9.34.tgz", + "integrity": "sha512-+Svypau/H5B7dOUVW5iDOCRowqRNKQMGHSDUoSVcTcEV9Ca0vex9LeWmWWVUwYc6o1RcpyPi38TTyZdRe14sKw==", "dependencies": { "@babel/runtime": "^7.0.0", "d3-dsv": "^1.0.8", @@ -778,52 +575,15 @@ "@deck.gl/core": "^8.0.0" } }, - "node_modules/@deck.gl/json/node_modules/commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" - }, - "node_modules/@deck.gl/json/node_modules/d3-dsv": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-1.2.0.tgz", - "integrity": "sha512-9yVlqvZcSOMhCYzniHE7EVUws7Fa1zgw+/EAV2BxJoG3ME19V6BQFBwI855XQDsxyOuG7NibqRMTtiF/Qup46g==", - "dependencies": { - "commander": "2", - "iconv-lite": "0.4", - "rw": "1" - }, - "bin": { - "csv2json": "bin/dsv2json", - "csv2tsv": "bin/dsv2dsv", - "dsv2dsv": "bin/dsv2dsv", - "dsv2json": "bin/dsv2json", - "json2csv": "bin/json2dsv", - "json2dsv": "bin/json2dsv", - "json2tsv": "bin/json2dsv", - "tsv2csv": "bin/dsv2dsv", - "tsv2json": "bin/dsv2json" - } - }, - "node_modules/@deck.gl/json/node_modules/iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/@deck.gl/layers": { - "version": "8.9.22", - "resolved": "https://registry.npmjs.org/@deck.gl/layers/-/layers-8.9.22.tgz", - "integrity": "sha512-1IipECeORaT2fdU9k8KPnZ3DjUeH02h6oZYl4ffihNAIoVXKNivghgJ8ZeELLiEOkrxlbK+KjoH1zej7yuMwmg==", + "version": "8.9.34", + "resolved": "https://registry.npmjs.org/@deck.gl/layers/-/layers-8.9.34.tgz", + "integrity": "sha512-kc9Wzk8Zf2XwdG/V0Md6dh6mlJjStkWHKCKQLJOwj9GDwP4KihzYY2xC98CMCgi2/H/lH03xYm3e5EHvwIENww==", "dependencies": { "@babel/runtime": "^7.0.0", - "@loaders.gl/images": "^3.4.2", - "@loaders.gl/schema": "^3.4.2", - "@luma.gl/constants": "^8.5.20", + "@loaders.gl/images": "^3.4.13", + "@loaders.gl/schema": "^3.4.13", + "@luma.gl/constants": "^8.5.21", "@mapbox/tiny-sdf": "^2.0.5", "@math.gl/core": "^3.6.2", "@math.gl/polygon": "^3.6.2", @@ -832,32 +592,20 @@ }, "peerDependencies": { "@deck.gl/core": "^8.0.0", - "@loaders.gl/core": "^3.4.2", + "@loaders.gl/core": "^3.4.13", "@luma.gl/core": "^8.0.0" } }, - "node_modules/@deck.gl/mapbox": { - "version": "8.9.22", - "resolved": "https://registry.npmjs.org/@deck.gl/mapbox/-/mapbox-8.9.22.tgz", - "integrity": "sha512-VanA1V/BE6vmHn/W9f8ug4ilMDEfP3JUQWegVaCiG2EA8yjML6QVmO31gNARTefBjgMsfkWDBwm325coIUkxBQ==", - "dependencies": { - "@babel/runtime": "^7.0.0", - "@types/mapbox-gl": "^2.6.3" - }, - "peerDependencies": { - "@deck.gl/core": "^8.0.0" - } - }, "node_modules/@deck.gl/mesh-layers": { - "version": "8.9.22", - "resolved": "https://registry.npmjs.org/@deck.gl/mesh-layers/-/mesh-layers-8.9.22.tgz", - "integrity": "sha512-XJ6WdHphBtdumQYseFQCfGQ8KLRzgOGu89qsiEcuRTQwgW5GxXi4WJSpZmXZGtXObubwuEX6YqrN4BkX3F/nWg==", + "version": "8.9.34", + "resolved": "https://registry.npmjs.org/@deck.gl/mesh-layers/-/mesh-layers-8.9.34.tgz", + "integrity": "sha512-BJClDfB86+zgWOyXjLNfVBgZ8BlaSXWDHWj0vS7UuV79h/6PAdwMBfi28/PNO9A89cCtUd94MkB73G0ni56iTA==", "dependencies": { "@babel/runtime": "^7.0.0", - "@loaders.gl/gltf": "^3.4.2", - "@luma.gl/constants": "^8.5.20", - "@luma.gl/experimental": "^8.5.20", - "@luma.gl/shadertools": "^8.5.20" + "@loaders.gl/gltf": "^3.4.13", + "@luma.gl/constants": "^8.5.21", + "@luma.gl/experimental": "^8.5.21", + "@luma.gl/shadertools": "^8.5.21" }, "peerDependencies": { "@deck.gl/core": "^8.0.0", @@ -865,9 +613,9 @@ } }, "node_modules/@deck.gl/react": { - "version": "8.9.22", - "resolved": "https://registry.npmjs.org/@deck.gl/react/-/react-8.9.22.tgz", - "integrity": "sha512-NZcWBlOWYPs+DQqYSZQFLxfguFe0GP2AE1ojlrstnckV1N3bsMf1dT6AI5AvX5h9DbiBc216ZrV9iwVhlfkLng==", + "version": "8.9.34", + "resolved": "https://registry.npmjs.org/@deck.gl/react/-/react-8.9.34.tgz", + "integrity": "sha512-kelU3otxmEtNYQ7gVrVSLvju+StuqqSkDrcJU82igjNalOvjjPGst1H7blQTgk1lEbfHNeddusIYGipefyuImw==", "dependencies": { "@babel/runtime": "^7.0.0" }, @@ -879,9 +627,9 @@ } }, "node_modules/@emerson-eps/color-tables": { - "version": "0.4.61", - "resolved": "https://registry.npmjs.org/@emerson-eps/color-tables/-/color-tables-0.4.61.tgz", - "integrity": "sha512-hQZgEoTbfllCI6by14RI/Jpqftn9m3wBT6afNOu/ffM4/IxjxpKYaG1ycle310AOAJWoTj9wByIwE7YlkJIFoQ==", + "version": "0.4.75", + "resolved": "https://registry.npmjs.org/@emerson-eps/color-tables/-/color-tables-0.4.75.tgz", + "integrity": "sha512-gNVmGR48L1gTOPC3qvZBST3ZGgHkOJzg78C6vuIfi7sZL31uY/aGZkd8+zixsRwwZusdsmswfc6TH42lMd+VVA==", "dependencies": { "@emotion/react": "^11.10.6", "@emotion/styled": "^11.10.0", @@ -1009,12 +757,6 @@ } } }, - "node_modules/@emotion/stylis": { - "version": "0.8.5", - "resolved": "https://registry.npmjs.org/@emotion/stylis/-/stylis-0.8.5.tgz", - "integrity": "sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ==", - "peer": true - }, "node_modules/@emotion/unitless": { "version": "0.8.1", "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.1.tgz", @@ -1039,17 +781,17 @@ "integrity": "sha512-EsBwpc7hBUJWAsNPBmJy4hxWx12v6bshQsldrVmjxJoc3isbxhOrF2IcCpaXxfvq03NwkI7sbsOLXbYuqF/8Ww==" }, "node_modules/@equinor/eds-core-react": { - "version": "0.32.4", - "resolved": "https://registry.npmjs.org/@equinor/eds-core-react/-/eds-core-react-0.32.4.tgz", - "integrity": "sha512-UTUE8TImQkVxl3srR0dOkPHTkLtmqsp+lcZz509sl3WRaGFlBseBiPgWrCTdgfT4EtAKRimmXhqsrAHllhGgJA==", + "version": "0.36.0", + "resolved": "https://registry.npmjs.org/@equinor/eds-core-react/-/eds-core-react-0.36.0.tgz", + "integrity": "sha512-O/WihrcxM2EjO5b/ZHFKmZ6w6NK0we6H/nvvYvmPu4iXt7Ci7lJrrEqGZfj9KeGfoX7T4wCYFEBP/nBqN7ndpQ==", "dependencies": { - "@babel/runtime": "^7.22.5", - "@equinor/eds-icons": "^0.19.3", + "@babel/runtime": "^7.23.8", + "@equinor/eds-icons": "^0.21.0", "@equinor/eds-tokens": "0.9.2", - "@equinor/eds-utils": "0.8.1", - "@floating-ui/react": "^0.25.1", - "@tanstack/react-virtual": "3.0.0-beta.54", - "downshift": "^8.1.0" + "@equinor/eds-utils": "0.8.4", + "@floating-ui/react": "^0.26.2", + "@tanstack/react-virtual": "3.0.4", + "downshift": "^8.2.3" }, "engines": { "node": ">=10.0.0", @@ -1058,13 +800,13 @@ "peerDependencies": { "react": ">=16.8", "react-dom": ">=16.8", - "styled-components": ">=4.2 < 6" + "styled-components": ">=4.2" } }, "node_modules/@equinor/eds-icons": { - "version": "0.19.3", - "resolved": "https://registry.npmjs.org/@equinor/eds-icons/-/eds-icons-0.19.3.tgz", - "integrity": "sha512-Sh0W01PrwXPCi8/p9YKj0qKNtRU9R/xYJORinIzsNNRllpiu9wvuGAsQNE0gQaDDnrprsiRBH3+MdMSRXVs3Wg==", + "version": "0.21.0", + "resolved": "https://registry.npmjs.org/@equinor/eds-icons/-/eds-icons-0.21.0.tgz", + "integrity": "sha512-k2keACHou9h9D5QLfSBeojTApqbPCkHNBWplUA/B9FQv8FMCMSBbjJAo2L/3yAExMylQN9LdwKo81T2tijRXoA==", "engines": { "node": ">=10.0.0", "pnpm": ">=4" @@ -1080,13 +822,12 @@ } }, "node_modules/@equinor/eds-utils": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/@equinor/eds-utils/-/eds-utils-0.8.1.tgz", - "integrity": "sha512-MqKqHhfOxGxbZPhHlZqiR58ei11CQ+UGJ/qEa7wC5pA/c+W9kyu7OveiK9OVvaswRiOmLaahnhSEC9JTFa7ICw==", + "version": "0.8.4", + "resolved": "https://registry.npmjs.org/@equinor/eds-utils/-/eds-utils-0.8.4.tgz", + "integrity": "sha512-njvqXd3Hzfy5vkEqnx+uEBAu00vnG/5R+gDgWCReVDjjUoHdQNcrqfjBLsGF2UungtO0LbYV8YuBP+9l4V7ywQ==", "dependencies": { - "@babel/runtime": "^7.22.5", - "@equinor/eds-tokens": "0.9.2", - "babel-jest": "^29.5.0" + "@babel/runtime": "^7.23.8", + "@equinor/eds-tokens": "0.9.2" }, "engines": { "node": ">=10.0.0", @@ -1612,29 +1353,29 @@ } }, "node_modules/@floating-ui/core": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.4.1.tgz", - "integrity": "sha512-jk3WqquEJRlcyu7997NtR5PibI+y5bi+LS3hPmguVClypenMsCY3CBa3LAQnozRCtCrYWSEtAdiskpamuJRFOQ==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.0.tgz", + "integrity": "sha512-PcF++MykgmTj3CIyOQbKA/hDzOAiqI3mhuoN44WRCopIs1sgoDoU4oty4Jtqaj/y3oDU6fnVSm4QG0a3t5i0+g==", "dependencies": { - "@floating-ui/utils": "^0.1.1" + "@floating-ui/utils": "^0.2.1" } }, "node_modules/@floating-ui/dom": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.5.1.tgz", - "integrity": "sha512-KwvVcPSXg6mQygvA1TjbN/gh///36kKtllIF8SUm0qpFj8+rvYrpvlYdL1JoA71SHpDqgSSdGOSoQ0Mp3uY5aw==", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.3.tgz", + "integrity": "sha512-RnDthu3mzPlQ31Ss/BTwQ1zjzIhr3lk1gZB1OC56h/1vEtaXkESrOqL5fQVMfXpwGtRwX+YsZBdyHtJMQnkArw==", "dependencies": { - "@floating-ui/core": "^1.4.1", - "@floating-ui/utils": "^0.1.1" + "@floating-ui/core": "^1.0.0", + "@floating-ui/utils": "^0.2.0" } }, "node_modules/@floating-ui/react": { - "version": "0.25.2", - "resolved": "https://registry.npmjs.org/@floating-ui/react/-/react-0.25.2.tgz", - "integrity": "sha512-3e10G9LFOgl32/SMWLBOwT7oVCtB+d5zBsU2GxTSVOvRgZexwno5MlYbc0BaXr+TR5EEGpqe9tg9OUbjlrVRnQ==", + "version": "0.26.9", + "resolved": "https://registry.npmjs.org/@floating-ui/react/-/react-0.26.9.tgz", + "integrity": "sha512-p86wynZJVEkEq2BBjY/8p2g3biQ6TlgT4o/3KgFKyTWoJLU1GZ8wpctwRqtkEl2tseYA+kw7dBAIDFcednfI5w==", "dependencies": { - "@floating-ui/react-dom": "^2.0.1", - "@floating-ui/utils": "^0.1.1", + "@floating-ui/react-dom": "^2.0.8", + "@floating-ui/utils": "^0.2.1", "tabbable": "^6.0.1" }, "peerDependencies": { @@ -1643,11 +1384,11 @@ } }, "node_modules/@floating-ui/react-dom": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.0.2.tgz", - "integrity": "sha512-5qhlDvjaLmAst/rKb3VdlCinwTF4EYMiVxuuc/HVUjs46W0zgtbMmAZ1UTsDrRTxRmUEzl92mOtWbeeXL26lSQ==", + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.0.8.tgz", + "integrity": "sha512-HOdqOt3R3OGeTKidaLvJKcgg75S6tibQ3Tif4eyd91QnIJWr0NLvoXFpJA/j8HqkFSL68GDca9AuyWEHlhyClw==", "dependencies": { - "@floating-ui/dom": "^1.5.1" + "@floating-ui/dom": "^1.6.1" }, "peerDependencies": { "react": ">=16.8.0", @@ -1655,9 +1396,9 @@ } }, "node_modules/@floating-ui/utils": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.1.1.tgz", - "integrity": "sha512-m0G6wlnhm/AX0H12IOWtK8gASEMffnX08RtKkCgTdHb9JpHKGloI7icFfLg9ZmQeavcvR0PKmzxClyuFPSjKWw==" + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.1.tgz", + "integrity": "sha512-9TANp6GPoMtYzQdt54kfAyMmz1+osLlXdg2ENroU7zzrtflTLrrC/lgrIfaSe+Wu0b89GKccT7vxXA0MoAIO+Q==" }, "node_modules/@headlessui/react": { "version": "1.7.16", @@ -1759,101 +1500,11 @@ "url": "https://github.com/chalk/strip-ansi?sponsor=1" } }, - "node_modules/@istanbuljs/load-nyc-config": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", - "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==", - "dependencies": { - "camelcase": "^5.3.1", - "find-up": "^4.1.0", - "get-package-type": "^0.1.0", - "js-yaml": "^3.13.1", - "resolve-from": "^5.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/@istanbuljs/load-nyc-config/node_modules/argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dependencies": { - "sprintf-js": "~1.0.2" - } - }, - "node_modules/@istanbuljs/load-nyc-config/node_modules/find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dependencies": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/@istanbuljs/load-nyc-config/node_modules/js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", - "dependencies": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/@istanbuljs/load-nyc-config/node_modules/locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dependencies": { - "p-locate": "^4.1.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/@istanbuljs/load-nyc-config/node_modules/p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dependencies": { - "p-try": "^2.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@istanbuljs/load-nyc-config/node_modules/p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dependencies": { - "p-limit": "^2.2.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/@istanbuljs/load-nyc-config/node_modules/resolve-from": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", - "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", - "engines": { - "node": ">=8" - } - }, "node_modules/@istanbuljs/schema": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", + "dev": true, "engines": { "node": ">=8" } @@ -1862,6 +1513,7 @@ "version": "29.6.3", "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", + "dev": true, "dependencies": { "@sinclair/typebox": "^0.27.8" }, @@ -1869,184 +1521,11 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@jest/transform": { - "version": "29.6.2", - "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.6.2.tgz", - "integrity": "sha512-ZqCqEISr58Ce3U+buNFJYUktLJZOggfyvR+bZMaiV1e8B1SIvJbwZMrYz3gx/KAPn9EXmOmN+uB08yLCjWkQQg==", - "dependencies": { - "@babel/core": "^7.11.6", - "@jest/types": "^29.6.1", - "@jridgewell/trace-mapping": "^0.3.18", - "babel-plugin-istanbul": "^6.1.1", - "chalk": "^4.0.0", - "convert-source-map": "^2.0.0", - "fast-json-stable-stringify": "^2.1.0", - "graceful-fs": "^4.2.9", - "jest-haste-map": "^29.6.2", - "jest-regex-util": "^29.4.3", - "jest-util": "^29.6.2", - "micromatch": "^4.0.4", - "pirates": "^4.0.4", - "slash": "^3.0.0", - "write-file-atomic": "^4.0.2" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/transform/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/@jest/transform/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/@jest/transform/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/@jest/transform/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" - }, - "node_modules/@jest/transform/node_modules/convert-source-map": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", - "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==" - }, - "node_modules/@jest/transform/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "engines": { - "node": ">=8" - } - }, - "node_modules/@jest/transform/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/@jest/types": { - "version": "29.6.1", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz", - "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==", - "dependencies": { - "@jest/schemas": "^29.6.0", - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^3.0.0", - "@types/node": "*", - "@types/yargs": "^17.0.8", - "chalk": "^4.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/types/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/@jest/types/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/@jest/types/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/@jest/types/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" - }, - "node_modules/@jest/types/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "engines": { - "node": ">=8" - } - }, - "node_modules/@jest/types/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/@jridgewell/gen-mapping": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==", + "dev": true, "dependencies": { "@jridgewell/set-array": "^1.0.1", "@jridgewell/sourcemap-codec": "^1.4.10", @@ -2060,6 +1539,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==", + "dev": true, "engines": { "node": ">=6.0.0" } @@ -2068,6 +1548,7 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", + "dev": true, "engines": { "node": ">=6.0.0" } @@ -2075,12 +1556,14 @@ "node_modules/@jridgewell/sourcemap-codec": { "version": "1.4.15", "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", - "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==" + "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==", + "dev": true }, "node_modules/@jridgewell/trace-mapping": { "version": "0.3.18", "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz", "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==", + "dev": true, "dependencies": { "@jridgewell/resolve-uri": "3.1.0", "@jridgewell/sourcemap-codec": "1.4.14" @@ -2089,7 +1572,8 @@ "node_modules/@jridgewell/trace-mapping/node_modules/@jridgewell/sourcemap-codec": { "version": "1.4.14", "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", - "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==" + "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==", + "dev": true }, "node_modules/@jsdevtools/ono": { "version": "7.1.3", @@ -2098,15 +1582,15 @@ "dev": true }, "node_modules/@loaders.gl/3d-tiles": { - "version": "3.4.8", - "resolved": "https://registry.npmjs.org/@loaders.gl/3d-tiles/-/3d-tiles-3.4.8.tgz", - "integrity": "sha512-v4Ejtp4Pb5RhFQyI37oDy9IZtBKEUZ+2xWNtyDgeV8Vni5ht532hsPVGY8CkUMMZFAyzl3zcDFUQo0cIbiqKKg==", - "dependencies": { - "@loaders.gl/draco": "3.4.8", - "@loaders.gl/gltf": "3.4.8", - "@loaders.gl/loader-utils": "3.4.8", - "@loaders.gl/math": "3.4.8", - "@loaders.gl/tiles": "3.4.8", + "version": "3.4.14", + "resolved": "https://registry.npmjs.org/@loaders.gl/3d-tiles/-/3d-tiles-3.4.14.tgz", + "integrity": "sha512-cxStTSLIJgRZnkTBYTcp9FPVBQWQlJMzW1LRlaKWiwAHkOKBElszzApIIEvRvZGSrs8k8TUi6BJ1Y41iiANF7w==", + "dependencies": { + "@loaders.gl/draco": "3.4.14", + "@loaders.gl/gltf": "3.4.14", + "@loaders.gl/loader-utils": "3.4.14", + "@loaders.gl/math": "3.4.14", + "@loaders.gl/tiles": "3.4.14", "@math.gl/core": "^3.5.1", "@math.gl/geospatial": "^3.5.1", "long": "^5.2.1" @@ -2121,13 +1605,13 @@ "integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==" }, "node_modules/@loaders.gl/core": { - "version": "3.4.8", - "resolved": "https://registry.npmjs.org/@loaders.gl/core/-/core-3.4.8.tgz", - "integrity": "sha512-pAaAISNmxiUQn8iz0yDhX5DCt3geaaJtSTxAHgz25G2Z5kWqYS00g5bc7XIGNT2BwqD5pgVLRch+BdTQ/Q8lJA==", + "version": "3.4.14", + "resolved": "https://registry.npmjs.org/@loaders.gl/core/-/core-3.4.14.tgz", + "integrity": "sha512-5PFcjv7xC8AYL17juDMrvo8n0Fcwg9s8F4BaM2YCNUsb9RCI2SmLuIFJMcx1GgHO5vL0WiTIKO+JT4n1FuNR6w==", "dependencies": { "@babel/runtime": "^7.3.1", - "@loaders.gl/loader-utils": "3.4.8", - "@loaders.gl/worker-utils": "3.4.8", + "@loaders.gl/loader-utils": "3.4.14", + "@loaders.gl/worker-utils": "3.4.14", "@probe.gl/log": "^4.0.1" } }, @@ -2149,129 +1633,129 @@ } }, "node_modules/@loaders.gl/draco": { - "version": "3.4.8", - "resolved": "https://registry.npmjs.org/@loaders.gl/draco/-/draco-3.4.8.tgz", - "integrity": "sha512-x127QX/CCzbSXTk5IL4WBmL6RjvMZhedzMoEiWE4NhAEiwTFKXvWUZLluoFlGzJhxSL6xiR2KBF8tN1EMv4L1Q==", + "version": "3.4.14", + "resolved": "https://registry.npmjs.org/@loaders.gl/draco/-/draco-3.4.14.tgz", + "integrity": "sha512-HwNFFt+dKZqFtzI0uVGvRkudFEZXxybJ+ZRsNkBbzAWoMM5L1TpuLs6DPsqPQUIT9HXNHzov18cZI0gK5bTJpg==", "dependencies": { "@babel/runtime": "^7.3.1", - "@loaders.gl/loader-utils": "3.4.8", - "@loaders.gl/schema": "3.4.8", - "@loaders.gl/worker-utils": "3.4.8", + "@loaders.gl/loader-utils": "3.4.14", + "@loaders.gl/schema": "3.4.14", + "@loaders.gl/worker-utils": "3.4.14", "draco3d": "1.5.5" } }, "node_modules/@loaders.gl/gis": { - "version": "3.4.8", - "resolved": "https://registry.npmjs.org/@loaders.gl/gis/-/gis-3.4.8.tgz", - "integrity": "sha512-I0Q8n1XhxXfZ6QoHvW6ayUkrOiifARGvSm4xTZxkydFNM5MULp9ICrZkFeqGMAVeevbssR3h9JKR111AmQvrPw==", + "version": "3.4.14", + "resolved": "https://registry.npmjs.org/@loaders.gl/gis/-/gis-3.4.14.tgz", + "integrity": "sha512-5cmhIwioPpSkfNzFRM3PbFDecjpYIhtEOFbryu3rE37npKHLTD2tF4ocQxUPB+QVED6GLwWBdzJIs64UWGrqjw==", "dependencies": { - "@loaders.gl/loader-utils": "3.4.8", - "@loaders.gl/schema": "3.4.8", + "@loaders.gl/loader-utils": "3.4.14", + "@loaders.gl/schema": "3.4.14", "@mapbox/vector-tile": "^1.3.1", "@math.gl/polygon": "^3.5.1", "pbf": "^3.2.1" } }, "node_modules/@loaders.gl/gltf": { - "version": "3.4.8", - "resolved": "https://registry.npmjs.org/@loaders.gl/gltf/-/gltf-3.4.8.tgz", - "integrity": "sha512-nvDj0LmkOXtQWUr7MkGShQ2WUmZlUnWTs6PatPxueevdL49vR16SB8VAWTx+8XUPq3Wno+gVZJxG8HBRkFVHng==", - "dependencies": { - "@loaders.gl/draco": "3.4.8", - "@loaders.gl/images": "3.4.8", - "@loaders.gl/loader-utils": "3.4.8", - "@loaders.gl/textures": "3.4.8", + "version": "3.4.14", + "resolved": "https://registry.npmjs.org/@loaders.gl/gltf/-/gltf-3.4.14.tgz", + "integrity": "sha512-jv+B5S/taiwzXAOu5D9nk1jjU9+JCCr/6/nGguCE2Ya3IX7CI1Nlnp20eKKhW8ZCEokZavMNT0bNbiJ5ahEFjA==", + "dependencies": { + "@loaders.gl/draco": "3.4.14", + "@loaders.gl/images": "3.4.14", + "@loaders.gl/loader-utils": "3.4.14", + "@loaders.gl/textures": "3.4.14", "@math.gl/core": "^3.5.1" } }, "node_modules/@loaders.gl/images": { - "version": "3.4.8", - "resolved": "https://registry.npmjs.org/@loaders.gl/images/-/images-3.4.8.tgz", - "integrity": "sha512-cKoQ20aMBgBXYKVVJuDLuH1wTeXZyinbG4otSBf4D+gAhQ09Gd3dVMYF7RWIxXp0CdL4jiqGHnJ470y0AvrT4w==", + "version": "3.4.14", + "resolved": "https://registry.npmjs.org/@loaders.gl/images/-/images-3.4.14.tgz", + "integrity": "sha512-tL447hTWhOKBOB87SE4hvlC8OkbRT0mEaW1a/wIS9f4HnYDa/ycRLMV+nvdvYMZur4isNPam44oiRqi7GcILkg==", "dependencies": { - "@loaders.gl/loader-utils": "3.4.8" + "@loaders.gl/loader-utils": "3.4.14" } }, "node_modules/@loaders.gl/loader-utils": { - "version": "3.4.8", - "resolved": "https://registry.npmjs.org/@loaders.gl/loader-utils/-/loader-utils-3.4.8.tgz", - "integrity": "sha512-/3sZ2J3Y29t50HSo6X6mtLNDYID+s77cmFWxjq+R4/uDekYx2vmgiw/WCFbupKse6NrAKe1KgqEBac1Q7yARSQ==", + "version": "3.4.14", + "resolved": "https://registry.npmjs.org/@loaders.gl/loader-utils/-/loader-utils-3.4.14.tgz", + "integrity": "sha512-HCTY2/F83RLbZWcTvWLVJ1vke3dl6Bye20HU1AqkA37J2vzHwOZ8kj6eee8eeSkIkf7VIFwjyhVJxe0flQE/Bw==", "dependencies": { "@babel/runtime": "^7.3.1", - "@loaders.gl/worker-utils": "3.4.8", + "@loaders.gl/worker-utils": "3.4.14", "@probe.gl/stats": "^4.0.1" } }, "node_modules/@loaders.gl/loader-utils/node_modules/@probe.gl/stats": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/@probe.gl/stats/-/stats-4.0.4.tgz", - "integrity": "sha512-SDuSY/D4yDL6LQDa69l/GCcnZLRiGYdyvYkxWb0CgnzTPdPrcdrzGkzkvpC3zsA4fEFw2smlDje370QGHwlisg==", + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/@probe.gl/stats/-/stats-4.0.6.tgz", + "integrity": "sha512-pl40G9FgumawDIORczUpk+GB73pEAdhboldPgf8Y74dGVgrmJnKsw7wVub8pfaFafu2oCteEIdLZ4owCLVBdAw==", "dependencies": { "@babel/runtime": "^7.0.0" } }, "node_modules/@loaders.gl/math": { - "version": "3.4.8", - "resolved": "https://registry.npmjs.org/@loaders.gl/math/-/math-3.4.8.tgz", - "integrity": "sha512-+9Hy1k44tj+v8IYKh+Zp0xXOijH94HoT/8ILdt5kG8MdjDU6VYyz2t/D4ZawSM+DBgXLYhDIIKkqrdND5ct2AQ==", + "version": "3.4.14", + "resolved": "https://registry.npmjs.org/@loaders.gl/math/-/math-3.4.14.tgz", + "integrity": "sha512-OBEVX6Q5pMipbCAiZyX2+q1zRd0nw8M2dclpny05on8700OaKMwfs47wEUnbfCU3iyHad3sgsAxN3EIh+kuo9Q==", "dependencies": { - "@loaders.gl/images": "3.4.8", - "@loaders.gl/loader-utils": "3.4.8", + "@loaders.gl/images": "3.4.14", + "@loaders.gl/loader-utils": "3.4.14", "@math.gl/core": "^3.5.1" } }, "node_modules/@loaders.gl/mvt": { - "version": "3.4.8", - "resolved": "https://registry.npmjs.org/@loaders.gl/mvt/-/mvt-3.4.8.tgz", - "integrity": "sha512-JvgSsg7+oypRAhGmUKvLSH8h146HRopxf25c9hzyPWX1MeAPfVWgwTou0syy5TwOyRlrLtGp4Rs/6AmNAWBtnw==", + "version": "3.4.14", + "resolved": "https://registry.npmjs.org/@loaders.gl/mvt/-/mvt-3.4.14.tgz", + "integrity": "sha512-tozGmWvsJacjaLavjX4S/5yNDV9S4wJb7+vPG/nXWX2gTtgZ1mxcFQAtAJjokqpy37d1ZhLt+TXh0HrLoTmRgw==", "dependencies": { - "@loaders.gl/gis": "3.4.8", - "@loaders.gl/loader-utils": "3.4.8", - "@loaders.gl/schema": "3.4.8", + "@loaders.gl/gis": "3.4.14", + "@loaders.gl/loader-utils": "3.4.14", + "@loaders.gl/schema": "3.4.14", "@math.gl/polygon": "^3.5.1", "pbf": "^3.2.1" } }, "node_modules/@loaders.gl/schema": { - "version": "3.4.8", - "resolved": "https://registry.npmjs.org/@loaders.gl/schema/-/schema-3.4.8.tgz", - "integrity": "sha512-nu+mT8LgeoCF65xs+F9qegJsIWqYOzwkzJLEd7zmHGRMMYqaFDqcp63J3CUQy+UvS4dGTZph38aQuVfncS/fJA==", + "version": "3.4.14", + "resolved": "https://registry.npmjs.org/@loaders.gl/schema/-/schema-3.4.14.tgz", + "integrity": "sha512-r6BEDfUvbvzgUnh/MtkR5RzrkIwo1x1jtPFRTSJVsIZO7arXXlu3blffuv5ppEkKpNZ1Xzd9WtHp/JIkuctsmw==", "dependencies": { "@types/geojson": "^7946.0.7" } }, "node_modules/@loaders.gl/terrain": { - "version": "3.4.8", - "resolved": "https://registry.npmjs.org/@loaders.gl/terrain/-/terrain-3.4.8.tgz", - "integrity": "sha512-bWLePOb6+4N8DNMXP0D3aqkwyU3phuUjzjQLvfoP9dySUuX4E9kwarCcmkaCYyqp2swp57cHaylSd6tHXOFR6w==", + "version": "3.4.14", + "resolved": "https://registry.npmjs.org/@loaders.gl/terrain/-/terrain-3.4.14.tgz", + "integrity": "sha512-vhchEVkPaWXnqd2ofujG2AEnBsk4hEw6LWSaFY7E3VMzNhI9l2EHvyU3+Hs03jYbXM4oLlQPGqd/T7x+5IMtig==", "dependencies": { "@babel/runtime": "^7.3.1", - "@loaders.gl/images": "3.4.8", - "@loaders.gl/loader-utils": "3.4.8", - "@loaders.gl/schema": "3.4.8", + "@loaders.gl/images": "3.4.14", + "@loaders.gl/loader-utils": "3.4.14", + "@loaders.gl/schema": "3.4.14", "@mapbox/martini": "^0.2.0" } }, "node_modules/@loaders.gl/textures": { - "version": "3.4.8", - "resolved": "https://registry.npmjs.org/@loaders.gl/textures/-/textures-3.4.8.tgz", - "integrity": "sha512-lFlV1/3yQqBANP5FoywuQwh+Br++BU3/6eT/Eb/zDbKOqTuqtHp7yAUz207tAO3mRqTkPvtKi9fv+0QrBGoxtw==", - "dependencies": { - "@loaders.gl/images": "3.4.8", - "@loaders.gl/loader-utils": "3.4.8", - "@loaders.gl/schema": "3.4.8", - "@loaders.gl/worker-utils": "3.4.8", + "version": "3.4.14", + "resolved": "https://registry.npmjs.org/@loaders.gl/textures/-/textures-3.4.14.tgz", + "integrity": "sha512-iKDHL2ZlOUud4/e3g0p0SyvkukznopYy6La3O6I9vDfKp8peuKMRRcTfFfd/zH0OqQC0hIhCXNz46vRLu7h6ng==", + "dependencies": { + "@loaders.gl/images": "3.4.14", + "@loaders.gl/loader-utils": "3.4.14", + "@loaders.gl/schema": "3.4.14", + "@loaders.gl/worker-utils": "3.4.14", "ktx-parse": "^0.0.4", "texture-compressor": "^1.0.2" } }, "node_modules/@loaders.gl/tiles": { - "version": "3.4.8", - "resolved": "https://registry.npmjs.org/@loaders.gl/tiles/-/tiles-3.4.8.tgz", - "integrity": "sha512-rA3ULOokiUTH6Y3sr37wGaTx3P0g/hRti9yB6q/8kSBy+fE1gSD801O4VluNx6DbOELR2zWkM8TqLTep6sBN1A==", + "version": "3.4.14", + "resolved": "https://registry.npmjs.org/@loaders.gl/tiles/-/tiles-3.4.14.tgz", + "integrity": "sha512-an3scxl65r74LW4WoIGgluBmQpMY9eb381y9mZmREphTP6bWEj96fL/tiR+G6TiE6HJqTv8O3PH6xwI9OQmEJg==", "dependencies": { - "@loaders.gl/loader-utils": "3.4.8", - "@loaders.gl/math": "3.4.8", + "@loaders.gl/loader-utils": "3.4.14", + "@loaders.gl/math": "3.4.14", "@math.gl/core": "^3.5.1", "@math.gl/culling": "^3.5.1", "@math.gl/geospatial": "^3.5.1", @@ -2283,75 +1767,75 @@ } }, "node_modules/@loaders.gl/tiles/node_modules/@probe.gl/stats": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/@probe.gl/stats/-/stats-4.0.4.tgz", - "integrity": "sha512-SDuSY/D4yDL6LQDa69l/GCcnZLRiGYdyvYkxWb0CgnzTPdPrcdrzGkzkvpC3zsA4fEFw2smlDje370QGHwlisg==", + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/@probe.gl/stats/-/stats-4.0.6.tgz", + "integrity": "sha512-pl40G9FgumawDIORczUpk+GB73pEAdhboldPgf8Y74dGVgrmJnKsw7wVub8pfaFafu2oCteEIdLZ4owCLVBdAw==", "dependencies": { "@babel/runtime": "^7.0.0" } }, "node_modules/@loaders.gl/wms": { - "version": "3.4.8", - "resolved": "https://registry.npmjs.org/@loaders.gl/wms/-/wms-3.4.8.tgz", - "integrity": "sha512-4ESwVUa6dStmGqHIqdz6XFo/b/uyB6O+A1iy/mhMGTW8JodrzTcPQl5Iq8fA6EEYP0xviXFL652IEn+dR/BsGg==", + "version": "3.4.14", + "resolved": "https://registry.npmjs.org/@loaders.gl/wms/-/wms-3.4.14.tgz", + "integrity": "sha512-D1pObPSUj885zGPyHIb7GtcwpHQNk0T8nK/4EHb0SHLe0y1b4qwqSOswdS9geXT9Q61hyhl/L0zqyTgwjiMStg==", "dependencies": { "@babel/runtime": "^7.3.1", - "@loaders.gl/images": "3.4.8", - "@loaders.gl/loader-utils": "3.4.8", - "@loaders.gl/schema": "3.4.8", - "@loaders.gl/xml": "3.4.8", + "@loaders.gl/images": "3.4.14", + "@loaders.gl/loader-utils": "3.4.14", + "@loaders.gl/schema": "3.4.14", + "@loaders.gl/xml": "3.4.14", "@turf/rewind": "^5.1.5", "deep-strict-equal": "^0.2.0", "lerc": "^4.0.1" } }, "node_modules/@loaders.gl/worker-utils": { - "version": "3.4.8", - "resolved": "https://registry.npmjs.org/@loaders.gl/worker-utils/-/worker-utils-3.4.8.tgz", - "integrity": "sha512-cioo1rKtUkbDPJVQZ5ytEc6r/LdR1eIOCszgRh1VymtYvWGT+prZxfCIAmM1uZBV2SLWYTnH17dR0PR+cNopzA==", + "version": "3.4.14", + "resolved": "https://registry.npmjs.org/@loaders.gl/worker-utils/-/worker-utils-3.4.14.tgz", + "integrity": "sha512-PUSwxoAYbskisXd0KfYEQ902b0igBA2UAWdP6PzPvY+tJmobfh74dTNwrrBQ1rGXQxxmGx6zc6/ksX6mlIzIrg==", "dependencies": { "@babel/runtime": "^7.3.1" } }, "node_modules/@loaders.gl/xml": { - "version": "3.4.8", - "resolved": "https://registry.npmjs.org/@loaders.gl/xml/-/xml-3.4.8.tgz", - "integrity": "sha512-8lrmdsnaobENpEPalEAzP720UY3kA/w6w7vCUKABB60QHnq+D5Rvw1PLPfQCACMFhYF+vR56KcQjtEbuqhs5wA==", + "version": "3.4.14", + "resolved": "https://registry.npmjs.org/@loaders.gl/xml/-/xml-3.4.14.tgz", + "integrity": "sha512-SNMGOHz4p8Cw+M6kxXhFEjXdNddJPOZY1rzNmRq7NYdGQlQYYeJdqV5HWzHx9BkoQYyrDXkrweGN0mY9QxCfeA==", "dependencies": { "@babel/runtime": "^7.3.1", - "@loaders.gl/loader-utils": "3.4.8", - "@loaders.gl/schema": "3.4.8", + "@loaders.gl/loader-utils": "3.4.14", + "@loaders.gl/schema": "3.4.14", "fast-xml-parser": "^4.2.5" } }, "node_modules/@luma.gl/constants": { - "version": "8.5.20", - "resolved": "https://registry.npmjs.org/@luma.gl/constants/-/constants-8.5.20.tgz", - "integrity": "sha512-5yG+ybkUZ4j6kLPWMZjN4Hun2yLB0MyEpNCRKAUN9/yS9UIWA7unyVxjSf2vnE7k/7dywtxlbXegASNFgNVGxw==" + "version": "8.5.21", + "resolved": "https://registry.npmjs.org/@luma.gl/constants/-/constants-8.5.21.tgz", + "integrity": "sha512-aJxayGxTT+IRd1vfpcgD/cKSCiVJjBNiuiChS96VulrmCvkzUOLvYXr42y5qKB4RyR7vOIda5uQprNzoHrhQAA==" }, "node_modules/@luma.gl/core": { - "version": "8.5.20", - "resolved": "https://registry.npmjs.org/@luma.gl/core/-/core-8.5.20.tgz", - "integrity": "sha512-xJr96G6vhYcznYHC84fbeOG3fgNM4lFwj9bd0VPcg/Kfe8otUeN1Hl0AKHCCtNn48PiMSg3LKbaiRfNUMhaffQ==", + "version": "8.5.21", + "resolved": "https://registry.npmjs.org/@luma.gl/core/-/core-8.5.21.tgz", + "integrity": "sha512-11jQJQEMoR/IN2oIsd4zFxiQJk6FE+xgVIMUcsCTBuzafTtQZ8Po9df8mt+MVewpDyBlTVs6g8nxHRH4np1ukA==", "dependencies": { "@babel/runtime": "^7.0.0", - "@luma.gl/constants": "8.5.20", - "@luma.gl/engine": "8.5.20", - "@luma.gl/gltools": "8.5.20", - "@luma.gl/shadertools": "8.5.20", - "@luma.gl/webgl": "8.5.20" + "@luma.gl/constants": "8.5.21", + "@luma.gl/engine": "8.5.21", + "@luma.gl/gltools": "8.5.21", + "@luma.gl/shadertools": "8.5.21", + "@luma.gl/webgl": "8.5.21" } }, "node_modules/@luma.gl/engine": { - "version": "8.5.20", - "resolved": "https://registry.npmjs.org/@luma.gl/engine/-/engine-8.5.20.tgz", - "integrity": "sha512-+0ryJ/4gL1pWaEgZimY21jUPt1LYiO6Cqte8TNUprCfAHoAStsuzD7jwgEqnM6jJOUEdIxQ3w0z3Dzw/0KIE+w==", + "version": "8.5.21", + "resolved": "https://registry.npmjs.org/@luma.gl/engine/-/engine-8.5.21.tgz", + "integrity": "sha512-IG3WQSKXFNUEs8QG7ZjHtGiOtsakUu+BAxtJ6997A6/F06yynZ44tPe5NU70jG9Yfu3kV0LykPZg7hO3vXZDiA==", "dependencies": { "@babel/runtime": "^7.0.0", - "@luma.gl/constants": "8.5.20", - "@luma.gl/gltools": "8.5.20", - "@luma.gl/shadertools": "8.5.20", - "@luma.gl/webgl": "8.5.20", + "@luma.gl/constants": "8.5.21", + "@luma.gl/gltools": "8.5.21", + "@luma.gl/shadertools": "8.5.21", + "@luma.gl/webgl": "8.5.21", "@math.gl/core": "^3.5.0", "@probe.gl/env": "^3.5.0", "@probe.gl/stats": "^3.5.0", @@ -2359,11 +1843,11 @@ } }, "node_modules/@luma.gl/experimental": { - "version": "8.5.20", - "resolved": "https://registry.npmjs.org/@luma.gl/experimental/-/experimental-8.5.20.tgz", - "integrity": "sha512-V1Jp68rYMPtwMdf+50r3NSYsGV3srjwZ+lcK2ew4DshjedDbYwLqTGMWcOyBhY3K3aCl2LH3Fhn0hAY+3NTLGA==", + "version": "8.5.21", + "resolved": "https://registry.npmjs.org/@luma.gl/experimental/-/experimental-8.5.21.tgz", + "integrity": "sha512-uFKPChGofyihOKxtqJy78QCQCDFnuMTK4QHrUX/qiTnvFSO8BgtTUevKvWGN9lBvq+uDD0lSieeF9yBzhQfAzw==", "dependencies": { - "@luma.gl/constants": "8.5.20", + "@luma.gl/constants": "8.5.21", "@math.gl/core": "^3.5.0", "earcut": "^2.0.6" }, @@ -2377,34 +1861,34 @@ } }, "node_modules/@luma.gl/gltools": { - "version": "8.5.20", - "resolved": "https://registry.npmjs.org/@luma.gl/gltools/-/gltools-8.5.20.tgz", - "integrity": "sha512-5pP6ph9FSX5gHiVWQM1DmYRUnriklzKUG9yaqlQsKEqCFsOcKB0EfK3MfBVXIfsOdP/1bJZ9Dlz/zV19soWVhg==", + "version": "8.5.21", + "resolved": "https://registry.npmjs.org/@luma.gl/gltools/-/gltools-8.5.21.tgz", + "integrity": "sha512-6qZ0LaT2Mxa4AJT5F44TFoaziokYiHUwO45vnM/NYUOIu9xevcmS6VtToawytMEACGL6PDeDyVqP3Y80SDzq5g==", "dependencies": { "@babel/runtime": "^7.0.0", - "@luma.gl/constants": "8.5.20", + "@luma.gl/constants": "8.5.21", "@probe.gl/env": "^3.5.0", "@probe.gl/log": "^3.5.0", "@types/offscreencanvas": "^2019.7.0" } }, "node_modules/@luma.gl/shadertools": { - "version": "8.5.20", - "resolved": "https://registry.npmjs.org/@luma.gl/shadertools/-/shadertools-8.5.20.tgz", - "integrity": "sha512-q1lrCZy1ncIFb4mMjsYgISLzNP6eMnhLUY+Oltj/qjAMcPEssCeHN2+XGfP/CVtU+O7sC+5JY2bQGaTs6HQ/Qw==", + "version": "8.5.21", + "resolved": "https://registry.npmjs.org/@luma.gl/shadertools/-/shadertools-8.5.21.tgz", + "integrity": "sha512-WQah7yFDJ8cNCLPYpIm3r0wSlXLvjoA279fcknmATvvkW3/i8PcCJ/nYEBJO3hHEwwMQxD16+YZu/uwGiifLMg==", "dependencies": { "@babel/runtime": "^7.0.0", "@math.gl/core": "^3.5.0" } }, "node_modules/@luma.gl/webgl": { - "version": "8.5.20", - "resolved": "https://registry.npmjs.org/@luma.gl/webgl/-/webgl-8.5.20.tgz", - "integrity": "sha512-p/kt9KztywH4l+09XHoZ4cPFOoE7xlZXIBMT8rxRVgfe1w0lvi7QYh4tOG7gk+iixQ34EyDQacoHCsabdpmqQg==", + "version": "8.5.21", + "resolved": "https://registry.npmjs.org/@luma.gl/webgl/-/webgl-8.5.21.tgz", + "integrity": "sha512-ZVLO4W5UuaOlzZIwmFWhnmZ1gYoU97a+heMqxLrSSmCUAsSu3ZETUex9gOmzdM1WWxcdWaa3M68rvKCNEgwz0Q==", "dependencies": { "@babel/runtime": "^7.0.0", - "@luma.gl/constants": "8.5.20", - "@luma.gl/gltools": "8.5.20", + "@luma.gl/constants": "8.5.21", + "@luma.gl/gltools": "8.5.21", "@probe.gl/env": "^3.5.0", "@probe.gl/stats": "^3.5.0" } @@ -2456,14 +1940,6 @@ "resolved": "https://registry.npmjs.org/@mapbox/point-geometry/-/point-geometry-0.1.0.tgz", "integrity": "sha512-6j56HdLTwWGO0fJPlrZtdU/B13q8Uwmo18Ck2GnGgN9PCFyKTZ3UbXeEdRFh18i9XQ92eH2VdtpJHpBD3aripQ==" }, - "node_modules/@mapbox/tile-cover": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@mapbox/tile-cover/-/tile-cover-3.0.1.tgz", - "integrity": "sha512-R8aoFY/87HWBOL9E2eBqzOY2lpfWYXCcTNgBpIxAv67rqQeD4IfnHD0iPXg/Z1cqXrklegEYZCp/7ZR/RsWqBQ==", - "dependencies": { - "tilebelt": "^1.0.1" - } - }, "node_modules/@mapbox/tiny-sdf": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/@mapbox/tiny-sdf/-/tiny-sdf-2.0.6.tgz", @@ -4134,7 +3610,8 @@ "node_modules/@sinclair/typebox": { "version": "0.27.8", "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", - "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==" + "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", + "dev": true }, "node_modules/@tanstack/query-core": { "version": "5.0.5", @@ -4197,24 +3674,25 @@ } }, "node_modules/@tanstack/react-virtual": { - "version": "3.0.0-beta.54", - "resolved": "https://registry.npmjs.org/@tanstack/react-virtual/-/react-virtual-3.0.0-beta.54.tgz", - "integrity": "sha512-D1mDMf4UPbrtHRZZriCly5bXTBMhylslm4dhcHqTtDJ6brQcgGmk8YD9JdWBGWfGSWPKoh2x1H3e7eh+hgPXtQ==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@tanstack/react-virtual/-/react-virtual-3.0.4.tgz", + "integrity": "sha512-tiqKW/e2MJVCr7/pRUXulpkyxllaOclkHNfhKTo4pmHjJIqnhMfwIjc1Q1R0Un3PI3kQywywu/791c8z9u0qeA==", "dependencies": { - "@tanstack/virtual-core": "3.0.0-beta.54" + "@tanstack/virtual-core": "3.0.0" }, "funding": { "type": "github", "url": "https://github.com/sponsors/tannerlinsley" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0 || ^18.0.0" + "react": "^16.8.0 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0" } }, "node_modules/@tanstack/virtual-core": { - "version": "3.0.0-beta.54", - "resolved": "https://registry.npmjs.org/@tanstack/virtual-core/-/virtual-core-3.0.0-beta.54.tgz", - "integrity": "sha512-jtkwqdP2rY2iCCDVAFuaNBH3fiEi29aTn2RhtIoky8DTTiCdc48plpHHreLwmv1PICJ4AJUUESaq3xa8fZH8+g==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@tanstack/virtual-core/-/virtual-core-3.0.0.tgz", + "integrity": "sha512-SYXOBTjJb05rXa2vl55TTwO40A6wKu0R5i1qQwhJYNDIqaIGF7D0HsLw+pJAyi2OvntlEIVusx3xtbbgSUi6zg==", "funding": { "type": "github", "url": "https://github.com/sponsors/tannerlinsley" @@ -4820,6 +4298,7 @@ "version": "7.20.5", "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz", "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==", + "dev": true, "dependencies": { "@babel/parser": "^7.20.7", "@babel/types": "^7.20.7", @@ -4832,6 +4311,7 @@ "version": "7.6.4", "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz", "integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==", + "dev": true, "dependencies": { "@babel/types": "^7.0.0" } @@ -4840,6 +4320,7 @@ "version": "7.4.1", "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz", "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==", + "dev": true, "dependencies": { "@babel/parser": "^7.1.0", "@babel/types": "^7.0.0" @@ -4849,6 +4330,7 @@ "version": "7.20.1", "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.1.tgz", "integrity": "sha512-MitHFXnhtgwsGZWtT68URpOvLN4EREih1u3QtQiN4VdAxWKRVvGCSvw/Qth0M0Qq3pJpnGOu5JaM/ydK7OGbqg==", + "dev": true, "dependencies": { "@babel/types": "^7.20.7" } @@ -4882,14 +4364,6 @@ "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.10.tgz", "integrity": "sha512-Nmh0K3iWQJzniTuPRcJn5hxXkfB1T1pgB89SBig5PlJQU5yocazeu4jATJlaA0GYFKWMqDdvYemoSnF2pXgLVA==" }, - "node_modules/@types/graceful-fs": { - "version": "4.1.6", - "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.6.tgz", - "integrity": "sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==", - "dependencies": { - "@types/node": "*" - } - }, "node_modules/@types/hammerjs": { "version": "2.0.41", "resolved": "https://registry.npmjs.org/@types/hammerjs/-/hammerjs-2.0.41.tgz", @@ -4904,27 +4378,6 @@ "hoist-non-react-statics": "^3.3.0" } }, - "node_modules/@types/istanbul-lib-coverage": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz", - "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==" - }, - "node_modules/@types/istanbul-lib-report": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", - "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==", - "dependencies": { - "@types/istanbul-lib-coverage": "*" - } - }, - "node_modules/@types/istanbul-reports": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz", - "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==", - "dependencies": { - "@types/istanbul-lib-report": "*" - } - }, "node_modules/@types/json-schema": { "version": "7.0.15", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", @@ -4961,18 +4414,11 @@ "@types/lodash": "*" } }, - "node_modules/@types/mapbox-gl": { - "version": "2.7.12", - "resolved": "https://registry.npmjs.org/@types/mapbox-gl/-/mapbox-gl-2.7.12.tgz", - "integrity": "sha512-aEMMOWlSTn2lp0liLqHsI/vAkV8858mkhn4fFYZELdLO1o6PEKCkkUfQ/GBp603Xfc3xmasLZsoELJBbje+atw==", - "dependencies": { - "@types/geojson": "*" - } - }, "node_modules/@types/node": { "version": "18.17.1", "resolved": "https://registry.npmjs.org/@types/node/-/node-18.17.1.tgz", - "integrity": "sha512-xlR1jahfizdplZYRU59JlUx9uzF1ARa8jbhM11ccpCJya8kvos5jwdm2ZAgxSCwOl0fq21svP18EVwPBXMQudw==" + "integrity": "sha512-xlR1jahfizdplZYRU59JlUx9uzF1ARa8jbhM11ccpCJya8kvos5jwdm2ZAgxSCwOl0fq21svP18EVwPBXMQudw==", + "dev": true }, "node_modules/@types/offscreencanvas": { "version": "2019.7.0", @@ -5052,6 +4498,12 @@ "integrity": "sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==", "dev": true }, + "node_modules/@types/stylis": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/@types/stylis/-/stylis-4.2.0.tgz", + "integrity": "sha512-n4sx2bqL0mW1tvDf/loQ+aMX7GQD3lc3fkCMC55VFNDu/vBOabO+LTIeXKM14xK0ppk5TUGcWRjiSpIlUpghKw==", + "peer": true + }, "node_modules/@types/use-sync-external-store": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/@types/use-sync-external-store/-/use-sync-external-store-0.0.3.tgz", @@ -5063,19 +4515,6 @@ "integrity": "sha512-kNnC1GFBLuhImSnV7w4njQkUiJi0ZXUycu1rUaouPqiKlXkh77JKgdRnTAp1x5eBwcIwbtI+3otwzuIDEuDoxQ==", "dev": true }, - "node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", - "dependencies": { - "@types/yargs-parser": "*" - } - }, - "node_modules/@types/yargs-parser": { - "version": "21.0.0", - "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz", - "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==" - }, "node_modules/@typescript-eslint/eslint-plugin": { "version": "6.21.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.21.0.tgz", @@ -5585,14 +5024,21 @@ } }, "node_modules/@webviz/subsurface-viewer": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@webviz/subsurface-viewer/-/subsurface-viewer-0.3.1.tgz", - "integrity": "sha512-1sfL50xZIn+Jub/Xkv9kJ+d2x4rpOzj2rIIoWlV1AI4SVRhT1jseQUtrM9AOnraB53USYeZZl22T7xp94zmNVA==", - "dependencies": { - "@deck.gl/core": "^8.8.25", - "@emerson-eps/color-tables": "^0.4.61", - "@equinor/eds-core-react": "^0.32.3", - "@equinor/eds-icons": "^0.19.1", + "version": "0.16.3", + "resolved": "https://registry.npmjs.org/@webviz/subsurface-viewer/-/subsurface-viewer-0.16.3.tgz", + "integrity": "sha512-qkZBdD5MEmR0Ag/iweY7eqlTUcYstRoDfzzjypcosf/jJqtJKKpxab/jFADdlqWbnwLpW28OJMLzZ0Sow3Gd6Q==", + "dependencies": { + "@deck.gl/aggregation-layers": "^8.9.33", + "@deck.gl/core": "^8.9.34", + "@deck.gl/extensions": "^8.9.33", + "@deck.gl/geo-layers": "^8.9.33", + "@deck.gl/json": "^8.9.33", + "@deck.gl/layers": "^8.9.33", + "@deck.gl/mesh-layers": "^8.9.33", + "@deck.gl/react": "^8.9.34", + "@emerson-eps/color-tables": "^0.4.71", + "@equinor/eds-core-react": "^0.36.0", + "@equinor/eds-icons": "^0.21.0", "@nebula.gl/layers": "^1.0.4", "@reduxjs/toolkit": "^1.7.2", "@turf/simplify": "^6.5.0", @@ -5602,12 +5048,12 @@ "convert-units": "^2.3.4", "d3": "^7.8.2", "d3-color": "^3.1.0", - "d3-format": "^1.4.5", - "deck.gl": "^8.9.19", + "d3-format": "^3.1.0", "gl-matrix": "^3.4.3", "lodash": "^4.17.21", - "mathjs": "^9.4.2", - "react-redux": "^8.1.1" + "mathjs": "^12.2.1", + "react-redux": "^8.1.1", + "workerpool": "^9.1.0" }, "peerDependencies": { "@mui/material": "^5.11", @@ -5616,6 +5062,14 @@ "react-dom": "^17 || ^18" } }, + "node_modules/@webviz/subsurface-viewer/node_modules/d3-format": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.0.tgz", + "integrity": "sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==", + "engines": { + "node": ">=12" + } + }, "node_modules/@webviz/well-completions-plot": { "version": "0.0.1-alpha.1", "resolved": "https://registry.npmjs.org/@webviz/well-completions-plot/-/well-completions-plot-0.0.1-alpha.1.tgz", @@ -5758,6 +5212,7 @@ "version": "3.1.3", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "dev": true, "dependencies": { "normalize-path": "^3.0.0", "picomatch": "^2.0.4" @@ -6012,119 +5467,6 @@ "proxy-from-env": "^1.1.0" } }, - "node_modules/babel-jest": { - "version": "29.6.2", - "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.6.2.tgz", - "integrity": "sha512-BYCzImLos6J3BH/+HvUCHG1dTf2MzmAB4jaVxHV+29RZLjR29XuYTmsf2sdDwkrb+FczkGo3kOhE7ga6sI0P4A==", - "dependencies": { - "@jest/transform": "^29.6.2", - "@types/babel__core": "^7.1.14", - "babel-plugin-istanbul": "^6.1.1", - "babel-preset-jest": "^29.5.0", - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "slash": "^3.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - }, - "peerDependencies": { - "@babel/core": "^7.8.0" - } - }, - "node_modules/babel-jest/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/babel-jest/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/babel-jest/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/babel-jest/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" - }, - "node_modules/babel-jest/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "engines": { - "node": ">=8" - } - }, - "node_modules/babel-jest/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/babel-plugin-istanbul": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz", - "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.0.0", - "@istanbuljs/load-nyc-config": "^1.0.0", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-instrument": "^5.0.4", - "test-exclude": "^6.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/babel-plugin-jest-hoist": { - "version": "29.5.0", - "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.5.0.tgz", - "integrity": "sha512-zSuuuAlTMT4mzLj2nPnUm6fsE6270vdOfnpbJ+RmruU75UhLFvL0N2NgI7xpeS7NaB6hGqmd5pVpGTDYvi4Q3w==", - "dependencies": { - "@babel/template": "^7.3.3", - "@babel/types": "^7.3.3", - "@types/babel__core": "^7.1.14", - "@types/babel__traverse": "^7.0.6" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, "node_modules/babel-plugin-macros": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz", @@ -6139,63 +5481,11 @@ "npm": ">=6" } }, - "node_modules/babel-plugin-styled-components": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-2.1.4.tgz", - "integrity": "sha512-Xgp9g+A/cG47sUyRwwYxGM4bR/jDRg5N6it/8+HxCnbT5XNKSKDT9xm4oag/osgqjC2It/vH0yXsomOG6k558g==", - "peer": true, - "dependencies": { - "@babel/helper-annotate-as-pure": "^7.22.5", - "@babel/helper-module-imports": "^7.22.5", - "@babel/plugin-syntax-jsx": "^7.22.5", - "lodash": "^4.17.21", - "picomatch": "^2.3.1" - }, - "peerDependencies": { - "styled-components": ">= 2" - } - }, - "node_modules/babel-preset-current-node-syntax": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz", - "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==", - "dependencies": { - "@babel/plugin-syntax-async-generators": "^7.8.4", - "@babel/plugin-syntax-bigint": "^7.8.3", - "@babel/plugin-syntax-class-properties": "^7.8.3", - "@babel/plugin-syntax-import-meta": "^7.8.3", - "@babel/plugin-syntax-json-strings": "^7.8.3", - "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", - "@babel/plugin-syntax-numeric-separator": "^7.8.3", - "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", - "@babel/plugin-syntax-optional-chaining": "^7.8.3", - "@babel/plugin-syntax-top-level-await": "^7.8.3" - }, - "peerDependencies": { - "@babel/core": "^7.0.0" - } - }, - "node_modules/babel-preset-jest": { - "version": "29.5.0", - "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.5.0.tgz", - "integrity": "sha512-JOMloxOqdiBSxMAzjRaH023/vvcaSaec49zvg+2LmNsktC7ei39LTJGw02J+9uUtTZUq6xbLyJ4dxe9sSmIuAg==", - "dependencies": { - "babel-plugin-jest-hoist": "^29.5.0", - "babel-preset-current-node-syntax": "^1.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0" - } - }, "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true }, "node_modules/binary-extensions": { "version": "2.2.0", @@ -6238,6 +5528,7 @@ "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -6247,6 +5538,7 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dev": true, "dependencies": { "fill-range": "^7.0.1" }, @@ -6258,6 +5550,7 @@ "version": "4.22.2", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.2.tgz", "integrity": "sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==", + "dev": true, "funding": [ { "type": "opencollective", @@ -6285,14 +5578,6 @@ "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" } }, - "node_modules/bser": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz", - "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==", - "dependencies": { - "node-int64": "^0.4.0" - } - }, "node_modules/buf-compare": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/buf-compare/-/buf-compare-1.0.1.tgz", @@ -6336,14 +5621,6 @@ "node": ">=6" } }, - "node_modules/camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "engines": { - "node": ">=6" - } - }, "node_modules/camelcase-css": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz", @@ -6366,6 +5643,7 @@ "version": "1.0.30001572", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001572.tgz", "integrity": "sha512-1Pbh5FLmn5y4+QhNyJE9j3/7dK44dGB83/ZMjv/qJk86TvDbjk0LosiZo0i0WB0Vx607qMX9jYrn1VLHCkN4rw==", + "dev": true, "funding": [ { "type": "opencollective", @@ -6390,14 +5668,6 @@ "element-size": "^1.1.1" } }, - "node_modules/cartocolor": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/cartocolor/-/cartocolor-4.0.2.tgz", - "integrity": "sha512-+Gh9mb6lFxsDOLQlBLPxAHCnWXlg2W8q3AcVwqRcy95TdBbcOU89Wrb6h2Hd/6Ww1Kc1pzXmUdpnWD+xeCG0dg==", - "dependencies": { - "colorbrewer": "1.0.0" - } - }, "node_modules/chai": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/chai/-/chai-4.4.0.tgz", @@ -6488,20 +5758,6 @@ "node": ">= 6" } }, - "node_modules/ci-info": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz", - "integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/sibiraj-s" - } - ], - "engines": { - "node": ">=8" - } - }, "node_modules/clamp": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/clamp/-/clamp-1.0.1.tgz", @@ -6595,11 +5851,6 @@ "mumath": "^3.3.4" } }, - "node_modules/colorbrewer": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/colorbrewer/-/colorbrewer-1.0.0.tgz", - "integrity": "sha512-NZuIOVdErK/C6jDH3jWT/roxWJbJAinMiqEpbuWniKvQAoWdg6lGra3pPrSHvaIf8PlX8wLs/RAC6nULFJbgmg==" - }, "node_modules/combined-stream": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", @@ -6612,12 +5863,9 @@ } }, "node_modules/commander": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", - "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", - "engines": { - "node": ">= 10" - } + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" }, "node_modules/complex.js": { "version": "2.1.1", @@ -6632,14 +5880,15 @@ } }, "node_modules/compute-scroll-into-view": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/compute-scroll-into-view/-/compute-scroll-into-view-2.0.4.tgz", - "integrity": "sha512-y/ZA3BGnxoM/QHHQ2Uy49CLtnWPbt4tTPpEEZiEmmiWBFKjej7nEyH8Ryz54jH0MLXflUYA3Er2zUxPSJu5R+g==" + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/compute-scroll-into-view/-/compute-scroll-into-view-3.1.0.tgz", + "integrity": "sha512-rj8l8pD4bJ1nx+dAkMhV1xB5RuZEyVysfxJqB1pRchh1KVvwOv9b7CGB8ZfjTImVv2oF+sYMUkMZq6Na5Ftmbg==" }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true }, "node_modules/concat-stream": { "version": "1.6.2", @@ -6989,27 +6238,24 @@ } }, "node_modules/d3-dsv": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-3.0.1.tgz", - "integrity": "sha512-UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-1.2.0.tgz", + "integrity": "sha512-9yVlqvZcSOMhCYzniHE7EVUws7Fa1zgw+/EAV2BxJoG3ME19V6BQFBwI855XQDsxyOuG7NibqRMTtiF/Qup46g==", "dependencies": { - "commander": "7", - "iconv-lite": "0.6", + "commander": "2", + "iconv-lite": "0.4", "rw": "1" }, "bin": { - "csv2json": "bin/dsv2json.js", - "csv2tsv": "bin/dsv2dsv.js", - "dsv2dsv": "bin/dsv2dsv.js", - "dsv2json": "bin/dsv2json.js", - "json2csv": "bin/json2dsv.js", - "json2dsv": "bin/json2dsv.js", - "json2tsv": "bin/json2dsv.js", - "tsv2csv": "bin/dsv2dsv.js", - "tsv2json": "bin/dsv2json.js" - }, - "engines": { - "node": ">=12" + "csv2json": "bin/dsv2json", + "csv2tsv": "bin/dsv2dsv", + "dsv2dsv": "bin/dsv2dsv", + "dsv2json": "bin/dsv2json", + "json2csv": "bin/json2dsv", + "json2dsv": "bin/json2dsv", + "json2tsv": "bin/json2dsv", + "tsv2csv": "bin/dsv2dsv", + "tsv2json": "bin/dsv2json" } }, "node_modules/d3-ease": { @@ -7076,12 +6322,6 @@ "geostitch": "bin/geostitch" } }, - "node_modules/d3-geo-projection/node_modules/commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", - "peer": true - }, "node_modules/d3-geo-projection/node_modules/d3-array": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-1.2.4.tgz", @@ -7267,6 +6507,38 @@ "node": ">=12" } }, + "node_modules/d3/node_modules/commander": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", + "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", + "engines": { + "node": ">= 10" + } + }, + "node_modules/d3/node_modules/d3-dsv": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-3.0.1.tgz", + "integrity": "sha512-UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q==", + "dependencies": { + "commander": "7", + "iconv-lite": "0.6", + "rw": "1" + }, + "bin": { + "csv2json": "bin/dsv2json.js", + "csv2tsv": "bin/dsv2dsv.js", + "dsv2dsv": "bin/dsv2dsv.js", + "dsv2json": "bin/dsv2json.js", + "json2csv": "bin/json2dsv.js", + "json2dsv": "bin/json2dsv.js", + "json2tsv": "bin/json2dsv.js", + "tsv2csv": "bin/dsv2dsv.js", + "tsv2json": "bin/dsv2json.js" + }, + "engines": { + "node": ">=12" + } + }, "node_modules/d3/node_modules/d3-format": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.0.tgz", @@ -7286,10 +6558,22 @@ "node": ">=12" } }, + "node_modules/d3/node_modules/iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dev": true, "dependencies": { "ms": "2.1.2" }, @@ -7307,25 +6591,6 @@ "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz", "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==" }, - "node_modules/deck.gl": { - "version": "8.9.22", - "resolved": "https://registry.npmjs.org/deck.gl/-/deck.gl-8.9.22.tgz", - "integrity": "sha512-CkJ/Wtyquh4wpG7Os6n5j4D9fm0NFROa6Go0hEToVU8kbfQoj6drD76ixBnsx47dOtcHNQ11AVaPaaAeHmnTjg==", - "dependencies": { - "@babel/runtime": "^7.0.0", - "@deck.gl/aggregation-layers": "8.9.22", - "@deck.gl/carto": "8.9.22", - "@deck.gl/core": "8.9.22", - "@deck.gl/extensions": "8.9.22", - "@deck.gl/geo-layers": "8.9.22", - "@deck.gl/google-maps": "8.9.22", - "@deck.gl/json": "8.9.22", - "@deck.gl/layers": "8.9.22", - "@deck.gl/mapbox": "8.9.22", - "@deck.gl/mesh-layers": "8.9.22", - "@deck.gl/react": "8.9.22" - } - }, "node_modules/deep-eql": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz", @@ -7380,11 +6645,11 @@ } }, "node_modules/delaunator": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/delaunator/-/delaunator-5.0.0.tgz", - "integrity": "sha512-AyLvtyJdbv/U1GkiS6gUUzclRoAY4Gs75qkMygJJhU75LW4DNuSF2RMzpxs9jw9Oz1BobHjTdkG3zdP55VxAqw==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/delaunator/-/delaunator-5.0.1.tgz", + "integrity": "sha512-8nvh+XBe96aCESrGOqMp/84b13H9cdKbG5P2ejQCh4d4sK9RL4371qou9drQjMhvnPmhWl5hnmqbEE0fXr9Xnw==", "dependencies": { - "robust-predicates": "^3.0.0" + "robust-predicates": "^3.0.2" } }, "node_modules/delayed-stream": { @@ -7578,25 +6843,20 @@ "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==" }, "node_modules/downshift": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/downshift/-/downshift-8.1.0.tgz", - "integrity": "sha512-e9EBBLZvB2G73qT272x3hExttGCH1q1usbjirm+1aMcFXuzSWhgBdbnAHPlFI2rEq61cU/kDrEIMrY+ozMhvmg==", + "version": "8.3.1", + "resolved": "https://registry.npmjs.org/downshift/-/downshift-8.3.1.tgz", + "integrity": "sha512-djPzjGfTSEjOsfmlur4onCV3Mtd6oGI+eOQIBNwoS7oEYTjPrxk6n+sJLmndT/KKwHvUyBSh3AFb64eHIFifTQ==", "dependencies": { - "@babel/runtime": "^7.14.8", - "compute-scroll-into-view": "^2.0.4", - "prop-types": "^15.7.2", - "react-is": "^17.0.2", - "tslib": "^2.3.0" + "@babel/runtime": "^7.22.15", + "compute-scroll-into-view": "^3.0.3", + "prop-types": "^15.8.1", + "react-is": "^18.2.0", + "tslib": "^2.6.2" }, "peerDependencies": { "react": ">=16.12.0" } }, - "node_modules/downshift/node_modules/react-is": { - "version": "17.0.2", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", - "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==" - }, "node_modules/draco3d": { "version": "1.5.5", "resolved": "https://registry.npmjs.org/draco3d/-/draco3d-1.5.5.tgz", @@ -7653,7 +6913,8 @@ "node_modules/electron-to-chromium": { "version": "1.4.617", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.617.tgz", - "integrity": "sha512-sYNE3QxcDS4ANW1k4S/wWYMXjCVcFSOX3Bg8jpuMFaXt/x8JCmp0R1Xe1ZXDX4WXnSRBf+GJ/3eGWicUuQq5cg==" + "integrity": "sha512-sYNE3QxcDS4ANW1k4S/wWYMXjCVcFSOX3Bg8jpuMFaXt/x8JCmp0R1Xe1ZXDX4WXnSRBf+GJ/3eGWicUuQq5cg==", + "dev": true }, "node_modules/element-size": { "version": "1.1.1", @@ -7889,6 +7150,7 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "dev": true, "engines": { "node": ">=6" } @@ -8442,6 +7704,7 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "peer": true, "bin": { "esparse": "bin/esparse.js", "esvalidate": "bin/esvalidate.js" @@ -8677,7 +7940,8 @@ "node_modules/fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true }, "node_modules/fast-levenshtein": { "version": "2.0.6", @@ -8685,17 +7949,17 @@ "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==" }, "node_modules/fast-xml-parser": { - "version": "4.2.7", - "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.2.7.tgz", - "integrity": "sha512-J8r6BriSLO1uj2miOk1NW0YVm8AGOOu3Si2HQp/cSmo6EA4m3fcwu2WKjJ4RK9wMLBtg69y1kS8baDiQBR41Ig==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.3.4.tgz", + "integrity": "sha512-utnwm92SyozgA3hhH2I8qldf2lBqm6qHOICawRNRFu1qMe3+oqr+GcXjGqTmXTMGE5T4eC03kr/rlh5C1IRdZA==", "funding": [ - { - "type": "paypal", - "url": "https://paypal.me/naturalintelligence" - }, { "type": "github", "url": "https://github.com/sponsors/NaturalIntelligence" + }, + { + "type": "paypal", + "url": "https://paypal.me/naturalintelligence" } ], "dependencies": { @@ -8709,17 +7973,9 @@ "version": "1.15.0", "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz", "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==", - "dev": true, - "dependencies": { - "reusify": "^1.0.4" - } - }, - "node_modules/fb-watchman": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz", - "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==", + "dev": true, "dependencies": { - "bser": "2.1.1" + "reusify": "^1.0.4" } }, "node_modules/figures": { @@ -8766,6 +8022,7 @@ "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, "dependencies": { "to-regex-range": "^5.0.1" }, @@ -8898,15 +8155,15 @@ } }, "node_modules/fraction.js": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz", - "integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.4.tgz", + "integrity": "sha512-pwiTgt0Q7t+GHZA4yaLjObx4vXmmdcS0iSJ19o8d/goUGgItX9UZWKWNnLHehxviD8wU2IWRsnR8cD5+yOJP2Q==", "engines": { "node": "*" }, "funding": { "type": "patreon", - "url": "https://www.patreon.com/infusion" + "url": "https://github.com/sponsors/rawify" } }, "node_modules/from2": { @@ -8935,12 +8192,14 @@ "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "dev": true }, "node_modules/fsevents": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "dev": true, "hasInstallScript": true, "optional": true, "os": [ @@ -8986,6 +8245,7 @@ "version": "1.0.0-beta.2", "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", + "dev": true, "engines": { "node": ">=6.9.0" } @@ -9055,14 +8315,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/get-package-type": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", - "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==", - "engines": { - "node": ">=8.0.0" - } - }, "node_modules/get-stream": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", @@ -9228,6 +8480,7 @@ "version": "11.12.0", "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", + "dev": true, "engines": { "node": ">=4" } @@ -9676,11 +8929,11 @@ } }, "node_modules/iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "dependencies": { - "safer-buffer": ">= 2.1.2 < 3.0.0" + "safer-buffer": ">= 2.1.2 < 3" }, "engines": { "node": ">=0.10.0" @@ -9759,6 +9012,7 @@ "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true, "engines": { "node": ">=0.8.19" } @@ -9791,6 +9045,7 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "dev": true, "dependencies": { "once": "^1.3.0", "wrappy": "1" @@ -10047,6 +9302,7 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, "engines": { "node": ">=0.12.0" } @@ -10235,21 +9491,7 @@ "version": "3.2.2", "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz", "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==", - "engines": { - "node": ">=8" - } - }, - "node_modules/istanbul-lib-instrument": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", - "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==", - "dependencies": { - "@babel/core": "^7.12.3", - "@babel/parser": "^7.14.7", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-coverage": "^3.2.0", - "semver": "^6.3.0" - }, + "dev": true, "engines": { "node": ">=8" } @@ -10348,154 +9590,6 @@ "resolved": "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz", "integrity": "sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw==" }, - "node_modules/jest-haste-map": { - "version": "29.6.2", - "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.2.tgz", - "integrity": "sha512-+51XleTDAAysvU8rT6AnS1ZJ+WHVNqhj1k6nTvN2PYP+HjU3kqlaKQ1Lnw3NYW3bm2r8vq82X0Z1nDDHZMzHVA==", - "dependencies": { - "@jest/types": "^29.6.1", - "@types/graceful-fs": "^4.1.3", - "@types/node": "*", - "anymatch": "^3.0.3", - "fb-watchman": "^2.0.0", - "graceful-fs": "^4.2.9", - "jest-regex-util": "^29.4.3", - "jest-util": "^29.6.2", - "jest-worker": "^29.6.2", - "micromatch": "^4.0.4", - "walker": "^1.0.8" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - }, - "optionalDependencies": { - "fsevents": "^2.3.2" - } - }, - "node_modules/jest-regex-util": { - "version": "29.4.3", - "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.4.3.tgz", - "integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==", - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-util": { - "version": "29.6.2", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz", - "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==", - "dependencies": { - "@jest/types": "^29.6.1", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-util/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/jest-util/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/jest-util/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/jest-util/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" - }, - "node_modules/jest-util/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "engines": { - "node": ">=8" - } - }, - "node_modules/jest-util/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/jest-worker": { - "version": "29.6.2", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.2.tgz", - "integrity": "sha512-l3ccBOabTdkng8I/ORCkADz4eSMKejTYv1vB/Z83UiubqhC1oQ5Li6dWCyqOIvSifGjUBxuvxvlm6KGK2DtuAQ==", - "dependencies": { - "@types/node": "*", - "jest-util": "^29.6.2", - "merge-stream": "^2.0.0", - "supports-color": "^8.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-worker/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "engines": { - "node": ">=8" - } - }, - "node_modules/jest-worker/node_modules/supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/supports-color?sponsor=1" - } - }, "node_modules/jiti": { "version": "1.19.1", "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.19.1.tgz", @@ -10534,6 +9628,7 @@ "version": "2.5.2", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", + "dev": true, "bin": { "jsesc": "bin/jsesc" }, @@ -10561,6 +9656,7 @@ "version": "2.2.3", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", + "dev": true, "bin": { "json5": "lib/cli.js" }, @@ -10618,9 +9714,9 @@ "integrity": "sha512-LY3nrmfXl+wZZdPxgJ3ZmLvG+wkOZZP3/dr4RbQj1Pk3Qwz44esOOSFFVQJcNWpXAtiNIC66WgXufX/SYgYz6A==" }, "node_modules/lerc": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/lerc/-/lerc-4.0.1.tgz", - "integrity": "sha512-b351eOjY3DKm1H2hDVhXswsd2RCK6bgREBK6Z639ctClOuYXTi9a44l8yO3zm1pYM2o4WrriloTAKgyrb/0EyA==" + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/lerc/-/lerc-4.0.4.tgz", + "integrity": "sha512-nHZH+ffiGPkgKUQtiZrljGUGV2GddvPcVTV5E345ZFncbKz+/rBIjDPrSxkiqW0EAtg1Jw7qAgRdaCwV+95Fow==" }, "node_modules/levn": { "version": "0.4.1", @@ -10904,6 +10000,7 @@ "version": "5.1.1", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "dev": true, "dependencies": { "yallist": "^3.0.2" } @@ -10979,14 +10076,6 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "dev": true }, - "node_modules/makeerror": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz", - "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==", - "dependencies": { - "tmpl": "1.0.5" - } - }, "node_modules/map-limit": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/map-limit/-/map-limit-0.0.1.tgz", @@ -11068,31 +10157,32 @@ } }, "node_modules/mathjs": { - "version": "9.5.2", - "resolved": "https://registry.npmjs.org/mathjs/-/mathjs-9.5.2.tgz", - "integrity": "sha512-c0erTq0GP503/Ch2OtDOAn50GIOsuxTMjmE00NI/vKJFSWrDaQHRjx6ai+16xYv70yBSnnpUgHZGNf9FR9IwmA==", + "version": "12.3.2", + "resolved": "https://registry.npmjs.org/mathjs/-/mathjs-12.3.2.tgz", + "integrity": "sha512-o+HwBVD71MHdYpdScDd6CEcdd6CJOF2eXQJE0kNuIkfTjffPyqoeYdYkzVqimTUr1YgIQkNbL8MakHCZ2Ml7mg==", "dependencies": { - "@babel/runtime": "^7.15.4", - "complex.js": "^2.0.15", - "decimal.js": "^10.3.1", + "@babel/runtime": "^7.23.9", + "complex.js": "^2.1.1", + "decimal.js": "^10.4.3", "escape-latex": "^1.2.0", - "fraction.js": "^4.1.1", + "fraction.js": "4.3.4", "javascript-natural-sort": "^0.7.1", "seedrandom": "^3.0.5", "tiny-emitter": "^2.1.0", - "typed-function": "^2.0.0" + "typed-function": "^4.1.1" }, "bin": { "mathjs": "bin/cli.js" }, "engines": { - "node": ">= 12" + "node": ">= 18" } }, "node_modules/merge-stream": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==" + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", + "dev": true }, "node_modules/merge2": { "version": "1.4.1", @@ -11107,6 +10197,7 @@ "version": "4.0.5", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "dev": true, "dependencies": { "braces": "^3.0.2", "picomatch": "^2.3.1" @@ -11158,6 +10249,7 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, "dependencies": { "brace-expansion": "^1.1.7" }, @@ -11207,25 +10299,6 @@ "ufo": "^1.3.0" } }, - "node_modules/moment": { - "version": "2.29.4", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz", - "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==", - "engines": { - "node": "*" - } - }, - "node_modules/moment-timezone": { - "version": "0.5.43", - "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.43.tgz", - "integrity": "sha512-72j3aNyuIsDxdF1i7CEgV2FfxM1r6aaqJyLB2vwb33mXYyoyLly+F1zbWqhA3/bVIoJ4szlUoMbUnVdid32NUQ==", - "dependencies": { - "moment": "^2.29.4" - }, - "engines": { - "node": "*" - } - }, "node_modules/mouse-change": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/mouse-change/-/mouse-change-1.4.0.tgz", @@ -11294,7 +10367,6 @@ "version": "3.3.7", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", - "dev": true, "funding": [ { "type": "github", @@ -11346,18 +10418,6 @@ "ms": "^2.1.1" } }, - "node_modules/needle/node_modules/iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "peer": true, - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/neo-async": { "version": "2.6.2", "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", @@ -11370,20 +10430,17 @@ "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==", "peer": true }, - "node_modules/node-int64": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", - "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==" - }, "node_modules/node-releases": { "version": "2.0.14", "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz", - "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==" + "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==", + "dev": true }, "node_modules/normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -11724,14 +10781,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "engines": { - "node": ">=6" - } - }, "node_modules/pako": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", @@ -11796,6 +10845,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, "engines": { "node": ">=8" } @@ -11804,6 +10854,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -11903,6 +10954,7 @@ "version": "2.3.1", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, "engines": { "node": ">=8.6" }, @@ -11923,6 +10975,7 @@ "version": "4.0.6", "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz", "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==", + "dev": true, "engines": { "node": ">= 6" } @@ -12446,17 +11499,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/quadbin": { - "version": "0.1.9", - "resolved": "https://registry.npmjs.org/quadbin/-/quadbin-0.1.9.tgz", - "integrity": "sha512-5V6m6+cL/6+uBl3hYL+CWF06rRvlHkIepYKGQjTLYaHhu9InPppql0+0ROiCaOQdz8gPNlgge3glk5Qg1mWOYw==", - "dependencies": { - "@mapbox/tile-cover": "3.0.1" - }, - "engines": { - "node": ">=14" - } - }, "node_modules/queue-microtask": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", @@ -13115,6 +12157,7 @@ "version": "6.3.1", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, "bin": { "semver": "bin/semver.js" } @@ -13244,6 +12287,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true, "engines": { "node": ">=8" } @@ -13260,7 +12304,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -13561,24 +12604,23 @@ "peer": true }, "node_modules/styled-components": { - "version": "5.3.11", - "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-5.3.11.tgz", - "integrity": "sha512-uuzIIfnVkagcVHv9nE0VPlHPSCmXIUGKfJ42LNjxCCTDTL5sgnJ8Z7GZBq0EnLYGln77tPpEpExt2+qa+cZqSw==", + "version": "6.1.8", + "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-6.1.8.tgz", + "integrity": "sha512-PQ6Dn+QxlWyEGCKDS71NGsXoVLKfE1c3vApkvDYS5KAK+V8fNWGhbSUEo9Gg2iaID2tjLXegEW3bZDUGpofRWw==", "peer": true, "dependencies": { - "@babel/helper-module-imports": "^7.0.0", - "@babel/traverse": "^7.4.5", - "@emotion/is-prop-valid": "^1.1.0", - "@emotion/stylis": "^0.8.4", - "@emotion/unitless": "^0.7.4", - "babel-plugin-styled-components": ">= 1.12.0", - "css-to-react-native": "^3.0.0", - "hoist-non-react-statics": "^3.0.0", - "shallowequal": "^1.1.0", - "supports-color": "^5.5.0" + "@emotion/is-prop-valid": "1.2.1", + "@emotion/unitless": "0.8.0", + "@types/stylis": "4.2.0", + "css-to-react-native": "3.2.0", + "csstype": "3.1.2", + "postcss": "8.4.31", + "shallowequal": "1.1.0", + "stylis": "4.3.1", + "tslib": "2.5.0" }, "engines": { - "node": ">=10" + "node": ">= 16" }, "funding": { "type": "opencollective", @@ -13586,14 +12628,53 @@ }, "peerDependencies": { "react": ">= 16.8.0", - "react-dom": ">= 16.8.0", - "react-is": ">= 16.8.0" + "react-dom": ">= 16.8.0" } }, "node_modules/styled-components/node_modules/@emotion/unitless": { - "version": "0.7.5", - "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz", - "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==", + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.0.tgz", + "integrity": "sha512-VINS5vEYAscRl2ZUDiT3uMPlrFQupiKgHz5AA4bCH1miKBg4qtwkim1qPmJj/4WG6TreYMY111rEFsjupcOKHw==", + "peer": true + }, + "node_modules/styled-components/node_modules/postcss": { + "version": "8.4.31", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", + "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/postcss" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "peer": true, + "dependencies": { + "nanoid": "^3.3.6", + "picocolors": "^1.0.0", + "source-map-js": "^1.0.2" + }, + "engines": { + "node": "^10 || ^12 || >=14" + } + }, + "node_modules/styled-components/node_modules/stylis": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.3.1.tgz", + "integrity": "sha512-EQepAV+wMsIaGVGX1RECzgrcqRRU/0sYOHkeLsZ3fzHaHXZy4DaOOX0vOlGQdlsjkh3mFHAIlVimpwAs4dslyQ==", + "peer": true + }, + "node_modules/styled-components/node_modules/tslib": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz", + "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==", "peer": true }, "node_modules/stylis": { @@ -13790,6 +12871,7 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", + "dev": true, "dependencies": { "@istanbuljs/schema": "^0.1.2", "glob": "^7.1.4", @@ -13803,6 +12885,7 @@ "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "dev": true, "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -13875,12 +12958,6 @@ "xtend": "~4.0.1" } }, - "node_modules/tilebelt": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/tilebelt/-/tilebelt-1.0.1.tgz", - "integrity": "sha512-cxHzpa5JgsugY9NUVRH43gPaGJw/29LecAn4X7UGOP64+kB8pU4VQ3bIhSyfb5Mk4jDxwl3yk330L/EIhbJ5aw==", - "deprecated": "This module is now under the @mapbox namespace: install @mapbox/tilebelt instead" - }, "node_modules/tiny-emitter": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz", @@ -13927,11 +13004,6 @@ "node": ">=14.0.0" } }, - "node_modules/tmpl": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", - "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==" - }, "node_modules/to-fast-properties": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", @@ -13959,6 +13031,7 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, "dependencies": { "is-number": "^7.0.0" }, @@ -13980,12 +13053,6 @@ "topoquantize": "bin/topoquantize" } }, - "node_modules/topojson-client/node_modules/commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", - "peer": true - }, "node_modules/ts-api-utils": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.2.0.tgz", @@ -14259,11 +13326,11 @@ } }, "node_modules/typed-function": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/typed-function/-/typed-function-2.1.0.tgz", - "integrity": "sha512-bctQIOqx2iVbWGDGPWwIm18QScpu2XRmkC19D8rQGFsjKSgteq/o1hTZvIG/wuDq8fanpBDrLkLq+aEN/6y5XQ==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/typed-function/-/typed-function-4.1.1.tgz", + "integrity": "sha512-Pq1DVubcvibmm8bYcMowjVnnMwPVMeh0DIdA8ad8NZY2sJgapANJmiigSUwlt+EgXxpfIv8MWrQXTIzkfYZLYQ==", "engines": { - "node": ">= 10" + "node": ">= 14" } }, "node_modules/typedarray": { @@ -14347,6 +13414,7 @@ "version": "1.0.13", "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz", "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==", + "dev": true, "funding": [ { "type": "opencollective", @@ -14916,14 +13984,6 @@ "pbf": "^3.2.1" } }, - "node_modules/walker": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz", - "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==", - "dependencies": { - "makeerror": "1.0.12" - } - }, "node_modules/watskeburt": { "version": "0.11.6", "resolved": "https://registry.npmjs.org/watskeburt/-/watskeburt-0.11.6.tgz", @@ -15032,6 +14092,11 @@ "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==", "dev": true }, + "node_modules/workerpool": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-9.1.0.tgz", + "integrity": "sha512-+wRWfm9yyJghvXLSHMQj3WXDxHbibHAQmRrWbqKBfy0RjftZNeQaW+Std5bSYc83ydkrxoPTPOWVlXUR9RWJdQ==" + }, "node_modules/world-calendars": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/world-calendars/-/world-calendars-1.0.3.tgz", @@ -15173,23 +14238,6 @@ "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" }, - "node_modules/write-file-atomic": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", - "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==", - "dependencies": { - "imurmurhash": "^0.1.4", - "signal-exit": "^3.0.7" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/write-file-atomic/node_modules/signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" - }, "node_modules/xtend": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", @@ -15202,7 +14250,8 @@ "node_modules/yallist": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "dev": true }, "node_modules/yaml": { "version": "1.10.2", diff --git a/frontend/package.json b/frontend/package.json index 1be7af583..bf26cfd99 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -25,7 +25,7 @@ "@mui/icons-material": "^5.14.9", "@tanstack/react-query": "^5.0.5", "@tanstack/react-query-devtools": "^5.4.2", - "@webviz/subsurface-viewer": "^0.3.1", + "@webviz/subsurface-viewer": "^0.16.3", "@webviz/well-completions-plot": "^0.0.1-alpha.1", "animate.css": "^4.1.1", "axios": "^1.6.5", @@ -70,4 +70,4 @@ "vite-plugin-checker": "^0.6.0", "vitest": "^1.1.3" } -} \ No newline at end of file +} diff --git a/frontend/src/modules/Grid3D/view.tsx b/frontend/src/modules/Grid3D/view.tsx index 30480b63b..ec9a973ac 100644 --- a/frontend/src/modules/Grid3D/view.tsx +++ b/frontend/src/modules/Grid3D/view.tsx @@ -125,7 +125,6 @@ export function View({ moduleContext, workbenchSettings, workbenchSession }: Mod bounds={[bounds[0], bounds[1], bounds[3], bounds[4]]} colorTables={colorTables} layers={newLayers} - toolbar={{ visible: true }} views={{ layout: [1, 1], showLabel: false, diff --git a/frontend/src/modules/SubsurfaceMap/view.tsx b/frontend/src/modules/SubsurfaceMap/view.tsx index 7b9578ef5..25d3130e2 100644 --- a/frontend/src/modules/SubsurfaceMap/view.tsx +++ b/frontend/src/modules/SubsurfaceMap/view.tsx @@ -211,7 +211,6 @@ export function View({ moduleContext, workbenchSettings, workbenchServices }: Mo bounds={viewportBounds} layers={newLayers} colorTables={colorTables} - toolbar={{ visible: true }} views={{ layout: [1, 1], showLabel: false, @@ -244,7 +243,6 @@ export function View({ moduleContext, workbenchSettings, workbenchServices }: Mo bounds={viewportBounds} layers={newLayers} colorTables={colorTables} - toolbar={{ visible: true }} views={{ layout: [1, 1], showLabel: false, From 2ea1c9a006c86f66f8e8c0b3918d7b6bfa7060e8 Mon Sep 17 00:00:00 2001 From: Hans Kallekleiv <16436291+HansKallekleiv@users.noreply.github.com> Date: Tue, 20 Feb 2024 19:45:09 +0100 Subject: [PATCH 05/14] Add wells --- .../components/smdaWellBoreSelect.tsx | 67 +++++++++++++++++++ .../MapMatrix/hooks/useSurfaceReducer.ts | 9 +++ .../MapMatrix/reducers/surfaceReducer.ts | 15 +++-- frontend/src/modules/MapMatrix/settings.tsx | 20 +++++- frontend/src/modules/MapMatrix/state.ts | 8 ++- frontend/src/modules/MapMatrix/types.ts | 4 ++ frontend/src/modules/MapMatrix/view.tsx | 50 +++++++++----- .../_shared/Surface/subsurfaceMapUtils.ts | 13 ++++ .../_shared/WellBore/wellBoreAddress.ts | 21 ++++++ 9 files changed, 181 insertions(+), 26 deletions(-) create mode 100644 frontend/src/modules/MapMatrix/components/smdaWellBoreSelect.tsx create mode 100644 frontend/src/modules/_shared/WellBore/wellBoreAddress.ts diff --git a/frontend/src/modules/MapMatrix/components/smdaWellBoreSelect.tsx b/frontend/src/modules/MapMatrix/components/smdaWellBoreSelect.tsx new file mode 100644 index 000000000..e38c22f56 --- /dev/null +++ b/frontend/src/modules/MapMatrix/components/smdaWellBoreSelect.tsx @@ -0,0 +1,67 @@ +import React from "react"; + +import { EnsembleIdent } from "@framework/EnsembleIdent"; +import { Button } from "@lib/components/Button"; +import { CircularProgress } from "@lib/components/CircularProgress"; +import { Label } from "@lib/components/Label"; +import { QueryStateWrapper } from "@lib/components/QueryStateWrapper"; +import { Select, SelectOption } from "@lib/components/Select"; +import { useWellHeadersQuery } from "@modules/_shared/WellBore"; +import { SmdaWellBoreAddress, WellBoreAddressFactory } from "@modules/_shared/WellBore/wellBoreAddress"; + +export type SmdaWellBoreSelectProps = { + ensembleIdent?: EnsembleIdent | null; + selectedWellAddresses: SmdaWellBoreAddress[]; + onWellBoreChange: (selectedWellUuids: SmdaWellBoreAddress[]) => void; +}; +export function SmdaWellBoreSelect(props: SmdaWellBoreSelectProps): JSX.Element { + const wellHeadersQuery = useWellHeadersQuery(props.ensembleIdent?.getCaseUuid()); + let wellHeaderOptions: SelectOption[] = []; + + if (wellHeadersQuery.data) { + wellHeaderOptions = wellHeadersQuery.data.map((header) => ({ + label: header.unique_wellbore_identifier, + value: header.wellbore_uuid, + })); + } + const wellBoreAddressFactory = new WellBoreAddressFactory(); + + function handleWellsChange(selectedWellUuids: string[]) { + const newSelectedWellBoreAddresses = selectedWellUuids.map((wellUuid) => { + return wellBoreAddressFactory.createSmdaAddress(wellUuid); + }); + props.onWellBoreChange(newSelectedWellBoreAddresses); + } + + return ( + } + > +