Some fixes

This commit is contained in:
Willem Dantuma
2019-11-01 15:57:50 +01:00
parent 173be180ce
commit ca6331e053
30 changed files with 707 additions and 91 deletions

View File

@@ -1,4 +1,4 @@
import { NgModule } from '@angular/core';
import { NgModule ,ModuleWithProviders} from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
@@ -62,6 +62,7 @@ import { WidgetStatusComponent } from './components/widget-status/widget-status.
import { ItemListItemShadowComponent } from './components/item-list-item-shadow/item-list-item-shadow.component';
import { ItemListItemBofekComponent } from './components/item-list-item-bofek/item-list-item-bofek.component';
export {
mapEffects,
mapReducer,
@@ -171,48 +172,26 @@ export {
// Switch2D3DComponent
],
entryComponents: [
// FeatureListComponent,
// FeatureListCroppingschemeComponent,
// FeatureListCropfieldComponent,
// FeatureListFeatureComponent,
// FeatureListFeatureCroppingschemeComponent,
// FeatureListFeatureCropfieldComponent,
// SelectedItemComponent,
// SelectedItemCropfieldComponent,
// SelectedItemGeotiffComponent,
// SelectedItemShapeComponent,
// ItemListComponent,
// ItemListItemComponent,
// ItemWidgetWeatherComponent,
// ItemListItemTemporalComponent,
// ItemListItemHeightComponent,
// ItemListItemTipstarComponent,
// ItemListItemWatBalComponent,
// ItemListItemShadowComponent,
// ItemListItemBofekComponent,
FeatureListComponent,
FeatureListCroppingschemeComponent,
FeatureListCropfieldComponent,
FeatureListFeatureComponent,
FeatureListFeatureCroppingschemeComponent,
FeatureListFeatureCropfieldComponent,
SelectedItemComponent,
SelectedItemCropfieldComponent,
SelectedItemGeotiffComponent,
SelectedItemShapeComponent,
ItemListComponent,
ItemListItemComponent,
ItemWidgetWeatherComponent,
ItemListItemTemporalComponent,
ItemListItemHeightComponent,
ItemListItemTipstarComponent,
ItemListItemWatBalComponent,
ItemListItemShadowComponent,
ItemListItemBofekComponent,
],
// providers: [
// StateSerializerService,
// GeolocationService,
// { provide: AbstractFeatureListComponent, useClass: FeatureListCroppingschemeComponent, multi: true },
// { provide: AbstractFeatureListComponent, useClass: FeatureListCropfieldComponent, multi: true },
// { provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureComponent, multi: true },
// { provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureCroppingschemeComponent, multi: true },
// { provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureCropfieldComponent, multi: true },
// { provide: AbstractSelectedItemComponent, useClass: SelectedItemComponent, multi: true },
// { provide: AbstractSelectedItemComponent, useClass: SelectedItemCropfieldComponent, multi: true },
// { provide: AbstractSelectedItemComponent, useClass: SelectedItemGeotiffComponent, multi: true },
// { provide: AbstractSelectedItemComponent, useClass: SelectedItemShapeComponent, multi: true },
// { provide: AbstractItemListItemComponent, useClass: ItemListItemComponent, multi: true },
// { provide: AbstractItemWidgetComponent, useClass: ItemWidgetWeatherComponent, multi: true },
// { provide: AbstractItemListItemComponent, useClass: ItemListItemTemporalComponent, multi: true },
// { provide: AbstractItemListItemComponent, useClass: ItemListItemHeightComponent, multi: true },
// { provide: AbstractItemListItemComponent, useClass: ItemListItemTipstarComponent, multi: true },
// { provide: AbstractItemListItemComponent, useClass: ItemListItemWatBalComponent, multi: true },
// { provide: AbstractItemListItemComponent, useClass: ItemListItemShadowComponent, multi: true },
// { provide: AbstractItemListItemComponent, useClass: ItemListItemBofekComponent, multi: true },
// { provide: AbstractItemListComponent, useClass: ItemListComponent, multi: true }
// ],
exports: [
ItemVectorSourceComponent,
ItemFeaturesSourceComponent,
@@ -256,4 +235,33 @@ export {
ZoomToExtentComponent
]
})
export class CommonMapModule { }
export class AppCommonMapModule {
static forRoot(): ModuleWithProviders {
return {
ngModule: AppCommonMapModule,
providers: [
StateSerializerService,
GeolocationService,
{ provide: AbstractFeatureListComponent, useClass: FeatureListCroppingschemeComponent, multi: true },
{ provide: AbstractFeatureListComponent, useClass: FeatureListCropfieldComponent, multi: true },
{ provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureComponent, multi: true },
{ provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureCroppingschemeComponent, multi: true },
{ provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureCropfieldComponent, multi: true },
{ provide: AbstractSelectedItemComponent, useClass: SelectedItemComponent, multi: true },
{ provide: AbstractSelectedItemComponent, useClass: SelectedItemCropfieldComponent, multi: true },
{ provide: AbstractSelectedItemComponent, useClass: SelectedItemGeotiffComponent, multi: true },
{ provide: AbstractSelectedItemComponent, useClass: SelectedItemShapeComponent, multi: true },
{ provide: AbstractItemListItemComponent, useClass: ItemListItemComponent, multi: true },
{ provide: AbstractItemWidgetComponent, useClass: ItemWidgetWeatherComponent, multi: true },
{ provide: AbstractItemListItemComponent, useClass: ItemListItemTemporalComponent, multi: true },
{ provide: AbstractItemListItemComponent, useClass: ItemListItemHeightComponent, multi: true },
{ provide: AbstractItemListItemComponent, useClass: ItemListItemTipstarComponent, multi: true },
{ provide: AbstractItemListItemComponent, useClass: ItemListItemWatBalComponent, multi: true },
{ provide: AbstractItemListItemComponent, useClass: ItemListItemShadowComponent, multi: true },
{ provide: AbstractItemListItemComponent, useClass: ItemListItemBofekComponent, multi: true },
{ provide: AbstractItemListComponent, useClass: ItemListComponent, multi: true }
]
};
}
}