FarmMaps/FarmMapsLib
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: FarmMaps:7f3736348693d8b0192f9a793ab91b02795a1751
Branches Tags
FarmMaps:develop
FarmMaps:master
FarmMaps:AW-4620
FarmMaps:2022.01
FarmMaps:feature/MinimizeSolution
FarmMaps:2024.10
FarmMaps:2024.04
FarmMaps:2023.10
FarmMaps:2023.08
FarmMaps:2023.03
FarmMaps:2022.08
FarmMaps:2022.05
FarmMaps:2022.03
FarmMaps:2021.09
FarmMaps:FarmMapsLib_0_0_1_prerelease_72
..
compare: FarmMaps:d601418eea470eff09cbb2289b3416c501a79bc8
Branches Tags
FarmMaps:develop
FarmMaps:master
FarmMaps:AW-4620
FarmMaps:2022.01
FarmMaps:feature/MinimizeSolution
FarmMaps:2024.10
FarmMaps:2024.04
FarmMaps:2023.10
FarmMaps:2023.08
FarmMaps:2023.03
FarmMaps:2022.08
FarmMaps:2022.05
FarmMaps:2022.03
FarmMaps:2021.09
FarmMaps:FarmMapsLib_0_0_1_prerelease_72

No commits in common. "7f3736348693d8b0192f9a793ab91b02795a1751" and "d601418eea470eff09cbb2289b3416c501a79bc8" have entirely different histories.
7f37363486 ... d601418eea

3 changed files with 5 additions and 6 deletions
Show Stats Expand all files Collapse all files

3
projects/common-map/src/fm-map/common-map.module.ts
View File

@ -9,7 +9,7 @@ import { ActionReducer, MetaReducer, StoreModule } from '@ngrx/store';
import { AngularOpenlayersModule } from 'ng-openlayers'; import { AngularOpenlayersModule } from 'ng-openlayers';
//common modules //common modules
import { AppCommonModule, ItemTypeService } from '@farmmaps/common'; import { AppCommonModule } from '@farmmaps/common';
import * as mapActions from './actions/map.actions'; import * as mapActions from './actions/map.actions';
import * as mapEffects from './effects/map.effects'; import * as mapEffects from './effects/map.effects';
@ -212,7 +212,6 @@ export {
GeolocationService, GeolocationService,
DeviceOrientationService, DeviceOrientationService,
TemporalService, TemporalService,
ItemTypeService,
{ provide: AbstractFeatureListComponent, useClass: FeatureListCroppingschemeComponent, multi: true }, { provide: AbstractFeatureListComponent, useClass: FeatureListCroppingschemeComponent, multi: true },
{ provide: AbstractFeatureListComponent, useClass: FeatureListCropfieldComponent, multi: true }, { provide: AbstractFeatureListComponent, useClass: FeatureListCropfieldComponent, multi: true },
{ provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureComponent, multi: true }, { provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureComponent, multi: true },

4
projects/common-map/src/fm-map/components/selected-item-cropfield/selected-item-cropfield.component.ts
View File

@ -1,5 +1,5 @@
import { Location } from '@angular/common'; import { Location } from '@angular/common';
import { Component, Injectable, OnInit } from '@angular/core'; import { Component, Inject, Injectable, OnInit } from '@angular/core';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { FolderService, IItem, IListItem, ItemService, ItemTypeService, commonReducers } from '@farmmaps/common'; import { FolderService, IItem, IListItem, ItemService, ItemTypeService, commonReducers } from '@farmmaps/common';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';
@ -23,7 +23,7 @@ export class SelectedItemCropfieldComponent extends AbstractSelectedItemComponen
public items: Observable<IListItem[]>; public items: Observable<IListItem[]>;
constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService, private folderService$: FolderService) { constructor(store: Store<mapReducers.State | commonReducers.State>, @Inject('itemTypeService') itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService, private folderService$: FolderService) {
super(store, itemTypeService,location,router); super(store, itemTypeService,location,router);
} }

4
projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.ts
View File

@ -1,5 +1,5 @@
import { Location } from '@angular/common'; import { Location } from '@angular/common';
import { Component, Injectable } from '@angular/core'; import { Component, Inject, Injectable } from '@angular/core';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { ItemTypeService, commonReducers } from '@farmmaps/common'; import { ItemTypeService, commonReducers } from '@farmmaps/common';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';
@ -18,7 +18,7 @@ import { AbstractSelectedItemComponent } from '../selected-item/selected-item.co
}) })
export class SelectedItemGeotiffComponent extends AbstractSelectedItemComponent { export class SelectedItemGeotiffComponent extends AbstractSelectedItemComponent {
constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router) { constructor(store: Store<mapReducers.State | commonReducers.State>, @Inject('itemTypeService') itemTypeService: ItemTypeService, location: Location, router: Router) {
super(store, itemTypeService,location,router); super(store, itemTypeService,location,router);
} }