diff --git a/package-lock.json b/package-lock.json index 068cbe7..60f42d8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -40,7 +40,7 @@ "ngx-openlayers": "1.0.0-next.19", "ngx-uploadx": "^5.2.0", "ol": "6.14.1", - "ol-cesium": "^2.13.1", + "olcs": "^2.13.1", "resumablejs": "^1.1.0", "rxjs": "^6.6.7", "stream": "^0.0.2", @@ -10552,15 +10552,6 @@ "url": "https://opencollective.com/openlayers" } }, - "node_modules/ol-cesium": { - "version": "2.13.1", - "resolved": "https://registry.npmjs.org/ol-cesium/-/ol-cesium-2.13.1.tgz", - "integrity": "sha512-U6RnNakFCwlqYTBBzB0BPx4mki8sArMRMRjBortGlM+3jMvXLPZ/QR9mtPp80SFoQAnPD21vSmFUCa47jhc3Cg==", - "peerDependencies": { - "cesium": ">= 1.62.0", - "ol": ">= 6.0.1 || 7" - } - }, "node_modules/ol-mapbox-style": { "version": "7.1.1", "resolved": "https://registry.npmjs.org/ol-mapbox-style/-/ol-mapbox-style-7.1.1.tgz", @@ -10571,6 +10562,15 @@ "webfont-matcher": "^1.1.0" } }, + "node_modules/olcs": { + "version": "2.13.1", + "resolved": "https://registry.npmjs.org/olcs/-/olcs-2.13.1.tgz", + "integrity": "sha512-/h1ldzUGQG05k9KR3M56m7qVRDruXfrHiaLujMKk+EiNvpGuxlwtsj2Kkcm2wVx9t+DQvDXemf2SeV8K/ME9qw==", + "peerDependencies": { + "cesium": ">= 1.62.0", + "ol": ">= 6.0.1 || 7" + } + }, "node_modules/on-finished": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", @@ -23105,11 +23105,6 @@ "rbush": "^3.0.1" } }, - "ol-cesium": { - "version": "2.13.1", - "resolved": "https://registry.npmjs.org/ol-cesium/-/ol-cesium-2.13.1.tgz", - "integrity": "sha512-U6RnNakFCwlqYTBBzB0BPx4mki8sArMRMRjBortGlM+3jMvXLPZ/QR9mtPp80SFoQAnPD21vSmFUCa47jhc3Cg==" - }, "ol-mapbox-style": { "version": "7.1.1", "resolved": "https://registry.npmjs.org/ol-mapbox-style/-/ol-mapbox-style-7.1.1.tgz", @@ -23120,6 +23115,11 @@ "webfont-matcher": "^1.1.0" } }, + "olcs": { + "version": "2.13.1", + "resolved": "https://registry.npmjs.org/olcs/-/olcs-2.13.1.tgz", + "integrity": "sha512-/h1ldzUGQG05k9KR3M56m7qVRDruXfrHiaLujMKk+EiNvpGuxlwtsj2Kkcm2wVx9t+DQvDXemf2SeV8K/ME9qw==" + }, "on-finished": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", diff --git a/package.json b/package.json index 6bf496f..e7d676a 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "ngx-openlayers": "1.0.0-next.19", "ngx-uploadx": "^5.2.0", "ol": "6.14.1", - "ol-cesium": "^2.13.1", + "olcs": "^2.13.1", "resumablejs": "^1.1.0", "rxjs": "^6.6.7", "stream": "^0.0.2", diff --git a/projects/common-map3d/src/fm-map3d/components/olcs/switch2d3d/switch2d3d.component.ts b/projects/common-map3d/src/fm-map3d/components/olcs/switch2d3d/switch2d3d.component.ts index ab92fdf..4d5ed64 100644 --- a/projects/common-map3d/src/fm-map3d/components/olcs/switch2d3d/switch2d3d.component.ts +++ b/projects/common-map3d/src/fm-map3d/components/olcs/switch2d3d/switch2d3d.component.ts @@ -1,11 +1,9 @@ import { Component, OnInit,Input,Host } from '@angular/core'; -import { OldCircularArc } from 'arcgis-rest-api'; -import { Map } from 'ol'; import { Interaction} from 'ol/interaction'; import { MapComponent } from 'ngx-openlayers'; -import OLCesium from 'ol-cesium'; - -declare var olcs: any; +import OLCesium from 'olcs/OLCesium'; +import RasterSynchronizer from 'olcs/RasterSynchronizer'; +import VectorSynchronizer from 'olcs/VectorSynchronizer'; @Component({ selector: 'fm-map3d-switch2d3d', @@ -30,8 +28,8 @@ export class Switch2D3DComponent { this.ol3d = new OLCesium({ map: this.map.instance, createSynchronizers: (map,scene) => { this.synchronizers = [ - new olcs.RasterSynchronizer(map,scene), - new olcs.VectorSynchronizer(map,scene) + new RasterSynchronizer(map,scene), + new VectorSynchronizer(map,scene) ]; this.loading=false; return this.synchronizers;