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

Merge branch 'develop'
Some checks failed
FarmMaps/FarmMapsLib/pipeline/head There was a failure building this commit
Details

Browse Source 
# Conflicts:
#	package-lock.json
#	package.json
This commit is contained in:
Peter Bastiani 2024-03-19 16:04:26 +01:00
commit 7e17a49dc6
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@ -1,6 +1,10 @@
{ {
"name": "farmmaps-lib-app", "name": "farmmaps-lib-app",
<<<<<<< HEAD
"version": "4.3.1", "version": "4.3.1",
=======
"version": "4.4.0",
>>>>>>> develop
"scripts": { "scripts": {
"ng": "ng", "ng": "ng",
"start": "ng serve", "start": "ng serve",

2
projects/common/src/fm/services/item.service.ts
View File

@ -154,7 +154,7 @@ export class ItemService {
putItemFile(item: IItem, jsonObject: any): Observable<IItem> { putItemFile(item: IItem, jsonObject: any): Observable<IItem> {
const formData = new FormData(); 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); formData.append('file', file);
return this.httpClient.put<any>(`${this.ApiEndpoint()}/api/v1/items/${item.code}/data`, formData); return this.httpClient.put<any>(`${this.ApiEndpoint()}/api/v1/items/${item.code}/data`, formData);
} }

2
projects/common/src/fm/services/itemtype.service.ts
View File

@ -27,7 +27,7 @@ export class ItemTypeService {
getExtraAttributes(itemType: string) { getExtraAttributes(itemType: string) {
let extraAttributes = null; 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; return extraAttributes;
} }

2
projects/ngx-openlayers/src/lib/interactions/select.component.ts
View File

@ -33,6 +33,8 @@ export class SelectInteractionComponent implements OnInit, OnDestroy {
filter?: FilterFunction; filter?: FilterFunction;
@Input() @Input()
wrapX?: boolean; wrapX?: boolean;
@Input()
hitTolerance?: number;
@Output() @Output()
olChange = new EventEmitter<SelectEvent>(); olChange = new EventEmitter<SelectEvent>();