Skip to content

Commit

Permalink
finish details
Browse files Browse the repository at this point in the history
  • Loading branch information
@jolevesq
jolevesq committed Jan 17, 2025
1 parent 91e92e6 commit 80f184e
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 30 deletions.
4 changes: 4 additions & 0 deletions packages/geoview-core/public/configs/performance.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@
{
"geoviewLayerType": "geoCore",
"geoviewLayerId": "e2424b6c-db0c-4996-9bc0-2ca2e6714d71"
},
{
"geoviewLayerType": "geoCore",
"geoviewLayerId": "c5c249c4-dea6-40a6-8fae-188a42030908"
}
]
},
Expand Down
4 changes: 2 additions & 2 deletions packages/geoview-core/src/core/components/details/feature-info.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ const FeatureHeader = memo(function FeatureHeader({ iconSrc, name, hasGeometry,
<Tooltip title={t('details.keepFeatureSelected')} placement="top" enterDelay={1000}>
<Checkbox disabled={!hasGeometry} onChange={onCheckChange} checked={checked} sx={sxClasses.selectFeatureCheckbox} />
</Tooltip>
<IconButton color="primary" onClick={onZoomIn} className="buttonOutline">
<IconButton color="primary" disabled={!hasGeometry} onClick={onZoomIn} className="buttonOutline">
<Tooltip title={t('details.zoomTo')} placement="top" enterDelay={1000}>
<ZoomInSearchIcon />
</Tooltip>
Expand Down Expand Up @@ -186,7 +186,7 @@ export function FeatureInfo({ feature }: FeatureInfoProps): JSX.Element | null {
<FeatureHeader
iconSrc={featureData.iconSrc}
name={featureData.name}
hasGeometry={!!featureData.geometry}
hasGeometry={!!featureData.geometry && !!featureData.extent}
checked={checked}
onCheckChange={handleFeatureSelectedChange}
onZoomIn={handleZoomIn}
Expand Down
73 changes: 45 additions & 28 deletions packages/geoview-core/src/geo/layer/gv-layers/raster/gv-esri-dynamic.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,15 @@ import {
} from '@/geo/map/map-schema-types';
import { esriGetFieldType, esriGetFieldDomain } from '../utils';
import { AbstractGVRaster } from './abstract-gv-raster';
import { TypeOutfieldsType } from '@/api/config/types/map-schema-types';
import { TypeOutfieldsType, TypeStyleGeometry } from '@/api/config/types/map-schema-types';
import { getLegendStyles } from '@/geo/utils/renderer/geoview-renderer';
import { CONST_LAYER_TYPES } from '../../geoview-layers/abstract-geoview-layers';
import { TypeLegend } from '@/core/stores/store-interface-and-intial-values/layer-state';
import { TypeEsriImageLayerLegend } from './gv-esri-image';
import { TypeJsonObject } from '@/api/config/types/config-types';
import { FetchEsriWorkerPool } from '@/core/workers/fetch-esri-worker-pool';
import { QueryParams } from '@/core/workers/fetch-esri-worker-script';
import { GeometryApi } from '../../geometry/geometry';

type TypeFieldOfTheSameValue = { value: string | number | Date; nbOccurence: number };
type TypeQueryTree = { fieldValue: string | number | Date; nextField: TypeQueryTree }[];
Expand Down Expand Up @@ -88,6 +89,9 @@ export class GVEsriDynamic extends AbstractGVRaster {
if (layerConfig.geoviewLayerConfig.geoviewLayerId === 'e2424b6c-db0c-4996-9bc0-2ca2e6714d71') {
imageLayerOptions.source?.updateParams({ imageSR: 3857 });
}
if (layerConfig.geoviewLayerConfig.geoviewLayerId === '1dcd28aa-99da-4f62-b157-15631379b170') {
imageLayerOptions.source?.updateParams({ imageSR: 4269 });
}

// Init the layer options with initial settings
AbstractGVRaster.initOptionsWithInitialSettings(imageLayerOptions, layerConfig);
Expand Down Expand Up @@ -396,33 +400,46 @@ export class GVEsriDynamic extends AbstractGVRaster {
const features = new EsriJSON().readFeatures({ features: identifyJsonResponse.results }) as Feature<Geometry>[];
const arrayOfFeatureInfoEntries = await this.formatFeatureInfoResult(features, layerConfig);

this.getFeatureInfoGeometryWorker(layerConfig, objectIds, true, mapViewer.getMapState().currentProjection, maxAllowableOffset)
.then((featuresJSON) => {
(featuresJSON.features as unknown as TypeFeatureInfoEntry[]).forEach((feat: TypeFeatureInfoEntry, index: number) => {
const geom = new EsriJSON().readFeature(feat, {
dataProjection: `EPSG:${mapViewer.getMapState().currentProjection}`,
featureProjection: `EPSG:${mapViewer.getMapState().currentProjection}`,
}) as Feature<Geometry>;

if (
arrayOfFeatureInfoEntries![index] &&
arrayOfFeatureInfoEntries![index].geometry &&
arrayOfFeatureInfoEntries![index].geometry instanceof Feature
) {
arrayOfFeatureInfoEntries![index].extent = geom.getGeometry()?.getExtent();
arrayOfFeatureInfoEntries![index].geometry.setGeometry(geom.getGeometry());
}
});

// arrayOfFeatureInfoEntries!.forEach((featureInfoEntry, i) => {
// const feature = features[i];
// featureInfoEntry.geometry = feature.getGeometry();

// arrayOfFeatureInfoEntries[0].geometry.setGeometry(featuresJSON.features[0])
// });
logger.logDebug('Features worker', featuresJSON);
})
.catch((err) => logger.logError('Features worker', err));
// If geometry is needed, use web worker to query and assing geometry later
if (queryGeometry)
// TODO: Performance - We may need to use chunk and process 50 geom at a time. When we query 500 features (points) we have CORS issue with
// TODO.CONT: the esri query (was working with identify). But identify was failing on huge geometry...
this.getFeatureInfoGeometryWorker(layerConfig, objectIds, true, mapViewer.getMapState().currentProjection, maxAllowableOffset)
.then((featuresJSON) => {
(featuresJSON.features as TypeJsonObject[]).forEach((feat: TypeJsonObject, index: number) => {
// TODO: Performance - There is still a problem when we create the feature with new EsriJSON().readFeature. It goes trought a loop and take minutes on the deflate function
// TODO.CONT: 1dcd28aa-99da-4f62-b157-15631379b170, ocean biology layer has huge amount of verticies and when zoomed in we require more
// TODO.CONT: more definition so the feature creation take more time. Investigate if we can create the geometry instead
// TODO.CONT: Investigate using this approach in esri-feature.ts
// const geom = new EsriJSON().readFeature(feat, {
// dataProjection: `EPSG:${mapViewer.getMapState().currentProjection}`,
// featureProjection: `EPSG:${mapViewer.getMapState().currentProjection}`,
// }) as Feature<Geometry>;

// TODO: Performance - Relying on style to get geometry is not good. We shold extract it from metadata and keep it in dedicated attribute
const geomType = Object.keys(layerConfig?.layerStyle || []);

// Get coordinates in right format and create geometry
const coordinates = (feat.geometry?.points ||
feat.geometry?.paths ||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
feat.geometry?.rings || [feat.geometry?.x, feat.geometry?.y]) as any; // MultiPoint or Line or Polygon or Point schema
const newGeom: Geometry | null =
geomType.length > 0
? (GeometryApi.createGeometryFromType(geomType[0] as TypeStyleGeometry, coordinates) as unknown as Geometry)
: null;

// TODO: Perfromance - We will need a trigger to refresh the higight and detaiils panel (for zoom button) when extent and
// TODO.CONT: is applied. Sometime the delay is too big so we need to change tab or layer in layer list to trigger the refresh
// We assume order of arrayOfFeatureInfoEntries is the same as featuresJSON.features as they are process in same order
const entry = arrayOfFeatureInfoEntries![index];
if (newGeom !== null && entry.geometry && entry.geometry instanceof Feature) {
entry.extent = newGeom.getExtent();
entry.geometry.setGeometry(newGeom);
}
});
})
.catch((err) => logger.logError('Features worker', err));

return arrayOfFeatureInfoEntries;
} catch (error) {
Expand Down

0 comments on commit 80f184e

Please sign in to comment.