Merge branch 'develop' of https://git.akkerweb.nl/FarmMaps/FarmMapsLib into develop

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

@@ -9,7 +9,7 @@ import { ActionReducer, MetaReducer, StoreModule } from '@ngrx/store';
 import { AngularOpenlayersModule } from 'ng-openlayers';
 
 //common modules
-import { AppCommonModule } from '@farmmaps/common';
+import { AppCommonModule, ItemService, ItemTypeService } from '@farmmaps/common';
 
 import * as mapActions from './actions/map.actions';
 import * as mapEffects from './effects/map.effects';
@@ -73,6 +73,7 @@ import { DeviceOrientationService } from './services/device-orientation.service'
 import { FeatureIconService } from './services/feature-icon.service';
 import { GeolocationService } from './services/geolocation.service';
 import { TemporalService } from './services/temporal.service';
+import { FolderService } from 'projects/common/src/public-api';
 
 export function LocalStorageSync(reducer: ActionReducer<any>): ActionReducer<any> {
   const r = function(state, action) {
@@ -113,120 +114,122 @@ export {
 };
 
 @NgModule({
-    imports: [
+  imports: [
-        CommonModule,
+    CommonModule,
-        AngularOpenlayersModule,
+    AngularOpenlayersModule,
-        MapRoutingModule,
+    MapRoutingModule,
-        StoreModule.forFeature(MODULE_NAME, mapReducers.reducer, { metaReducers: metaReducers }),
+    StoreModule.forFeature(MODULE_NAME, mapReducers.reducer, { metaReducers: metaReducers }),
-        EffectsModule.forFeature([mapEffects.MapEffects]),
+    EffectsModule.forFeature([mapEffects.MapEffects]),
-        NgbModule,
+    NgbModule,
-        FormsModule,
+    FormsModule,
-        ReactiveFormsModule,
+    ReactiveFormsModule,
-        AppCommonModule
+    AppCommonModule
-    ],
+  ],
-    declarations: [
+  declarations: [
-        ZoomToExtentComponent,
+    ZoomToExtentComponent,
-        ItemVectorSourceComponent,
+    ItemVectorSourceComponent,
-        ItemLayersComponent,
+    ItemLayersComponent,
-        FileDropTargetComponent,
+    FileDropTargetComponent,
-        MapComponent,
+    MapComponent,
-        MetaDataModalComponent,
+    MetaDataModalComponent,
-        RotationResetComponent,
+    RotationResetComponent,
-        MapSearchComponent,
+    MapSearchComponent,
-        SelectPeriodModalComponent,
+    SelectPeriodModalComponent,
-        LayerListComponent,
+    LayerListComponent,
-        LegendComponent,
+    LegendComponent,
-        LayerVectorImageComponent,
+    LayerVectorImageComponent,
-        FeatureListComponent,
+    FeatureListComponent,
-        WidgetHostDirective,
+    WidgetHostDirective,
-        FeatureListContainerComponent,
+    FeatureListContainerComponent,
-        FeatureListCroppingschemeComponent,
+    FeatureListCroppingschemeComponent,
-        FeatureListCropfieldComponent,
+    FeatureListCropfieldComponent,
-        FeatureListFeatureContainerComponent,
+    FeatureListFeatureContainerComponent,
-        FeatureListFeatureComponent,
+    FeatureListFeatureComponent,
-        FeatureListFeatureCroppingschemeComponent,
+    FeatureListFeatureCroppingschemeComponent,
-        FeatureListFeatureCropfieldComponent,
+    FeatureListFeatureCropfieldComponent,
-        SelectedItemContainerComponent,
+    SelectedItemContainerComponent,
-        SelectedItemComponent,
+    SelectedItemComponent,
-        SelectedItemCropfieldComponent,
+    SelectedItemCropfieldComponent,
-        SelectedItemGeotiffComponent,
+    SelectedItemGeotiffComponent,
-        SelectedItemTemporalComponent,
+    SelectedItemTemporalComponent,
-        SelectedItemShapeComponent,
+    SelectedItemShapeComponent,
-        ItemListItemComponent,
+    ItemListItemComponent,
-        ItemListItemContainerComponent,
+    ItemListItemContainerComponent,
-        ItemListComponent,
+    ItemListComponent,
-        ItemWidgetListComponent,
+    ItemWidgetListComponent,
-        WidgetStatusComponent,
+    WidgetStatusComponent,
-        GpsLocation,
+    GpsLocation,
-        PanToLocation,
+    PanToLocation,
-        LayerSwitcher,
+    LayerSwitcher,
-        HistogramDetailsComponent,
+    HistogramDetailsComponent,
-        StatisticsDetailsComponent,
+    StatisticsDetailsComponent,
-        ifZoomToShowDirective,
+    ifZoomToShowDirective,
-        ZoomToShowAlert,
+    ZoomToShowAlert,
-        LayerValuesComponent,
+    LayerValuesComponent,
-        GeometryThumbnailComponent
+    GeometryThumbnailComponent
-    ],
+  ],
-    exports: [
+  exports: [
-        ItemVectorSourceComponent,
+    ItemVectorSourceComponent,
-        ItemLayersComponent,
+    ItemLayersComponent,
-        FileDropTargetComponent,
+    FileDropTargetComponent,
-        MetaDataModalComponent,
+    MetaDataModalComponent,
-        MapComponent,
+    MapComponent,
-        GpsLocation,
+    GpsLocation,
-        PanToLocation,
+    PanToLocation,
-        LayerSwitcher,
+    LayerSwitcher,
-        FeatureListFeatureComponent,
+    FeatureListFeatureComponent,
-        FeatureListFeatureCropfieldComponent,
+    FeatureListFeatureCropfieldComponent,
-        FeatureListFeatureCroppingschemeComponent,
+    FeatureListFeatureCroppingschemeComponent,
-        SelectedItemContainerComponent,
+    SelectedItemContainerComponent,
-        SelectedItemComponent,
+    SelectedItemComponent,
-        SelectedItemCropfieldComponent,
+    SelectedItemCropfieldComponent,
-        SelectedItemGeotiffComponent,
+    SelectedItemGeotiffComponent,
-        SelectedItemTemporalComponent,
+    SelectedItemTemporalComponent,
-        SelectedItemShapeComponent,
+    SelectedItemShapeComponent,
-        ItemListItemComponent,
+    ItemListItemComponent,
-        ItemListItemContainerComponent,
+    ItemListItemContainerComponent,
-        ItemListComponent,
+    ItemListComponent,
-        ItemWidgetListComponent,
+    ItemWidgetListComponent,
-        WidgetStatusComponent,
+    WidgetStatusComponent,
-        RotationResetComponent,
+    RotationResetComponent,
-        MapSearchComponent,
+    MapSearchComponent,
-        SelectPeriodModalComponent,
+    SelectPeriodModalComponent,
-        LayerListComponent,
+    LayerListComponent,
-        LegendComponent,
+    LegendComponent,
-        LayerVectorImageComponent,
+    LayerVectorImageComponent,
-        FeatureListComponent,
+    FeatureListComponent,
-        WidgetHostDirective,
+    WidgetHostDirective,
-        FeatureListContainerComponent,
+    FeatureListContainerComponent,
-        FeatureListCroppingschemeComponent,
+    FeatureListCroppingschemeComponent,
-        FeatureListCropfieldComponent,
+    FeatureListCropfieldComponent,
-        FeatureListFeatureContainerComponent,
+    FeatureListFeatureContainerComponent,
-        ZoomToExtentComponent,
+    ZoomToExtentComponent,
-        ifZoomToShowDirective,
+    ifZoomToShowDirective,
-        ZoomToShowAlert,
+    ZoomToShowAlert,
-        GeometryThumbnailComponent
+    GeometryThumbnailComponent
-    ],
+  ],
-    providers: [
+  providers: [
-        FeatureIconService,
+    FeatureIconService,
-        GeolocationService,
+    GeolocationService,
-        DeviceOrientationService,
+    DeviceOrientationService,
-        TemporalService,
+    TemporalService,
-        { provide: AbstractFeatureListComponent, useClass: FeatureListCroppingschemeComponent, multi: true },
+    ItemTypeService,
-        { provide: AbstractFeatureListComponent, useClass: FeatureListCropfieldComponent, multi: true },
+    ItemService,
-        { provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureComponent, multi: true },
+    FolderService,
-        { provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureCroppingschemeComponent, multi: true },
+    { provide: AbstractFeatureListComponent, useClass: FeatureListCroppingschemeComponent, multi: true },
-        { provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureCropfieldComponent, multi: true },
+    { provide: AbstractFeatureListComponent, useClass: FeatureListCropfieldComponent, multi: true },
-        { provide: AbstractSelectedItemComponent, useClass: SelectedItemComponent, multi: true },
+    { provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureComponent, multi: true },
-        { provide: AbstractSelectedItemComponent, useClass: SelectedItemCropfieldComponent, multi: true },
+    { provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureCroppingschemeComponent, multi: true },
-        { provide: AbstractSelectedItemComponent, useClass: SelectedItemGeotiffComponent, multi: true },
+    { provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureCropfieldComponent, multi: true },
-        { provide: AbstractSelectedItemComponent, useClass: SelectedItemTemporalComponent, multi: true },
+    { provide: AbstractSelectedItemComponent, useClass: SelectedItemComponent, multi: true },
-        { provide: AbstractSelectedItemComponent, useClass: SelectedItemShapeComponent, multi: true },
+    { provide: AbstractSelectedItemComponent, useClass: SelectedItemCropfieldComponent, multi: true },
-        { provide: AbstractItemListItemComponent, useClass: ItemListItemComponent, multi: true },
+    { provide: AbstractSelectedItemComponent, useClass: SelectedItemGeotiffComponent, multi: true },
-        { provide: AbstractItemListComponent, useClass: ItemListComponent, 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 }
+  ]
 })
 
-
 export class AppCommonMapModule {  
 }