Use bracket notation instead of goog.object.set

This commit is contained in:
Tim Schaub
2015-01-07 21:08:24 -07:00
parent 0a784bfc3b
commit f9a92c422c
19 changed files with 97 additions and 104 deletions

View File

@@ -505,18 +505,17 @@ ol.format.GeoJSON.prototype.writeFeatureObject = function(
}; };
var id = feature.getId(); var id = feature.getId();
if (goog.isDefAndNotNull(id)) { if (goog.isDefAndNotNull(id)) {
goog.object.set(object, 'id', id); object['id'] = id;
} }
var geometry = feature.getGeometry(); var geometry = feature.getGeometry();
if (goog.isDefAndNotNull(geometry)) { if (goog.isDefAndNotNull(geometry)) {
goog.object.set( object['geometry'] =
object, 'geometry', ol.format.GeoJSON.writeGeometry_(geometry, opt_options);
ol.format.GeoJSON.writeGeometry_(geometry, opt_options));
} }
var properties = feature.getProperties(); var properties = feature.getProperties();
goog.object.remove(properties, feature.getGeometryName()); goog.object.remove(properties, feature.getGeometryName());
if (!goog.object.isEmpty(properties)) { if (!goog.object.isEmpty(properties)) {
goog.object.set(object, 'properties', properties); object['properties'] = properties;
} }
return object; return object;
}; };

View File

@@ -759,7 +759,7 @@ ol.format.GML3.prototype.RING_NODE_FACTORY_ =
goog.asserts.assert(goog.isObject(context)); goog.asserts.assert(goog.isObject(context));
var exteriorWritten = goog.object.get(context, 'exteriorWritten'); var exteriorWritten = goog.object.get(context, 'exteriorWritten');
if (!goog.isDef(exteriorWritten)) { if (!goog.isDef(exteriorWritten)) {
goog.object.set(context, 'exteriorWritten', true); context['exteriorWritten'] = true;
} }
return ol.xml.createElementNS(parentNode.namespaceURI, return ol.xml.createElementNS(parentNode.namespaceURI,
goog.isDef(exteriorWritten) ? 'interior' : 'exterior'); goog.isDef(exteriorWritten) ? 'interior' : 'exterior');

View File

