From daba1fbcb6855db2f5633a11cecb4dc932286d92 Mon Sep 17 00:00:00 2001
From: Tim Schaub <tim.schaub@gmail.com>
Date: Sun, 4 Dec 2016 14:20:57 -0700
Subject: [PATCH] Add EventType enum to ol.Object

---
 src/ol/control/overviewmap.js |  3 +--
 src/ol/layer/group.js         |  5 ++---
 src/ol/map.js                 |  5 ++---
 src/ol/object.js              | 29 ++++++++++++++---------------
 src/ol/source/vector.js       |  4 ++--
 5 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/src/ol/control/overviewmap.js b/src/ol/control/overviewmap.js
index cd099bf3c9..791a358264 100644
--- a/src/ol/control/overviewmap.js
+++ b/src/ol/control/overviewmap.js
@@ -5,7 +5,6 @@ goog.require('ol.Collection');
 goog.require('ol.Map');
 goog.require('ol.MapEvent');
 goog.require('ol.Object');
-goog.require('ol.ObjectEventType');
 goog.require('ol.Overlay');
 goog.require('ol.View');
 goog.require('ol.control.Control');
@@ -166,7 +165,7 @@ ol.control.OverviewMap.prototype.setMap = function(map) {
 
   if (map) {
     this.listenerKeys.push(ol.events.listen(
-        map, ol.ObjectEventType.PROPERTYCHANGE,
+        map, ol.Object.EventType.PROPERTYCHANGE,
         this.handleMapPropertyChange_, this));
 
     // TODO: to really support map switching, this would need to be reworked
diff --git a/src/ol/layer/group.js b/src/ol/layer/group.js
index cd1f892aa8..c42e4ca4b4 100644
--- a/src/ol/layer/group.js
+++ b/src/ol/layer/group.js
@@ -4,7 +4,6 @@ goog.require('ol');
 goog.require('ol.asserts');
 goog.require('ol.Collection');
 goog.require('ol.Object');
-goog.require('ol.ObjectEventType');
 goog.require('ol.events');
 goog.require('ol.events.EventType');
 goog.require('ol.extent');
@@ -104,7 +103,7 @@ ol.layer.Group.prototype.handleLayersChanged_ = function(event) {
   for (i = 0, ii = layersArray.length; i < ii; i++) {
     layer = layersArray[i];
     this.listenerKeys_[ol.getUid(layer).toString()] = [
-      ol.events.listen(layer, ol.ObjectEventType.PROPERTYCHANGE,
+      ol.events.listen(layer, ol.Object.EventType.PROPERTYCHANGE,
           this.handleLayerChange_, this),
       ol.events.listen(layer, ol.events.EventType.CHANGE,
           this.handleLayerChange_, this)
@@ -125,7 +124,7 @@ ol.layer.Group.prototype.handleLayersAdd_ = function(collectionEvent) {
   ol.DEBUG && console.assert(!(key in this.listenerKeys_),
       'listeners already registered');
   this.listenerKeys_[key] = [
-    ol.events.listen(layer, ol.ObjectEventType.PROPERTYCHANGE,
+    ol.events.listen(layer, ol.Object.EventType.PROPERTYCHANGE,
         this.handleLayerChange_, this),
     ol.events.listen(layer, ol.events.EventType.CHANGE,
         this.handleLayerChange_, this)
diff --git a/src/ol/map.js b/src/ol/map.js
index 8f33081a23..8acbe9a76a 100644
--- a/src/ol/map.js
+++ b/src/ol/map.js
@@ -10,7 +10,6 @@ goog.require('ol.MapBrowserEvent');
 goog.require('ol.MapBrowserEventHandler');
 goog.require('ol.MapEvent');
 goog.require('ol.Object');
-goog.require('ol.ObjectEventType');
 goog.require('ol.TileQueue');
 goog.require('ol.View');
 goog.require('ol.asserts');
@@ -1104,7 +1103,7 @@ ol.Map.prototype.handleViewChanged_ = function() {
   var view = this.getView();
   if (view) {
     this.viewPropertyListenerKey_ = ol.events.listen(
-        view, ol.ObjectEventType.PROPERTYCHANGE,
+        view, ol.Object.EventType.PROPERTYCHANGE,
         this.handleViewPropertyChanged_, this);
     this.viewChangeListenerKey_ = ol.events.listen(
         view, ol.events.EventType.CHANGE,
@@ -1126,7 +1125,7 @@ ol.Map.prototype.handleLayerGroupChanged_ = function() {
   if (layerGroup) {
     this.layerGroupPropertyListenerKeys_ = [
       ol.events.listen(
-          layerGroup, ol.ObjectEventType.PROPERTYCHANGE,
+          layerGroup, ol.Object.EventType.PROPERTYCHANGE,
           this.render, this),
       ol.events.listen(
           layerGroup, ol.events.EventType.CHANGE,
diff --git a/src/ol/object.js b/src/ol/object.js
index e3d3a5dedf..fb1d63e260 100644
--- a/src/ol/object.js
+++ b/src/ol/object.js
@@ -1,6 +1,5 @@
 goog.provide('ol.Object');
 goog.provide('ol.ObjectEvent');
-goog.provide('ol.ObjectEventType');
 
 goog.require('ol');
 goog.require('ol.Observable');
@@ -8,19 +7,6 @@ goog.require('ol.events.Event');
 goog.require('ol.obj');
 
 
-/**
- * @enum {string}
- */
-ol.ObjectEventType = {
-  /**
-   * Triggered when a property is changed.
-   * @event ol.ObjectEvent#propertychange
-   * @api stable
-   */
-  PROPERTYCHANGE: 'propertychange'
-};
-
-
 /**
  * @classdesc
  * Events emitted by {@link ol.Object} instances are instances of this type.
@@ -182,7 +168,7 @@ ol.Object.prototype.notify = function(key, oldValue) {
   var eventType;
   eventType = ol.Object.getChangeEventType(key);
   this.dispatchEvent(new ol.ObjectEvent(eventType, key, oldValue));
-  eventType = ol.ObjectEventType.PROPERTYCHANGE;
+  eventType = ol.Object.EventType.PROPERTYCHANGE;
   this.dispatchEvent(new ol.ObjectEvent(eventType, key, oldValue));
 };
 
@@ -237,3 +223,16 @@ ol.Object.prototype.unset = function(key, opt_silent) {
     }
   }
 };
+
+
+/**
+ * @enum {string}
+ */
+ol.Object.EventType = {
+  /**
+   * Triggered when a property is changed.
+   * @event ol.ObjectEvent#propertychange
+   * @api stable
+   */
+  PROPERTYCHANGE: 'propertychange'
+};
diff --git a/src/ol/source/vector.js b/src/ol/source/vector.js
index b7cd916f69..d13336d7cc 100644
--- a/src/ol/source/vector.js
+++ b/src/ol/source/vector.js
@@ -5,7 +5,7 @@ goog.provide('ol.source.Vector');
 
 goog.require('ol');
 goog.require('ol.Collection');
-goog.require('ol.ObjectEventType');
+goog.require('ol.Object');
 goog.require('ol.array');
 goog.require('ol.asserts');
 goog.require('ol.events');
@@ -205,7 +205,7 @@ ol.source.Vector.prototype.setupChangeEvents_ = function(featureKey, feature) {
   this.featureChangeKeys_[featureKey] = [
     ol.events.listen(feature, ol.events.EventType.CHANGE,
         this.handleFeatureChange_, this),
-    ol.events.listen(feature, ol.ObjectEventType.PROPERTYCHANGE,
+    ol.events.listen(feature, ol.Object.EventType.PROPERTYCHANGE,
         this.handleFeatureChange_, this)
   ];
 };