mapshaper 0.7.17 → 0.7.18

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'}
   };
 
@@ -31667,6 +31667,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 +44081,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 +44106,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 +44201,7 @@ ${svg}
 
     if (colorArg == 'random') {
       if (categorical) {
-        colorScheme = pickRandomCategoricalScheme(n);
+        return getRandomizedCategoricalColorScheme(n);
       } else {
         colorScheme = pickRandomColorScheme('sequential');
       }
@@ -56697,6 +56715,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 +58269,7 @@ ${svg}
     });
   }
 
-  var version = "0.7.17";
+  var version = "0.7.18";
 
   // 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.18",
+  "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 -->