Merge pull request #10031 from flexjoly/upstream
Cache starting coordinates and add mapBrowserEvent to translateEvent
This commit is contained in:
@@ -70,8 +70,10 @@ export class TranslateEvent extends Event {
|
|||||||
* @param {TranslateEventType} type Type.
|
* @param {TranslateEventType} type Type.
|
||||||
* @param {Collection<import("../Feature.js").default>} features The features translated.
|
* @param {Collection<import("../Feature.js").default>} features The features translated.
|
||||||
* @param {import("../coordinate.js").Coordinate} coordinate The event coordinate.
|
* @param {import("../coordinate.js").Coordinate} coordinate The event coordinate.
|
||||||
|
* @param {import("../coordinate.js").Coordinate} startCoordinate The original coordinates before.translation started
|
||||||
|
* @param {import("../MapBrowserEvent.js").default} mapBrowserEvent Map browser event.
|
||||||
*/
|
*/
|
||||||
constructor(type, features, coordinate) {
|
constructor(type, features, coordinate, startCoordinate, mapBrowserEvent) {
|
||||||
|
|
||||||
super(type);
|
super(type);
|
||||||
|
|
||||||
@@ -90,6 +92,21 @@ export class TranslateEvent extends Event {
|
|||||||
*/
|
*/
|
||||||
this.coordinate = coordinate;
|
this.coordinate = coordinate;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The coordinate of the start position before translation started.
|
||||||
|
* @const
|
||||||
|
* @type {import("../coordinate.js").Coordinate}
|
||||||
|
* @api
|
||||||
|
*/
|
||||||
|
this.startCoordinate = startCoordinate;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Associated {@link module:ol/MapBrowserEvent}.
|
||||||
|
* @type {import("../MapBrowserEvent.js").default}
|
||||||
|
* @api
|
||||||
|
*/
|
||||||
|
this.mapBrowserEvent = mapBrowserEvent;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -118,6 +135,13 @@ class Translate extends PointerInteraction {
|
|||||||
*/
|
*/
|
||||||
this.lastCoordinate_ = null;
|
this.lastCoordinate_ = null;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The start position before translation started.
|
||||||
|
* @type {import("../coordinate.js").Coordinate}
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
|
this.startCoordinate_ = null;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @type {Collection<import("../Feature.js").default>}
|
* @type {Collection<import("../Feature.js").default>}
|
||||||
@@ -174,6 +198,7 @@ class Translate extends PointerInteraction {
|
|||||||
handleDownEvent(event) {
|
handleDownEvent(event) {
|
||||||
this.lastFeature_ = this.featuresAtPixel_(event.pixel, event.map);
|
this.lastFeature_ = this.featuresAtPixel_(event.pixel, event.map);
|
||||||
if (!this.lastCoordinate_ && this.lastFeature_) {
|
if (!this.lastCoordinate_ && this.lastFeature_) {
|
||||||
|
this.startCoordinate_ =
|
||||||
this.lastCoordinate_ = event.coordinate;
|
this.lastCoordinate_ = event.coordinate;
|
||||||
this.handleMoveEvent(event);
|
this.handleMoveEvent(event);
|
||||||
|
|
||||||
@@ -182,7 +207,7 @@ class Translate extends PointerInteraction {
|
|||||||
this.dispatchEvent(
|
this.dispatchEvent(
|
||||||
new TranslateEvent(
|
new TranslateEvent(
|
||||||
TranslateEventType.TRANSLATESTART, features,
|
TranslateEventType.TRANSLATESTART, features,
|
||||||
event.coordinate));
|
event.coordinate, this.startCoordinate_, event));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
@@ -201,7 +226,9 @@ class Translate extends PointerInteraction {
|
|||||||
this.dispatchEvent(
|
this.dispatchEvent(
|
||||||
new TranslateEvent(
|
new TranslateEvent(
|
||||||
TranslateEventType.TRANSLATEEND, features,
|
TranslateEventType.TRANSLATEEND, features,
|
||||||
event.coordinate));
|
event.coordinate, this.startCoordinate_, event));
|
||||||
|
// cleanup
|
||||||
|
this.startCoordinate_ = null;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
@@ -228,7 +255,7 @@ class Translate extends PointerInteraction {
|
|||||||
this.dispatchEvent(
|
this.dispatchEvent(
|
||||||
new TranslateEvent(
|
new TranslateEvent(
|
||||||
TranslateEventType.TRANSLATING, features,
|
TranslateEventType.TRANSLATING, features,
|
||||||
newCoordinate));
|
newCoordinate, this.startCoordinate_, event));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user