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

Merge pull request #4884 from fredj/isFinite

Browse Source 
Remove use of goog.math.isFiniteNumber()
This commit is contained in:
Frédéric Junod
2016-02-23 11:29:16 +01:00
parent 996e119b25 84288cd8bb
commit d642fe6783
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/reproj/reproj.js
+1 -2
View File
@@ -2,7 +2,6 @@ goog.provide('ol.reproj');
goog.require('goog.labs.userAgent.browser'); goog.require('goog.labs.userAgent.browser');
goog.require('goog.labs.userAgent.platform'); goog.require('goog.labs.userAgent.platform');
goog.require('goog.math');
goog.require('ol.dom'); goog.require('ol.dom');
goog.require('ol.extent'); goog.require('ol.extent');
goog.require('ol.math'); goog.require('ol.math');
@@ -61,7 +60,7 @@ ol.reproj.calculateSourceResolution = function(sourceProj, targetProj,
sourceProj.getPointResolution(sourceResolution, sourceCenter) / sourceProj.getPointResolution(sourceResolution, sourceCenter) /
sourceResolution; sourceResolution;
if (goog.math.isFiniteNumber(compensationFactor) && compensationFactor > 0) { if (isFinite(compensationFactor) && compensationFactor > 0) {
sourceResolution /= compensationFactor; sourceResolution /= compensationFactor;
} }
src/ol/reproj/tile.js
+1 -2
View File
@@ -2,7 +2,6 @@ goog.provide('ol.reproj.Tile');
goog.provide('ol.reproj.TileFunctionType'); goog.provide('ol.reproj.TileFunctionType');
goog.require('goog.asserts'); goog.require('goog.asserts');
goog.require('goog.math');
goog.require('ol.Tile'); goog.require('ol.Tile');
goog.require('ol.TileState'); goog.require('ol.TileState');
goog.require('ol.events'); goog.require('ol.events');
@@ -145,7 +144,7 @@ ol.reproj.Tile = function(sourceProj, sourceTileGrid,
var sourceResolution = ol.reproj.calculateSourceResolution( var sourceResolution = ol.reproj.calculateSourceResolution(
sourceProj, targetProj, targetCenter, targetResolution); sourceProj, targetProj, targetCenter, targetResolution);
if (!goog.math.isFiniteNumber(sourceResolution) || sourceResolution <= 0) { if (!isFinite(sourceResolution) || sourceResolution <= 0) {
// invalid sourceResolution -> EMPTY // invalid sourceResolution -> EMPTY
// probably edges of the projections when no extent is defined // probably edges of the projections when no extent is defined
this.state = ol.TileState.EMPTY; this.state = ol.TileState.EMPTY;