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

Simplify and make the compiler happy

Browse Source
This commit is contained in:
Andreas Hocevar
2016-11-29 12:14:11 +01:00
parent c898cda2e6
commit fe758c2606
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/proj/index.js
+4 -9
View File
@@ -723,9 +723,7 @@ ol.proj.getTransformFromProjections = function(sourceProjection, destinationProj
var sourceCode = sourceProjection.getCode(); var sourceCode = sourceProjection.getCode();
var destinationCode = destinationProjection.getCode(); var destinationCode = destinationProjection.getCode();
var transform; var transform;
if (sourceCode in transforms && destinationCode in transforms[sourceCode]) { if (ol.ENABLE_PROJ4JS && !(sourceCode in transforms && destinationCode in transforms[sourceCode])) {
transform = transforms[sourceCode][destinationCode];
} else if (ol.ENABLE_PROJ4JS) {
var proj4js = ol.proj.proj4_ || window['proj4']; var proj4js = ol.proj.proj4_ || window['proj4'];
if (typeof proj4js == 'function') { if (typeof proj4js == 'function') {
var sourceDef = proj4js.defs(sourceCode); var sourceDef = proj4js.defs(sourceCode);
@@ -739,15 +737,12 @@ ol.proj.getTransformFromProjections = function(sourceProjection, destinationProj
ol.proj.addCoordinateTransforms(destinationProjection, sourceProjection, ol.proj.addCoordinateTransforms(destinationProjection, sourceProjection,
proj4Transform.forward, proj4Transform.inverse); proj4Transform.forward, proj4Transform.inverse);
} }
if (sourceCode in transforms && destinationCode in transforms[sourceCode]) {
transform = transforms[sourceCode][destinationCode];
}
} else {
transform = undefined;
} }
} }
} }
if (transform === undefined) { if (sourceCode in transforms && destinationCode in transforms[sourceCode]) {
transform = transforms[sourceCode][destinationCode];
} else {
ol.DEBUG && console.assert(transform !== undefined, 'transform should be defined'); ol.DEBUG && console.assert(transform !== undefined, 'transform should be defined');
transform = ol.proj.identityTransform; transform = ol.proj.identityTransform;
} }