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

@@ -5,7 +5,6 @@ import { IItemLayer } from '../models/item.layer';
 import { IQueryState } from '@farmmaps/common';
 import { IItem } from '@farmmaps/common';
 import { Feature,Style } from 'ol';
-import { IListItem } from 'dist/common/public-api';
 
 export const SETSTATE = '[Map] SetState';
 export const SETMAPSTATE = '[Map] MapState';
@@ -17,10 +16,6 @@ export const STARTSEARCHSUCCESS = '[Map] StartSearchSuccess';
 export const SELECTFEATURE = '[Map] SelectFeature';
 export const SELECTITEM = '[Map] SelectItem';
 export const SELECTITEMSUCCESS = '[Map] SelectItemSuccess';
-export const SELECTTEMPORALITEMSSUCCESS = '[Map] SelectTemporalItemsSuccess';
-export const NEXTTEMPORAL = '[Map] NextTemporal';
-export const PREVIOUSTEMPORAL = '[Map] PreviousTemporal';
-export const SELECTTEMPORAL = '[Map] SelectTemporal';
 export const ADDFEATURESUCCESS = '[Map] AddFeatureSuccess';
 export const UPDATEFEATURESUCCESS = '[Map] UpdateFeatureSuccess';
 export const EXPANDSEARCH = '[Map] ExpandSearch';
@@ -102,30 +97,6 @@ export class SelectItemSuccess implements Action {
   constructor(public item: IItem) { }
 }
 
