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

@@ -1,8 +1,6 @@
 import { Action } from '@ngrx/store';
 
-import { IMapState } from '../models/map.state';
+import { IMapState,IItemLayer,IQueryState } from '../models';
-import { IItemLayer } from '../models/item.layer';
-import { IQueryState } from '../models/query.state';
 import { IItem } from '@farmmaps/common';
 import { Feature } from 'ol';
 import { Extent } from 'ol/extent';

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

@@ -16,12 +16,12 @@ import * as mapReducers from './reducers/map.reducer';
 import * as mapActions from './actions/map.actions';
 import * as mapEffects from './effects/map.effects';
 
-import { IMapState} from './models/map.state';
+import { IMapState} from './models';
-import { ISelectedFeatures } from './models/selected.features';
+import { ISelectedFeatures } from './models';
-import { IItemLayer } from './models/item.layer';
+import { IItemLayer } from './models';
-import { ItemLayer} from './models/item.layer';
+import { ItemLayer} from './models';
-import { IQueryState } from './models/query.state';
+import { IQueryState } from './models';
-import { IPeriodState } from './models/period.state';
+import { IPeriodState } from './models';
 
 // components
 import { GpsLocation} from './components/aol/gps-location/gps-location.component';
@@ -54,7 +54,7 @@ import { LayerListComponent } from './components/aol/layer-list/layer-list.compo
 import { MetaDataModalComponent } from './components/meta-data-modal/meta-data-modal.component';
 import { SelectPeriodModalComponent } from './components/select-period-modal/select-period-modal.component';
 import { MapComponent } from './components/map/map.component';
-import { MapSearchComponent } from './components/map-search/map-search.component';
+import { MapSearchComponent } from './components/map-search';
 import { MapRoutingModule } from './common-map-routing.module';
 import { LegendComponent } from './components/legend/legend.component';
 import { LayerVectorImageComponent } from './components/aol/layer-vector-image/layer-vector-image.component';

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

@@ -4,7 +4,7 @@ import { LayerVectorComponent, SourceVectorComponent, MapComponent, LayerImageCo
 import { LayerVectorImageComponent } from '../layer-vector-image/layer-vector-image.component';
 import { ItemService } from '@farmmaps/common';
 import { IItem } from '@farmmaps/common';
-import { ISelectedFeatures } from '../../../models/selected.features';
+import { ISelectedFeatures } from '../../../models';
 
 import {Vector} from 'ol/source';
 import {Feature,Collection} from 'ol';

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

@@ -3,9 +3,8 @@ 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} from '../../../models/item.layer';
+import { IItemLayer, ILayerData, IRenderoutputTiles, IRenderoutputImage, IGradientstop, ILayer, IHistogram } from '../../../models';
-import { ILayerData} from '../../../models/layer.data';
+
-import { IRenderoutputTiles,IRenderoutputImage,IGradientstop,ILayer,IHistogram} from '../../../models/color.map';
 import {Extent} from 'ol/extent';
 import Projection from 'ol/proj/Projection';
 import * as proj from 'ol/proj';

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

@@ -1,5 +1,5 @@
 import { Component,Input,Output,EventEmitter } from '@angular/core';
