fix(layer): use new interface MapLayerMouseEvent

fix #89
Wykks · Jan 27, 2019 · 1a5f369 · 1a5f369
1 parent b06e848
commit 1a5f369
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/projects/ngx-mapbox-gl/src/lib/layer/layer.component.ts b/projects/ngx-mapbox-gl/src/lib/layer/layer.component.ts
@@ -23,14 +23,14 @@ import {
   Layer,
   LineLayout,
   LinePaint,
-  MapMouseEvent,
   RasterLayout,
   RasterPaint,
   RasterSource,
   SymbolLayout,
   SymbolPaint,
   VectorSource,
-  VideoSource
+  VideoSource,
+  MapLayerMouseEvent
 } from 'mapbox-gl';
 import { fromEvent, Subscription } from 'rxjs';
 import { filter, mapTo, switchMap, startWith } from 'rxjs/operators';
@@ -56,10 +56,10 @@ export class LayerComponent implements OnInit, OnDestroy, OnChanges, Layer {
   @Input() minzoom?: number;
   @Input() maxzoom?: number;
 
-  @Output() click = new EventEmitter<MapMouseEvent>();
-  @Output() mouseEnter = new EventEmitter<MapMouseEvent>();
-  @Output() mouseLeave = new EventEmitter<MapMouseEvent>();
-  @Output() mouseMove = new EventEmitter<MapMouseEvent>();
+  @Output() click = new EventEmitter<MapLayerMouseEvent>();
+  @Output() mouseEnter = new EventEmitter<MapLayerMouseEvent>();
+  @Output() mouseLeave = new EventEmitter<MapLayerMouseEvent>();
+  @Output() mouseMove = new EventEmitter<MapLayerMouseEvent>();
 
   private layerAdded = false;
   private sub: Subscription;

diff --git a/projects/showcase/src/app/demo/examples/polygon-popup-on-click.component.ts b/projects/showcase/src/app/demo/examples/polygon-popup-on-click.component.ts
@@ -1,5 +1,6 @@
 import { Component } from '@angular/core';
-import { MapMouseEvent, LngLat } from 'mapbox-gl';
+import { LngLat, MapLayerMouseEvent } from 'mapbox-gl';
+import { GeoJsonProperties } from 'geojson';
 
 @Component({
   selector: 'showcase-demo',
@@ -36,12 +37,12 @@ import { MapMouseEvent, LngLat } from 'mapbox-gl';
   styleUrls: ['./examples.css']
 })
 export class PolygonPopupOnClickComponent {
-  selectedElement: object;
+  selectedElement: GeoJsonProperties;
   selectedLngLat: LngLat;
   cursorStyle: string;
 
-  onClick(evt: MapMouseEvent) {
+  onClick(evt: MapLayerMouseEvent) {
     this.selectedLngLat = evt.lngLat;
-    this.selectedElement = (<any>evt).features[0].properties;
+    this.selectedElement = evt.features![0].properties;
   }
 }
diff --git a/projects/showcase/src/app/demo/examples/popup-on-click.component.ts b/projects/showcase/src/app/demo/examples/popup-on-click.component.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { MapMouseEvent } from 'mapbox-gl';
+import { MapboxGeoJSONFeature, MapLayerMouseEvent } from 'mapbox-gl';
 
 @Component({
   selector: 'showcase-demo',
@@ -38,7 +38,7 @@ import { MapMouseEvent } from 'mapbox-gl';
 })
 export class PopupOnClickComponent {
   points: GeoJSON.FeatureCollection<GeoJSON.Point>;
-  selectedPoint: GeoJSON.Feature<GeoJSON.Point> | null;
+  selectedPoint: MapboxGeoJSONFeature | null;
   cursorStyle: string;
 
   constructor() {
@@ -147,7 +147,7 @@ export class PopupOnClickComponent {
     };
   }
 
-  onClick(evt: MapMouseEvent) {
-    this.selectedPoint = (<any>evt).features[0];
+  onClick(evt: MapLayerMouseEvent) {
+    this.selectedPoint = evt.features![0];
   }
 }