Merge branch 'develop'

This reverts commit a454f2306d.

projects/common-map/src/fm-map/actions/map.actions.ts

@@ -6,12 +6,14 @@ import { ILayervalue } from '../models/layer.value';
 import { IQueryState } from '@farmmaps/common';
 import { IItem } from '@farmmaps/common';
 import { Feature,Style } from 'ol';
+import { IPeriodState } from '../models/period.state';
 
 export const SETSTATE = '[Map] SetState';
 export const SETMAPSTATE = '[Map] MapState';
 export const SETVIEWEXTENT = '[Map] SetViewExtent';
 export const INIT = '[Map] Init';
 export const SETPARENT = '[Map] SetParent';
+export const SETPERIOD = '[Map] SetPeriod';
 export const STARTSEARCH = '[Map] StartSearch';
 export const STARTSEARCHSUCCESS = '[Map] StartSearchSuccess';
 export const SELECTFEATURE = '[Map] SelectFeature';
@@ -86,6 +88,12 @@ export class SetParent implements Action {
   constructor(public parentCode:string) { }
 }
 
+export class SetPeriod implements Action {
+  readonly type = SETPERIOD;
+
+  constructor(public period:IPeriodState) { }
+}
+
 export class StartSearch implements Action {
   readonly type = STARTSEARCH;
 
@@ -348,5 +356,6 @@ export type Actions = SetMapState
   | SetLayerValuesLocation
   | ToggleLayerValuesEnabled
   | GetLayerValueSuccess
-  | GetLayerValue;
+  | GetLayerValue
+  | SetPeriod;
 

projects/common-map/src/fm-map/common-map.module.ts

@@ -82,9 +82,17 @@ export function LocalStorageSync(reducer: ActionReducer<any>): ActionReducer<any
         if(ms) {
           r2["mapState"] = JSON.parse(ms);
         }
+        let sp = window.localStorage.getItem(MODULE_NAME+"_searchPeriod");
+        if(sp) {          
+          let p = JSON.parse(sp);
+          r2["period"] = { startDate: new Date(Date.parse(p.startDate)),endDate:new Date(Date.parse(p.endDate))};
+        }
     }
     if(action.type == "[Map] MapState" || action.type == "[Map] SetState") {
-        window.localStorage.setItem(MODULE_NAME + "_mapState",JSON.stringify(r2["mapState"]));
+      window.localStorage.setItem(MODULE_NAME + "_mapState",JSON.stringify(r2["mapState"]));
+    }
+    if(action.type == "[Map] SetPeriod" ) {
+      window.localStorage.setItem(MODULE_NAME + "_searchPeriod",JSON.stringify(r2["period"]));
     }
 
     return r2;

projects/common-map/src/fm-map/components/aol/item-vector-source/item-vector-source.component.ts

