Move interaction event handlers to class methods

2018-10-03 06:30:09 -06:00
parent 9586c7cbc7
commit 942a0976be
12 changed files with 916 additions and 995 deletions
@@ -98,15 +98,10 @@ class Translate extends PointerInteraction {
   * @param {Options=} opt_options Options.
   */
  constructor(opt_options) {
-    super({
-      handleDownEvent: handleDownEvent,
-      handleDragEvent: handleDragEvent,
-      handleMoveEvent: handleMoveEvent,
-      handleUpEvent: handleUpEvent
-    });
-
    const options = opt_options ? opt_options : {};

+    super(/** @type {import("./Pointer.js").Options} */ (options));
+
    /**
     * The last position we translated to.
     * @type {import("../coordinate.js").Coordinate}
@@ -160,6 +155,86 @@ class Translate extends PointerInteraction {

  }

+  /**
+   * @inheritDoc
+   */
+  handleDownEvent(event) {
+    this.lastFeature_ = this.featuresAtPixel_(event.pixel, event.map);
+    if (!this.lastCoordinate_ && this.lastFeature_) {
+      this.lastCoordinate_ = event.coordinate;
+      this.handleMoveEvent(event);
+
+      const features = this.features_ || new Collection([this.lastFeature_]);
+
+      this.dispatchEvent(
+        new TranslateEvent(
+          TranslateEventType.TRANSLATESTART, features,
+          event.coordinate));
+      return true;
+    }
+    return false;
+  }
+
+  /**
+   * @inheritDoc
+   */
+  handleUpEvent(event) {
+    if (this.lastCoordinate_) {
+      this.lastCoordinate_ = null;
+      this.handleMoveEvent(event);
+
+      const features = this.features_ || new Collection([this.lastFeature_]);
+
+      this.dispatchEvent(
+        new TranslateEvent(
+          TranslateEventType.TRANSLATEEND, features,
+          event.coordinate));
+      return true;
+    }
+    return false;
+  }
+
+  /**
+   * @inheritDoc
+   */
+  handleDragEvent(event) {
+    if (this.lastCoordinate_) {
+      const newCoordinate = event.coordinate;
+      const deltaX = newCoordinate[0] - this.lastCoordinate_[0];
+      const deltaY = newCoordinate[1] - this.lastCoordinate_[1];
+
+      const features = this.features_ || new Collection([this.lastFeature_]);
+
+      features.forEach(function(feature) {
+        const geom = feature.getGeometry();
+        geom.translate(deltaX, deltaY);
+        feature.setGeometry(geom);
+      });
+
+      this.lastCoordinate_ = newCoordinate;
+      this.dispatchEvent(
+        new TranslateEvent(
+          TranslateEventType.TRANSLATING, features,
+          newCoordinate));
+    }
+  }
+
+  /**
+   * @inheritDoc
+   */
+  handleMoveEvent(event) {
+    const elem = event.map.getViewport();
+
+    // Change the cursor to grab/grabbing if hovering any of the features managed
+    // by the interaction
+    if (this.featuresAtPixel_(event.pixel, event.map)) {
+      elem.classList.remove(this.lastCoordinate_ ? 'ol-grab' : 'ol-grabbing');
+      elem.classList.add(this.lastCoordinate_ ? 'ol-grabbing' : 'ol-grab');
+    } else {
+      elem.classList.remove('ol-grab', 'ol-grabbing');
+    }
+  }
+
  /**
   * Tests to see if the given coordinates intersects any of our selected
   * features.
@@ -234,95 +309,4 @@ class Translate extends PointerInteraction {
  }
 }

-
-/**
- * @param {import("../MapBrowserPointerEvent.js").default} event Event.
- * @return {boolean} Start drag sequence?
- * @this {Translate}
- */
-function handleDownEvent(event) {
-  this.lastFeature_ = this.featuresAtPixel_(event.pixel, event.map);
-  if (!this.lastCoordinate_ && this.lastFeature_) {
-    this.lastCoordinate_ = event.coordinate;
-    handleMoveEvent.call(this, event);
-
-    const features = this.features_ || new Collection([this.lastFeature_]);
-
-    this.dispatchEvent(
-      new TranslateEvent(
-        TranslateEventType.TRANSLATESTART, features,
-        event.coordinate));
-    return true;
-  }
-  return false;
-}
-
-
-/**
- * @param {import("../MapBrowserPointerEvent.js").default} event Event.
- * @return {boolean} Stop drag sequence?
- * @this {Translate}
- */
-function handleUpEvent(event) {
-  if (this.lastCoordinate_) {
-    this.lastCoordinate_ = null;
-    handleMoveEvent.call(this, event);
-
-    const features = this.features_ || new Collection([this.lastFeature_]);
-
-    this.dispatchEvent(
-      new TranslateEvent(
-        TranslateEventType.TRANSLATEEND, features,
-        event.coordinate));
-    return true;
-  }
-  return false;
-}
-
-
-/**
- * @param {import("../MapBrowserPointerEvent.js").default} event Event.
- * @this {Translate}
- */
-function handleDragEvent(event) {
-  if (this.lastCoordinate_) {
-    const newCoordinate = event.coordinate;
-    const deltaX = newCoordinate[0] - this.lastCoordinate_[0];
-    const deltaY = newCoordinate[1] - this.lastCoordinate_[1];
-
-    const features = this.features_ || new Collection([this.lastFeature_]);
-
-    features.forEach(function(feature) {
-      const geom = feature.getGeometry();
-      geom.translate(deltaX, deltaY);
-      feature.setGeometry(geom);
-    });
-
-    this.lastCoordinate_ = newCoordinate;
-    this.dispatchEvent(
-      new TranslateEvent(
-        TranslateEventType.TRANSLATING, features,
-        newCoordinate));
-  }
-}
-
-
-/**
- * @param {import("../MapBrowserEvent.js").default} event Event.
- * @this {Translate}
- */
-function handleMoveEvent(event) {
-  const elem = event.map.getViewport();
-
-  // Change the cursor to grab/grabbing if hovering any of the features managed
-  // by the interaction
-  if (this.featuresAtPixel_(event.pixel, event.map)) {
-    elem.classList.remove(this.lastCoordinate_ ? 'ol-grab' : 'ol-grabbing');
-    elem.classList.add(this.lastCoordinate_ ? 'ol-grabbing' : 'ol-grab');
-  } else {
-    elem.classList.remove('ol-grab', 'ol-grabbing');
-  }
-}
-
-
 export default Translate;