From fc1be1dcd8f42bb136d59112ea10e91ceace437d Mon Sep 17 00:00:00 2001
From: Alex <alexandre.roy@nrcan-rncan.gc.ca>
Date: Tue, 20 Feb 2024 15:09:50 -0500
Subject: [PATCH] =?UTF-8?q?Integration=20des=20commentaires=20Fix=20pour?=
 =?UTF-8?q?=20charts:[]=20dans=20configuration=20par=20d=C3=A9faut=20du=20?=
 =?UTF-8?q?GeoChart=20Added=20geocoreids=20on=20the=20raw-add-layers=20tem?=
 =?UTF-8?q?plate=20page?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../public/templates/raw-add-layers.html      | 29 +++++++++++++++----
 .../core/utils/config/config-validation.ts    | 19 ++++--------
 .../utils/config/reader/uuid-config-reader.ts |  6 +++-
 .../geoview-core/src/core/utils/constant.ts   |  6 ++++
 .../src/geo/layer/other/geocore.ts            |  9 +++---
 .../default-config-geochart.json              |  3 +-
 6 files changed, 47 insertions(+), 25 deletions(-)

diff --git a/packages/geoview-core/public/templates/raw-add-layers.html b/packages/geoview-core/public/templates/raw-add-layers.html
index 8079f52f248..15dab170e60 100644
--- a/packages/geoview-core/public/templates/raw-add-layers.html
+++ b/packages/geoview-core/public/templates/raw-add-layers.html
@@ -256,11 +256,22 @@ <h4>Add Layer Examples</h4>
           <li class="source-link">https://b6ryuvakk5.execute-api.us-east-1.amazonaws.com/dev/collections/lakes</li>
         </ul>
       </div>
-      <div>
-        GeoCore UUID Layer
-        <ul>
-          <li>ccc75c12-5acc-4a6a-959f-ef6f621147b9</li>
-        </ul>
+      <div style="margin-bottom:20px;">
+        <div>
+          GeoCore UUID Layer
+        </div>
+        <div style="margin-top:10px; margin-left:20px;">
+          <input id='selectGeoCore' list="geocoreids" style="width:300px;">
+          <datalist id="geocoreids">
+            <option value="21b821cf-0f1c-40ee-8925-eab12d357668"></option>
+            <option value="ccc75c12-5acc-4a6a-959f-ef6f621147b9"></option>
+            <option value="0fca08b5-e9d0-414b-a3c4-092ff9c5e326"></option>
+            <option value="03ccfb5c-a06e-43e3-80fd-09d4f8f69703"></option>
+            <option value="ea4c0bdb-a63f-49a4-b14a-09c1560aad0b"></option>
+            <option value="0fe65119-e96e-4a57-8bfe-9d9245fba06b"></option>
+          </datalist>
+          <button type="button" onclick="addGeocore()">Add layer</button>
+        </div>
       </div>
       <div>
         GeoPackage Layer
@@ -293,6 +304,14 @@ <h4 id="HUC2">2. Layer Panel with layers in config</h4>
     <script src="codedoc.js"></script>
 
     <script>
