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

Fix 'scale' and 'translate' tests

Browse Source
This commit is contained in:
Frederic Junod
2014-03-26 13:40:13 +01:00
parent b59fa4e8af
commit 429a256fff
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/format/topojsonformat.js
+2 -2
View File
@@ -94,7 +94,7 @@ ol.format.TopoJSON.concatenateArcs_ = function(indices, arcs) {
ol.format.TopoJSON.readPointGeometry_ = ol.format.TopoJSON.readPointGeometry_ =
function(object, scale, translate) { function(object, scale, translate) {
var coordinates = object.coordinates; 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); ol.format.TopoJSON.transformVertex_(coordinates, scale, translate);
} }
return new ol.geom.Point(coordinates); return new ol.geom.Point(coordinates);
@@ -114,7 +114,7 @@ ol.format.TopoJSON.readMultiPointGeometry_ = function(object, scale,
translate) { translate) {
var coordinates = object.coordinates; var coordinates = object.coordinates;
var i, ii; 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) { for (i = 0, ii = coordinates.length; i < ii; ++i) {
ol.format.TopoJSON.transformVertex_(coordinates[i], scale, translate); ol.format.TopoJSON.transformVertex_(coordinates[i], scale, translate);
} }