Merge branch 'develop' of https://github.com/Canadian-Geospatial-Plat…

…form/geoview into 2307-skelton

packages/geoview-basemap-panel/package.json

@@ -10,7 +10,7 @@
   "author": "Saleh Yassin",
   "license": "MIT",
   "dependencies": {
-    "geoview-core": "workspace:~0.1.0"
+    "geoview-core": "workspace:~1.0.0"
   },
   "devDependencies": {
     "@babel/core": "^7.17.0",

packages/geoview-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geoview-core",
-  "version": "0.1.0",
+  "version": "1.0.0",
   "description": "Lightweight viewer based on Open Layers and React for the Canadian Geospatial Platform",
   "private": true,
   "main": "src/app.tsx",
@@ -71,7 +71,7 @@
     "linkifyjs": "^4.1.0",
     "lodash": "^4.17.21",
     "material-react-table": "^2.13.0",
-    "ol": "9.1.0",
+    "ol": "^9.2.4",
     "ol-mapbox-style": "^12.2.1",
     "proj4": "^2.7.5",
     "prop-types": "^15.8.1",

packages/geoview-core/src/geo/layer/geometry/geometry.ts

@@ -1,6 +1,6 @@
 import VectorLayer from 'ol/layer/Vector';
+import Feature, { FeatureLike } from 'ol/Feature';
 import VectorSource, { Options as VectorSourceOptions } from 'ol/source/Vector';
-import { Feature } from 'ol';
 import { Geometry as OLGeometry, Circle, LineString, Point, Polygon } from 'ol/geom';
 import { Coordinate } from 'ol/coordinate';
 import { Fill, Stroke, Style, Icon } from 'ol/style';
@@ -22,7 +22,7 @@ import { TypeFeatureCircleStyle, TypeFeatureStyle, TypeIconStyle } from './geome
  */
 interface FeatureCollection {
   geometryGroupId: string;
-  vectorLayer: VectorLayer<VectorSource>;
+  vectorLayer: VectorLayer<Feature>;
   vectorSource: VectorSource;
 }
 
@@ -428,17 +428,17 @@ export class GeometryApi {
   createGeometryGroup(
     geometryGroupId: string,
     options?: {
-      vectorLayerOptions?: VectorLayerOptions<VectorSource>;
+      vectorLayerOptions?: VectorLayerOptions<VectorSource<FeatureLike>>;
       vectorSourceOptions?: VectorSourceOptions<Feature>;
     }
   ): FeatureCollection {
     const geometryGroupOptions = options || {};
 
     let geometryGroup = this.getGeometryGroup(geometryGroupId);
     if (!geometryGroup) {
-      const vectorSource = new VectorSource(geometryGroupOptions.vectorSourceOptions);
+      const vectorSource = new VectorSource<Feature>(geometryGroupOptions.vectorSourceOptions);
 
-      const vectorLayer = new VectorLayer({
+      const vectorLayer = new VectorLayer<Feature>({
         ...geometryGroupOptions.vectorLayerOptions,
         source: vectorSource,
       });

packages/geoview-core/src/geo/layer/geoview-layers/raster/vector-tiles.ts

@@ -217,16 +217,16 @@ export class VectorTiles extends AbstractGeoViewRaster {
     const requestResult = this.emitLayerRequesting({ config: layerConfig, source });
 
     // If any response
-    let olLayer: VectorTileLayer | undefined;
+    let olLayer: VectorTileLayer<Feature> | undefined;
     if (requestResult.length > 0) {
       // Get the OpenLayer that was created
-      olLayer = requestResult[0] as VectorTileLayer;
+      olLayer = requestResult[0] as VectorTileLayer<Feature>;
     }
 
     // If no olLayer was obtained
     if (!olLayer) {
       // We're working in old LAYERS_HYBRID_MODE (in the new mode the code below is handled in the new classes)
-      const tileLayerOptions: TileOptions<VectorTileSource> = { source };
+      const tileLayerOptions: TileOptions<VectorTileSource<Feature>> = { source };
       // layerConfig.initialSettings cannot be undefined because config-validation set it to {} if it is undefined.
       if (layerConfig.initialSettings?.className !== undefined) tileLayerOptions.className = layerConfig.initialSettings.className;
       if (layerConfig.initialSettings?.extent !== undefined) tileLayerOptions.extent = layerConfig.initialSettings.extent;
@@ -356,6 +356,6 @@ export class VectorTiles extends AbstractGeoViewRaster {
   // GV Layers Refactoring - Obsolete (just should be removed?)
   setVectorTileStyle(layerPath: string, styleUrl: string): Promise<unknown> {
     // FIXME: Check if this should be removed or done somewhere else?
-    return applyStyle(this.getMapViewer().layer.getOLLayer(layerPath) as VectorTileLayer, styleUrl);
+    return applyStyle(this.getMapViewer().layer.getOLLayer(layerPath) as VectorTileLayer<Feature>, styleUrl);
   }
 }

packages/geoview-core/src/geo/layer/geoview-layers/vector/abstract-geoview-vector.ts

@@ -306,12 +306,12 @@ export abstract class AbstractGeoViewVector extends AbstractGeoViewLayer {
    * The layer entry configuration keeps a reference to the layer in the olLayer attribute.
    *
    * @param {VectorLayerEntryConfig} layerConfig The layer entry configuration used by the source.
-   * @param {VectorSource<Feature>} vectorSource The source configuration for the vector layer.
+   * @param {VectorSource} vectorSource The source configuration for the vector layer.
    *
-   * @returns {VectorLayer<VectorSource>} The vector layer created.
+   * @returns {VectorLayer<Feature>} The vector layer created.
    */
   // GV Layers Refactoring - Obsolete (this is bridging between config and layers, okay)
-  protected createVectorLayer(layerConfig: VectorLayerEntryConfig, vectorSource: VectorSource<Feature>): VectorLayer<VectorSource> {
+  protected createVectorLayer(layerConfig: VectorLayerEntryConfig, vectorSource: VectorSource): VectorLayer<Feature> {
     // TODO: remove link to language, layer should be created in one language and recreated if needed to change
     const language = AppEventProcessor.getDisplayLanguage(this.mapId);
 
@@ -322,10 +322,10 @@ export abstract class AbstractGeoViewVector extends AbstractGeoViewLayer {
     const requestResult = this.emitLayerRequesting({ config: layerConfig, source: vectorSource });
 
     // If any response
-    let olLayer: VectorLayer<VectorSource> | undefined;
+    let olLayer: VectorLayer<Feature> | undefined;
     if (requestResult.length > 0) {
       // Get the OpenLayer that was created
-      olLayer = requestResult[0] as VectorLayer<VectorSource>;
+      olLayer = requestResult[0] as VectorLayer<Feature>;
     }
 
     // If no olLayer was obtained
@@ -380,7 +380,7 @@ export abstract class AbstractGeoViewVector extends AbstractGeoViewLayer {
     try {
       // Get the layer config in a loaded phase
       const layerConfig = this.getLayerConfig(layerPath) as VectorLayerEntryConfig;
-      const layer = this.getOLLayer(layerPath) as VectorLayer<VectorSource>;
+      const layer = this.getOLLayer(layerPath) as VectorLayer<Feature>;
       const features = layer.getSource()!.getFeatures();
       const arrayOfFeatureInfoEntries = await this.formatFeatureInfoResult(features, layerConfig);
       return arrayOfFeatureInfoEntries;
@@ -467,7 +467,7 @@ export abstract class AbstractGeoViewVector extends AbstractGeoViewLayer {
    */
   // GV Layers Refactoring - Obsolete (in layers)
   override getBounds(layerPath: string): Extent | undefined {
-    const layer = this.getOLLayer(layerPath) as VectorLayer<VectorSource> | undefined;
+    const layer = this.getOLLayer(layerPath) as VectorLayer<Feature> | undefined;
     const layerBounds = layer?.getSource()?.getExtent();
 
     // Return the calculated layer bounds

packages/geoview-core/src/geo/layer/gv-layers/vector/abstract-gv-vector-tile.ts

@@ -1,5 +1,6 @@
 import VectorTile from 'ol/source/VectorTile';
-import BaseVectorLayer from 'ol/layer/BaseVector';
+import VectorTileLayer from 'ol/layer/VectorTile';
+import Feature from 'ol/Feature';
 import { Extent } from 'ol/extent';
 
 import { AbstractGVLayer } from '../abstract-gv-layer';
@@ -10,15 +11,15 @@ import { AbstractGVLayer } from '../abstract-gv-layer';
 export abstract class AbstractGVVectorTile extends AbstractGVLayer {
   /**
    * Overrides the get of the OpenLayers Layer
-   * @returns {BaseVectorLayer} The OpenLayers Layer
+   * @returns {VectorTileLayer<Feature>} The OpenLayers Layer
    */
   // Disabling 'any', because too many renderer types in OpenLayers
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  override getOLLayer(): BaseVectorLayer<VectorTile, any> {
+  override getOLLayer(): VectorTileLayer<Feature> {
     // Call parent and cast
     // Disabling 'any', because too many renderer types in OpenLayers
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    return super.getOLLayer() as BaseVectorLayer<VectorTile, any>;
+    return super.getOLLayer() as VectorTileLayer<Feature>;
   }
 
   /**

packages/geoview-core/src/geo/layer/gv-layers/vector/abstract-gv-vector.ts

@@ -1,5 +1,4 @@
 import BaseLayer from 'ol/layer/Base';
-import BaseVectorLayer from 'ol/layer/BaseVector';
 import VectorLayer from 'ol/layer/Vector';
 import VectorSource from 'ol/source/Vector';
 import { Options as VectorLayerOptions } from 'ol/layer/VectorImage';
@@ -29,7 +28,7 @@ export abstract class AbstractGVVector extends AbstractGVLayer {
    * Constructs a GeoView Vector layer to manage an OpenLayer layer.
    * @param {string} mapId - The map id
    * @param {VectorSource} olSource - The OpenLayer source.
-   * @param {AbstractBaseLayerEntryConfig} layerConfig - The layer configuration.
+   * @param {VectorLayerEntryConfig} layerConfig - The layer configuration.
    */
   protected constructor(mapId: string, olSource: VectorSource, layerConfig: VectorLayerEntryConfig) {
     super(mapId, olSource, layerConfig);
@@ -65,15 +64,15 @@ export abstract class AbstractGVVector extends AbstractGVLayer {
 
   /**
    * Overrides the get of the OpenLayers Layer
-   * @returns {BaseVectorLayer<VectorSource, any>} The OpenLayers Layer
+   * @returns {VectorLayer<Feature>} The OpenLayers Layer
    */
   // Disabling 'any', because too many renderer types in OpenLayers
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  override getOLLayer(): BaseVectorLayer<VectorSource, any> {
+  override getOLLayer(): VectorLayer<Feature> {
     // Call parent and cast
     // Disabling 'any', because too many renderer types in OpenLayers
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    return super.getOLLayer() as BaseVectorLayer<VectorSource, any>;
+    return super.getOLLayer() as VectorLayer<Feature>;
   }
 
   /**

packages/geoview-core/src/geo/layer/gv-layers/vector/gv-esri-feature.ts

@@ -1,4 +1,3 @@
-import { VectorImage } from 'ol/layer';
 import VectorSource from 'ol/source/Vector';
 
 import { EsriFeatureLayerEntryConfig } from '@/core/utils/config/validation-classes/vector-validation-classes/esri-feature-layer-entry-config';
@@ -23,15 +22,6 @@ export class GVEsriFeature extends AbstractGVVector {
     super(mapId, olSource, layerConfig);
   }
 
-  /**
-   * Overrides the get of the OpenLayers Layer
-   * @returns {VectorImage<VectorSource>} The OpenLayers Layer
-   */
-  override getOLLayer(): VectorImage<VectorSource> {
-    // Call parent and cast
-    return super.getOLLayer() as VectorImage<VectorSource>;
-  }
-
   /**
    * Overrides the get of the layer configuration associated with the layer.
    * @returns {EsriFeatureLayerEntryConfig} The layer configuration or undefined if not found.

packages/geoview-core/src/geo/layer/gv-layers/vector/gv-vector-tiles.ts

@@ -33,15 +33,6 @@ export class GVVectorTiles extends AbstractGVVectorTile {
     this.olLayer = new VectorTileLayer({ ...tileLayerOptions });
   }
 
-  /**
-   * Overrides the get of the OpenLayers Layer
-   * @returns {VectorTileLayer} The OpenLayers Layer
-   */
-  override getOLLayer(): VectorTileLayer {
-    // Call parent and cast
-    return super.getOLLayer() as VectorTileLayer;
-  }
-
   /**
    * Overrides the get of the layer configuration associated with the layer.
    * @returns {VectorTilesLayerEntryConfig} The layer configuration or undefined if not found.

packages/geoview-core/src/geo/map/feature-highlight.ts

@@ -26,7 +26,7 @@ export class FeatureHighlight {
 
   /** The hidden layer to display animations. */
   // GV It's public, to save an eslint warning, because even if it's not read in this class, it's actually important to instanciate per OpenLayer design.
-  overlayLayer: VectorLayer<VectorSource>;
+  overlayLayer: VectorLayer<Feature>;
 
   /** The fill for the highlight */
   #highlightColor = 'black';

packages/geoview-geochart/package.json

@@ -14,7 +14,7 @@
   "license": "MIT",
   "dependencies": {
     "lodash": "^4.17.21",
-    "geoview-core": "workspace:~0.1.0",
+    "geoview-core": "workspace:~1.0.0",
     "geochart": "Canadian-Geospatial-Platform/geochart#develop",
     "@mui/material": "^5.15.11"
   },

packages/geoview-swiper/package.json

@@ -10,9 +10,9 @@
   "author": "Saleh Yassin",
   "license": "MIT",
   "dependencies": {
-    "geoview-core": "workspace:~0.1.0",
+    "geoview-core": "workspace:~1.0.0",
     "lodash": "^4.17.21",
-    "ol": "9.1.0",
+    "ol": "^9.2.4",
     "react-draggable": "^4.4.5"
   },
   "devDependencies": {

packages/geoview-time-slider/package.json

@@ -10,7 +10,7 @@
   "author": "Damon Ulmi",
   "license": "MIT",
   "dependencies": {
-    "geoview-core": "workspace:~0.1.0",
+    "geoview-core": "workspace:~1.0.0",
     "@mui/material": "^5.15.11"
   },
   "devDependencies": {