From dc0c0877d74fe61737d8540ba4a305a5df207330 Mon Sep 17 00:00:00 2001
From: Andreas Hocevar <andreas.hocevar@gmail.com>
Date: Thu, 8 Oct 2015 15:18:11 +0200
Subject: [PATCH] Recover from bad merge conflict resolution in #4036

---
 src/ol/interaction/modifyinteraction.js            | 12 ++++++------
 test/spec/ol/interaction/modifyinteraction.test.js |  9 +++++----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/ol/interaction/modifyinteraction.js b/src/ol/interaction/modifyinteraction.js
index 6aed25ebd8..6c3eb15e2b 100644
--- a/src/ol/interaction/modifyinteraction.js
+++ b/src/ol/interaction/modifyinteraction.js
@@ -265,8 +265,8 @@ ol.interaction.Modify.prototype.addFeature_ = function(feature) {
 ol.interaction.Modify.prototype.willModifyFeatures_ = function(evt) {
   if (!this.modified_) {
     this.modified_ = true;
-    this.dispatchEvent(new ol.ModifyEvent(ol.ModifyEventType.MODIFYSTART,
-        this.features_, evt));
+    this.dispatchEvent(new ol.interaction.ModifyEvent(
+        ol.ModifyEventType.MODIFYSTART, this.features_, evt));
   }
 };
 
@@ -678,8 +678,8 @@ ol.interaction.Modify.handleUpEvent_ = function(evt) {
         segmentData);
   }
   if (this.modified_) {
-    this.dispatchEvent(new ol.ModifyEvent(ol.ModifyEventType.MODIFYEND,
-        this.features_, evt));
+    this.dispatchEvent(new ol.interaction.ModifyEvent(
+        ol.ModifyEventType.MODIFYEND, this.features_, evt));
     this.modified_ = false;
   }
   return false;
@@ -713,8 +713,8 @@ ol.interaction.Modify.handleEvent = function(mapBrowserEvent) {
           'geometry should be an ol.geom.Point');
       this.willModifyFeatures_(mapBrowserEvent);
       handled = this.removeVertex_();
-      this.dispatchEvent(new ol.ModifyEvent(ol.ModifyEventType.MODIFYEND,
-          this.features_, mapBrowserEvent));
+      this.dispatchEvent(new ol.interaction.ModifyEvent(
+          ol.ModifyEventType.MODIFYEND, this.features_, mapBrowserEvent));
       this.modified_ = false;
     } else {
       handled = true;
diff --git a/test/spec/ol/interaction/modifyinteraction.test.js b/test/spec/ol/interaction/modifyinteraction.test.js
index cfc715a6c0..e1692e4be2 100644
--- a/test/spec/ol/interaction/modifyinteraction.test.js
+++ b/test/spec/ol/interaction/modifyinteraction.test.js
@@ -83,7 +83,7 @@ describe('ol.interaction.Modify', function() {
    * modifications. Helper function to
    * @param {ol.Feature} feature Modified feature.
    * @param {ol.interaction.Modify} interaction
-   * @return {Array<ol.ModifyEvent|string>} events
+   * @return {Array<ol.interaction.ModifyEvent|string>} events
    */
   function trackEvents(feature, interaction) {
     var events = [];
@@ -103,7 +103,7 @@ describe('ol.interaction.Modify', function() {
   * Validates the event array to verify proper event sequence. Checks
   * that first and last event are correct ModifyEvents and that feature
   * modifications event are in between.
-  * @param {Array<ol.ModifyEvent|string>} event
+  * @param {Array<ol.interaction.ModifyEvent|string>} event
   * @param {Array<ol.Feature>} features
   */
   function validateEvents(events, features) {
@@ -112,11 +112,11 @@ describe('ol.interaction.Modify', function() {
     var endevent = events[events.length - 1];
 
     // first event should be modifystary
-    expect(startevent).to.be.an(ol.ModifyEvent);
+    expect(startevent).to.be.an(ol.interaction.ModifyEvent);
     expect(startevent.type).to.eql('modifystart');
 
     // last event should be modifyend
-    expect(endevent).to.be.an(ol.ModifyEvent);
+    expect(endevent).to.be.an(ol.interaction.ModifyEvent);
     expect(endevent.type).to.eql('modifyend');
 
     // make sure we get change events to events array
@@ -387,6 +387,7 @@ goog.require('ol.events.condition');
 goog.require('ol.geom.Point');
 goog.require('ol.geom.Polygon');
 goog.require('ol.interaction.Modify');
+goog.require('ol.interaction.ModifyEvent');
 goog.require('ol.layer.Vector');
 goog.require('ol.pointer.PointerEvent');
 goog.require('ol.source.Vector');