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

Merge branch 'develop'
All checks were successful
FarmMaps/FarmMapsLib/pipeline/head This commit looks good
Details
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Willem Dantuma 2023-01-23 15:24:24 +01:00
commit 237fd27489
23 changed files with 10186 additions and 20186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -33,6 +33,7 @@ speed-measure-plugin.json
.history/* .history/*
# misc # misc
/.angular/cache
/.sass-cache /.sass-cache
/connect.lock /connect.lock
/coverage /coverage

61
angular.json
View File

@ -148,18 +148,6 @@
"src/assets" "src/assets"
] ]
} }
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"src/tsconfig.app.json",
"src/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**"
]
}
} }
} }
}, },
@ -179,15 +167,6 @@
"devServerTarget": "farmmaps-lib-app:serve:production" "devServerTarget": "farmmaps-lib-app:serve:production"
} }
} }
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": "e2e/tsconfig.e2e.json",
"exclude": [
"**/node_modules/**"
]
}
} }
} }
}, },
@ -216,18 +195,6 @@
"tsConfig": "projects/common/tsconfig.spec.json", "tsConfig": "projects/common/tsconfig.spec.json",
"karmaConfig": "projects/common/karma.conf.js" "karmaConfig": "projects/common/karma.conf.js"
} }
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"projects/common/tsconfig.lib.json",
"projects/common/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**"
]
}
} }
} }
}, },
@ -256,18 +223,6 @@
"tsConfig": "projects/common-map/tsconfig.spec.json", "tsConfig": "projects/common-map/tsconfig.spec.json",
"karmaConfig": "projects/common-map/karma.conf.js" "karmaConfig": "projects/common-map/karma.conf.js"
} }
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"projects/common-map/tsconfig.lib.json",
"projects/common-map/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**"
]
}
} }
} }
}, },
@ -296,21 +251,11 @@
"tsConfig": "projects/common-map3d/tsconfig.spec.json", "tsConfig": "projects/common-map3d/tsconfig.spec.json",
"karmaConfig": "projects/common-map3d/karma.conf.js" "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" "cli": {
"analytics": false
}
} }

29983
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

59
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "farmmaps-lib-app", "name": "farmmaps-lib-app",
"version": "2.1.5", "version": "3.0.0",
"scripts": { "scripts": {
"ng": "ng", "ng": "ng",
"start": "ng serve", "start": "ng serve",
@ -11,23 +11,24 @@
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@angular/animations": "~12.2.8", "@angular/animations": "^14.1.3",
"@angular/common": "~12.2.8", "@angular/common": "^14.1.3",
"@angular/compiler": "~12.2.8", "@angular/compiler": "^14.1.3",
"@angular/core": "~12.2.8", "@angular/core": "^14.1.3",
"@angular/forms": "~12.2.8", "@angular/forms": "^14.1.3",
"@angular/platform-browser": "~12.2.8", "@angular/platform-browser": "^14.1.3",
"@angular/platform-browser-dynamic": "~12.2.8", "@angular/platform-browser-dynamic": "^14.1.3",
"@angular/router": "~12.2.8", "@angular/router": "^14.1.3",
"@farmmaps/common": "file:dist/common", "@farmmaps/common": "file:dist/common",
"@farmmaps/common-map": "file:dist/common-map", "@farmmaps/common-map": "file:dist/common-map",
"@farmmaps/common-map3d": "file:dist/common-map3d", "@farmmaps/common-map3d": "file:dist/common-map3d",
"@microsoft/signalr": "^3.1.16", "@microsoft/signalr": "^3.1.16",
"@ng-bootstrap/ng-bootstrap": "^9.0", "@ng-bootstrap/ng-bootstrap": "^13.0.0",
"@ngrx/effects": "^12.0", "@ngrx/effects": "^14",
"@ngrx/router-store": "^12.0", "@ngrx/router-store": "^14",
"@ngrx/store": "^12.0", "@ngrx/store": "^14",
"angular-oauth2-oidc": "^12.0", "@popperjs/core": "^2.11.6",
"angular-oauth2-oidc": "^13",
"assert": "^2.0.0", "assert": "^2.0.0",
"bootstrap": "^4.6.0", "bootstrap": "^4.6.0",
"browserify-zlib": "^0.2.0", "browserify-zlib": "^0.2.0",
@ -55,28 +56,28 @@
"zone.js": "~0.11.4" "zone.js": "~0.11.4"
}, },
"devDependencies": { "devDependencies": {
"@angular-builders/custom-webpack": "^12.1.3", "@angular-builders/custom-webpack": "^14",
"@angular-devkit/build-angular": "^12.2.8", "@angular-devkit/build-angular": "^14.1.3",
"@angular/cli": "^12.2.8", "@angular/cli": "^14.1.3",
"@angular/compiler-cli": "~12.2.8", "@angular/compiler-cli": "^14.1.3",
"@angular/language-service": "~12.2.8", "@angular/language-service": "^14.1.3",
"@angular/localize": "^12.2.8", "@angular/localize": "^14.1.3",
"@types/arcgis-rest-api": "^10.4.5", "@types/arcgis-rest-api": "^10.4.5",
"@types/jasmine": "~2.8.8", "@types/jasmine": "~2.8.8",
"@types/jasminewd2": "^2.0.9", "@types/jasminewd2": "^2.0.9",
"@types/node": "^12.20.15", "@types/node": "^12.20.15",
"codelyzer": "^5.1.2", "codelyzer": "^0.0.28",
"jasmine-core": "~3.5.0", "jasmine-core": "^4.3.0",
"jasmine-spec-reporter": "~5.0.0", "jasmine-spec-reporter": "^7.0.0",
"karma": "~6.3.3", "karma": "^6.3.20",
"karma-chrome-launcher": "~3.1.0", "karma-chrome-launcher": "~3.1.0",
"karma-coverage-istanbul-reporter": "~3.0.2", "karma-coverage-istanbul-reporter": "^3.0.3",
"karma-jasmine": "~4.0.0", "karma-jasmine": "^5.1.0",
"karma-jasmine-html-reporter": "^1.6.0", "karma-jasmine-html-reporter": "^2.0.0",
"ng-packagr": "^12.2.2", "ng-packagr": "^14.1.0",
"protractor": "~7.0.0", "protractor": "~7.0.0",
"ts-node": "^8.8.1", "ts-node": "^8.8.1",
"tslint": "~6.1.0", "tslint": "~6.1.0",
"typescript": "~4.3.5" "typescript": "~4.6.4"
} }
} }

18
projects/common-map/package.json
View File

@ -8,14 +8,14 @@
"tslib": "^2.0.0" "tslib": "^2.0.0"
}, },
"peerDependencies": { "peerDependencies": {
"@angular/core": "~12.2.8", "@angular/core": ">=14.0.0",
"ngrx-store-localstorage": "^12.0", "ngrx-store-localstorage": ">=14.0.0",
"@ngrx/effects": "^12.0", "@ngrx/effects": ">=14.0.0",
"@ngrx/router-store":"^12.0", "@ngrx/router-store":">=14.0.0",
"@ngrx/store":"^12.0", "@ngrx/store":">=14.0.0",
"tassign": "^1.0.0", "tassign": ">=1.0.0",
"@farmmaps/common": "~2.0", "@farmmaps/common": ">=2.0.0",
"ngx-openlayers": "1.0.0-next.19", "ngx-openlayers": ">=1.0.0-next.19",
"ol": "6.8.1" "ol": ">=6.8.1"
} }
} }

15
projects/common-map/src/fm-map/common-map.module.ts
View File

@ -224,21 +224,6 @@ export {
LayerValuesComponent, LayerValuesComponent,
GeometryThumbnailComponent GeometryThumbnailComponent
], ],
entryComponents: [
FeatureListComponent,
FeatureListCroppingschemeComponent,
FeatureListCropfieldComponent,
FeatureListFeatureComponent,
FeatureListFeatureCroppingschemeComponent,
FeatureListFeatureCropfieldComponent,
SelectedItemComponent,
SelectedItemCropfieldComponent,
SelectedItemGeotiffComponent,
SelectedItemTemporalComponent,
SelectedItemShapeComponent,
ItemListComponent,
ItemListItemComponent,
],
exports: [ exports: [
ItemVectorSourceComponent, ItemVectorSourceComponent,
ItemLayersComponent, ItemLayersComponent,

6
projects/common-map/src/fm-map/components/meta-data-modal/meta-data-modal.component.ts
View File

@ -1,5 +1,5 @@
import { Component, Output, ViewChild, EventEmitter, Input, ElementRef, HostListener } from '@angular/core'; import { Component, Output, ViewChild, EventEmitter, Input, ElementRef, HostListener } from '@angular/core';
import { FormGroup,FormBuilder, Validators } from '@angular/forms'; import { UntypedFormGroup,UntypedFormBuilder, Validators } from '@angular/forms';
import { IListItem } from '@farmmaps/common'; import { IListItem } from '@farmmaps/common';
import { IDroppedFile } from '../aol/file-drop-target/file-drop-target.component'; import { IDroppedFile } from '../aol/file-drop-target/file-drop-target.component';
import {NgbModal, NgbModalRef} from "@ng-bootstrap/ng-bootstrap"; import {NgbModal, NgbModalRef} from "@ng-bootstrap/ng-bootstrap";
@ -33,9 +33,9 @@ export class MetaDataModalComponent {
@Output() onCloseModal = new EventEmitter<any>(); @Output() onCloseModal = new EventEmitter<any>();
@Output() onAddFilesWithMetaData = new EventEmitter<IMetaData>(); @Output() onAddFilesWithMetaData = new EventEmitter<IMetaData>();
constructor(private modalService: NgbModal, public fb: FormBuilder) { } constructor(private modalService: NgbModal, public fb: UntypedFormBuilder) { }
public metaDataForm: FormGroup; public metaDataForm: UntypedFormGroup;
handleMetaDataEntered(event) { handleMetaDataEntered(event) {
if (this.metaDataForm.valid) { if (this.metaDataForm.valid) {

2
projects/common-map/src/fm-map/effects/map.effects.ts
View File

@ -126,7 +126,7 @@ export class MapEffects {
var endDate = a.queryState.endDate; var endDate = a.queryState.endDate;
var newAction:Observable<Action>; var newAction:Observable<Action>;
if (a.queryState.itemCode || a.queryState.parentCode || a.queryState.itemType || a.queryState.query || a.queryState.tags) { if (a.queryState.itemCode || a.queryState.parentCode || a.queryState.itemType || a.queryState.query || a.queryState.tags) {
newAction= this.itemService$.getFeatures(a.queryState.bbox, "EPSG:3857", a.queryState.query, a.queryState.tags, startDate, endDate, a.queryState.itemType, a.queryState.parentCode, null, a.queryState.level).pipe( newAction= this.itemService$.getFeatures(a.queryState.bbox, "EPSG:3857", a.queryState.query, a.queryState.tags, startDate, endDate, a.queryState.itemType, a.queryState.parentCode, a.queryState.dataFilter, a.queryState.level).pipe(
switchMap((features: any) => { switchMap((features: any) => {
for (let f of features.features) { for (let f of features.features) {
if (f.properties && f.properties["code"]) { if (f.properties && f.properties["code"]) {

4
projects/common-map/src/test.ts
View File

@ -14,7 +14,9 @@ declare const require: any;
// First, initialize the Angular testing environment. // First, initialize the Angular testing environment.
getTestBed().initTestEnvironment( getTestBed().initTestEnvironment(
BrowserDynamicTestingModule, BrowserDynamicTestingModule,
platformBrowserDynamicTesting() platformBrowserDynamicTesting(), {
teardown: { destroyAfterEach: false }
}
); );
// Then we find all the tests. // Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/); const context = require.context('./', true, /\.spec\.ts$/);

2
projects/common-map/tsconfig.lib.json
View File

@ -2,7 +2,7 @@
"extends": "../../tsconfig.json", "extends": "../../tsconfig.json",
"compilerOptions": { "compilerOptions": {
"outDir": "../../out-tsc/lib", "outDir": "../../out-tsc/lib",
"target": "es2015", "target": "es2020",
"module": "es2015", "module": "es2015",
"moduleResolution": "node", "moduleResolution": "node",
"declaration": true, "declaration": true,

2
projects/common-map/tsconfig.lib.prod.json
View File

@ -2,7 +2,7 @@
"extends": "../../tsconfig.json", "extends": "../../tsconfig.json",
"compilerOptions": { "compilerOptions": {
"outDir": "../../out-tsc/lib", "outDir": "../../out-tsc/lib",
"target": "es2015", "target": "es2020",
"module": "es2015", "module": "es2015",
"moduleResolution": "node", "moduleResolution": "node",
"declaration": true, "declaration": true,

8
projects/common-map3d/package.json
View File

@ -5,11 +5,11 @@
"registry": "https://repository.akkerweb.nl/repository/npm-hosted/" "registry": "https://repository.akkerweb.nl/repository/npm-hosted/"
}, },
"peerDependencies": { "peerDependencies": {
"@angular/common": "~12.2.8", "@angular/common": ">=14.0.0",
"@angular/core": "~12.2.8", "@angular/core": ">=14.0.0",
"ngx-openlayers": "1.0.0-next.19", "ngx-openlayers": "1.0.0-next.19",
"cesium": "^1.82.1", "cesium": ">=1.82.1",
"ol-cesium": "^2.13.0" "ol-cesium": ">=2.13.0"
}, },
"dependencies": { "dependencies": {
"tslib": "^2.0.0" "tslib": "^2.0.0"

4
projects/common-map3d/src/test.ts
View File

@ -18,7 +18,9 @@ declare const require: {
// First, initialize the Angular testing environment. // First, initialize the Angular testing environment.
getTestBed().initTestEnvironment( getTestBed().initTestEnvironment(
BrowserDynamicTestingModule, BrowserDynamicTestingModule,
platformBrowserDynamicTesting() platformBrowserDynamicTesting(), {
teardown: { destroyAfterEach: false }
}
); );
// Then we find all the tests. // Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/); const context = require.context('./', true, /\.spec\.ts$/);

5
projects/common/ng-package.json
View File

@ -2,10 +2,7 @@
"$schema": "../../node_modules/ng-packagr/ng-package.schema.json", "$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
"dest": "../../dist/common", "dest": "../../dist/common",
"lib": { "lib": {
"entryFile": "src/public-api.ts", "entryFile": "src/public-api.ts"
"umdModuleIds": {
"my-data": "my-data"
}
}, },
"allowedNonPeerDependencies": [ "allowedNonPeerDependencies": [
"." "."

45
projects/common/package-lock.json generated
View File

@ -1,27 +1,30 @@
{ {
"name": "@farmmaps/common", "name": "@farmmaps/common",
"version": "0.0.1", "version": "2.0.0",
"lockfileVersion": 1, "lockfileVersion": 2,
"requires": true, "requires": true,
"dependencies": { "packages": {
"is-retina": { "": {
"version": "1.0.3", "name": "@farmmaps/common",
"resolved": "https://registry.npmjs.org/is-retina/-/is-retina-1.0.3.tgz", "version": "2.0.0",
"integrity": "sha1-10AbKGvqKuN/Ykd1iN5QTQuGR+M=" "peerDependencies": {
}, "@angular/common": "^14.0.0",
"ngx-avatar": { "@angular/core": "^14.0.0",
"version": "4.0.0", "@angular/forms": "^14",
"resolved": "https://registry.npmjs.org/ngx-avatar/-/ngx-avatar-4.0.0.tgz", "@microsoft/signalr": "^3.1.3",
"integrity": "sha512-Uk40UXl26RvDy1ori9NDsGFB+f84AaxMnsIwZA6JPJK0pLcbo3F4vZTmzLZeOusOw1Qtgk5IzF630jo06keXwQ==", "@ng-bootstrap/ng-bootstrap": ">=10.0.0",
"requires": { "@ngrx/effects": "^14.0.0",
"is-retina": "^1.0.3", "@ngrx/router-store": "^14.0.0",
"ts-md5": "^1.2.4" "@ngrx/store": "^14.0.0",
} "angular-oauth2-oidc": "^13",
}, "bootstrap": "^4.4.1",
"ts-md5": { "moment": "^2.27.0",
"version": "1.2.7", "ngx-avatar": "^4.1.0",
"resolved": "https://registry.npmjs.org/ts-md5/-/ts-md5-1.2.7.tgz", "ngx-clipboard": "^14.0.1",
"integrity": "sha512-emODogvKGWi1KO1l9c6YxLMBn6CEH3VrH5mVPIyOtxBG52BvV4jP3GWz6bOZCz61nLgBc3ffQYE4+EHfCD+V7w==" "ngx-image-cropper": "^3.3.5",
"ngx-uploadx": "^5.2.0",
"tassign": "^1.0.0"
}
} }
} }
} }

32
projects/common/package.json
View File

@ -5,21 +5,21 @@
"registry": "https://repository.akkerweb.nl/repository/npm-hosted/" "registry": "https://repository.akkerweb.nl/repository/npm-hosted/"
}, },
"peerDependencies": { "peerDependencies": {
"@ng-bootstrap/ng-bootstrap": "^7.0", "@ng-bootstrap/ng-bootstrap": ">=10.0.0",
"@angular/common": "~12.2.8", "@angular/common": ">=14.0.0",
"@angular/core": "~12.2.8", "@angular/core": ">=14.0.0",
"@angular/forms": "~12.2.8", "@angular/forms": ">=14.0.0",
"@ngrx/effects": "^12.0", "@ngrx/effects": ">=14.0.0",
"@ngrx/router-store": "^12.0", "@ngrx/router-store": ">=14.0.0",
"@ngrx/store": "^12.0", "@ngrx/store": ">=14.0.0",
"tassign": "^1.0.0", "tassign": ">=1.0.0",
"bootstrap": "^4.4.1", "bootstrap": ">=4.4.1",
"@microsoft/signalr": "^3.1.3", "@microsoft/signalr": ">=3.1.3",
"ngx-uploadx": "^3.3.4", "ngx-uploadx": ">=5.1.0",
"angular-oauth2-oidc": "^12.0", "angular-oauth2-oidc": ">=13.0.0",
"moment": "^2.27.0", "moment": ">=2.27.0",
"ngx-avatar": "^4.0.0", "ngx-avatar": ">=4.1.0",
"ngx-image-cropper": "^3.3.5", "ngx-image-cropper": ">=3.3.5",
"ngx-clipboard": "^14.0.1" "ngx-clipboard": ">=14.0.1"
} }
} }

1
projects/common/src/fm/models/query.state.ts
View File

@ -1,6 +1,7 @@
export interface IQueryState { export interface IQueryState {
itemCode: string; itemCode: string;
parentCode: string; parentCode: string;
dataFilter?: string;
level: number; level: number;
itemType: string; itemType: string;
query: string; query: string;

4
projects/common/src/test.ts
View File

@ -14,7 +14,9 @@ declare const require: any;
// First, initialize the Angular testing environment. // First, initialize the Angular testing environment.
getTestBed().initTestEnvironment( getTestBed().initTestEnvironment(
BrowserDynamicTestingModule, BrowserDynamicTestingModule,
platformBrowserDynamicTesting() platformBrowserDynamicTesting(), {
teardown: { destroyAfterEach: false }
}
); );
// Then we find all the tests. // Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/); const context = require.context('./', true, /\.spec\.ts$/);

2
projects/common/tsconfig.lib.json
View File

@ -2,7 +2,7 @@
"extends": "../../tsconfig.json", "extends": "../../tsconfig.json",
"compilerOptions": { "compilerOptions": {
"outDir": "../../out-tsc/lib", "outDir": "../../out-tsc/lib",
"target": "es2015", "target": "es2020",
"module": "es2015", "module": "es2015",
"moduleResolution": "node", "moduleResolution": "node",
"declaration": true, "declaration": true,

2
projects/common/tsconfig.lib.prod.json
View File

@ -2,7 +2,7 @@
"extends": "../../tsconfig.json", "extends": "../../tsconfig.json",
"compilerOptions": { "compilerOptions": {
"outDir": "../../out-tsc/lib", "outDir": "../../out-tsc/lib",
"target": "es2015", "target": "es2020",
"module": "es2015", "module": "es2015",
"moduleResolution": "node", "moduleResolution": "node",
"declaration": true, "declaration": true,

10
src/polyfills.ts
View File

@ -18,16 +18,6 @@
* BROWSER POLYFILLS * BROWSER POLYFILLS
*/ */
/** IE10 and IE11 requires the following for NgClass support on SVG elements */
// import 'classlist.js'; // Run `npm install --save classlist.js`.
/**
* Web Animations `@angular/platform-browser/animations`
* Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
* Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
*/
// import 'web-animations-js'; // Run `npm install --save web-animations-js`.
/** /**
* By default, zone.js will patch all possible macroTask and DomEvents * By default, zone.js will patch all possible macroTask and DomEvents
* user can disable parts of macroTask/DomEvents patch by setting following flags * user can disable parts of macroTask/DomEvents patch by setting following flags

4
src/test.ts
View File

@ -12,7 +12,9 @@ declare const require: any;
// First, initialize the Angular testing environment. // First, initialize the Angular testing environment.
getTestBed().initTestEnvironment( getTestBed().initTestEnvironment(
BrowserDynamicTestingModule, BrowserDynamicTestingModule,
platformBrowserDynamicTesting() platformBrowserDynamicTesting(), {
teardown: { destroyAfterEach: false }
}
); );
// Then we find all the tests. // Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/); const context = require.context('./', true, /\.spec\.ts$/);

2
tsconfig.json
View File

@ -13,7 +13,7 @@
"allowSyntheticDefaultImports": true, "allowSyntheticDefaultImports": true,
"importHelpers": true, "importHelpers": true,
"skipLibCheck": true, "skipLibCheck": true,
"target": "es2015", "target": "es2020",
"typeRoots": [ "typeRoots": [
"node_modules/@types" "node_modules/@types"
], ],