FarmMaps/FarmMapsLib
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Upgrade to olcs

Browse Source
This commit is contained in:
Willem Dantuma 2022-09-28 19:20:45 +02:00
parent eb1b8f18eb
commit a9185b86af
3 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
package-lock.json generated
View File

@ -40,7 +40,7 @@
"ngx-openlayers": "1.0.0-next.19", "ngx-openlayers": "1.0.0-next.19",
"ngx-uploadx": "^5.2.0", "ngx-uploadx": "^5.2.0",
"ol": "6.14.1", "ol": "6.14.1",
"ol-cesium": "^2.13.1", "olcs": "^2.13.1",
"resumablejs": "^1.1.0", "resumablejs": "^1.1.0",
"rxjs": "^6.6.7", "rxjs": "^6.6.7",
"stream": "^0.0.2", "stream": "^0.0.2",
@ -10552,15 +10552,6 @@
"url": "https://opencollective.com/openlayers" "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": { "node_modules/ol-mapbox-style": {
"version": "7.1.1", "version": "7.1.1",
"resolved": "https://registry.npmjs.org/ol-mapbox-style/-/ol-mapbox-style-7.1.1.tgz", "resolved": "https://registry.npmjs.org/ol-mapbox-style/-/ol-mapbox-style-7.1.1.tgz",
@ -10571,6 +10562,15 @@
"webfont-matcher": "^1.1.0" "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": { "node_modules/on-finished": {
"version": "2.4.1", "version": "2.4.1",
"resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
@ -23105,11 +23105,6 @@
"rbush": "^3.0.1" "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": { "ol-mapbox-style": {
"version": "7.1.1", "version": "7.1.1",
"resolved": "https://registry.npmjs.org/ol-mapbox-style/-/ol-mapbox-style-7.1.1.tgz", "resolved": "https://registry.npmjs.org/ol-mapbox-style/-/ol-mapbox-style-7.1.1.tgz",
@ -23120,6 +23115,11 @@
"webfont-matcher": "^1.1.0" "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": { "on-finished": {
"version": "2.4.1", "version": "2.4.1",
"resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",

2
package.json
View File

@ -43,7 +43,7 @@
"ngx-openlayers": "1.0.0-next.19", "ngx-openlayers": "1.0.0-next.19",
"ngx-uploadx": "^5.2.0", "ngx-uploadx": "^5.2.0",
"ol": "6.14.1", "ol": "6.14.1",
"ol-cesium": "^2.13.1", "olcs": "^2.13.1",
"resumablejs": "^1.1.0", "resumablejs": "^1.1.0",
"rxjs": "^6.6.7", "rxjs": "^6.6.7",
"stream": "^0.0.2", "stream": "^0.0.2",

12
projects/common-map3d/src/fm-map3d/components/olcs/switch2d3d/switch2d3d.component.ts
View File

@ -1,11 +1,9 @@
import { Component, OnInit,Input,Host } from '@angular/core'; import { Component, OnInit,Input,Host } from '@angular/core';
import { OldCircularArc } from 'arcgis-rest-api';
import { Map } from 'ol';
import { Interaction} from 'ol/interaction'; import { Interaction} from 'ol/interaction';
import { MapComponent } from 'ngx-openlayers'; import { MapComponent } from 'ngx-openlayers';
import OLCesium from 'ol-cesium'; import OLCesium from 'olcs/OLCesium';
import RasterSynchronizer from 'olcs/RasterSynchronizer';
declare var olcs: any; import VectorSynchronizer from 'olcs/VectorSynchronizer';
@Component({ @Component({
selector: 'fm-map3d-switch2d3d', selector: 'fm-map3d-switch2d3d',
@ -30,8 +28,8 @@ export class Switch2D3DComponent {
this.ol3d = new OLCesium({ map: this.map.instance, createSynchronizers: (map,scene) => { this.ol3d = new OLCesium({ map: this.map.instance, createSynchronizers: (map,scene) => {
this.synchronizers = [ this.synchronizers = [
new olcs.RasterSynchronizer(map,scene), new RasterSynchronizer(map,scene),
new olcs.VectorSynchronizer(map,scene) new VectorSynchronizer(map,scene)
]; ];
this.loading=false; this.loading=false;
return this.synchronizers; return this.synchronizers;