fix(demo): Repoint web services in assembly demo (#1557)

infra-geo-ouverte · Jan 8, 2024 · b714937 · b714937
1 parent 5a1514c
commit b714937
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 28 deletions.
diff --git a/projects/demo/src/app/geo/layer/layer.component.ts b/projects/demo/src/app/geo/layer/layer.component.ts
@@ -63,7 +63,7 @@ export class AppLayerComponent {
 
     const wfsDatasourceCustomEPSG: WFSoptions = {
       type: 'wfs',
-      url: 'https://geoegl.msp.gouv.qc.ca/apis/ws/igo_gouvouvert.fcgi',
+      url: 'https://geoegl.msp.gouv.qc.ca/apis/wss/complet.fcgi',
       params: {
         featureTypes: 'vg_observation_v_autre_wmst',
         fieldNameGeometry: 'geometry',
@@ -175,7 +175,7 @@ export class AppLayerComponent {
 
     const datasource: WMSDataSourceOptions = {
       type: 'wms',
-      url: 'https://geoegl.msp.gouv.qc.ca/apis/ws/igo_gouvouvert.fcgi',
+      url: 'https://geoegl.msp.gouv.qc.ca/apis/wss/complet.fcgi',
       refreshIntervalSec: 15,
       params: {
         LAYERS: 'vg_observation_v_inondation_embacle_wmst',

diff --git a/projects/demo/src/app/geo/legend/legend.component.ts b/projects/demo/src/app/geo/legend/legend.component.ts
@@ -162,7 +162,7 @@ export class AppLegendComponent {
 
     const datasource: WMSDataSourceOptions = {
       type: 'wms',
-      url: 'https://geoegl.msp.gouv.qc.ca/apis/ws/igo_gouvouvert.fcgi',
+      url: 'https://geoegl.msp.gouv.qc.ca/apis/wss/complet.fcgi',
       refreshIntervalSec: 15,
       params: {
         LAYERS: 'vg_observation_v_inondation_embacle_wmst',

diff --git a/projects/demo/src/app/geo/ogc-filter/ogc-filter.component.ts b/projects/demo/src/app/geo/ogc-filter/ogc-filter.component.ts
@@ -69,7 +69,7 @@ export class AppOgcFilterComponent {
 
     const datasource: WFSOptions = {
       type: 'wfs',
-      url: 'https://geoegl.msp.gouv.qc.ca/apis/ws/igo_gouvouvert.fcgi',
+      url: 'https://geoegl.msp.gouv.qc.ca/apis/wss/complet.fcgi',
       params: {
         featureTypes: 'vg_observation_v_autre_wmst',
         fieldNameGeometry: 'geometry',
@@ -142,7 +142,7 @@ export class AppOgcFilterComponent {
 
     const datasourceDuringFilter: WFSOptions = {
       type: 'wfs',
-      url: 'https://geoegl.msp.gouv.qc.ca/apis/ws/igo_gouvouvert.fcgi',
+      url: 'https://geoegl.msp.gouv.qc.ca/apis/wss/complet.fcgi',
       params: {
         featureTypes: 'vg_observation_v_autre_wmst',
         fieldNameGeometry: 'geometry',
@@ -193,7 +193,7 @@ export class AppOgcFilterComponent {
 
     const datasourceDuringFilterTime: WFSOptions = {
       type: 'wfs',
-      url: 'https://geoegl.msp.gouv.qc.ca/apis/ws/igo_gouvouvert.fcgi',
+      url: 'https://geoegl.msp.gouv.qc.ca/apis/wss/complet.fcgi',
       params: {
         featureTypes: 'vg_observation_v_autre_wmst',
         fieldNameGeometry: 'geometry',
@@ -217,7 +217,7 @@ export class AppOgcFilterComponent {
           operator: 'During',
           propertyName: 'date_observation',
           begin: '2016-01-01T04:00:00-05:00',
-          end: '2016-01-12T16:00:00-05:00',
+          end: '2016-01-12T16:00:00-05:00'
         } satisfies OgcFilterDuringOptions | OgcFilterAttributeOptions
       },
       minDate: '2016-01-01T00:00:00-05:00',
@@ -251,7 +251,7 @@ export class AppOgcFilterComponent {
 
     const datasourceDuringFilterTimeMonth: WFSOptions = {
       type: 'wfs',
-      url: 'https://geoegl.msp.gouv.qc.ca/apis/ws/igo_gouvouvert.fcgi',
+      url: 'https://geoegl.msp.gouv.qc.ca/apis/wss/complet.fcgi',
       params: {
         featureTypes: 'vg_observation_v_autre_wmst',
         fieldNameGeometry: 'geometry',
@@ -310,7 +310,7 @@ export class AppOgcFilterComponent {
 
     const datasourceDuringFilterTimeYear: WFSOptions = {
       type: 'wfs',
-      url: 'https://geoegl.msp.gouv.qc.ca/apis/ws/igo_gouvouvert.fcgi',
+      url: 'https://geoegl.msp.gouv.qc.ca/apis/wss/complet.fcgi',
       params: {
         featureTypes: 'vg_observation_v_autre_wmst',
         fieldNameGeometry: 'geometry',
@@ -369,7 +369,7 @@ export class AppOgcFilterComponent {
 
     const datasourceDuringFilterTimeInterval: WFSOptions = {
       type: 'wfs',
-      url: 'https://geoegl.msp.gouv.qc.ca/apis/ws/igo_gouvouvert.fcgi',
+      url: 'https://geoegl.msp.gouv.qc.ca/apis/wss/complet.fcgi',
       params: {
         featureTypes: 'vg_observation_v_autre_wmst',
         fieldNameGeometry: 'geometry',
@@ -427,7 +427,7 @@ export class AppOgcFilterComponent {
 
     const datasourceDuringFilterTimeRestrictedToStep: WFSOptions = {
       type: 'wfs',
-      url: 'https://geoegl.msp.gouv.qc.ca/apis/ws/igo_gouvouvert.fcgi',
+      url: 'https://geoegl.msp.gouv.qc.ca/apis/wss/complet.fcgi',
       params: {
         featureTypes: 'vg_observation_v_autre_wmst',
         fieldNameGeometry: 'geometry',
@@ -485,7 +485,8 @@ export class AppOgcFilterComponent {
 
     const wmsOgcFilterOptions: WMSOptions = {
       type: 'wms',
-      url: 'https://geoegl.msp.gouv.qc.ca/apis/ws/igo_gouvouvert.fcgi',
+      url: 'https://geoegl.msp.gouv.qc.ca/apis/wss/complet.fcgi',
+      optionsFromCapabilities: true,
       params: {
         LAYERS: 'vg_observation_v_autre_wmst',
         VERSION: '1.3.0'
@@ -504,7 +505,7 @@ export class AppOgcFilterComponent {
           operator: 'During',
           propertyName: 'date_observation',
           begin: '2016-01-01 00:00:00',
-          end: '2020-01-01 00:00:00',
+          end: '2020-01-01 00:00:00'
         } satisfies OgcFilterDuringOptions | OgcFilterAttributeOptions,
         allowedOperatorsType: OgcFilterOperatorType.Time
       }

diff --git a/projects/demo/src/app/geo/print/print.component.ts b/projects/demo/src/app/geo/print/print.component.ts
@@ -1,6 +1,14 @@
 import { Component } from '@angular/core';
 
-import { IgoMap, ImageLayer, ImageLayerOptions, LayerService, MapViewOptions, TileLayer, TileLayerOptions } from '@igo2/geo';
+import {
+  IgoMap,
+  ImageLayer,
+  ImageLayerOptions,
+  LayerService,
+  MapViewOptions,
+  TileLayer,
+  TileLayerOptions
+} from '@igo2/geo';
 
 @Component({
   selector: 'app-print',
@@ -21,9 +29,7 @@ export class AppPrintComponent {
     zoom: 9
   };
 
-  constructor(
-    private layerService: LayerService
-  ) {
+  constructor(private layerService: LayerService) {
     this.layerService
       .createAsyncLayer({
         title: 'Quebec Base Map',
@@ -33,7 +39,7 @@ export class AppPrintComponent {
           type: 'xyz',
           url: 'https://geoegl.msp.gouv.qc.ca/carto/tms/1.0.0/carte_gouv_qc_public@EPSG_3857/{z}/{x}/{-y}.png',
           crossOrigin: 'anonymous'
-        },
+        }
       } satisfies TileLayerOptions)
       .subscribe((layer: TileLayer) => this.map.addLayer(layer));
 
@@ -42,7 +48,7 @@ export class AppPrintComponent {
         title: 'Embâcles',
         sourceOptions: {
           type: 'wms',
-          url: 'https://geoegl.msp.gouv.qc.ca/apis/ws/igo_gouvouvert.fcgi',
+          url: 'https://geoegl.msp.gouv.qc.ca/apis/wss/complet.fcgi',
           params: {
             LAYERS: 'vg_observation_v_inondation_embacle_wmst',
             VERSION: '1.3.0'
@@ -75,7 +81,7 @@ export class AppPrintComponent {
           url: 'https://ws.mapserver.transports.gouv.qc.ca/swtq?',
           params: {
             layers: 'aeroport',
-            version: '1.3.0',
+            version: '1.3.0'
           },
           crossOrigin: 'anonymous'
         }

diff --git a/projects/demo/src/contexts/_default.json b/projects/demo/src/contexts/_default.json
@@ -5,7 +5,7 @@
     {
       "sourceOptions": {
         "type": "wms",
-        "url": "https://geoegl.msp.gouv.qc.ca/apis/ws/igo_gouvouvert.fcgi",
+        "url": "https://geoegl.msp.gouv.qc.ca/apis/wss/complet.fcgi",
         "optionsFromCapabilities": true,
         "queryable": true,
         "params": {

diff --git a/projects/demo/src/environments/environment.prod.ts b/projects/demo/src/environments/environment.prod.ts
@@ -34,7 +34,7 @@ export const environment: EnvironmentOptions = {
         {
           id: 'Gououvert',
           title: 'Gouvouvert',
-          url: 'https://geoegl.msp.gouv.qc.ca/apis/ws/igo_gouvouvert.fcgi'
+          url: 'https://geoegl.msp.gouv.qc.ca/apis/wss/complet.fcgi'
         },
         {
           id: 'DefiningInfoFormat',
@@ -56,15 +56,15 @@ export const environment: EnvironmentOptions = {
         {
           id: 'catalogwithtooltipcontrol',
           title: 'Controling tooltip format',
-          url: 'https://geoegl.msp.gouv.qc.ca/apis/ws/igo_gouvouvert.fcgi',
+          url: 'https://geoegl.msp.gouv.qc.ca/apis/wss/complet.fcgi',
           tooltipType: TooltipType.ABSTRACT
         }
       ]
     },
     monitoring: {
       provider: 'sentry',
       dsn: 'https://[email protected]/0',
-      identifyUser: true,
+      identifyUser: true
     },
     searchSources: {
       storedqueriesreverse: { enabled: false },

diff --git a/projects/demo/src/environments/environment.ts b/projects/demo/src/environments/environment.ts
@@ -38,7 +38,7 @@ export const environment: EnvironmentOptions = {
         {
           id: 'Gououvert',
           title: 'Gouvouvert',
-          url: 'https://geoegl.msp.gouv.qc.ca/apis/ws/igo_gouvouvert.fcgi'
+          url: 'https://geoegl.msp.gouv.qc.ca/apis/wss/complet.fcgi'
         },
         {
           id: 'DefiningInfoFormat',
@@ -60,7 +60,7 @@ export const environment: EnvironmentOptions = {
         {
           id: 'catalogwithtooltipcontrol',
           title: 'Controling tooltip format',
-          url: 'https://geoegl.msp.gouv.qc.ca/apis/ws/igo_gouvouvert.fcgi',
+          url: 'https://geoegl.msp.gouv.qc.ca/apis/wss/complet.fcgi',
           tooltipType: TooltipType.ABSTRACT
         },
         {
@@ -217,7 +217,7 @@ export const environment: EnvironmentOptions = {
             },
             {
               id: 'Gououvert',
-              url: 'https://geoegl.msp.gouv.qc.ca/apis/ws/igo_gouvouvert.fcgi',
+              url: 'https://geoegl.msp.gouv.qc.ca/apis/wss/complet.fcgi',
               regFilters: ['zpegt'],
               groupImpose: { id: 'zpegt', title: 'zpegt' }
             },
@@ -267,7 +267,7 @@ export const environment: EnvironmentOptions = {
             },
             {
               id: 'Gououvert',
-              url: 'https://geoegl.msp.gouv.qc.ca/apis/ws/igo_gouvouvert.fcgi',
+              url: 'https://geoegl.msp.gouv.qc.ca/apis/wss/complet.fcgi',
               regFilters: ['limtn_charg'],
               groupImpose: { id: 'mix_swtq_gouv', title: 'mix same name layer' }
             }