diff --git a/angular.json b/angular.json index d456d41..4a2d49a 100644 --- a/angular.json +++ b/angular.json @@ -241,6 +241,46 @@ } } } + }, + "common-map3d": { + "projectType": "library", + "root": "projects/common-map3d", + "sourceRoot": "projects/common-map3d/src", + "prefix": "fm-map3d", + "architect": { + "build": { + "builder": "@angular-devkit/build-angular:ng-packagr", + "options": { + "tsConfig": "projects/common-map3d/tsconfig.lib.json", + "project": "projects/common-map3d/ng-package.json" + }, + "configurations": { + "production": { + "tsConfig": "projects/common-map3d/tsconfig.lib.prod.json" + } + } + }, + "test": { + "builder": "@angular-devkit/build-angular:karma", + "options": { + "main": "projects/common-map3d/src/test.ts", + "tsConfig": "projects/common-map3d/tsconfig.spec.json", + "karmaConfig": "projects/common-map3d/karma.conf.js" + } + }, + "lint": { + "builder": "@angular-devkit/build-angular:tslint", + "options": { + "tsConfig": [ + "projects/common-map3d/tsconfig.lib.json", + "projects/common-map3d/tsconfig.spec.json" + ], + "exclude": [ + "**/node_modules/**" + ] + } + } + } } }, "defaultProject": "farmmaps-lib-app" diff --git a/package-lock.json b/package-lock.json index cab857b..0cfc6dd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1715,9 +1715,7 @@ } }, "@farmmaps/common-map": { - "version": "0.0.1-prerelease.420", - "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map/-/common-map-0.0.1-prerelease.420.tgz", - "integrity": "sha512-91vy6x4M0ms/lk8Zc8I0uaAk2IG15UG1SXYDvuxgoQZHpQxaGQhALvKkf1mY8V27pwwx6dVDYs8X9VuTRIy9rw==", + "version": "file:dist/common-map", "requires": { "tslib": "^2.0.0" } diff --git a/package.json b/package.json index 43a1eca..0415b31 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "@angular/platform-browser-dynamic": "~10.1.3", "@angular/router": "~10.1.3", "@farmmaps/common": ">=0.0.1-prerelease.420 <0.0.1", - "@farmmaps/common-map": ">=0.0.1-prerelease.420 <0.0.1", + "@farmmaps/common-map": "file:dist/common-map", "@microsoft/signalr": "^3.1.3", "@ng-bootstrap/ng-bootstrap": "^7.0", "@ngrx/effects": "^10.0", @@ -33,7 +33,7 @@ "font-awesome": "^4.7.0", "ngrx-store-localstorage": "^10.0", "ngx-bootstrap": "^5.6.1", - "ngx-openlayers": "1.0.0-next.13", + "ngx-openlayers": "1.0.0-next.16", "ngx-uploadx": "^3.5.1", "ol": "6.1.1", "ol-cesium": "^2.11.3", diff --git a/projects/common-map/package.json b/projects/common-map/package.json index bdca699..655b895 100644 --- a/projects/common-map/package.json +++ b/projects/common-map/package.json @@ -15,7 +15,7 @@ "@ngrx/store": "^10.0", "tassign": "^1.0.0", "@farmmaps/common": ">=0.0.1-prerelease.420 <0.0.1", - "ngx-openlayers": "1.0.0-next.13", + "ngx-openlayers": "1.0.0-next.16", "ol": "6.1.1" } } diff --git a/projects/common-map/src/fm-map/common-map.module.ts b/projects/common-map/src/fm-map/common-map.module.ts index 0666c5b..45bd227 100644 --- a/projects/common-map/src/fm-map/common-map.module.ts +++ b/projects/common-map/src/fm-map/common-map.module.ts @@ -24,7 +24,6 @@ import { IPeriodState } from './models/period.state'; // components import { GpsLocation} from './components/aol/gps-location/gps-location.component'; -import {Switch2D3DComponent } from './components/aol/switch2d3d/switch2d3d.component'; import {FeatureListFeatureCropfieldComponent } from './components/feature-list-feature-cropfield/feature-list-feature-cropfield.component'; import { FeatureListFeatureCroppingschemeComponent} from './components/feature-list-feature-croppingscheme/feature-list-feature-croppingscheme.component'; import { ItemWidgetListComponent} from './components/item-widget-list/item-widget-list.component'; @@ -102,7 +101,6 @@ export { MapComponent, MetaDataModalComponent, RotationResetComponent, - Switch2D3DComponent, MapSearchComponent, SelectPeriodModalComponent, LayerListComponent, @@ -171,7 +169,6 @@ export { MapComponent, MetaDataModalComponent, RotationResetComponent, - Switch2D3DComponent, MapSearchComponent, SelectPeriodModalComponent, LayerListComponent, @@ -242,7 +239,6 @@ export { ItemWidgetListComponent, WidgetStatusComponent, RotationResetComponent, - Switch2D3DComponent, MapSearchComponent, SelectPeriodModalComponent, LayerListComponent, diff --git a/projects/common-map/src/fm-map/components/map/map.component.html b/projects/common-map/src/fm-map/components/map/map.component.html index 45854c4..2455031 100644 --- a/projects/common-map/src/fm-map/components/map/map.component.html +++ b/projects/common-map/src/fm-map/components/map/map.component.html @@ -39,7 +39,7 @@
- + 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-map/src/fm-map/components/aol/switch2d3d/switch2d3d.component.scss b/projects/common-map3d/src/fm-map3d/components/olcs/switch2d3d/switch2d3d.component.scss similarity index 100% rename from projects/common-map/src/fm-map/components/aol/switch2d3d/switch2d3d.component.scss rename to projects/common-map3d/src/fm-map3d/components/olcs/switch2d3d/switch2d3d.component.scss diff --git a/projects/common-map/src/fm-map/components/aol/switch2d3d/switch2d3d.component.ts b/projects/common-map3d/src/fm-map3d/components/olcs/switch2d3d/switch2d3d.component.ts similarity index 88% rename from projects/common-map/src/fm-map/components/aol/switch2d3d/switch2d3d.component.ts rename to projects/common-map3d/src/fm-map3d/components/olcs/switch2d3d/switch2d3d.component.ts index 1fe871f..d89a80e 100644 --- a/projects/common-map/src/fm-map/components/aol/switch2d3d/switch2d3d.component.ts +++ b/projects/common-map3d/src/fm-map3d/components/olcs/switch2d3d/switch2d3d.component.ts @@ -1,12 +1,11 @@ import { Component, OnInit,Input,Host } from '@angular/core'; import { MapComponent } from 'ngx-openlayers'; import OLCesium from 'ol-cesium'; -//import OLCesium from '../../../../../../../../ol-cesium/src/olcs/OLCesium.js'; declare var olcs: any; @Component({ - selector: 'fm-map-switch2d3d', + selector: 'fm-map3d-switch2d3d', template: '
{{label}}
', styleUrls: ['./switch2d3d.component.scss'] }) 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/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" ] } }