ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use bracket notation instead of goog.object.set

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

61
src/ol/format/kmlformat.js
View File

@@ -539,7 +539,7 @@ ol.format.KML.IconStyleParser_ = function(node, objectStack) {
size: size,
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} */
(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_)),
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} */
(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'));
if (goog.isDef(fill)) {
goog.object.set(styleObject, 'fill', fill);
styleObject['fill'] = fill;
}
var outline =
/** @type {boolean|undefined} */ (goog.object.get(object, '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 =
/** @type {Object} */ (objectStack[objectStack.length - 1]);
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];
goog.asserts.assert(goog.isObject(placemarkObject));
if (goog.isArray(styleMapValue)) {
goog.object.set(placemarkObject, 'Style', styleMapValue);
placemarkObject['Style'] = styleMapValue;
} else if (goog.isString(styleMapValue)) {
goog.object.set(placemarkObject, 'styleUrl', styleMapValue);
placemarkObject['styleUrl'] = styleMapValue;
} else {
goog.asserts.fail();
}
@@ -1082,7 +1082,7 @@ ol.format.KML.SimpleDataParser_ = function(node, objectStack) {
var data = ol.format.XSD.readString(node);
var featureObject =
/** @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)) {
goog.object.set(iconProperties, 'w', size[0]);
goog.object.set(iconProperties, 'h', size[1]);
iconProperties['w'] = size[0];
iconProperties['h'] = size[1];
var anchor = style.getAnchor(); // top-left
var origin = style.getOrigin(); // top-left
if (!goog.isNull(origin) && !goog.isNull(iconImageSize) &&
origin[0] !== 0 && origin[1] !== size[1]) {
goog.object.set(iconProperties, 'x', origin[0]);
goog.object.set(iconProperties, 'y',
iconImageSize[1] - (origin[1] + size[1]));
iconProperties['x'] = origin[0];
iconProperties['y'] = iconImageSize[1] - (origin[1] + size[1]);
}
if (!goog.isNull(anchor) &&
@@ -1871,20 +1870,20 @@ ol.format.KML.writeIconStyle_ = function(node, style, objectStack) {
y: size[1] - anchor[1],
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();
if (scale !== 1) {
goog.object.set(properties, 'scale', scale);
properties['scale'] = scale;
}
var rotation = style.getRotation();
if (rotation !== 0) {
goog.object.set(properties, 'heading', rotation); // 0-360
properties['heading'] = rotation; // 0-360
}
var parentNode = objectStack[objectStack.length - 1].node;
@@ -1906,11 +1905,11 @@ ol.format.KML.writeLabelStyle_ = function(node, style, objectStack) {
var properties = {};
var fill = style.getFill();
if (!goog.isNull(fill)) {
goog.object.set(properties, 'color', fill.getColor());
properties['color'] = fill.getColor();
}
var scale = style.getScale();
if (goog.isDef(scale) && scale !== 1) {
goog.object.set(properties, 'scale', scale);
properties['scale'] = scale;
}
var parentNode = objectStack[objectStack.length - 1].node;
var orderedKeys =
@@ -2019,10 +2018,10 @@ ol.format.KML.writePlacemark_ = function(node, feature, objectStack) {
// resolution-independent here
var styles = styleFunction.call(feature, 0);
if (!goog.isNull(styles) && styles.length > 0) {
goog.object.set(properties, 'Style', styles[0]);
properties['Style'] = styles[0];
var textStyle = styles[0].getText();
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));
var flatCoordinates = geometry.getFlatCoordinates();
var /** @type {ol.xml.NodeStackItem} */ context = {node: node};
goog.object.set(context, 'layout', geometry.getLayout());
goog.object.set(context, 'stride', geometry.getStride());
context['layout'] = geometry.getLayout();
context['stride'] = geometry.getStride();
ol.xml.pushSerializeAndPop(context,
ol.format.KML.PRIMITIVE_GEOMETRY_SERIALIZERS_,
ol.format.KML.COORDINATES_NODE_FACTORY_,
@@ -2128,16 +2127,16 @@ ol.format.KML.writeStyle_ = function(node, style, objectStack) {
var imageStyle = style.getImage();
var textStyle = style.getText();
if (!goog.isNull(imageStyle)) {
goog.object.set(properties, 'IconStyle', imageStyle);
properties['IconStyle'] = imageStyle;
}
if (!goog.isNull(textStyle)) {
goog.object.set(properties, 'LabelStyle', textStyle);
properties['LabelStyle'] = textStyle;
}
if (!goog.isNull(strokeStyle)) {
goog.object.set(properties, 'LineStyle', strokeStyle);
properties['LineStyle'] = strokeStyle;
}
if (!goog.isNull(fillStyle)) {
goog.object.set(properties, 'PolyStyle', fillStyle);
properties['PolyStyle'] = fillStyle;
}
var parentNode = objectStack[objectStack.length - 1].node;
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 properties = {};
if (features.length > 1) {
goog.object.set(properties, 'Document', features);
properties['Document'] = features;
} 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 values = ol.xml.makeSequence(properties, orderedKeys);