Inline simple !goog.isDef() checks

This commit is contained in:
Tim Schaub
2015-09-27 10:23:30 -06:00
parent b36d697585
commit 6638ae855d
14 changed files with 27 additions and 27 deletions

View File

@@ -110,7 +110,7 @@ ol.proj.EPSG3857.fromEPSG4326 = function(input, opt_output, opt_dimension) {
var length = input.length, var length = input.length,
dimension = opt_dimension > 1 ? opt_dimension : 2, dimension = opt_dimension > 1 ? opt_dimension : 2,
output = opt_output; output = opt_output;
if (!goog.isDef(output)) { if (output === undefined) {
if (dimension > 2) { if (dimension > 2) {
// preserve values beyond second dimension // preserve values beyond second dimension
output = input.slice(); output = input.slice();
@@ -141,7 +141,7 @@ ol.proj.EPSG3857.toEPSG4326 = function(input, opt_output, opt_dimension) {
var length = input.length, var length = input.length,
dimension = opt_dimension > 1 ? opt_dimension : 2, dimension = opt_dimension > 1 ? opt_dimension : 2,
output = opt_output; output = opt_output;
if (!goog.isDef(output)) { if (output === undefined) {
if (dimension > 2) { if (dimension > 2) {
// preserve values beyond second dimension // preserve values beyond second dimension
output = input.slice(); output = input.slice();

View File

@@ -154,7 +154,7 @@ ol.proj.Projection = function(options) {
} }
if (!goog.isDef(options.units)) { if (!goog.isDef(options.units)) {
var units = def.units; var units = def.units;
if (!goog.isDef(units)) { if (units === undefined) {
if (def.to_meter !== undefined) { if (def.to_meter !== undefined) {
units = def.to_meter.toString(); units = def.to_meter.toString();
ol.proj.METERS_PER_UNIT[units] = def.to_meter; ol.proj.METERS_PER_UNIT[units] = def.to_meter;
@@ -725,7 +725,7 @@ ol.proj.getTransformFromProjections =
goog.object.containsKey(transforms[sourceCode], destinationCode)) { goog.object.containsKey(transforms[sourceCode], destinationCode)) {
transform = transforms[sourceCode][destinationCode]; transform = transforms[sourceCode][destinationCode];
} }
if (!goog.isDef(transform)) { if (transform === undefined) {
goog.asserts.assert(goog.isDef(transform), 'transform should be defined'); goog.asserts.assert(goog.isDef(transform), 'transform should be defined');
transform = ol.proj.identityTransform; transform = ol.proj.identityTransform;
} }

View File

@@ -485,7 +485,7 @@ ol.render.canvas.Immediate.prototype.drawFeature = function(feature, style) {
return; return;
} }
var zIndex = style.getZIndex(); var zIndex = style.getZIndex();
if (!goog.isDef(zIndex)) { if (zIndex === undefined) {
zIndex = 0; zIndex = 0;
} }
this.drawAsync(zIndex, function(render) { this.drawAsync(zIndex, function(render) {

View File

@@ -1919,12 +1919,12 @@ ol.render.canvas.ReplayGroup.prototype.getReplay =
function(zIndex, replayType) { function(zIndex, replayType) {
var zIndexKey = goog.isDef(zIndex) ? zIndex.toString() : '0'; var zIndexKey = goog.isDef(zIndex) ? zIndex.toString() : '0';
var replays = this.replaysByZIndex_[zIndexKey]; var replays = this.replaysByZIndex_[zIndexKey];
if (!goog.isDef(replays)) { if (replays === undefined) {
replays = {}; replays = {};
this.replaysByZIndex_[zIndexKey] = replays; this.replaysByZIndex_[zIndexKey] = replays;
} }
var replay = replays[replayType]; var replay = replays[replayType];
if (!goog.isDef(replay)) { if (replay === undefined) {
var Constructor = ol.render.canvas.BATCH_CONSTRUCTORS_[replayType]; var Constructor = ol.render.canvas.BATCH_CONSTRUCTORS_[replayType];
goog.asserts.assert(goog.isDef(Constructor), goog.asserts.assert(goog.isDef(Constructor),
replayType + replayType +

View File

@@ -131,7 +131,7 @@ ol.render.webgl.Immediate.prototype.drawFeature = function(feature, style) {
return; return;
} }
var zIndex = style.getZIndex(); var zIndex = style.getZIndex();
if (!goog.isDef(zIndex)) { if (zIndex === undefined) {
zIndex = 0; zIndex = 0;
} }
this.drawAsync(zIndex, function(render) { this.drawAsync(zIndex, function(render) {

View File

@@ -634,7 +634,7 @@ ol.render.webgl.ImageReplay.prototype.replay = function(context,
// draw! // draw!
var result; var result;
if (!goog.isDef(featureCallback)) { if (featureCallback === undefined) {
this.drawReplay_(gl, context, skippedFeaturesHash, this.drawReplay_(gl, context, skippedFeaturesHash,
this.textures_, this.groupIndices_); this.textures_, this.groupIndices_);
} else { } else {
@@ -1037,7 +1037,7 @@ ol.render.webgl.ReplayGroup.prototype.finish = function(context) {
ol.render.webgl.ReplayGroup.prototype.getReplay = ol.render.webgl.ReplayGroup.prototype.getReplay =
function(zIndex, replayType) { function(zIndex, replayType) {
var replay = this.replays_[replayType]; var replay = this.replays_[replayType];
if (!goog.isDef(replay)) { if (replay === undefined) {
var constructor = ol.render.webgl.BATCH_CONSTRUCTORS_[replayType]; var constructor = ol.render.webgl.BATCH_CONSTRUCTORS_[replayType];
goog.asserts.assert(goog.isDef(constructor), goog.asserts.assert(goog.isDef(constructor),
replayType + replayType +

View File

@@ -228,7 +228,7 @@ ol.renderer.canvas.VectorLayer.prototype.prepareFrame =
var vectorLayerRenderBuffer = vectorLayer.getRenderBuffer(); var vectorLayerRenderBuffer = vectorLayer.getRenderBuffer();
var vectorLayerRenderOrder = vectorLayer.getRenderOrder(); var vectorLayerRenderOrder = vectorLayer.getRenderOrder();
if (!goog.isDef(vectorLayerRenderOrder)) { if (vectorLayerRenderOrder === undefined) {
vectorLayerRenderOrder = ol.renderer.vector.defaultOrder; vectorLayerRenderOrder = ol.renderer.vector.defaultOrder;
} }

View File

@@ -250,7 +250,7 @@ ol.renderer.dom.VectorLayer.prototype.prepareFrame =
var vectorLayerRenderBuffer = vectorLayer.getRenderBuffer(); var vectorLayerRenderBuffer = vectorLayer.getRenderBuffer();
var vectorLayerRenderOrder = vectorLayer.getRenderOrder(); var vectorLayerRenderOrder = vectorLayer.getRenderOrder();
if (!goog.isDef(vectorLayerRenderOrder)) { if (vectorLayerRenderOrder === undefined) {
vectorLayerRenderOrder = ol.renderer.vector.defaultOrder; vectorLayerRenderOrder = ol.renderer.vector.defaultOrder;
} }

View File

@@ -223,7 +223,7 @@ ol.renderer.webgl.VectorLayer.prototype.prepareFrame =
var vectorLayerRenderBuffer = vectorLayer.getRenderBuffer(); var vectorLayerRenderBuffer = vectorLayer.getRenderBuffer();
var vectorLayerRenderOrder = vectorLayer.getRenderOrder(); var vectorLayerRenderOrder = vectorLayer.getRenderOrder();
if (!goog.isDef(vectorLayerRenderOrder)) { if (vectorLayerRenderOrder === undefined) {
vectorLayerRenderOrder = ol.renderer.vector.defaultOrder; vectorLayerRenderOrder = ol.renderer.vector.defaultOrder;
} }

View File

@@ -21,7 +21,7 @@ ol.Size;
* @return {ol.Size} * @return {ol.Size}
*/ */
ol.size.buffer = function(size, buffer, opt_size) { ol.size.buffer = function(size, buffer, opt_size) {
if (!goog.isDef(opt_size)) { if (opt_size === undefined) {
opt_size = [0, 0]; opt_size = [0, 0];
} }
opt_size[0] = size[0] + 2 * buffer; opt_size[0] = size[0] + 2 * buffer;
@@ -59,7 +59,7 @@ ol.size.hasArea = function(size) {
* @return {ol.Size} * @return {ol.Size}
*/ */
ol.size.scale = function(size, ratio, opt_size) { ol.size.scale = function(size, ratio, opt_size) {
if (!goog.isDef(opt_size)) { if (opt_size === undefined) {
opt_size = [0, 0]; opt_size = [0, 0];
} }
opt_size[0] = (size[0] * ratio + 0.5) | 0; opt_size[0] = (size[0] * ratio + 0.5) | 0;
@@ -82,7 +82,7 @@ ol.size.toSize = function(size, opt_size) {
return size; return size;
} else { } else {
goog.asserts.assert(goog.isNumber(size)); goog.asserts.assert(goog.isNumber(size));
if (!goog.isDef(opt_size)) { if (opt_size === undefined) {
opt_size = [size, size]; opt_size = [size, size];
} else { } else {
opt_size[0] = size; opt_size[0] = size;

View File

@@ -249,7 +249,7 @@ ol.style.Circle.prototype.render_ = function(atlasManager) {
if (!goog.isNull(this.stroke_)) { if (!goog.isNull(this.stroke_)) {
strokeStyle = ol.color.asString(this.stroke_.getColor()); strokeStyle = ol.color.asString(this.stroke_.getColor());
strokeWidth = this.stroke_.getWidth(); strokeWidth = this.stroke_.getWidth();
if (!goog.isDef(strokeWidth)) { if (strokeWidth === undefined) {
strokeWidth = ol.render.canvas.defaultLineWidth; strokeWidth = ol.render.canvas.defaultLineWidth;
} }
lineDash = this.stroke_.getLineDash(); lineDash = this.stroke_.getLineDash();
@@ -269,7 +269,7 @@ ol.style.Circle.prototype.render_ = function(atlasManager) {
lineDash: lineDash lineDash: lineDash
}; };
if (!goog.isDef(atlasManager)) { if (atlasManager === undefined) {
// no atlas manager is used, create a new canvas // no atlas manager is used, create a new canvas
this.canvas_ = /** @type {HTMLCanvasElement} */ this.canvas_ = /** @type {HTMLCanvasElement} */
(goog.dom.createElement(goog.dom.TagName.CANVAS)); (goog.dom.createElement(goog.dom.TagName.CANVAS));

View File

@@ -315,7 +315,7 @@ ol.style.RegularShape.prototype.render_ = function(atlasManager) {
if (!goog.isNull(this.stroke_)) { if (!goog.isNull(this.stroke_)) {
strokeStyle = ol.color.asString(this.stroke_.getColor()); strokeStyle = ol.color.asString(this.stroke_.getColor());
strokeWidth = this.stroke_.getWidth(); strokeWidth = this.stroke_.getWidth();
if (!goog.isDef(strokeWidth)) { if (strokeWidth === undefined) {
strokeWidth = ol.render.canvas.defaultLineWidth; strokeWidth = ol.render.canvas.defaultLineWidth;
} }
lineDash = this.stroke_.getLineDash(); lineDash = this.stroke_.getLineDash();
@@ -323,15 +323,15 @@ ol.style.RegularShape.prototype.render_ = function(atlasManager) {
lineDash = null; lineDash = null;
} }
lineJoin = this.stroke_.getLineJoin(); lineJoin = this.stroke_.getLineJoin();
if (!goog.isDef(lineJoin)) { if (lineJoin === undefined) {
lineJoin = ol.render.canvas.defaultLineJoin; lineJoin = ol.render.canvas.defaultLineJoin;
} }
lineCap = this.stroke_.getLineCap(); lineCap = this.stroke_.getLineCap();
if (!goog.isDef(lineCap)) { if (lineCap === undefined) {
lineCap = ol.render.canvas.defaultLineCap; lineCap = ol.render.canvas.defaultLineCap;
} }
miterLimit = this.stroke_.getMiterLimit(); miterLimit = this.stroke_.getMiterLimit();
if (!goog.isDef(miterLimit)) { if (miterLimit === undefined) {
miterLimit = ol.render.canvas.defaultMiterLimit; miterLimit = ol.render.canvas.defaultMiterLimit;
} }
} }
@@ -349,7 +349,7 @@ ol.style.RegularShape.prototype.render_ = function(atlasManager) {
miterLimit: miterLimit miterLimit: miterLimit
}; };
if (!goog.isDef(atlasManager)) { if (atlasManager === undefined) {
// no atlas manager is used, create a new canvas // no atlas manager is used, create a new canvas
this.canvas_ = /** @type {HTMLCanvasElement} */ this.canvas_ = /** @type {HTMLCanvasElement} */
(goog.dom.createElement(goog.dom.TagName.CANVAS)); (goog.dom.createElement(goog.dom.TagName.CANVAS));

View File

@@ -703,7 +703,7 @@ ol.View.createResolutionConstraint_ = function(options) {
// user provided minResolution takes precedence // user provided minResolution takes precedence
minResolution = options.minResolution; minResolution = options.minResolution;
if (!goog.isDef(minResolution)) { if (minResolution === undefined) {
if (options.maxZoom !== undefined) { if (options.maxZoom !== undefined) {
if (options.maxResolution !== undefined) { if (options.maxResolution !== undefined) {
minResolution = maxResolution / Math.pow(zoomFactor, maxZoom); minResolution = maxResolution / Math.pow(zoomFactor, maxZoom);

View File

@@ -537,7 +537,7 @@ ol.xml.makeChildAppender = function(nodeWriter, opt_this) {
ol.xml.makeArraySerializer = function(nodeWriter, opt_this) { ol.xml.makeArraySerializer = function(nodeWriter, opt_this) {
var serializersNS, nodeFactory; var serializersNS, nodeFactory;
return function(node, value, objectStack) { return function(node, value, objectStack) {
if (!goog.isDef(serializersNS)) { if (serializersNS === undefined) {
serializersNS = {}; serializersNS = {};
var serializers = {}; var serializers = {};
serializers[node.localName] = nodeWriter; serializers[node.localName] = nodeWriter;
@@ -577,11 +577,11 @@ ol.xml.makeSimpleNodeFactory = function(opt_nodeName, opt_namespaceURI) {
goog.asserts.assert(ol.xml.isNode(node) || ol.xml.isDocument(node), goog.asserts.assert(ol.xml.isNode(node) || ol.xml.isDocument(node),
'expected node %s to be a Node or a Document', node); 'expected node %s to be a Node or a Document', node);
var nodeName = fixedNodeName; var nodeName = fixedNodeName;
if (!goog.isDef(nodeName)) { if (nodeName === undefined) {
nodeName = opt_nodeName; nodeName = opt_nodeName;
} }
var namespaceURI = opt_namespaceURI; var namespaceURI = opt_namespaceURI;
if (!goog.isDef(opt_namespaceURI)) { if (opt_namespaceURI === undefined) {
namespaceURI = node.namespaceURI; namespaceURI = node.namespaceURI;
} }
goog.asserts.assert(goog.isDef(nodeName), 'nodeName was undefined'); goog.asserts.assert(goog.isDef(nodeName), 'nodeName was undefined');