From 1ff43686f539a745f65a2c334d1a25b9d322cfe7 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Wed, 7 Jan 2015 22:31:01 -0700 Subject: [PATCH] Use bracket notation instead of goog.object.get --- src/ol/format/gml/gml2format.js | 3 +- src/ol/format/gml/gml3format.js | 44 ++++++++++++------------ src/ol/format/gml/gmlbaseformat.js | 4 +-- src/ol/format/gpxformat.js | 28 +++++++-------- src/ol/format/kmlformat.js | 36 +++++++++---------- src/ol/format/osmxmlformat.js | 2 +- src/ol/format/owsformat.js | 3 +- src/ol/format/wfsformat.js | 30 ++++++++-------- src/ol/format/wmscapabilitiesformat.js | 34 +++++++++--------- src/ol/format/wmsgetfeatureinfoformat.js | 2 +- src/ol/object.js | 4 +-- src/ol/pointer/mousesource.js | 3 +- src/ol/pointer/touchsource.js | 2 +- src/ol/render/canvas/canvasreplay.js | 2 +- src/ol/render/webgl/webglreplay.js | 2 +- src/ol/source/imagewmssource.js | 2 +- src/ol/source/tilewmssource.js | 2 +- src/ol/structs/rbush.js | 12 ++++--- 18 files changed, 108 insertions(+), 107 deletions(-) diff --git a/src/ol/format/gml/gml2format.js b/src/ol/format/gml/gml2format.js index f1564bc505..4faea336ce 100644 --- a/src/ol/format/gml/gml2format.js +++ b/src/ol/format/gml/gml2format.js @@ -3,7 +3,6 @@ goog.provide('ol.format.GML2'); goog.require('goog.asserts'); goog.require('goog.dom'); goog.require('goog.dom.NodeType'); -goog.require('goog.object'); goog.require('ol.extent'); goog.require('ol.format.GML'); goog.require('ol.format.GMLBase'); @@ -58,7 +57,7 @@ ol.format.GML2.prototype.readFlatCoordinates_ = function(node, objectStack) { var s = ol.xml.getAllTextContent(node, false).replace(/^\s*|\s*$/g, ''); var context = objectStack[0]; goog.asserts.assert(goog.isObject(context)); - var containerSrs = goog.object.get(context, 'srsName'); + var containerSrs = context['srsName']; var containerDimension = node.parentNode.getAttribute('srsDimension'); var axisOrientation = 'enu'; if (!goog.isNull(containerSrs)) { diff --git a/src/ol/format/gml/gml3format.js b/src/ol/format/gml/gml3format.js index bddcff8673..ed9c0bba6f 100644 --- a/src/ol/format/gml/gml3format.js +++ b/src/ol/format/gml/gml3format.js @@ -356,7 +356,7 @@ ol.format.GML3.prototype.readFlatPos_ = function(node, objectStack) { } var context = objectStack[0]; goog.asserts.assert(goog.isObject(context)); - var containerSrs = goog.object.get(context, 'srsName'); + var containerSrs = context['srsName']; var axisOrientation = 'enu'; if (!goog.isNull(containerSrs)) { var proj = ol.proj.get(containerSrs); @@ -392,7 +392,7 @@ ol.format.GML3.prototype.readFlatPosList_ = function(node, objectStack) { var s = ol.xml.getAllTextContent(node, false).replace(/^\s*|\s*$/g, ''); var context = objectStack[0]; goog.asserts.assert(goog.isObject(context)); - var containerSrs = goog.object.get(context, 'srsName'); + var containerSrs = context['srsName']; var containerDimension = node.parentNode.getAttribute('srsDimension'); var axisOrientation = 'enu'; if (!goog.isNull(containerSrs)) { @@ -614,7 +614,7 @@ ol.format.GML3.prototype.SEGMENTS_PARSERS_ = Object({ ol.format.GML3.prototype.writePos_ = function(node, value, objectStack) { var context = objectStack[objectStack.length - 1]; goog.asserts.assert(goog.isObject(context)); - var srsName = goog.object.get(context, 'srsName'); + var srsName = context['srsName']; var axisOrientation = 'enu'; if (goog.isDefAndNotNull(srsName)) { axisOrientation = ol.proj.get(srsName).getAxisOrientation(); @@ -657,7 +657,7 @@ ol.format.GML3.prototype.getCoords_ = function(point, opt_srsName) { ol.format.GML3.prototype.writePosList_ = function(node, value, objectStack) { var context = objectStack[objectStack.length - 1]; goog.asserts.assert(goog.isObject(context)); - var srsName = goog.object.get(context, 'srsName'); + var srsName = context['srsName']; // only 2d for simple features profile var points = value.getCoordinates(); var len = points.length; @@ -680,7 +680,7 @@ ol.format.GML3.prototype.writePosList_ = function(node, value, objectStack) { ol.format.GML3.prototype.writePoint_ = function(node, geometry, objectStack) { var context = objectStack[objectStack.length - 1]; goog.asserts.assert(goog.isObject(context)); - var srsName = goog.object.get(context, 'srsName'); + var srsName = context['srsName']; if (goog.isDefAndNotNull(srsName)) { node.setAttribute('srsName', srsName); } @@ -711,7 +711,7 @@ ol.format.GML3.prototype.writeEnvelope = function(node, extent, objectStack) { goog.asserts.assert(extent.length == 4); var context = objectStack[objectStack.length - 1]; goog.asserts.assert(goog.isObject(context)); - var srsName = goog.object.get(context, 'srsName'); + var srsName = context['srsName']; if (goog.isDef(srsName)) { node.setAttribute('srsName', srsName); } @@ -735,7 +735,7 @@ ol.format.GML3.prototype.writeLinearRing_ = function(node, geometry, objectStack) { var context = objectStack[objectStack.length - 1]; goog.asserts.assert(goog.isObject(context)); - var srsName = goog.object.get(context, 'srsName'); + var srsName = context['srsName']; if (goog.isDefAndNotNull(srsName)) { node.setAttribute('srsName', srsName); } @@ -757,7 +757,7 @@ ol.format.GML3.prototype.RING_NODE_FACTORY_ = var context = objectStack[objectStack.length - 1]; var parentNode = context.node; goog.asserts.assert(goog.isObject(context)); - var exteriorWritten = goog.object.get(context, 'exteriorWritten'); + var exteriorWritten = context['exteriorWritten']; if (!goog.isDef(exteriorWritten)) { context['exteriorWritten'] = true; } @@ -776,7 +776,7 @@ ol.format.GML3.prototype.writeSurfaceOrPolygon_ = function(node, geometry, objectStack) { var context = objectStack[objectStack.length - 1]; goog.asserts.assert(goog.isObject(context)); - var srsName = goog.object.get(context, 'srsName'); + var srsName = context['srsName']; if (node.nodeName !== 'PolygonPatch' && goog.isDefAndNotNull(srsName)) { node.setAttribute('srsName', srsName); } @@ -806,7 +806,7 @@ ol.format.GML3.prototype.writeCurveOrLineString_ = function(node, geometry, objectStack) { var context = objectStack[objectStack.length - 1]; goog.asserts.assert(goog.isObject(context)); - var srsName = goog.object.get(context, 'srsName'); + var srsName = context['srsName']; if (node.nodeName !== 'LineStringSegment' && goog.isDefAndNotNull(srsName)) { node.setAttribute('srsName', srsName); @@ -835,8 +835,8 @@ ol.format.GML3.prototype.writeMultiSurfaceOrPolygon_ = function(node, geometry, objectStack) { var context = objectStack[objectStack.length - 1]; goog.asserts.assert(goog.isObject(context)); - var srsName = goog.object.get(context, 'srsName'); - var surface = goog.object.get(context, 'surface'); + var srsName = context['srsName']; + var surface = context['surface']; if (goog.isDefAndNotNull(srsName)) { node.setAttribute('srsName', srsName); } @@ -858,7 +858,7 @@ ol.format.GML3.prototype.writeMultiPoint_ = function(node, geometry, objectStack) { var context = objectStack[objectStack.length - 1]; goog.asserts.assert(goog.isObject(context)); - var srsName = goog.object.get(context, 'srsName'); + var srsName = context['srsName']; if (goog.isDefAndNotNull(srsName)) { node.setAttribute('srsName', srsName); } @@ -880,8 +880,8 @@ ol.format.GML3.prototype.writeMultiCurveOrLineString_ = function(node, geometry, objectStack) { var context = objectStack[objectStack.length - 1]; goog.asserts.assert(goog.isObject(context)); - var srsName = goog.object.get(context, 'srsName'); - var curve = goog.object.get(context, 'curve'); + var srsName = context['srsName']; + var curve = context['curve']; if (goog.isDefAndNotNull(srsName)) { node.setAttribute('srsName', srsName); } @@ -1030,7 +1030,7 @@ ol.format.GML3.prototype.writeFeatureElement = } var context = objectStack[objectStack.length - 1]; goog.asserts.assert(goog.isObject(context)); - var featureNS = goog.object.get(context, 'featureNS'); + var featureNS = context['featureNS']; var geometryName = feature.getGeometryName(); if (!goog.isDef(context.serializers)) { context.serializers = {}; @@ -1076,8 +1076,8 @@ ol.format.GML3.prototype.writeFeatureMembers_ = function(node, features, objectStack) { var context = objectStack[objectStack.length - 1]; goog.asserts.assert(goog.isObject(context)); - var featureType = goog.object.get(context, 'featureType'); - var featureNS = goog.object.get(context, 'featureNS'); + var featureType = context['featureType']; + var featureNS = context['featureNS']; var serializers = {}; serializers[featureNS] = {}; serializers[featureNS][featureType] = ol.xml.makeChildAppender( @@ -1219,10 +1219,10 @@ ol.format.GML3.prototype.GEOMETRY_NODE_FACTORY_ = function(value, objectStack, opt_nodeName) { var context = objectStack[objectStack.length - 1]; goog.asserts.assert(goog.isObject(context)); - var multiSurface = goog.object.get(context, 'multiSurface'); - var surface = goog.object.get(context, 'surface'); - var curve = goog.object.get(context, 'curve'); - var multiCurve = goog.object.get(context, 'multiCurve'); + var multiSurface = context['multiSurface']; + var surface = context['surface']; + var curve = context['curve']; + var multiCurve = context['multiCurve']; var parentNode = objectStack[objectStack.length - 1].node; goog.asserts.assert(ol.xml.isNode(parentNode)); var nodeName; diff --git a/src/ol/format/gml/gmlbaseformat.js b/src/ol/format/gml/gmlbaseformat.js index f4cd1ce302..96111d0980 100644 --- a/src/ol/format/gml/gmlbaseformat.js +++ b/src/ol/format/gml/gmlbaseformat.js @@ -90,7 +90,7 @@ ol.format.GMLBase.prototype.readFeatures_ = function(node, objectStack) { } else if (localName == 'featureMembers' || localName == 'featureMember') { var context = objectStack[0]; goog.asserts.assert(goog.isObject(context)); - var featureType = goog.object.get(context, 'featureType'); + var featureType = context['featureType']; if (!goog.isDef(featureType) && !goog.isNull(node.firstElementChild)) { var member = node.firstElementChild; featureType = member.nodeName.split(':').pop(); @@ -102,7 +102,7 @@ ol.format.GMLBase.prototype.readFeatures_ = function(node, objectStack) { parsers[featureType] = (localName == 'featureMembers') ? ol.xml.makeArrayPusher(this.readFeatureElement, this) : ol.xml.makeReplacer(this.readFeatureElement, this); - parsersNS[goog.object.get(context, 'featureNS')] = parsers; + parsersNS[context['featureNS']] = parsers; features = ol.xml.pushParseAndPop([], parsersNS, node, objectStack); } if (!goog.isDef(features)) { diff --git a/src/ol/format/gpxformat.js b/src/ol/format/gpxformat.js index 5bd9ff044c..06fb6fcd65 100644 --- a/src/ol/format/gpxformat.js +++ b/src/ol/format/gpxformat.js @@ -71,14 +71,14 @@ ol.format.GPX.appendCoordinate_ = function(flatCoordinates, node, values) { parseFloat(node.getAttribute('lat'))); if (goog.object.containsKey(values, 'ele')) { flatCoordinates.push( - /** @type {number} */ (goog.object.get(values, 'ele'))); + /** @type {number} */ (values['ele'])); goog.object.remove(values, 'ele'); } else { flatCoordinates.push(0); } if (goog.object.containsKey(values, 'time')) { flatCoordinates.push( - /** @type {number} */ (goog.object.get(values, 'time'))); + /** @type {number} */ (values['time'])); goog.object.remove(values, 'time'); } else { flatCoordinates.push(0); @@ -130,7 +130,7 @@ ol.format.GPX.parseRtePt_ = function(node, objectStack) { if (goog.isDef(values)) { var rteValues = /** @type {Object} */ (objectStack[objectStack.length - 1]); var flatCoordinates = /** @type {Array.} */ - (goog.object.get(rteValues, 'flatCoordinates')); + (rteValues['flatCoordinates']); ol.format.GPX.appendCoordinate_(flatCoordinates, node, values); } }; @@ -149,7 +149,7 @@ ol.format.GPX.parseTrkPt_ = function(node, objectStack) { if (goog.isDef(values)) { var trkValues = /** @type {Object} */ (objectStack[objectStack.length - 1]); var flatCoordinates = /** @type {Array.} */ - (goog.object.get(trkValues, 'flatCoordinates')); + (trkValues['flatCoordinates']); ol.format.GPX.appendCoordinate_(flatCoordinates, node, values); } }; @@ -166,8 +166,8 @@ ol.format.GPX.parseTrkSeg_ = function(node, objectStack) { var values = /** @type {Object} */ (objectStack[objectStack.length - 1]); ol.xml.parseNode(ol.format.GPX.TRKSEG_PARSERS_, node, objectStack); var flatCoordinates = /** @type {Array.} */ - (goog.object.get(values, 'flatCoordinates')); - var ends = /** @type {Array.} */ (goog.object.get(values, 'ends')); + (values['flatCoordinates']); + var ends = /** @type {Array.} */ (values['ends']); ends.push(flatCoordinates.length); }; @@ -189,7 +189,7 @@ ol.format.GPX.readRte_ = function(node, objectStack) { return undefined; } var flatCoordinates = /** @type {Array.} */ - (goog.object.get(values, 'flatCoordinates')); + (values['flatCoordinates']); goog.object.remove(values, 'flatCoordinates'); var geometry = new ol.geom.LineString(null); geometry.setFlatCoordinates(ol.geom.GeometryLayout.XYZM, flatCoordinates); @@ -218,9 +218,9 @@ ol.format.GPX.readTrk_ = function(node, objectStack) { return undefined; } var flatCoordinates = /** @type {Array.} */ - (goog.object.get(values, 'flatCoordinates')); + (values['flatCoordinates']); goog.object.remove(values, 'flatCoordinates'); - var ends = /** @type {Array.} */ (goog.object.get(values, 'ends')); + var ends = /** @type {Array.} */ (values['ends']); goog.object.remove(values, 'ends'); var geometry = new ol.geom.MultiLineString(null); geometry.setFlatCoordinates( @@ -527,10 +527,10 @@ ol.format.GPX.writeLink_ = function(node, value, objectStack) { node.setAttribute('href', value); var context = objectStack[objectStack.length - 1]; goog.asserts.assert(goog.isObject(context)); - var properties = goog.object.get(context, 'properties'); + var properties = context['properties']; var link = [ - goog.object.get(properties, 'linkText'), - goog.object.get(properties, 'linkType') + properties['linkText'], + properties['linkType'] ]; ol.xml.pushSerializeAndPop(/** @type {ol.xml.NodeStackItem} */ ({node: node}), ol.format.GPX.LINK_SERIALIZERS_, ol.xml.OBJECT_PROPERTY_NODE_FACTORY, @@ -550,11 +550,11 @@ ol.format.GPX.writeWptType_ = function(node, coordinate, objectStack) { var parentNode = context.node; goog.asserts.assert(ol.xml.isNode(parentNode)); var namespaceURI = parentNode.namespaceURI; - var properties = goog.object.get(context, 'properties'); + var properties = context['properties']; //FIXME Projection handling ol.xml.setAttributeNS(node, null, 'lat', coordinate[1]); ol.xml.setAttributeNS(node, null, 'lon', coordinate[0]); - var geometryLayout = goog.object.get(context, 'geometryLayout'); + var geometryLayout = context['geometryLayout']; /* jshint -W086 */ switch (geometryLayout) { case ol.geom.GeometryLayout.XYZM: diff --git a/src/ol/format/kmlformat.js b/src/ol/format/kmlformat.js index 0669da76b9..b45668bd38 100644 --- a/src/ol/format/kmlformat.js +++ b/src/ol/format/kmlformat.js @@ -472,7 +472,7 @@ ol.format.KML.IconStyleParser_ = function(node, objectStack) { var IconObject = /** @type {Object} */ (goog.object.get(object, 'Icon', {})); var src; var href = /** @type {string|undefined} */ - (goog.object.get(IconObject, 'href')); + (IconObject['href']); if (goog.isDef(href)) { src = href; } else { @@ -480,7 +480,7 @@ ol.format.KML.IconStyleParser_ = function(node, objectStack) { } var anchor, anchorXUnits, anchorYUnits; var hotSpot = /** @type {ol.format.KMLVec2_|undefined} */ - (goog.object.get(object, 'hotSpot')); + (object['hotSpot']); if (goog.isDef(hotSpot)) { anchor = [hotSpot.x, hotSpot.y]; anchorXUnits = hotSpot.xunits; @@ -497,31 +497,31 @@ ol.format.KML.IconStyleParser_ = function(node, objectStack) { var offset; var x = /** @type {number|undefined} */ - (goog.object.get(IconObject, 'x')); + (IconObject['x']); var y = /** @type {number|undefined} */ - (goog.object.get(IconObject, 'y')); + (IconObject['y']); if (goog.isDef(x) && goog.isDef(y)) { offset = [x, y]; } var size; var w = /** @type {number|undefined} */ - (goog.object.get(IconObject, 'w')); + (IconObject['w']); var h = /** @type {number|undefined} */ - (goog.object.get(IconObject, 'h')); + (IconObject['h']); if (goog.isDef(w) && goog.isDef(h)) { size = [w, h]; } var rotation; var heading = /** @type {number|undefined} */ - (goog.object.get(object, 'heading')); + (object['heading']); if (goog.isDef(heading)) { rotation = goog.math.toRadians(heading); } var scale = /** @type {number|undefined} */ - (goog.object.get(object, 'scale')); + (object['scale']); if (src == ol.format.KML.DEFAULT_IMAGE_STYLE_SRC_) { size = ol.format.KML.DEFAULT_IMAGE_STYLE_SIZE_; } @@ -565,7 +565,7 @@ ol.format.KML.LabelStyleParser_ = function(node, objectStack) { (goog.object.get(object, 'color', ol.format.KML.DEFAULT_COLOR_)) }), scale: /** @type {number|undefined} */ - (goog.object.get(object, 'scale')) + (object['scale']) }); styleObject['textStyle'] = textStyle; }; @@ -621,12 +621,12 @@ ol.format.KML.PolyStyleParser_ = function(node, objectStack) { (goog.object.get(object, 'color', ol.format.KML.DEFAULT_COLOR_)) }); styleObject['fillStyle'] = fillStyle; - var fill = /** @type {boolean|undefined} */ (goog.object.get(object, 'fill')); + var fill = /** @type {boolean|undefined} */ (object['fill']); if (goog.isDef(fill)) { styleObject['fill'] = fill; } var outline = - /** @type {boolean|undefined} */ (goog.object.get(object, 'outline')); + /** @type {boolean|undefined} */ (object['outline']); if (goog.isDef(outline)) { styleObject['outline'] = outline; } @@ -944,7 +944,7 @@ ol.format.KML.readStyle_ = function(node, objectStack) { var fillStyle = /** @type {ol.style.Fill} */ (goog.object.get( styleObject, 'fillStyle', ol.format.KML.DEFAULT_FILL_STYLE_)); var fill = /** @type {boolean|undefined} */ - (goog.object.get(styleObject, 'fill')); + (styleObject['fill']); if (goog.isDef(fill) && !fill) { fillStyle = null; } @@ -955,7 +955,7 @@ ol.format.KML.readStyle_ = function(node, objectStack) { var strokeStyle = /** @type {ol.style.Stroke} */ (goog.object.get( styleObject, 'strokeStyle', ol.format.KML.DEFAULT_STROKE_STYLE_)); var outline = /** @type {boolean|undefined} */ - (goog.object.get(styleObject, 'outline')); + (styleObject['outline']); if (goog.isDef(outline) && !outline) { strokeStyle = null; } @@ -1017,15 +1017,15 @@ ol.format.KML.PairDataParser_ = function(node, objectStack) { return; } var key = /** @type {string|undefined} */ - (goog.object.get(pairObject, 'key')); + (pairObject['key']); if (goog.isDef(key) && key == 'normal') { var styleUrl = /** @type {string|undefined} */ - (goog.object.get(pairObject, 'styleUrl')); + (pairObject['styleUrl']); if (goog.isDef(styleUrl)) { objectStack[objectStack.length - 1] = styleUrl; } var Style = /** @type {ol.style.Style} */ - (goog.object.get(pairObject, 'Style')); + (pairObject['Style']); if (goog.isDef(Style)) { objectStack[objectStack.length - 1] = Style; } @@ -1766,8 +1766,8 @@ ol.format.KML.writeCoordinatesTextNode_ = var context = objectStack[objectStack.length - 1]; goog.asserts.assert(goog.isObject(context)); - var layout = goog.object.get(context, 'layout'); - var stride = goog.object.get(context, 'stride'); + var layout = context['layout']; + var stride = context['stride']; var dimension; if (layout == ol.geom.GeometryLayout.XY || diff --git a/src/ol/format/osmxmlformat.js b/src/ol/format/osmxmlformat.js index 12d73bbc57..01165e61cc 100644 --- a/src/ol/format/osmxmlformat.js +++ b/src/ol/format/osmxmlformat.js @@ -100,7 +100,7 @@ ol.format.OSMXML.readWay_ = function(node, objectStack) { var state = /** @type {Object} */ (objectStack[objectStack.length - 1]); var flatCoordinates = /** @type {Array.} */ ([]); for (var i = 0, ii = values.ndrefs.length; i < ii; i++) { - var point = goog.object.get(state.nodes, values.ndrefs[i]); + var point = state.nodes[values.ndrefs[i]]; goog.array.extend(flatCoordinates, point); } var geometry; diff --git a/src/ol/format/owsformat.js b/src/ol/format/owsformat.js index 5397db21b3..59cc689d98 100644 --- a/src/ol/format/owsformat.js +++ b/src/ol/format/owsformat.js @@ -2,7 +2,6 @@ goog.provide('ol.format.OWS'); goog.require('goog.asserts'); goog.require('goog.dom.NodeType'); -goog.require('goog.object'); goog.require('ol.format.XLink'); goog.require('ol.format.XML'); goog.require('ol.format.XSD'); @@ -146,7 +145,7 @@ ol.format.OWS.readGet_ = function(node, objectStack) { if (!goog.isDef(value)) { return undefined; } - var get = goog.object.get(object, 'get'); + var get = object['get']; if (!goog.isDef(get)) { object['get'] = [value]; }else { diff --git a/src/ol/format/wfsformat.js b/src/ol/format/wfsformat.js index 88e9311e45..bede4019cc 100644 --- a/src/ol/format/wfsformat.js +++ b/src/ol/format/wfsformat.js @@ -367,8 +367,8 @@ ol.format.WFS.QUERY_SERIALIZERS_ = { ol.format.WFS.writeFeature_ = function(node, feature, objectStack) { var context = objectStack[objectStack.length - 1]; goog.asserts.assert(goog.isObject(context)); - var featureType = goog.object.get(context, 'featureType'); - var featureNS = goog.object.get(context, 'featureNS'); + var featureType = context['featureType']; + var featureNS = context['featureNS']; var child = ol.xml.createElementNS(featureNS, featureType); node.appendChild(child); ol.format.GML3.prototype.writeFeatureElement(child, feature, objectStack); @@ -399,11 +399,11 @@ ol.format.WFS.writeOgcFidFilter_ = function(node, fid, objectStack) { ol.format.WFS.writeDelete_ = function(node, feature, objectStack) { var context = objectStack[objectStack.length - 1]; goog.asserts.assert(goog.isObject(context)); - var featureType = goog.object.get(context, 'featureType'); - var featurePrefix = goog.object.get(context, 'featurePrefix'); + var featureType = context['featureType']; + var featurePrefix = context['featurePrefix']; featurePrefix = goog.isDef(featurePrefix) ? featurePrefix : ol.format.WFS.FEATURE_PREFIX; - var featureNS = goog.object.get(context, 'featureNS'); + var featureNS = context['featureNS']; node.setAttribute('typeName', featurePrefix + ':' + featureType); ol.xml.setAttributeNS(node, ol.format.WFS.XMLNS, 'xmlns:' + featurePrefix, featureNS); @@ -423,11 +423,11 @@ ol.format.WFS.writeDelete_ = function(node, feature, objectStack) { ol.format.WFS.writeUpdate_ = function(node, feature, objectStack) { var context = objectStack[objectStack.length - 1]; goog.asserts.assert(goog.isObject(context)); - var featureType = goog.object.get(context, 'featureType'); - var featurePrefix = goog.object.get(context, 'featurePrefix'); + var featureType = context['featureType']; + var featurePrefix = context['featurePrefix']; featurePrefix = goog.isDef(featurePrefix) ? featurePrefix : ol.format.WFS.FEATURE_PREFIX; - var featureNS = goog.object.get(context, 'featureNS'); + var featureNS = context['featureNS']; node.setAttribute('typeName', featurePrefix + ':' + featureType); ol.xml.setAttributeNS(node, ol.format.WFS.XMLNS, 'xmlns:' + featurePrefix, featureNS); @@ -442,7 +442,7 @@ ol.format.WFS.writeUpdate_ = function(node, feature, objectStack) { } } ol.xml.pushSerializeAndPop({node: node, srsName: - goog.object.get(context, 'srsName')}, + context['srsName']}, ol.format.WFS.TRANSACTION_SERIALIZERS_, ol.xml.makeSimpleNodeFactory('Property'), values, objectStack); @@ -518,10 +518,10 @@ ol.format.WFS.TRANSACTION_SERIALIZERS_ = { ol.format.WFS.writeQuery_ = function(node, featureType, objectStack) { var context = objectStack[objectStack.length - 1]; goog.asserts.assert(goog.isObject(context)); - var featurePrefix = goog.object.get(context, 'featurePrefix'); - var featureNS = goog.object.get(context, 'featureNS'); - var propertyNames = goog.object.get(context, 'propertyNames'); - var srsName = goog.object.get(context, 'srsName'); + var featurePrefix = context['featurePrefix']; + var featureNS = context['featureNS']; + var propertyNames = context['propertyNames']; + var srsName = context['srsName']; var prefix = goog.isDef(featurePrefix) ? featurePrefix + ':' : ''; node.setAttribute('typeName', prefix + featureType); if (goog.isDef(srsName)) { @@ -537,7 +537,7 @@ ol.format.WFS.writeQuery_ = function(node, featureType, objectStack) { ol.format.WFS.QUERY_SERIALIZERS_, ol.xml.makeSimpleNodeFactory('PropertyName'), propertyNames, objectStack); - var bbox = goog.object.get(context, 'bbox'); + var bbox = context['bbox']; if (goog.isDef(bbox)) { var child = ol.xml.createElementNS('http://www.opengis.net/ogc', 'Filter'); ol.format.WFS.writeOgcBBOX_(child, bbox, objectStack); @@ -569,7 +569,7 @@ ol.format.WFS.writeOgcPropertyName_ = function(node, value, objectStack) { ol.format.WFS.writeOgcBBOX_ = function(node, bbox, objectStack) { var context = objectStack[objectStack.length - 1]; goog.asserts.assert(goog.isObject(context)); - var geometryName = goog.object.get(context, 'geometryName'); + var geometryName = context['geometryName']; var bboxNode = ol.xml.createElementNS('http://www.opengis.net/ogc', 'BBOX'); node.appendChild(bboxNode); ol.format.WFS.writeOgcPropertyName_(bboxNode, geometryName, objectStack); diff --git a/src/ol/format/wmscapabilitiesformat.js b/src/ol/format/wmscapabilitiesformat.js index 83c668238e..b5062b320c 100644 --- a/src/ol/format/wmscapabilitiesformat.js +++ b/src/ol/format/wmscapabilitiesformat.js @@ -136,14 +136,14 @@ ol.format.WMSCapabilities.readEXGeographicBoundingBox_ = if (!goog.isDef(geographicBoundingBox)) { return undefined; } - var westBoundLongitude = /** @type {number|undefined} */ (goog.object.get( - geographicBoundingBox, 'westBoundLongitude')); - var southBoundLatitude = /** @type {number|undefined} */ (goog.object.get( - geographicBoundingBox, 'southBoundLatitude')); - var eastBoundLongitude = /** @type {number|undefined} */ (goog.object.get( - geographicBoundingBox, 'eastBoundLongitude')); - var northBoundLatitude = /** @type {number|undefined} */ (goog.object.get( - geographicBoundingBox, 'northBoundLatitude')); + var westBoundLongitude = /** @type {number|undefined} */ + (geographicBoundingBox['westBoundLongitude']); + var southBoundLatitude = /** @type {number|undefined} */ + (geographicBoundingBox['southBoundLatitude']); + var eastBoundLongitude = /** @type {number|undefined} */ + (geographicBoundingBox['eastBoundLongitude']); + var northBoundLatitude = /** @type {number|undefined} */ + (geographicBoundingBox['northBoundLatitude']); if (!goog.isDef(westBoundLongitude) || !goog.isDef(southBoundLatitude) || !goog.isDef(eastBoundLongitude) || !goog.isDef(northBoundLatitude)) { return undefined; @@ -280,48 +280,48 @@ ol.format.WMSCapabilities.readLayer_ = function(node, objectStack) { var queryable = ol.format.XSD.readBooleanString(node.getAttribute('queryable')); if (!goog.isDef(queryable)) { - queryable = goog.object.get(parentLayerObject, 'queryable'); + queryable = parentLayerObject['queryable']; } layerObject['queryable'] = goog.isDef(queryable) ? queryable : false; var cascaded = ol.format.XSD.readNonNegativeIntegerString( node.getAttribute('cascaded')); if (!goog.isDef(cascaded)) { - cascaded = goog.object.get(parentLayerObject, 'cascaded'); + cascaded = parentLayerObject['cascaded']; } layerObject['cascaded'] = cascaded; var opaque = ol.format.XSD.readBooleanString(node.getAttribute('opaque')); if (!goog.isDef(opaque)) { - opaque = goog.object.get(parentLayerObject, 'opaque'); + opaque = parentLayerObject['opaque']; } layerObject['opaque'] = goog.isDef(opaque) ? opaque : false; var noSubsets = ol.format.XSD.readBooleanString(node.getAttribute('noSubsets')); if (!goog.isDef(noSubsets)) { - noSubsets = goog.object.get(parentLayerObject, 'noSubsets'); + noSubsets = parentLayerObject['noSubsets']; } layerObject['noSubsets'] = goog.isDef(noSubsets) ? noSubsets : false; var fixedWidth = ol.format.XSD.readDecimalString(node.getAttribute('fixedWidth')); if (!goog.isDef(fixedWidth)) { - fixedWidth = goog.object.get(parentLayerObject, 'fixedWidth'); + fixedWidth = parentLayerObject['fixedWidth']; } layerObject['fixedWidth'] = fixedWidth; var fixedHeight = ol.format.XSD.readDecimalString(node.getAttribute('fixedHeight')); if (!goog.isDef(fixedHeight)) { - fixedHeight = goog.object.get(parentLayerObject, 'fixedHeight'); + fixedHeight = parentLayerObject['fixedHeight']; } layerObject['fixedHeight'] = fixedHeight; // See 7.2.4.8 var addKeys = ['Style', 'CRS', 'AuthorityURL']; goog.array.forEach(addKeys, function(key) { - var parentValue = goog.object.get(parentLayerObject, key); + var parentValue = parentLayerObject[key]; if (goog.isDef(parentValue)) { var childValue = goog.object.setIfUndefined(layerObject, key, []); childValue = childValue.concat(parentValue); @@ -332,9 +332,9 @@ ol.format.WMSCapabilities.readLayer_ = function(node, objectStack) { var replaceKeys = ['EX_GeographicBoundingBox', 'BoundingBox', 'Dimension', 'Attribution', 'MinScaleDenominator', 'MaxScaleDenominator']; goog.array.forEach(replaceKeys, function(key) { - var childValue = goog.object.get(layerObject, key); + var childValue = layerObject[key]; if (!goog.isDef(childValue)) { - var parentValue = goog.object.get(parentLayerObject, key); + var parentValue = parentLayerObject[key]; layerObject[key] = parentValue; } }); diff --git a/src/ol/format/wmsgetfeatureinfoformat.js b/src/ol/format/wmsgetfeatureinfoformat.js index 567680056c..cedb4011f6 100644 --- a/src/ol/format/wmsgetfeatureinfoformat.js +++ b/src/ol/format/wmsgetfeatureinfoformat.js @@ -97,7 +97,7 @@ ol.format.WMSGetFeatureInfo.prototype.readFeatures_ = parsers[featureType] = ol.xml.makeArrayPusher( this.gmlFormat_.readFeatureElement, this.gmlFormat_); var parsersNS = ol.xml.makeParsersNS( - [goog.object.get(context, 'featureNS'), null], parsers); + [context['featureNS'], null], parsers); layer.namespaceURI = this.featureNS_; var layerFeatures = ol.xml.pushParseAndPop( [], parsersNS, layer, objectStack, this.gmlFormat_); diff --git a/src/ol/object.js b/src/ol/object.js index fe5a613fd1..0e2f7ab88d 100644 --- a/src/ol/object.js +++ b/src/ol/object.js @@ -268,7 +268,7 @@ ol.Object.getSetterName = function(key) { ol.Object.getKeyValue_ = function(obj, key) { var getterName = ol.Object.getGetterName(key); var getter = /** @type {function(): *|undefined} */ - (goog.object.get(obj, getterName)); + (/** @type {Object} */ (obj)[getterName]); return goog.isDef(getter) ? getter.call(obj) : obj.get(key); }; @@ -284,7 +284,7 @@ ol.Object.getKeyValue_ = function(obj, key) { ol.Object.setKeyValue_ = function(obj, key, value) { var setterName = ol.Object.getSetterName(key); var setter = /** @type {function(*)|undefined} */ - (goog.object.get(obj, setterName)); + (/** @type {Object} */ (obj)[setterName]); if (goog.isDef(setter)) { setter.call(obj, value); } else { diff --git a/src/ol/pointer/mousesource.js b/src/ol/pointer/mousesource.js index b1f9dd6856..3e007cfef0 100644 --- a/src/ol/pointer/mousesource.js +++ b/src/ol/pointer/mousesource.js @@ -195,8 +195,7 @@ ol.pointer.MouseSource.prototype.mousemove = function(inEvent) { */ ol.pointer.MouseSource.prototype.mouseup = function(inEvent) { if (!this.isEventSimulatedFromTouch_(inEvent)) { - var p = goog.object.get(this.pointerMap, - ol.pointer.MouseSource.POINTER_ID.toString()); + var p = this.pointerMap[ol.pointer.MouseSource.POINTER_ID.toString()]; if (p && p.button === inEvent.button) { var e = ol.pointer.MouseSource.prepareEvent(inEvent, this.dispatcher); diff --git a/src/ol/pointer/touchsource.js b/src/ol/pointer/touchsource.js index 80e3188781..575a1e6130 100644 --- a/src/ol/pointer/touchsource.js +++ b/src/ol/pointer/touchsource.js @@ -342,7 +342,7 @@ ol.pointer.TouchSource.prototype.touchmove = function(inEvent) { ol.pointer.TouchSource.prototype.moveOverOut_ = function(browserEvent, inPointer) { var event = inPointer; - var pointer = goog.object.get(this.pointerMap, event.pointerId); + var pointer = this.pointerMap[event.pointerId]; // a finger drifted off the screen, ignore it if (!pointer) { return; diff --git a/src/ol/render/canvas/canvasreplay.js b/src/ol/render/canvas/canvasreplay.js index 92127daabc..13f7f5bf17 100644 --- a/src/ol/render/canvas/canvasreplay.js +++ b/src/ol/render/canvas/canvasreplay.js @@ -240,7 +240,7 @@ ol.render.canvas.Replay.prototype.replay_ = function( case ol.render.canvas.Instruction.BEGIN_GEOMETRY: feature = /** @type {ol.Feature} */ (instruction[1]); var featureUid = goog.getUid(feature).toString(); - if (!goog.isDef(goog.object.get(skippedFeaturesHash, featureUid))) { + if (!goog.isDef(skippedFeaturesHash[featureUid])) { ++i; } else { i = /** @type {number} */ (instruction[2]); diff --git a/src/ol/render/webgl/webglreplay.js b/src/ol/render/webgl/webglreplay.js index 2e7d42ee7a..723e5c8164 100644 --- a/src/ol/render/webgl/webglreplay.js +++ b/src/ol/render/webgl/webglreplay.js @@ -451,7 +451,7 @@ ol.render.webgl.ImageReplay.prototype.finish = function(context) { uid = goog.getUid(image).toString(); if (goog.object.containsKey(texturePerImage, uid)) { - texture = goog.object.get(texturePerImage, uid); + texture = texturePerImage[uid]; } else { texture = gl.createTexture(); gl.bindTexture(goog.webgl.TEXTURE_2D, texture); diff --git a/src/ol/source/imagewmssource.js b/src/ol/source/imagewmssource.js index 08d5e94939..c42e1cdddd 100644 --- a/src/ol/source/imagewmssource.js +++ b/src/ol/source/imagewmssource.js @@ -152,7 +152,7 @@ ol.source.ImageWMS.prototype.getGetFeatureInfoUrl = 'REQUEST': 'GetFeatureInfo', 'FORMAT': 'image/png', 'TRANSPARENT': true, - 'QUERY_LAYERS': goog.object.get(this.params_, 'LAYERS') + 'QUERY_LAYERS': this.params_['LAYERS'] }; goog.object.extend(baseParams, this.params_, params); diff --git a/src/ol/source/tilewmssource.js b/src/ol/source/tilewmssource.js index 5e4edb0b0f..a562207c66 100644 --- a/src/ol/source/tilewmssource.js +++ b/src/ol/source/tilewmssource.js @@ -161,7 +161,7 @@ ol.source.TileWMS.prototype.getGetFeatureInfoUrl = 'REQUEST': 'GetFeatureInfo', 'FORMAT': 'image/png', 'TRANSPARENT': true, - 'QUERY_LAYERS': goog.object.get(this.params_, 'LAYERS') + 'QUERY_LAYERS': this.params_['LAYERS'] }; goog.object.extend(baseParams, this.params_, params); diff --git a/src/ol/structs/rbush.js b/src/ol/structs/rbush.js index a9c5cce5d9..ec2ac67355 100644 --- a/src/ol/structs/rbush.js +++ b/src/ol/structs/rbush.js @@ -59,7 +59,9 @@ ol.structs.RBush.prototype.insert = function(extent, value) { ]; this.rbush_.insert(item); // remember the object that was added to the internal rbush - goog.object.add(this.items_, goog.getUid(value).toString(), item); + goog.asserts.assert( + !goog.object.containsKey(this.items_, goog.getUid(value))); + this.items_[goog.getUid(value)] = item; }; @@ -87,7 +89,9 @@ ol.structs.RBush.prototype.load = function(extents, values) { value ]; items[i] = item; - goog.object.add(this.items_, goog.getUid(value).toString(), item); + goog.asserts.assert( + !goog.object.containsKey(this.items_, goog.getUid(value))); + this.items_[goog.getUid(value)] = item; } this.rbush_.load(items); }; @@ -102,12 +106,12 @@ ol.structs.RBush.prototype.remove = function(value) { if (goog.DEBUG && this.readers_) { throw new Error('Can not remove value while reading'); } - var uid = goog.getUid(value).toString(); + var uid = goog.getUid(value); goog.asserts.assert(goog.object.containsKey(this.items_, uid)); // get the object in which the value was wrapped when adding to the // internal rbush. then use that object to do the removal. - var item = goog.object.get(this.items_, uid); + var item = this.items_[uid]; goog.object.remove(this.items_, uid); return this.rbush_.remove(item) !== null; };