-
+
diff --git a/projects/common-map3d/README.md b/projects/common-map3d/README.md
new file mode 100644
index 0000000..aa24b9f
--- /dev/null
+++ b/projects/common-map3d/README.md
@@ -0,0 +1,24 @@
+# CommonMap3d
+
+This library was generated with [Angular CLI](https://github.com/angular/angular-cli) version 10.1.3.
+
+## Code scaffolding
+
+Run `ng generate component component-name --project common-map3d` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module --project common-map3d`.
+> Note: Don't forget to add `--project common-map3d` or else it will be added to the default project in your `angular.json` file.
+
+## Build
+
+Run `ng build common-map3d` to build the project. The build artifacts will be stored in the `dist/` directory.
+
+## Publishing
+
+After building your library with `ng build common-map3d`, go to the dist folder `cd dist/common-map3d` and run `npm publish`.
+
+## Running unit tests
+
+Run `ng test common-map3d` to execute the unit tests via [Karma](https://karma-runner.github.io).
+
+## Further help
+
+To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).
diff --git a/projects/common-map3d/karma.conf.js b/projects/common-map3d/karma.conf.js
new file mode 100644
index 0000000..1b79caf
--- /dev/null
+++ b/projects/common-map3d/karma.conf.js
@@ -0,0 +1,32 @@
+// Karma configuration file, see link for more information
+// https://karma-runner.github.io/1.0/config/configuration-file.html
+
+module.exports = function (config) {
+ config.set({
+ basePath: '',
+ frameworks: ['jasmine', '@angular-devkit/build-angular'],
+ plugins: [
+ require('karma-jasmine'),
+ require('karma-chrome-launcher'),
+ require('karma-jasmine-html-reporter'),
+ require('karma-coverage-istanbul-reporter'),
+ require('@angular-devkit/build-angular/plugins/karma')
+ ],
+ client: {
+ clearContext: false // leave Jasmine Spec Runner output visible in browser
+ },
+ coverageIstanbulReporter: {
+ dir: require('path').join(__dirname, '../../coverage/common-map3d'),
+ reports: ['html', 'lcovonly', 'text-summary'],
+ fixWebpackSourcePaths: true
+ },
+ reporters: ['progress', 'kjhtml'],
+ port: 9876,
+ colors: true,
+ logLevel: config.LOG_INFO,
+ autoWatch: true,
+ browsers: ['Chrome'],
+ singleRun: false,
+ restartOnFileChange: true
+ });
+};
diff --git a/projects/common-map3d/ng-package.json b/projects/common-map3d/ng-package.json
new file mode 100644
index 0000000..886dc9c
--- /dev/null
+++ b/projects/common-map3d/ng-package.json
@@ -0,0 +1,7 @@
+{
+ "$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
+ "dest": "../../dist/common-map3d",
+ "lib": {
+ "entryFile": "src/public-api.ts"
+ }
+}
\ No newline at end of file
diff --git a/projects/common-map3d/package.json b/projects/common-map3d/package.json
new file mode 100644
index 0000000..2d75dd9
--- /dev/null
+++ b/projects/common-map3d/package.json
@@ -0,0 +1,14 @@
+{
+ "name": "common-map3d",
+ "version": "0.0.1",
+ "peerDependencies": {
+ "@angular/common": "^10.1.3",
+ "@angular/core": "^10.1.3",
+ "ngx-openlayers": "1.0.0-next.16",
+ "cesium": "^1.73.0",
+ "ol-cesium": "^2.11.3"
+ },
+ "dependencies": {
+ "tslib": "^2.0.0"
+ }
+}
\ No newline at end of file
diff --git a/projects/common-map3d/src/fm-map3d/common-map3d.module.ts b/projects/common-map3d/src/fm-map3d/common-map3d.module.ts
new file mode 100644
index 0000000..29a20f1
--- /dev/null
+++ b/projects/common-map3d/src/fm-map3d/common-map3d.module.ts
@@ -0,0 +1,11 @@
+import { NgModule } from '@angular/core';
+import { Switch2D3DComponent } from './components/olcs/switch2d3d/switch2d3d.component';
+
+
+@NgModule({
+ declarations: [Switch2D3DComponent],
+ imports: [
+ ],
+ exports: [Switch2D3DComponent]
+})
+export class CommonMap3dModule { }
diff --git a/projects/common-map3d/src/fm-map3d/common-map3d.service.spec.ts b/projects/common-map3d/src/fm-map3d/common-map3d.service.spec.ts
new file mode 100644
index 0000000..9bc6cad
--- /dev/null
+++ b/projects/common-map3d/src/fm-map3d/common-map3d.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { CommonMap3dService } from './common-map3d.service';
+
+describe('CommonMap3dService', () => {
+ let service: CommonMap3dService;
+
+ beforeEach(() => {
+ TestBed.configureTestingModule({});
+ service = TestBed.inject(CommonMap3dService);
+ });
+
+ it('should be created', () => {
+ expect(service).toBeTruthy();
+ });
+});
diff --git a/projects/common-map3d/src/fm-map3d/common-map3d.service.ts b/projects/common-map3d/src/fm-map3d/common-map3d.service.ts
new file mode 100644
index 0000000..db5e459
--- /dev/null
+++ b/projects/common-map3d/src/fm-map3d/common-map3d.service.ts
@@ -0,0 +1,9 @@
+import { Injectable } from '@angular/core';
+
+@Injectable({
+ providedIn: 'root'
+})
+export class CommonMap3dService {
+
+ constructor() { }
+}
diff --git a/projects/common-map3d/src/fm-map3d/components/olcs/switch2d3d/switch2d3d.component.scss b/projects/common-map3d/src/fm-map3d/components/olcs/switch2d3d/switch2d3d.component.scss
new file mode 100644
index 0000000..a4e654e
--- /dev/null
+++ b/projects/common-map3d/src/fm-map3d/components/olcs/switch2d3d/switch2d3d.component.scss
@@ -0,0 +1,15 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
+.twotreed {
+ display:block;
+ width:2.5em;
+ height:2.5em;
+ background-color: $body-bg;
+ background-size: contain;
+ margin-top:0.5em;
+ text-align: center;
+ line-height: 2.5em;
+ border-radius: 1.75em;
+ padding: 0;
+ color: $secondary;
+}
\ No newline at end of file
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
new file mode 100644
index 0000000..d89a80e
--- /dev/null
+++ b/projects/common-map3d/src/fm-map3d/components/olcs/switch2d3d/switch2d3d.component.ts
@@ -0,0 +1,49 @@
+import { Component, OnInit,Input,Host } from '@angular/core';
+import { MapComponent } from 'ngx-openlayers';
+import OLCesium from 'ol-cesium';
+
+declare var olcs: any;
+
+@Component({
+ selector: 'fm-map3d-switch2d3d',
+ template: '
{{label}}
',
+ styleUrls: ['./switch2d3d.component.scss']
+})
+export class Switch2D3DComponent {
+
+ @Input() enable:boolean;
+ public label: string = "3D";
+ private ol3d: OLCesium;
+ private synchronizers:any[];
+
+
+ constructor(@Host() private map: MapComponent) {
+
+ }
+
+ ngOnInit() {
+
+ this.ol3d = new OLCesium({ map: this.map.instance, createSynchronizers: (map,scene) => {
+ this.synchronizers = [
+ new olcs.RasterSynchronizer(map,scene),
+ new olcs.VectorSynchronizer(map,scene)
+ ];
+ return this.synchronizers;
+ }, stopOpenLayersEventsPropagation:true});
+ }
+
+ synchronize() {
+ this.synchronizers.forEach((synchronizer) => {
+ synchronizer.synchronize();
+ });
+ }
+
+ handleClick(event) {
+ this.enable = !this.enable;
+ if(this.enable) {
+ this.synchronize();
+ }
+ this.ol3d.setEnabled(this.enable);
+ this.label = this.enable?"2D":"3D";
+ }
+}
diff --git a/projects/common-map3d/src/public-api.ts b/projects/common-map3d/src/public-api.ts
new file mode 100644
index 0000000..ffbc9e2
--- /dev/null
+++ b/projects/common-map3d/src/public-api.ts
@@ -0,0 +1,7 @@
+/*
+ * Public API Surface of common-map3d
+ */
+
+export * from './fm-map3d/common-map3d.service';
+export * from './fm-map3d/components/olcs/switch2d3d/switch2d3d.component';
+export * from './fm-map3d/common-map3d.module';
diff --git a/projects/common-map3d/src/test.ts b/projects/common-map3d/src/test.ts
new file mode 100644
index 0000000..303b32a
--- /dev/null
+++ b/projects/common-map3d/src/test.ts
@@ -0,0 +1,26 @@
+// This file is required by karma.conf.js and loads recursively all the .spec and framework files
+
+import 'zone.js/dist/zone';
+import 'zone.js/dist/zone-testing';
+import { getTestBed } from '@angular/core/testing';
+import {
+ BrowserDynamicTestingModule,
+ platformBrowserDynamicTesting
+} from '@angular/platform-browser-dynamic/testing';
+
+declare const require: {
+ context(path: string, deep?: boolean, filter?: RegExp): {
+ keys(): string[];
+
(id: string): T;
+ };
+};
+
+// First, initialize the Angular testing environment.
+getTestBed().initTestEnvironment(
+ BrowserDynamicTestingModule,
+ platformBrowserDynamicTesting()
+);
+// Then we find all the tests.
+const context = require.context('./', true, /\.spec\.ts$/);
+// And load the modules.
+context.keys().map(context);
diff --git a/projects/common-map3d/tsconfig.lib.json b/projects/common-map3d/tsconfig.lib.json
new file mode 100644
index 0000000..6e06ad5
--- /dev/null
+++ b/projects/common-map3d/tsconfig.lib.json
@@ -0,0 +1,25 @@
+/* To learn more about this file see: https://angular.io/config/tsconfig. */
+{
+ "extends": "../../tsconfig.json",
+ "compilerOptions": {
+ "outDir": "../../out-tsc/lib",
+ "target": "es2015",
+ "declaration": true,
+ "declarationMap": true,
+ "inlineSources": true,
+ "types": [],
+ "lib": [
+ "dom",
+ "es2018"
+ ]
+ },
+ "angularCompilerOptions": {
+ "skipTemplateCodegen": true,
+ "strictMetadataEmit": true,
+ "enableResourceInlining": true
+ },
+ "exclude": [
+ "src/test.ts",
+ "**/*.spec.ts"
+ ]
+}
diff --git a/projects/common-map3d/tsconfig.lib.prod.json b/projects/common-map3d/tsconfig.lib.prod.json
new file mode 100644
index 0000000..5615c27
--- /dev/null
+++ b/projects/common-map3d/tsconfig.lib.prod.json
@@ -0,0 +1,10 @@
+/* To learn more about this file see: https://angular.io/config/tsconfig. */
+{
+ "extends": "./tsconfig.lib.json",
+ "compilerOptions": {
+ "declarationMap": false
+ },
+ "angularCompilerOptions": {
+ "enableIvy": false
+ }
+}
diff --git a/projects/common-map3d/tsconfig.spec.json b/projects/common-map3d/tsconfig.spec.json
new file mode 100644
index 0000000..16da33d
--- /dev/null
+++ b/projects/common-map3d/tsconfig.spec.json
@@ -0,0 +1,17 @@
+{
+ "extends": "../../tsconfig.json",
+ "compilerOptions": {
+ "outDir": "../../out-tsc/spec",
+ "types": [
+ "jasmine",
+ "node"
+ ]
+ },
+ "files": [
+ "src/test.ts"
+ ],
+ "include": [
+ "**/*.spec.ts",
+ "**/*.d.ts"
+ ]
+}
diff --git a/projects/common-map3d/tslint.json b/projects/common-map3d/tslint.json
new file mode 100644
index 0000000..124133f
--- /dev/null
+++ b/projects/common-map3d/tslint.json
@@ -0,0 +1,17 @@
+{
+ "extends": "../../tslint.json",
+ "rules": {
+ "directive-selector": [
+ true,
+ "attribute",
+ "lib",
+ "camelCase"
+ ],
+ "component-selector": [
+ true,
+ "element",
+ "lib",
+ "kebab-case"
+ ]
+ }
+}
diff --git a/src/main.ts b/src/main.ts
index c7b673c..c10fd29 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,12 +1,19 @@
+import * as Cesium from 'cesium';
+
import { enableProdMode } from '@angular/core';
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
import { AppModule } from './app/app.module';
import { environment } from './environments/environment';
+
+
if (environment.production) {
enableProdMode();
}
+window['CESIUM_BASE_URL'] = '/assets/cesium/';
+window['Cesium'] = Cesium;
+
platformBrowserDynamic().bootstrapModule(AppModule)
.catch(err => console.error(err));
diff --git a/tsconfig.json b/tsconfig.json
index 2288f09..26caf36 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -26,6 +26,10 @@
],
"common-map/*": [
"dist/common-map/*"
+ ],
+ "common-map3d": [
+ "dist/common-map3d/common-map3d",
+ "dist/common-map3d"
]
}
}