Better -each expression geojson support

src/expressions/mapshaper-each-geojson.mjs

@@ -6,7 +6,7 @@ import utils from '../utils/mapshaper-utils';
 import GeoJSON from '../geojson/geojson-common';
 
 export function expressionUsesGeoJSON(exp) {
-  return exp.includes('this.geojson');
+  return exp.includes('this.geojson') || exp.includes('this.geometry') || exp.includes('this.feature');
 }
 
 export function getFeatureEditor(lyr, dataset) {
@@ -22,6 +22,24 @@ export function getFeatureEditor(lyr, dataset) {
     return features[i];
   };
 
+  api.getGeometry = function(i) {
+    if (i > 0) features[i-1] = null; // garbage-collect old features
+    return features[i] ? features[i].geometry : null;
+  };
+
+  api.setGeometry = function(geom, i) {
+    if (utils.isString(geom)) {
+      geom = JSON.parse(geom);
+    }
+    // TODO: validate? validate geometry in feature setter?
+    var feat = {
+      type: 'Feature',
+      properties: features[i] ? features[i].properties : null,
+      geometry: geom || null
+    };
+    api.set(feat, i);
+  };
+
   api.set = function(feat, i) {
     var arr;
 

src/expressions/mapshaper-feature-proxy.mjs

@@ -39,6 +39,24 @@ export function initFeatureProxy(lyr, arcs, optsArg) {
         return opts.geojson_editor.get(_id);
       }
     });
+
+    Object.defineProperty(ctx, 'feature', {
+      set: function(o) {
+        opts.geojson_editor.set(o, _id);
+      },
+      get: function() {
+        return opts.geojson_editor.get(_id);
+      }
+    });
+
+    Object.defineProperty(ctx, 'geometry', {
+      set: function(o) {
+        opts.geojson_editor.setGeometry(o, _id);
+      },
+      get: function() {
+        return opts.geojson_editor.getGeometry(_id);
+      }
+    });
   }
 
   if (_records) {