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

Merge pull request #3784 from fredj/geojson_geometry

Browse Source 
Always write the GeoJSONFeature geometry property
This commit is contained in:
Frédéric Junod
2015-06-11 10:20:02 +02:00
parent 4aa3ef59d5 d5ea855108
commit a6dddfa282
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
externs/geojson.js
View File

@@ -123,7 +123,7 @@ var GeoJSONFeature = function() {};
/** /**
* @type {GeoJSONGeometry} * @type {GeoJSONGeometry|GeoJSONGeometryCollection}
*/ */
GeoJSONFeature.prototype.geometry; GeoJSONFeature.prototype.geometry;

2
src/ol/format/geojsonformat.js
View File

@@ -541,6 +541,8 @@ ol.format.GeoJSON.prototype.writeFeatureObject = function(
if (goog.isDefAndNotNull(geometry)) { if (goog.isDefAndNotNull(geometry)) {
object['geometry'] = object['geometry'] =
ol.format.GeoJSON.writeGeometry_(geometry, opt_options); ol.format.GeoJSON.writeGeometry_(geometry, opt_options);
} else {
object['geometry'] = null;
} }
var properties = feature.getProperties(); var properties = feature.getProperties();
goog.object.remove(properties, feature.getGeometryName()); goog.object.remove(properties, feature.getGeometryName());

6
test/spec/ol/format/geojsonformat.test.js
View File

@@ -530,6 +530,12 @@ describe('ol.format.GeoJSON', function() {
expect(geojson.properties).to.eql(null); expect(geojson.properties).to.eql(null);
}); });
it('writes out a feature without geometry correctly', function() {
var feature = new ol.Feature();
var geojson = format.writeFeatureObject(feature);
expect(geojson.geometry).to.eql(null);
});
}); });
describe('#writeGeometry', function() { describe('#writeGeometry', function() {