@@ -94,8 +94,8 @@ ol.format.GMLBase.prototype.readFeatures_ = function(node, objectStack) {
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();
goog.object.set(context, 'featureType', featureType); context['featureType'] = featureType;
goog.object.set(context, 'featureNS', member.namespaceURI); context['featureNS'] = member.namespaceURI;
} }
var parsers = {}; var parsers = {};
var parsersNS = {}; var parsersNS = {};
@@ -133,8 +133,7 @@ ol.format.GMLBase.prototype.FEATURE_COLLECTION_PARSERS = Object({
ol.format.GMLBase.prototype.readGeometryElement = function(node, objectStack) { ol.format.GMLBase.prototype.readGeometryElement = function(node, objectStack) {
var context = objectStack[0]; var context = objectStack[0];
goog.asserts.assert(goog.isObject(context)); goog.asserts.assert(goog.isObject(context));
goog.object.set(context, 'srsName', context['srsName'] = node.firstElementChild.getAttribute('srsName');
node.firstElementChild.getAttribute('srsName'));
var geometry = ol.xml.pushParseAndPop(/** @type {ol.geom.Geometry} */(null), var geometry = ol.xml.pushParseAndPop(/** @type {ol.geom.Geometry} */(null),
this.GEOMETRY_PARSERS_, node, objectStack, this); this.GEOMETRY_PARSERS_, node, objectStack, this);
if (goog.isDefAndNotNull(geometry)) { if (goog.isDefAndNotNull(geometry)) {

View File

@@ -98,7 +98,7 @@ ol.format.GPX.parseLink_ = function(node, objectStack) {
var values = /** @type {Object} */ (objectStack[objectStack.length - 1]); var values = /** @type {Object} */ (objectStack[objectStack.length - 1]);
var href = node.getAttribute('href'); var href = node.getAttribute('href');
if (!goog.isNull(href)) { if (!goog.isNull(href)) {
goog.object.set(values, 'link', href); values['link'] = href;
} }
ol.xml.parseNode(ol.format.GPX.LINK_PARSERS_, node, objectStack); ol.xml.parseNode(ol.format.GPX.LINK_PARSERS_, node, objectStack);
}; };
@@ -113,7 +113,7 @@ ol.format.GPX.parseExtensions_ = function(node, objectStack) {
goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT); goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT);
goog.asserts.assert(node.localName == 'extensions'); goog.asserts.assert(node.localName == 'extensions');
var values = /** @type {Object} */ (objectStack[objectStack.length - 1]); var values = /** @type {Object} */ (objectStack[objectStack.length - 1]);
goog.object.set(values, 'extensionsNode_', node); values['extensionsNode_'] = node;
}; };
@@ -559,16 +559,16 @@ ol.format.GPX.writeWptType_ = function(node, coordinate, objectStack) {
switch (geometryLayout) { switch (geometryLayout) {
case ol.geom.GeometryLayout.XYZM: case ol.geom.GeometryLayout.XYZM:
if (coordinate[3] !== 0) { if (coordinate[3] !== 0) {
goog.object.set(properties, 'time', coordinate[3]); properties['time'] = coordinate[3];
} }
case ol.geom.GeometryLayout.XYZ: case ol.geom.GeometryLayout.XYZ:
if (coordinate[2] !== 0) { if (coordinate[2] !== 0) {
goog.object.set(properties, 'ele', coordinate[2]); properties['ele'] = coordinate[2];
} }
break; break;
case ol.geom.GeometryLayout.XYM: case ol.geom.GeometryLayout.XYM:
if (coordinate[2] !== 0) { if (coordinate[2] !== 0) {
goog.object.set(properties, 'time', coordinate[2]); properties['time'] = coordinate[2];
} }
} }
/* jshint +W086 */ /* jshint +W086 */
@@ -596,8 +596,8 @@ ol.format.GPX.writeRte_ = function(node, feature, objectStack) {
goog.asserts.assertInstanceof(geometry, ol.geom.LineString); goog.asserts.assertInstanceof(geometry, ol.geom.LineString);
geometry = /** @type {ol.geom.LineString} */ geometry = /** @type {ol.geom.LineString} */
(ol.format.Feature.transformWithOptions(geometry, true, options)); (ol.format.Feature.transformWithOptions(geometry, true, options));
goog.object.set(context, 'geometryLayout', geometry.getLayout()); context['geometryLayout'] = geometry.getLayout();
goog.object.set(properties, 'rtept', geometry.getCoordinates()); properties['rtept'] = geometry.getCoordinates();
} }
var parentNode = objectStack[objectStack.length - 1].node; var parentNode = objectStack[objectStack.length - 1].node;
var orderedKeys = ol.format.GPX.RTE_SEQUENCE_[parentNode.namespaceURI]; var orderedKeys = ol.format.GPX.RTE_SEQUENCE_[parentNode.namespaceURI];
@@ -623,7 +623,7 @@ ol.format.GPX.writeTrk_ = function(node, feature, objectStack) {
goog.asserts.assertInstanceof(geometry, ol.geom.MultiLineString); goog.asserts.assertInstanceof(geometry, ol.geom.MultiLineString);
geometry = /** @type {ol.geom.MultiLineString} */ geometry = /** @type {ol.geom.MultiLineString} */
(ol.format.Feature.transformWithOptions(geometry, true, options)); (ol.format.Feature.transformWithOptions(geometry, true, options));
goog.object.set(properties, 'trkseg', geometry.getLineStrings()); properties['trkseg'] = geometry.getLineStrings();
} }
var parentNode = objectStack[objectStack.length - 1].node; var parentNode = objectStack[objectStack.length - 1].node;
var orderedKeys = ol.format.GPX.TRK_SEQUENCE_[parentNode.namespaceURI]; var orderedKeys = ol.format.GPX.TRK_SEQUENCE_[parentNode.namespaceURI];
@@ -659,13 +659,13 @@ ol.format.GPX.writeWpt_ = function(node, feature, objectStack) {
var options = /** @type {olx.format.WriteOptions} */ (objectStack[0]); var options = /** @type {olx.format.WriteOptions} */ (objectStack[0]);
var context = objectStack[objectStack.length - 1]; var context = objectStack[objectStack.length - 1];
goog.asserts.assert(goog.isObject(context)); goog.asserts.assert(goog.isObject(context));
goog.object.set(context, 'properties', feature.getProperties()); context['properties'] = feature.getProperties();
var geometry = feature.getGeometry(); var geometry = feature.getGeometry();
if (goog.isDef(geometry)) { if (goog.isDef(geometry)) {
goog.asserts.assertInstanceof(geometry, ol.geom.Point); goog.asserts.assertInstanceof(geometry, ol.geom.Point);
geometry = /** @type {ol.geom.Point} */ geometry = /** @type {ol.geom.Point} */
(ol.format.Feature.transformWithOptions(geometry, true, options)); (ol.format.Feature.transformWithOptions(geometry, true, options));
goog.object.set(context, 'geometryLayout', geometry.getLayout()); context['geometryLayout'] = geometry.getLayout();
ol.format.GPX.writeWptType_(node, geometry.getCoordinates(), objectStack); ol.format.GPX.writeWptType_(node, geometry.getCoordinates(), objectStack);
} }
}; };

View File