@@ -112,17 +112,18 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements
     this.host.instance.setSource(this.instance);
       
     this.host.instance.setStyle((feature) => {     
-      var key = feature.get('itemType') + (this.selectedItem?"_I":"");
+      var itemType = feature.get('itemType');
+      var key = itemType + (this.selectedItem?"_I":"");
       if (!this.stylesCache[key]) {
-        if (this.itemTypeService.itemTypes[key]) {
-          let itemType = this.itemTypeService.itemTypes[key];
-          let fillColor = color.asArray(itemType.iconColor);
+        if (this.itemTypeService.itemTypes[itemType]) {
+          let itemTypeEntry = this.itemTypeService.itemTypes[itemType];
+          let fillColor = color.asArray(itemTypeEntry.iconColor);
           fillColor[3] = 0;
           this.stylesCache[key] = new style.Style({
-              image: itemType.icon ? new style.Icon({
+              image: itemTypeEntry.icon ? new style.Icon({
                   anchor: [0.5, 1],
                   scale: 0.05,
-                  src: this.featureIconService$.getIconImageDataUrl(itemType.icon)
+                  src: this.featureIconService$.getIconImageDataUrl(itemTypeEntry.icon)
                 }):null,
               stroke: new style.Stroke({
                 color: 'red',

projects/common-map/src/fm-map/components/aol/layer-list/layer-list.component.html

@@ -17,7 +17,7 @@
           </div>
           <div *ngIf="itemLayer.legendVisible">
             <div class="card legend">
-              <fm-map-layer-legend [layer]="firstLayer(itemLayer)" (click)="handleLegendClick($event,itemLayer);"></fm-map-layer-legend>
+              <fm-map-layer-legend [layer]="firstLayer(itemLayer)" (click)="handleLegendClick($event,itemLayer);" [histogramenabled]="true"></fm-map-layer-legend>
             </div>
           </div>
       </div>

projects/common-map/src/fm-map/components/aol/layer-values/layer-values.component.html

@@ -7,7 +7,7 @@
                <li class="border-top pt-1 pb-1 value" *ngFor="let layerValue of layers">
                    <div>{{layerValue.layerName}}</div>
                    <div>{{layerValue.date|date}}</div>
-                   <div><span class="mr-1">{{layerValue.quantity}}</span> <span class="mr-1 font-weight-bold">{{layerValue.value}}</span><span>{{layerValue.unit}}</span></div>
+                   <div><span *ngIf="layerValue.quantity"><span class="mr-1">{{layerValue.quantity}}</span> </span><span class="mr-1 font-weight-bold">{{layerValue.value}}</span><span>{{layerValue.unit}}</span></div>
                </li>
            </ul>
            <ng-template #no_data>

projects/common-map/src/fm-map/components/legend/legend.component.ts

@@ -89,7 +89,7 @@ export class LegendComponent implements OnInit,AfterViewInit {
   }
 
   showHistogram(): boolean {
-    return this.histogramenabled && this.layer.renderer.band.histogram.entries && this.layer.renderer.band.histogram.entries.length > 0 && this.layer.renderer.colorMap.colormapType == "minmax";
+    return this.histogramenabled && this.layer.renderer.band.histogram.entries && this.layer.renderer.band.histogram.entries.length > 0 && this.layer.renderer.band.histogram.entries.length == this.layer.renderer.colorMap.entries.length;
   }
 
   bandContainsStatistics(): boolean {

projects/common-map/src/fm-map/components/map-search/map-search.component.html

@@ -33,4 +33,4 @@
     <ng-content></ng-content>
   </div>  
 </div>
-<fm-map-select-period-modal [modalState]="openedModalName" (onCloseModal)="handleCloseModal()" (onSelect)="handleSelectPeriod($event)" [startDate]="startDate" [endDate]="endDate"></fm-map-select-period-modal>
+<fm-map-select-period-modal [modalState]="openedModalName" (onCloseModal)="handleCloseModal()" (onSelect)="handleSelectPeriod($event)" [startDate]="periodLocal.startDate" [endDate]="periodLocal.endDate"></fm-map-select-period-modal>

projects/common-map/src/fm-map/components/map-search/map-search.component.ts

@@ -22,7 +22,10 @@ export class MapSearchComponent {
   @Input() set searchMinified(minified: boolean) {
     this.searchMinifiedLocal = minified;
   }
-  @Input() period: IPeriodState
+  @Input() set period(period:IPeriodState) {
+    this.periodLocal =  tassign(this.periodLocal,{startDate: period.startDate,endDate:period.endDate});
+    this.startEndCaption = this.timespanService.getCaption(period.startDate, period.endDate, 4)
+  }
   @Output() onSearch = new EventEmitter<IQueryState>();
   @Output() onClear = new EventEmitter<any>();
   @Output() onSearchCollapse = new EventEmitter<any>();
@@ -30,6 +33,7 @@ export class MapSearchComponent {
   @Output() onToggleMenu = new EventEmitter<any>();
   @Output() onOpenModal = new EventEmitter<string>();
   @Output() onCloseModal = new EventEmitter<any>();
+  @Output() onPeriodChange = new EventEmitter<IPeriodState>();
   @Input() openedModalName: string;
   @Input() set filterOptions(filterOptions: IQueryState) {
     if (filterOptions && filterOptions.query && filterOptions.query.length > 0) {
@@ -42,23 +46,18 @@ export class MapSearchComponent {
       this.searchTextLocal = { name: filterOptions.tags };
     } else {
       this.searchTextLocal = { name: filterOptions.query };
-    }
-    if (this.dateFilter) {
-      this.filterOptionsLocal.startDate = this.startDate;
-      this.filterOptionsLocal.endDate = this.endDate;
-    }
+    } 
   }
 
   public collapsedLocal: boolean = true;
   public searchMinifiedLocal: boolean = false;
+  public periodLocal: IPeriodState = { startDate:new Date(new Date(Date.now()).getFullYear(), new Date(Date.now()).getMonth() - 3, 1), endDate:new Date(Date.now())};
   public filterOptionsLocal: IQueryState;
   private extent: number[];
   public searchTextLocal: any;
   public searchTextLocalOutput: string; 
-  public dateFilter: boolean = true;
-  public startDate: Date = new Date(new Date(Date.now()).getFullYear(), new Date(Date.now()).getMonth() - 3, 1);
-  public endDate: Date = new Date(Date.now());
-  public startEndCaption: string = this.timespanService.getCaption(this.startDate, this.endDate, 4);
+  public dateFilter: boolean = true; 
+  public startEndCaption: string = this.timespanService.getCaption(this.periodLocal.startDate, this.periodLocal.endDate, 4);
 
   searching = false;
   searchFailed = false;
@@ -94,8 +93,8 @@ export class MapSearchComponent {
     this.filterOptionsLocal.parentCode = null;
     this.filterOptionsLocal.query = this.searchTextLocalOutput;
     if (this.dateFilter) {
-      this.filterOptionsLocal.startDate = this.startDate;
-      this.filterOptionsLocal.endDate = this.endDate;
+      this.filterOptionsLocal.startDate = this.periodLocal.startDate;
+      this.filterOptionsLocal.endDate = this.periodLocal.endDate;
     }
     this.onSearch.emit(this.filterOptionsLocal);
   }
@@ -117,26 +116,30 @@ export class MapSearchComponent {
     this.filterOptionsLocal.parentCode = null;
     this.filterOptionsLocal.tags = event.item.name;
     if (this.dateFilter) {
-      this.filterOptionsLocal.startDate = this.startDate;
-      this.filterOptionsLocal.endDate = this.endDate;
+      this.filterOptionsLocal.startDate = this.periodLocal.startDate;
+      this.filterOptionsLocal.endDate = this.periodLocal.endDate;
     }
     this.onSearch.emit(this.filterOptionsLocal);
     this.searchTextLocal = { name: this.filterOptionsLocal.tags };
   }
 
   handleSelectPeriod(event: { startDate: Date, endDate: Date }) {
-    this.startDate = event.startDate;
-    this.endDate = event.endDate;   
-    this.handleCloseModal();
+    this.periodLocal = { startDate: event.startDate, endDate: event.endDate}
+    this.onPeriodChange.emit(this.periodLocal);
     this.startEndCaption = this.timespanService.getCaption(event.startDate, event.endDate, 4);
-    this.onSearch.emit(this.filterOptionsLocal);
+    if(this.dateFilter) {
+      this.filterOptionsLocal.startDate =event.startDate;
+      this.filterOptionsLocal.endDate = event.endDate;
+      this.onSearch.emit(this.filterOptionsLocal);
+    }
+    this.handleCloseModal();
   }
 
   handleChangeEnableDateFilter(enabled) {
     this.dateFilter = enabled;
     if (enabled) {
-      this.filterOptionsLocal.startDate = this.startDate;
-      this.filterOptionsLocal.endDate = this.endDate;
+      this.filterOptionsLocal.startDate = this.periodLocal.startDate;
+      this.filterOptionsLocal.endDate = this.periodLocal.endDate;
     } else {
       this.filterOptionsLocal.startDate = null;
       this.filterOptionsLocal.endDate = null;

projects/common-map/src/fm-map/components/map/map.component.html

@@ -50,7 +50,7 @@
     <fm-map-file-drop-target [parentCode]="state.parentCode" (onFileDropped)="handleFileDropped($event)"></fm-map-file-drop-target>
 
     <div *ngIf="noContent">
-      <fm-map-map-search #mapSearch [openedModalName]="state.openedModalName" (onOpenModal)="handleOpenModal($event)" (onCloseModal)="handleCloseModal()" [ngClass]="{'menuVisible':state.menuVisible}" (onToggleMenu)="handleToggleMenu($event)" (onSearchCollapse)="handleSearchCollapse($event)" (onSearchExpand)="handleSearchExpand($event)" [collapsed]="state.searchCollapsed" [searchMinified]="state.searchMinified" (onSearch)="handleSearch($event)" (onClear)="handleClearSearch($event)" [filterOptions]="state.queryState" [clearEnabled]="state.clearEnabled" [period]="state.period"></fm-map-map-search>
+      <fm-map-map-search #mapSearch [openedModalName]="state.openedModalName" (onOpenModal)="handleOpenModal($event)" (onCloseModal)="handleCloseModal()" [ngClass]="{'menuVisible':state.menuVisible}" (onToggleMenu)="handleToggleMenu($event)" (onSearchCollapse)="handleSearchCollapse($event)" (onSearchExpand)="handleSearchExpand($event)" [collapsed]="state.searchCollapsed" [searchMinified]="state.searchMinified" (onSearch)="handleSearch($event)" (onClear)="handleClearSearch($event)" [filterOptions]="state.queryState" [clearEnabled]="state.clearEnabled" [period]="state.period" (onPeriodChange)="handlePeriodChange($event)"></fm-map-map-search>
     </div>
     <div class="side-panel-container">
       <fm-side-panel [resizeable]="true" [visible]="state.panelVisible && noContent" [collapsed]="state.panelCollapsed" [collapsable]="false">

projects/common-map/src/fm-map/components/map/map.component.ts

@@ -434,6 +434,10 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
     this.store.dispatch(new mapActions.SelectOverlayLayer(itemLayer));
   }
 
+  handlePeriodChange(period:IPeriodState) {
+    this.store.dispatch(new mapActions.SetPeriod(period));
+  }
+
   ngOnDestroy() {
     if (this.paramSub) this.paramSub.unsubscribe();
     if (this.itemTypeSub) this.itemTypeSub.unsubscribe();

projects/common-map/src/fm-map/effects/map.effects.ts

@@ -50,15 +50,16 @@ export class MapEffects {
   private _wktFormat: WKT;
   private overrideSelectedItemLayer: boolean = false;
 
-  private toPointFeature(updateEvent:commonActions.DeviceUpdateEvent): Feature {
+  private updateFeatureGeometry(feature:Feature, updateEvent:commonActions.DeviceUpdateEvent): Feature {
+    let newFeature = feature.clone();
     var f = this._wktFormat.readFeature(updateEvent.attributes["geometry"],{
       dataProjection: 'EPSG:4326',
       featureProjection: 'EPSG:3857'
     });
-    f.setId(updateEvent.itemCode);
     var centroid = getCenter(f.getGeometry().getExtent());
-    f.setGeometry(new Point(centroid));
-    return f;
+    newFeature.setId(feature.getId());
+    newFeature.setGeometry(new Point(centroid));
+    return newFeature;
   }
 
   init$ =  createEffect(() => this.actions$.pipe(
@@ -263,7 +264,7 @@ export class MapEffects {
         }
       }
       if (feature) {
-        return of(new mapActions.UpdateFeatureSuccess(this.toPointFeature(deviceUpdateEventAction)));
+        return of(new mapActions.UpdateFeatureSuccess(this.updateFeatureGeometry(feature,deviceUpdateEventAction)));
       } else {
         return [];
       }
@@ -316,7 +317,7 @@ export class MapEffects {
           if(v !== null) {
             if(l.renderer && l.renderer.colorMap && l.renderer.colorMap.colormapType == "manual") {
               l.renderer.colorMap.entries.forEach((e) => {
-                  if(e.value == v) {
+                  if(e.value == v && e.label) {
                     v=e.label;
                     return;
                   }

projects/common-map/src/fm-map/reducers/map.reducer.ts

@@ -3,7 +3,7 @@ import { IItem,Item } from '@farmmaps/common';
 import { IItemLayer,ItemLayer,ITemporalItemLayer,TemporalItemLayer} from '../models/item.layer';
 import { IMapState} from '../models/map.state';
 import { IQueryState} from '@farmmaps/common';
-import { IPeriodState} from '../models/period.state';
+import { IPeriodState } from '../models/period.state';
 import { IStyles} from '../models/style.cache';
 import { ILayervalue } from '../models/layer.value';
 import * as mapActions from '../actions/map.actions';
@@ -304,10 +304,14 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
       return tassign(state, {
         query: tassign(state.query,
           {
-            querystate: tassign(a.query, { bbox: a.query.bboxFilter ? state.viewExtent : [] }),
+            querystate: tassign(a.query, { bbox: a.query.bboxFilter ? state.viewExtent : [] }),  
             replace:a.replace
           })
-        })
+      })
+    }
+
+    case mapActions.SETPERIOD: {
+       return tassign(state,{ period: action.period});
     }
 
     case mapActions.ADDFEATURESUCCESS: {

projects/common/src/fm/common-service.module.ts

@@ -17,6 +17,7 @@ import { EventService } from './services/event.service';
 import { TypeaheadService } from './services/typeahead.service';
 import { UserService } from './services/user.service';
 import { ImageService } from './services/image.service';
+import { GeolocatorService } from './services/geolocator.service';
 import { WeatherService} from './services/weather.service';
 import { AppConfig } from './shared/app.config';
 import { AccessTokenInterceptor } from "./shared/accesstoken.interceptor";
@@ -44,6 +45,7 @@ export {
   TypeaheadService,
   UserService,
   ImageService,
+  GeolocatorService,
   WeatherService,
   AppConfig,
   AccessTokenInterceptor,

projects/common/src/fm/components/thumbnail/thumbnail.component.html

@@ -1,9 +1,9 @@
 <div #thumbnail class="thumbnail" [style.background-color]="itemTypeService.getColor(item.itemType)" >
     <div class="content">
-        <img *ngIf="item.thumbnail" class="card-img-top" [src]="getThumbnailUrl(item)" />
-        <div *ngIf="!item.thumbnail" class="large-icon" [style.font-size]="getFontSize()" [style.line-height]="getLineHeight()"><i [ngClass]="itemTypeService.getIcon(item.itemType)"></i></div>
+        <img *ngIf="hasThumbnail()" class="card-img-top" [src]="getThumbnailUrl(item)" />
+        <div *ngIf="!hasThumbnail()" class="large-icon" [style.font-size]="getFontSize()" [style.line-height]="getLineHeight()"><i [ngClass]="itemTypeService.getIcon(item.itemType)"></i></div>
         <div *ngIf="canEdit()" class="edit btn btn-secondary rounded-circle" (click)="onEditClick()"><i class="fal fa-camera"></i></div>
     </div>
 </div>
 
-<fm-edit-image-modal #modal (changed)="onChanged()"></fm-edit-image-modal>
+<fm-edit-image-modal #modal (changed)="onChanged($event)"></fm-edit-image-modal>

projects/common/src/fm/components/thumbnail/thumbnail.component.ts

@@ -1,7 +1,8 @@
-import { Component,Input ,ViewChild,ElementRef,ChangeDetectorRef} from '@angular/core';
+import { Component,Input ,ViewChild,ElementRef,ChangeDetectorRef, Output,EventEmitter} from '@angular/core';
 import { Store } from '@ngrx/store';
 
 import { IListItem  } from '../../models/list.item';
+import { ImageService } from '../../services/image.service';
 import { commonReducers,ItemTypeService } from '../../../public-api'
 import { EditImageModalComponent} from '../edit-image-modal/edit-image-modal.component';
 import { AppConfig } from "../../shared/app.config";
@@ -16,14 +17,25 @@ import { AppConfig } from "../../shared/app.config";
   export class ThumbnailComponent {
     @Input() public item: IListItem;
     @Input() public edit: boolean = false;
+    @Input() public save: boolean = true;
+    @Output() changed = new EventEmitter();
     @ViewChild('thumbnail') el:ElementRef;
     @ViewChild('modal') modal:EditImageModalComponent;
 
-    constructor(public store: Store<commonReducers.State>, public itemTypeService: ItemTypeService,public appConfig: AppConfig,private changeDetector:ChangeDetectorRef) {
+    public image = null;
+    private endpoint = "";
+    public thumnailUrl = "";
+
+    constructor(public store: Store<commonReducers.State>, public itemTypeService: ItemTypeService,public appConfig: AppConfig,private changeDetector:ChangeDetectorRef,public imageService:ImageService) {
     }
 
     getThumbnailUrl(item:IListItem):string {
-        return this.appConfig.getConfig("apiEndPoint")+item.url+'/thumbnail?v=' + Date.parse(item.updated);
+        if(this.image == null && this.item.thumbnail) {
+            this.thumnailUrl = this.appConfig.getConfig("apiEndPoint")+item.url+'/thumbnail?v=' + Date.parse(item.updated);
+        } else if (this.image == null) {
+            this.thumnailUrl = "";
+        } 
+        return this.thumnailUrl;
     }
 
     getFontSize():string {        
@@ -47,15 +59,28 @@ import { AppConfig } from "../../shared/app.config";
         return this.edit && this.item != null;
     }
 
-    onEditClick() {
-       var endpoint = `${this.appConfig.getConfig("apiEndPoint")}/api/v1/items/${this.item.code}/thumbnail`;
-       this.modal.open(endpoint,4/3);
+    hasThumbnail():boolean {
+        return (this.item && this.item.thumbnail) || this.image != null;
     }
 
-    onChanged() {
-        if(this.item) {
-            this.item.updated = new Date(new Date().getTime()).toISOString();
-            this.changeDetector.detectChanges();
-        }
+    onEditClick() {
+       this.endpoint = `${this.appConfig.getConfig("apiEndPoint")}/api/v1/items/${this.item.code}/thumbnail`;
+       this.modal.open(this.endpoint,4/3,false,200,false);
     }
+
+    onChanged(event:any) {
+        this.image = event.croppedImage;
+        this.imageService.blobToDataUrl(event.croppedImage).then(url => {
+           this.thumnailUrl = url
+           this.changeDetector.detectChanges();           
+           if(this.save) this.saveImage();
+           this.changed.emit(event.croppedImage);
+        });                
+    }
+
+    saveImage() {
+        if(this.image) {
+          this.imageService.putImage(this.endpoint,this.image).subscribe(() => {});      
+        }
+      }
   }

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

@@ -0,0 +1,21 @@
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { IUser } from '../models/user';
+import { HttpClient,HttpHeaders } from "@angular/common/http";
+import { AppConfig } from "../shared/app.config";
+
+@Injectable({
+  providedIn: 'root',
+})
+export class GeolocatorService {
+  constructor(public httpClient: HttpClient, public appConfig: AppConfig) {
+  }
+
+  ApiEndpoint() {
+    return this.appConfig.getConfig("apiEndPoint");
+  }
+
+  geocode(address:string): Observable<any>  {
+    return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/service/geocode?address=${address}`)   
+  }
+}

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

@@ -48,4 +48,18 @@ export class ImageService {
   blobToFile(blob:Blob, filename:string):File {
     return new File([blob],filename,{type:blob.type});
   }
+
+  blobToDataUrl(blob:File):Promise<string> {
+
+    return new Promise<string>((resolve) => {
+      let reader = new FileReader();
+      reader.addEventListener('error', () => {
+        resolve("");
+      });
+      reader.addEventListener("load", function () {
+        resolve(reader.result as string);
+      }, false);
+      reader.readAsDataURL(blob);
+    });
+  }
 }

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

@@ -28,7 +28,7 @@ export class PackageService {
     
     hasPackage(id:string):boolean {
        if(!this.packages$[id]) return false;
-       return this.packages$[id].enabled == true;
+       return this.packages$[id].enabled ? this.packages$[id].enabled == true : true;
     }
 
     postItemPackageTask(item: IItem, task: IItemTask): Observable<IItemTask> {