+      function addGeocore() {
+        // Precond
+        if (!document.getElementById('selectGeoCore').value) return;
+
+        // Add the layer on the map
+        cgpv.api.maps['mapWM'].layer.addGeoviewLayerByGeoCoreUUID(document.getElementById('selectGeoCore').value);
+      }
+
       document.addEventListener('DOMContentLoaded', function () {
         var sourceLinks = document.querySelectorAll('li.source-link');
 
diff --git a/packages/geoview-core/src/core/utils/config/config-validation.ts b/packages/geoview-core/src/core/utils/config/config-validation.ts
index 365a0db4cdf..148bf715652 100644
--- a/packages/geoview-core/src/core/utils/config/config-validation.ts
+++ b/packages/geoview-core/src/core/utils/config/config-validation.ts
@@ -6,9 +6,6 @@ import { AnyValidateFunction } from 'ajv/dist/types';
 
 import defaultsDeep from 'lodash/defaultsDeep';
 
-import { generateId, replaceParams, getLocalizedMessage, showError } from '../utilities';
-
-import schema from '../../../../schema.json';
 import { TypeBasemapId, TypeBasemapOptions, VALID_BASEMAP_ID } from '@/geo/layer/basemap/basemap-types';
 import { geoviewEntryIsWMS } from '@/geo/layer/geoview-layers/raster/wms';
 import { geoviewEntryIsImageStatic } from '@/geo/layer/geoview-layers/raster/image-static';
@@ -42,10 +39,13 @@ import {
   TypeEsriImageLayerEntryConfig,
 } from '@/geo/map/map-schema-types';
 import { Cast, toJsonObject, TypeJsonObject, TypeMapFeaturesConfig } from '@/core/types/global-types';
-
 import { CONST_GEOVIEW_SCHEMA_BY_TYPE, TypeGeoviewLayerType } from '@/geo/layer/geoview-layers/abstract-geoview-layers';
 import { geoviewEntryIsEsriImage } from '@/geo/layer/geoview-layers/raster/esri-image';
 import { logger } from '@/core/utils/logger';
+import { CONFIG_GEOCORE_URL, CONFIG_GEOLOCATOR_URL } from '@/app';
+
+import { generateId, replaceParams, getLocalizedMessage, showError } from '../utilities';
+import schema from '../../../../schema.json';
 
 // ******************************************************************************************************************************
 // ******************************************************************************************************************************
@@ -65,13 +65,6 @@ export class ConfigValidation {
   /** The language that will be used to display the GeoView layer. */
   private _displayLanguage: TypeDisplayLanguage;
 
-  // TODO: Refactor - Environment - How to edit this configuration easily per environment?
-  /** The default geocore url */
-  static CONFIG_GEOCORE_URL = 'https://geocore-stage.api.geo.ca';
-
-  /** The default geolocator url */
-  static CONFIG_GEOLOCATOR_URL = 'https://geolocator.api.geo.ca?keys=geonames,nominatim,locate';
-
   /** default configuration if provided configuration is missing or wrong */
   private _defaultMapFeaturesConfig: TypeMapFeaturesConfig = {
     mapId: '',
@@ -99,8 +92,8 @@ export class ConfigValidation {
     corePackages: [],
     overviewMap: undefined,
     serviceUrls: {
-      geocoreUrl: ConfigValidation.CONFIG_GEOCORE_URL,
-      geolocator: ConfigValidation.CONFIG_GEOLOCATOR_URL,
+      geocoreUrl: CONFIG_GEOCORE_URL,
+      geolocator: CONFIG_GEOLOCATOR_URL,
     },
     displayLanguage: 'en',
     triggerReadyCallback: false,
diff --git a/packages/geoview-core/src/core/utils/config/reader/uuid-config-reader.ts b/packages/geoview-core/src/core/utils/config/reader/uuid-config-reader.ts
index 9b462a9070f..6a7e4f51ed1 100644
--- a/packages/geoview-core/src/core/utils/config/reader/uuid-config-reader.ts
+++ b/packages/geoview-core/src/core/utils/config/reader/uuid-config-reader.ts
@@ -30,6 +30,8 @@ export type GeoChartGeoCoreConfig = TypeJsonObject & {
   };
 }; // TypeJsonObject, because the definition is in the external package
 
+// #region GeoChart Config types
+
 // The GeoChart Json object expected by GeoView
 export type GeoChartConfig = TypeJsonObject & {
   layers: [
@@ -45,6 +47,8 @@ export type UUIDmapConfigReaderResponse = {
   geocharts?: GeoChartConfig[];
 };
 
+// #endregion
+
 /**
  * A class to generate GeoView layers config from a URL using a UUID.
  * @exports
@@ -351,7 +355,7 @@ export class UUIDmapConfigReader {
   }
 
   /**
-   * Generates GeoView layers and geocharts configurations, from GeoCore API, using a list of UUIDs.
+   * Generates GeoView layers and package configurations (i.e. geochart), from GeoCore API, using a list of UUIDs.
    * @param {string} baseUrl the base url of GeoCore API
    * @param {string} lang the language to get the config for
    * @param {string[]} uuids a list of uuids to get the configurations for
diff --git a/packages/geoview-core/src/core/utils/constant.ts b/packages/geoview-core/src/core/utils/constant.ts
index ca5010e1a6f..25ac92e51d1 100644
--- a/packages/geoview-core/src/core/utils/constant.ts
+++ b/packages/geoview-core/src/core/utils/constant.ts
@@ -7,6 +7,12 @@ export const GEO_URL_TEXT = {
   text: 'Geo.ca',
 };
 
+/** The default geocore url */
+export const CONFIG_GEOCORE_URL = 'https://geocore-stage.api.geo.ca';
+
+/** The default geolocator url */
+export const CONFIG_GEOLOCATOR_URL = 'https://geolocator.api.geo.ca?keys=geonames,nominatim,locate';
+
 // OpenLayer constants
 export const OL_ZOOM_DURATION = 500;
 
diff --git a/packages/geoview-core/src/geo/layer/other/geocore.ts b/packages/geoview-core/src/geo/layer/other/geocore.ts
index 4efdf7da3c2..78046d5483a 100644
--- a/packages/geoview-core/src/geo/layer/other/geocore.ts
+++ b/packages/geoview-core/src/geo/layer/other/geocore.ts
@@ -123,15 +123,14 @@ export class GeoCore {
       // Get the language
       const lang = api.maps[this.mapId].getDisplayLanguage();
 
-      // Generate the url
-      // TODO: Check - Is the metadataAccessPath still used? Because it seems to be incompatible with the rest now?
+      // Generate the url using metadataAccessPath when specified or using the geocore url
       const url = geocoreLayerConfig.metadataAccessPath?.[lang] || `${mapConfig!.serviceUrls.geocoreUrl}`;
-      const uuids = [layerConfig.layerId];
+      const uuid = layerConfig.layerId;
 
       try {
         // Get the GV config from UUID and await even if within loop
         // eslint-disable-next-line no-await-in-loop
-        const response = await UUIDmapConfigReader.getGVConfigFromUUIDs(url, lang, uuids);
+        const response = await UUIDmapConfigReader.getGVConfigFromUUIDs(url, lang, [uuid]);
 
         // Cumulate
         listOfLayerCreated.push(response.layers);
@@ -149,7 +148,7 @@ export class GeoCore {
         });
       } catch (error) {
         // Log
-        logger.logError(`Failed to get the GeoView layer from UUI ${uuids}`, error);
+        logger.logError(`Failed to get the GeoView layer from UUI ${uuid}`, error);
         const message = replaceParams([error as TypeJsonValue, this.mapId], getLocalizedMessage(this.mapId, 'validation.layer.loadfailed'));
         showError(this.mapId, message);
       }
diff --git a/packages/geoview-geochart/default-config-geochart.json b/packages/geoview-geochart/default-config-geochart.json
index 6071cd842dc..30150f9fa7d 100644
--- a/packages/geoview-geochart/default-config-geochart.json
+++ b/packages/geoview-geochart/default-config-geochart.json
@@ -1,3 +1,4 @@
 {
-  "supportedLanguages": ["en", "fr"]
+  "supportedLanguages": ["en", "fr"],
+  "charts": []
 }
\ No newline at end of file