From 429a256fffed948010206426d38bf04ca5b0f064 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Wed, 26 Mar 2014 13:40:13 +0100 Subject: [PATCH] Fix 'scale' and 'translate' tests --- src/ol/format/topojsonformat.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ol/format/topojsonformat.js b/src/ol/format/topojsonformat.js index 3af47c2f5c..66243663fd 100644 --- a/src/ol/format/topojsonformat.js +++ b/src/ol/format/topojsonformat.js @@ -94,7 +94,7 @@ ol.format.TopoJSON.concatenateArcs_ = function(indices, arcs) { ol.format.TopoJSON.readPointGeometry_ = function(object, scale, translate) { var coordinates = object.coordinates; - if (goog.isDef(scale) && goog.isDef(translate)) { + if (!goog.isNull(scale) && !goog.isNull(translate)) { ol.format.TopoJSON.transformVertex_(coordinates, scale, translate); } return new ol.geom.Point(coordinates); @@ -114,7 +114,7 @@ ol.format.TopoJSON.readMultiPointGeometry_ = function(object, scale, translate) { var coordinates = object.coordinates; var i, ii; - if (goog.isDef(scale) && goog.isDef(translate)) { + if (!goog.isNull(scale) && !goog.isNull(translate)) { for (i = 0, ii = coordinates.length; i < ii; ++i) { ol.format.TopoJSON.transformVertex_(coordinates[i], scale, translate); }