mapshaper 0.6.37 → 0.6.39

package/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.6.37";
+  var VERSION = "0.6.39";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -65,7 +65,7 @@
     get rtrim () { return rtrim; },
     get addThousandsSep () { return addThousandsSep; },
     get numToStr () { return numToStr; },
-    get formatNumber () { return formatNumber; },
+    get formatNumber () { return formatNumber$1; },
     get formatIntlNumber () { return formatIntlNumber; },
     get formatNumberForDisplay () { return formatNumberForDisplay; },
     get shuffle () { return shuffle; },
@@ -649,12 +649,12 @@
     return decimals >= 0 ? num.toFixed(decimals) : String(num);
   }
 
-  function formatNumber(val) {
+  function formatNumber$1(val) {
     return val + '';
   }
 
   function formatIntlNumber(val) {
-    var str = formatNumber(val);
+    var str = formatNumber$1(val);
     return '"' + str.replace('.', ',') + '"'; // need to quote if comma-delimited
   }
 
@@ -1247,7 +1247,8 @@
 
   // Handle an error caused by invalid input or misuse of API
   function stop() {
-    _stop.apply(null, utils.toArray(arguments));
+    // _stop.apply(null, utils.toArray(arguments));
+    _stop.apply(null, messageArgs(arguments));
   }
 
   function interrupt() {
@@ -4670,12 +4671,11 @@
     albersusa: AlbersUSA
   };
 
-  // This stub is replaced when loaded in GUI, which may need to load some files
-  function initProjLibrary(opts, done) {
-    if (!asyncLoader) return done();
-    asyncLoader(opts, done);
+  async function initProjLibrary(opts) {
+    if (asyncLoader) await asyncLoader(opts);
   }
 
+  // used by web UI to support loading projection assets asyncronously
   function setProjectionLoader(loader) {
     asyncLoader = loader;
   }
@@ -13115,6 +13115,105 @@
     });
   }
 
+  // Parse a formatted value in DMS DM or D to a numeric value. Returns NaN if unparsable.
+  // Delimiters: degrees: D|d|°; minutes: '; seconds: "
+  function parseDMS(str, fmt) {
+    var defaultRxp = /^(?<prefix>[nsew+-]?)(?<d>[0-9.]+)[d°]? ?(?<m>[0-9.]*)['′]? ?(?<s>[0-9.]*)["″]? ?(?<suffix>[nsew]?)$/i;
+    var rxp = fmt ? getParseRxp(fmt) : defaultRxp;
+    var match = rxp.exec(str.trim());
+    var d = NaN;
+    var deg, min, sec;
+    if (match) {
+      deg = match.groups.d || '0';
+      min = match.groups.m || '0';
+      sec = match.groups.s || '0';
+      d = (+deg) + (+min) / 60 + (+sec) / 3600;
+      if (/[sw-]/i.test(match.groups.prefix || '') || /[sw]/i.test(match.groups.suffix || '')) {
+        d = -d;
+      }
+    }
+    return d;
+  }
+
+  var cache$1 = {};
+
+  function getParseRxp(fmt) {
+    if (fmt in cache$1) return cache$1[fmt];
+    var rxp = fmt;
+    rxp = rxp.replace('[-]', '(?<prefix>-)?'); // optional -
+    rxp = rxp.replace(/\[[NSEW, +-]{2,}\]/, '(?<prefix>$&)');
+    rxp = rxp.replace(/(MM?)(\.M+)?/, (m, g1, g2) => {
+      var s = g1.length == 1 ? '[0-9]+' : '[0-9][0-9]';
+      if (g2) s += `\\.[0-9]+`;
+      return `(?<m>${s})`;
+    });
+    rxp = rxp.replace(/(SS?)(\.S+)?/, (m, g1, g2) => {
+      var s = g1.length == 1 ? '[0-9]+' : '[0-9][0-9]';
+      if (g2) s += `\\.[0-9]+`;
+      return `(?<s>${s})`;
+    });
+    rxp = rxp.replace(/D+/, '(?<d>[0-9]+)');
+    rxp = '^' + rxp + '$';
+    try {
+      // TODO: make sure all DMS codes have been matched
+      cache$1[fmt] = new RegExp(rxp);
+    } catch(e) {
+      stop('Invalid DMS format string:', fmt);
+    }
+    return cache$1[fmt];
+  }
+
+  function formatNumber(val, integers, decimals) {
+    var str = val.toFixed(decimals);
+    var parts = str.split('.');
+    if (parts.length > 0) {
+      parts[0] = parts[0].padStart(integers, '0');
+      str = parts.join('.');
+    }
+    return str;
+  }
+
+  function getDecimals(fmt) {
+    var match = /S\.(S+)/.exec(fmt) || /M\.(M+)/.exec(fmt) || null;
+    return match ? match[1].length : 0;
+  }
+
+  // TODO: support DD.DDDDD
+  function formatDMS(coord, fmt) {
+    if (!fmt) fmt = '[-]D°M\'S.SSS';
+    var str = fmt;
+    var dstr, mstr, sstr;
+    var match = /(D+)[^M]*(M+)[^S[\]]*(S+)?/.exec(fmt);
+    if (!match) {
+      stop('Invalid DMS format string:', fmt);
+    }
+    var gotSeconds = !!match[3];
+    var decimals = getDecimals(fmt);
+    var integers = gotSeconds ? match[3].length : match[2].length;
+    var RES = Math.pow(10, decimals);
+    var CONV = gotSeconds ? 3600 * RES : 60 * RES;
+    var r = Math.floor(Math.abs(coord) * CONV + 0.5);
+    var lastPart = formatNumber((r / RES) % 60, integers, decimals);
+    if (gotSeconds) {
+      r = Math.floor(r / (RES * 60));
+      sstr = lastPart;
+      mstr = String(r % 60).padStart(match[2].length, '0');
+    } else {
+      r = Math.floor(r / RES);
+      mstr = lastPart;
+      sstr = '';
+    }
+    dstr = String(Math.floor(r / 60)).padStart(match[1].length, '0');
+    str = str.replace(/\[-\]/, s => coord < 0 ? '-' : '');
+    str = str.replace(/\[[+-]+\]/, s => coord < 0 ? '-' : '+');
+    str = str.replace(/\[[NS, ]+\]/, s => coord < 0 ? 'S' : 'N');
+    str = str.replace(/\[[EW, ]+\]/, s => coord < 0 ? 'W' : 'E');
+    str = str.replace(/D+/, dstr);
+    str = str.replace(/M+(\.M+)?/, mstr);
+    if (gotSeconds) str = str.replace(/S+(\.S+)?/, sstr);
+    return str;
+  }
+
   function cleanExpression(exp) {
     // workaround for problem in GNU Make v4: end-of-line backslashes inside
     // quoted strings are left in the string (other shell environments remove them)
@@ -13126,7 +13225,9 @@
       round: roundToDigits2,
       int_median: interpolated_median,
       sprintf: utils.format,
-      blend: blend
+      blend: blend,
+      format_dms: formatDMS,
+      parse_dms: parseDMS
     });
   }
 
