fix(mapService): remove mapService

packages/geo/src/lib/print/index.ts

@@ -1,4 +1,3 @@
 export * from './shared';
 export * from './print/print.component';
-export * from './print/print-binding.directive';
 export * from './print-form';

packages/geo/src/lib/print/print.module.ts

@@ -1,4 +1,4 @@
-import { NgModule, ModuleWithProviders } from '@angular/core';
+import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import {
@@ -15,7 +15,6 @@ import { IgoLanguageModule } from '@igo2/core';
 import { IgoKeyValueModule } from '@igo2/common';
 
 import { PrintComponent } from './print/print.component';
-import { PrintBindingDirective } from './print/print-binding.directive';
 import { PrintFormComponent } from './print-form/print-form.component';
 
 @NgModule({
@@ -33,13 +32,7 @@ import { PrintFormComponent } from './print-form/print-form.component';
     IgoLanguageModule,
     IgoKeyValueModule
   ],
-  exports: [PrintComponent, PrintBindingDirective, PrintFormComponent],
-  declarations: [PrintComponent, PrintBindingDirective, PrintFormComponent]
+  exports: [PrintComponent, PrintFormComponent],
+  declarations: [PrintComponent, PrintFormComponent]
 })
-export class IgoPrintModule {
-  static forRoot(): ModuleWithProviders {
-    return {
-      ngModule: IgoPrintModule
-    };
-  }
-}
+export class IgoPrintModule {}

packages/geo/src/lib/routing/routing-form/routing-form-binding.directive.ts

@@ -1,35 +1,25 @@
 import {
   Directive,
   Self,
-  OnInit,
   AfterViewInit,
   Optional
 } from '@angular/core';
 
 import { RouteService } from '@igo2/core';
 
-import { MapService } from '../../map/shared/map.service';
 import { RoutingFormComponent } from './routing-form.component';
 import { RoutingFormService } from './routing-form.service';
 
 @Directive({
   selector: '[igoRoutingFormBinding]'
 })
-export class RoutingFormBindingDirective implements OnInit, AfterViewInit {
-  private component: RoutingFormComponent;
+export class RoutingFormBindingDirective implements AfterViewInit {
 
   constructor(
-    @Self() component: RoutingFormComponent,
-    private mapService: MapService,
+    @Self() private component: RoutingFormComponent,
     private routingFormService: RoutingFormService,
     @Optional() private route: RouteService
-  ) {
-    this.component = component;
-  }
-
-  ngOnInit() {
-    this.component.map = this.mapService.getMap();
-  }
+  ) {}
 
   ngAfterViewInit(): void {
     const storedStopsCoordinates = this.routingFormService.getStopsCoordinates();

packages/integration/src/lib/directions/directions-tool/directions-tool.component.ts

@@ -1,6 +1,9 @@
 import { Component } from '@angular/core';
 
 import { ToolComponent } from '@igo2/common';
+import { IgoMap } from '@igo2/geo';
+
+import { MapState } from '../../map/map.state';
 
 @ToolComponent({
   name: 'directions',
@@ -12,5 +15,9 @@ import { ToolComponent } from '@igo2/common';
   templateUrl: './directions-tool.component.html'
 })
 export class DirectionsToolComponent {
-  constructor() {}
+  get map(): IgoMap {
+    return this.mapState.map;
+  }
+
+  constructor(private mapState: MapState) {}
 }

packages/integration/src/lib/print/print-tool/print-tool.component.html

@@ -1 +1 @@
-<igo-print igoPrintBinding></igo-print>
+<igo-print [map]="map"></igo-print>

packages/integration/src/lib/print/print-tool/print-tool.component.ts

@@ -1,6 +1,9 @@
-import { Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import { Component } from '@angular/core';
 
 import { ToolComponent } from '@igo2/common';
+import { IgoMap } from '@igo2/geo';
+
+import { MapState } from '../../map/map.state';
 
 @ToolComponent({
   name: 'print',
@@ -12,5 +15,9 @@ import { ToolComponent } from '@igo2/common';
   templateUrl: './print-tool.component.html'
 })
 export class PrintToolComponent {
-  constructor() {}
+  get map(): IgoMap {
+    return this.mapState.map;
+  }
+
+  constructor(private mapState: MapState) {}
 }