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

Do not set geometry by default

Browse Source 
A feature can have a geometry whose value is an ol.geom.Geometry instance or null.  A feature can also have no geometry property.  By default, a feature has no geometry property.  To set a geometry, one can be passed to the constructor (including null) or passed to setGeometry().
This commit is contained in:
Tim Schaub
2014-05-21 09:16:54 -06:00
parent 832371b2aa
commit a4d31147bc
2 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/ol/feature.js
View File

@@ -63,8 +63,9 @@ ol.Feature = function(opt_geometryOrValues) {
this, ol.Object.getChangeEventType(this.geometryName_), this, ol.Object.getChangeEventType(this.geometryName_),
this.handleGeometryChanged_, false, this); this.handleGeometryChanged_, false, this);
if (goog.isDefAndNotNull(opt_geometryOrValues)) { if (goog.isDef(opt_geometryOrValues)) {
if (opt_geometryOrValues instanceof ol.geom.Geometry) { if (opt_geometryOrValues instanceof ol.geom.Geometry ||
goog.isNull(opt_geometryOrValues)) {
var geometry = /** @type {ol.geom.Geometry} */ (opt_geometryOrValues); var geometry = /** @type {ol.geom.Geometry} */ (opt_geometryOrValues);
this.setGeometry(geometry); this.setGeometry(geometry);
} else { } else {
@@ -72,8 +73,6 @@ ol.Feature = function(opt_geometryOrValues) {
var values = /** @type {Object.<string, *>} */ (opt_geometryOrValues); var values = /** @type {Object.<string, *>} */ (opt_geometryOrValues);
this.setValues(values); this.setValues(values);
} }
} else {
this.setGeometry(null);
} }
}; };
goog.inherits(ol.Feature, ol.Object); goog.inherits(ol.Feature, ol.Object);

21
test/spec/ol/feature.test.js
View File

@@ -58,7 +58,7 @@ describe('ol.Feature', function() {
}); });
describe('#getAttributes()', function() { describe('#getProperties()', function() {
it('returns an object with all attributes', function() { it('returns an object with all attributes', function() {
var point = new ol.geom.Point([15, 30]); var point = new ol.geom.Point([15, 30]);
@@ -78,6 +78,12 @@ describe('ol.Feature', function() {
expect(attributes.ten).to.be(10); expect(attributes.ten).to.be(10);
}); });
it('is empty by default', function() {
var feature = new ol.Feature();
var properties = feature.getProperties();
expect(goog.object.isEmpty(properties)).to.be(true);
});
}); });
@@ -85,8 +91,19 @@ describe('ol.Feature', function() {
var point = new ol.geom.Point([15, 30]); var point = new ol.geom.Point([15, 30]);
it('returns null for no geometry', function() { it('returns undefined for unset geometry', function() {
var feature = new ol.Feature(); var feature = new ol.Feature();
expect(feature.getGeometry()).to.be(undefined);
});
it('returns null for null geometry (constructor)', function() {
var feature = new ol.Feature(null);
expect(feature.getGeometry()).to.be(null);
});
it('returns null for null geometry (setGeometry())', function() {
var feature = new ol.Feature();
feature.setGeometry(null);
expect(feature.getGeometry()).to.be(null); expect(feature.getGeometry()).to.be(null);
}); });