diff --git a/package.json b/package.json index 9c55bec..e956d8f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,10 @@ { "name": "farmmaps-lib-app", +<<<<<<< HEAD "version": "4.3.1", +======= + "version": "4.4.0", +>>>>>>> develop "scripts": { "ng": "ng", "start": "ng serve", 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; } 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();