mapshaper 0.6.31 → 0.6.33

package/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.6.31";
+  var VERSION = "0.6.33";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -11665,8 +11665,16 @@
       }
       cands.forEach(function(cand) {
         var p = getTestPoint(cand.ids);
-        var isEnclosed = b.containsPoint(p[0], p[1]) && (index ?
-          index.pointInPolygon(p[0], p[1]) : geom.testPointInRing(p[0], p[1], pathIds, arcs));
+        var isEnclosed = b.containsPoint(p[0], p[1]) &&
+          // added a bounds-in-bounds test to handle a case where the test point
+          // fell along the shared boundary of two rings, but the rings did no overlap
+          // (this gave a false positive for the enclosure test)
+          // (for speed, the midpoint of an arc is used as the test point; this
+          // works well in the typical case where rings to not share an edge.
+          // Finding an internal test point would be better, we just need a fast
+          // function to find internal points)
+          b.contains(cand.bounds) &&
+          (index ? index.pointInPolygon(p[0], p[1]) : geom.testPointInRing(p[0], p[1], pathIds, arcs));
         if (isEnclosed) {
           paths.push(cand.ids);
         }
@@ -11674,6 +11682,7 @@
       return paths.length > 0 ? paths : null;
     };
 
+    // return array of indexed paths within a given shape
     this.findPathsInsideShape = function(shape) {
       var paths = []; // list of enclosed paths
       shape.forEach(function(ids) {
@@ -12075,7 +12084,6 @@
         yy = coords.yy,
         ids = nodes.getConnectedArcs(fromArcId),
         toArcId = fromArcId; // initialize to fromArcId -- an error condition
-
     if (filter) {
       ids = ids.filter(filter);
     }
@@ -12104,14 +12112,12 @@
         continue;
       }
       icand = arcs.indexOfVertex(candId, -2);
-
       if (toArcId == fromArcId) {
         // first valid candidate
         ito = icand;
         toArcId = candId;
         continue;
       }
-
       code = chooseRighthandPath(fromX, fromY, nodeX, nodeY, xx[ito], yy[ito], xx[icand], yy[icand]);
       if (code == 2) {
         ito = icand;
@@ -12119,6 +12125,7 @@
       }
     }
 
+
     if (toArcId == fromArcId) {
       // This shouldn't occur, assuming that other arcs are present
       error("Pathfinder error");
@@ -12183,6 +12190,9 @@
     chooseRighthandVector: chooseRighthandVector
   });
 
+  var FWD_USED = 0x8;
+  var REV_USED = 0x80;
+
   function setBits(bits, arcBits, mask) {
     return (bits & ~mask) | (arcBits & mask);
   }
@@ -12210,6 +12220,16 @@
     return bits & 7;
   }
 
