mapshaper 0.6.38 → 0.6.40

package/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.6.38";
+  var VERSION = "0.6.40";
 
 
   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,110 @@
     });
   }
 
+  // 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>$&)');
+    // TODO: validate that if there are degree decimals, there are no M or S codes
+    rxp = rxp.replace(/D+(\.D+)?/, (m, g1) => {
+      var s = '[0-9]+';
+      if (g1) s += `\\.[0-9]+`;
+      return `(?<d>${s})`;
+    });
+    // TODO: validate that if there are minutes decimals, there are no S codes
+    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 + '$';
+    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 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);
+    var gotSeconds = match && !!match[3];
+    var gotMinutes = match && !!match[2];
+    if (!match || gotSeconds && !gotMinutes) {
+      stop('Invalid DMS format string:', fmt);
+    }
+    var integers = gotSeconds && match[3].length || gotMinutes && match[2].length || match[1].length;
+    var decimalRxp = gotSeconds && /S\.(S+)/ || gotMinutes && /M\.(M+)/ || /D\.(D+)/;
+    var decimals = decimalRxp.test(fmt) ? decimalRxp.exec(fmt)[1].length : 0;
+    if (gotMinutes) {
+      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;
+      }
+      dstr = String(Math.floor(r / 60)).padStart(match[1].length, '0');
+    } else {
+      dstr = Math.abs(coord).toFixed(decimals);
+    }
+    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+(\.D+)?/, dstr);
+    if (gotMinutes) 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 +13230,9 @@
       round: roundToDigits2,
       int_median: interpolated_median,
       sprintf: utils.format,
-      blend: blend
+      blend: blend,
+      format_dms: formatDMS,
+      parse_dms: parseDMS
     });
   }
 
@@ -17598,12 +17704,18 @@
   }
 
   function calcFrameData(dataset, opts) {
-    var bounds = getDatasetBounds(dataset);
-    var bounds2 = calcOutputSizeInPixels(bounds, opts);
+    var bounds;
+    if (opts.svg_bbox) {
+      bounds = new Bounds(opts.svg_bbox);
+      opts = Object.assign({margin: 0}, opts); // prevent default pixel margin around content
+    } else {
+      bounds = getDatasetBounds(dataset);
+    }
+    var pixBounds = calcOutputSizeInPixels(bounds, opts);
     return {
       bbox: bounds.toArray(),
-      width: Math.round(bounds2.width()),
-      height: Math.round(bounds2.height()) || 1,
+      width: Math.round(pixBounds.width()),
+      height: Math.round(pixBounds.height()) || 1,
       type: 'frame'
     };
   }
@@ -22791,7 +22903,6 @@ ${svg}
 
     this.getHelpMessage = function(cmdName) {
       var helpCommands, singleCommand, lines;
-
       if (cmdName) {
         singleCommand = findCommandDefn(cmdName, getCommands());
         if (!singleCommand) {
@@ -22910,10 +23021,6 @@ ${svg}
       }
     };
 
-    this.printHelp = function(command) {
-      print(this.getHelpMessage(command));
-    };
-
     function getCommands() {
       return _commands.map(function(cmd) {
         return cmd.done();
@@ -23343,6 +23450,10 @@ ${svg}
         describe: '[SVG] source units per pixel (alternative to width= option)',
         type: 'number'
       })
+      .option('svg-bbox', {
+        describe: '[SVG] bounding box of SVG map in projected map units',
+        type: 'bbox'
+      })
       .option('point-symbol', {
         describe: '[SVG] circle or square (default is circle)'
       })
@@ -23633,7 +23744,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 +24672,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', {})
@@ -24575,8 +24686,7 @@ ${svg}
         describe: 'symbol line width (linear symbols only)'
       })
       .option('opacity', {
-        describe: 'symbol opacity',
-        type: 'number'
+        describe: 'symbol opacity'
       })
       .option('geographic', {
         old_alias: 'polygons',
@@ -24678,7 +24788,6 @@ ${svg}
       .option('no-replace', noReplaceOpt);
       // .option('name', nameOpt);
 
-
     parser.command('target')
       .describe('set active layer (or layers)')
       .option('target', {
@@ -24688,6 +24797,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'
       });
@@ -38520,6 +38637,11 @@ ${svg}
     };
   }
 
+  cmd.printHelp = function(opts) {
+    var str = getOptionParser().getHelpMessage(opts.command);
+    print(str);
+  };
+
   function resetControlFlow(job) {
     job.control = null;
   }
@@ -39159,25 +39281,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);
@@ -42827,9 +42930,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');
@@ -43214,7 +43349,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) {
@@ -43403,8 +43538,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?
@@ -43486,7 +43621,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);
@@ -44321,6 +44456,7 @@ ${svg}
     Heap,
     NodeCollection,
     parseDMS,
