mapshaper 0.7.17 → 0.7.19

package/mapshaper.js

@@ -18650,14 +18650,14 @@
   var labelPositionFields = ['label-pos', 'dx', 'dy', 'text-anchor'];
 
   var labelPositionStyles = {
-    n: {dx: 0, dy: '-0.45em', 'text-anchor': 'middle'},
-    s: {dx: 0, dy: '1.05em', 'text-anchor': 'middle'},
-    e: {dx: '0.4em', dy: '0.25em', 'text-anchor': 'start'},
-    w: {dx: '-0.4em', dy: '0.25em', 'text-anchor': 'end'},
-    ne: {dx: '0.35em', dy: '-0.15em', 'text-anchor': 'start'},
-    se: {dx: '0.35em', dy: '0.7em', 'text-anchor': 'start'},
-    nw: {dx: '-0.35em', dy: '-0.15em', 'text-anchor': 'end'},
-    sw: {dx: '-0.35em', dy: '0.7em', 'text-anchor': 'end'},
+    n: {dx: 0, dy: '-0.5em', 'text-anchor': 'middle'},
+    s: {dx: 0, dy: '1.1em', 'text-anchor': 'middle'},
+    e: {dx: '0.45em', dy: '0.23em', 'text-anchor': 'start'},
+    w: {dx: '-0.45em', dy: '0.23em', 'text-anchor': 'end'},
+    ne: {dx: '0.4em', dy: '-0.15em', 'text-anchor': 'start'},
+    se: {dx: '0.4em', dy: '0.7em', 'text-anchor': 'start'},
+    nw: {dx: '-0.4em', dy: '-0.15em', 'text-anchor': 'end'},
+    sw: {dx: '-0.4em', dy: '0.7em', 'text-anchor': 'end'},
     c: {dx: 0, dy: '0.25em', 'text-anchor': 'middle'}
   };
 
