From cf1b1822b871fc8742cd7fb90c35b2cef470d493 Mon Sep 17 00:00:00 2001
From: Frederic Junod <frederic.junod@camptocamp.com>
Date: Mon, 30 Nov 2015 17:34:53 +0100
Subject: [PATCH] Remove use of goog.object.getKeys

---
 CONTRIBUTING.md                       | 2 ++
 src/ol/pointer/mousesource.js         | 2 +-
 src/ol/pointer/mssource.js            | 2 +-
 src/ol/pointer/pointereventhandler.js | 2 +-
 src/ol/pointer/touchsource.js         | 4 ++--
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0387ae4f3a..eb361d1791 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -106,6 +106,8 @@ style of the existing OpenLayers 3 code, which includes:
 
  * Use `array.length = 0` instead of `goog.array.clear`.
 
+ * Use `Object.keys(obj)` instead of `goog.object.getKeys(obj)`.
+
  * Use bracket notation instead of `goog.object.set` and `goog.object.get` (with
    two arguments).
 
diff --git a/src/ol/pointer/mousesource.js b/src/ol/pointer/mousesource.js
index 131d4adbca..618541604e 100644
--- a/src/ol/pointer/mousesource.js
+++ b/src/ol/pointer/mousesource.js
@@ -51,7 +51,7 @@ ol.pointer.MouseSource = function(dispatcher) {
 
   /**
    * @const
-   * @type {Object.<string, goog.events.BrowserEvent|Object>}
+   * @type {!Object.<string, goog.events.BrowserEvent|Object>}
    */
   this.pointerMap = dispatcher.pointerMap;
 
diff --git a/src/ol/pointer/mssource.js b/src/ol/pointer/mssource.js
index 69a326fb3b..5855758f12 100644
--- a/src/ol/pointer/mssource.js
+++ b/src/ol/pointer/mssource.js
@@ -54,7 +54,7 @@ ol.pointer.MsSource = function(dispatcher) {
 
   /**
    * @const
-   * @type {Object.<string, goog.events.BrowserEvent|Object>}
+   * @type {!Object.<string, goog.events.BrowserEvent|Object>}
    */
   this.pointerMap = dispatcher.pointerMap;
 
diff --git a/src/ol/pointer/pointereventhandler.js b/src/ol/pointer/pointereventhandler.js
index b2aa3cabb2..2b4d299138 100644
--- a/src/ol/pointer/pointereventhandler.js
+++ b/src/ol/pointer/pointereventhandler.js
@@ -61,7 +61,7 @@ ol.pointer.PointerEventHandler = function(element) {
 
   /**
    * @const
-   * @type {Object.<string, goog.events.BrowserEvent|Object>}
+   * @type {!Object.<string, goog.events.BrowserEvent|Object>}
    */
   this.pointerMap = {};
 
diff --git a/src/ol/pointer/touchsource.js b/src/ol/pointer/touchsource.js
index baeeee5341..33a62bca4f 100644
--- a/src/ol/pointer/touchsource.js
+++ b/src/ol/pointer/touchsource.js
@@ -55,7 +55,7 @@ ol.pointer.TouchSource = function(dispatcher, mouseSource) {
 
   /**
    * @const
-   * @type {Object.<string, goog.events.BrowserEvent|Object>}
+   * @type {!Object.<string, goog.events.BrowserEvent|Object>}
    */
   this.pointerMap = dispatcher.pointerMap;
 
@@ -269,7 +269,7 @@ ol.pointer.TouchSource.prototype.vacuumTouches_ = function(inEvent) {
   var touchList = inEvent.getBrowserEvent().touches;
   // pointerMap.getCount() should be < touchList.length here,
   // as the touchstart has not been processed yet.
-  var keys = goog.object.getKeys(this.pointerMap);
+  var keys = Object.keys(this.pointerMap);
   var count = keys.length;
   if (count >= touchList.length) {
     var d = [];