+    formatDMS,
     PathIndex,
     PolygonIndex,
     ShpReader,

package/package.json

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

package/www/index.html

@@ -149,19 +149,27 @@
 		</div>
 		<div class="export-zip-option option-menu">
 
+		<div style="height:10px"></div>
+
 		</div>
 		<h4>File format</h4>
 		<div class="export-formats option-menu">
 		</div>
 
-		<div class="option-menu"><input type="text" class="advanced-options" placeholder="command line options" />
+		<div style="height:10px"></div>
+
+		<div class="option-menu"><input type="text" class="text-input 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="option-menu">
+	<input id="ofile-name" class="text-input" type="text" placeholder="output file name" />
+	</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>
@@ -288,7 +296,7 @@ apply to TopoJSON files.</div></div></div></div> -->
 
 		</div>
 
-		<div><input type="text" class="advanced-options" placeholder="import options" />
+		<div><input type="text" class="text-input 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

package/www/mapshaper-gui.js

@@ -1265,7 +1265,6 @@
       .onCancel(done);
   }
 
-
   async function saveBlobToSelectedFile(filename, blob, done) {
     // see: https://developer.chrome.com/articles/file-system-access/
     // note: saving multiple files to a directory using showDirectoryPicker()
@@ -1427,7 +1426,6 @@
       // }
 
       snapshots.forEach(function(item, i) {
-        var id = i + 1;
         var line = El('div').appendTo(menu).addClass('save-menu-item');
         El('span').appendTo(line).html(`<span class="save-item-label">#${item.number}</span> `);
         // show snapshot size
@@ -1440,7 +1438,10 @@
           var obj = await idb.get(item.id);
           await internal.applyCompression(obj, {consume: true});
           var buf = internal.pack(obj);
-          saveBlobToLocalFile('mapshaper_snapshot.msx', new Blob([buf]));
+          // choose output filename and directory every time
+          // saveBlobToLocalFile('mapshaper_snapshot.msx', new Blob([buf]));
+          var fileName = `snapshot-${String(item.number).padStart(2, '0')}.msx`;
+          saveBlobToSelectedFile(fileName, new Blob([buf]), function() {});
         }).text('export');
         El('span').addClass('save-menu-btn').appendTo(line).on('click', async function(e) {
           await removeSnapshotById(item.id);
@@ -2479,42 +2480,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 +3348,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 +3384,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);
       });
     }
 
@@ -3670,6 +3645,7 @@
     var layersArr = [];
     var toggleBtn = null; // checkbox <input> for toggling layer selection
     var exportBtn = gui.container.findChild('.export-btn');
+    var ofileName = gui.container.findChild('#ofile-name');
     new SimpleButton(menu.findChild('.close2-btn')).on('click', gui.clearMode);
 
     if (!GUI.exportIsSupported()) {
@@ -3755,7 +3731,7 @@
     // done: function(string|Error|null)
     async function exportMenuSelection(layers) {
       var opts = getExportOpts();
-        // note: command line "target" option gets ignored
+      // note: command line "target" option gets ignored
       var files = await internal.exportTargetLayers(layers, opts);
       gui.session.layersExported(getTargetLayerIds(), getExportOptsAsString());
       await utils$1.promisify(internal.writeFiles)(files, opts);
@@ -5068,7 +5044,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 +7953,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 +10289,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.38";
+  var VERSION = "0.6.40";
 
 
   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,110 @@
     });
   }
 
+  // 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>$&)');
+    // TODO: validate that if there are degree decimals, there are no M or S codes
+    rxp = rxp.replace(/D+(\.D+)?/, (m, g1) => {
+      var s = '[0-9]+';
+      if (g1) s += `\\.[0-9]+`;
+      return `(?<d>${s})`;
+    });
+    // TODO: validate that if there are minutes decimals, there are no S codes
+    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 + '$';
+    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 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);
+    var gotSeconds = match && !!match[3];
+    var gotMinutes = match && !!match[2];
+    if (!match || gotSeconds && !gotMinutes) {
+      stop('Invalid DMS format string:', fmt);
+    }
+    var integers = gotSeconds && match[3].length || gotMinutes && match[2].length || match[1].length;
+    var decimalRxp = gotSeconds && /S\.(S+)/ || gotMinutes && /M\.(M+)/ || /D\.(D+)/;
+    var decimals = decimalRxp.test(fmt) ? decimalRxp.exec(fmt)[1].length : 0;
+    if (gotMinutes) {
+      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;
+      }
+      dstr = String(Math.floor(r / 60)).padStart(match[1].length, '0');
+    } else {
+      dstr = Math.abs(coord).toFixed(decimals);
+    }
+    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+(\.D+)?/, dstr);
+    if (gotMinutes) 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 +13230,9 @@
       round: roundToDigits2,
       int_median: interpolated_median,
       sprintf: utils.format,