-export class SelectTemporalItemsSuccess implements Action {
-  readonly type = SELECTTEMPORALITEMSSUCCESS;
-
-  constructor(public temporalItems: IItem[]) { }
-}
-
-export class NextTemporal implements Action {
-  readonly type = NEXTTEMPORAL;
-
-  constructor() { }
-}
-
-export class PreviousTemporal implements Action {
-  readonly type = PREVIOUSTEMPORAL;
-
-  constructor() { }
-}
-
-export class SelectTemporal implements Action {
-  readonly type = SELECTTEMPORAL;
-
-  constructor(item:IItem) { }
-}
-
 export class AddFeatureSuccess implements Action {
   readonly type = ADDFEATURESUCCESS;
 
@@ -253,10 +224,6 @@ export type Actions = SetMapState
   | SelectFeature
   | SelectItem
   | SelectItemSuccess
-  | SelectTemporalItemsSuccess
-  | NextTemporal
-  | PreviousTemporal
-  | SelectTemporal
   | AddFeatureSuccess
   | UpdateFeatureSuccess
   | ExpandSearch

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

@@ -34,7 +34,6 @@ import { AbstractItemListComponent,ItemListComponent} from './components/item-li
 import { AbstractSelectedItemComponent, SelectedItemComponent } from './components/selected-item/selected-item.component';
 import { SelectedItemCropfieldComponent } from './components/selected-item-cropfield/selected-item-cropfield.component';
 import { SelectedItemGeotiffComponent } from './components/selected-item-geotiff/selected-item-geotiff.component';
-import { SelectedItemTemporalComponent} from './components/selected-item-temporal/selected-item-temporal.component';
 import {SelectedItemShapeComponent } from './components/selected-item-shape/selected-item-shape.component';
 import { SelectedItemContainerComponent } from './components/selected-item-container/selected-item-container.component';
 import { AbstractFeatureListFeatureComponent, FeatureListFeatureComponent } from './components/feature-list-feature/feature-list-feature.component';
@@ -117,7 +116,6 @@ export {
   SelectedItemComponent,
   SelectedItemCropfieldComponent,
   SelectedItemGeotiffComponent,
-  SelectedItemTemporalComponent,
   SelectedItemShapeComponent,
   ItemListItemComponent,
   ItemListItemContainerComponent,
@@ -184,7 +182,6 @@ export {
     SelectedItemComponent,
     SelectedItemCropfieldComponent,
     SelectedItemGeotiffComponent,
-    SelectedItemTemporalComponent,
     SelectedItemShapeComponent,
     ItemListItemComponent,
     ItemListItemContainerComponent,
@@ -205,7 +202,6 @@ export {
     SelectedItemComponent,
     SelectedItemCropfieldComponent,
     SelectedItemGeotiffComponent,
-    SelectedItemTemporalComponent,
     SelectedItemShapeComponent,
     ItemListComponent,
     ItemListItemComponent,
@@ -226,7 +222,6 @@ export {
        SelectedItemComponent,
        SelectedItemCropfieldComponent,
        SelectedItemGeotiffComponent,
-       SelectedItemTemporalComponent,
        SelectedItemShapeComponent,
        ItemListItemComponent,
        ItemListItemContainerComponent,
@@ -266,7 +261,6 @@ export class AppCommonMapModule {
         { provide: AbstractSelectedItemComponent, useClass: SelectedItemComponent, multi: true },
         { provide: AbstractSelectedItemComponent, useClass: SelectedItemCropfieldComponent, multi: true },
         { provide: AbstractSelectedItemComponent, useClass: SelectedItemGeotiffComponent, multi: true },
-        { provide: AbstractSelectedItemComponent, useClass: SelectedItemTemporalComponent, multi: true },
         { provide: AbstractSelectedItemComponent, useClass: SelectedItemShapeComponent, multi: true },
         { provide: AbstractItemListItemComponent, useClass: ItemListItemComponent, multi: true },
         { provide: AbstractItemListComponent, useClass: ItemListComponent, multi: true }

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

@@ -3,7 +3,7 @@ import { HttpClient } from "@angular/common/http";
 import { LayerVectorComponent, LayerTileComponent, LayerGroupComponent, MapComponent } from 'ngx-openlayers';
 import { ItemService } from '@farmmaps/common';
 import { AppConfig } from '@farmmaps/common';
-import { IItemLayer,ItemLayer, ITemporalItemLayer} from '../../../models/item.layer';
+import { IItemLayer} from '../../../models/item.layer';
 import { ILayerData} from '../../../models/layer.data';
 import { IRenderoutputTiles,IRenderoutputImage,IGradientstop,ILayer,IHistogram} from '../../../models/color.map';
 import {Extent} from 'ol/extent';
@@ -19,7 +19,6 @@ import VectorTileSource from 'ol/source/VectorTile';
 import VectorTileLayer from 'ol/layer/VectorTile';
 import {GeoJSON,MVT} from 'ol/format';
 import { from } from 'rxjs';
-import { IItem } from 'dist/common/public-api';
 
 @Component({
   selector: 'fm-map-item-layers',
@@ -87,17 +86,18 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
       });
   }
 
-  createGeotiffLayer(item:IItem,itemLayer:IItemLayer):Layer {
+  createLayer(itemLayer: IItemLayer): Layer {
-    var layerIndex = -1;
     var layer: Layer = null;   
-    layerIndex = itemLayer.layerIndex != -1 ? itemLayer.layerIndex : item.data.layers[0].index;
+    var layerIndex = -1;
-    let source = new XYZ({ maxZoom: 19, minZoom: 1, url: `${this._apiEndPoint}/api/v1/items/${item.code}/tiles/${layerIndex}/{z}/{x}/{y}.png?v=${item.updated.getTime()}` });
+    if (itemLayer.item.itemType == 'vnd.farmmaps.itemtype.geotiff.processed') {
+      layerIndex = itemLayer.layerIndex != -1 ? itemLayer.layerIndex : itemLayer.item.data.layers[0].index;
+      let source = new XYZ({ maxZoom: 19, minZoom: 1, url: `${this._apiEndPoint}/api/v1/items/${itemLayer.item.code}/tiles/${layerIndex}/{z}/{x}/{y}.png?v=${itemLayer.item.updated.getTime()}` });
       layer = new Tile({ source: source });
-    var data = item.data;
+      var data = itemLayer.item.data;
       var l = (data && data.layers && data.layers.length > 0) ? data.layers[0] : null;
       if (l && l.rendering && l.rendering.renderoutputType == "Tiles") {
         var rt = l.rendering as IRenderoutputTiles;
-      let source = new XYZ({ maxZoom: rt.maxzoom, minZoom: rt.minzoom, url: `${this._apiEndPoint}/api/v1/items/${item.code}/tiles/${layerIndex}/{z}/{x}/{y}.png?v=${item.updated.getTime()}` });
+        let source = new XYZ({ maxZoom: rt.maxzoom, minZoom: rt.minzoom, url: `${this._apiEndPoint}/api/v1/items/${itemLayer.item.code}/tiles/${layerIndex}/{z}/{x}/{y}.png?v=${itemLayer.item.updated.getTime()}` });
         layer = new Tile({ source: source });
       }
       if (l && l.rendering && l.rendering.renderoutputType == "Image") {
@@ -107,27 +107,22 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
           units: 'pixels',
           extent: ri.extent
         });
-      let source = new ImageStatic({ imageExtent: ri.extent, projection: projection, url: `${this._apiEndPoint}/api/v1/items/${item.code}/mapimage/${layerIndex}?v=${item.updated.getTime()}` });
+        let source = new ImageStatic({ imageExtent: ri.extent, projection: projection, url: `${this._apiEndPoint}/api/v1/items/${itemLayer.item.code}/mapimage/${layerIndex}?v=${itemLayer.item.updated.getTime()}` });
         layer = new Image({ source: source });
       }
-    return layer;
+    } else if (itemLayer.item.itemType == 'vnd.farmmaps.itemtype.shape.processed') {
-  }
+      var data = itemLayer.item.data;
-
+      layerIndex = itemLayer.layerIndex != -1 ? itemLayer.layerIndex : itemLayer.item.data.layers[0].index;
-  createShapeLayer(item:IItem,itemLayer:IItemLayer):Layer {
+      var l = itemLayer.item.data.layers[layerIndex];
-    var layerIndex = -1;
-    var layer: Layer = null; 
-    layerIndex = itemLayer.layerIndex != -1 ? itemLayer.layerIndex : item.data.layers[0].index;
-    var data = item.data;
-    var l = (data && data.layers && data.layers.length > 0) ? data.layers[0] : null;
       if (l && l.rendering && l.rendering.renderoutputType == "VectorTiles") {
-      var rt = item.data.layers[layerIndex].rendering as IRenderoutputTiles;
+        var rt = itemLayer.item.data.layers[layerIndex].rendering as IRenderoutputTiles;
         layer = new VectorTileLayer({
           declutter: true,
           source: new VectorTileSource({
             maxZoom: rt.maxzoom,
             minZoom: rt.minzoom,
             format: new MVT(),
-          url: `${this._apiEndPoint}/api/v1/items/${item.code}/vectortiles/{z}/{x}/{y}.pbf?v=${item.updated.getTime()}`
+            url: `${this._apiEndPoint}/api/v1/items/${itemLayer.item.code}/vectortiles/{z}/{x}/{y}.pbf?v=${itemLayer.item.updated.getTime()}`
           }),
           style: (feature) => {
             return this.getColorFromGradient(l, feature);
@@ -139,7 +134,7 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
           source: new XYZ({
             maxZoom: rt.maxzoom,
             minZoom: rt.minzoom,
-          url: `${this._apiEndPoint}/api/v1/items/${item.code}/vectortiles/image_tiles/${layerIndex}/{z}/{x}/{y}.png?v=${item.updated.getTime()}`
+            url: `${this._apiEndPoint}/api/v1/items/${itemLayer.item.code}/vectortiles/image_tiles/${layerIndex}/{z}/{x}/{y}.png?v=${itemLayer.item.updated.getTime()}`
           })
         });
       } else {
@@ -149,7 +144,7 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
           strategy: loadingstrategy.bbox,
           loader: function (extent: Extent, resolution: number, projection: Projection) {
             var source = this as VectorSource;
-          __this.itemService.getItemFeatures(item.code, extent, projection.getCode(), layerIndex).subscribe(function (data) {
+            __this.itemService.getItemFeatures(itemLayer.item.code, extent, projection.getCode(), layerIndex).subscribe(function (data) {
               var features = format.readFeatures(data);
               for (let f of features) {
                 if (f.get("code")) {
@@ -192,12 +187,8 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
           }
         });
       }
-    return layer;
+    } else if (itemLayer.item.itemType == 'vnd.farmmaps.itemtype.layer') {
-  }
+      let data = itemLayer.item.data as ILayerData;
-
-  createExternalLayer(item:IItem,itemLayer:IItemLayer):Layer {
-    let data = item.data as ILayerData;
-    var layer: Layer = null; 
       switch (data.interfaceType) {
         case 'OSM': {
           let source = new OSM();
@@ -223,18 +214,6 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
           break;
         }
       }
-    return layer;
-  }
-
-  createLayer(itemLayer: IItemLayer): Layer {
-    var layer: Layer = null;   
-    var layerIndex = -1;
-    if (itemLayer.item.itemType == 'vnd.farmmaps.itemtype.geotiff.processed') {
-      layer = this.createGeotiffLayer(itemLayer.item,itemLayer);
-    } else if (itemLayer.item.itemType == 'vnd.farmmaps.itemtype.shape.processed') {
-      layer = this.createShapeLayer(itemLayer.item,itemLayer);
-    } else if (itemLayer.item.itemType == 'vnd.farmmaps.itemtype.layer') {
-      layer = this.createExternalLayer(itemLayer.item,itemLayer);
     }
     if (layer) {
       let geometry = new GeoJSON().readGeometry(itemLayer.item.geometry);
@@ -250,51 +229,33 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
     this.updateLayers(this.itemLayers);
   }
 
-  addOrUpdateOlLayer(itemLayer:IItemLayer,index:number):Layer {
+  updateLayers(itemLayers: IItemLayer[]) {
-    if(!itemLayer) return null;
+    if (itemLayers) {
       var olLayers = this.instance.getLayers();
+      itemLayers.forEach((itemLayer, index) => {
+
         var layer = itemLayer.layer;
         let olIndex = olLayers.getArray().indexOf(layer);
         if (olIndex < 0) {
           // New layer: we add it to the map
           layer = this.createLayer(itemLayer);
           if (layer) {
-        olLayers.insertAt(index, layer);
+            itemLayer.layer = layer;
           }
+          olLayers.insertAt(index, layer);
         } else if (index !== olIndex) {
           // layer has moved inside the layers list
           olLayers.removeAt(olIndex);
           olLayers.insertAt(index, layer);
         }
-    if(layer) {
-      itemLayer.layer = layer;
         layer.setOpacity(itemLayer.opacity);
         layer.setVisible(itemLayer.visible);
-    }
-    return layer;
-  }
-
-  updateLayers(itemLayers: IItemLayer[]) {
-    let newLayers: IItemLayer[] = [];
-    if (itemLayers) {
-      itemLayers.forEach((itemLayer, index) => {
-        if(itemLayer.item.itemType ==  'vnd.farmmaps.itemtype.temporal') {
-          let il = itemLayer as ITemporalItemLayer;
-          let previousLayer = this.addOrUpdateOlLayer(il.previousItemLayer,newLayers.length);
-          if(previousLayer) newLayers.push(previousLayer);
-          let selectedLayer = this.addOrUpdateOlLayer(il.selectedItemLayer,newLayers.length);
-          if(selectedLayer) newLayers.push(selectedLayer);
-          let nextLayer = this.addOrUpdateOlLayer(il.nextItemLayer,newLayers.length);
-          if(nextLayer) newLayers.push(nextLayer);
-        } else {
-          let layer = this.addOrUpdateOlLayer(itemLayer,newLayers.length);
-          if(layer) newLayers.push(layer);           
-        }
       });
       // Remove the layers that have disapeared from childrenLayers
-      var olLayers = this.instance.getLayers();
+      if (olLayers.getLength() > itemLayers.length) {
-      while(olLayers.getLength() > newLayers.length) {
+        for (let i = itemLayers.length; i < olLayers.getLength(); i++) {
-        olLayers.removeAt(newLayers.length);
+          olLayers.removeAt(i);
+        }
       }
     }
   }

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

@@ -57,7 +57,7 @@
         </div>
   
         <div *ngIf="state.selectedItem;let item">
-          <fm-map-selected-item-container [item]="item" [itemLayer]="state.selectedItemLayer"></fm-map-selected-item-container>
+          <fm-map-selected-item-container [item]="item"></fm-map-selected-item-container>
         </div>
         <div *ngIf="state.features.length == 0" class="no-results  m-2">
           <div *ngIf="state.queryState.query">Cannot find <span>{{state.queryState?.query}}</span></div>

projects/common-map/src/fm-map/components/selected-item-container/selected-item-container.component.ts

@@ -2,7 +2,6 @@ import { Component, Input, OnInit, ComponentFactoryResolver, ViewChild, SimpleCh
 import { IItem } from '@farmmaps/common';
 import { AbstractSelectedItemComponent, SelectedItemComponent  } from '../selected-item/selected-item.component';
 import { WidgetHostDirective } from '../widget-host/widget-host.directive';
-import { IItemLayer } from '../../models/item.layer';
 
 
 @Component({
@@ -16,7 +15,6 @@ export class SelectedItemContainerComponent {
   }
 
   @Input() item: IItem;
-  @Input() itemLayer:IItemLayer
 
   @ViewChild(WidgetHostDirective, { static: true }) widgetHost: WidgetHostDirective; 
 
@@ -43,15 +41,11 @@ export class SelectedItemContainerComponent {
 
     const componentRef = viewContainerRef.createComponent(componentFactory);
     (<AbstractSelectedItemComponent>componentRef.instance).item = this.item;
-    (<AbstractSelectedItemComponent>componentRef.instance).itemLayer = this.itemLayer;
   }
 
   ngOnChanges(changes: SimpleChanges) {
     if (changes["item"] && changes["item"].currentValue) {
         this.loadComponent();
     }
-    if (changes["itemLayer"] && changes["itemLayer"].currentValue) {
-      this.loadComponent();
-    }
   }
 }

projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.html

@@ -1,30 +0,0 @@
-<div class="spacer"></div>
-<div *ngIf="selectedItem();let item">
-  <div class="card border-0">
-    <div class="card-body">
-      <div class="mb-2"><a href="#" (click)="handleBackToList($event)" i18n>Back</a></div>
-      <div class="card menu-card">
-        <h1>{{item.name}}</h1>
-        <h3>{{item.dataDate|date}}</h3>
-      </div>
-      <div class="legend-container" *ngIf="item?.data.layers;let layers">
-        <div class="card menu-card">
-          <div *ngIf="layers.length>1">
-            <select (change)="onLayerChanged($event.target.value)">
-              <option *ngFor="let l of layers;let layerIndex = index" [value]="layerIndex">{{l.name}}</option>
-            </select>
-          </div>
-          <fm-map-layer-legend [layer]="layers[selectedLayer]" [histogramenabled]="true"></fm-map-layer-legend>
-        </div>
-      </div>
-      <div class="card menu-card">
-        <ul class="p-0 mt-2">
-          <li *ngIf="item.isEditable"><a href="#" class="mt-1 mr-1" (click)="handleOnEdit(item)" i18n><i class="fa fa-pencil" aria-hidden="true" title="Edit"></i> Edit</a></li>
-          <li *ngIf="itemTypeService.isLayer(item)"><a href="#" (click)="handleAddAsLayer(item)" class="mt-1 mr-1" i18n><i class="fa fa-eye" aria-hidden="true" title="Add as layer"></i> Add as overlay</a></li>
-          <li *ngIf="hasNext()"><a href="#" (click)="handleNextTemporal($event)" class="mt-1 mr-1" i18n>Next <span>({{nextDate()|date}})</span></a></li>
-          <li *ngIf="hasPrevious()"><a href="#" (click)="handlePreviousTemporal($event)" class="mt-1 mr-1" i18n>Previous <span>({{previousDate()|date}})</span></a></li>
-        </ul>
-      </div>
-    </div>
-  </div>
-</div>

projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.scss

@@ -1,41 +0,0 @@
-@import "~bootstrap/scss/bootstrap.scss";
-
-.big-icon {
-  width: 100%;
-  color: white;
-  font-size: 9rem;
-  padding: 3rem;
-  text-align: center;
-}
-
-.card-title {
-  font-size: 1rem;
-}
-
-ul {
-  list-style:none;
-}
-
-li {
-  margin-top:1rem;
-}
-
-.spacer {
-  display:none;
-  height:4rem;
-}
-
-@media screen and (min-width:44rem) {
-  .spacer {
-    display:block;
-  }
-}
-
-.menu-card {
-  margin-left: -7px;
-  padding-left: 7px;
-  margin-right: -7px;
-  padding-right: 7px;
-  margin-bottom: 7px;
-}
-

projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.ts

@@ -1,73 +0,0 @@
-import { Component, Injectable } from '@angular/core';
-import { Location } from '@angular/common';
-import { Store } from '@ngrx/store';
-import * as mapReducers from '../../reducers/map.reducer';
-import { commonReducers, ItemTypeService, ItemService, FolderService,IItem } from '@farmmaps/common';
-import { Router } from '@angular/router';
-import { ForItemType } from '../for-item/for-itemtype.decorator';
-import { AbstractSelectedItemComponent } from '../selected-item/selected-item.component';
-import { ITemporalItemLayer} from '../../models/item.layer';
-import * as mapActions from '../../actions/map.actions';
-
-
-@ForItemType("vnd.farmmaps.itemtype.temporal")
-@Injectable()
-@Component({
-  selector: 'fm-map-selected-item-temporal',
-  templateUrl: './selected-item-temporal.component.html',
-  styleUrls: ['./selected-item-temporal.component.scss']
-})
-export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent {
-
-  constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService) {
-    super(store, itemTypeService,location,router);
-  }
-  public selectedLayer: number = 0;
-
-  onLayerChanged(layerIndex: number) {
-    this.selectedLayer = layerIndex;
-    this.store.dispatch(new mapActions.SetLayerIndex(layerIndex));
-  }
-
-  hasNext():boolean {
-    let temporalItemLayer = this.itemLayer as  ITemporalItemLayer;
-    return temporalItemLayer && temporalItemLayer.nextItemLayer != null;
-  }
-
-  nextDate():Date {
-    let temporalItemLayer = this.itemLayer as  ITemporalItemLayer;
-    if(temporalItemLayer.nextItemLayer.item) 
-      return temporalItemLayer.nextItemLayer.item.dataDate;
-    return null;
-  }
-
-  hasPrevious():boolean {
-    let temporalItemLayer = this.itemLayer as  ITemporalItemLayer;
-    return temporalItemLayer && temporalItemLayer.previousItemLayer != null;
-  }
-
-  previousDate():Date {
-    let temporalItemLayer = this.itemLayer as  ITemporalItemLayer;
-    if(temporalItemLayer.previousItemLayer.item) 
-      return temporalItemLayer.previousItemLayer.item.dataDate;
-    return null;
-  }
-
-  handleNextTemporal(event:MouseEvent) {
-    this.store.dispatch(new mapActions.NextTemporal());
-    event.preventDefault();    
-  }
-
-  handlePreviousTemporal(event:MouseEvent) {
-    this.store.dispatch(new mapActions.PreviousTemporal());
-    event.preventDefault();
-  }
-
-  selectedItem():IItem {
-    let temporalItemLayer = this.itemLayer as ITemporalItemLayer;
-    if(temporalItemLayer && temporalItemLayer.selectedItemLayer) {
-       return temporalItemLayer.selectedItemLayer.item;
-    }
-    return null;
-  }  
-}

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

@@ -5,13 +5,11 @@ import * as mapReducers from '../../reducers/map.reducer';
 import {AppConfig, commonReducers, IItem, ItemTypeService} from '@farmmaps/common';
 import * as mapActions from '../../actions/map.actions';
 import {Router} from '@angular/router';
-import { IItemLayer } from '../../models/item.layer';
 
 
 @Injectable()
 export abstract class AbstractSelectedItemComponent {
   @Input() item: IItem
-  @Input() itemLayer: IItemLayer
   constructor(public store: Store<mapReducers.State | commonReducers.State>, public itemTypeService: ItemTypeService, private location: Location, private router: Router) {
   }
 

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

@@ -172,24 +172,6 @@ export class MapEffects {
     }
     ));
 
-    @Effect()
-    selectItemSuccessTemporal$: Observable<Action> = this.actions$.pipe(
-      ofType(mapActions.SELECTITEMSUCCESS),
-      switchMap((action:mapActions.SelectItemSuccess) => {
-        if(action.item.itemType == "vnd.farmmaps.itemtype.temporal") {
-          return this.itemService$.getChildItemList(action.item.code,null).pipe(
-            map(items => new mapActions.SelectTemporalItemsSuccess(
-              items.sort((a, b) => 
-                 -(b.dataDate.getTime() - a.dataDate.getTime())
-              )
-            )),
-            catchError(error => of(new commonActions.Fail(error))));
-        } else {
-           return [];
-        }        
-      }
-      ));
-
   @Effect()
   uploadedItemClick$: Observable<Action> = this.actions$.pipe(
       ofType(commonActions.UPLOADEDFILECLICK),

projects/common-map/src/fm-map/models/item.layer.ts

@@ -1,4 +1,4 @@
-import { IItem,IListItem } from '@farmmaps/common';
+import { IItem } from '@farmmaps/common';
 import {Layer} from 'ol/layer';
 
 export interface IItemLayer  {
@@ -20,30 +20,7 @@ export class ItemLayer implements IItemLayer {
   public opacity: number = 1;
   public layerIndex: number = -1;
 
-  constructor(item:IItem,opacity:number = 1, visible:boolean = true) {
+  constructor(item:IItem) {
     this.item = item;
-    this.opacity = opacity;
-    this.visible = visible;
   }
 }
-
-export interface ITemporalItemLayer extends IItemLayer {
-  previousItemLayer: IItemLayer,
-  selectedItemLayer: IItemLayer,
-  nextItemLayer: IItemLayer,
-  temporalItems: IItem[],
-}
-
-export class TemporalItemLayer extends ItemLayer implements ITemporalItemLayer {
-  public previousItemLayer:IItemLayer = null;
-  public selectedItemLayer:IItemLayer =null;
-  public nextItemLayer:IItemLayer = null;
-  public temporalItems:IItem[] = [];
-
-  constructor(item:IItem,opacity:number = 1, visible:boolean = true) {
-   super(item,opacity,visible)
-  }
-}
-
-
-

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

@@ -1,6 +1,6 @@
 import { tassign } from 'tassign';
 import { IItem,Item } from '@farmmaps/common';
-import { IItemLayer,ItemLayer,ITemporalItemLayer,TemporalItemLayer} from '../models/item.layer';
+import { IItemLayer,ItemLayer} from '../models/item.layer';
 import { IMapState} from '../models/map.state';
 import { IQueryState} from '@farmmaps/common';
 import { IPeriodState} from '../models/period.state';
@@ -164,8 +164,6 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
       var itemLayer = null;
       if (a.item && "vnd.farmmaps.itemtype.layer,vnd.farmmaps.itemtype.shape.processed,vnd.farmmaps.itemtype.geotiff.processed".indexOf(a.item.itemType) >=0 ) {
         itemLayer = new ItemLayer(a.item);
-      } else if (a.item && a.item.itemType == "vnd.farmmaps.itemtype.temporal") {
-        itemLayer = new TemporalItemLayer(a.item);
       }
       return tassign(state, {
         selectedItem: a.item,
@@ -177,56 +175,6 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
         queryState: tassign(state.queryState, {itemCode:a.item ? a.item.code:null})
       });
     }
-    case mapActions.SELECTTEMPORALITEMSSUCCESS:{
-      let a = action as mapActions.SelectTemporalItemsSuccess;
-      let selectedItemLayer=tassign(state.selectedItemLayer) as TemporalItemLayer;
-      selectedItemLayer.temporalItems = a.temporalItems;
-      selectedItemLayer.selectedItemLayer = a.temporalItems.length>0?new ItemLayer(a.temporalItems[a.temporalItems.length-1]):null;
-      selectedItemLayer.previousItemLayer = a.temporalItems.length>1?new ItemLayer(a.temporalItems[a.temporalItems.length-2],0):null;
-      selectedItemLayer.nextItemLayer = null;
-      return tassign(state,{selectedItemLayer:tassign(state.selectedItemLayer,selectedItemLayer as ItemLayer)});
-    }
-    case mapActions.NEXTTEMPORAL: {
-      let temporalLayer = state.selectedItemLayer as ITemporalItemLayer;
-      if(temporalLayer.temporalItems && temporalLayer.temporalItems.length>0) {
-        let index = temporalLayer.temporalItems.indexOf(temporalLayer.selectedItemLayer.item);
-        if(index ==  (temporalLayer.temporalItems.length-1)) {
-          return state;
-        } else {
-          temporalLayer.previousItemLayer = temporalLayer.selectedItemLayer;
-          if( temporalLayer.previousItemLayer)  temporalLayer.previousItemLayer.opacity=0;
-          temporalLayer.selectedItemLayer = temporalLayer.nextItemLayer;
-          if( temporalLayer.selectedItemLayer)  temporalLayer.selectedItemLayer.opacity=1;
-          temporalLayer.nextItemLayer = index+2 < temporalLayer.temporalItems.length ? new ItemLayer(temporalLayer.temporalItems[index+2],0):null;
-          if( temporalLayer.nextItemLayer)  temporalLayer.nextItemLayer.opacity=0;
-          return tassign(state,{selectedItemLayer:tassign(state.selectedItemLayer,temporalLayer as ItemLayer)});
-        }
-      } else {
-        return state;
-      }
-    }
-    case mapActions.PREVIOUSTEMPORAL: {
-      let temporalLayer = state.selectedItemLayer as ITemporalItemLayer;
-      if(temporalLayer.temporalItems && temporalLayer.temporalItems.length>0) {
-        let index = temporalLayer.temporalItems.indexOf(temporalLayer.selectedItemLayer.item);
-        if(index ==  0) {
-          return state;
-        } else {
-          temporalLayer.nextItemLayer = temporalLayer.selectedItemLayer;
-          if( temporalLayer.nextItemLayer)  temporalLayer.nextItemLayer.opacity=0;
-          temporalLayer.selectedItemLayer = temporalLayer.previousItemLayer;
-          if( temporalLayer.selectedItemLayer)  temporalLayer.selectedItemLayer.opacity=1;
-          temporalLayer.previousItemLayer = index-2 >=0? new ItemLayer(temporalLayer.temporalItems[index-2],0):null;
-          if( temporalLayer.previousItemLayer)  temporalLayer.previousItemLayer.opacity=0;
-          return tassign(state,{selectedItemLayer:tassign(state.selectedItemLayer,temporalLayer as ItemLayer)});
-        }
-      } else {
-        return state;
-      }
-    }
-    case mapActions.SELECTTEMPORAL:{
-      //todo implement
-    }
     case mapActions.STARTSEARCH: {
       let a = action as mapActions.StartSearch;
       return tassign(state, {