diff --git a/packages/layers/src/index.ts b/packages/layers/src/index.ts index 945c398c2a..faafea0d10 100644 --- a/packages/layers/src/index.ts +++ b/packages/layers/src/index.ts @@ -1,6 +1,13 @@ +import { registerProj4 } from '@swissgeo/coordinates' +import proj4 from 'proj4' + // let's export the types "globally" export * from '@/types/layers' export * from '@/types/capabilities' export * from '@/types/timeConfig' export * from '@/validation' +import { register } from 'ol/proj/proj4' + +registerProj4(proj4) +register(proj4) diff --git a/packages/layers/src/parsers/WMSCapabilitiesParser.ts b/packages/layers/src/parsers/WMSCapabilitiesParser.ts index 63786f7d59..877ccfb0f7 100644 --- a/packages/layers/src/parsers/WMSCapabilitiesParser.ts +++ b/packages/layers/src/parsers/WMSCapabilitiesParser.ts @@ -467,41 +467,50 @@ function getFeatureInfoCapability( * @param options.params URL parameters to pass to WMS server * @param options.ignoreError Don't throw exception in case of error, but return a default value or * undefined + * @param options.parentsArray Optional parents array (internal parameter for recursion) * @returns Layer object, or undefined in case of error (and ignoreError is equal to true) */ function getExternalLayer( capabilities: WMSCapabilitiesResponse, layerOrLayerId: WMSCapabilityLayer | string, - options?: ExternalLayerParsingOptions + options?: ExternalLayerParsingOptions, ): ExternalWMSLayer | undefined { if (!layerOrLayerId) { // without a layer object or layer ID we can do nothing return } - const { outputProjection = WGS84, initialValues = {}, ignoreErrors = true } = options ?? {} + const { outputProjection = WGS84, initialValues = {}, ignoreErrors = true, parentsArray } = options ?? {} const { currentYear, params } = initialValues - let layerId: string - if (typeof layerOrLayerId === 'string') { - layerId = layerOrLayerId + let layer: WMSCapabilityLayer | undefined + let parents: WMSCapabilityLayer[] | undefined + + // If we have a layer object, use it directly with provided parents + if (typeof layerOrLayerId !== 'string') { + layer = layerOrLayerId + parents = (parentsArray as WMSCapabilityLayer[]) ?? [] } else { - layerId = layerOrLayerId.Name - } - if (!capabilities.Capability?.Layer?.Layer) { - return - } + // If we have a layer ID, search for it + const layerId = layerOrLayerId + if (!capabilities.Capability?.Layer?.Layer) { + return + } - const layerAndParents = findLayerRecurse( - layerId, - [capabilities.Capability.Layer], - [capabilities.Capability.Layer] - ) - if (!layerAndParents) { - return + const layerAndParents = findLayerRecurse( + layerId, + [capabilities.Capability.Layer], + [capabilities.Capability.Layer] + ) + if (!layerAndParents) { + return + } + layer = layerAndParents.layer + parents = layerAndParents.parents } - const { layer, parents } = layerAndParents + if (!layer) { + const layerId = typeof layerOrLayerId === 'string' ? layerOrLayerId : layerOrLayerId.Name const msg = `No WMS layer ${layerId} found in Capabilities ${capabilities.originUrl.toString()}` log.error({ title: 'WMS Capabilities parser', @@ -513,6 +522,7 @@ function getExternalLayer( } throw new CapabilitiesError(msg, 'no_layer_found') } + // Go through the child to get valid layers let layers: ExternalWMSLayer[] = [] diff --git a/packages/layers/src/parsers/WMTSCapabilitiesParser.ts b/packages/layers/src/parsers/WMTSCapabilitiesParser.ts index 4db1c98b32..48649de44b 100644 --- a/packages/layers/src/parsers/WMTSCapabilitiesParser.ts +++ b/packages/layers/src/parsers/WMTSCapabilitiesParser.ts @@ -445,22 +445,39 @@ function getExternalLayer( } const attributes = getLayerAttributes(capabilities, layer, outputProjection, ignoreErrors) - if (!attributes) { + if (!attributes || !attributes.id) { log.error(`No attributes found for layer ${layer.Identifier}`) return } + let olOptions + try { + olOptions = optionsFromCapabilities(capabilities, { + layer: attributes.id, + projection: outputProjection.epsg, + }) ?? undefined + } catch (error) { + log.warn({ + title: 'WMTS Capabilities parser', + titleColor: LogPreDefinedColor.Indigo, + messages: [`Failed to get OpenLayers options for layer ${attributes.id}`, error], + }) + if (!ignoreErrors) { + throw new CapabilitiesError( + `Failed to parse WMTS layer options: ${error?.toString()}`, + 'invalid_wmts_layer' + ) + } + olOptions = undefined + } + return layerUtils.makeExternalWMTSLayer({ type: LayerType.WMTS, ...attributes, opacity, isVisible, isLoading: false, - options: - optionsFromCapabilities(capabilities, { - layer: attributes.id, - projection: outputProjection.epsg, - }) ?? undefined, + options: olOptions, timeConfig: getTimeConfig(attributes.dimensions), currentYear, }) diff --git a/packages/layers/src/types/capabilities.ts b/packages/layers/src/types/capabilities.ts index 65899c4f54..f3f565c17d 100644 --- a/packages/layers/src/types/capabilities.ts +++ b/packages/layers/src/types/capabilities.ts @@ -255,6 +255,11 @@ export interface ExternalLayerParsingOptions { * layer's visibility or opacity after parsing, without using its default values */ initialValues?: Partial + /** + * Optional parents array (internal parameter for recursion) + * @internal + */ + parentsArray?: unknown[] } export interface CapabilitiesParser< diff --git a/packages/viewer/src/modules/menu/components/LayerCatalogueItem.vue b/packages/viewer/src/modules/menu/components/LayerCatalogueItem.vue index b3693ca2c3..174bcbaf22 100644 --- a/packages/viewer/src/modules/menu/components/LayerCatalogueItem.vue +++ b/packages/viewer/src/modules/menu/components/LayerCatalogueItem.vue @@ -6,7 +6,7 @@ import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome' import { type FlatExtent, LV95, type NormalizedExtent } from '@swissgeo/coordinates' -import { type GeoAdminGroupOfLayers, type Layer, LayerType } from '@swissgeo/layers' +import { type ExternalWMSLayer, type GeoAdminGroupOfLayers, type Layer, LayerType } from '@swissgeo/layers' import log from '@swissgeo/log' import { booleanContains, polygon } from '@turf/turf' import { computed, onMounted, ref, watch } from 'vue' @@ -61,8 +61,11 @@ const showItem = computed(() => { const isGroupOfLayers = (layer: Layer): layer is GeoAdminGroupOfLayers => { return layer.type === LayerType.GROUP } +const isWmsLayer = (layer: Layer): layer is ExternalWMSLayer => { + return layer.type === LayerType.WMS +} -const hasChildren = computed(() => isGroupOfLayers(item) && item?.layers?.length > 0) +const hasChildren = computed(() => (isGroupOfLayers(item) || isWmsLayer(item)) && item?.layers?.length && item?.layers?.length > 0) const hasDescription = computed(() => canBeAddedToTheMap.value && item?.hasDescription) const isPhoneMode = computed(() => uiStore.isPhoneMode) @@ -72,8 +75,8 @@ const isPhoneMode = computed(() => uiStore.isPhoneMode) */ const hasChildrenMatchSearch = computed(() => { if (search) { - if (isGroupOfLayers(item) && hasChildren.value) { - return containsLayer(item.layers, search) + if (hasChildren.value) { + return containsLayer((item as GeoAdminGroupOfLayers | ExternalWMSLayer).layers as Layer[], search) } return false } @@ -320,12 +323,12 @@ function containsLayer(layers: Layer[], searchText: string): boolean {
    (() => { - if (timeConfig.currentTimeEntry) { - return renderHumanReadableTimestamp( - timeConfig.currentTimeEntry as LayerTimeConfigEntry & { year: string } - ) - } - return '' -}) +const humanReadableCurrentTimestamp = computed(() => renderHumanReadableTimestamp( + timeConfig.currentTimeEntry as LayerTimeConfigEntry & { year: string } +)) -function renderHumanReadableTimestamp(timeEntry: LayerTimeConfigEntry & { year: string }): string { +function renderHumanReadableTimestamp(timeEntry?: LayerTimeConfigEntry & { year: string }): string { if (!timeEntry || !timeEntry.year) { return '-' } diff --git a/packages/viewer/src/modules/menu/components/advancedTools/ImportCatalogue/useCapabilities.ts b/packages/viewer/src/modules/menu/components/advancedTools/ImportCatalogue/useCapabilities.ts index e90832cdac..9b29f4b883 100644 --- a/packages/viewer/src/modules/menu/components/advancedTools/ImportCatalogue/useCapabilities.ts +++ b/packages/viewer/src/modules/menu/components/advancedTools/ImportCatalogue/useCapabilities.ts @@ -50,9 +50,7 @@ export function useCapabilities(newUrl: MaybeRef) { function handleWms(content: string, fullUrl: URL): UseCapabilitiesResponse { let wmsMaxSize: WMSMaxSize | undefined - const capabilities = wmsCapabilitiesParser.parse(content, fullUrl) - if (capabilities.Service.MaxWidth && capabilities.Service.MaxHeight) { wmsMaxSize = { width: capabilities.Service.MaxWidth, diff --git a/packages/viewer/src/store/modules/layers/getters/hasDataDisclaimer.ts b/packages/viewer/src/store/modules/layers/getters/hasDataDisclaimer.ts index 804ff1a42c..3dc303408f 100644 --- a/packages/viewer/src/store/modules/layers/getters/hasDataDisclaimer.ts +++ b/packages/viewer/src/store/modules/layers/getters/hasDataDisclaimer.ts @@ -4,13 +4,24 @@ import { LayerType } from '@swissgeo/layers' import type { LayerActionFilter, LayersStore } from '@/store/modules/layers/types/layers' +import { EXTERNAL_PROVIDER_WHITELISTED_URL_REGEXES } from '@/config/regex.config' + export default function hasDataDisclaimer( this: LayersStore ): (layerId: string, options?: LayerActionFilter) => boolean { return (layerId: string, options?: LayerActionFilter) => this.getActiveLayersById(layerId, options).some( (layer: Layer) => - layer && - (layer.isExternal || (layer.type === LayerType.KML && !(layer as KMLLayer).adminId)) + (layer && layer.isExternal && !checkLayerUrlWhitelisting(options?.baseUrl)) || + (layer.type === LayerType.KML && !(layer as KMLLayer).adminId) ) } + +function checkLayerUrlWhitelisting(layerBaseUrl?: string): boolean { + if (!layerBaseUrl) { + return false + } + return EXTERNAL_PROVIDER_WHITELISTED_URL_REGEXES.some( + (regex) => !!layerBaseUrl.match(regex) + ) +} \ No newline at end of file diff --git a/packages/viewer/src/store/modules/layers/utils/loadLayerFromCapabilities.ts b/packages/viewer/src/store/modules/layers/utils/loadLayerFromCapabilities.ts index 1aa6a5dba8..c13d9b7e90 100644 --- a/packages/viewer/src/store/modules/layers/utils/loadLayerFromCapabilities.ts +++ b/packages/viewer/src/store/modules/layers/utils/loadLayerFromCapabilities.ts @@ -61,6 +61,7 @@ export default async function loadLayerFromCapabilities( opacity: layer.opacity, isVisible: layer.isVisible, customAttributes: layer.customAttributes, + currentYear: (layer as ExternalWMSLayer).currentYear }, } ) @@ -72,6 +73,7 @@ export default async function loadLayerFromCapabilities( opacity: layer.opacity, isVisible: layer.isVisible, customAttributes: layer.customAttributes, + currentYear: (layer as ExternalWMTSLayer).currentYear }, }) } diff --git a/packages/viewer/src/store/modules/topics/actions/loadTopic.ts b/packages/viewer/src/store/modules/topics/actions/loadTopic.ts index 4f2a9b4a5b..fe17db62c2 100644 --- a/packages/viewer/src/store/modules/topics/actions/loadTopic.ts +++ b/packages/viewer/src/store/modules/topics/actions/loadTopic.ts @@ -73,4 +73,4 @@ export default function loadTopic( messages: ['Error while loading topic tree', error], }) }) -} +} \ No newline at end of file diff --git a/packages/viewer/src/store/plugins/storeSync/params/layers.param.ts b/packages/viewer/src/store/plugins/storeSync/params/layers.param.ts index de6535092b..373434cae9 100644 --- a/packages/viewer/src/store/plugins/storeSync/params/layers.param.ts +++ b/packages/viewer/src/store/plugins/storeSync/params/layers.param.ts @@ -125,7 +125,7 @@ export function createLayerObject(parsedLayer: Partial, currentLayer?: La layer.opacity = parsedLayer.opacity ?? DEFAULT_OPACITY if (adminId && layer.type === LayerType.KML) { - ;(layer as KMLLayer).adminId = adminId + ; (layer as KMLLayer).adminId = adminId } } else if (parsedLayer.type === LayerType.KML) { // format is KML|FILE_URL @@ -184,7 +184,7 @@ export function createLayerObject(parsedLayer: Partial, currentLayer?: La const internalLayer = layer as GeoAdminLayer if (internalLayer.type === LayerType.GEOJSON && updateDelay !== undefined) { - ;(internalLayer as GeoAdminGeoJSONLayer).updateDelay = updateDelay + ; (internalLayer as GeoAdminGeoJSONLayer).updateDelay = updateDelay } // only highlightable feature will output something, for the others a click coordinate is required diff --git a/packages/viewer/tests/cypress/tests-e2e/importToolMaps.cy.ts b/packages/viewer/tests/cypress/tests-e2e/importToolMaps.cy.ts index a799773016..7a6b3e3735 100644 --- a/packages/viewer/tests/cypress/tests-e2e/importToolMaps.cy.ts +++ b/packages/viewer/tests/cypress/tests-e2e/importToolMaps.cy.ts @@ -160,7 +160,7 @@ describe('The Import Maps Tool', () => { const positionStore = usePositionStore(pinia) const center = positionStore.center expect(center).to.have.length(2) - const expectedCenter = [2764440, 1187890] + const expectedCenter = [2764416, 1187917] cy.wrap(center[0]).should('be.closeTo', expectedCenter[0], 5) cy.wrap(center[1]).should('be.closeTo', expectedCenter[1], 5) }) @@ -243,7 +243,6 @@ describe('The Import Maps Tool', () => { } ).as('getLegendOfficialSurvey2') cy.get(`[data-cy="catalogue-tree-item-info-${legendWithoutAbstractLayerId}"]`) - .should('be.visible') .click() cy.wait('@getLegendOfficialSurvey2') cy.get(`[data-cy="simple-window-title"]`) @@ -531,7 +530,6 @@ describe('The Import Maps Tool', () => { cy.openMenuIfMobile() cy.checkOlLayer([bgLayer, layer1Id, layer2Id, layer4Id]) - cy.get('[data-cy="menu-active-layers"]').should('be.visible').click() cy.get('[data-cy="active-layer-name-layer4-2"]').should('be.visible') cy.get('[data-cy="time-selector-layer4-2"]').should('not.exist') @@ -539,7 +537,6 @@ describe('The Import Maps Tool', () => { //----------------------------------------------------------------------------------------- cy.log('Reload and check that everything is still present') cy.reload() - cy.checkOlLayer([bgLayer, layer1Id, layer2Id, layer4Id]) cy.openMenuIfMobile() cy.get('[data-cy="active-layer-name-layer1-0"]').should('be.visible') cy.get('[data-cy="time-selector-layer1-0"]').should('not.exist')