-      blend: blend
+      blend: blend,
+      format_dms: formatDMS,
+      parse_dms: parseDMS
     });
   }
 
@@ -17598,12 +17704,18 @@
   }
 
   function calcFrameData(dataset, opts) {
-    var bounds = getDatasetBounds(dataset);
-    var bounds2 = calcOutputSizeInPixels(bounds, opts);
+    var bounds;
+    if (opts.svg_bbox) {
+      bounds = new Bounds(opts.svg_bbox);
+      opts = Object.assign({margin: 0}, opts); // prevent default pixel margin around content
+    } else {
+      bounds = getDatasetBounds(dataset);
+    }
+    var pixBounds = calcOutputSizeInPixels(bounds, opts);
     return {
       bbox: bounds.toArray(),
-      width: Math.round(bounds2.width()),
-      height: Math.round(bounds2.height()) || 1,
+      width: Math.round(pixBounds.width()),
+      height: Math.round(pixBounds.height()) || 1,
       type: 'frame'
     };
   }
@@ -22791,7 +22903,6 @@ ${svg}
 
     this.getHelpMessage = function(cmdName) {
       var helpCommands, singleCommand, lines;
-
       if (cmdName) {
         singleCommand = findCommandDefn(cmdName, getCommands());
         if (!singleCommand) {
@@ -22910,10 +23021,6 @@ ${svg}
       }
     };
 
-    this.printHelp = function(command) {
-      print(this.getHelpMessage(command));
-    };
-
     function getCommands() {
       return _commands.map(function(cmd) {
         return cmd.done();
@@ -23343,6 +23450,10 @@ ${svg}
         describe: '[SVG] source units per pixel (alternative to width= option)',
         type: 'number'
       })
+      .option('svg-bbox', {
+        describe: '[SVG] bounding box of SVG map in projected map units',
+        type: 'bbox'
+      })
       .option('point-symbol', {
         describe: '[SVG] circle or square (default is circle)'
       })
@@ -23633,7 +23744,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 +24672,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', {})
@@ -24575,8 +24686,7 @@ ${svg}
         describe: 'symbol line width (linear symbols only)'
       })
       .option('opacity', {
-        describe: 'symbol opacity',
-        type: 'number'
+        describe: 'symbol opacity'
       })
       .option('geographic', {
         old_alias: 'polygons',
@@ -24678,7 +24788,6 @@ ${svg}
       .option('no-replace', noReplaceOpt);
       // .option('name', nameOpt);
 
-
     parser.command('target')
       .describe('set active layer (or layers)')
       .option('target', {
@@ -24688,6 +24797,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'
       });
@@ -38520,6 +38637,11 @@ ${svg}
     };
   }
 
+  cmd.printHelp = function(opts) {
+    var str = getOptionParser().getHelpMessage(opts.command);
+    print(str);
+  };
+
   function resetControlFlow(job) {
     job.control = null;
   }
@@ -39159,25 +39281,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);
@@ -42827,9 +42930,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');
@@ -43214,7 +43349,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) {
@@ -43403,8 +43538,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?
@@ -43486,7 +43621,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);
@@ -44321,6 +44456,7 @@ ${svg}
     Heap,
     NodeCollection,
     parseDMS,
+    formatDMS,
     PathIndex,
     PolygonIndex,
     ShpReader,

package/www/page.css

@@ -242,10 +242,6 @@ body {
 	white-space: nowrap;
 }
 
-.export-options .option-menu .advanced-options {
-	width: 195px;
-}
-
 /* --- Main area ------------- */
 
 .main-area {
@@ -450,14 +446,14 @@ body.dragover #import-options-drop-area .drop-area {
 
 /* --- Import screen -------------- */
 
-
-.option-menu .advanced-options {
-	width: 250px;
+.option-menu .text-input {
+	width: 230px;
 	background: rgba(255, 255, 255, 0.4);
 	border: 1px solid #999;
 	padding: 0 3px;
 	height: 18px;
 	font-size: 13px;
+	margin: 0 0 5px 0;
 }
 
 #mshp-not-supported {
@@ -548,10 +544,6 @@ body.dragover #import-options-drop-area .drop-area {
 	font-size: 90%;
 }
 
-.option-menu {
-	padding: 0 0 9px 0;
-}
-
 /*.option-menu input[type="radio"],
 .option-menu input[type="checkbox"]  */
 .info-box input[type="radio"],