From 9b19950945cff02945c2d5e0237db8c74cceb7a1 Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Mon, 4 Mar 2024 13:20:23 +0100 Subject: [PATCH 1/4] Fix upload json formatting Fix extraAttributes null exception --- projects/common/src/fm/services/item.service.ts | 2 +- projects/common/src/fm/services/itemtype.service.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/common/src/fm/services/item.service.ts b/projects/common/src/fm/services/item.service.ts index 63d5355..c302639 100644 --- a/projects/common/src/fm/services/item.service.ts +++ b/projects/common/src/fm/services/item.service.ts @@ -154,7 +154,7 @@ export class ItemService { putItemFile(item: IItem, jsonObject: any): Observable { const formData = new FormData(); - const file = new File([JSON.stringify(jsonObject)], 'data.dat', {type: 'application/json'}); + const file = new File([JSON.stringify(jsonObject, undefined, '\t')], 'data.dat', {type: 'application/json'}); formData.append('file', file); return this.httpClient.put(`${this.ApiEndpoint()}/api/v1/items/${item.code}/data`, formData); } diff --git a/projects/common/src/fm/services/itemtype.service.ts b/projects/common/src/fm/services/itemtype.service.ts index cc06612..6887532 100644 --- a/projects/common/src/fm/services/itemtype.service.ts +++ b/projects/common/src/fm/services/itemtype.service.ts @@ -27,7 +27,7 @@ export class ItemTypeService { getExtraAttributes(itemType: string) { let extraAttributes = null; - if (this.itemTypes[itemType]) extraAttributes = this.itemTypes[itemType].extraAttributes; + if (this.itemTypes[itemType] && this.itemTypes[itemType].extraAttributes) extraAttributes = this.itemTypes[itemType].extraAttributes; return extraAttributes; } From 6b617ed4ad37b2b60d41b3565de7e4a4fd8b47bb Mon Sep 17 00:00:00 2001 From: jenkins Date: Mon, 4 Mar 2024 12:22:37 +0000 Subject: [PATCH 2/4] [ci skip] Updated packages #2444 --- package-lock.json | 12 ++++++------ package.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index ce47539..5da6b14 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "farmmaps-lib-app", - "version": "4.3.0", + "version": "4.4.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "farmmaps-lib-app", - "version": "4.3.0", + "version": "4.4.0", "dependencies": { "@angular-eslint/eslint-plugin": "^15.2.1", "@angular/animations": "^16.2.12", @@ -86,7 +86,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.3.0-prerelease.2442", + "version": "4.3.0-prerelease.2443", "dependencies": { "tslib": "^2.3.0" }, @@ -111,7 +111,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.3.0-prerelease.2442", + "version": "4.3.0-prerelease.2443", "dependencies": { "tslib": "^2.0.0" }, @@ -128,7 +128,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.3.0-prerelease.2442", + "version": "4.3.0-prerelease.2443", "dependencies": { "tslib": "^2.0.0" }, @@ -141,7 +141,7 @@ } }, "dist/ngx-openlayers": { - "version": "4.3.0-prerelease.2442", + "version": "4.3.0-prerelease.2443", "dependencies": { "tslib": "^2.3.0" }, diff --git a/package.json b/package.json index fa9734b..241df04 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "farmmaps-lib-app", - "version": "4.3.0", + "version": "4.4.0", "scripts": { "ng": "ng", "start": "ng serve", From 752e1e2c422da5fbe0d872121f54b46dff719114 Mon Sep 17 00:00:00 2001 From: Mark Date: Tue, 5 Mar 2024 15:39:52 +0100 Subject: [PATCH 3/4] added hit tolerance to ngx select interaction --- .../ngx-openlayers/src/lib/interactions/select.component.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/ngx-openlayers/src/lib/interactions/select.component.ts b/projects/ngx-openlayers/src/lib/interactions/select.component.ts index b3154a9..653eca4 100644 --- a/projects/ngx-openlayers/src/lib/interactions/select.component.ts +++ b/projects/ngx-openlayers/src/lib/interactions/select.component.ts @@ -33,6 +33,8 @@ export class SelectInteractionComponent implements OnInit, OnDestroy { filter?: FilterFunction; @Input() wrapX?: boolean; + @Input() + hitTolerance?: number; @Output() olChange = new EventEmitter(); From ce52cbdbed9f0f94a9655b51d4e6e2d0477d47e2 Mon Sep 17 00:00:00 2001 From: jenkins Date: Tue, 5 Mar 2024 14:41:30 +0000 Subject: [PATCH 4/4] [ci skip] Updated packages #2445 --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5da6b14..d154dff 100644 --- a/package-lock.json +++ b/package-lock.json @@ -86,7 +86,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.3.0-prerelease.2443", + "version": "4.4.0-prerelease.2444", "dependencies": { "tslib": "^2.3.0" }, @@ -111,7 +111,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.3.0-prerelease.2443", + "version": "4.4.0-prerelease.2444", "dependencies": { "tslib": "^2.0.0" }, @@ -128,7 +128,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.3.0-prerelease.2443", + "version": "4.4.0-prerelease.2444", "dependencies": { "tslib": "^2.0.0" }, @@ -141,7 +141,7 @@ } }, "dist/ngx-openlayers": { - "version": "4.3.0-prerelease.2443", + "version": "4.4.0-prerelease.2444", "dependencies": { "tslib": "^2.3.0" },