From 0142f888c377740e440035408b24351f815cb143 Mon Sep 17 00:00:00 2001 From: Wykks Date: Mon, 20 Nov 2017 23:02:01 +0100 Subject: [PATCH] fix(map): rename zoomChange and pitchChange events BREAKING CHANGES: Rename zoomChange and pitchChange events to zoomEvt and pitchEvt, because the "Change" suffix allow incorrecty two-way binding. --- src/app/lib/map/map.component.ts | 4 ++-- src/app/lib/map/map.service.spec.ts | 4 ++-- src/app/lib/map/map.service.ts | 4 ++-- src/app/lib/map/map.types.ts | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/app/lib/map/map.component.ts b/src/app/lib/map/map.component.ts index 4b3679ac6..2a5eedfa9 100644 --- a/src/app/lib/map/map.component.ts +++ b/src/app/lib/map/map.component.ts @@ -127,13 +127,13 @@ export class MapComponent implements OnChanges, OnDestroy, AfterViewInit, Mapbox @Output() drag = new EventEmitter(); @Output() dragEnd = new EventEmitter(); @Output() zoomStart = new EventEmitter(); - @Output() zoomChange = new EventEmitter(); + @Output() zoomEvt = new EventEmitter(); @Output() zoomEnd = new EventEmitter(); @Output() rotateStart = new EventEmitter(); @Output() rotate = new EventEmitter(); @Output() rotateEnd = new EventEmitter(); @Output() pitchStart = new EventEmitter(); - @Output() pitchChange = new EventEmitter(); + @Output() pitchEvt = new EventEmitter(); @Output() pitchEnd = new EventEmitter(); @Output() boxZoomStart = new EventEmitter(); @Output() boxZoomEnd = new EventEmitter(); diff --git a/src/app/lib/map/map.service.spec.ts b/src/app/lib/map/map.service.spec.ts index a4cb95b79..e1b54a532 100644 --- a/src/app/lib/map/map.service.spec.ts +++ b/src/app/lib/map/map.service.spec.ts @@ -59,13 +59,13 @@ describe('MapService', () => { drag: new EventEmitter(), dragEnd: new EventEmitter(), zoomStart: new EventEmitter(), - zoomChange: new EventEmitter(), + zoomEvt: new EventEmitter(), zoomEnd: new EventEmitter(), rotateStart: new EventEmitter(), rotate: new EventEmitter(), rotateEnd: new EventEmitter(), pitchStart: new EventEmitter(), - pitchChange: new EventEmitter(), + pitchEvt: new EventEmitter(), pitchEnd: new EventEmitter(), boxZoomStart: new EventEmitter(), boxZoomEnd: new EventEmitter(), diff --git a/src/app/lib/map/map.service.ts b/src/app/lib/map/map.service.ts index 03a419546..88272c3a9 100644 --- a/src/app/lib/map/map.service.ts +++ b/src/app/lib/map/map.service.ts @@ -382,13 +382,13 @@ export class MapService { this.mapInstance.on('drag', (evt: MapboxGl.MapTouchEvent | MapboxGl.MapMouseEvent) => this.zone.run(() => events.drag.emit(evt))); this.mapInstance.on('dragend', (evt: DragEvent) => this.zone.run(() => events.dragEnd.emit(evt))); this.mapInstance.on('zoomstart', (evt: MapboxGl.MapTouchEvent | MapboxGl.MapMouseEvent) => this.zone.run(() => events.zoomStart.emit(evt))); - this.mapInstance.on('zoom', (evt: MapboxGl.MapTouchEvent | MapboxGl.MapMouseEvent) => this.zone.run(() => events.zoomChange.emit(evt))); + this.mapInstance.on('zoom', (evt: MapboxGl.MapTouchEvent | MapboxGl.MapMouseEvent) => this.zone.run(() => events.zoomEvt.emit(evt))); this.mapInstance.on('zoomend', (evt: MapboxGl.MapTouchEvent | MapboxGl.MapMouseEvent) => this.zone.run(() => events.zoomEnd.emit(evt))); this.mapInstance.on('rotatestart', (evt: MapboxGl.MapTouchEvent | MapboxGl.MapMouseEvent) => this.zone.run(() => events.rotateStart.emit(evt))); this.mapInstance.on('rotate', (evt: MapboxGl.MapTouchEvent | MapboxGl.MapMouseEvent) => this.zone.run(() => events.rotate.emit(evt))); this.mapInstance.on('rotateend', (evt: MapboxGl.MapTouchEvent | MapboxGl.MapMouseEvent) => this.zone.run(() => events.rotateEnd.emit(evt))); this.mapInstance.on('pitchstart', (evt: MapboxGl.EventData) => this.zone.run(() => events.pitchStart.emit(evt))); - this.mapInstance.on('pitch', (evt: MapboxGl.EventData) => this.zone.run(() => events.pitchChange.emit(evt))); + this.mapInstance.on('pitch', (evt: MapboxGl.EventData) => this.zone.run(() => events.pitchEvt.emit(evt))); this.mapInstance.on('pitchend', (evt: MapboxGl.EventData) => this.zone.run(() => events.pitchEnd.emit(evt))); this.mapInstance.on('boxzoomstart', (evt: MapboxGl.MapBoxZoomEvent) => this.zone.run(() => events.boxZoomStart.emit(evt))); this.mapInstance.on('boxzoomend', (evt: MapboxGl.MapBoxZoomEvent) => this.zone.run(() => events.boxZoomEnd.emit(evt))); diff --git a/src/app/lib/map/map.types.ts b/src/app/lib/map/map.types.ts index 926685c1d..b3954c80c 100644 --- a/src/app/lib/map/map.types.ts +++ b/src/app/lib/map/map.types.ts @@ -26,13 +26,13 @@ export interface MapEvent { drag: EventEmitter; dragEnd: EventEmitter; zoomStart: EventEmitter; - zoomChange: EventEmitter; + zoomEvt: EventEmitter; zoomEnd: EventEmitter; rotateStart: EventEmitter; rotate: EventEmitter; rotateEnd: EventEmitter; pitchStart: EventEmitter; - pitchChange: EventEmitter; + pitchEvt: EventEmitter; pitchEnd: EventEmitter; boxZoomStart: EventEmitter; boxZoomEnd: EventEmitter;