mapshaper 0.7.2 → 0.7.4

package/www/mapshaper.js

@@ -12416,8 +12416,8 @@
     return obj;
   };
 
-  async function writeFiles(exports, opts) {
-    return _writeFiles(exports, opts);
+  async function writeFiles(exports$1, opts) {
+    return _writeFiles(exports$1, opts);
   }
 
   // Used by GUI to replace the CLI version of writeFiles()
@@ -12426,24 +12426,24 @@
     _writeFiles = func;
   }
 
-  var _writeFiles = function(exports, opts) {
-    if (exports.length > 0 === false) {
+  var _writeFiles = function(exports$1, opts) {
+    if (exports$1.length > 0 === false) {
       message("No files to save");
     } else if (opts.dry_run) ; else if (opts.stdout) {
       // Using async writeFile() function -- synchronous output to stdout can
       // trigger EAGAIN error, e.g. when piped to less.
-      require$1('rw').writeFile('/dev/stdout', exports[0].content, function() {});
+      require$1('rw').writeFile('/dev/stdout', exports$1[0].content, function() {});
     } else {
       if (opts.zip) {
-        exports = [{
+        exports$1 = [{
           // TODO: add output subdirectory, if relevant
           filename: opts.zipfile || 'output.zip',
-          content: zipSync(exports)
+          content: zipSync(exports$1)
         }];
       }
-      var paths = getOutputPaths(utils.pluck(exports, 'filename'), opts);
+      var paths = getOutputPaths(utils.pluck(exports$1, 'filename'), opts);
       var inputFiles = getStashedVar('input_files');
-      exports.forEach(function(obj, i) {
+      exports$1.forEach(function(obj, i) {
         var path = paths[i];
         if (obj.content instanceof ArrayBuffer) {
           // replacing content so ArrayBuffers can be gc'd
@@ -14993,10 +14993,10 @@
     return d;
   }
 
-  var cache$1 = {};
+  var cache = {};
 
   function getParseRxp(fmt) {
-    if (fmt in cache$1) return cache$1[fmt];
+    if (fmt in cache) return cache[fmt];
     var rxp = fmt;
     rxp = rxp.replace('[-]', '(?<prefix>-)?'); // optional -
     rxp = rxp.replace(/\[[NSEW, +-]{2,}\]/, '(?<prefix>$&)');
@@ -15020,11 +15020,11 @@
     rxp = '^' + rxp + '$';
     try {
       // TODO: make sure all DMS codes have been matched
-      cache$1[fmt] = new RegExp(rxp);
+      cache[fmt] = new RegExp(rxp);
     } catch(e) {
       stop$1('Invalid DMS format string:', fmt);
     }
-    return cache$1[fmt];
+    return cache[fmt];
   }
 
   function formatNumber(val, integers, decimals) {
@@ -21150,15 +21150,6 @@
     getSphereEffectParams: getSphereEffectParams
   });
 
-  var cache = {};
-  function fetchFileSync(url) {
-    if (url in cache) return cache[url];
-    var res  = require$1('sync-request')('GET', url, {timeout: 2000});
-    var content = res.getBody().toString();
-    cache[url] = content;
-    return content;
-  }
-
   // convert object properties to definitions for images and hatch fills
   function convertPropertiesToDefinitions(obj, defs) {
     procNode(obj);
@@ -21183,6 +21174,13 @@
   function convertSvgImage(obj, defs) {
     // Same-origin policy prevents embedding images in the web UI
     var href = obj.properties.href;
+    // Remote URLs were previously fetched at export time so the SVG could be
+    // embedded inline. That capability has been removed (it required a
+    // synchronous-HTTP dependency built on a child-process hack); download
+    // the asset first and reference it by local path instead.
+    if (href.indexOf('http') === 0) {
+      stop$1('Remote SVG asset references are not supported. Download the file first and reference it by a local path:', href);
+    }
     // look for a previously added definition to use
     // (assumes that images that share the same href can also use the same defn)
     var item = utils.find(defs, function(item) {return item.href == href;});
@@ -21200,12 +21198,12 @@
     }
   }
 
-  // Returns the content of an SVG file from a local path or URL
-  // Returns '' if unable to get the content (e.g. due to cross-domain security rules)
+  // Returns the content of an SVG file from a local path.
+  // Returns '' if unable to get the content; the caller leaves the original
+  // <image> tag in the output so the SVG renderer can attempt to load it.
   function serializeSvgImage(href, id) {
     var svg = '';
     try {
-      // try to download the SVG content and use that
       svg = convertSvgToDefn(getSvgContent(href), id) + '\n';
       svg = '<!-- ' + href + '-->\n' + svg; // add href as a comment, to aid in debugging
     } catch(e) {
@@ -21216,20 +21214,12 @@
     return svg;
   }
 
-  // href: A URL or a local path
-  // TODO: download SVG files asynchronously
-  // (currently, files are downloaded synchronously, which is obviously undesirable)
-  //
+  // href: A local path
   function getSvgContent(href) {
-    var content;
-    if (href.indexOf('http') === 0) {
-      content = fetchFileSync(href);
-    } else if (require$1('fs').existsSync(href)) {
-      content = require$1('fs').readFileSync(href, 'utf8');
-    } else {
-      stop$1("Invalid SVG location:", href);
+    if (require$1('fs').existsSync(href)) {
+      return require$1('fs').readFileSync(href, 'utf8');
     }
-    return content;
+    stop$1("Invalid SVG location:", href);
   }
 
   function convertSvgToDefn(svg, id) {
@@ -21372,12 +21362,27 @@ ${svg}
     var geojson = exportDatasetAsGeoJSON(d, opts);
     var features = geojson.features || geojson.geometries || (geojson.type ? [geojson] : []);
     var children = importGeoJSONFeatures(features, opts);
+    // Drop empty placeholder <g/> elements (features whose geometry was null in the
+    // source data, collapsed during simplification, or otherwise produced no
+    // visible output). Keep the layer's records in lockstep so that data-*
+    // attributes added via -o svg-data= remain correctly aligned.
+    var records = lyr.data ? lyr.data.getRecords() : null;
+    var keptRecords = records ? [] : null;
+    children = children.filter(function(child, i) {
+      if (isEmptyPlaceholder(child)) return false;
+      if (keptRecords) keptRecords.push(records[i]);
+      return true;
+    });
     if (opts.svg_data && lyr.data) {
-      addDataAttributesToSVG(children, lyr.data, opts.svg_data);
+      addDataAttributesToSVG(children, keptRecords, lyr.data.getFields(), opts.svg_data);
     }
     return children;
   }
 
+  function isEmptyPlaceholder(o) {
+    return o.tag == 'g' && (!o.children || o.children.length === 0);
+  }
+
   function validateSvgDataFields(layers, fieldsArg) {
     var missingFields = fieldsArg.reduce(function(memo, field) {
       if (!fieldExists(layers, field)) {
@@ -21397,15 +21402,13 @@ ${svg}
     }
   }
 
-  function addDataAttributesToSVG(children, table, fieldsArg) {
-    var allFields = table.getFields();
+  function addDataAttributesToSVG(children, records, allFields, fieldsArg) {
     var dataFields = fieldsArg.indexOf('*') > -1 ? allFields.concat() : fieldsArg;
     var missingFields = utils.difference(dataFields, allFields);
     if (missingFields.length > 0) {
       dataFields = utils.difference(dataFields, missingFields);
       // stop("Missing data field(s):", missingFields.join(', '));
     }
-    var records = table.getRecords();
     var data = exportDataAttributesForSVG(records, dataFields);
     if (children.length != data.length) {
       error("Mismatch between number of SVG symbols and data attributes");
@@ -52127,7 +52130,7 @@ ${svg}
     });
   }
 
-  var version = "0.7.2";
+  var version = "0.7.4";
 
   // Parse command line args into commands and run them
   // Function takes an optional Node-style callback. A Promise is returned if no callback is given.

package/www/modules.js

@@ -13503,7 +13503,7 @@
 	function requireEncodings () {
 		if (hasRequiredEncodings) return encodings;
 		hasRequiredEncodings = 1;
-		(function (exports) {
+		(function (exports$1) {
 			"use strict";
 
 			// Update this array if you add/rename/remove files in this directory.
@@ -13525,7 +13525,7 @@
 			    var module = modules[i];
 			    for (var enc in module)
 			        if (Object.prototype.hasOwnProperty.call(module, enc))
-			            exports[enc] = module[enc];
+			            exports$1[enc] = module[enc];
 			} 
 		} (encodings));
 		return encodings;
@@ -18975,7 +18975,7 @@
 		tcxGen: tcxGen
 	});
 
-	var __filename = '/Users/matthewbloch/mb4/mapshaper/node_modules/mproj/dist';
+	var __filename$1 = '/Users/matthewbloch/mb4/mapshaper/node_modules/mproj/dist';
 
 	var mproj$2 = {exports: {}};
 
@@ -19247,7 +19247,7 @@
 	function requireMproj () {
 		if (hasRequiredMproj) return mproj$2.exports;
 		hasRequiredMproj = 1;
-		(function (module, exports) {
+		(function (module, exports$1) {
 			(function(){
 
 			// add math.h functions to library scope
@@ -19967,7 +19967,7 @@
 			  var fs = require$$0,
 			      path = require$$1,
 			      // path to library assumes mproj script is in the dist/ directory
-			      dir = path.join(path.dirname(__filename), '../nad'),
+			      dir = path.join(path.dirname(__filename$1), '../nad'),
 			      pathUC = path.join(dir, libFile.toUpperCase()),
 			      pathLC = path.join(dir, libFile.toLowerCase()),
 			      contents;

package/www/page.css

@@ -165,6 +165,13 @@ body.map-view {
 
 }
 
+/* When the page is preloaded with data (CLI files, ?files= or ?catalog= URL
+   params), suppress the splash header links so they don't flash into view
+   for ~a second before the editor mounts and hides them. */
+.mapshaper-preload #splash-buttons {
+	display: none;
+}
+
 .page-header-buttons {
 	z-index: 20;
 	position: absolute;
@@ -1197,6 +1204,156 @@ img.close-btn:hover,
 	pointer-events: initial;
 }
 
+/* --- Messages inbox --------------- */
+
+.messages-btn.btn {
+	/* SVG-only button; align like the hamburger so its baseline doesn't drag
+	   the row's text-bearing buttons down. */
+	padding: 8px 8px 4px 8px;
+	user-select: none;
+	vertical-align: top;
+	cursor: pointer;
+	position: relative;
+}
+
+.messages-btn.btn.hidden {
+	display: none;
+}
+
+.messages-btn svg {
+	display: block;
+	fill: currentColor;
+}
+
+.messages-badge {
+	position: absolute;
+	top: 2px;
+	right: -1px;
+	min-width: 14px;
+	height: 14px;
+	padding: 0 3px;
+	border-radius: 7px;
+	background-color: #d63333;
+	color: #fff;
+	font-size: 10px;
+	line-height: 14px;
+	font-weight: 600;
+	text-align: center;
+	box-sizing: border-box;
+	pointer-events: none;
+}
+
+.messages-badge.warn {
+	background-color: #d68f33;
+}
+
+/* Quick pulse to draw attention when a new message arrives. The animation
+   is added by JS for ~2s and then removed, so it doesn't cycle forever. */
+.messages-btn.pulse .messages-badge {
+	animation: messages-pulse 0.9s ease-out 2;
+}
+
+@keyframes messages-pulse {
+	0%   { transform: scale(1);   box-shadow: 0 0 0 0 rgba(214, 51, 51, 0.55); }
+	60%  { transform: scale(1.15); box-shadow: 0 0 0 6px rgba(214, 51, 51, 0); }
+	100% { transform: scale(1);   box-shadow: 0 0 0 0 rgba(214, 51, 51, 0); }
+}
+
+.messages-panel {
+	pointer-events: none;
+}
+
+.messages-panel .info-box {
+	pointer-events: initial;
+	width: 360px;
+	max-width: 90vw;
+}
+
+.messages-empty {
+	color: #888;
+	font-size: 13px;
+	font-style: italic;
+	padding: 4px 0 8px 0;
+}
+
+.messages-list {
+	max-height: 50vh;
+	overflow: hidden;
+	overflow-y: auto;
+	margin: 0 -4px 6px -4px;
+}
+
+.message-item {
+	position: relative;
+	border-left: 3px solid #888;
+	background-color: #f4f7fa;
+	padding: 6px 22px 6px 9px;
+	margin: 4px 4px;
+	border-radius: 3px;
+	font-size: 13px;
+	line-height: 1.35;
+}
+
+.message-item.severity-warn {
+	border-left-color: #d68f33;
+	background-color: #fbf3e6;
+}
+
+.message-item.severity-error {
+	border-left-color: #d63333;
+	background-color: #fbecec;
+}
+
+.message-item .message-title {
+	font-weight: 600;
+	display: block;
+	margin-bottom: 1px;
+}
+
+.message-item .message-body {
+	white-space: pre-wrap;
+	word-wrap: break-word;
+}
+
+.message-item .message-time {
+	color: #888;
+	font-size: 11px;
+	margin-top: 2px;
+	display: block;
+}
+
+.message-item .message-dismiss {
+	position: absolute;
+	top: 3px;
+	right: 5px;
+	width: 16px;
+	height: 16px;
+	line-height: 14px;
+	text-align: center;
+	color: #888;
+	cursor: pointer;
+	font-size: 14px;
+	user-select: none;
+	border-radius: 8px;
+}
+
+.message-item .message-dismiss:hover {
+	color: #333;
+	background-color: rgba(0, 0, 0, 0.05);
+}
+
+.messages-footer {
+	text-align: right;
+	padding-top: 4px;
+	border-top: 1px solid #eee;
+}
+
+.messages-footer .messages-clear-btn {
+	font-size: 12px;
+	min-width: 0;
+	padding: 3px 9px;
+}
+
 .basemap-container {
 	z-index: -1;
 	position:  absolute;

package/www/docs/_assets/cmd-search.js

@@ -1,213 +0,0 @@
-// Jump-to-command dropdown for the command reference page.
-//
-// The build script wraps each command in <section class="cmd-section"
-// data-id="-clip" data-name="-clip" data-options="..."> and tags the H2
-// above each group as <h2 class="cmd-category">. We use that to populate a
-// dropdown of matching commands beneath the search input. Selecting an item
-// jumps to the corresponding section -- the page itself is never filtered.
-
-(function () {
-  'use strict';
-
-  var input = document.querySelector('.cmd-search-input');
-  var panel = document.querySelector('.cmd-search-results');
-  if (!input || !panel) return;
-
-  var statusEl = panel.querySelector('.cmd-search-status');
-  var listEl = panel.querySelector('.cmd-search-list');
-  var sections = Array.prototype.slice.call(
-    document.querySelectorAll('.cmd-section')
-  );
-  if (!sections.length) return;
-
-  // Build a flat command index. We walk the article in document order so we
-  // can attach the most recent h2.cmd-category to each section.
-  var article = sections[0].closest('.docs-article') || document;
-  var commands = (function () {
-    var out = [];
-    var currentCat = '';
-    var nodes = article.querySelectorAll('h2.cmd-category, section.cmd-section');
-    for (var i = 0; i < nodes.length; i++) {
-      var n = nodes[i];
-      if (n.tagName === 'H2') {
-        currentCat = (n.textContent || '').trim();
-      } else {
-        var name = n.dataset.name || '';
-        var opts = n.dataset.options || '';
-        var id = n.dataset.id || '';
-        if (!id) continue;
-        out.push({
-          id: id,
-          name: name,
-          options: opts,
-          category: currentCat,
-          haystack: (name + ' ' + opts).toLowerCase(),
-          el: n
-        });
-      }
-    }
-    return out;
-  })();
-
-  var MAX_RESULTS = 60;
-  var activeIdx = -1;
-  var results = [];
-
-  function render() {
-    var raw = input.value.trim();
-    var tokens = raw.toLowerCase().split(/\s+/).filter(Boolean);
-
-    if (!tokens.length) {
-      close();
-      return;
-    }
-
-    // Score-free matching: every token must appear in the name + options
-    // string. We deliberately don't search the full body text -- the dropdown
-    // is for jumping to a known command, not for free-text search.
-    results = commands.filter(function (c) {
-      return tokens.every(function (t) { return c.haystack.indexOf(t) !== -1; });
-    });
-
-    var truncated = results.length > MAX_RESULTS;
-    var shown = truncated ? results.slice(0, MAX_RESULTS) : results;
-
-    listEl.innerHTML = shown.map(function (c, i) {
-      return '<li role="option" id="cmd-result-' + i + '" class="cmd-result">' +
-        '<a href="#' + escapeAttr(c.id) + '" class="cmd-result-link" tabindex="-1">' +
-          '<span class="cmd-result-name">' + escapeHtml(c.name) + '</span>' +
-          (c.category
-            ? '<span class="cmd-result-cat">' + escapeHtml(c.category) + '</span>'
-            : '') +
-        '</a>' +
-      '</li>';
-    }).join('');
-
-    if (!results.length) {
-      statusEl.textContent = 'No commands match \u201c' + raw + '\u201d.';
-    } else if (truncated) {
-      statusEl.textContent = 'Showing first ' + MAX_RESULTS + ' of ' +
-        results.length + ' matches.';
-    } else if (results.length === 1) {
-      statusEl.textContent = '1 match (press Enter to jump).';
-    } else {
-      statusEl.textContent = results.length + ' matches.';
-    }
-
-    open();
-    setActive(results.length ? 0 : -1);
-  }
-
-  function open() {
-    panel.hidden = false;
-    input.setAttribute('aria-expanded', 'true');
-  }
-
-  function close() {
-    panel.hidden = true;
-    input.setAttribute('aria-expanded', 'false');
-    input.removeAttribute('aria-activedescendant');
-    activeIdx = -1;
-    results = [];
-    listEl.innerHTML = '';
-    statusEl.textContent = '';
-  }
-
-  function setActive(idx) {
-    var items = listEl.querySelectorAll('.cmd-result');
-    if (activeIdx >= 0 && items[activeIdx]) {
-      items[activeIdx].classList.remove('is-active');
-    }
-    activeIdx = idx;
-    if (idx < 0 || !items[idx]) {
-      input.removeAttribute('aria-activedescendant');
-      return;
-    }
-    items[idx].classList.add('is-active');
-    input.setAttribute('aria-activedescendant', 'cmd-result-' + idx);
-    // Keep the highlighted item visible inside the (scrollable) dropdown.
-    var el = items[idx];
-    var top = el.offsetTop;
-    var bottom = top + el.offsetHeight;
-    if (top < listEl.scrollTop) {
-      listEl.scrollTop = top;
-    } else if (bottom > listEl.scrollTop + listEl.clientHeight) {
-      listEl.scrollTop = bottom - listEl.clientHeight;
-    }
-  }
-
-  function jumpTo(idx) {
-    if (idx < 0 || idx >= results.length) return;
-    var c = results[idx];
-    // Use the anchor's href so the browser updates location.hash and triggers
-    // its native scroll-to-anchor behaviour (which respects scroll-margin-top).
-    var link = listEl.querySelectorAll('.cmd-result-link')[idx];
-    if (link) link.click();
-    close();
-    input.blur();
-  }
-
-  function escapeHtml(s) {
-    return String(s).replace(/[&<>"']/g, function (c) {
-      return ({ '&': '&amp;', '<': '&lt;', '>': '&gt;',
-                '"': '&quot;', "'": '&#39;' })[c];
-    });
-  }
-  function escapeAttr(s) { return escapeHtml(s); }
-
-  input.addEventListener('input', render);
-  input.addEventListener('focus', function () {
-    if (input.value.trim()) render();
-  });
-
-  input.addEventListener('keydown', function (e) {
-    if (e.key === 'ArrowDown') {
-      if (panel.hidden) { render(); return; }
-      e.preventDefault();
-      if (results.length) setActive((activeIdx + 1) % results.length);
-    } else if (e.key === 'ArrowUp') {
-      if (panel.hidden) return;
-      e.preventDefault();
-      if (results.length) {
-        setActive(activeIdx <= 0 ? results.length - 1 : activeIdx - 1);
-      }
-    } else if (e.key === 'Enter') {
-      if (panel.hidden || activeIdx < 0) return;
-      e.preventDefault();
-      jumpTo(activeIdx);
-    } else if (e.key === 'Escape') {
-      if (!panel.hidden) {
-        e.preventDefault();
-        close();
-      } else if (input.value) {
-        e.preventDefault();
-        input.value = '';
-      }
-    }
-  });
-
-  // Mouse interaction with the dropdown.
-  listEl.addEventListener('mousemove', function (e) {
-    var li = e.target.closest('.cmd-result');
-    if (!li) return;
-    var idx = Array.prototype.indexOf.call(listEl.children, li);
-    if (idx !== activeIdx) setActive(idx);
-  });
-
-  listEl.addEventListener('click', function (e) {
-    var link = e.target.closest('.cmd-result-link');
-    if (!link) return;
-    // Let cmd/ctrl/middle-click open in new tab as normal; otherwise
-    // intercept so we can close the dropdown after navigation.
-    if (e.metaKey || e.ctrlKey || e.shiftKey || e.button === 1) return;
-    // Default <a> click handles the scroll; just tidy up the UI.
-    setTimeout(close, 0);
-  });
-
-  // Click outside the wrap closes the dropdown.
-  document.addEventListener('click', function (e) {
-    if (panel.hidden) return;
-    if (e.target.closest('.cmd-search-wrap')) return;
-    close();
-  });
-})();