-import { IItemLayer } from '../../../models/item.layer';
+import { IItemLayer } from '../../../models';
 
 @Component({
   selector: 'fm-map-layer-list',

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

@@ -8,7 +8,7 @@ import * as mapActions from '../../actions/map.actions';
 import { Observable, from } from 'rxjs';
 import { withLatestFrom } from 'rxjs/operators';
 import { tassign } from 'tassign';
-import { IQueryState } from '../../models/query.state';
+import { IQueryState } from '../../models';
 
 
 @Injectable()

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

@@ -1,10 +1,14 @@
 import { Component, Input, Injectable } from '@angular/core';
 import { Location } from '@angular/common';
+import { Feature } from 'ol';
 import { Store } from '@ngrx/store';
 import * as mapReducers from '../../reducers/map.reducer';
-import { commonReducers,ItemTypeService,IListItem } from '@farmmaps/common';
+import { commonReducers,ItemTypeService, IItem, Item,IListItem } from '@farmmaps/common';
 import * as mapActions from '../../actions/map.actions';
+import { Observable, from } from 'rxjs';
+import { withLatestFrom } from 'rxjs/operators';
 import { tassign } from 'tassign';
+import { IQueryState } from '../../models';
 
 
 @Injectable()

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

@@ -15,7 +15,7 @@
   </tr>
   <tr *ngFor="let entry of layer.renderer.colorMap.entries; let i = index ">
     <td class="legend-items"><div [style.background-color]="getHex(entry.color)"></div></td>
-    <td class="legend-items-text"><span *ngIf="!entry.label">{{entry.value | number:'1.0-2'}} {{legendunit}}</span><span *ngIf="entry.label">{{entry.label}}</span></td>
+    <td class="legend-items-text">{{entry.value | number:'1.0-2'}} {{legendunit}}</td>
     <!--<td class="histogram-items-text"><span *ngIf="histogramenabled">{{entry.value}} {{histogramunit}}</span></td>
     <td class="histogram-items">
       <div *ngIf="histogramenabled" [style.background-color]="getHex(selectedColorMap.noValue)" [style.width]="getPart(selectedColorMap, entry)">

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

@@ -1,5 +1,5 @@
 import { Component, OnInit, Input,AfterViewInit } from '@angular/core';
-import { IColorMap, IColor, IColorEntry,ILayer } from '../../models/color.map';
+import { IColorMap, IColor, IColorEntry,ILayer } from '../../models';
 
 
 @Component({

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

@@ -0,0 +1 @@
+export * from './map-search.component';

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

@@ -2,8 +2,7 @@ import { Component, Input, Output, OnInit, EventEmitter, SimpleChanges, OnChange
 import { Observable ,  of } from 'rxjs';
 import { debounceTime,distinctUntilChanged,tap,switchMap,merge,catchError} from 'rxjs/operators';
 import { TypeaheadService, TimespanService } from '@farmmaps/common';
-import { IQueryState } from '../../models/query.state';
+import { IQueryState,IPeriodState } from '../../models';
-import { IPeriodState } from '../../models/period.state';
 import { fillProperties } from '@angular/core/src/util/property';
 import { tassign } from 'tassign';
 

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

@@ -9,11 +9,7 @@ import { Store } from '@ngrx/store';
 // Map
 import * as mapReducers from '../../reducers/map.reducer';
 import * as mapActions from '../../actions/map.actions';
-import { IMapState} from '../../models/map.state';
+import { IMapState,ISelectedFeatures,IItemLayer, ItemLayer,IQueryState,IPeriodState } from '../../models';
-import { ISelectedFeatures } from '../../models/selected.features';
-import { IItemLayer } from '../../models/item.layer';
-import { IQueryState } from '../../models/query.state';
-import { IPeriodState } from '../../models/period.state';
 import { IDroppedFile } from '../aol/file-drop-target/file-drop-target.component';
 import { IMetaData } from '../meta-data-modal/meta-data-modal.component';
 import { StateSerializerService } from '../../services/state-serializer.service';

projects/common-map/src/fm-map/models/index.ts

@@ -0,0 +1,7 @@
+export * from './map.state';
+export * from './selected.features';
+export * from './item.layer'
+export * from './layer.data'
+export * from './color.map';
+export * from './query.state';
+export * from './period.state';

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

@@ -1,9 +1,6 @@
 import { tassign } from 'tassign';
 import { IItem,Item } from '@farmmaps/common';
-import { IItemLayer,ItemLayer} from '../models/item.layer';
+import { IItemLayer,ItemLayer, IMapState,IQueryState,IPeriodState} from '../models'
-import { IMapState} from '../models/map.state';
-import { IQueryState} from '../models/query.state';
-import { IPeriodState} from '../models/period.state';
 import * as mapActions from '../actions/map.actions';
 import {commonActions} from '@farmmaps/common';
 import { createSelector, createFeatureSelector } from '@ngrx/store';

projects/common/src/fm/index.ts

@@ -0,0 +1 @@
+