@@ -539,7 +539,7 @@ ol.format.KML.IconStyleParser_ = function(node, objectStack) {
size: size, size: size,
src: src src: src
}); });
goog.object.set(styleObject, 'imageStyle', imageStyle); styleObject['imageStyle'] = imageStyle;
}; };
@@ -567,7 +567,7 @@ ol.format.KML.LabelStyleParser_ = function(node, objectStack) {
scale: /** @type {number|undefined} */ scale: /** @type {number|undefined} */
(goog.object.get(object, 'scale')) (goog.object.get(object, 'scale'))
}); });
goog.object.set(styleObject, 'textStyle', textStyle); styleObject['textStyle'] = textStyle;
}; };
@@ -596,7 +596,7 @@ ol.format.KML.LineStyleParser_ = function(node, objectStack) {
(goog.object.get(object, 'color', ol.format.KML.DEFAULT_COLOR_)), (goog.object.get(object, 'color', ol.format.KML.DEFAULT_COLOR_)),
width: /** @type {number} */ (goog.object.get(object, 'width', 1)) width: /** @type {number} */ (goog.object.get(object, 'width', 1))
}); });
goog.object.set(styleObject, 'strokeStyle', strokeStyle); styleObject['strokeStyle'] = strokeStyle;
}; };
@@ -620,15 +620,15 @@ ol.format.KML.PolyStyleParser_ = function(node, objectStack) {
color: /** @type {ol.Color} */ color: /** @type {ol.Color} */
(goog.object.get(object, 'color', ol.format.KML.DEFAULT_COLOR_)) (goog.object.get(object, 'color', ol.format.KML.DEFAULT_COLOR_))
}); });
goog.object.set(styleObject, 'fillStyle', fillStyle); styleObject['fillStyle'] = fillStyle;
var fill = /** @type {boolean|undefined} */ (goog.object.get(object, 'fill')); var fill = /** @type {boolean|undefined} */ (goog.object.get(object, 'fill'));
if (goog.isDef(fill)) { if (goog.isDef(fill)) {
goog.object.set(styleObject, 'fill', fill); styleObject['fill'] = fill;
} }
var outline = var outline =
/** @type {boolean|undefined} */ (goog.object.get(object, 'outline')); /** @type {boolean|undefined} */ (goog.object.get(object, 'outline'));
if (goog.isDef(outline)) { if (goog.isDef(outline)) {
goog.object.set(styleObject, 'outline', outline); styleObject['outline'] = outline;
} }
}; };
@@ -985,7 +985,7 @@ ol.format.KML.DataParser_ = function(node, objectStack) {
var featureObject = var featureObject =
/** @type {Object} */ (objectStack[objectStack.length - 1]); /** @type {Object} */ (objectStack[objectStack.length - 1]);
goog.asserts.assert(goog.isObject(featureObject)); goog.asserts.assert(goog.isObject(featureObject));
goog.object.set(featureObject, name, data); featureObject[name] = data;
} }
} }
}; };
@@ -1048,9 +1048,9 @@ ol.format.KML.PlacemarkStyleMapParser_ = function(node, objectStack) {
var placemarkObject = objectStack[objectStack.length - 1]; var placemarkObject = objectStack[objectStack.length - 1];
goog.asserts.assert(goog.isObject(placemarkObject)); goog.asserts.assert(goog.isObject(placemarkObject));
if (goog.isArray(styleMapValue)) { if (goog.isArray(styleMapValue)) {
goog.object.set(placemarkObject, 'Style', styleMapValue); placemarkObject['Style'] = styleMapValue;
} else if (goog.isString(styleMapValue)) { } else if (goog.isString(styleMapValue)) {
goog.object.set(placemarkObject, 'styleUrl', styleMapValue); placemarkObject['styleUrl'] = styleMapValue;
} else { } else {
goog.asserts.fail(); goog.asserts.fail();
} }
@@ -1082,7 +1082,7 @@ ol.format.KML.SimpleDataParser_ = function(node, objectStack) {
var data = ol.format.XSD.readString(node); var data = ol.format.XSD.readString(node);
var featureObject = var featureObject =
/** @type {Object} */ (objectStack[objectStack.length - 1]); /** @type {Object} */ (objectStack[objectStack.length - 1]);
goog.object.set(featureObject, name, data); featureObject[name] = data;
} }
}; };
@@ -1851,16 +1851,15 @@ ol.format.KML.writeIconStyle_ = function(node, style, objectStack) {
}; };
if (!goog.isNull(size)) { if (!goog.isNull(size)) {
goog.object.set(iconProperties, 'w', size[0]); iconProperties['w'] = size[0];
goog.object.set(iconProperties, 'h', size[1]); iconProperties['h'] = size[1];
var anchor = style.getAnchor(); // top-left var anchor = style.getAnchor(); // top-left
var origin = style.getOrigin(); // top-left var origin = style.getOrigin(); // top-left
if (!goog.isNull(origin) && !goog.isNull(iconImageSize) && if (!goog.isNull(origin) && !goog.isNull(iconImageSize) &&
origin[0] !== 0 && origin[1] !== size[1]) { origin[0] !== 0 && origin[1] !== size[1]) {
goog.object.set(iconProperties, 'x', origin[0]); iconProperties['x'] = origin[0];
goog.object.set(iconProperties, 'y', iconProperties['y'] = iconImageSize[1] - (origin[1] + size[1]);
iconImageSize[1] - (origin[1] + size[1]));
} }
if (!goog.isNull(anchor) && if (!goog.isNull(anchor) &&
@@ -1871,20 +1870,20 @@ ol.format.KML.writeIconStyle_ = function(node, style, objectStack) {
y: size[1] - anchor[1], y: size[1] - anchor[1],
yunits: ol.style.IconAnchorUnits.PIXELS yunits: ol.style.IconAnchorUnits.PIXELS
}; };
goog.object.set(properties, 'hotSpot', hotSpot); properties['hotSpot'] = hotSpot;
} }
} }
goog.object.set(properties, 'Icon', iconProperties); properties['Icon'] = iconProperties;
var scale = style.getScale(); var scale = style.getScale();
if (scale !== 1) { if (scale !== 1) {
goog.object.set(properties, 'scale', scale); properties['scale'] = scale;
} }
var rotation = style.getRotation(); var rotation = style.getRotation();
if (rotation !== 0) { if (rotation !== 0) {
goog.object.set(properties, 'heading', rotation); // 0-360 properties['heading'] = rotation; // 0-360
} }
var parentNode = objectStack[objectStack.length - 1].node; var parentNode = objectStack[objectStack.length - 1].node;
@@ -1906,11 +1905,11 @@ ol.format.KML.writeLabelStyle_ = function(node, style, objectStack) {
var properties = {}; var properties = {};
var fill = style.getFill(); var fill = style.getFill();
if (!goog.isNull(fill)) { if (!goog.isNull(fill)) {
goog.object.set(properties, 'color', fill.getColor()); properties['color'] = fill.getColor();
} }
var scale = style.getScale(); var scale = style.getScale();
if (goog.isDef(scale) && scale !== 1) { if (goog.isDef(scale) && scale !== 1) {
goog.object.set(properties, 'scale', scale); properties['scale'] = scale;
} }
var parentNode = objectStack[objectStack.length - 1].node; var parentNode = objectStack[objectStack.length - 1].node;
var orderedKeys = var orderedKeys =
@@ -2019,10 +2018,10 @@ ol.format.KML.writePlacemark_ = function(node, feature, objectStack) {
// resolution-independent here // resolution-independent here
var styles = styleFunction.call(feature, 0); var styles = styleFunction.call(feature, 0);
if (!goog.isNull(styles) && styles.length > 0) { if (!goog.isNull(styles) && styles.length > 0) {
goog.object.set(properties, 'Style', styles[0]); properties['Style'] = styles[0];
var textStyle = styles[0].getText(); var textStyle = styles[0].getText();
if (!goog.isNull(textStyle)) { if (!goog.isNull(textStyle)) {
goog.object.set(properties, 'name', textStyle.getText()); properties['name'] = textStyle.getText();
} }
} }
} }
@@ -2057,8 +2056,8 @@ ol.format.KML.writePrimitiveGeometry_ = function(node, geometry, objectStack) {
(geometry instanceof ol.geom.LinearRing)); (geometry instanceof ol.geom.LinearRing));
var flatCoordinates = geometry.getFlatCoordinates(); var flatCoordinates = geometry.getFlatCoordinates();
var /** @type {ol.xml.NodeStackItem} */ context = {node: node}; var /** @type {ol.xml.NodeStackItem} */ context = {node: node};
goog.object.set(context, 'layout', geometry.getLayout()); context['layout'] = geometry.getLayout();
goog.object.set(context, 'stride', geometry.getStride()); context['stride'] = geometry.getStride();
ol.xml.pushSerializeAndPop(context, ol.xml.pushSerializeAndPop(context,
ol.format.KML.PRIMITIVE_GEOMETRY_SERIALIZERS_, ol.format.KML.PRIMITIVE_GEOMETRY_SERIALIZERS_,
ol.format.KML.COORDINATES_NODE_FACTORY_, ol.format.KML.COORDINATES_NODE_FACTORY_,
@@ -2128,16 +2127,16 @@ ol.format.KML.writeStyle_ = function(node, style, objectStack) {
var imageStyle = style.getImage(); var imageStyle = style.getImage();
var textStyle = style.getText(); var textStyle = style.getText();
if (!goog.isNull(imageStyle)) { if (!goog.isNull(imageStyle)) {
goog.object.set(properties, 'IconStyle', imageStyle); properties['IconStyle'] = imageStyle;
} }
if (!goog.isNull(textStyle)) { if (!goog.isNull(textStyle)) {
goog.object.set(properties, 'LabelStyle', textStyle); properties['LabelStyle'] = textStyle;
} }
if (!goog.isNull(strokeStyle)) { if (!goog.isNull(strokeStyle)) {
goog.object.set(properties, 'LineStyle', strokeStyle); properties['LineStyle'] = strokeStyle;
} }
if (!goog.isNull(fillStyle)) { if (!goog.isNull(fillStyle)) {
goog.object.set(properties, 'PolyStyle', fillStyle); properties['PolyStyle'] = fillStyle;
} }
var parentNode = objectStack[objectStack.length - 1].node; var parentNode = objectStack[objectStack.length - 1].node;
var orderedKeys = ol.format.KML.STYLE_SEQUENCE_[parentNode.namespaceURI]; var orderedKeys = ol.format.KML.STYLE_SEQUENCE_[parentNode.namespaceURI];
@@ -2608,9 +2607,9 @@ ol.format.KML.prototype.writeFeaturesNode = function(features, opt_options) {
var /** @type {ol.xml.NodeStackItem} */ context = {node: kml}; var /** @type {ol.xml.NodeStackItem} */ context = {node: kml};
var properties = {}; var properties = {};
if (features.length > 1) { if (features.length > 1) {
goog.object.set(properties, 'Document', features); properties['Document'] = features;
} else if (features.length == 1) { } else if (features.length == 1) {
goog.object.set(properties, 'Placemark', features[0]); properties['Placemark'] = features[0];
} }
var orderedKeys = ol.format.KML.KML_SEQUENCE_[kml.namespaceURI]; var orderedKeys = ol.format.KML.KML_SEQUENCE_[kml.namespaceURI];
var values = ol.xml.makeSequence(properties, orderedKeys); var values = ol.xml.makeSequence(properties, orderedKeys);

View File

@@ -67,7 +67,7 @@ ol.format.OSMXML.readNode_ = function(node, objectStack) {
parseFloat(node.getAttribute('lon')), parseFloat(node.getAttribute('lon')),
parseFloat(node.getAttribute('lat')) parseFloat(node.getAttribute('lat'))
]); ]);
goog.object.set(state.nodes, id, coordinates); state.nodes[id] = coordinates;
var values = ol.xml.pushParseAndPop({ var values = ol.xml.pushParseAndPop({
tags: {} tags: {}
@@ -145,7 +145,7 @@ ol.format.OSMXML.readTag_ = function(node, objectStack) {
goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT); goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT);
goog.asserts.assert(node.localName == 'tag'); goog.asserts.assert(node.localName == 'tag');
var values = /** @type {Object} */ (objectStack[objectStack.length - 1]); var values = /** @type {Object} */ (objectStack[objectStack.length - 1]);
goog.object.set(values.tags, node.getAttribute('k'), node.getAttribute('v')); values.tags[node.getAttribute('k')] = node.getAttribute('v');
}; };

View File

@@ -148,7 +148,7 @@ ol.format.OWS.readGet_ = function(node, objectStack) {
} }
var get = goog.object.get(object, 'get'); var get = goog.object.get(object, 'get');
if (!goog.isDef(get)) { if (!goog.isDef(get)) {
goog.object.set(object, 'get', [value]); object['get'] = [value];
}else { }else {
goog.asserts.assert(goog.isArray(get)); goog.asserts.assert(goog.isArray(get));
get.push(value); get.push(value);
@@ -189,7 +189,7 @@ ol.format.OWS.readOperation_ = function(node, objectStack) {
var object = /** @type {Object} */ var object = /** @type {Object} */
(objectStack[objectStack.length - 1]); (objectStack[objectStack.length - 1]);
goog.asserts.assert(goog.isObject(object)); goog.asserts.assert(goog.isObject(object));
goog.object.set(object, name, value); object[name] = value;
}; };
@@ -285,7 +285,7 @@ ol.format.OWS.readValue_ = function(node, objectStack) {
if (!goog.isDef(key)) { if (!goog.isDef(key)) {
return undefined; return undefined;
} }
goog.object.set(object, key, true); object[key] = true;
}; };

View File

@@ -220,7 +220,7 @@ ol.format.WFS.prototype.readFeatureCollectionMetadataFromNode = function(node) {
var result = {}; var result = {};
var value = ol.format.XSD.readNonNegativeIntegerString( var value = ol.format.XSD.readNonNegativeIntegerString(
node.getAttribute('numberOfFeatures')); node.getAttribute('numberOfFeatures'));
goog.object.set(result, 'numberOfFeatures', value); result['numberOfFeatures'] = value;
return ol.xml.pushParseAndPop( return ol.xml.pushParseAndPop(
/** @type {ol.format.WFS.FeatureCollectionMetadata} */ (result), /** @type {ol.format.WFS.FeatureCollectionMetadata} */ (result),
ol.format.WFS.FEATURE_COLLECTION_PARSERS_, node, [], this.gmlFormat_); ol.format.WFS.FEATURE_COLLECTION_PARSERS_, node, [], this.gmlFormat_);

View File

@@ -282,43 +282,41 @@ ol.format.WMSCapabilities.readLayer_ = function(node, objectStack) {
if (!goog.isDef(queryable)) { if (!goog.isDef(queryable)) {
queryable = goog.object.get(parentLayerObject, 'queryable'); queryable = goog.object.get(parentLayerObject, 'queryable');
} }
goog.object.set( 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 = goog.object.get(parentLayerObject, 'cascaded');
} }
goog.object.set(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 = goog.object.get(parentLayerObject, 'opaque');
} }
goog.object.set(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 = goog.object.get(parentLayerObject, 'noSubsets');
} }
goog.object.set( 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 = goog.object.get(parentLayerObject, 'fixedWidth');
} }
goog.object.set(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 = goog.object.get(parentLayerObject, 'fixedHeight');
} }
goog.object.set(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'];
@@ -327,7 +325,7 @@ ol.format.WMSCapabilities.readLayer_ = function(node, objectStack) {
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);
goog.object.set(layerObject, key, childValue); layerObject[key] = childValue;
} }
}); });
@@ -337,7 +335,7 @@ ol.format.WMSCapabilities.readLayer_ = function(node, objectStack) {
var childValue = goog.object.get(layerObject, key); var childValue = goog.object.get(layerObject, key);
if (!goog.isDef(childValue)) { if (!goog.isDef(childValue)) {
var parentValue = goog.object.get(parentLayerObject, key); var parentValue = goog.object.get(parentLayerObject, key);
goog.object.set(layerObject, key, parentValue); layerObject[key] = parentValue;
} }
}); });
@@ -456,7 +454,7 @@ ol.format.WMSCapabilities.readSizedFormatOnlineresource_ =
ol.format.XSD.readNonNegativeIntegerString(node.getAttribute('width')), ol.format.XSD.readNonNegativeIntegerString(node.getAttribute('width')),
ol.format.XSD.readNonNegativeIntegerString(node.getAttribute('height')) ol.format.XSD.readNonNegativeIntegerString(node.getAttribute('height'))
]; ];
goog.object.set(formatOnlineresource, 'size', size); formatOnlineresource['size'] = size;
return formatOnlineresource; return formatOnlineresource;
} }
return undefined; return undefined;
@@ -475,7 +473,7 @@ ol.format.WMSCapabilities.readAuthorityURL_ = function(node, objectStack) {
var authorityObject = var authorityObject =
ol.format.WMSCapabilities.readFormatOnlineresource_(node, objectStack); ol.format.WMSCapabilities.readFormatOnlineresource_(node, objectStack);
if (goog.isDef(authorityObject)) { if (goog.isDef(authorityObject)) {
goog.object.set(authorityObject, 'name', node.getAttribute('name')); authorityObject['name'] = node.getAttribute('name');
return authorityObject; return authorityObject;
} }
return undefined; return undefined;
@@ -494,7 +492,7 @@ ol.format.WMSCapabilities.readMetadataURL_ = function(node, objectStack) {
var metadataObject = var metadataObject =
ol.format.WMSCapabilities.readFormatOnlineresource_(node, objectStack); ol.format.WMSCapabilities.readFormatOnlineresource_(node, objectStack);
if (goog.isDef(metadataObject)) { if (goog.isDef(metadataObject)) {
goog.object.set(metadataObject, 'type', node.getAttribute('type')); metadataObject['type'] = node.getAttribute('type');
return metadataObject; return metadataObject;
} }
return undefined; return undefined;

View File

@@ -90,8 +90,8 @@ ol.format.WMSGetFeatureInfo.prototype.readFeatures_ =
ol.format.WMSGetFeatureInfo.layerIdentifier_) + ol.format.WMSGetFeatureInfo.layerIdentifier_) +
ol.format.WMSGetFeatureInfo.featureIdentifier_; ol.format.WMSGetFeatureInfo.featureIdentifier_;
goog.object.set(context, 'featureType', featureType); context['featureType'] = featureType;
goog.object.set(context, 'featureNS', this.featureNS_); context['featureNS'] = this.featureNS_;
var parsers = {}; var parsers = {};
parsers[featureType] = ol.xml.makeArrayPusher( parsers[featureType] = ol.xml.makeArrayPusher(

View File

@@ -37,7 +37,7 @@ ol.geom.flat.geodesic.line_ =
/** @type {Array.<number>} */ /** @type {Array.<number>} */
var fractionStack = [1, 0]; var fractionStack = [1, 0];
/** @type {Object.<number, boolean>} */ /** @type {Object.<string, boolean>} */
var fractions = {}; var fractions = {};
var maxIterations = 1e5; var maxIterations = 1e5;
@@ -52,7 +52,7 @@ ol.geom.flat.geodesic.line_ =
key = fracA.toString(); key = fracA.toString();
if (!goog.object.containsKey(fractions, key)) { if (!goog.object.containsKey(fractions, key)) {
flatCoordinates.push(a[0], a[1]); flatCoordinates.push(a[0], a[1]);
goog.object.set(fractions, key, true); fractions[key] = true;
} }
// Pop the b coordinate off the stack // Pop the b coordinate off the stack
fracB = fractionStack.pop(); fracB = fractionStack.pop();
@@ -70,7 +70,7 @@ ol.geom.flat.geodesic.line_ =
flatCoordinates.push(b[0], b[1]); flatCoordinates.push(b[0], b[1]);
key = fracB.toString(); key = fracB.toString();
goog.asserts.assert(!goog.object.containsKey(fractions, key)); goog.asserts.assert(!goog.object.containsKey(fractions, key));
goog.object.set(fractions, key, true); fractions[key] = true;
} else { } else {
// Otherwise, we need to subdivide the current line segment. Split it // Otherwise, we need to subdivide the current line segment. Split it
// into two and push the two line segments onto the stack. // into two and push the two line segments onto the stack.

View File

@@ -169,8 +169,7 @@ ol.pointer.MouseSource.prototype.mousedown = function(inEvent) {
this.cancel(inEvent); this.cancel(inEvent);
} }
var e = ol.pointer.MouseSource.prepareEvent(inEvent, this.dispatcher); var e = ol.pointer.MouseSource.prepareEvent(inEvent, this.dispatcher);
goog.object.set(this.pointerMap, this.pointerMap[ol.pointer.MouseSource.POINTER_ID.toString()] = inEvent;
ol.pointer.MouseSource.POINTER_ID.toString(), inEvent);
this.dispatcher.down(e, inEvent); this.dispatcher.down(e, inEvent);
} }
}; };

