Merge branch 'develop'

# Conflicts:
#	package-lock.json
#	package.json

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

projects/common/src/fm/services/item.service.ts

@@ -154,7 +154,7 @@ export class ItemService {
 
   putItemFile(item: IItem, jsonObject: any): Observable<IItem> {
     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<any>(`${this.ApiEndpoint()}/api/v1/items/${item.code}/data`, formData);
   }

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;
     }
 

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<SelectEvent>();