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

Allow Proj4js to be loaded after OpenLayers

Browse Source
This commit is contained in:
Andreas Hocevar
2014-07-08 20:04:33 +02:00
parent 20e903f8d9
commit a22d7e4d22
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/proj/proj.js
+2 -9
View File
@@ -14,14 +14,6 @@ goog.require('ol.extent');
goog.require('ol.sphere.NORMAL'); goog.require('ol.sphere.NORMAL');
/**
* Have Proj4js.
* @const
* @type {boolean}
*/
ol.HAVE_PROJ4JS = ol.ENABLE_PROJ4JS && typeof proj4 == 'function';
/** /**
* A projection as {@link ol.proj.Projection}, SRS identifier string or * A projection as {@link ol.proj.Projection}, SRS identifier string or
* undefined. * undefined.
@@ -485,7 +477,8 @@ ol.proj.get = function(projectionLike) {
var code = projectionLike; var code = projectionLike;
var projections = ol.proj.projections_; var projections = ol.proj.projections_;
projection = projections[code]; projection = projections[code];
if (ol.HAVE_PROJ4JS && !goog.isDef(projection)) { if (ol.ENABLE_PROJ4JS && !goog.isDef(projection) &&
goog.isFunction(proj4)) {
var def = proj4.defs[code]; var def = proj4.defs[code];
if (goog.isDef(def)) { if (goog.isDef(def)) {
var units = def.units; var units = def.units;