Use bracket notation instead of goog.object.get

This commit is contained in:
Tim Schaub
2015-01-07 22:31:01 -07:00
parent f9a92c422c
commit 1ff43686f5
18 changed files with 108 additions and 107 deletions
+1 -2
View File
@@ -3,7 +3,6 @@ goog.provide('ol.format.GML2');
goog.require('goog.asserts'); goog.require('goog.asserts');
goog.require('goog.dom'); goog.require('goog.dom');
goog.require('goog.dom.NodeType'); goog.require('goog.dom.NodeType');
goog.require('goog.object');
goog.require('ol.extent'); goog.require('ol.extent');
goog.require('ol.format.GML'); goog.require('ol.format.GML');
goog.require('ol.format.GMLBase'); 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 s = ol.xml.getAllTextContent(node, false).replace(/^\s*|\s*$/g, '');
var context = objectStack[0]; var context = objectStack[0];
goog.asserts.assert(goog.isObject(context)); goog.asserts.assert(goog.isObject(context));
var containerSrs = goog.object.get(context, 'srsName'); var containerSrs = context['srsName'];
var containerDimension = node.parentNode.getAttribute('srsDimension'); var containerDimension = node.parentNode.getAttribute('srsDimension');
var axisOrientation = 'enu'; var axisOrientation = 'enu';
if (!goog.isNull(containerSrs)) { if (!goog.isNull(containerSrs)) {
+22 -22
View File
@@ -356,7 +356,7 @@ ol.format.GML3.prototype.readFlatPos_ = function(node, objectStack) {
} }
var context = objectStack[0]; var context = objectStack[0];
goog.asserts.assert(goog.isObject(context)); goog.asserts.assert(goog.isObject(context));
var containerSrs = goog.object.get(context, 'srsName'); var containerSrs = context['srsName'];
var axisOrientation = 'enu'; var axisOrientation = 'enu';
if (!goog.isNull(containerSrs)) { if (!goog.isNull(containerSrs)) {
var proj = ol.proj.get(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 s = ol.xml.getAllTextContent(node, false).replace(/^\s*|\s*$/g, '');
var context = objectStack[0]; var context = objectStack[0];
goog.asserts.assert(goog.isObject(context)); goog.asserts.assert(goog.isObject(context));
var containerSrs = goog.object.get(context, 'srsName'); var containerSrs = context['srsName'];
var containerDimension = node.parentNode.getAttribute('srsDimension'); var containerDimension = node.parentNode.getAttribute('srsDimension');
var axisOrientation = 'enu'; var axisOrientation = 'enu';
if (!goog.isNull(containerSrs)) { if (!goog.isNull(containerSrs)) {
@@ -614,7 +614,7 @@ ol.format.GML3.prototype.SEGMENTS_PARSERS_ = Object({
ol.format.GML3.prototype.writePos_ = function(node, value, objectStack) { ol.format.GML3.prototype.writePos_ = function(node, value, objectStack) {
var context = objectStack[objectStack.length - 1]; var context = objectStack[objectStack.length - 1];
goog.asserts.assert(goog.isObject(context)); goog.asserts.assert(goog.isObject(context));
var srsName = goog.object.get(context, 'srsName'); var srsName = context['srsName'];
var axisOrientation = 'enu'; var axisOrientation = 'enu';
if (goog.isDefAndNotNull(srsName)) { if (goog.isDefAndNotNull(srsName)) {
axisOrientation = ol.proj.get(srsName).getAxisOrientation(); 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) { ol.format.GML3.prototype.writePosList_ = function(node, value, objectStack) {
var context = objectStack[objectStack.length - 1]; var context = objectStack[objectStack.length - 1];
goog.asserts.assert(goog.isObject(context)); goog.asserts.assert(goog.isObject(context));
var srsName = goog.object.get(context, 'srsName'); var srsName = context['srsName'];
// only 2d for simple features profile // only 2d for simple features profile
var points = value.getCoordinates(); var points = value.getCoordinates();
var len = points.length; 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) { ol.format.GML3.prototype.writePoint_ = function(node, geometry, objectStack) {
var context = objectStack[objectStack.length - 1]; var context = objectStack[objectStack.length - 1];
goog.asserts.assert(goog.isObject(context)); goog.asserts.assert(goog.isObject(context));
var srsName = goog.object.get(context, 'srsName'); var srsName = context['srsName'];
if (goog.isDefAndNotNull(srsName)) { if (goog.isDefAndNotNull(srsName)) {
node.setAttribute('srsName', srsName); node.setAttribute('srsName', srsName);
} }
@@ -711,7 +711,7 @@ ol.format.GML3.prototype.writeEnvelope = function(node, extent, objectStack) {
goog.asserts.assert(extent.length == 4); goog.asserts.assert(extent.length == 4);
var context = objectStack[objectStack.length - 1]; var context = objectStack[objectStack.length - 1];
goog.asserts.assert(goog.isObject(context)); goog.asserts.assert(goog.isObject(context));
var srsName = goog.object.get(context, 'srsName'); var srsName = context['srsName'];
if (goog.isDef(srsName)) { if (goog.isDef(srsName)) {
node.setAttribute('srsName', srsName); node.setAttribute('srsName', srsName);
} }
@@ -735,7 +735,7 @@ ol.format.GML3.prototype.writeLinearRing_ =
function(node, geometry, objectStack) { function(node, geometry, objectStack) {
var context = objectStack[objectStack.length - 1]; var context = objectStack[objectStack.length - 1];
goog.asserts.assert(goog.isObject(context)); goog.asserts.assert(goog.isObject(context));
var srsName = goog.object.get(context, 'srsName'); var srsName = context['srsName'];
if (goog.isDefAndNotNull(srsName)) { if (goog.isDefAndNotNull(srsName)) {
node.setAttribute('srsName', srsName); node.setAttribute('srsName', srsName);
} }
@@ -757,7 +757,7 @@ ol.format.GML3.prototype.RING_NODE_FACTORY_ =
var context = objectStack[objectStack.length - 1]; var context = objectStack[objectStack.length - 1];
var parentNode = context.node; var parentNode = context.node;
goog.asserts.assert(goog.isObject(context)); goog.asserts.assert(goog.isObject(context));
var exteriorWritten = goog.object.get(context, 'exteriorWritten'); var exteriorWritten = context['exteriorWritten'];
if (!goog.isDef(exteriorWritten)) { if (!goog.isDef(exteriorWritten)) {
context['exteriorWritten'] = true; context['exteriorWritten'] = true;
} }
@@ -776,7 +776,7 @@ ol.format.GML3.prototype.writeSurfaceOrPolygon_ =
function(node, geometry, objectStack) { function(node, geometry, objectStack) {
var context = objectStack[objectStack.length - 1]; var context = objectStack[objectStack.length - 1];
goog.asserts.assert(goog.isObject(context)); goog.asserts.assert(goog.isObject(context));
var srsName = goog.object.get(context, 'srsName'); var srsName = context['srsName'];
if (node.nodeName !== 'PolygonPatch' && goog.isDefAndNotNull(srsName)) { if (node.nodeName !== 'PolygonPatch' && goog.isDefAndNotNull(srsName)) {
node.setAttribute('srsName', srsName); node.setAttribute('srsName', srsName);
} }
@@ -806,7 +806,7 @@ ol.format.GML3.prototype.writeCurveOrLineString_ =
function(node, geometry, objectStack) { function(node, geometry, objectStack) {
var context = objectStack[objectStack.length - 1]; var context = objectStack[objectStack.length - 1];
goog.asserts.assert(goog.isObject(context)); goog.asserts.assert(goog.isObject(context));
var srsName = goog.object.get(context, 'srsName'); var srsName = context['srsName'];
if (node.nodeName !== 'LineStringSegment' && if (node.nodeName !== 'LineStringSegment' &&
goog.isDefAndNotNull(srsName)) { goog.isDefAndNotNull(srsName)) {
node.setAttribute('srsName', srsName); node.setAttribute('srsName', srsName);
@@ -835,8 +835,8 @@ ol.format.GML3.prototype.writeMultiSurfaceOrPolygon_ =
function(node, geometry, objectStack) { function(node, geometry, objectStack) {
var context = objectStack[objectStack.length - 1]; var context = objectStack[objectStack.length - 1];
goog.asserts.assert(goog.isObject(context)); goog.asserts.assert(goog.isObject(context));
var srsName = goog.object.get(context, 'srsName'); var srsName = context['srsName'];
var surface = goog.object.get(context, 'surface'); var surface = context['surface'];
if (goog.isDefAndNotNull(srsName)) { if (goog.isDefAndNotNull(srsName)) {
node.setAttribute('srsName', srsName); node.setAttribute('srsName', srsName);
} }
@@ -858,7 +858,7 @@ ol.format.GML3.prototype.writeMultiPoint_ = function(node, geometry,
objectStack) { objectStack) {
var context = objectStack[objectStack.length - 1]; var context = objectStack[objectStack.length - 1];
goog.asserts.assert(goog.isObject(context)); goog.asserts.assert(goog.isObject(context));
var srsName = goog.object.get(context, 'srsName'); var srsName = context['srsName'];
if (goog.isDefAndNotNull(srsName)) { if (goog.isDefAndNotNull(srsName)) {
node.setAttribute('srsName', srsName); node.setAttribute('srsName', srsName);
} }
@@ -880,8 +880,8 @@ ol.format.GML3.prototype.writeMultiCurveOrLineString_ =
function(node, geometry, objectStack) { function(node, geometry, objectStack) {
var context = objectStack[objectStack.length - 1]; var context = objectStack[objectStack.length - 1];
goog.asserts.assert(goog.isObject(context)); goog.asserts.assert(goog.isObject(context));
var srsName = goog.object.get(context, 'srsName'); var srsName = context['srsName'];
var curve = goog.object.get(context, 'curve'); var curve = context['curve'];
if (goog.isDefAndNotNull(srsName)) { if (goog.isDefAndNotNull(srsName)) {
node.setAttribute('srsName', srsName); node.setAttribute('srsName', srsName);
} }
@@ -1030,7 +1030,7 @@ ol.format.GML3.prototype.writeFeatureElement =
} }
var context = objectStack[objectStack.length - 1]; var context = objectStack[objectStack.length - 1];
goog.asserts.assert(goog.isObject(context)); goog.asserts.assert(goog.isObject(context));
var featureNS = goog.object.get(context, 'featureNS'); var featureNS = context['featureNS'];
var geometryName = feature.getGeometryName(); var geometryName = feature.getGeometryName();
if (!goog.isDef(context.serializers)) { if (!goog.isDef(context.serializers)) {
context.serializers = {}; context.serializers = {};
@@ -1076,8 +1076,8 @@ ol.format.GML3.prototype.writeFeatureMembers_ =
function(node, features, objectStack) { function(node, features, objectStack) {
var context = objectStack[objectStack.length - 1]; var context = objectStack[objectStack.length - 1];
goog.asserts.assert(goog.isObject(context)); goog.asserts.assert(goog.isObject(context));
var featureType = goog.object.get(context, 'featureType'); var featureType = context['featureType'];
var featureNS = goog.object.get(context, 'featureNS'); var featureNS = context['featureNS'];
var serializers = {}; var serializers = {};
serializers[featureNS] = {}; serializers[featureNS] = {};
serializers[featureNS][featureType] = ol.xml.makeChildAppender( serializers[featureNS][featureType] = ol.xml.makeChildAppender(
@@ -1219,10 +1219,10 @@ ol.format.GML3.prototype.GEOMETRY_NODE_FACTORY_ =
function(value, objectStack, opt_nodeName) { function(value, objectStack, opt_nodeName) {
var context = objectStack[objectStack.length - 1]; var context = objectStack[objectStack.length - 1];
goog.asserts.assert(goog.isObject(context)); goog.asserts.assert(goog.isObject(context));
var multiSurface = goog.object.get(context, 'multiSurface'); var multiSurface = context['multiSurface'];
var surface = goog.object.get(context, 'surface'); var surface = context['surface'];
var curve = goog.object.get(context, 'curve'); var curve = context['curve'];
var multiCurve = goog.object.get(context, 'multiCurve'); var multiCurve = context['multiCurve'];
var parentNode = objectStack[objectStack.length - 1].node; var parentNode = objectStack[objectStack.length - 1].node;
goog.asserts.assert(ol.xml.isNode(parentNode)); goog.asserts.assert(ol.xml.isNode(parentNode));
var nodeName; var nodeName;
+2 -2
View File
@@ -90,7 +90,7 @@ ol.format.GMLBase.prototype.readFeatures_ = function(node, objectStack) {
} else if (localName == 'featureMembers' || localName == 'featureMember') { } else if (localName == 'featureMembers' || localName == 'featureMember') {
var context = objectStack[0]; var context = objectStack[0];
goog.asserts.assert(goog.isObject(context)); 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)) { if (!goog.isDef(featureType) && !goog.isNull(node.firstElementChild)) {
var member = node.firstElementChild; var member = node.firstElementChild;
featureType = member.nodeName.split(':').pop(); featureType = member.nodeName.split(':').pop();
@@ -102,7 +102,7 @@ ol.format.GMLBase.prototype.readFeatures_ = function(node, objectStack) {
parsers[featureType] = (localName == 'featureMembers') ? parsers[featureType] = (localName == 'featureMembers') ?
ol.xml.makeArrayPusher(this.readFeatureElement, this) : ol.xml.makeArrayPusher(this.readFeatureElement, this) :
ol.xml.makeReplacer(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); features = ol.xml.pushParseAndPop([], parsersNS, node, objectStack);
} }
if (!goog.isDef(features)) { if (!goog.isDef(features)) {
+14 -14
View File
@@ -71,14 +71,14 @@ ol.format.GPX.appendCoordinate_ = function(flatCoordinates, node, values) {
parseFloat(node.getAttribute('lat'))); parseFloat(node.getAttribute('lat')));
if (goog.object.containsKey(values, 'ele')) { if (goog.object.containsKey(values, 'ele')) {
flatCoordinates.push( flatCoordinates.push(
/** @type {number} */ (goog.object.get(values, 'ele'))); /** @type {number} */ (values['ele']));
goog.object.remove(values, 'ele'); goog.object.remove(values, 'ele');
} else { } else {
flatCoordinates.push(0); flatCoordinates.push(0);
} }
if (goog.object.containsKey(values, 'time')) { if (goog.object.containsKey(values, 'time')) {
flatCoordinates.push( flatCoordinates.push(
/** @type {number} */ (goog.object.get(values, 'time'))); /** @type {number} */ (values['time']));
goog.object.remove(values, 'time'); goog.object.remove(values, 'time');
} else { } else {
flatCoordinates.push(0); flatCoordinates.push(0);
@@ -130,7 +130,7 @@ ol.format.GPX.parseRtePt_ = function(node, objectStack) {
if (goog.isDef(values)) { if (goog.isDef(values)) {
var rteValues = /** @type {Object} */ (objectStack[objectStack.length - 1]); var rteValues = /** @type {Object} */ (objectStack[objectStack.length - 1]);
var flatCoordinates = /** @type {Array.<number>} */ var flatCoordinates = /** @type {Array.<number>} */
(goog.object.get(rteValues, 'flatCoordinates')); (rteValues['flatCoordinates']);
ol.format.GPX.appendCoordinate_(flatCoordinates, node, values); ol.format.GPX.appendCoordinate_(flatCoordinates, node, values);
} }
}; };
@@ -149,7 +149,7 @@ ol.format.GPX.parseTrkPt_ = function(node, objectStack) {
if (goog.isDef(values)) { if (goog.isDef(values)) {
var trkValues = /** @type {Object} */ (objectStack[objectStack.length - 1]); var trkValues = /** @type {Object} */ (objectStack[objectStack.length - 1]);
var flatCoordinates = /** @type {Array.<number>} */ var flatCoordinates = /** @type {Array.<number>} */
(goog.object.get(trkValues, 'flatCoordinates')); (trkValues['flatCoordinates']);
ol.format.GPX.appendCoordinate_(flatCoordinates, node, values); 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]); var values = /** @type {Object} */ (objectStack[objectStack.length - 1]);
ol.xml.parseNode(ol.format.GPX.TRKSEG_PARSERS_, node, objectStack); ol.xml.parseNode(ol.format.GPX.TRKSEG_PARSERS_, node, objectStack);
var flatCoordinates = /** @type {Array.<number>} */ var flatCoordinates = /** @type {Array.<number>} */
(goog.object.get(values, 'flatCoordinates')); (values['flatCoordinates']);
var ends = /** @type {Array.<number>} */ (goog.object.get(values, 'ends')); var ends = /** @type {Array.<number>} */ (values['ends']);
ends.push(flatCoordinates.length); ends.push(flatCoordinates.length);
}; };
@@ -189,7 +189,7 @@ ol.format.GPX.readRte_ = function(node, objectStack) {
return undefined; return undefined;
} }
var flatCoordinates = /** @type {Array.<number>} */ var flatCoordinates = /** @type {Array.<number>} */
(goog.object.get(values, 'flatCoordinates')); (values['flatCoordinates']);
goog.object.remove(values, 'flatCoordinates'); goog.object.remove(values, 'flatCoordinates');
var geometry = new ol.geom.LineString(null); var geometry = new ol.geom.LineString(null);
geometry.setFlatCoordinates(ol.geom.GeometryLayout.XYZM, flatCoordinates); geometry.setFlatCoordinates(ol.geom.GeometryLayout.XYZM, flatCoordinates);
@@ -218,9 +218,9 @@ ol.format.GPX.readTrk_ = function(node, objectStack) {
return undefined; return undefined;
} }
var flatCoordinates = /** @type {Array.<number>} */ var flatCoordinates = /** @type {Array.<number>} */
(goog.object.get(values, 'flatCoordinates')); (values['flatCoordinates']);
goog.object.remove(values, 'flatCoordinates'); goog.object.remove(values, 'flatCoordinates');
var ends = /** @type {Array.<number>} */ (goog.object.get(values, 'ends')); var ends = /** @type {Array.<number>} */ (values['ends']);
goog.object.remove(values, 'ends'); goog.object.remove(values, 'ends');
var geometry = new ol.geom.MultiLineString(null); var geometry = new ol.geom.MultiLineString(null);
geometry.setFlatCoordinates( geometry.setFlatCoordinates(
@@ -527,10 +527,10 @@ ol.format.GPX.writeLink_ = function(node, value, objectStack) {
node.setAttribute('href', value); node.setAttribute('href', value);
var context = objectStack[objectStack.length - 1]; var context = objectStack[objectStack.length - 1];
goog.asserts.assert(goog.isObject(context)); goog.asserts.assert(goog.isObject(context));
var properties = goog.object.get(context, 'properties'); var properties = context['properties'];
var link = [ var link = [
goog.object.get(properties, 'linkText'), properties['linkText'],
goog.object.get(properties, 'linkType') properties['linkType']
]; ];
ol.xml.pushSerializeAndPop(/** @type {ol.xml.NodeStackItem} */ ({node: node}), ol.xml.pushSerializeAndPop(/** @type {ol.xml.NodeStackItem} */ ({node: node}),
ol.format.GPX.LINK_SERIALIZERS_, ol.xml.OBJECT_PROPERTY_NODE_FACTORY, 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; var parentNode = context.node;
goog.asserts.assert(ol.xml.isNode(parentNode)); goog.asserts.assert(ol.xml.isNode(parentNode));
var namespaceURI = parentNode.namespaceURI; var namespaceURI = parentNode.namespaceURI;
var properties = goog.object.get(context, 'properties'); var properties = context['properties'];
//FIXME Projection handling //FIXME Projection handling
ol.xml.setAttributeNS(node, null, 'lat', coordinate[1]); ol.xml.setAttributeNS(node, null, 'lat', coordinate[1]);
ol.xml.setAttributeNS(node, null, 'lon', coordinate[0]); ol.xml.setAttributeNS(node, null, 'lon', coordinate[0]);
var geometryLayout = goog.object.get(context, 'geometryLayout'); var geometryLayout = context['geometryLayout'];
/* jshint -W086 */ /* jshint -W086 */
switch (geometryLayout) { switch (geometryLayout) {
case ol.geom.GeometryLayout.XYZM: case ol.geom.GeometryLayout.XYZM:
+18 -18
View File
@@ -472,7 +472,7 @@ ol.format.KML.IconStyleParser_ = function(node, objectStack) {
var IconObject = /** @type {Object} */ (goog.object.get(object, 'Icon', {})); var IconObject = /** @type {Object} */ (goog.object.get(object, 'Icon', {}));
var src; var src;
var href = /** @type {string|undefined} */ var href = /** @type {string|undefined} */
(goog.object.get(IconObject, 'href')); (IconObject['href']);
if (goog.isDef(href)) { if (goog.isDef(href)) {
src = href; src = href;
} else { } else {
@@ -480,7 +480,7 @@ ol.format.KML.IconStyleParser_ = function(node, objectStack) {
} }
var anchor, anchorXUnits, anchorYUnits; var anchor, anchorXUnits, anchorYUnits;
var hotSpot = /** @type {ol.format.KMLVec2_|undefined} */ var hotSpot = /** @type {ol.format.KMLVec2_|undefined} */
(goog.object.get(object, 'hotSpot')); (object['hotSpot']);
if (goog.isDef(hotSpot)) { if (goog.isDef(hotSpot)) {
anchor = [hotSpot.x, hotSpot.y]; anchor = [hotSpot.x, hotSpot.y];
anchorXUnits = hotSpot.xunits; anchorXUnits = hotSpot.xunits;
@@ -497,31 +497,31 @@ ol.format.KML.IconStyleParser_ = function(node, objectStack) {
var offset; var offset;
var x = /** @type {number|undefined} */ var x = /** @type {number|undefined} */
(goog.object.get(IconObject, 'x')); (IconObject['x']);
var y = /** @type {number|undefined} */ var y = /** @type {number|undefined} */
(goog.object.get(IconObject, 'y')); (IconObject['y']);
if (goog.isDef(x) && goog.isDef(y)) { if (goog.isDef(x) && goog.isDef(y)) {
offset = [x, y]; offset = [x, y];
} }
var size; var size;
var w = /** @type {number|undefined} */ var w = /** @type {number|undefined} */
(goog.object.get(IconObject, 'w')); (IconObject['w']);
var h = /** @type {number|undefined} */ var h = /** @type {number|undefined} */
(goog.object.get(IconObject, 'h')); (IconObject['h']);
if (goog.isDef(w) && goog.isDef(h)) { if (goog.isDef(w) && goog.isDef(h)) {
size = [w, h]; size = [w, h];
} }
var rotation; var rotation;
var heading = /** @type {number|undefined} */ var heading = /** @type {number|undefined} */
(goog.object.get(object, 'heading')); (object['heading']);
if (goog.isDef(heading)) { if (goog.isDef(heading)) {
rotation = goog.math.toRadians(heading); rotation = goog.math.toRadians(heading);
} }
var scale = /** @type {number|undefined} */ var scale = /** @type {number|undefined} */
(goog.object.get(object, 'scale')); (object['scale']);
if (src == ol.format.KML.DEFAULT_IMAGE_STYLE_SRC_) { if (src == ol.format.KML.DEFAULT_IMAGE_STYLE_SRC_) {
size = ol.format.KML.DEFAULT_IMAGE_STYLE_SIZE_; 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_)) (goog.object.get(object, 'color', ol.format.KML.DEFAULT_COLOR_))
}), }),
scale: /** @type {number|undefined} */ scale: /** @type {number|undefined} */
(goog.object.get(object, 'scale')) (object['scale'])
}); });
styleObject['textStyle'] = textStyle; styleObject['textStyle'] = textStyle;
}; };
@@ -621,12 +621,12 @@ ol.format.KML.PolyStyleParser_ = function(node, objectStack) {
(goog.object.get(object, 'color', ol.format.KML.DEFAULT_COLOR_)) (goog.object.get(object, 'color', ol.format.KML.DEFAULT_COLOR_))
}); });
styleObject['fillStyle'] = fillStyle; styleObject['fillStyle'] = fillStyle;
var fill = /** @type {boolean|undefined} */ (goog.object.get(object, 'fill')); var fill = /** @type {boolean|undefined} */ (object['fill']);
if (goog.isDef(fill)) { if (goog.isDef(fill)) {
styleObject['fill'] = fill; styleObject['fill'] = fill;
} }
var outline = var outline =
/** @type {boolean|undefined} */ (goog.object.get(object, 'outline')); /** @type {boolean|undefined} */ (object['outline']);
if (goog.isDef(outline)) { if (goog.isDef(outline)) {
styleObject['outline'] = outline; styleObject['outline'] = outline;
} }
@@ -944,7 +944,7 @@ ol.format.KML.readStyle_ = function(node, objectStack) {
var fillStyle = /** @type {ol.style.Fill} */ (goog.object.get( var fillStyle = /** @type {ol.style.Fill} */ (goog.object.get(
styleObject, 'fillStyle', ol.format.KML.DEFAULT_FILL_STYLE_)); styleObject, 'fillStyle', ol.format.KML.DEFAULT_FILL_STYLE_));
var fill = /** @type {boolean|undefined} */ var fill = /** @type {boolean|undefined} */
(goog.object.get(styleObject, 'fill')); (styleObject['fill']);
if (goog.isDef(fill) && !fill) { if (goog.isDef(fill) && !fill) {
fillStyle = null; fillStyle = null;
} }
@@ -955,7 +955,7 @@ ol.format.KML.readStyle_ = function(node, objectStack) {
var strokeStyle = /** @type {ol.style.Stroke} */ (goog.object.get( var strokeStyle = /** @type {ol.style.Stroke} */ (goog.object.get(
styleObject, 'strokeStyle', ol.format.KML.DEFAULT_STROKE_STYLE_)); styleObject, 'strokeStyle', ol.format.KML.DEFAULT_STROKE_STYLE_));
var outline = /** @type {boolean|undefined} */ var outline = /** @type {boolean|undefined} */
(goog.object.get(styleObject, 'outline')); (styleObject['outline']);
if (goog.isDef(outline) && !outline) { if (goog.isDef(outline) && !outline) {
strokeStyle = null; strokeStyle = null;
} }
@@ -1017,15 +1017,15 @@ ol.format.KML.PairDataParser_ = function(node, objectStack) {
return; return;
} }
var key = /** @type {string|undefined} */ var key = /** @type {string|undefined} */
(goog.object.get(pairObject, 'key')); (pairObject['key']);
if (goog.isDef(key) && key == 'normal') { if (goog.isDef(key) && key == 'normal') {
var styleUrl = /** @type {string|undefined} */ var styleUrl = /** @type {string|undefined} */
(goog.object.get(pairObject, 'styleUrl')); (pairObject['styleUrl']);
if (goog.isDef(styleUrl)) { if (goog.isDef(styleUrl)) {
objectStack[objectStack.length - 1] = styleUrl; objectStack[objectStack.length - 1] = styleUrl;
} }
var Style = /** @type {ol.style.Style} */ var Style = /** @type {ol.style.Style} */
(goog.object.get(pairObject, 'Style')); (pairObject['Style']);
if (goog.isDef(Style)) { if (goog.isDef(Style)) {
objectStack[objectStack.length - 1] = Style; objectStack[objectStack.length - 1] = Style;
} }
@@ -1766,8 +1766,8 @@ ol.format.KML.writeCoordinatesTextNode_ =
var context = objectStack[objectStack.length - 1]; var context = objectStack[objectStack.length - 1];
goog.asserts.assert(goog.isObject(context)); goog.asserts.assert(goog.isObject(context));
var layout = goog.object.get(context, 'layout'); var layout = context['layout'];
var stride = goog.object.get(context, 'stride'); var stride = context['stride'];
var dimension; var dimension;
if (layout == ol.geom.GeometryLayout.XY || if (layout == ol.geom.GeometryLayout.XY ||
+1 -1
View File
@@ -100,7 +100,7 @@ ol.format.OSMXML.readWay_ = function(node, objectStack) {
var state = /** @type {Object} */ (objectStack[objectStack.length - 1]); var state = /** @type {Object} */ (objectStack[objectStack.length - 1]);
var flatCoordinates = /** @type {Array.<number>} */ ([]); var flatCoordinates = /** @type {Array.<number>} */ ([]);
for (var i = 0, ii = values.ndrefs.length; i < ii; i++) { 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); goog.array.extend(flatCoordinates, point);
} }
var geometry; var geometry;
+1 -2
View File
@@ -2,7 +2,6 @@ goog.provide('ol.format.OWS');
goog.require('goog.asserts'); goog.require('goog.asserts');
goog.require('goog.dom.NodeType'); goog.require('goog.dom.NodeType');
goog.require('goog.object');
goog.require('ol.format.XLink'); goog.require('ol.format.XLink');
goog.require('ol.format.XML'); goog.require('ol.format.XML');
goog.require('ol.format.XSD'); goog.require('ol.format.XSD');
@@ -146,7 +145,7 @@ ol.format.OWS.readGet_ = function(node, objectStack) {
if (!goog.isDef(value)) { if (!goog.isDef(value)) {
return undefined; return undefined;
} }
var get = goog.object.get(object, 'get'); var get = object['get'];
if (!goog.isDef(get)) { if (!goog.isDef(get)) {
object['get'] = [value]; object['get'] = [value];
}else { }else {
+15 -15
View File
@@ -367,8 +367,8 @@ ol.format.WFS.QUERY_SERIALIZERS_ = {
ol.format.WFS.writeFeature_ = function(node, feature, objectStack) { ol.format.WFS.writeFeature_ = function(node, feature, objectStack) {
var context = objectStack[objectStack.length - 1]; var context = objectStack[objectStack.length - 1];
goog.asserts.assert(goog.isObject(context)); goog.asserts.assert(goog.isObject(context));
var featureType = goog.object.get(context, 'featureType'); var featureType = context['featureType'];
var featureNS = goog.object.get(context, 'featureNS'); var featureNS = context['featureNS'];
var child = ol.xml.createElementNS(featureNS, featureType); var child = ol.xml.createElementNS(featureNS, featureType);
node.appendChild(child); node.appendChild(child);
ol.format.GML3.prototype.writeFeatureElement(child, feature, objectStack); 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) { ol.format.WFS.writeDelete_ = function(node, feature, objectStack) {
var context = objectStack[objectStack.length - 1]; var context = objectStack[objectStack.length - 1];
goog.asserts.assert(goog.isObject(context)); goog.asserts.assert(goog.isObject(context));
var featureType = goog.object.get(context, 'featureType'); var featureType = context['featureType'];
var featurePrefix = goog.object.get(context, 'featurePrefix'); var featurePrefix = context['featurePrefix'];
featurePrefix = goog.isDef(featurePrefix) ? featurePrefix : featurePrefix = goog.isDef(featurePrefix) ? featurePrefix :
ol.format.WFS.FEATURE_PREFIX; ol.format.WFS.FEATURE_PREFIX;
var featureNS = goog.object.get(context, 'featureNS'); var featureNS = context['featureNS'];
node.setAttribute('typeName', featurePrefix + ':' + featureType); node.setAttribute('typeName', featurePrefix + ':' + featureType);
ol.xml.setAttributeNS(node, ol.format.WFS.XMLNS, 'xmlns:' + featurePrefix, ol.xml.setAttributeNS(node, ol.format.WFS.XMLNS, 'xmlns:' + featurePrefix,
featureNS); featureNS);
@@ -423,11 +423,11 @@ ol.format.WFS.writeDelete_ = function(node, feature, objectStack) {
ol.format.WFS.writeUpdate_ = function(node, feature, objectStack) { ol.format.WFS.writeUpdate_ = function(node, feature, objectStack) {
var context = objectStack[objectStack.length - 1]; var context = objectStack[objectStack.length - 1];
goog.asserts.assert(goog.isObject(context)); goog.asserts.assert(goog.isObject(context));
var featureType = goog.object.get(context, 'featureType'); var featureType = context['featureType'];
var featurePrefix = goog.object.get(context, 'featurePrefix'); var featurePrefix = context['featurePrefix'];
featurePrefix = goog.isDef(featurePrefix) ? featurePrefix : featurePrefix = goog.isDef(featurePrefix) ? featurePrefix :
ol.format.WFS.FEATURE_PREFIX; ol.format.WFS.FEATURE_PREFIX;
var featureNS = goog.object.get(context, 'featureNS'); var featureNS = context['featureNS'];
node.setAttribute('typeName', featurePrefix + ':' + featureType); node.setAttribute('typeName', featurePrefix + ':' + featureType);
ol.xml.setAttributeNS(node, ol.format.WFS.XMLNS, 'xmlns:' + featurePrefix, ol.xml.setAttributeNS(node, ol.format.WFS.XMLNS, 'xmlns:' + featurePrefix,
featureNS); featureNS);
@@ -442,7 +442,7 @@ ol.format.WFS.writeUpdate_ = function(node, feature, objectStack) {
} }
} }
ol.xml.pushSerializeAndPop({node: node, srsName: ol.xml.pushSerializeAndPop({node: node, srsName:
goog.object.get(context, 'srsName')}, context['srsName']},
ol.format.WFS.TRANSACTION_SERIALIZERS_, ol.format.WFS.TRANSACTION_SERIALIZERS_,
ol.xml.makeSimpleNodeFactory('Property'), values, ol.xml.makeSimpleNodeFactory('Property'), values,
objectStack); objectStack);
@@ -518,10 +518,10 @@ ol.format.WFS.TRANSACTION_SERIALIZERS_ = {
ol.format.WFS.writeQuery_ = function(node, featureType, objectStack) { ol.format.WFS.writeQuery_ = function(node, featureType, objectStack) {
var context = objectStack[objectStack.length - 1]; var context = objectStack[objectStack.length - 1];
goog.asserts.assert(goog.isObject(context)); goog.asserts.assert(goog.isObject(context));
var featurePrefix = goog.object.get(context, 'featurePrefix'); var featurePrefix = context['featurePrefix'];
var featureNS = goog.object.get(context, 'featureNS'); var featureNS = context['featureNS'];
var propertyNames = goog.object.get(context, 'propertyNames'); var propertyNames = context['propertyNames'];
var srsName = goog.object.get(context, 'srsName'); var srsName = context['srsName'];
var prefix = goog.isDef(featurePrefix) ? featurePrefix + ':' : ''; var prefix = goog.isDef(featurePrefix) ? featurePrefix + ':' : '';
node.setAttribute('typeName', prefix + featureType); node.setAttribute('typeName', prefix + featureType);
if (goog.isDef(srsName)) { if (goog.isDef(srsName)) {
@@ -537,7 +537,7 @@ ol.format.WFS.writeQuery_ = function(node, featureType, objectStack) {
ol.format.WFS.QUERY_SERIALIZERS_, ol.format.WFS.QUERY_SERIALIZERS_,
ol.xml.makeSimpleNodeFactory('PropertyName'), propertyNames, ol.xml.makeSimpleNodeFactory('PropertyName'), propertyNames,
objectStack); objectStack);
var bbox = goog.object.get(context, 'bbox'); var bbox = context['bbox'];
if (goog.isDef(bbox)) { if (goog.isDef(bbox)) {
var child = ol.xml.createElementNS('http://www.opengis.net/ogc', 'Filter'); var child = ol.xml.createElementNS('http://www.opengis.net/ogc', 'Filter');
ol.format.WFS.writeOgcBBOX_(child, bbox, objectStack); 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) { ol.format.WFS.writeOgcBBOX_ = function(node, bbox, objectStack) {
var context = objectStack[objectStack.length - 1]; var context = objectStack[objectStack.length - 1];
goog.asserts.assert(goog.isObject(context)); 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'); var bboxNode = ol.xml.createElementNS('http://www.opengis.net/ogc', 'BBOX');
node.appendChild(bboxNode); node.appendChild(bboxNode);
ol.format.WFS.writeOgcPropertyName_(bboxNode, geometryName, objectStack); ol.format.WFS.writeOgcPropertyName_(bboxNode, geometryName, objectStack);
+17 -17
View File
@@ -136,14 +136,14 @@ ol.format.WMSCapabilities.readEXGeographicBoundingBox_ =
if (!goog.isDef(geographicBoundingBox)) { if (!goog.isDef(geographicBoundingBox)) {
return undefined; return undefined;
} }
var westBoundLongitude = /** @type {number|undefined} */ (goog.object.get( var westBoundLongitude = /** @type {number|undefined} */
geographicBoundingBox, 'westBoundLongitude')); (geographicBoundingBox['westBoundLongitude']);
var southBoundLatitude = /** @type {number|undefined} */ (goog.object.get( var southBoundLatitude = /** @type {number|undefined} */
geographicBoundingBox, 'southBoundLatitude')); (geographicBoundingBox['southBoundLatitude']);
var eastBoundLongitude = /** @type {number|undefined} */ (goog.object.get( var eastBoundLongitude = /** @type {number|undefined} */
geographicBoundingBox, 'eastBoundLongitude')); (geographicBoundingBox['eastBoundLongitude']);
var northBoundLatitude = /** @type {number|undefined} */ (goog.object.get( var northBoundLatitude = /** @type {number|undefined} */
geographicBoundingBox, 'northBoundLatitude')); (geographicBoundingBox['northBoundLatitude']);
if (!goog.isDef(westBoundLongitude) || !goog.isDef(southBoundLatitude) || if (!goog.isDef(westBoundLongitude) || !goog.isDef(southBoundLatitude) ||
!goog.isDef(eastBoundLongitude) || !goog.isDef(northBoundLatitude)) { !goog.isDef(eastBoundLongitude) || !goog.isDef(northBoundLatitude)) {
return undefined; return undefined;
@@ -280,48 +280,48 @@ ol.format.WMSCapabilities.readLayer_ = function(node, objectStack) {
var queryable = var queryable =
ol.format.XSD.readBooleanString(node.getAttribute('queryable')); ol.format.XSD.readBooleanString(node.getAttribute('queryable'));
if (!goog.isDef(queryable)) { if (!goog.isDef(queryable)) {
queryable = goog.object.get(parentLayerObject, 'queryable'); queryable = parentLayerObject['queryable'];
} }
layerObject['queryable'] = goog.isDef(queryable) ? queryable : false; layerObject['queryable'] = goog.isDef(queryable) ? queryable : false;
var cascaded = ol.format.XSD.readNonNegativeIntegerString( var cascaded = ol.format.XSD.readNonNegativeIntegerString(
node.getAttribute('cascaded')); node.getAttribute('cascaded'));
if (!goog.isDef(cascaded)) { if (!goog.isDef(cascaded)) {
cascaded = goog.object.get(parentLayerObject, 'cascaded'); cascaded = parentLayerObject['cascaded'];
} }
layerObject['cascaded'] = cascaded; layerObject['cascaded'] = cascaded;
var opaque = ol.format.XSD.readBooleanString(node.getAttribute('opaque')); var opaque = ol.format.XSD.readBooleanString(node.getAttribute('opaque'));
if (!goog.isDef(opaque)) { if (!goog.isDef(opaque)) {
opaque = goog.object.get(parentLayerObject, 'opaque'); opaque = parentLayerObject['opaque'];
} }
layerObject['opaque'] = goog.isDef(opaque) ? opaque : false; layerObject['opaque'] = goog.isDef(opaque) ? opaque : false;
var noSubsets = var noSubsets =
ol.format.XSD.readBooleanString(node.getAttribute('noSubsets')); ol.format.XSD.readBooleanString(node.getAttribute('noSubsets'));
if (!goog.isDef(noSubsets)) { if (!goog.isDef(noSubsets)) {
noSubsets = goog.object.get(parentLayerObject, 'noSubsets'); noSubsets = parentLayerObject['noSubsets'];
} }
layerObject['noSubsets'] = goog.isDef(noSubsets) ? noSubsets : false; layerObject['noSubsets'] = goog.isDef(noSubsets) ? noSubsets : false;
var fixedWidth = var fixedWidth =
ol.format.XSD.readDecimalString(node.getAttribute('fixedWidth')); ol.format.XSD.readDecimalString(node.getAttribute('fixedWidth'));
if (!goog.isDef(fixedWidth)) { if (!goog.isDef(fixedWidth)) {
fixedWidth = goog.object.get(parentLayerObject, 'fixedWidth'); fixedWidth = parentLayerObject['fixedWidth'];
} }
layerObject['fixedWidth'] = fixedWidth; layerObject['fixedWidth'] = fixedWidth;
var fixedHeight = var fixedHeight =
ol.format.XSD.readDecimalString(node.getAttribute('fixedHeight')); ol.format.XSD.readDecimalString(node.getAttribute('fixedHeight'));
if (!goog.isDef(fixedHeight)) { if (!goog.isDef(fixedHeight)) {
fixedHeight = goog.object.get(parentLayerObject, 'fixedHeight'); fixedHeight = parentLayerObject['fixedHeight'];
} }
layerObject['fixedHeight'] = fixedHeight; layerObject['fixedHeight'] = fixedHeight;
// See 7.2.4.8 // See 7.2.4.8
var addKeys = ['Style', 'CRS', 'AuthorityURL']; var addKeys = ['Style', 'CRS', 'AuthorityURL'];
goog.array.forEach(addKeys, function(key) { goog.array.forEach(addKeys, function(key) {
var parentValue = goog.object.get(parentLayerObject, key); var parentValue = parentLayerObject[key];
if (goog.isDef(parentValue)) { if (goog.isDef(parentValue)) {
var childValue = goog.object.setIfUndefined(layerObject, key, []); var childValue = goog.object.setIfUndefined(layerObject, key, []);
childValue = childValue.concat(parentValue); childValue = childValue.concat(parentValue);
@@ -332,9 +332,9 @@ ol.format.WMSCapabilities.readLayer_ = function(node, objectStack) {
var replaceKeys = ['EX_GeographicBoundingBox', 'BoundingBox', 'Dimension', var replaceKeys = ['EX_GeographicBoundingBox', 'BoundingBox', 'Dimension',
'Attribution', 'MinScaleDenominator', 'MaxScaleDenominator']; 'Attribution', 'MinScaleDenominator', 'MaxScaleDenominator'];
goog.array.forEach(replaceKeys, function(key) { goog.array.forEach(replaceKeys, function(key) {
var childValue = goog.object.get(layerObject, key); var childValue = layerObject[key];
if (!goog.isDef(childValue)) { if (!goog.isDef(childValue)) {
var parentValue = goog.object.get(parentLayerObject, key); var parentValue = parentLayerObject[key];
layerObject[key] = parentValue; layerObject[key] = parentValue;
} }
}); });
+1 -1
View File
@@ -97,7 +97,7 @@ ol.format.WMSGetFeatureInfo.prototype.readFeatures_ =
parsers[featureType] = ol.xml.makeArrayPusher( parsers[featureType] = ol.xml.makeArrayPusher(
this.gmlFormat_.readFeatureElement, this.gmlFormat_); this.gmlFormat_.readFeatureElement, this.gmlFormat_);
var parsersNS = ol.xml.makeParsersNS( var parsersNS = ol.xml.makeParsersNS(
[goog.object.get(context, 'featureNS'), null], parsers); [context['featureNS'], null], parsers);
layer.namespaceURI = this.featureNS_; layer.namespaceURI = this.featureNS_;
var layerFeatures = ol.xml.pushParseAndPop( var layerFeatures = ol.xml.pushParseAndPop(
[], parsersNS, layer, objectStack, this.gmlFormat_); [], parsersNS, layer, objectStack, this.gmlFormat_);
+2 -2
View File
@@ -268,7 +268,7 @@ ol.Object.getSetterName = function(key) {
ol.Object.getKeyValue_ = function(obj, key) { ol.Object.getKeyValue_ = function(obj, key) {
var getterName = ol.Object.getGetterName(key); var getterName = ol.Object.getGetterName(key);
var getter = /** @type {function(): *|undefined} */ var getter = /** @type {function(): *|undefined} */
(goog.object.get(obj, getterName)); (/** @type {Object} */ (obj)[getterName]);
return goog.isDef(getter) ? getter.call(obj) : obj.get(key); 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) { ol.Object.setKeyValue_ = function(obj, key, value) {
var setterName = ol.Object.getSetterName(key); var setterName = ol.Object.getSetterName(key);
var setter = /** @type {function(*)|undefined} */ var setter = /** @type {function(*)|undefined} */
(goog.object.get(obj, setterName)); (/** @type {Object} */ (obj)[setterName]);
if (goog.isDef(setter)) { if (goog.isDef(setter)) {
setter.call(obj, value); setter.call(obj, value);
} else { } else {
+1 -2
View File
@@ -195,8 +195,7 @@ ol.pointer.MouseSource.prototype.mousemove = function(inEvent) {
*/ */
ol.pointer.MouseSource.prototype.mouseup = function(inEvent) { ol.pointer.MouseSource.prototype.mouseup = function(inEvent) {
if (!this.isEventSimulatedFromTouch_(inEvent)) { if (!this.isEventSimulatedFromTouch_(inEvent)) {
var p = goog.object.get(this.pointerMap, var p = this.pointerMap[ol.pointer.MouseSource.POINTER_ID.toString()];
ol.pointer.MouseSource.POINTER_ID.toString());
if (p && p.button === inEvent.button) { if (p && p.button === inEvent.button) {
var e = ol.pointer.MouseSource.prepareEvent(inEvent, this.dispatcher); var e = ol.pointer.MouseSource.prepareEvent(inEvent, this.dispatcher);
+1 -1
View File
@@ -342,7 +342,7 @@ ol.pointer.TouchSource.prototype.touchmove = function(inEvent) {
ol.pointer.TouchSource.prototype.moveOverOut_ = ol.pointer.TouchSource.prototype.moveOverOut_ =
function(browserEvent, inPointer) { function(browserEvent, inPointer) {
var event = 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 // a finger drifted off the screen, ignore it
if (!pointer) { if (!pointer) {
return; return;
+1 -1
View File
@@ -240,7 +240,7 @@ ol.render.canvas.Replay.prototype.replay_ = function(
case ol.render.canvas.Instruction.BEGIN_GEOMETRY: case ol.render.canvas.Instruction.BEGIN_GEOMETRY:
feature = /** @type {ol.Feature} */ (instruction[1]); feature = /** @type {ol.Feature} */ (instruction[1]);
var featureUid = goog.getUid(feature).toString(); var featureUid = goog.getUid(feature).toString();
if (!goog.isDef(goog.object.get(skippedFeaturesHash, featureUid))) { if (!goog.isDef(skippedFeaturesHash[featureUid])) {
++i; ++i;
} else { } else {
i = /** @type {number} */ (instruction[2]); i = /** @type {number} */ (instruction[2]);
+1 -1
View File
@@ -451,7 +451,7 @@ ol.render.webgl.ImageReplay.prototype.finish = function(context) {
uid = goog.getUid(image).toString(); uid = goog.getUid(image).toString();
if (goog.object.containsKey(texturePerImage, uid)) { if (goog.object.containsKey(texturePerImage, uid)) {
texture = goog.object.get(texturePerImage, uid); texture = texturePerImage[uid];
} else { } else {
texture = gl.createTexture(); texture = gl.createTexture();
gl.bindTexture(goog.webgl.TEXTURE_2D, texture); gl.bindTexture(goog.webgl.TEXTURE_2D, texture);
+1 -1
View File
@@ -152,7 +152,7 @@ ol.source.ImageWMS.prototype.getGetFeatureInfoUrl =
'REQUEST': 'GetFeatureInfo', 'REQUEST': 'GetFeatureInfo',
'FORMAT': 'image/png', 'FORMAT': 'image/png',
'TRANSPARENT': true, 'TRANSPARENT': true,
'QUERY_LAYERS': goog.object.get(this.params_, 'LAYERS') 'QUERY_LAYERS': this.params_['LAYERS']
}; };
goog.object.extend(baseParams, this.params_, params); goog.object.extend(baseParams, this.params_, params);
+1 -1
View File
@@ -161,7 +161,7 @@ ol.source.TileWMS.prototype.getGetFeatureInfoUrl =
'REQUEST': 'GetFeatureInfo', 'REQUEST': 'GetFeatureInfo',
'FORMAT': 'image/png', 'FORMAT': 'image/png',
'TRANSPARENT': true, 'TRANSPARENT': true,
'QUERY_LAYERS': goog.object.get(this.params_, 'LAYERS') 'QUERY_LAYERS': this.params_['LAYERS']
}; };
goog.object.extend(baseParams, this.params_, params); goog.object.extend(baseParams, this.params_, params);
+8 -4
View File
@@ -59,7 +59,9 @@ ol.structs.RBush.prototype.insert = function(extent, value) {
]; ];
this.rbush_.insert(item); this.rbush_.insert(item);
// remember the object that was added to the internal rbush // 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 value
]; ];
items[i] = item; 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); this.rbush_.load(items);
}; };
@@ -102,12 +106,12 @@ ol.structs.RBush.prototype.remove = function(value) {
if (goog.DEBUG && this.readers_) { if (goog.DEBUG && this.readers_) {
throw new Error('Can not remove value while reading'); 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)); goog.asserts.assert(goog.object.containsKey(this.items_, uid));
// get the object in which the value was wrapped when adding to the // get the object in which the value was wrapped when adding to the
// internal rbush. then use that object to do the removal. // 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); goog.object.remove(this.items_, uid);
return this.rbush_.remove(item) !== null; return this.rbush_.remove(item) !== null;
}; };