From 36d8a3466f5f4467463d22315d320fe3e2c3fe15 Mon Sep 17 00:00:00 2001 From: cbourget Date: Thu, 18 Oct 2018 10:22:05 -0400 Subject: [PATCH 1/2] fix WMTS GetCapbilities import error --- .../geo/src/lib/datasource/shared/capabilities.service.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/geo/src/lib/datasource/shared/capabilities.service.ts b/projects/geo/src/lib/datasource/shared/capabilities.service.ts index de8c6a67b7..8830af93f8 100644 --- a/projects/geo/src/lib/datasource/shared/capabilities.service.ts +++ b/projects/geo/src/lib/datasource/shared/capabilities.service.ts @@ -4,7 +4,7 @@ import { Observable, forkJoin } from 'rxjs'; import { map } from 'rxjs/operators'; import { WMSCapabilities, WMTSCapabilities } from 'ol/format'; -import olSourceWMTS from 'ol/source/WMTS'; +import olSourceWMTS, {optionsFromCapabilities} from 'ol/source/WMTS.js'; import olAttribution from 'ol/control/Attribution'; import { ObjectUtils } from '@igo2/utils'; @@ -156,7 +156,7 @@ export class CapabilitiesService { baseOptions: WMTSDataSourceOptions, capabilities: any ): WMTSDataSourceOptions { - const options = olSourceWMTS.optionsFromCapabilities( + const options = optionsFromCapabilities( capabilities, baseOptions ); From 833945007867e56f80c354921e72ecd36dd8ca48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Barbeau?= Date: Thu, 18 Oct 2018 10:52:44 -0400 Subject: [PATCH 2/2] remove unnecessary import --- projects/geo/src/lib/datasource/shared/capabilities.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/geo/src/lib/datasource/shared/capabilities.service.ts b/projects/geo/src/lib/datasource/shared/capabilities.service.ts index 8830af93f8..0de4d1b731 100644 --- a/projects/geo/src/lib/datasource/shared/capabilities.service.ts +++ b/projects/geo/src/lib/datasource/shared/capabilities.service.ts @@ -4,7 +4,7 @@ import { Observable, forkJoin } from 'rxjs'; import { map } from 'rxjs/operators'; import { WMSCapabilities, WMTSCapabilities } from 'ol/format'; -import olSourceWMTS, {optionsFromCapabilities} from 'ol/source/WMTS.js'; +import { optionsFromCapabilities } from 'ol/source/WMTS.js'; import olAttribution from 'ol/control/Attribution'; import { ObjectUtils } from '@igo2/utils';