diff --git a/src/ol/format/gpxformat.js b/src/ol/format/gpxformat.js index 1c3f998a24..fabb0f6b72 100644 --- a/src/ol/format/gpxformat.js +++ b/src/ol/format/gpxformat.js @@ -3,7 +3,6 @@ goog.provide('ol.format.GPX'); goog.require('goog.array'); goog.require('goog.asserts'); goog.require('goog.dom.NodeType'); -goog.require('goog.object'); goog.require('ol.Feature'); goog.require('ol.format.Feature'); goog.require('ol.format.XMLFeature'); @@ -71,16 +70,14 @@ ol.format.GPX.appendCoordinate_ = function(flatCoordinates, node, values) { flatCoordinates.push( parseFloat(node.getAttribute('lon')), parseFloat(node.getAttribute('lat'))); - if (goog.object.containsKey(values, 'ele')) { - flatCoordinates.push( - /** @type {number} */ (values['ele'])); + if ('ele' in values) { + flatCoordinates.push(/** @type {number} */ (values['ele'])); delete values['ele']; } else { flatCoordinates.push(0); } - if (goog.object.containsKey(values, 'time')) { - flatCoordinates.push( - /** @type {number} */ (values['time'])); + if ('time' in values) { + flatCoordinates.push(/** @type {number} */ (values['time'])); delete values['time']; } else { flatCoordinates.push(0); diff --git a/src/ol/pointer/mousesource.js b/src/ol/pointer/mousesource.js index 1e226c8ef9..131d4adbca 100644 --- a/src/ol/pointer/mousesource.js +++ b/src/ol/pointer/mousesource.js @@ -30,7 +30,6 @@ goog.provide('ol.pointer.MouseSource'); -goog.require('goog.object'); goog.require('ol.pointer.EventSource'); @@ -161,11 +160,9 @@ ol.pointer.MouseSource.prepareEvent = function(inEvent, dispatcher) { */ ol.pointer.MouseSource.prototype.mousedown = function(inEvent) { if (!this.isEventSimulatedFromTouch_(inEvent)) { - var p = goog.object.containsKey(this.pointerMap, - ol.pointer.MouseSource.POINTER_ID.toString()); // TODO(dfreedman) workaround for some elements not sending mouseup // http://crbug/149091 - if (p) { + if (ol.pointer.MouseSource.POINTER_ID.toString() in this.pointerMap) { this.cancel(inEvent); } var e = ol.pointer.MouseSource.prepareEvent(inEvent, this.dispatcher);