Feature collection from array

Author: tschaub

src/main/java/org/geoscript/js/feature/FeatureCollection.java

@@ -323,8 +323,8 @@ public SimpleFeature next() throws NoSuchElementException {
             if (hasNext()) {
                 ++current;
                 Object obj = array.get(current, array);
-                if (obj instanceof SimpleFeature) {
-                    feature = (SimpleFeature) obj;
+                if (obj instanceof Feature) {
+                    feature = (SimpleFeature) ((Feature) obj).unwrap();
                 } else if (obj instanceof NativeObject) {
                     NativeObject config = (NativeObject) obj;
                     feature = (SimpleFeature) new Feature(config.getParentScope(), config).unwrap();

src/test/resources/org/geoscript/js/tests/geoscript/feature/test_collection.js

@@ -199,6 +199,26 @@ exports["test: close (custom)"] = function() {
 
 }
 
+exports["test: constructor (array)"] = function() {
+    var Point = GEOM.Point;
+
+    var features = [
+        new Feature({properties: {loc: new Point([1, 2])}}),
+        new Feature({properties: {loc: new Point([3, 4])}})
+    ];
+    var collection = new FeatureCollection({features: features});
+    ASSERT.strictEqual(collection.size, 2);
+    
+    var got = [];
+    for (var feature in collection) {
+        got.push(feature);
+    }
+    ASSERT.strictEqual(got.length, 2);
+    ASSERT.ok(got[0].geometry.equals(new Point([1, 2])));
+    ASSERT.deepEqual(got[1].get("loc").coordinates, [3, 4]);
+    
+};
+
 
 if (require.main == module.id) {
     system.exit(require("test").run(exports));