View File

@@ -108,8 +108,7 @@ ol.pointer.MsSource.prototype.cleanup = function(pointerId) {
* @param {goog.events.BrowserEvent} inEvent * @param {goog.events.BrowserEvent} inEvent
*/ */
ol.pointer.MsSource.prototype.msPointerDown = function(inEvent) { ol.pointer.MsSource.prototype.msPointerDown = function(inEvent) {
goog.object.set(this.pointerMap, this.pointerMap[inEvent.getBrowserEvent().pointerId] = inEvent;
inEvent.getBrowserEvent().pointerId, inEvent);
var e = this.prepareEvent_(inEvent); var e = this.prepareEvent_(inEvent);
this.dispatcher.down(e, inEvent); this.dispatcher.down(e, inEvent);
}; };

View File

@@ -312,11 +312,11 @@ ol.pointer.TouchSource.prototype.touchstart = function(inEvent) {
* @param {Object} inPointer * @param {Object} inPointer
*/ */
ol.pointer.TouchSource.prototype.overDown_ = function(browserEvent, inPointer) { ol.pointer.TouchSource.prototype.overDown_ = function(browserEvent, inPointer) {
goog.object.set(this.pointerMap, inPointer.pointerId, { this.pointerMap[inPointer.pointerId] = {
target: inPointer.target, target: inPointer.target,
out: inPointer, out: inPointer,
outTarget: inPointer.target outTarget: inPointer.target
}); };
this.dispatcher.over(inPointer, browserEvent); this.dispatcher.over(inPointer, browserEvent);
this.dispatcher.enter(inPointer, browserEvent); this.dispatcher.enter(inPointer, browserEvent);
this.dispatcher.down(inPointer, browserEvent); this.dispatcher.down(inPointer, browserEvent);

View File

@@ -465,7 +465,7 @@ ol.render.webgl.ImageReplay.prototype.finish = function(context) {
goog.webgl.TEXTURE_MAG_FILTER, goog.webgl.LINEAR); goog.webgl.TEXTURE_MAG_FILTER, goog.webgl.LINEAR);
gl.texImage2D(goog.webgl.TEXTURE_2D, 0, goog.webgl.RGBA, goog.webgl.RGBA, gl.texImage2D(goog.webgl.TEXTURE_2D, 0, goog.webgl.RGBA, goog.webgl.RGBA,
goog.webgl.UNSIGNED_BYTE, image); goog.webgl.UNSIGNED_BYTE, image);
goog.object.set(texturePerImage, uid, texture); texturePerImage[uid] = texture;
} }
this.textures_[i] = texture; this.textures_[i] = texture;
} }

