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

AW6241 Migrate libs to ng-18

Browse Source
This commit is contained in:
Peter (extern)
2024-09-05 11:02:15 +02:00
parent 10a1f07622
commit 93e497ec3f
19 changed files with 5013 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
projects/common-map3d/src/fm-map3d/common-map3d.module.ts
View File

@@ -1,14 +1,15 @@
import { NgModule } from '@angular/core';
import { AppCommonModule } from '@farmmaps/common';
import { AppCommonMapModule } from '@farmmaps/common-map';
import { AngularOpenlayersModule } from 'ng-openlayers';
import { Switch2D3DComponent } from './components/olcs/switch2d3d/switch2d3d.component';
import { AppCommonModule} from '@farmmaps/common';
import { AppCommonMapModule} from '@farmmaps/common-map';
@NgModule({
declarations: [Switch2D3DComponent],
imports: [
AppCommonModule,
AppCommonMapModule
AppCommonMapModule,
AngularOpenlayersModule,
],
exports: [Switch2D3DComponent]
})

6
projects/common-map3d/src/fm-map3d/components/olcs/switch2d3d/switch2d3d.component.ts
View File

@@ -49,7 +49,11 @@ export class Switch2D3DComponent {
this.interactions=[];
this.map.instance.getInteractions().forEach((i) => {
if(i.getActive()) {
this.interactions.push(i);
// AW-6241 TODO How to fix?
// error TS2345: Argument of type 'import("C:/Project/Farmmaps/FarmMapsLib/node_modules/ol/interaction/Interaction").default'
// is not assignable to parameter of type 'import("C:/Project/Farmmaps/FarmMapsLib/projects/common-map3d/node_modules/ol/interaction/Interaction").default'.
// Line below commented out
// this.interactions.push(i);
i.setActive(false);
}
});