@@ -22791,7 +22892,6 @@ ${svg}
 
     this.getHelpMessage = function(cmdName) {
       var helpCommands, singleCommand, lines;
-
       if (cmdName) {
         singleCommand = findCommandDefn(cmdName, getCommands());
         if (!singleCommand) {
@@ -22910,10 +23010,6 @@ ${svg}
       }
     };
 
-    this.printHelp = function(command) {
-      print(this.getHelpMessage(command));
-    };
-
     function getCommands() {
       return _commands.map(function(cmd) {
         return cmd.done();
@@ -23633,7 +23729,7 @@ ${svg}
         type: 'flag'
       })
       .option('other', {
-        describe: 'default color for categorical scheme (defaults to no-data color)'
+        describe: 'default color for categorical scheme (default is nodata color)'
       })
       .option('nodata', {
         describe: 'color to use for invalid or missing data (default is white)'
@@ -24561,7 +24657,7 @@ ${svg}
     parser.command('symbols')
       .describe('symbolize points as arrows, circles, stars, polygons, etc.')
       .option('type', {
-        describe: 'symbol type (e.g. arrow, circle, square, star, polygon, ring)'
+        describe: 'types: arrow, circle, square, star, polygon, ring'
       })
       .option('stroke', {})
       .option('stroke-width', {})
@@ -24574,6 +24670,9 @@ ${svg}
       .option('stroke-width', {
         describe: 'symbol line width (linear symbols only)'
       })
+      .option('opacity', {
+        describe: 'symbol opacity'
+      })
       .option('geographic', {
         old_alias: 'polygons',
          describe: 'make geographic shapes instead of SVG objects',
@@ -24674,7 +24773,6 @@ ${svg}
       .option('no-replace', noReplaceOpt);
       // .option('name', nameOpt);
 
-
     parser.command('target')
       .describe('set active layer (or layers)')
       .option('target', {
@@ -24684,6 +24782,14 @@ ${svg}
       .option('type', {
         describe: 'type of layer to target (polygon|polyline|point)'
       })
+      // .option('combine', {
+      //   type: 'flag',
+      //   describe: 'place all targeted layers in one dataset together with any  associated layers'
+      // })
+      // .option('isolate', {
+      //   type: 'flag',
+      //   describe: 'place all targeted layers in one dataset exclusive of associated layers'
+      // })
       .option('name', {
         describe: 'rename the target layer'
       });
@@ -38516,6 +38622,11 @@ ${svg}
     };
   }
 
+  cmd.printHelp = function(opts) {
+    var str = getOptionParser().getHelpMessage(opts.command);
+    print(str);
+  };
+
   function resetControlFlow(job) {
     job.control = null;
   }
@@ -39155,25 +39266,6 @@ ${svg}
     };
   }
 
-  // Parse a formatted value in DMS DM or D to a numeric value. Returns NaN if unparsable.
-  // Delimiters: degrees: D|d|°; minutes: '; seconds: "
-  function parseDMS(str) {
-    var rxp = /^([nsew+-]?)([0-9.]+)[d°]? ?([0-9.]*)['′]? ?([0-9.]*)["″]? ?([nsew]?)$/i;
-    var match = rxp.exec(str.trim());
-    var d = NaN;
-    var deg, min, sec;
-    if (match) {
-      deg = match[2] || '0';
-      min = match[3] || '0';
-      sec = match[4] || '0';
-      d = (+deg) + (+min) / 60 + (+sec) / 3600;
-      if (/[sw-]/i.test(match[1]) || /[sw]/i.test(match[5])) {
-        d = -d;
-      }
-    }
-    return d;
-  }
-
   function findNearestVertices(p, shp, arcs) {
     var p2 = findNearestVertex(p[0], p[1], shp, arcs);
     return findVertexIds(p2.x, p2.y, arcs);
@@ -42281,6 +42373,18 @@ ${svg}
     return d.stroke || d.fill || 'magenta';
   }
 
+  function applySymbolStyles(sym, d) {
+    if (sym.type == 'polyline') {
+      sym.stroke = getSymbolStrokeColor(d);
+    } else {
+      sym.fill = getSymbolFillColor(d);
+    }
+    if (d.opacity) {
+      sym.opacity = d.opacity;
+    }
+    return sym;
+  }
+
   function getSymbolRadius(d) {
     if (d.radius === 0 || d.length === 0 || d.r === 0) return 0;
     return d.radius || d.length || d.r || 5; // use a default value
@@ -42518,11 +42622,8 @@ ${svg}
     var radius = getSymbolRadius(d);
     // TODO: remove duplication with svg-symbols.js
     if (+opts.scale) radius *= +opts.scale;
-    return {
-      type: 'circle',
-      fill: getSymbolFillColor(d),
-      r: radius
-    };
+    var sym = { type: 'circle', r: radius };
+    return applySymbolStyles(sym, d);
   }
 
   function getPolygonCoords(d) {
@@ -42614,11 +42715,13 @@ ${svg}
     var radii = parseRings(d.radii || '2').map(function(r) { return r * scale; });
     var solidCenter = utils.isOdd(radii.length);
     var color = getSymbolFillColor(d);
+    var opacity = opts.opacity || undefined;
     var parts = [];
     if (solidCenter) {
       parts.push({
         type: 'circle',
         fill: color,
+        opacity: opacity,
         r: radii.shift()
       });
     }
@@ -42627,6 +42730,7 @@ ${svg}
         type: 'circle',
         fill: 'none', // TODO remove default black fill so this is not needed
         stroke: color,
+        opacity: opacity,
         'stroke-width':  roundToTenths(radii[i+1] - radii[i]),
         r: roundToTenths(radii[i+1] * 0.5 + radii[i] * 0.5)
       });
@@ -42674,19 +42778,18 @@ ${svg}
     if (geojsonType == 'MultiPolygon' || geojsonType == 'Polygon') {
       sym = {
         type: 'polygon',
-        fill: getSymbolFillColor(properties),
         coordinates: geojsonType == 'Polygon' ? coords : flattenMultiPolygonCoords(coords)
       };
     } else if (geojsonType == 'LineString' || geojsonType == 'MultiLineString') {
       sym = {
         type: 'polyline',
-        stroke: getSymbolStrokeColor(properties),
         'stroke-width': properties['stroke-width'] || 2,
         coordinates: geojsonType == 'LineString' ? [coords] : coords
       };
     } else {
       error('Unsupported type:', geojsonType);
     }
+    applySymbolStyles(sym, properties);
     roundCoordsForSVG(sym.coordinates);
     return sym;
   }
@@ -42746,6 +42849,7 @@ ${svg}
         scaleAndShiftCoords(coords, metersPerPx, shp[0]);
         if (d.fill) rec.fill = d.fill;
         if (d.stroke) rec.stroke = d.stroke;
+        if (d.opacity) rec.opacity = d.opacity;
         return createGeometry(coords, geojsonType);
       } else {
         rec['svg-symbol'] = makePathSymbol(coords, d, geojsonType);
@@ -42811,9 +42915,41 @@ ${svg}
       // TODO: improve this
       targets[0].layers[0].name = opts.name;
     }
+    if (opts.combine) {
+      targets = combineTargets(targets, catalog);
+    } else if (opts.isolate) {
+      targets = isolateTargets(targets, catalog);
+    }
     catalog.setDefaultTargets(targets);
   };
 
+  function combineTargets(targets, catalog) {
+    var datasets = [];
+    var layers = [];
+    targets.forEach(function(o) {
+      datasets.push(o.dataset);
+      catalog.removeDataset(o.dataset);
+      layers = layers.concat(o.layers);
+    });
+    var combined = mergeDatasets(datasets);
+    catalog.addDataset(combined);
+    return [{
+      dataset: combined,
+      layers: layers
+    }];
+  }
+
+  function isolateTargets(targets, catalog) {
+    var datasets = [];
+    targets.forEach(function(o) {
+      datasets.push(o.dataset);
+      o.layers.forEach(function(lyr) {
+        catalog.removeLayer(lyr, o.dataset);
+
+      });
+    });
+  }
+
   cmd.union = function(targetLayers, targetDataset, opts) {
     if (targetLayers.length < 2) {
       stop('Command requires at least two target layers');
@@ -43198,7 +43334,7 @@ ${svg}
   function commandAcceptsMultipleTargetDatasets(name) {
     return name == 'rotate' || name == 'info' || name == 'proj' ||
       name == 'drop' || name == 'target' || name == 'if' || name == 'elif' ||
-      name == 'else' || name == 'endif' || name == 'run';
+      name == 'else' || name == 'endif' || name == 'run' || name == 'i';
   }
 
   function commandAcceptsEmptyTarget(name) {
@@ -43387,8 +43523,8 @@ ${svg}
         job.catalog.addDataset(cmd.graticule(targetDataset, opts));
 
       } else if (name == 'help') {
-        // placing this here to handle errors from invalid command names
-        getOptionParser().printHelp(command.options.command);
+        // placing help command here to handle errors from invalid command names
+        cmd.printHelp(command.options);
 
       } else if (name == 'i') {
         if (opts.replace) job.catalog = new Catalog(); // is this what we want?
@@ -43470,7 +43606,7 @@ ${svg}
         cmd.print(command._.join(' '));
 
       } else if (name == 'proj') {
-        await utils.promisify(initProjLibrary)(opts);
+        await initProjLibrary(opts);
         job.resumeCommand();
         targets.forEach(function(targ) {
           cmd.proj(targ.dataset, job.catalog, opts);
@@ -44305,6 +44441,7 @@ ${svg}
     Heap,
     NodeCollection,
     parseDMS,
+    formatDMS,
     PathIndex,
     PolygonIndex,
     ShpReader,

package/package.json

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

package/www/mapshaper-gui.js

@@ -2479,42 +2479,18 @@
     });
   }
 
+  internal.setProjectionLoader(loadProjLibs);
+
   // load Proj.4 CRS definition files dynamically
   //
-  internal.setProjectionLoader(function(opts, done) {
+  async function loadProjLibs(opts) {
     var mproj = require('mproj');
     var libs = internal.findProjLibs([opts.init || '', opts.match || '', opts.crs || ''].join(' '));
-    // skip loaded libs
-    libs = libs.filter(function(name) {return !mproj.internal.mproj_search_libcache(name);});
-    loadProjLibs(libs, done);
-  });
-
-  function loadProjLibs(libs, done) {
-    var mproj = require('mproj');
-    var i = 0;
-    next();
-
-    function next() {
-      var libName = libs[i];
-      var content, req;
-      if (!libName) return done();
-      req = new XMLHttpRequest();
-      req.addEventListener('load', function(e) {
-        if (req.status == 200) {
-          content = req.response;
-        }
-      });
-      req.addEventListener('loadend', function() {
-        if (content) {
-          mproj.internal.mproj_insert_libcache(libName, content);
-        }
-        // TODO: consider stopping with an error message if no content was loaded
-        // (currently, a less specific error will occur when mapshaper tries to use the library)
-        next();
-      });
-      req.open('GET', 'assets/' + libName);
-      req.send();
-      i++;
+    libs = libs.filter(function(name) {return !mproj.internal.mproj_search_libcache(name);}); // skip loaded libs
+    for (var libName of libs) {
+      var content = await fetch('assets/' + libName).then(resp => resp.ok ? resp.text() : null);
+      if (!content) stop$1(`Unable to load projection resource [${libName}]`);
+      mproj.internal.mproj_insert_libcache(libName, content);
     }
   }
 
@@ -3371,7 +3347,10 @@
           setDisplayProjection(gui, cmd);
         } else {
           line.hide(); // hide cursor while command is being run
-          runMapshaperCommands(cmd, function(err) {
+          runMapshaperCommands(cmd, function(err, flags) {
+            if (flags) {
+              gui.clearMode();
+            }
             if (err) {
               onError(err);
             }
@@ -3404,14 +3383,9 @@
           }
         }
         if (flags) {
-          // if the command may have changed data, and a tool with an edit mode is being used,
-          // close the tool. (we may need a better way to allow the console and other tools
-          // to be used at the same time).
-          gui.clearMode();
-
           model.updated(flags); // info commands do not return flags
         }
-        done(err);
+        done(err, flags);
       });
     }
 
@@ -5068,7 +5042,8 @@
 
   // Handle an error caused by invalid input or misuse of API
   function stop() {
-    _stop.apply(null, utils.toArray(arguments));
+    // _stop.apply(null, utils.toArray(arguments));
+    _stop.apply(null, messageArgs(arguments));
   }
 
   function interrupt() {
@@ -7976,10 +7951,11 @@
       hit.clearSelection();
     });
 
-    function runCommand(cmd) {
+    function runCommand(cmd, turnOff) {
       popup.hide();
       if (gui.console) gui.console.runMapshaperCommands(cmd, function(err) {
         reset();
+        if (turnOff) gui.clearMode();
       });
     }
   }
@@ -10311,6 +10287,7 @@
       if (gui.console) {
         gui.console.runMapshaperCommands(cmd, function(err) {
           reset();
+          gui.clearMode();
         });
       }
       // reset(); // TODO: exit interactive mode

package/www/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.6.37";
+  var VERSION = "0.6.39";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -65,7 +65,7 @@
     get rtrim () { return rtrim; },
     get addThousandsSep () { return addThousandsSep; },
     get numToStr () { return numToStr; },
-    get formatNumber () { return formatNumber; },
+    get formatNumber () { return formatNumber$1; },
     get formatIntlNumber () { return formatIntlNumber; },
     get formatNumberForDisplay () { return formatNumberForDisplay; },
     get shuffle () { return shuffle; },
@@ -649,12 +649,12 @@
     return decimals >= 0 ? num.toFixed(decimals) : String(num);
   }
 
-  function formatNumber(val) {
+  function formatNumber$1(val) {
     return val + '';
   }
 
   function formatIntlNumber(val) {
-    var str = formatNumber(val);
+    var str = formatNumber$1(val);
     return '"' + str.replace('.', ',') + '"'; // need to quote if comma-delimited
   }
 
@@ -1247,7 +1247,8 @@
 
   // Handle an error caused by invalid input or misuse of API
   function stop() {
-    _stop.apply(null, utils.toArray(arguments));
+    // _stop.apply(null, utils.toArray(arguments));
+    _stop.apply(null, messageArgs(arguments));
   }
 
   function interrupt() {
@@ -4670,12 +4671,11 @@
     albersusa: AlbersUSA
   };
 
-  // This stub is replaced when loaded in GUI, which may need to load some files
-  function initProjLibrary(opts, done) {
-    if (!asyncLoader) return done();
-    asyncLoader(opts, done);
+  async function initProjLibrary(opts) {
+    if (asyncLoader) await asyncLoader(opts);
   }
 
+  // used by web UI to support loading projection assets asyncronously
   function setProjectionLoader(loader) {
     asyncLoader = loader;
   }
@@ -13115,6 +13115,105 @@
     });
   }
 
+  // Parse a formatted value in DMS DM or D to a numeric value. Returns NaN if unparsable.
+  // Delimiters: degrees: D|d|°; minutes: '; seconds: "
+  function parseDMS(str, fmt) {
+    var defaultRxp = /^(?<prefix>[nsew+-]?)(?<d>[0-9.]+)[d°]? ?(?<m>[0-9.]*)['′]? ?(?<s>[0-9.]*)["″]? ?(?<suffix>[nsew]?)$/i;
+    var rxp = fmt ? getParseRxp(fmt) : defaultRxp;
+    var match = rxp.exec(str.trim());
+    var d = NaN;
+    var deg, min, sec;
+    if (match) {
+      deg = match.groups.d || '0';
+      min = match.groups.m || '0';
+      sec = match.groups.s || '0';
+      d = (+deg) + (+min) / 60 + (+sec) / 3600;
+      if (/[sw-]/i.test(match.groups.prefix || '') || /[sw]/i.test(match.groups.suffix || '')) {
+        d = -d;
+      }
+    }
+    return d;
+  }
+
+  var cache$1 = {};
+
+  function getParseRxp(fmt) {
+    if (fmt in cache$1) return cache$1[fmt];
+    var rxp = fmt;
+    rxp = rxp.replace('[-]', '(?<prefix>-)?'); // optional -
+    rxp = rxp.replace(/\[[NSEW, +-]{2,}\]/, '(?<prefix>$&)');
+    rxp = rxp.replace(/(MM?)(\.M+)?/, (m, g1, g2) => {
+      var s = g1.length == 1 ? '[0-9]+' : '[0-9][0-9]';
+      if (g2) s += `\\.[0-9]+`;
+      return `(?<m>${s})`;
+    });
+    rxp = rxp.replace(/(SS?)(\.S+)?/, (m, g1, g2) => {
+      var s = g1.length == 1 ? '[0-9]+' : '[0-9][0-9]';
+      if (g2) s += `\\.[0-9]+`;
+      return `(?<s>${s})`;
+    });
+    rxp = rxp.replace(/D+/, '(?<d>[0-9]+)');
+    rxp = '^' + rxp + '$';
+    try {
+      // TODO: make sure all DMS codes have been matched
+      cache$1[fmt] = new RegExp(rxp);
+    } catch(e) {
+      stop('Invalid DMS format string:', fmt);
+    }
+    return cache$1[fmt];
+  }
+
+  function formatNumber(val, integers, decimals) {
+    var str = val.toFixed(decimals);
+    var parts = str.split('.');
+    if (parts.length > 0) {
+      parts[0] = parts[0].padStart(integers, '0');
+      str = parts.join('.');
+    }
+    return str;
+  }
+
+  function getDecimals(fmt) {
+    var match = /S\.(S+)/.exec(fmt) || /M\.(M+)/.exec(fmt) || null;
+    return match ? match[1].length : 0;
+  }
+
+  // TODO: support DD.DDDDD
+  function formatDMS(coord, fmt) {
+    if (!fmt) fmt = '[-]D°M\'S.SSS';
+    var str = fmt;
+    var dstr, mstr, sstr;
+    var match = /(D+)[^M]*(M+)[^S[\]]*(S+)?/.exec(fmt);
+    if (!match) {
+      stop('Invalid DMS format string:', fmt);
+    }
+    var gotSeconds = !!match[3];
+    var decimals = getDecimals(fmt);
+    var integers = gotSeconds ? match[3].length : match[2].length;
+    var RES = Math.pow(10, decimals);
+    var CONV = gotSeconds ? 3600 * RES : 60 * RES;
+    var r = Math.floor(Math.abs(coord) * CONV + 0.5);
+    var lastPart = formatNumber((r / RES) % 60, integers, decimals);
+    if (gotSeconds) {
+      r = Math.floor(r / (RES * 60));
+      sstr = lastPart;
+      mstr = String(r % 60).padStart(match[2].length, '0');
+    } else {
+      r = Math.floor(r / RES);
+      mstr = lastPart;
+      sstr = '';
+    }
+    dstr = String(Math.floor(r / 60)).padStart(match[1].length, '0');
+    str = str.replace(/\[-\]/, s => coord < 0 ? '-' : '');
+    str = str.replace(/\[[+-]+\]/, s => coord < 0 ? '-' : '+');
+    str = str.replace(/\[[NS, ]+\]/, s => coord < 0 ? 'S' : 'N');
+    str = str.replace(/\[[EW, ]+\]/, s => coord < 0 ? 'W' : 'E');
+    str = str.replace(/D+/, dstr);
+    str = str.replace(/M+(\.M+)?/, mstr);
+    if (gotSeconds) str = str.replace(/S+(\.S+)?/, sstr);
+    return str;
+  }
+
   function cleanExpression(exp) {
     // workaround for problem in GNU Make v4: end-of-line backslashes inside
     // quoted strings are left in the string (other shell environments remove them)
@@ -13126,7 +13225,9 @@
       round: roundToDigits2,
       int_median: interpolated_median,
       sprintf: utils.format,
-      blend: blend
+      blend: blend,
+      format_dms: formatDMS,
+      parse_dms: parseDMS
     });
   }
 