View File

@@ -117,7 +117,7 @@ ol.source.Cluster.prototype.cluster_ = function() {
neighbors = goog.array.filter(neighbors, function(neighbor) { neighbors = goog.array.filter(neighbors, function(neighbor) {
var uid = goog.getUid(neighbor).toString(); var uid = goog.getUid(neighbor).toString();
if (!goog.object.containsKey(clustered, uid)) { if (!goog.object.containsKey(clustered, uid)) {
goog.object.set(clustered, uid, true); clustered[uid] = true;
return true; return true;
} else { } else {
return false; return false;

View File

@@ -158,8 +158,8 @@ ol.source.ImageWMS.prototype.getGetFeatureInfoUrl =
var x = Math.floor((coordinate[0] - extent[0]) / resolution); var x = Math.floor((coordinate[0] - extent[0]) / resolution);
var y = Math.floor((extent[3] - coordinate[1]) / resolution); var y = Math.floor((extent[3] - coordinate[1]) / resolution);
goog.object.set(baseParams, this.v13_ ? 'I' : 'X', x); baseParams[this.v13_ ? 'I' : 'X'] = x;
goog.object.set(baseParams, this.v13_ ? 'J' : 'Y', y); baseParams[this.v13_ ? 'J' : 'Y'] = y;
return this.getRequestUrl_( return this.getRequestUrl_(
extent, ol.source.ImageWMS.GETFEATUREINFO_IMAGE_SIZE_, extent, ol.source.ImageWMS.GETFEATUREINFO_IMAGE_SIZE_,
@@ -270,7 +270,7 @@ ol.source.ImageWMS.prototype.getRequestUrl_ =
if (!('STYLES' in this.params_)) { if (!('STYLES' in this.params_)) {
/* jshint -W053 */ /* jshint -W053 */
goog.object.set(params, 'STYLES', new String('')); params['STYLES'] = new String('');
/* jshint +W053 */ /* jshint +W053 */
} }
@@ -278,14 +278,14 @@ ol.source.ImageWMS.prototype.getRequestUrl_ =
switch (this.serverType_) { switch (this.serverType_) {
case ol.source.wms.ServerType.GEOSERVER: case ol.source.wms.ServerType.GEOSERVER:
var dpi = (90 * pixelRatio + 0.5) | 0; var dpi = (90 * pixelRatio + 0.5) | 0;
goog.object.set(params, 'FORMAT_OPTIONS', 'dpi:' + dpi); params['FORMAT_OPTIONS'] = 'dpi:' + dpi;
break; break;
case ol.source.wms.ServerType.MAPSERVER: case ol.source.wms.ServerType.MAPSERVER:
goog.object.set(params, 'MAP_RESOLUTION', 90 * pixelRatio); params['MAP_RESOLUTION'] = 90 * pixelRatio;
break; break;
case ol.source.wms.ServerType.CARMENTA_SERVER: case ol.source.wms.ServerType.CARMENTA_SERVER:
case ol.source.wms.ServerType.QGIS: case ol.source.wms.ServerType.QGIS:
goog.object.set(params, 'DPI', 90 * pixelRatio); params['DPI'] = 90 * pixelRatio;
break; break;
default: default:
goog.asserts.fail(); goog.asserts.fail();
@@ -293,8 +293,8 @@ ol.source.ImageWMS.prototype.getRequestUrl_ =
} }
} }
goog.object.set(params, 'WIDTH', size[0]); params['WIDTH'] = size[0];
goog.object.set(params, 'HEIGHT', size[1]); params['HEIGHT'] = size[1];
var axisOrientation = projection.getAxisOrientation(); var axisOrientation = projection.getAxisOrientation();
var bbox; var bbox;
@@ -303,7 +303,7 @@ ol.source.ImageWMS.prototype.getRequestUrl_ =
} else { } else {
bbox = extent; bbox = extent;
} }
goog.object.set(params, 'BBOX', bbox.join(',')); params['BBOX'] = bbox.join(',');
return goog.uri.utils.appendParamsFromMap(this.url_, params); return goog.uri.utils.appendParamsFromMap(this.url_, params);
}; };

View File

@@ -168,8 +168,8 @@ ol.source.TileWMS.prototype.getGetFeatureInfoUrl =
var x = Math.floor((coordinate[0] - tileExtent[0]) / tileResolution); var x = Math.floor((coordinate[0] - tileExtent[0]) / tileResolution);
var y = Math.floor((tileExtent[3] - coordinate[1]) / tileResolution); var y = Math.floor((tileExtent[3] - coordinate[1]) / tileResolution);
goog.object.set(baseParams, this.v13_ ? 'I' : 'X', x); baseParams[this.v13_ ? 'I' : 'X'] = x;
goog.object.set(baseParams, this.v13_ ? 'J' : 'Y', y); baseParams[this.v13_ ? 'J' : 'Y'] = y;
return this.getRequestUrl_(tileCoord, tileSize, tileExtent, return this.getRequestUrl_(tileCoord, tileSize, tileExtent,
1, projectionObj, baseParams); 1, projectionObj, baseParams);
@@ -222,14 +222,14 @@ ol.source.TileWMS.prototype.getRequestUrl_ =
return undefined; return undefined;
} }
goog.object.set(params, 'WIDTH', tileSize); params['WIDTH'] = tileSize;
goog.object.set(params, 'HEIGHT', tileSize); params['HEIGHT'] = tileSize;
params[this.v13_ ? 'CRS' : 'SRS'] = projection.getCode(); params[this.v13_ ? 'CRS' : 'SRS'] = projection.getCode();
if (!('STYLES' in this.params_)) { if (!('STYLES' in this.params_)) {
/* jshint -W053 */ /* jshint -W053 */
goog.object.set(params, 'STYLES', new String('')); params['STYLES'] = new String('');
/* jshint +W053 */ /* jshint +W053 */
} }
@@ -237,14 +237,14 @@ ol.source.TileWMS.prototype.getRequestUrl_ =
switch (this.serverType_) { switch (this.serverType_) {
case ol.source.wms.ServerType.GEOSERVER: case ol.source.wms.ServerType.GEOSERVER:
var dpi = (90 * pixelRatio + 0.5) | 0; var dpi = (90 * pixelRatio + 0.5) | 0;
goog.object.set(params, 'FORMAT_OPTIONS', 'dpi:' + dpi); params['FORMAT_OPTIONS'] = 'dpi:' + dpi;
break; break;
case ol.source.wms.ServerType.MAPSERVER: case ol.source.wms.ServerType.MAPSERVER:
goog.object.set(params, 'MAP_RESOLUTION', 90 * pixelRatio); params['MAP_RESOLUTION'] = 90 * pixelRatio;
break; break;
case ol.source.wms.ServerType.CARMENTA_SERVER: case ol.source.wms.ServerType.CARMENTA_SERVER:
case ol.source.wms.ServerType.QGIS: case ol.source.wms.ServerType.QGIS:
goog.object.set(params, 'DPI', 90 * pixelRatio); params['DPI'] = 90 * pixelRatio;
break; break;
default: default:
goog.asserts.fail(); goog.asserts.fail();
@@ -263,7 +263,7 @@ ol.source.TileWMS.prototype.getRequestUrl_ =
bbox[2] = tileExtent[3]; bbox[2] = tileExtent[3];
bbox[3] = tmp; bbox[3] = tmp;
} }
goog.object.set(params, 'BBOX', bbox.join(',')); params['BBOX'] = bbox.join(',');
var url; var url;
if (urls.length == 1) { if (urls.length == 1) {

View File

@@ -473,7 +473,7 @@ ol.xml.makeObjectPropertySetter =
var property = goog.isDef(opt_property) ? var property = goog.isDef(opt_property) ?
opt_property : node.localName; opt_property : node.localName;
goog.asserts.assert(goog.isObject(object)); goog.asserts.assert(goog.isObject(object));
goog.object.set(object, property, value); object[property] = value;
} }
}); });
}; };
@@ -535,8 +535,8 @@ ol.xml.makeArraySerializer = function(nodeWriter, opt_this) {
if (!goog.isDef(serializersNS)) { if (!goog.isDef(serializersNS)) {
serializersNS = {}; serializersNS = {};
var serializers = {}; var serializers = {};
goog.object.set(serializers, node.localName, nodeWriter); serializers[node.localName] = nodeWriter;
goog.object.set(serializersNS, node.namespaceURI, serializers); serializersNS[node.namespaceURI] = serializers;
nodeFactory = ol.xml.makeSimpleNodeFactory(node.localName); nodeFactory = ol.xml.makeSimpleNodeFactory(node.localName);
} }
ol.xml.serialize(serializersNS, nodeFactory, value, objectStack); ol.xml.serialize(serializersNS, nodeFactory, value, objectStack);