@@ -19880,7 +19880,7 @@
   function exportSVG(dataset, opts) {
     var namespace = 'xmlns="http://www.w3.org/2000/svg"';
     var defs = [];
-    var frame, svg, layers, metadataJSON;
+    var frame, svg, layers, metadataJSON, files, svgFile;
     var style = '';
 
     // kludge for map keys
@@ -19901,6 +19901,8 @@
     // use invert_y: 0 setting for screen coordinates and geojson polygon generation
     // use 1px default margin so typical strokes don't get cut off on the sides
     opts = Object.assign({invert_y: true, margin: "1"}, opts);
+    opts.svg_image_files = [];
+    opts.svg_file_base = getSvgFileBase(dataset, opts);
     frame = getFrameData(dataset, opts);
     fitDatasetToFrame(dataset, frame);
     setCoordinatePrecision(dataset, opts.precision || 0.01);
@@ -19953,10 +19955,17 @@
 ${svg}
 </svg>`;
     svg = utils.format(template, frame.width, frame.height, 0, 0, frame.width, frame.height);
-    return [{
+    svgFile = {
       content: svg,
       filename: opts.file || getOutputFileBase(dataset) + '.svg'
-    }];
+    };
+    files = [svgFile].concat(opts.svg_image_files);
+    return files;
+  }
+
+  function getSvgFileBase(dataset, opts) {
+    var file = opts.file || getOutputFileBase(dataset) + '.svg';
+    return file.replace(/\.svg$/i, '');
   }
 
   function getMetadataBlock(metadataJSON, viewBox) {
@@ -20047,7 +20056,9 @@ ${svg}
       layerObj.children = [];
       return layerObj;
     }
-    href = encodeRasterPreview(rendered.preview, opts);
+    href = opts.linked_images ?
+      exportLinkedRasterPreview(rendered.preview, opts) :
+      encodeRasterPreview(rendered.preview, opts);
     layerObj.children = [{
       tag: 'image',
       properties: {
@@ -20121,6 +20132,30 @@ ${svg}
     return 'data:image/' + format + ';base64,' + data;
   }
 
+  function exportLinkedRasterPreview(preview, opts) {
+    var format = getSvgRasterFormat(preview, opts);
+    var data = format == 'png' ? encodePng(preview) : encodeJpeg(preview, opts);
+    var ext = format == 'jpeg' ? 'jpg' : format;
+    var filename = opts.svg_file_base + '-image-' + (opts.svg_image_files.length + 1) + '.' + ext;
+    opts.svg_image_files.push({
+      filename: filename,
+      content: base64ToBytes(data)
+    });
+    return filename;
+  }
+
+  function base64ToBytes(str) {
+    if (typeof Buffer != 'undefined') {
+      return Buffer.from(str, 'base64');
+    }
+    var bin = atob(str);
+    var bytes = new Uint8Array(bin.length);
+    for (var i = 0; i < bin.length; i++) {
+      bytes[i] = bin.charCodeAt(i);
+    }
+    return bytes;
+  }
+
   function getSvgRasterFormat(preview, opts) {
     var fmt = opts.svg_raster_format || opts.raster_format || null;
     if (fmt) return fmt == 'jpg' ? 'jpeg' : fmt;
@@ -20136,11 +20171,11 @@ ${svg}
   }
 
   function encodeJpeg(preview, opts) {
+    var quality = getJpegQuality(opts);
     if (runningInBrowser() && typeof document != 'undefined') {
-      return encodeWithCanvas(preview, 'image/jpeg', opts.svg_raster_quality || 0.85);
+      return encodeWithCanvas(preview, 'image/jpeg', quality / 100);
     }
     var jpeg = require$1('jpeg-js');
-    var quality = Math.round((opts.svg_raster_quality || 0.85) * 100);
     return Buffer.from(jpeg.encode({
       data: Buffer.from(preview.pixels),
       width: preview.width,
@@ -20148,6 +20183,14 @@ ${svg}
     }, quality).data).toString('base64');
   }
 
+  function getJpegQuality(opts) {
+    var quality = opts.jpeg_quality == null ? 85 : opts.jpeg_quality;
+    if ((quality >= 1 && quality <= 100) === false) {
+      stop$1('jpeg-quality= option should be a number from 1 to 100');
+    }
+    return Math.round(quality);
+  }
+
   function encodePng(preview) {
     if (runningInBrowser() && typeof document != 'undefined') {
       return encodeWithCanvas(preview, 'image/png');
@@ -29002,6 +29045,10 @@ ${svg}
     if ('topojson_precision' in o && o.topojson_precision > 0 === false) {
       error('topojson-precision= option should be a positive number');
     }
+
+    if ('jpeg_quality' in o && (o.jpeg_quality >= 1 && o.jpeg_quality <= 100) === false) {
+      error('jpeg-quality= option should be a number from 1 to 100');
+    }
   }
 
   var assignmentRxp = /^([a-z0-9_+-]+)=(?!=)(.*)$/i; // exclude ==
@@ -30408,6 +30455,14 @@ ${svg}
         describe: '[SVG] raster pixels per SVG pixel (default is 1)',
         type: 'number'
       })
+      .option('linked-images', {
+        describe: '[SVG] link raster images as external files',
+        type: 'flag'
+      })
+      .option('jpeg-quality', {
+        describe: '[SVG] JPEG quality for raster images, 1-100 (default is 85)',
+        type: 'number'
+      })
       .option('fit-extent', {
         describe: '[SVG] layer to use for the map extent'
       })
@@ -31432,6 +31487,10 @@ ${svg}
       .option('nodata-color', {
         describe: '[raster] color for uncovered pixels after reprojection'
       })
+      .option('background', {
+        describe: '[raster] alias for nodata-color',
+        alias_to: 'nodata-color'
+      })
       .option('resampling', {
         describe: '[raster] nearest or bilinear (default is bilinear)'
       })
@@ -31667,6 +31726,10 @@ ${svg}
         type: 'flag'
       })
       .option('where', whereOpt)
+      .option('ids', {
+        describe: 'comma-sep. list of feature ids to style',
+        type: 'numbers'
+      })
       .option('class', {
         describe: 'name of CSS class or classes (space-separated)'
       })
@@ -44077,7 +44140,17 @@ ${svg}
     return utils.pickOne(schemes) || 'Tableau20';
   }
 
-  function getCategoricalColorScheme(name, n) {
+  function randomRotateArr(arr) {
+    var n = Math.floor(Math.random() * arr.length);
+    return arr.slice(-n).concat(arr.slice(0, -n));
+  }
+
+  function getRandomizedCategoricalColorScheme(n) {
+    var name = pickRandomCategoricalScheme(n);
+    return getCategoricalColorScheme(name, n, true);
+  }
+
+  function getCategoricalColorScheme(name, n, randomized) {
     var colors;
     initSchemes();
     name = standardName(name);
@@ -44092,7 +44165,11 @@ ${svg}
       // stop(name, 'does not contain', n, 'colors');
       message('Color scheme has', colors.length, 'colors. Using duplication to match', n, 'categories.');
       colors = wrapColors(colors, n);
-    } else {
+    }
+    if (randomized) {
+      colors = randomRotateArr(colors);
+    }
+    if (n < colors.length) {
       colors = colors.slice(0, n);
     }
     return colors;
@@ -44183,7 +44260,7 @@ ${svg}
 
     if (colorArg == 'random') {
       if (categorical) {
-        colorScheme = pickRandomCategoricalScheme(n);
+        return getRandomizedCategoricalColorScheme(n);
       } else {
         colorScheme = pickRandomColorScheme('sequential');
       }
@@ -51092,7 +51169,7 @@ ${svg}
     bbox = opts.output_bbox || opts.outputBbox || getProjectedMeshBBox(mesh);
     if (!bbox) stop$1('Unable to project raster layer');
     outSize = getOutputGridSize(grid, bbox, opts);
-    outGrid = createProjectedRasterGrid(grid, bbox, outSize.width, outSize.height, opts);
+    outGrid = createProjectedRasterGrid(grid, raster, bbox, outSize.width, outSize.height, opts);
     timeStart(timing, 'rasterize');
     rasterizeProjectedMesh(grid, outGrid, mesh, getRasterProjectionSampleMethod(raster, opts));
     timeEnd(timing, 'rasterize');
@@ -51361,13 +51438,13 @@ ${svg}
     return xmin < Infinity && xmax > xmin && ymax > ymin ? [xmin, ymin, xmax, ymax] : null;
   }
 
-  function createProjectedRasterGrid(grid, bbox, widthArg, heightArg, opts) {
+  function createProjectedRasterGrid(grid, raster, bbox, widthArg, heightArg, opts) {
     var width = widthArg || grid.width;
     var height = heightArg || grid.height;
-    var bands = getOutputBandCount(grid, opts);
+    var bands = getOutputBandCount(grid, raster, opts);
     var samples = new grid.samples.constructor(width * height * bands);
     var coverage = new Uint8Array(width * height);
-    fillProjectedRasterSamples(samples, bands, grid, opts || {});
+    fillProjectedRasterSamples(samples, bands, grid, raster, opts || {});
     return Object.assign({}, grid, {
       width: width,
       height: height,
@@ -51404,13 +51481,13 @@ ${svg}
     return {width: width, height: height};
   }
 
-  function getOutputBandCount(grid, opts) {
-    var color = getNoDataColor(opts);
+  function getOutputBandCount(grid, raster, opts) {
+    var color = getNoDataColor(raster, opts);
     return color && color.a === 0 && grid.bands > 1 && grid.bands < 4 ? 4 : grid.bands;
   }
 
-  function fillProjectedRasterSamples(samples, bands, grid, opts) {
-    var color = getNoDataColor(opts);
+  function fillProjectedRasterSamples(samples, bands, grid, raster, opts) {
+    var color = getNoDataColor(raster, opts);
     var noData = grid.nodata;
     if (color) {
       fillProjectedRasterColor(samples, bands, color);
@@ -51420,10 +51497,12 @@ ${svg}
     samples.fill(noData);
   }
 
-  function getNoDataColor(opts) {
+  function getNoDataColor(raster, opts) {
     var arg = opts.nodata_color || opts.nodataColor;
     var color;
-    if (arg == null || arg === '') return null;
+    if (arg == null || arg === '') {
+      return rasterAppearsCategorical(raster) ? null : {r: 255, g: 255, b: 255, a: 1};
+    }
     if (String(arg).toLowerCase() == 'transparent') {
       return {r: 0, g: 0, b: 0, a: 0};
     }
@@ -56697,6 +56776,9 @@ ${svg}
     if (opts.where) {
       filterFn = compileFeatureExpression(opts.where, lyr, dataset.arcs);
     }
+    if (opts.ids) {
+      filterFn = combineFilters(filterFn, getIdFilter(opts.ids));
+    }
     if (opts.clear) {
       lyr.data.getFields().filter(isSupportedSvgStyleProperty).forEach(lyr.data.deleteField, lyr.data);
     }
@@ -58248,7 +58330,7 @@ ${svg}
     });
   }
 
-  var version = "0.7.17";
+  var version = "0.7.19";
 
   // 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,7 +1,7 @@
 {
   "name": "mapshaper",
-  "version": "0.7.17",
-  "description": "A tool for editing vector datasets for mapping and GIS.",
+  "version": "0.7.19",
+  "description": "A tool for editing geospatial data for mapping and GIS.",
   "keywords": [
     "shapefile",
     "topojson",

package/www/index.html

@@ -48,7 +48,7 @@
 	</svg>
 
 <svg id="text-tool-icon" xmlns="http://www.w3.org/2000/svg" width="15" height="22" viewBox="0 0 15 22">
-  <path d="M13.4125,6.1758c-.0735,0-.1704.0087-.3023.0225-.35.0418-1.1581.0841-1.6018.0841H3.4416c-.4199,0-1.2035-.0418-1.5848-.0845-.1272-.0133-.2242-.022-.2977-.022-.5733,0-.5733.5104-.5733.678v3.8421h.9614c.8167,0,1.1245-.4428,1.2361-.7083.43-1.0372.9151-1.2196,1.775-1.2196h.6348v8.7486c0,.3918-.0528.4281-.463.7111l-.0919.0634c-.4874.3427-.6362.5765-.6362,1.0014v1.1346h6.1463v-1.1346c0-.4222-.1617-.6753-.6992-1.0441-.435-.3023-.4708-.3266-.4708-.7318v-8.7486h.6353c.8439,0,1.3253.1833,1.7754,1.2205.1851.4428.6307.7074,1.1925.7074h1.0042v-3.8421c0-.1677,0-.678-.5733-.678Z"/>
+  <path d="M13.4125,6.1758c-.0735,0-.1704.0087-.3023.0225-.35.0418-1.1581.0841-1.6018.0841H3.4416c-.4199,0-1.2035-.0418-1.5848-.0845-.1272-.0133-.2242-.022-.2977-.022-.5733,0-.5733.5104-.5733.678v3.8421h.9614c.8167,0,1.1245-.4428,1.2361-.7083.43-1.0372.9151-1.2196,1.775-1.2196h.6348v9.7486c0,.3918-.0528.4281-.463.7111l-.0919.0634c-.4874.3427-.6362.5765-.6362,1.0014v1.1346h6.1463v-1.1346c0-.4222-.1617-.6753-.6992-1.0441-.435-.3023-.4708-.3266-.4708-.7318v-9.7486h.6353c.8439,0,1.3253.1833,1.7754,1.2205.1851.4428.6307.7074,1.1925.7074h1.0042v-3.8421c0-.1677,0-.678-.5733-.678Z"/>
 </svg>
 
 	<!-- adjusted height -->
@@ -375,8 +375,8 @@ encoding=big5</span>. Click to see all options.</div></div></div>
 	</div>
 	<div class="mshp-main-map main-area map-area">
 		<div class="intersection-display">
-			<span class="intersection-count">0 line intersections</span>
-			<div class="repair-btn text-btn colored-text">Repair</div>
+			<span class="intersection-count">0 line intersections</span>&nbsp;
+			<span class="repair-btn text-btn colored-text">repair</span>
 		</div>
 		<div class="basemap-overlay-buttons basemap-buttons"></div>
 		<div class="map-layers"></div>