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

Make projection retrieval consistent

Browse Source
This commit is contained in:
Andreas Hocevar
2014-07-28 20:01:35 +02:00
parent 4c4a335448
commit 464eb3ccf5
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/format/geojsonformat.js
+6 -9
View File
@@ -72,12 +72,10 @@ ol.format.GeoJSON.readGeometry_ = function(object, opt_options) {
if (goog.isNull(object)) { if (goog.isNull(object)) {
return null; return null;
} }
var featureProjection = goog.isDef(opt_options) && var featureProjection = goog.isDef(opt_options) ?
goog.isDef(opt_options.featureProjection) ? ol.proj.get(opt_options.featureProjection) : null;
ol.proj.get(opt_options.featureProjection) : null; var dataProjection = goog.isDef(opt_options) ?
var dataProjection = goog.isDef(opt_options) && ol.proj.get(opt_options.dataProjection) : null;
goog.isDef(opt_options.dataProjection) ?
ol.proj.get(opt_options.dataProjection) : null;
var geometryReader = ol.format.GeoJSON.GEOMETRY_READERS_[object.type]; var geometryReader = ol.format.GeoJSON.GEOMETRY_READERS_[object.type];
goog.asserts.assert(goog.isDef(geometryReader)); goog.asserts.assert(goog.isDef(geometryReader));
var geometry = geometryReader(object); var geometry = geometryReader(object);
@@ -187,9 +185,8 @@ ol.format.GeoJSON.writeGeometry_ = function(geometry, opt_options) {
goog.asserts.assert(goog.isDef(geometryWriter)); goog.asserts.assert(goog.isDef(geometryWriter));
var featureProjection = goog.isDef(opt_options) ? var featureProjection = goog.isDef(opt_options) ?
ol.proj.get(opt_options.featureProjection) : null; ol.proj.get(opt_options.featureProjection) : null;
var dataProjection = goog.isDef(opt_options) && var dataProjection = goog.isDef(opt_options) ?
goog.isDef(opt_options.dataProjection) ? ol.proj.get(opt_options.dataProjection) : featureProjection;
ol.proj.get(opt_options.dataProjection) : featureProjection;
if (!goog.isNull(featureProjection) && !goog.isNull(dataProjection) && if (!goog.isNull(featureProjection) && !goog.isNull(dataProjection) &&
!ol.proj.equivalent(featureProjection, dataProjection)) { !ol.proj.equivalent(featureProjection, dataProjection)) {
return geometryWriter( return geometryWriter(