mapshaper 0.6.39 → 0.6.40

package/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.6.39";
+  var VERSION = "0.6.40";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -13142,17 +13142,23 @@
     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]+`;
+      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]+`;
+      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
@@ -13173,43 +13179,42 @@
     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) {
+    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 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');
+    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 {
-      r = Math.floor(r / RES);
-      mstr = lastPart;
-      sstr = '';
+      dstr = Math.abs(coord).toFixed(decimals);
     }
-    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);
+    str = str.replace(/D+(\.D+)?/, dstr);
+    if (gotMinutes) str = str.replace(/M+(\.M+)?/, mstr);
     if (gotSeconds) str = str.replace(/S+(\.S+)?/, sstr);
     return str;
   }
@@ -17699,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'
     };
   }
@@ -23439,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)'
       })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mapshaper",
-  "version": "0.6.39",
+  "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);
@@ -3644,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()) {
@@ -3729,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);

package/www/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.6.39";
+  var VERSION = "0.6.40";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -13142,17 +13142,23 @@
     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]+`;
+      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]+`;
+      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
@@ -13173,43 +13179,42 @@
     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) {
+    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 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');
+    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 {
-      r = Math.floor(r / RES);
-      mstr = lastPart;
-      sstr = '';
+      dstr = Math.abs(coord).toFixed(decimals);
     }
-    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);
+    str = str.replace(/D+(\.D+)?/, dstr);
+    if (gotMinutes) str = str.replace(/M+(\.M+)?/, mstr);
     if (gotSeconds) str = str.replace(/S+(\.S+)?/, sstr);
     return str;
   }
@@ -17699,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'
     };
   }
@@ -23439,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)'
       })

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"],