+  function markPathsAsUsed(paths, routesArr) {
+    forEachArcId(paths, function(arcId) {
+      if (arcId < 0) {
+        routesArr[~arcId] |= REV_USED;
+      } else {
+        routesArr[arcId] |= FWD_USED;
+      }
+    });
+  }
+
   // Open arc pathways in a single shape or array of shapes
   //
   function openArcRoutes(paths, arcColl, routesArr, fwd, rev, dissolve, orBits) {
@@ -12400,6 +12420,7 @@
     andBits: andBits,
     setRouteBits: setRouteBits,
     getRouteBits: getRouteBits,
+    markPathsAsUsed: markPathsAsUsed,
     openArcRoutes: openArcRoutes,
     closeArcRoutes: closeArcRoutes,
     getPathFinder: getPathFinder,
@@ -24840,13 +24861,12 @@ ${svg}
 
     parser.command('run')
       .describe('create commands on-the-fly and run them')
-      .option('include', {
-        // TODO: remove this option
-      })
-      .option('commands', {
+      .option('expression', {
         DEFAULT: true,
-        describe: 'command string or JS expresson to generate command(s)'
+        describe: 'JS expression to generate command(s)'
       })
+      // deprecated
+      .option('commands', {alias_to: 'expression'})
       .option('target', targetOpt);
 
     parser.command('scalebar')
@@ -33402,7 +33422,7 @@ ${svg}
     var clipArcTouches = 0;
     var clipArcUses = 0;
     var usedClipArcs = [];
-    var dividePath = getPathFinder(nodes, useRoute, routeIsActive);
+    var findPath = getPathFinder(nodes, useRoute, routeIsActive);
     var dissolvePolygon = getPolygonDissolver(nodes);
 
     // The following cleanup step is a performance bottleneck (it often takes longer than
@@ -33435,12 +33455,16 @@ ${svg}
       return null;
     });
 
+    markPathsAsUsed(clippedShapes, routeFlags); // to help us find unused paths later
+
+
     // add clip/erase polygons that are fully contained in a target polygon
     // need to index only non-intersecting clip shapes
     // (Intersecting shapes have one or more arcs that have been scanned)
 
     // first, find shapes that do not intersect the target layer
     // (these could be inside or outside the target polygons)
+
     var undividedClipShapes = findUndividedClipShapes(clipShapes);
 
     closeArcRoutes(clipShapes, arcs, routeFlags, true, true); // not needed?
@@ -33469,7 +33493,7 @@ ${svg}
         for (var i=0, n=ids.length; i<n; i++) {
           clipArcTouches = 0;
           clipArcUses = 0;
-          path = dividePath(ids[i]);
+          path = findPath(ids[i]);
           if (path) {
             // if ring doesn't touch/intersect a clip/erase polygon, check if it is contained
             // if (clipArcTouches === 0) {
@@ -33488,6 +33512,7 @@ ${svg}
         }
       });
 
+
       // Clear pathways of current target shape to hidden/closed
       closeArcRoutes(shape, arcs, routeFlags, true, true, true);
       // Also clear pathways of any clip arcs that were used
@@ -33558,8 +33583,9 @@ ${svg}
       return usable;
     }
 
-    // Filter a collection of shapes to exclude paths that contain clip/erase arcs
-    // and paths that are hidden (e.g. internal boundaries)
+
+    // Filter a collection of shapes to exclude paths that incorporate parts of
+    // clip/erase polygons and paths that are hidden (e.g. internal boundaries)
     function findUndividedClipShapes(clipShapes) {
       return clipShapes.map(function(shape) {
         var usableParts = [];
@@ -33583,12 +33609,12 @@ ${svg}
       });
     }
 
