Some refactoring

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

@@ -19,6 +19,7 @@ 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',
@@ -86,18 +87,17 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
       });
   }
 
-  createLayer(itemLayer: IItemLayer): Layer {
+  createGeotiffLayer(item:IItem,itemLayer:IItemLayer):Layer {
-    var layer: Layer = null;   
     var layerIndex = -1;
-    if (itemLayer.item.itemType == 'vnd.farmmaps.itemtype.geotiff.processed') {
+    var layer: Layer = null;  
-      layerIndex = itemLayer.layerIndex != -1 ? itemLayer.layerIndex : itemLayer.item.data.layers[0].index;
+    layerIndex = itemLayer.layerIndex != -1 ? itemLayer.layerIndex : 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()}` });
+    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()}` });
     layer = new Tile({ source: source });
-      var data = itemLayer.item.data;
+    var data = 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/${itemLayer.item.code}/tiles/${layerIndex}/{z}/{x}/{y}.png?v=${itemLayer.item.updated.getTime()}` });
+      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()}` });
       layer = new Tile({ source: source });
     }
     if (l && l.rendering && l.rendering.renderoutputType == "Image") {
@@ -107,22 +107,27 @@ 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/${itemLayer.item.code}/mapimage/${layerIndex}?v=${itemLayer.item.updated.getTime()}` });
+      let source = new ImageStatic({ imageExtent: ri.extent, projection: projection, url: `${this._apiEndPoint}/api/v1/items/${item.code}/mapimage/${layerIndex}?v=${item.updated.getTime()}` });
       layer = new Image({ source: source });
     }
-    } else if (itemLayer.item.itemType == 'vnd.farmmaps.itemtype.shape.processed') {
+    return layer;
-      var data = itemLayer.item.data;
+  }
-      layerIndex = itemLayer.layerIndex != -1 ? itemLayer.layerIndex : itemLayer.item.data.layers[0].index;
+
-      var l = itemLayer.item.data.layers[layerIndex];
+  createShapeLayer(item:IItem,itemLayer:IItemLayer):Layer {
+    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 = itemLayer.item.data.layers[layerIndex].rendering as IRenderoutputTiles;
+      var rt = 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/${itemLayer.item.code}/vectortiles/{z}/{x}/{y}.pbf?v=${itemLayer.item.updated.getTime()}`
+          url: `${this._apiEndPoint}/api/v1/items/${item.code}/vectortiles/{z}/{x}/{y}.pbf?v=${item.updated.getTime()}`
         }),
         style: (feature) => {
           return this.getColorFromGradient(l, feature);
@@ -134,7 +139,7 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
         source: new XYZ({
           maxZoom: rt.maxzoom,
           minZoom: rt.minzoom,
-            url: `${this._apiEndPoint}/api/v1/items/${itemLayer.item.code}/vectortiles/image_tiles/${layerIndex}/{z}/{x}/{y}.png?v=${itemLayer.item.updated.getTime()}`
+          url: `${this._apiEndPoint}/api/v1/items/${item.code}/vectortiles/image_tiles/${layerIndex}/{z}/{x}/{y}.png?v=${item.updated.getTime()}`
         })
       });
     } else {
@@ -144,7 +149,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(itemLayer.item.code, extent, projection.getCode(), layerIndex).subscribe(function (data) {
+          __this.itemService.getItemFeatures(item.code, extent, projection.getCode(), layerIndex).subscribe(function (data) {
             var features = format.readFeatures(data);
             for (let f of features) {
               if (f.get("code")) {
@@ -187,8 +192,12 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
         }
       });
     }
-    } else if (itemLayer.item.itemType == 'vnd.farmmaps.itemtype.layer') {
+    return 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();
@@ -214,6 +223,24 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
         break;
       }
     }
+    return layer;
+  }
+
+  createTemporalLayer(item:IItem,itemLayer:IItemLayer):Layer {
+    return null;
+  }
+
+  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);
+    } else if (itemLayer.item.itemType == 'vnd.farmmaps.itemtype.temporal') {
+      layer = this.createTemporalLayer(itemLayer.item,itemLayer);
     }
     if (layer) {
       let geometry = new GeoJSON().readGeometry(itemLayer.item.geometry);
@@ -241,15 +268,17 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
           layer = this.createLayer(itemLayer);
           if (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) {
           layer.setOpacity(itemLayer.opacity);
           layer.setVisible(itemLayer.visible);  
+        }
       });
       // Remove the layers that have disapeared from childrenLayers
       if (olLayers.getLength() > itemLayers.length) {

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

@@ -1,4 +1,4 @@
-import { IItem } from '@farmmaps/common';
+import { IItem,IListItem } from '@farmmaps/common';
 import {Layer} from 'ol/layer';
 
 export interface IItemLayer  {
@@ -24,3 +24,26 @@ export class ItemLayer implements IItemLayer {
     this.item = item;
   }
 }
+
+export interface ITemporalItemLayer extends IItemLayer {
+  previousLayer: Layer
+  selectedLayer: Layer,
+  nextLayer: Layer
+  temporalItems: IListItem[],
+  selectedItem: IListItem
+}
+
+export class TemporalItemLayer extends ItemLayer implements ITemporalItemLayer {
+  public previousLayer:Layer = null;
+  public selectedLayer:Layer = null;
+  public nextLayer:Layer = null;
+  public temporalItems:IListItem[] = [];
+  public selectedItem:IListItem =null;
+
+  constructor(item:IItem) {
+   super(item)
+  }
+}
+
+
+

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} from '../models/item.layer';
+import { IItemLayer,ItemLayer,TemporalItemLayer} from '../models/item.layer';
 import { IMapState} from '../models/map.state';
 import { IQueryState} from '@farmmaps/common';
 import { IPeriodState} from '../models/period.state';
@@ -164,6 +164,8 @@ 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,