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

Some more fixes

Browse Source
This commit is contained in:
Willem Dantuma 2022-08-19 21:17:13 +02:00
parent a767502d66
commit 83a5c1a7d2
12 changed files with 2541 additions and 2766 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
angular.json
View File

@ -254,6 +254,5 @@
} }
} }
} }
}, }
"defaultProject": "farmmaps-lib-app"
} }

6436
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

40
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "farmmaps-lib-app", "name": "farmmaps-lib-app",
"version": "2.1.1", "version": "3.0.0",
"scripts": { "scripts": {
"ng": "ng", "ng": "ng",
"start": "ng serve", "start": "ng serve",
@ -11,28 +11,28 @@
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@angular/animations": "~13.3.11", "@angular/animations": "^14.1.3",
"@angular/common": "~13.3.11", "@angular/common": "^14.1.3",
"@angular/compiler": "~13.3.11", "@angular/compiler": "^14.1.3",
"@angular/core": "~13.3.11", "@angular/core": "^14.1.3",
"@angular/forms": "~13.3.11", "@angular/forms": "^14.1.3",
"@angular/platform-browser": "~13.3.11", "@angular/platform-browser": "^14.1.3",
"@angular/platform-browser-dynamic": "~13.3.11", "@angular/platform-browser-dynamic": "^14.1.3",
"@angular/router": "~13.3.11", "@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.1.3", "@ng-bootstrap/ng-bootstrap": "^9.1.3",
"@ngrx/effects": "^13", "@ngrx/effects": "^14",
"@ngrx/router-store": "^13", "@ngrx/router-store": "^14",
"@ngrx/store": "^13", "@ngrx/store": "^14",
"angular-oauth2-oidc": "^13", "angular-oauth2-oidc": "^13",
"ngrx-store-localstorage": "^14",
"bootstrap": "^4.6.0", "bootstrap": "^4.6.0",
"cesium": "^1.82.1", "cesium": "^1.82.1",
"core-js": "^2.6.12", "core-js": "^2.6.12",
"moment": "^2.29.4", "moment": "^2.29.4",
"ngrx-store-localstorage": "^13",
"ngx-avatar": "^4.1.0", "ngx-avatar": "^4.1.0",
"ngx-clipboard": "^14.0.1", "ngx-clipboard": "^14.0.1",
"ngx-image-cropper": "^3.3.5", "ngx-image-cropper": "^3.3.5",
@ -47,12 +47,12 @@
"zone.js": "~0.11.4" "zone.js": "~0.11.4"
}, },
"devDependencies": { "devDependencies": {
"@angular-builders/custom-webpack": "^13", "@angular-builders/custom-webpack": "^14",
"@angular-devkit/build-angular": "^13.3.9", "@angular-devkit/build-angular": "^14.1.3",
"@angular/cli": "^13.3.9", "@angular/cli": "^14.1.3",
"@angular/compiler-cli": "~13.3.11", "@angular/compiler-cli": "^14.1.3",
"@angular/language-service": "~13.3.11", "@angular/language-service": "^14.1.3",
"@angular/localize": "^13.3.11", "@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",
@ -65,7 +65,7 @@
"karma-coverage-istanbul-reporter": "~3.0.2", "karma-coverage-istanbul-reporter": "~3.0.2",
"karma-jasmine": "~4.0.0", "karma-jasmine": "~4.0.0",
"karma-jasmine-html-reporter": "^1.6.0", "karma-jasmine-html-reporter": "^1.6.0",
"ng-packagr": "^13.3.1", "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",

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

@ -8,11 +8,11 @@
"tslib": "^2.0.0" "tslib": "^2.0.0"
}, },
"peerDependencies": { "peerDependencies": {
"@angular/core": "~13", "@angular/core": "~14",
"ngrx-store-localstorage": "^13", "ngrx-store-localstorage": "^14",
"@ngrx/effects": "^13", "@ngrx/effects": "^14",
"@ngrx/router-store":"^13", "@ngrx/router-store":"^14",
"@ngrx/store":"^13", "@ngrx/store":"^14",
"tassign": "^1.0.0", "tassign": "^1.0.0",
"@farmmaps/common": "~2.0", "@farmmaps/common": "~2.0",
"ngx-openlayers": "1.0.0-next.19", "ngx-openlayers": "1.0.0-next.19",

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/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,

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

@ -5,8 +5,8 @@
"registry": "https://repository.akkerweb.nl/repository/npm-hosted/" "registry": "https://repository.akkerweb.nl/repository/npm-hosted/"
}, },
"peerDependencies": { "peerDependencies": {
"@angular/common": "~13", "@angular/common": "~14",
"@angular/core": "~13", "@angular/core": "~14",
"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"

14
projects/common/package.json
View File

@ -6,17 +6,17 @@
}, },
"peerDependencies": { "peerDependencies": {
"@ng-bootstrap/ng-bootstrap": "^7.0", "@ng-bootstrap/ng-bootstrap": "^7.0",
"@angular/common": "~13", "@angular/common": "~14",
"@angular/core": "~13", "@angular/core": "~14",
"@angular/forms": "~13", "@angular/forms": "~14",
"@ngrx/effects": "^13", "@ngrx/effects": "^14",
"@ngrx/router-store": "^13", "@ngrx/router-store": "^14",
"@ngrx/store": "^13", "@ngrx/store": "^14",
"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": "^3.3.4",
"angular-oauth2-oidc": "^12.0", "angular-oauth2-oidc": "^13",
"moment": "^2.27.0", "moment": "^2.27.0",
"ngx-avatar": "^4.0.0", "ngx-avatar": "^4.0.0",
"ngx-image-cropper": "^3.3.5", "ngx-image-cropper": "^3.3.5",

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,

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"
], ],