-    // Test if arc is unused in both directions
-    // (not testing open/closed or visible/hidden)
+
     function arcIsUnused(id, flags) {
       var abs = absArcId(id),
           flag = flags[abs];
-          return (flag & 0x44) === 0;
+          return (flag & 0x88) === 0;
+          // return id < 0 ? (flag & 0x80) === 0 : (flag & 0x8) === 0;
     }
 
     function arcIsVisible(id, flags) {
@@ -33611,7 +33637,7 @@ ${svg}
         enclosedPaths.forEach(function(ids) {
           var path;
           for (var j=0; j<ids.length; j++) {
-            path = dividePath(ids[j]);
+            path = findPath(ids[j]);
             if (path) {
               dissolvedPaths.push(path);
             }
@@ -34730,7 +34756,64 @@ ${svg}
     };
   }
 
-  cmd.define = function(opts) {
+  function compileIfCommandExpression(expr, catalog, opts) {
+    return compileLayerExpression(expr, catalog, opts);
+  }
+
+
+  function compileLayerExpression(expr, catalog, opts) {
+    var targetId = opts.layer || opts.target || null;
+    var targets = catalog.findCommandTargets(targetId);
+    var isSingle = targets.length == 1 && targets[0].layers.length == 1;
+    if (targets.length === 0 && targetId) {
+      stop('Layer not found:', targetId);
+    }
+    // var vars = getAssignedVars(exp);
+    var defs = getStashedVar('defs') || {};
+
+    var ctx;
+    if (isSingle) {
+      ctx = getLayerProxy(targets[0].layers[0], targets[0].dataset.arcs);
+    } else {
+      ctx = getNullLayerProxy(targets);
+    }
+    ctx.global = defs; // TODO: remove duplication with mapshaper.expressions.mjs
+    var exprOpts = Object.assign({returns: true}, opts);
+    var func = compileExpressionToFunction(expr, exprOpts);
+
+    // @geoType: optional geometry type (polygon, polyline, point, null);
+    ctx.layer_exists = function(name, geoType) {
+      try {
+        var targets = catalog.findCommandTargets(name, geoType);
+        if (targets.length > 0) return true;
+      } catch(e) {}
+      return false;
+    };
+
+    ctx.file_exists = function(file) {
+      return cli.isFile(file);
+    };
+
+    return function() {
+      try {
+        return func.call(ctx, defs, ctx);
+      } catch(e) {
+        // if (opts.quiet) throw e;
+        stop(e.name, "in expression [" + expr + "]:", e.message);
+      }
+    };
+  }
+
+  /*
+  cmd.define_v2 = function(catalog, opts) {
+    if (!opts.expression) {
+      stop('Missing an assignment expression');
+    }
+    compileLayerExpression(opts.expression, catalog, opts)();
+  };
+  */
+
+  cmd.define = function(catalog, opts) {
     if (!opts.expression) {
       stop('Missing an assignment expression');
     }
@@ -38418,46 +38501,6 @@ ${svg}
     return job.control || (job.control = {});
   }
 
-  function compileIfCommandExpression(expr, catalog, opts) {
-    var targetId = opts.layer || opts.target || null;
-    var targets = catalog.findCommandTargets(targetId);
-    var isSingle = targets.length == 1 && targets[0].layers.length == 1;
-    if (targets.length === 0 && targetId) {
-      stop('Layer not found:', targetId);
-    }
-    var ctx;
-    if (isSingle) {
-      ctx = getLayerProxy(targets[0].layers[0], targets[0].dataset.arcs);
-    } else {
-      ctx = getNullLayerProxy(targets);
-    }
-    ctx.global = getStashedVar('defs') || {}; // TODO: remove duplication with mapshaper.expressions.mjs
-    var exprOpts = Object.assign({returns: true}, opts);
-    var func = compileExpressionToFunction(expr, exprOpts);
-
-    // @geoType: optional geometry type (polygon, polyline, point, null);
-    ctx.layer_exists = function(name, geoType) {
-      try {
-        var targets = catalog.findCommandTargets(name, geoType);
-        if (targets.length > 0) return true;
-      } catch(e) {}
-      return false;
-    };
-
-    ctx.file_exists = function(file) {
-      return cli.isFile(file);
-    };
-
-    return function() {
-      try {
-        return func.call(ctx, {}, ctx);
-      } catch(e) {
-        // if (opts.quiet) throw e;
-        stop(e.name, "in expression [" + expr + "]:", e.message);
-      }
-    };
-  }
-
   function skipCommand(cmdName, job) {
     // allow all control commands to run
     if (jobIsStopped(job)) return true;
@@ -40914,13 +40957,10 @@ ${svg}
 
   cmd.run = function(job, targets, opts, cb) {
     var commandStr, commands;
-    if (opts.include) {
-      cmd.include({file: opts.include});
-    }
-    if (!opts.commands) {
-      stop("Missing commands parameter");
+    if (!opts.expression) {
+      stop("Missing expression parameter");
     }
-    commandStr = runGlobalExpression(opts.commands, targets);
+    commandStr = runGlobalExpression(opts.expression, targets);
     if (commandStr) {
       commands = parseCommands(commandStr);
       runParsedCommands(commands, job, cb);
@@ -40937,6 +40977,8 @@ ${svg}
       targetData = getRunCommandData(targets[0]);
       Object.defineProperty(ctx, 'target', {value: targetData});
     }
+    // Add defined functions and data to the expression context
+    // (Such as functions imported via the -require command)
     utils.extend(ctx, getStashedVar('defs'));
     try {
       output = Function('ctx', 'with(ctx) {return (' + expression + ');}').call({}, ctx);
@@ -43220,7 +43262,7 @@ ${svg}
         applyCommandToEachLayer(cmd.dashlines, targetLayers, targetDataset, opts);
 
       } else if (name == 'define') {
-        cmd.define(opts);
+        cmd.define(job.catalog, opts);
 
       } else if (name == 'dissolve') {
         outputLayers = applyCommandToEachLayer(cmd.dissolve, targetLayers, arcs, opts);
@@ -43648,7 +43690,6 @@ ${svg}
 
   // Unified function for processing calls to runCommands() and applyCommands()
   function _runCommands(argv, opts, callback) {
-
     var outputArr = opts.output || null,
         inputObj = opts.input,
         commands;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mapshaper",
-  "version": "0.6.31",
+  "version": "0.6.33",
   "description": "A tool for editing vector datasets for mapping and GIS.",
   "keywords": [
     "shapefile",

package/www/index.html

@@ -154,9 +154,14 @@
 		<div class="export-formats option-menu">
 		</div>
 
-		<div class="option-menu"><input type="text" class="advanced-options" placeholder="command line options" /><div class="tip-button">?<div class="tip-anchor">
-		<div class="tip">Enter options from the command line interface for the -o command. Examples: "bbox" "no-quantization"
-"precision=0.001"</div></div></div></div>
+		<div class="option-menu"><input type="text" class="advanced-options" placeholder="command line options" />
+		<a href="https://github.com/mbloch/mapshaper/wiki/Command-Reference#-o-output" target="_mapshaper_output_docs">
+			<div class="tip-button">?<div class="tip-anchor">
+		<div class="tip">Enter options from the command line interface for
+the -o command. Examples: bbox no-quantization
+precision=0.001. Click to see all options.</div></div></div></a>
+
+</div>
 		<!-- <div class="cancel-btn btn dialog-btn">Cancel</div> -->
 		<div class="save-btn btn dialog-btn">Export</div>
 		<span id="save-preference"><input type="checkbox"/>choose directory</span>
@@ -283,10 +288,13 @@ apply to TopoJSON files.</div></div></div></div> -->
 
 		</div>
 
-		<div><input type="text" class="advanced-options" placeholder="import options" /><div class="tip-button">?<div class="tip-anchor">
+		<div><input type="text" class="advanced-options" placeholder="import options" />
+			<a href="https://github.com/mbloch/mapshaper/wiki/Command-Reference#-i-input" target="_mapshaper_import_docs">
+			<div class="tip-button">?<div class="tip-anchor">
 <div class="tip">Enter options from the command line
-interface. Examples: <span id="import-option-examples">no-topology
-encoding=big5</span></div></div></div></div>
+interface. Examples: <span id="import-option-examples">snap no-topology
+encoding=big5</span>. Click to see all options.</div></div></div></div>
+		</a>
 
 		</div>
 

package/www/mapshaper-gui.js

@@ -1834,6 +1834,7 @@
     var importCount = 0;
     var importTotal = 0;
     var overQuickView = false;
+    var useQuickView = false;
     var queuedFiles = [];
     var manifestFiles = opts.files || [];
     var catalog;
@@ -1863,21 +1864,17 @@
       }
     });
 
-    function useQuickView() {
-      return initialImport && (opts.quick_view || overQuickView);
-    }
-
     function initDropArea(el, isQuick) {
       var area = El(el)
         .on('dragleave', onout)
-        .on('dragover', onover)
+        .on('dragover', function() {overQuickView = !!isQuick; onover();})
         .on('mouseover', onover)
         .on('mouseout', onout);
 
       function onover() {
-        overQuickView = !!isQuick;
         area.addClass('dragover');
       }
+
       function onout() {
         overQuickView = false;
         area.removeClass('dragover');
@@ -1981,6 +1978,7 @@
       var names = getFileNames(files);
       var expanded = [];
       if (files.length === 0) return;
+      useQuickView = importCount === 0 && (opts.quick_view || overQuickView);
       try {
         expanded = await expandFiles(files);
       } catch(e) {
@@ -1995,7 +1993,7 @@
         return;
       }
       gui.enterMode('import');
-      if (useQuickView()) {
+      if (useQuickView) {
         await importQueuedFiles();
       } else {
         gui.container.addClass('queued-files');
@@ -2091,7 +2089,7 @@
 
     function readImportOpts() {
       var importOpts;
-      if (useQuickView()) {
+      if (useQuickView) {
         importOpts = {}; // default opts using quickview
       } else {
         var freeform = El('#import-options .advanced-options').node().value;
@@ -4040,8 +4038,11 @@
     }
 
     function updateMenuBtn() {
-      var name = model.getActiveLayer().layer.name || "[unnamed layer]";
-      btn.classed('active', 'true').findChild('.layer-name').html(name + "  ▼");
+      var lyrName = model.getActiveLayer().layer.name || '';
+      var menuTitle = lyrName || '[unnamed layer]';
+      var pageTitle = lyrName || 'mapshaper';
+      btn.classed('active', 'true').findChild('.layer-name').html(menuTitle + "  ▼");
+      window.document.title = pageTitle;
     }
 
     function render() {
@@ -10174,12 +10175,12 @@
       return action == 'hover' && _overlayCanv.visible();
     }
 
-    function drawCanvasLayer(target, canv) {
-      if (!target) return;
-      if (target.style.type == 'outline') {
-        drawOutlineLayerToCanvas(target, canv, ext);
+    function drawCanvasLayer(lyr, canv) {
+      if (!lyr) return;
+      if (lyr.style.type == 'outline') {
+        drawOutlineLayerToCanvas(lyr, canv, ext);
       } else {
-        drawStyledLayerToCanvas(target, canv, ext);
+        drawStyledLayerToCanvas(lyr, canv, ext);
       }
     }
 
@@ -11041,7 +11042,9 @@
       } else {
         _overlayLyr = null;
       }
-      drawLayers('hover');
+      // 'hover' bypasses style creation in drawLayers2()... sometimes we need that
+      // drawLayers('hover');
+      drawLayers();
     }
 
     function getDisplayOptions() {
@@ -11056,12 +11059,14 @@
       return flags.simplify_method || flags.simplify || flags.proj ||
         flags.arc_count || flags.repair || flags.clip || flags.erase ||
         flags.slice || flags.affine || flags.rectangle || flags.buffer ||
-        flags.union || flags.mosaic || flags.snap || flags.clean || false;
+        flags.union || flags.mosaic || flags.snap || flags.clean || flags.drop || false;
     }
 
     // Test if an update allows hover popup to stay open
     function popupCanStayOpen(flags) {
-      // if (arcsMayHaveChanged(flags)) return false;
+      // keeping popup open after -drop geometry causes problems...
+      // // if (arcsMayHaveChanged(flags)) return false;
+      if (arcsMayHaveChanged(flags)) return false;
       if (flags.points || flags.proj) return false;
       if (!flags.same_table) return false;
       return true;

package/www/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.6.31";
+  var VERSION = "0.6.33";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -11665,8 +11665,16 @@
       }
       cands.forEach(function(cand) {
         var p = getTestPoint(cand.ids);
-        var isEnclosed = b.containsPoint(p[0], p[1]) && (index ?
-          index.pointInPolygon(p[0], p[1]) : geom.testPointInRing(p[0], p[1], pathIds, arcs));
+        var isEnclosed = b.containsPoint(p[0], p[1]) &&
+          // added a bounds-in-bounds test to handle a case where the test point
+          // fell along the shared boundary of two rings, but the rings did no overlap
+          // (this gave a false positive for the enclosure test)
+          // (for speed, the midpoint of an arc is used as the test point; this
+          // works well in the typical case where rings to not share an edge.
+          // Finding an internal test point would be better, we just need a fast
+          // function to find internal points)
+          b.contains(cand.bounds) &&
+          (index ? index.pointInPolygon(p[0], p[1]) : geom.testPointInRing(p[0], p[1], pathIds, arcs));
         if (isEnclosed) {
           paths.push(cand.ids);
         }
@@ -11674,6 +11682,7 @@
       return paths.length > 0 ? paths : null;
     };
 
+    // return array of indexed paths within a given shape
     this.findPathsInsideShape = function(shape) {
       var paths = []; // list of enclosed paths
       shape.forEach(function(ids) {
@@ -12075,7 +12084,6 @@
         yy = coords.yy,
         ids = nodes.getConnectedArcs(fromArcId),
         toArcId = fromArcId; // initialize to fromArcId -- an error condition
-
     if (filter) {
       ids = ids.filter(filter);
     }
@@ -12104,14 +12112,12 @@
         continue;
       }
       icand = arcs.indexOfVertex(candId, -2);
-
       if (toArcId == fromArcId) {
         // first valid candidate
         ito = icand;
         toArcId = candId;
         continue;
       }
-
       code = chooseRighthandPath(fromX, fromY, nodeX, nodeY, xx[ito], yy[ito], xx[icand], yy[icand]);
       if (code == 2) {
         ito = icand;
@@ -12119,6 +12125,7 @@
       }
     }
 
+
     if (toArcId == fromArcId) {
       // This shouldn't occur, assuming that other arcs are present
       error("Pathfinder error");
@@ -12183,6 +12190,9 @@
     chooseRighthandVector: chooseRighthandVector
   });
 
+  var FWD_USED = 0x8;
+  var REV_USED = 0x80;
+
   function setBits(bits, arcBits, mask) {
     return (bits & ~mask) | (arcBits & mask);
   }
@@ -12210,6 +12220,16 @@
     return bits & 7;
   }
 
+  function markPathsAsUsed(paths, routesArr) {
+    forEachArcId(paths, function(arcId) {
+      if (arcId < 0) {
+        routesArr[~arcId] |= REV_USED;
+      } else {
+        routesArr[arcId] |= FWD_USED;
+      }
+    });
+  }
+
   // Open arc pathways in a single shape or array of shapes
   //
   function openArcRoutes(paths, arcColl, routesArr, fwd, rev, dissolve, orBits) {
@@ -12400,6 +12420,7 @@
     andBits: andBits,
     setRouteBits: setRouteBits,
     getRouteBits: getRouteBits,
+    markPathsAsUsed: markPathsAsUsed,
     openArcRoutes: openArcRoutes,
     closeArcRoutes: closeArcRoutes,
     getPathFinder: getPathFinder,
@@ -24840,13 +24861,12 @@ ${svg}
 
     parser.command('run')
       .describe('create commands on-the-fly and run them')
-      .option('include', {
-        // TODO: remove this option
-      })
-      .option('commands', {
+      .option('expression', {
         DEFAULT: true,
-        describe: 'command string or JS expresson to generate command(s)'
+        describe: 'JS expression to generate command(s)'
       })
+      // deprecated
+      .option('commands', {alias_to: 'expression'})
       .option('target', targetOpt);
 
     parser.command('scalebar')
@@ -33402,7 +33422,7 @@ ${svg}
     var clipArcTouches = 0;
     var clipArcUses = 0;
     var usedClipArcs = [];
-    var dividePath = getPathFinder(nodes, useRoute, routeIsActive);
+    var findPath = getPathFinder(nodes, useRoute, routeIsActive);
     var dissolvePolygon = getPolygonDissolver(nodes);
 
     // The following cleanup step is a performance bottleneck (it often takes longer than
@@ -33435,12 +33455,16 @@ ${svg}
       return null;
     });
 
+    markPathsAsUsed(clippedShapes, routeFlags); // to help us find unused paths later
+
+
     // add clip/erase polygons that are fully contained in a target polygon
     // need to index only non-intersecting clip shapes
     // (Intersecting shapes have one or more arcs that have been scanned)
 
     // first, find shapes that do not intersect the target layer
     // (these could be inside or outside the target polygons)
+
     var undividedClipShapes = findUndividedClipShapes(clipShapes);
 
     closeArcRoutes(clipShapes, arcs, routeFlags, true, true); // not needed?
@@ -33469,7 +33493,7 @@ ${svg}
         for (var i=0, n=ids.length; i<n; i++) {
           clipArcTouches = 0;
           clipArcUses = 0;
-          path = dividePath(ids[i]);
+          path = findPath(ids[i]);
           if (path) {
             // if ring doesn't touch/intersect a clip/erase polygon, check if it is contained
             // if (clipArcTouches === 0) {
@@ -33488,6 +33512,7 @@ ${svg}
         }
       });
 
+
       // Clear pathways of current target shape to hidden/closed
       closeArcRoutes(shape, arcs, routeFlags, true, true, true);
       // Also clear pathways of any clip arcs that were used
@@ -33558,8 +33583,9 @@ ${svg}
       return usable;
     }
 
-    // Filter a collection of shapes to exclude paths that contain clip/erase arcs
-    // and paths that are hidden (e.g. internal boundaries)
+
+    // Filter a collection of shapes to exclude paths that incorporate parts of
+    // clip/erase polygons and paths that are hidden (e.g. internal boundaries)
     function findUndividedClipShapes(clipShapes) {
       return clipShapes.map(function(shape) {
         var usableParts = [];
@@ -33583,12 +33609,12 @@ ${svg}
       });
     }
 
-    // Test if arc is unused in both directions
-    // (not testing open/closed or visible/hidden)
+
     function arcIsUnused(id, flags) {
       var abs = absArcId(id),
           flag = flags[abs];
-          return (flag & 0x44) === 0;
+          return (flag & 0x88) === 0;
+          // return id < 0 ? (flag & 0x80) === 0 : (flag & 0x8) === 0;
     }
 
     function arcIsVisible(id, flags) {
@@ -33611,7 +33637,7 @@ ${svg}
         enclosedPaths.forEach(function(ids) {
           var path;
           for (var j=0; j<ids.length; j++) {
-            path = dividePath(ids[j]);
+            path = findPath(ids[j]);
             if (path) {
               dissolvedPaths.push(path);
             }
@@ -34730,7 +34756,64 @@ ${svg}
     };
   }
 
-  cmd.define = function(opts) {
+  function compileIfCommandExpression(expr, catalog, opts) {
+    return compileLayerExpression(expr, catalog, opts);
+  }
+
+
+  function compileLayerExpression(expr, catalog, opts) {
+    var targetId = opts.layer || opts.target || null;
+    var targets = catalog.findCommandTargets(targetId);
+    var isSingle = targets.length == 1 && targets[0].layers.length == 1;
+    if (targets.length === 0 && targetId) {
+      stop('Layer not found:', targetId);
+    }
+    // var vars = getAssignedVars(exp);
+    var defs = getStashedVar('defs') || {};
+
+    var ctx;
+    if (isSingle) {
+      ctx = getLayerProxy(targets[0].layers[0], targets[0].dataset.arcs);
+    } else {
+      ctx = getNullLayerProxy(targets);
+    }
+    ctx.global = defs; // TODO: remove duplication with mapshaper.expressions.mjs
+    var exprOpts = Object.assign({returns: true}, opts);
+    var func = compileExpressionToFunction(expr, exprOpts);
+
+    // @geoType: optional geometry type (polygon, polyline, point, null);
+    ctx.layer_exists = function(name, geoType) {
+      try {
+        var targets = catalog.findCommandTargets(name, geoType);
+        if (targets.length > 0) return true;
+      } catch(e) {}
+      return false;
+    };
+
+    ctx.file_exists = function(file) {
+      return cli.isFile(file);
+    };
+
+    return function() {
+      try {
+        return func.call(ctx, defs, ctx);
+      } catch(e) {
+        // if (opts.quiet) throw e;
+        stop(e.name, "in expression [" + expr + "]:", e.message);
+      }
+    };
+  }
+
+  /*
+  cmd.define_v2 = function(catalog, opts) {
+    if (!opts.expression) {
+      stop('Missing an assignment expression');
+    }
+    compileLayerExpression(opts.expression, catalog, opts)();
+  };
+  */
+
+  cmd.define = function(catalog, opts) {
     if (!opts.expression) {
       stop('Missing an assignment expression');
     }
@@ -38418,46 +38501,6 @@ ${svg}
     return job.control || (job.control = {});
   }
 
-  function compileIfCommandExpression(expr, catalog, opts) {
-    var targetId = opts.layer || opts.target || null;
-    var targets = catalog.findCommandTargets(targetId);
-    var isSingle = targets.length == 1 && targets[0].layers.length == 1;
-    if (targets.length === 0 && targetId) {
-      stop('Layer not found:', targetId);
-    }
-    var ctx;
-    if (isSingle) {
-      ctx = getLayerProxy(targets[0].layers[0], targets[0].dataset.arcs);
-    } else {
-      ctx = getNullLayerProxy(targets);
-    }
-    ctx.global = getStashedVar('defs') || {}; // TODO: remove duplication with mapshaper.expressions.mjs
-    var exprOpts = Object.assign({returns: true}, opts);
-    var func = compileExpressionToFunction(expr, exprOpts);
-
-    // @geoType: optional geometry type (polygon, polyline, point, null);
-    ctx.layer_exists = function(name, geoType) {
-      try {
-        var targets = catalog.findCommandTargets(name, geoType);
-        if (targets.length > 0) return true;
-      } catch(e) {}
-      return false;
-    };
-
-    ctx.file_exists = function(file) {
-      return cli.isFile(file);
-    };
-
-    return function() {
-      try {
-        return func.call(ctx, {}, ctx);
-      } catch(e) {
-        // if (opts.quiet) throw e;
-        stop(e.name, "in expression [" + expr + "]:", e.message);
-      }
-    };
-  }
-
   function skipCommand(cmdName, job) {
     // allow all control commands to run
     if (jobIsStopped(job)) return true;
@@ -40914,13 +40957,10 @@ ${svg}
 
   cmd.run = function(job, targets, opts, cb) {
     var commandStr, commands;
-    if (opts.include) {
-      cmd.include({file: opts.include});
-    }
-    if (!opts.commands) {
-      stop("Missing commands parameter");
+    if (!opts.expression) {
+      stop("Missing expression parameter");
     }
-    commandStr = runGlobalExpression(opts.commands, targets);
+    commandStr = runGlobalExpression(opts.expression, targets);
     if (commandStr) {
       commands = parseCommands(commandStr);
       runParsedCommands(commands, job, cb);
@@ -40937,6 +40977,8 @@ ${svg}
       targetData = getRunCommandData(targets[0]);
       Object.defineProperty(ctx, 'target', {value: targetData});
     }
+    // Add defined functions and data to the expression context
+    // (Such as functions imported via the -require command)
     utils.extend(ctx, getStashedVar('defs'));
     try {
       output = Function('ctx', 'with(ctx) {return (' + expression + ');}').call({}, ctx);
@@ -43220,7 +43262,7 @@ ${svg}
         applyCommandToEachLayer(cmd.dashlines, targetLayers, targetDataset, opts);
 
       } else if (name == 'define') {
-        cmd.define(opts);
+        cmd.define(job.catalog, opts);
 
       } else if (name == 'dissolve') {
         outputLayers = applyCommandToEachLayer(cmd.dissolve, targetLayers, arcs, opts);
@@ -43648,7 +43690,6 @@ ${svg}
 
   // Unified function for processing calls to runCommands() and applyCommands()
   function _runCommands(argv, opts, callback) {
-
     var outputArr = opts.output || null,
         inputObj = opts.input,
         commands;