mapshaper 0.7.6 → 0.7.7

package/mapshaper.js

@@ -18443,7 +18443,7 @@
   function exportSVG(dataset, opts) {
     var namespace = 'xmlns="http://www.w3.org/2000/svg"';
     var defs = [];
-    var frame, svg, layers;
+    var frame, svg, layers, metadataJSON;
     var style = '';
 
     // kludge for map keys
@@ -18467,6 +18467,9 @@
     frame = getFrameData(dataset, opts);
     fitDatasetToFrame(dataset, frame);
     setCoordinatePrecision(dataset, opts.precision || 0.01);
+    if (opts.metadata) {
+      metadataJSON = JSON.stringify(getGeospatialMetadata(dataset, frame));
+    }
 
     // error if one or more svg_data fields are not present in any layers
     if (opts.svg_data) validateSvgDataFields(dataset.layers, opts.svg_data);
@@ -18486,6 +18489,10 @@
       return stringify(obj);
     }).join('\n');
 
+    if (metadataJSON) {
+      svg = getMetadataBlock(metadataJSON, [0, 0, frame.width, frame.height]) + svg;
+    }
+
     if (defs.length > 0) {
       svg = '<defs>\n' + utils.pluck(defs, 'svg').join('') + '</defs>\n' + svg;
     }
@@ -18513,6 +18520,57 @@ ${svg}
     }];
   }
 
+  function getMetadataBlock(metadataJSON, viewBox) {
+    var x = 0;
+    var y = 0;
+    var width = viewBox && viewBox[2] || 0;
+    var height = viewBox && viewBox[3] || 0;
+    return '<metadata>' + metadataJSON + '</metadata>\n' +
+      '<g id="mapshaper-metadata">\n' +
+      '<rect x="' + x + '" y="' + y + '" width="' + width + '" height="' + height + '" opacity="0"/>\n' +
+      '<text opacity="0" font-size="0.1">' + metadataJSON + '</text>\n' +
+      '</g>\n';
+  }
+
+  function getGeospatialMetadata(dataset, frame) {
+    return {
+      crs: getSVGMetadataCRS(dataset),
+      bbox: frame.bbox || null
+    };
+  }
+
+  function getSVGMetadataCRS(dataset) {
+    var crs = getDatasetCRS(dataset);
+    var info = getDatasetCrsInfo(dataset);
+    var proj4 = null;
+    if (crs) {
+      proj4 = crsToProj4(crs);
+    }
+    if (proj4) return proj4;
+    return getAuthorityCodeString(info) || null;
+  }
+
+  function getAuthorityCodeString(info) {
+    var authority = null;
+    if (info && info.crs_string) {
+      authority = parseAuthorityCodeString(info.crs_string);
+    }
+    if (!authority && info && info.wkt1) {
+      authority = parseAuthorityCodeFromWkt(info.wkt1);
+    }
+    if (!authority && info && info.geopackage_crs) {
+      authority = parseGeoPackageAuthority(info.geopackage_crs);
+    }
+    return authority ? authority.authority + ':' + authority.code : null;
+  }
+
+  function parseGeoPackageAuthority(o) {
+    if (!o) return null;
+    var authority = o.organization || o.authority || null;
+    var code = o.organization_coordsys_id || o.code || null;
+    return authority && code != null ? {authority: String(authority).toUpperCase(), code: String(code)} : null;
+  }
+
   function exportFurnitureLayerForSVG(lyr, frame, opts) {
     var layerObj = getEmptyLayerForSVG(lyr, opts);
     layerObj.children = renderFurnitureLayer(lyr, frame);
@@ -28017,6 +28075,10 @@ ${svg}
         old_alias: 'json-subtree',
         describe: '[JSON] path to JSON input data; separator is /'
       })
+      .option('ndjson', {
+        type: 'flag',
+        describe: '[JSON/GeoJSON] input is newline-delimited JSON objects'
+      })
       .option('single-part', {
         type: 'flag',
         // describe: '[GeoJSON] split multi-part features into single-part features'
@@ -28109,10 +28171,6 @@ ${svg}
         describe: '[TopoJSON] export coordinates without quantization',
         type: 'flag'
       })
-      .option('metadata', {
-        // describe: '[TopoJSON] Add a metadata object containing CRS information',
-        type: 'flag'
-      })
       .option('no-point-quantization', {
         // describe: '[TopoJSON] export point coordinates without quantization',
         type: 'flag'
@@ -28155,6 +28213,10 @@ ${svg}
         describe: '[GeoJSON/JSON] output newline-delimited features or records',
         type: 'flag'
       })