@@ -22791,7 +22892,6 @@ ${svg}
 
     this.getHelpMessage = function(cmdName) {
       var helpCommands, singleCommand, lines;
-
       if (cmdName) {
         singleCommand = findCommandDefn(cmdName, getCommands());
         if (!singleCommand) {
@@ -22910,10 +23010,6 @@ ${svg}
       }
     };
 
-    this.printHelp = function(command) {
-      print(this.getHelpMessage(command));
-    };
-
     function getCommands() {
       return _commands.map(function(cmd) {
         return cmd.done();
@@ -23633,7 +23729,7 @@ ${svg}
         type: 'flag'
       })
       .option('other', {
-        describe: 'default color for categorical scheme (defaults to no-data color)'
+        describe: 'default color for categorical scheme (default is nodata color)'
       })
       .option('nodata', {
         describe: 'color to use for invalid or missing data (default is white)'
@@ -24561,7 +24657,7 @@ ${svg}
     parser.command('symbols')
       .describe('symbolize points as arrows, circles, stars, polygons, etc.')
       .option('type', {
-        describe: 'symbol type (e.g. arrow, circle, square, star, polygon, ring)'
+        describe: 'types: arrow, circle, square, star, polygon, ring'
       })
       .option('stroke', {})
       .option('stroke-width', {})
@@ -24574,6 +24670,9 @@ ${svg}
       .option('stroke-width', {
         describe: 'symbol line width (linear symbols only)'
       })
+      .option('opacity', {
+        describe: 'symbol opacity'
+      })
       .option('geographic', {
         old_alias: 'polygons',
          describe: 'make geographic shapes instead of SVG objects',
@@ -24674,7 +24773,6 @@ ${svg}
       .option('no-replace', noReplaceOpt);
       // .option('name', nameOpt);
 
-
     parser.command('target')
       .describe('set active layer (or layers)')
       .option('target', {
@@ -24684,6 +24782,14 @@ ${svg}
       .option('type', {
         describe: 'type of layer to target (polygon|polyline|point)'
       })
+      // .option('combine', {
+      //   type: 'flag',
+      //   describe: 'place all targeted layers in one dataset together with any  associated layers'
+      // })
+      // .option('isolate', {
+      //   type: 'flag',
+      //   describe: 'place all targeted layers in one dataset exclusive of associated layers'
+      // })
       .option('name', {
         describe: 'rename the target layer'
       });
@@ -38516,6 +38622,11 @@ ${svg}
     };
   }
 
+  cmd.printHelp = function(opts) {
+    var str = getOptionParser().getHelpMessage(opts.command);
+    print(str);
+  };
+
   function resetControlFlow(job) {
     job.control = null;
   }
@@ -39155,25 +39266,6 @@ ${svg}
     };
   }
 
-  // Parse a formatted value in DMS DM or D to a numeric value. Returns NaN if unparsable.
-  // Delimiters: degrees: D|d|°; minutes: '; seconds: "
-  function parseDMS(str) {
-    var rxp = /^([nsew+-]?)([0-9.]+)[d°]? ?([0-9.]*)['′]? ?([0-9.]*)["″]? ?([nsew]?)$/i;
-    var match = rxp.exec(str.trim());
-    var d = NaN;
-    var deg, min, sec;
-    if (match) {
-      deg = match[2] || '0';
-      min = match[3] || '0';
-      sec = match[4] || '0';
-      d = (+deg) + (+min) / 60 + (+sec) / 3600;
-      if (/[sw-]/i.test(match[1]) || /[sw]/i.test(match[5])) {
-        d = -d;
-      }
-    }
-    return d;
-  }
-
   function findNearestVertices(p, shp, arcs) {
     var p2 = findNearestVertex(p[0], p[1], shp, arcs);
     return findVertexIds(p2.x, p2.y, arcs);
@@ -42281,6 +42373,18 @@ ${svg}
     return d.stroke || d.fill || 'magenta';
   }
 
+  function applySymbolStyles(sym, d) {
+    if (sym.type == 'polyline') {
+      sym.stroke = getSymbolStrokeColor(d);
+    } else {
+      sym.fill = getSymbolFillColor(d);
+    }
+    if (d.opacity) {
+      sym.opacity = d.opacity;
+    }
+    return sym;
+  }
+
   function getSymbolRadius(d) {
     if (d.radius === 0 || d.length === 0 || d.r === 0) return 0;
     return d.radius || d.length || d.r || 5; // use a default value
@@ -42518,11 +42622,8 @@ ${svg}
     var radius = getSymbolRadius(d);
     // TODO: remove duplication with svg-symbols.js
     if (+opts.scale) radius *= +opts.scale;
-    return {
-      type: 'circle',
-      fill: getSymbolFillColor(d),
-      r: radius
-    };
+    var sym = { type: 'circle', r: radius };
+    return applySymbolStyles(sym, d);
   }
 
   function getPolygonCoords(d) {
@@ -42614,11 +42715,13 @@ ${svg}
     var radii = parseRings(d.radii || '2').map(function(r) { return r * scale; });
     var solidCenter = utils.isOdd(radii.length);
     var color = getSymbolFillColor(d);
+    var opacity = opts.opacity || undefined;
     var parts = [];
     if (solidCenter) {
       parts.push({
         type: 'circle',
         fill: color,
+        opacity: opacity,
         r: radii.shift()
       });
     }
@@ -42627,6 +42730,7 @@ ${svg}
         type: 'circle',
         fill: 'none', // TODO remove default black fill so this is not needed
         stroke: color,
+        opacity: opacity,
         'stroke-width':  roundToTenths(radii[i+1] - radii[i]),
         r: roundToTenths(radii[i+1] * 0.5 + radii[i] * 0.5)
       });
@@ -42674,19 +42778,18 @@ ${svg}
     if (geojsonType == 'MultiPolygon' || geojsonType == 'Polygon') {
       sym = {
         type: 'polygon',
-        fill: getSymbolFillColor(properties),
         coordinates: geojsonType == 'Polygon' ? coords : flattenMultiPolygonCoords(coords)
       };
     } else if (geojsonType == 'LineString' || geojsonType == 'MultiLineString') {
       sym = {
         type: 'polyline',
-        stroke: getSymbolStrokeColor(properties),
         'stroke-width': properties['stroke-width'] || 2,
         coordinates: geojsonType == 'LineString' ? [coords] : coords
       };
     } else {
       error('Unsupported type:', geojsonType);
     }
+    applySymbolStyles(sym, properties);
     roundCoordsForSVG(sym.coordinates);
     return sym;
   }
@@ -42746,6 +42849,7 @@ ${svg}
         scaleAndShiftCoords(coords, metersPerPx, shp[0]);
         if (d.fill) rec.fill = d.fill;
         if (d.stroke) rec.stroke = d.stroke;
+        if (d.opacity) rec.opacity = d.opacity;
         return createGeometry(coords, geojsonType);
       } else {
         rec['svg-symbol'] = makePathSymbol(coords, d, geojsonType);
@@ -42811,9 +42915,41 @@ ${svg}
       // TODO: improve this
       targets[0].layers[0].name = opts.name;
     }
+    if (opts.combine) {
+      targets = combineTargets(targets, catalog);
+    } else if (opts.isolate) {
+      targets = isolateTargets(targets, catalog);
+    }
     catalog.setDefaultTargets(targets);
   };
 
+  function combineTargets(targets, catalog) {
+    var datasets = [];
+    var layers = [];
+    targets.forEach(function(o) {
+      datasets.push(o.dataset);
+      catalog.removeDataset(o.dataset);
+      layers = layers.concat(o.layers);
+    });
+    var combined = mergeDatasets(datasets);
+    catalog.addDataset(combined);
+    return [{
+      dataset: combined,
+      layers: layers
+    }];
+  }
+
+  function isolateTargets(targets, catalog) {
+    var datasets = [];
+    targets.forEach(function(o) {
+      datasets.push(o.dataset);
+      o.layers.forEach(function(lyr) {
+        catalog.removeLayer(lyr, o.dataset);
+
+      });
+    });
+  }
+
   cmd.union = function(targetLayers, targetDataset, opts) {
     if (targetLayers.length < 2) {
       stop('Command requires at least two target layers');
@@ -43198,7 +43334,7 @@ ${svg}
   function commandAcceptsMultipleTargetDatasets(name) {
     return name == 'rotate' || name == 'info' || name == 'proj' ||
       name == 'drop' || name == 'target' || name == 'if' || name == 'elif' ||
-      name == 'else' || name == 'endif' || name == 'run';
+      name == 'else' || name == 'endif' || name == 'run' || name == 'i';
   }
 
   function commandAcceptsEmptyTarget(name) {
@@ -43387,8 +43523,8 @@ ${svg}
         job.catalog.addDataset(cmd.graticule(targetDataset, opts));
 
       } else if (name == 'help') {
-        // placing this here to handle errors from invalid command names
-        getOptionParser().printHelp(command.options.command);
+        // placing help command here to handle errors from invalid command names
+        cmd.printHelp(command.options);
 
       } else if (name == 'i') {
         if (opts.replace) job.catalog = new Catalog(); // is this what we want?
@@ -43470,7 +43606,7 @@ ${svg}
         cmd.print(command._.join(' '));
 
       } else if (name == 'proj') {
-        await utils.promisify(initProjLibrary)(opts);
+        await initProjLibrary(opts);
         job.resumeCommand();
         targets.forEach(function(targ) {
           cmd.proj(targ.dataset, job.catalog, opts);
@@ -44305,6 +44441,7 @@ ${svg}
     Heap,
     NodeCollection,
     parseDMS,
+    formatDMS,
     PathIndex,
     PolygonIndex,
     ShpReader,