+      .option('metadata', {
+        describe: '[SVG/TopoJSON] include metadata in output',
+        type: 'flag'
+      })
       .option('width', {
         describe: '[SVG/TopoJSON] pixel width of output (SVG default is 800)',
         type: 'number'
@@ -28217,10 +28279,7 @@ ${svg}
       .option('final', {
         type: 'flag' // for testing
       })
-      .option('metadata', {
-        // describe: '[TopoJSON] add a metadata object',
-        type: 'flag'
-      });
+      ;
 
     parser.section('Editing commands');
 
@@ -32479,7 +32538,13 @@ ${svg}
     var str = readFirstChars(reader, 1000);
     var type = identifyJSONString(str, opts);
     var dataset, retn;
-    if (type == 'geojson') { // consider only for larger files
+    if (opts.ndjson) {
+      // NDJSON can represent either newline-delimited GeoJSON features/geometries
+      // or plain JSON records. Defer type detection until after line parsing.
+      retn = {
+        content: reader.toString('utf8')
+      };
+    } else if (type == 'geojson') { // consider only for larger files
       dataset = importGeoJSONFile(reader, opts);
       retn = {
         dataset: dataset,
@@ -32531,6 +32596,12 @@ ${svg}
     }
 
     if (content) {
+      if (opts.ndjson) {
+        var nd = importNDJSON(content, opts);
+        retn.dataset = nd.dataset;
+        retn.format = nd.format;
+        return retn;
+      }
       if (utils.isString(content)) {
         try {
           content = JSON.parse(content); // ~3sec for 100MB string
@@ -32569,6 +32640,54 @@ ${svg}
     });
   }
 
+  function importNDJSON(content, opts) {
+    var lines = utils.isString(content) ? utils.splitLines(content) : [];
+    var objects = [];
+    var firstGeo = null;
+    for (var i = 0; i < lines.length; i++) {
+      var raw = lines[i].trim();
+      if (!raw) continue;
+      var obj;
+      try {
+        obj = JSON.parse(raw);
+      } catch (e) {
+        stop$1('NDJSON parsing error on line ' + (i + 1) + ': ' + e.message);
+      }
+      objects.push(obj);
+      if (firstGeo === null) {
+        firstGeo = isGeoJSONObject(obj);
+      } else if (firstGeo !== isGeoJSONObject(obj)) {
+        stop$1('NDJSON input mixes GeoJSON and non-GeoJSON objects');
+      }
+    }
+    if (objects.length === 0) {
+      stop$1('NDJSON input does not contain any JSON objects');
+    }
+    if (!firstGeo) {
+      return {dataset: importJSONTable(objects), format: 'json'};
+    }
+    var parser = new GeoJSONParser(getGeoJSONImportOpts(opts));
+    objects.forEach(function(obj) {
+      if (obj && obj.type == 'FeatureCollection') {
+        (obj.features || []).forEach(parser.parseObject);
+      } else if (obj && obj.type == 'GeometryCollection') {
+        (obj.geometries || []).forEach(parser.parseObject);
+      } else {
+        parser.parseObject(obj);
+      }
+    });
+    return {dataset: parser.done(), format: 'geojson'};
+  }
+
+  function isGeoJSONObject(obj) {
+    if (!obj || typeof obj != 'object') return false;
+    var type = obj.type;
+    return type == 'Feature' || type == 'FeatureCollection' ||
+      type == 'GeometryCollection' || type == 'Point' || type == 'MultiPoint' ||
+      type == 'LineString' || type == 'MultiLineString' ||
+      type == 'Polygon' || type == 'MultiPolygon';
+  }
+
   // path: path from top-level to the target object
   function selectFromObject(o, path) {
     var arrayRxp = /(.*)\[([0-9]+)\]$/; // array bracket notation w/ index
@@ -33159,6 +33278,7 @@ ${svg}
     var Parser = typeof DOMParser == 'undefined' ? require$1('@xmldom/xmldom').DOMParser : DOMParser;
     var doc = new Parser().parseFromString(str, 'text/xml');
     var root = doc && doc.documentElement;
+    var geometadata = parseSVGGeometadata(root, str);
     var groups = getTopLevelLayerGroups(root);
     var layerData = [];
     var datasets = [];
@@ -33175,7 +33295,11 @@ ${svg}
       });
     });
 
-    flipYCoordinates(layerData);
+    if (geometadata && geometadata.bbox && geometadata.viewBox) {
+      remapCoordinatesFromSVGToMap(layerData, geometadata.viewBox, geometadata.bbox);
+    } else {
+      flipYCoordinates(layerData);
+    }
 
     layerData.forEach(function(layer) {
       datasets.push(importLayerFeatures(layer.name, layer.features, opts));
@@ -33185,9 +33309,237 @@ ${svg}
       return {layers: [], info: {}};
     }
     if (datasets.length === 1) {
-      return datasets[0];
+      return applySVGGeometadata(datasets[0], geometadata);
     }
-    return mergeDatasets(datasets);
+    return applySVGGeometadata(mergeDatasets(datasets), geometadata);
+  }
+
+  function applySVGGeometadata(dataset, geometadata) {
+    if (geometadata && geometadata.crs) {
+      setDatasetCrsInfo(dataset, getCrsInfo(geometadata.crs));
+    }
+    return dataset;
+  }
+
+  function parseSVGGeometadata(root, svgText) {
+    var json = findMetadataJSONString(root, svgText);
+    var obj;
+    var metadataViewport = getMetadataViewportRect(root);
+    if (!json) return null;
+    obj = parseMetadataJSONObject(json);
+    if (!obj) return null;
+    return {
+      crs: normalizeMetadataCRS(obj.crs),
+      bbox: normalizeMetadataBBox(obj.bbox),
+      viewBox: metadataViewport || parseSVGViewBox(root && root.getAttribute && root.getAttribute('viewBox'))
+    };
+  }
+
+  function findMetadataJSONString(root, svgText) {
+    var text = getMetadataTagText(root) || getHiddenMetadataText(root);
+    if (!text && svgText) {
+      text = extractHiddenMetadataFromSource(svgText);
+    }
+    return normalizeMetadataJSONText(text);
+  }
+
+  function getMetadataTagText(root) {
+    var nodes = getElementChildren(root);
+    for (var i = 0; i < nodes.length; i++) {
+      if (getTagName(nodes[i]) == 'metadata') {
+        return nodes[i].textContent || '';
+      }
+    }
+    return null;
+  }
+
+  function getHiddenMetadataText(root) {
+    var node = getMetadataGroupNode(root);
+    if (node) {
+      return node.textContent || '';
+    }
+    return null;
+  }
+
+  function getMetadataGroupNode(root) {
+    var nodes = getElementChildren(root);
+    var i, node;
+    for (i = 0; i < nodes.length; i++) {
+      node = nodes[i];
+      if (getTagName(node) == 'g' && node.getAttribute && node.getAttribute('id') == 'mapshaper-metadata') {
+        return node;
+      }
+    }
+    return null;
+  }
+
+  function getMetadataViewportRect(root) {
+    var node = getMetadataGroupNode(root);
+    var children, i, rect;
+    if (!node) return null;
+    children = getElementChildren(node);
+    for (i = 0; i < children.length; i++) {
+      if (getTagName(children[i]) == 'rect') {
+        rect = parseMetadataRectNode(children[i]);
+        if (rect) return rect;
+      }
+    }
+    return null;
+  }
+
+  function parseMetadataRectNode(node) {
+    var x = parseNumber(node.getAttribute('x')) || 0;
+    var y = parseNumber(node.getAttribute('y')) || 0;
+    var width = parseNumber(node.getAttribute('width'));
+    var height = parseNumber(node.getAttribute('height'));
+    var pts, i, p;
+    var xmin = Infinity, ymin = Infinity, xmax = -Infinity, ymax = -Infinity;
+    if (!isFiniteNumber(width) || !isFiniteNumber(height) || width === 0 || height === 0) {
+      return null;
+    }
+    pts = [
+      [x, y],
+      [x + width, y],
+      [x, y + height],
+      [x + width, y + height]
+    ];
+    for (i = 0; i < pts.length; i++) {
+      p = applyNodeTransformChain(node, pts[i]);
+      xmin = Math.min(xmin, p[0]);
+      ymin = Math.min(ymin, p[1]);
+      xmax = Math.max(xmax, p[0]);
+      ymax = Math.max(ymax, p[1]);
+    }
+    if (!isFiniteNumber(xmin) || !isFiniteNumber(ymin) || !isFiniteNumber(xmax) || !isFiniteNumber(ymax)) {
+      return null;
+    }
+    return [xmin, ymin, xmax - xmin, ymax - ymin];
+  }
+
+  function applyNodeTransformChain(node, point) {
+    var chain = [];
+    var p = [point[0], point[1]];
+    var i;
+    while (node && node.nodeType == 1) {
+      chain.unshift(node);
+      node = node.parentNode;
+    }
+    for (i = 0; i < chain.length; i++) {
+      p = applyTransformString(chain[i].getAttribute && chain[i].getAttribute('transform'), p);
+    }
+    return p;
+  }
+
+  function applyTransformString(str, point) {
+    var re = /([a-z]+)\s*\(([^)]*)\)/ig;
+    var m = null;
+    var p = [point[0], point[1]];
+    while ((m = re.exec(String(str || '')))) {
+      p = applyTransformCommand(m[1].toLowerCase(), parseTransformNumbers(m[2]), p);
+    }
+    return p;
+  }
+
+  function parseTransformNumbers(str) {
+    return String(str || '')
+      .trim()
+      .split(/[\s,]+/)
+      .filter(Boolean)
+      .map(Number)
+      .filter(function(v) { return isFiniteNumber(v); });
+  }
+
+  function applyTransformCommand(cmd, nums, point) {
+    var x = point[0], y = point[1];
+    var sx, sy;
+    if (cmd == 'translate') {
+      return [x + (nums[0] || 0), y + (nums.length > 1 ? nums[1] : 0)];
+    }
+    if (cmd == 'scale') {
+      sx = nums.length > 0 ? nums[0] : 1;
+      sy = nums.length > 1 ? nums[1] : sx;
+      return [x * sx, y * sy];
+    }
+    if (cmd == 'matrix' && nums.length >= 6) {
+      return [
+        nums[0] * x + nums[2] * y + nums[4],
+        nums[1] * x + nums[3] * y + nums[5]
+      ];
+    }
+    return point;
+  }
+
+  function extractHiddenMetadataFromSource(str) {
+    var m = String(str || '').match(/<g[^>]*\bid\s*=\s*["']mapshaper-metadata["'][^>]*>([\s\S]*?)<\/g>/i);
+    if (!m) return null;
+    return stripMarkupTags(m[1]);
+  }
+
+  function stripMarkupTags(str) {
+    return String(str || '').replace(/<[^>]*>/g, '');
+  }
+
+  function normalizeMetadataJSONText(str) {
+    if (!str) return null;
+    return decodeHTMLEntities(stripMarkupTags(String(str))).trim();
+  }
+
+  function decodeHTMLEntities(str) {
+    return String(str || '')
+      .replace(/&#34;|&#x22;/gi, '"')
+      .replace(/&#39;|&#x27;/gi, "'")
+      .replace(/&#38;|&#x26;/gi, '&')
+      .replace(/&#60;|&#x3c;/gi, '<')
+      .replace(/&#62;|&#x3e;/gi, '>')
+      .replace(/&quot;/g, '"')
+      .replace(/&apos;/g, "'")
+      .replace(/&amp;/g, '&')
+      .replace(/&lt;/g, '<')
+      .replace(/&gt;/g, '>');
+  }
+
+  function parseMetadataJSONObject(text) {
+    try {
+      return JSON.parse(text);
+    } catch (e) {
+      return null;
+    }
+  }
+
+  function normalizeMetadataCRS(crs) {
+    return typeof crs == 'string' && crs.trim() ? crs.trim() : null;
+  }
+
+  function normalizeMetadataBBox(bbox) {
+    if (!Array.isArray(bbox) || bbox.length != 4) return null;
+    var out = bbox.map(function(v) { return Number(v); });
+    return out.every(isFiniteNumber) ? out : null;
+  }
+
+  function parseSVGViewBox(str) {
+    var parts = String(str || '').trim().split(/[\s,]+/).map(Number);
+    if (parts.length != 4 || !parts.every(isFiniteNumber) || parts[2] === 0 || parts[3] === 0) {
+      return null;
+    }
+    return parts;
+  }
+
+  function remapCoordinatesFromSVGToMap(layerData, viewBox, bbox) {
+    var vx = viewBox[0], vy = viewBox[1], vw = viewBox[2], vh = viewBox[3];
+    var minX = bbox[0], minY = bbox[1], maxX = bbox[2], maxY = bbox[3];
+    var scaleX = (maxX - minX) / vw;
+    var scaleY = (maxY - minY) / vh;
+
+    layerData.forEach(function(layer) {
+      layer.features.forEach(function(feature) {
+        forEachGeometryCoordinate(feature && feature.geometry, function(coord) {
+          var sx = coord[0];
+          var sy = coord[1];
+          coord[0] = minX + (sx - vx) * scaleX;
+          coord[1] = maxY - (sy - vy) * scaleY;
+        });
+      });
+    });
   }
 
   function importLayerFeatures(layerName, features, opts) {
@@ -33215,6 +33567,7 @@ ${svg}
     childNodes.forEach(function(node) {
       var tag = getTagName(node);
       if (tag == 'defs') return;
+      if (tag == 'g' && node.getAttribute && node.getAttribute('id') == 'mapshaper-metadata') return;
       if (tag == 'g') {
         groups.push({
           node: node,
@@ -41265,7 +41618,7 @@ ${svg}
   // @type: 'clip' or 'erase'
   function clipLayers(targetLayers, clipSrc, targetDataset, type, opts) {
     profileStart('clipLayers');
-    opts = opts || {no_fcleanup: true}; // TODO: update testing functions
+    opts = opts || {no_cleanup: true}; // TODO: update testing functions
     var usingPathClip = utils.some(targetLayers, layerHasPaths);
     var mergedDataset, clipLyr, nodes, result;
     var clipDataset = normalizeOverlaySource(clipSrc, targetDataset, opts);
@@ -48147,17 +48500,62 @@ ${svg}
     });
   }
 
+  function parseWKTPoint(val) {
+    if (!utils.isString(val)) return null;
+    // Support 2D POINT WKT, case-insensitive, with optional Z/M tokens.
+    // Examples:
+    //   POINT (1 2)
+    //   point(1 2)
+    //   POINT Z (1 2 3)
+    //   POINT M (1 2 3)
+    //   POINT ZM (1 2 3 4)
+    var m = /^\s*POINT(?:\s+Z(?:M)?|\s+M)?\s*\(\s*([^\s,]+)\s+([^\s,]+)(?:\s+[^)]*)?\)\s*$/i.exec(val);
+    if (!m) return null;
+    var x = coordinateFromValue(m[1]);
+    var y = coordinateFromValue(m[2]);
+    if (isNaN(x) || isNaN(y)) return null;
+    return [x, y];
+  }
+
+  function findWKTField(records, fields) {
+    var sampleSize = Math.min(records.length, 50);
+    return utils.find(fields, function(name) {
+      var seen = 0;
+      var matches = 0;
+      for (var i = 0; i < sampleSize; i++) {
+        var rec = records[i];
+        if (!rec) continue;
+        var val = rec[name];
+        if (!utils.isString(val) || val.trim() === '') continue;
+        seen++;
+        if (parseWKTPoint(val)) matches++;
+      }
+      // Require at least one non-empty sample and majority parseable as POINT.
+      return seen > 0 && matches / seen >= 0.6;
+    });
+  }
+
   function pointsFromDataTableAuto(data) {
     var fields = data ? data.getFields() : [];
+    var records = data ? data.getRecords() : [];
     var opts = {
       x: findXField(fields),
       y: findYField(fields)
     };
+    if (!opts.x || !opts.y) {
+      opts.wkt = findWKTField(records, fields);
+    }
     return pointsFromDataTable(data, opts);
   }
 
   function pointsFromDataTable(data, opts) {
     if (!data) stop$1("Layer is missing a data table");
+    if (opts.wkt && data.fieldExists(opts.wkt)) {
+      return data.getRecords().map(function(rec) {
+        var p = parseWKTPoint(rec[opts.wkt]);
+        return p ? [p] : null;
+      });
+    }
     if (!opts.x || !opts.y || !data.fieldExists(opts.x) || !data.fieldExists(opts.y)) {
       stop$1("Missing x,y data fields");
     }
@@ -48175,8 +48573,10 @@ ${svg}
   var Points = /*#__PURE__*/Object.freeze({
     __proto__: null,
     coordinateFromValue: coordinateFromValue,
+    findWKTField: findWKTField,
     findXField: findXField,
     findYField: findYField,
+    parseWKTPoint: parseWKTPoint,
     pointsFromPolygons: pointsFromPolygons
   });
 
@@ -53074,7 +53474,7 @@ ${svg}
     });
   }
 
-  var version = "0.7.6";
+  var version = "0.7.7";
 
   // 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/package.json

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

package/www/index.html

@@ -1,22 +1,18 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-	<title>mapshaper</title>
-	<meta name="Description" content="A tool for topologically aware shape simplification. Reads and writes Shapefile, GeoJSON, TopoJSON, KML, GeoPackage and FlatGeobuf formats.">
+	<title>Mapshaper</title>
+	<meta name="Description" content="A topology-aware tool for editing and converting geospatial vector data. Works with Shapefile, GeoJSON, TopoJSON, GeoPackage, FlatGeobuf and KML — in the browser or on the command line.">
 	<meta charset="UTF-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<script>
-	// If the page is opened with preloaded data (?files= or ?catalog= in the
-	// URL), tag <html> so CSS hides the splash-screen header links right away.
-	// Without this they flash into view for ~a second before the editor mounts
-	// and hides them. Done as the first script in <head> so the class is set
-	// before any layout.  bin/mapshaper-gui adds the same class server-side
-	// when files are passed on the command line.
 	(function() {
 		try {
 			var s = location.search || '';
-			if (s.indexOf('files=') !== -1 || s.indexOf('catalog=') !== -1) {
+			if (!window.location.hostname.endsWith("mapshaper.org") ||
+				s.indexOf('files=') !== -1 || s.indexOf('catalog=') !== -1) {
+				// hide spash-screen header links
 				document.documentElement.className += ' mapshaper-preload';
 			}
 		} catch (e) {}
@@ -26,7 +22,7 @@
 	<link rel="stylesheet" href="elements.css">
 	<link rel="icon" type="image/png" href="images/icon.png">
 </head>
-<body class="mapshaper-preload">
+<body>
 <div class="hidden">
 	<svg version="1.1" id="home-icon" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
 		 y="0px" width="14px" height="19px" viewBox="0 0 14 16">
@@ -72,7 +68,7 @@
 <div class="page-header">
 	<div class="mapshaper-logo">map<span class="logo-highlight">shaper</span></div>
 
-	<div class="layer-control-btn"><span class="btn header-btn layer-name"></span></div>
+	<div class="layer-control-btn icon-duo"><span class="btn header-btn layer-name"></span></div>
 
 	<div class="simplify-control-wrapper"><div class="simplify-control"><div class="header-btn btn simplify-settings-btn">Settings</div>
 		<div class="slider">

package/www/mapshaper-gui.js

@@ -15412,7 +15412,8 @@ GUI and setting the size and crop of SVG output.</p><div><input type="text" clas
         gui = new GuiInstance('body');
 
     if (!importOpts.files?.length) {
-      El('body').removeClass('mapshaper-preload');
+      // show header links if not preloading files
+      document.documentElement.classList.remove('mapshaper-preload');
     }
 
     new AlertControl(gui);

package/www/mapshaper.js

@@ -18443,7 +18443,7 @@
   function exportSVG(dataset, opts) {
     var namespace = 'xmlns="http://www.w3.org/2000/svg"';
     var defs = [];
-    var frame, svg, layers;
+    var frame, svg, layers, metadataJSON;
     var style = '';
 
     // kludge for map keys
@@ -18467,6 +18467,9 @@
     frame = getFrameData(dataset, opts);
     fitDatasetToFrame(dataset, frame);
     setCoordinatePrecision(dataset, opts.precision || 0.01);
+    if (opts.metadata) {
+      metadataJSON = JSON.stringify(getGeospatialMetadata(dataset, frame));
+    }
 
     // error if one or more svg_data fields are not present in any layers
     if (opts.svg_data) validateSvgDataFields(dataset.layers, opts.svg_data);
@@ -18486,6 +18489,10 @@
       return stringify(obj);
     }).join('\n');
 
+    if (metadataJSON) {
+      svg = getMetadataBlock(metadataJSON, [0, 0, frame.width, frame.height]) + svg;
+    }
+
     if (defs.length > 0) {
       svg = '<defs>\n' + utils.pluck(defs, 'svg').join('') + '</defs>\n' + svg;
     }
@@ -18513,6 +18520,57 @@ ${svg}
     }];
   }
 
+  function getMetadataBlock(metadataJSON, viewBox) {
+    var x = 0;
+    var y = 0;
+    var width = viewBox && viewBox[2] || 0;
+    var height = viewBox && viewBox[3] || 0;
+    return '<metadata>' + metadataJSON + '</metadata>\n' +
+      '<g id="mapshaper-metadata">\n' +
+      '<rect x="' + x + '" y="' + y + '" width="' + width + '" height="' + height + '" opacity="0"/>\n' +
+      '<text opacity="0" font-size="0.1">' + metadataJSON + '</text>\n' +
+      '</g>\n';
+  }
+
+  function getGeospatialMetadata(dataset, frame) {
+    return {
+      crs: getSVGMetadataCRS(dataset),
+      bbox: frame.bbox || null
+    };
+  }
+
+  function getSVGMetadataCRS(dataset) {
+    var crs = getDatasetCRS(dataset);
+    var info = getDatasetCrsInfo(dataset);
+    var proj4 = null;
+    if (crs) {
+      proj4 = crsToProj4(crs);
+    }
+    if (proj4) return proj4;
+    return getAuthorityCodeString(info) || null;
+  }
+
+  function getAuthorityCodeString(info) {
+    var authority = null;
+    if (info && info.crs_string) {
+      authority = parseAuthorityCodeString(info.crs_string);
+    }
+    if (!authority && info && info.wkt1) {
+      authority = parseAuthorityCodeFromWkt(info.wkt1);
+    }
+    if (!authority && info && info.geopackage_crs) {
+      authority = parseGeoPackageAuthority(info.geopackage_crs);
+    }
+    return authority ? authority.authority + ':' + authority.code : null;
+  }
+
+  function parseGeoPackageAuthority(o) {
+    if (!o) return null;
+    var authority = o.organization || o.authority || null;
+    var code = o.organization_coordsys_id || o.code || null;
+    return authority && code != null ? {authority: String(authority).toUpperCase(), code: String(code)} : null;
+  }
+
   function exportFurnitureLayerForSVG(lyr, frame, opts) {
     var layerObj = getEmptyLayerForSVG(lyr, opts);
     layerObj.children = renderFurnitureLayer(lyr, frame);
@@ -28017,6 +28075,10 @@ ${svg}
         old_alias: 'json-subtree',
         describe: '[JSON] path to JSON input data; separator is /'
       })
+      .option('ndjson', {
+        type: 'flag',
+        describe: '[JSON/GeoJSON] input is newline-delimited JSON objects'
+      })
       .option('single-part', {
         type: 'flag',
         // describe: '[GeoJSON] split multi-part features into single-part features'
@@ -28109,10 +28171,6 @@ ${svg}
         describe: '[TopoJSON] export coordinates without quantization',
         type: 'flag'
       })
-      .option('metadata', {
-        // describe: '[TopoJSON] Add a metadata object containing CRS information',
-        type: 'flag'
-      })
       .option('no-point-quantization', {
         // describe: '[TopoJSON] export point coordinates without quantization',
         type: 'flag'
@@ -28155,6 +28213,10 @@ ${svg}
         describe: '[GeoJSON/JSON] output newline-delimited features or records',
         type: 'flag'
       })
+      .option('metadata', {
+        describe: '[SVG/TopoJSON] include metadata in output',
+        type: 'flag'
+      })
       .option('width', {
         describe: '[SVG/TopoJSON] pixel width of output (SVG default is 800)',
         type: 'number'
@@ -28217,10 +28279,7 @@ ${svg}
       .option('final', {
         type: 'flag' // for testing
       })
-      .option('metadata', {
-        // describe: '[TopoJSON] add a metadata object',
-        type: 'flag'
-      });
+      ;
 
     parser.section('Editing commands');
 
@@ -32479,7 +32538,13 @@ ${svg}
     var str = readFirstChars(reader, 1000);
     var type = identifyJSONString(str, opts);
     var dataset, retn;
-    if (type == 'geojson') { // consider only for larger files
+    if (opts.ndjson) {
+      // NDJSON can represent either newline-delimited GeoJSON features/geometries
+      // or plain JSON records. Defer type detection until after line parsing.
+      retn = {
+        content: reader.toString('utf8')
+      };
+    } else if (type == 'geojson') { // consider only for larger files
       dataset = importGeoJSONFile(reader, opts);
       retn = {
         dataset: dataset,
@@ -32531,6 +32596,12 @@ ${svg}
     }
 
     if (content) {
+      if (opts.ndjson) {
+        var nd = importNDJSON(content, opts);
+        retn.dataset = nd.dataset;
+        retn.format = nd.format;
+        return retn;
+      }
       if (utils.isString(content)) {
         try {
           content = JSON.parse(content); // ~3sec for 100MB string
@@ -32569,6 +32640,54 @@ ${svg}
     });
   }
 
+  function importNDJSON(content, opts) {
+    var lines = utils.isString(content) ? utils.splitLines(content) : [];
+    var objects = [];
+    var firstGeo = null;
+    for (var i = 0; i < lines.length; i++) {
+      var raw = lines[i].trim();
+      if (!raw) continue;
+      var obj;
+      try {
+        obj = JSON.parse(raw);
+      } catch (e) {
+        stop$1('NDJSON parsing error on line ' + (i + 1) + ': ' + e.message);
+      }
+      objects.push(obj);
+      if (firstGeo === null) {
+        firstGeo = isGeoJSONObject(obj);
+      } else if (firstGeo !== isGeoJSONObject(obj)) {
+        stop$1('NDJSON input mixes GeoJSON and non-GeoJSON objects');
+      }
+    }
+    if (objects.length === 0) {
+      stop$1('NDJSON input does not contain any JSON objects');
+    }
+    if (!firstGeo) {
+      return {dataset: importJSONTable(objects), format: 'json'};
+    }
+    var parser = new GeoJSONParser(getGeoJSONImportOpts(opts));
+    objects.forEach(function(obj) {
+      if (obj && obj.type == 'FeatureCollection') {
+        (obj.features || []).forEach(parser.parseObject);
+      } else if (obj && obj.type == 'GeometryCollection') {
+        (obj.geometries || []).forEach(parser.parseObject);
+      } else {
+        parser.parseObject(obj);
+      }
+    });
+    return {dataset: parser.done(), format: 'geojson'};
+  }
+
+  function isGeoJSONObject(obj) {
+    if (!obj || typeof obj != 'object') return false;
+    var type = obj.type;
+    return type == 'Feature' || type == 'FeatureCollection' ||
+      type == 'GeometryCollection' || type == 'Point' || type == 'MultiPoint' ||
+      type == 'LineString' || type == 'MultiLineString' ||
+      type == 'Polygon' || type == 'MultiPolygon';
+  }
+
   // path: path from top-level to the target object
   function selectFromObject(o, path) {
     var arrayRxp = /(.*)\[([0-9]+)\]$/; // array bracket notation w/ index
@@ -33159,6 +33278,7 @@ ${svg}
     var Parser = typeof DOMParser == 'undefined' ? require$1('@xmldom/xmldom').DOMParser : DOMParser;
     var doc = new Parser().parseFromString(str, 'text/xml');
     var root = doc && doc.documentElement;
+    var geometadata = parseSVGGeometadata(root, str);
     var groups = getTopLevelLayerGroups(root);
     var layerData = [];
     var datasets = [];
@@ -33175,7 +33295,11 @@ ${svg}
       });
     });
 
-    flipYCoordinates(layerData);
+    if (geometadata && geometadata.bbox && geometadata.viewBox) {
+      remapCoordinatesFromSVGToMap(layerData, geometadata.viewBox, geometadata.bbox);
+    } else {
+      flipYCoordinates(layerData);
+    }
 
     layerData.forEach(function(layer) {
       datasets.push(importLayerFeatures(layer.name, layer.features, opts));
@@ -33185,9 +33309,237 @@ ${svg}
       return {layers: [], info: {}};
     }
     if (datasets.length === 1) {
-      return datasets[0];
+      return applySVGGeometadata(datasets[0], geometadata);
     }
-    return mergeDatasets(datasets);
+    return applySVGGeometadata(mergeDatasets(datasets), geometadata);
+  }
+
+  function applySVGGeometadata(dataset, geometadata) {
+    if (geometadata && geometadata.crs) {
+      setDatasetCrsInfo(dataset, getCrsInfo(geometadata.crs));
+    }
+    return dataset;
+  }
+
+  function parseSVGGeometadata(root, svgText) {
+    var json = findMetadataJSONString(root, svgText);
+    var obj;
+    var metadataViewport = getMetadataViewportRect(root);
+    if (!json) return null;
+    obj = parseMetadataJSONObject(json);
+    if (!obj) return null;
+    return {
+      crs: normalizeMetadataCRS(obj.crs),
+      bbox: normalizeMetadataBBox(obj.bbox),
+      viewBox: metadataViewport || parseSVGViewBox(root && root.getAttribute && root.getAttribute('viewBox'))
+    };
+  }
+
+  function findMetadataJSONString(root, svgText) {
+    var text = getMetadataTagText(root) || getHiddenMetadataText(root);
+    if (!text && svgText) {
+      text = extractHiddenMetadataFromSource(svgText);
+    }
+    return normalizeMetadataJSONText(text);
+  }
+
+  function getMetadataTagText(root) {
+    var nodes = getElementChildren(root);
+    for (var i = 0; i < nodes.length; i++) {
+      if (getTagName(nodes[i]) == 'metadata') {
+        return nodes[i].textContent || '';
+      }
+    }
+    return null;
+  }
+
+  function getHiddenMetadataText(root) {
+    var node = getMetadataGroupNode(root);
+    if (node) {
+      return node.textContent || '';
+    }
+    return null;
+  }
+
+  function getMetadataGroupNode(root) {
+    var nodes = getElementChildren(root);
+    var i, node;
+    for (i = 0; i < nodes.length; i++) {
+      node = nodes[i];
+      if (getTagName(node) == 'g' && node.getAttribute && node.getAttribute('id') == 'mapshaper-metadata') {
+        return node;
+      }
+    }
+    return null;
+  }
+
+  function getMetadataViewportRect(root) {
+    var node = getMetadataGroupNode(root);
+    var children, i, rect;
+    if (!node) return null;
+    children = getElementChildren(node);
+    for (i = 0; i < children.length; i++) {
+      if (getTagName(children[i]) == 'rect') {
+        rect = parseMetadataRectNode(children[i]);
+        if (rect) return rect;
+      }
+    }
+    return null;
+  }
+
+  function parseMetadataRectNode(node) {
+    var x = parseNumber(node.getAttribute('x')) || 0;
+    var y = parseNumber(node.getAttribute('y')) || 0;
+    var width = parseNumber(node.getAttribute('width'));
+    var height = parseNumber(node.getAttribute('height'));
+    var pts, i, p;
+    var xmin = Infinity, ymin = Infinity, xmax = -Infinity, ymax = -Infinity;
+    if (!isFiniteNumber(width) || !isFiniteNumber(height) || width === 0 || height === 0) {
+      return null;
+    }
+    pts = [
+      [x, y],
+      [x + width, y],
+      [x, y + height],
+      [x + width, y + height]
+    ];
+    for (i = 0; i < pts.length; i++) {
+      p = applyNodeTransformChain(node, pts[i]);
+      xmin = Math.min(xmin, p[0]);
+      ymin = Math.min(ymin, p[1]);
+      xmax = Math.max(xmax, p[0]);
+      ymax = Math.max(ymax, p[1]);
+    }
+    if (!isFiniteNumber(xmin) || !isFiniteNumber(ymin) || !isFiniteNumber(xmax) || !isFiniteNumber(ymax)) {
+      return null;
+    }
+    return [xmin, ymin, xmax - xmin, ymax - ymin];
+  }
+
+  function applyNodeTransformChain(node, point) {
+    var chain = [];
+    var p = [point[0], point[1]];
+    var i;
+    while (node && node.nodeType == 1) {
+      chain.unshift(node);
+      node = node.parentNode;
+    }
+    for (i = 0; i < chain.length; i++) {
+      p = applyTransformString(chain[i].getAttribute && chain[i].getAttribute('transform'), p);
+    }
+    return p;
+  }
+
+  function applyTransformString(str, point) {
+    var re = /([a-z]+)\s*\(([^)]*)\)/ig;
+    var m = null;
+    var p = [point[0], point[1]];
+    while ((m = re.exec(String(str || '')))) {
+      p = applyTransformCommand(m[1].toLowerCase(), parseTransformNumbers(m[2]), p);
+    }
+    return p;
+  }
+
+  function parseTransformNumbers(str) {
+    return String(str || '')
+      .trim()
+      .split(/[\s,]+/)
+      .filter(Boolean)
+      .map(Number)
+      .filter(function(v) { return isFiniteNumber(v); });
+  }
+
+  function applyTransformCommand(cmd, nums, point) {
+    var x = point[0], y = point[1];
+    var sx, sy;
+    if (cmd == 'translate') {
+      return [x + (nums[0] || 0), y + (nums.length > 1 ? nums[1] : 0)];
+    }
+    if (cmd == 'scale') {
+      sx = nums.length > 0 ? nums[0] : 1;
+      sy = nums.length > 1 ? nums[1] : sx;
+      return [x * sx, y * sy];
+    }
+    if (cmd == 'matrix' && nums.length >= 6) {
+      return [
+        nums[0] * x + nums[2] * y + nums[4],
+        nums[1] * x + nums[3] * y + nums[5]
+      ];
+    }
+    return point;
+  }
+
+  function extractHiddenMetadataFromSource(str) {
+    var m = String(str || '').match(/<g[^>]*\bid\s*=\s*["']mapshaper-metadata["'][^>]*>([\s\S]*?)<\/g>/i);
+    if (!m) return null;
+    return stripMarkupTags(m[1]);
+  }
+
+  function stripMarkupTags(str) {
+    return String(str || '').replace(/<[^>]*>/g, '');
+  }
+
+  function normalizeMetadataJSONText(str) {
+    if (!str) return null;
+    return decodeHTMLEntities(stripMarkupTags(String(str))).trim();
+  }
+
+  function decodeHTMLEntities(str) {
+    return String(str || '')
+      .replace(/&#34;|&#x22;/gi, '"')
+      .replace(/&#39;|&#x27;/gi, "'")
+      .replace(/&#38;|&#x26;/gi, '&')
+      .replace(/&#60;|&#x3c;/gi, '<')
+      .replace(/&#62;|&#x3e;/gi, '>')
+      .replace(/&quot;/g, '"')
+      .replace(/&apos;/g, "'")
+      .replace(/&amp;/g, '&')
+      .replace(/&lt;/g, '<')
+      .replace(/&gt;/g, '>');
+  }
+
+  function parseMetadataJSONObject(text) {
+    try {
+      return JSON.parse(text);
+    } catch (e) {
+      return null;
+    }
+  }
+
+  function normalizeMetadataCRS(crs) {
+    return typeof crs == 'string' && crs.trim() ? crs.trim() : null;
+  }
+
+  function normalizeMetadataBBox(bbox) {
+    if (!Array.isArray(bbox) || bbox.length != 4) return null;
+    var out = bbox.map(function(v) { return Number(v); });
+    return out.every(isFiniteNumber) ? out : null;
+  }
+
+  function parseSVGViewBox(str) {
+    var parts = String(str || '').trim().split(/[\s,]+/).map(Number);
+    if (parts.length != 4 || !parts.every(isFiniteNumber) || parts[2] === 0 || parts[3] === 0) {
+      return null;
+    }
+    return parts;
+  }
+
+  function remapCoordinatesFromSVGToMap(layerData, viewBox, bbox) {
+    var vx = viewBox[0], vy = viewBox[1], vw = viewBox[2], vh = viewBox[3];
+    var minX = bbox[0], minY = bbox[1], maxX = bbox[2], maxY = bbox[3];
+    var scaleX = (maxX - minX) / vw;
+    var scaleY = (maxY - minY) / vh;
+
+    layerData.forEach(function(layer) {
+      layer.features.forEach(function(feature) {
+        forEachGeometryCoordinate(feature && feature.geometry, function(coord) {
+          var sx = coord[0];
+          var sy = coord[1];
+          coord[0] = minX + (sx - vx) * scaleX;
+          coord[1] = maxY - (sy - vy) * scaleY;
+        });
+      });
+    });
   }
 
   function importLayerFeatures(layerName, features, opts) {
@@ -33215,6 +33567,7 @@ ${svg}
     childNodes.forEach(function(node) {
       var tag = getTagName(node);
       if (tag == 'defs') return;
+      if (tag == 'g' && node.getAttribute && node.getAttribute('id') == 'mapshaper-metadata') return;
       if (tag == 'g') {
         groups.push({
           node: node,
@@ -41265,7 +41618,7 @@ ${svg}
   // @type: 'clip' or 'erase'
   function clipLayers(targetLayers, clipSrc, targetDataset, type, opts) {
     profileStart('clipLayers');
-    opts = opts || {no_fcleanup: true}; // TODO: update testing functions
+    opts = opts || {no_cleanup: true}; // TODO: update testing functions
     var usingPathClip = utils.some(targetLayers, layerHasPaths);
     var mergedDataset, clipLyr, nodes, result;
     var clipDataset = normalizeOverlaySource(clipSrc, targetDataset, opts);
@@ -48147,17 +48500,62 @@ ${svg}
     });
   }
 
+  function parseWKTPoint(val) {
+    if (!utils.isString(val)) return null;
+    // Support 2D POINT WKT, case-insensitive, with optional Z/M tokens.
+    // Examples:
+    //   POINT (1 2)
+    //   point(1 2)
+    //   POINT Z (1 2 3)
+    //   POINT M (1 2 3)
+    //   POINT ZM (1 2 3 4)
+    var m = /^\s*POINT(?:\s+Z(?:M)?|\s+M)?\s*\(\s*([^\s,]+)\s+([^\s,]+)(?:\s+[^)]*)?\)\s*$/i.exec(val);
+    if (!m) return null;
+    var x = coordinateFromValue(m[1]);
+    var y = coordinateFromValue(m[2]);
+    if (isNaN(x) || isNaN(y)) return null;
+    return [x, y];
+  }
+
+  function findWKTField(records, fields) {
+    var sampleSize = Math.min(records.length, 50);
+    return utils.find(fields, function(name) {
+      var seen = 0;
+      var matches = 0;
+      for (var i = 0; i < sampleSize; i++) {
+        var rec = records[i];
+        if (!rec) continue;
+        var val = rec[name];
+        if (!utils.isString(val) || val.trim() === '') continue;
+        seen++;
+        if (parseWKTPoint(val)) matches++;
+      }
+      // Require at least one non-empty sample and majority parseable as POINT.
+      return seen > 0 && matches / seen >= 0.6;
+    });
+  }
+
   function pointsFromDataTableAuto(data) {
     var fields = data ? data.getFields() : [];
+    var records = data ? data.getRecords() : [];
     var opts = {
       x: findXField(fields),
       y: findYField(fields)
     };
+    if (!opts.x || !opts.y) {
+      opts.wkt = findWKTField(records, fields);
+    }
     return pointsFromDataTable(data, opts);
   }
 
   function pointsFromDataTable(data, opts) {
     if (!data) stop$1("Layer is missing a data table");
+    if (opts.wkt && data.fieldExists(opts.wkt)) {
+      return data.getRecords().map(function(rec) {
+        var p = parseWKTPoint(rec[opts.wkt]);
+        return p ? [p] : null;
+      });
+    }
     if (!opts.x || !opts.y || !data.fieldExists(opts.x) || !data.fieldExists(opts.y)) {
       stop$1("Missing x,y data fields");
     }
@@ -48175,8 +48573,10 @@ ${svg}
   var Points = /*#__PURE__*/Object.freeze({
     __proto__: null,
     coordinateFromValue: coordinateFromValue,
+    findWKTField: findWKTField,
     findXField: findXField,
     findYField: findYField,
+    parseWKTPoint: parseWKTPoint,
     pointsFromPolygons: pointsFromPolygons
   });
 
@@ -53074,7 +53474,7 @@ ${svg}
     });
   }
 
-  var version = "0.7.6";
+  var version = "0.7.7";
 
   // 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/page.css

@@ -172,12 +172,20 @@ body.map-view {
 	display: none;
 }
 
+/* On narrow screens, splash links collide with the logo; keep the header clean
+   until data is loaded and the editor controls take over. */
+@media (max-width: 500px) {
+	#splash-buttons {
+		display: none;
+	}
+}
+
 .page-header-buttons {
 	z-index: 20;
 	position: absolute;
 	top: 0px;
 	right: 0px;
-	margin: 0 3px 3px 0;
+	margin: 0 2px 3px 0;
 }
 
 .btn.header-btn {
@@ -218,7 +226,6 @@ body.map-view {
 
 #header-menu-btn {
 	cursor: pointer;
-	padding: 8px 7px 4px 7px;
 	user-select: none;
 	/* All header buttons are 29px tall, so top-align the hamburger to keep its
 	   row baseline-neutral. Without this, the SVG-only button (no text) makes
@@ -843,6 +850,84 @@ body.simplify .layer-control-btn {
 	display: none;
 }
 
+/* On small screens, move the layer menu trigger out of the header center and
+   render it as an icon-only floating map button. */
+@media (max-width: 700px) {
+	.info-box {
+		margin-top: 8px;
+	}
+
+	div.nav-buttons {
+		top: 2px;
+	}
+
+	.btn.header-btn {
+		padding-left: 5px;
+		padding-right: 5px;
+	}
+
+	.layer-control-btn {
+		width: auto;
+		left: 9px;
+		top: 38px; /* below the 30px header */
+		text-align: left;
+	}
+
+	.layer-control-btn > .btn.header-btn {
+		margin-right: 0;
+		width: 30px;
+		height: 30px;
+		box-sizing: content-box;
+		padding: 0;
+		border-radius: 4px;
+		border: 2px solid rgba(255, 255, 255, 0.45);
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	/* The clickable header button element itself has class "layer-name", so
+	   hide text on the button directly (not a child selector). */
+	.layer-control-btn > .btn.header-btn.layer-name {
+		color: transparent;
+		font-size: 0;
+		line-height: 0;
+		text-indent: -9999px;
+		overflow: hidden;
+	}
+
+	/* Mobile layer-button icon */
+	.layer-control-btn > .btn.header-btn::before {
+		content: "";
+		display: block;
+	}
+
+	/* Two diagonally offset squares */
+	.layer-control-btn.icon-duo > .btn.header-btn::before {
+		width: 13px;
+		height: 13px;
+		margin: 2px 0 0 2px;
+		border: 1px solid rgba(255, 255, 255, 0.95);
+		border-radius: 1px;
+		box-shadow: -4px -4px 0 -1px rgba(255, 255, 255, 0.72);
+	}
+
+	.mshp-main-map .basemap-overlay-buttons {
+		top: 10px; /* map-relative offset to align with page-level layer button */
+		right: 33px;
+		padding: 0;
+		background: transparent;
+		border-radius: 0;
+	}
+
+	.mshp-main-map .basemap-overlay-buttons .basemap-style-btn.basemap-overlay-btn {
+		width: 30px !important;
+		height: 30px !important;
+		margin: 0 0 0 4px !important;
+		border-radius: 4px !important;
+	}
+}
+
 .layer-control .info-box {
 	padding: 0;
 	pointer-events: none;
@@ -1644,7 +1729,7 @@ body.pan.panning .map-layers:not(.drawing) {
 	position: relative;
 	cursor:pointer;
 	/* padding: 3px 3px 5px 3px; */
-	padding: 4px;
+	padding: 4px 5px;
 	line-height: 1;
 }