mapshaper 0.6.36 → 0.6.38

package/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.6.36";
+  var VERSION = "0.6.38";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -24574,6 +24574,10 @@ ${svg}
       .option('stroke-width', {
         describe: 'symbol line width (linear symbols only)'
       })
+      .option('opacity', {
+        describe: 'symbol opacity',
+        type: 'number'
+      })
       .option('geographic', {
         old_alias: 'polygons',
          describe: 'make geographic shapes instead of SVG objects',
@@ -42281,6 +42285,18 @@ ${svg}
     return d.stroke || d.fill || 'magenta';
   }
 
+  function applySymbolStyles(sym, d) {
+    if (sym.type == 'polyline') {
+      sym.stroke = getSymbolStrokeColor(d);
+    } else {
+      sym.fill = getSymbolFillColor(d);
+    }
+    if (d.opacity) {
+      sym.opacity = d.opacity;
+    }
+    return sym;
+  }
+
   function getSymbolRadius(d) {
     if (d.radius === 0 || d.length === 0 || d.r === 0) return 0;
     return d.radius || d.length || d.r || 5; // use a default value
@@ -42346,7 +42362,7 @@ ${svg}
         headDx = size.headWidth / 2,
         stemDx = size.stemWidth / 2,
         baseDx = stemDx * (1 - stemTaper),
-        head, stem, coords, dx, dy;
+        coords, dx, dy;
 
     if (curvature) {
       // make curved stem
@@ -42359,11 +42375,11 @@ ${svg}
       dy = stemLen * Math.cos(theta / 2);
 
       if (stickArrow) {
-        stem = getCurvedStemCoords(-ax, -ay, dx, dy);
+        coords = getCurvedStemCoords(-ax, -ay, dx, dy);
       } else {
         var leftStem = getCurvedStemCoords(-ax, -ay, -stemDx + dx, dy);
         var rightStem = getCurvedStemCoords(ax, ay, stemDx + dx, dy);
-        stem = leftStem.concat(rightStem.reverse());
+        coords = leftStem.concat(rightStem.reverse());
       }
 
     } else {
@@ -42371,23 +42387,26 @@ ${svg}
       dx = 0;
       dy = stemLen;
       if (stickArrow) {
-        stem = [[0, 0], [0, stemLen]];
+        coords = [[0, 0], [0, stemLen]];
       } else {
-        stem = [[-baseDx, 0], [baseDx, 0]];
+        coords = [[-baseDx, 0], [baseDx, 0]];
       }
     }
 
     if (stickArrow) {
       // make stick arrow
-      head = [[-headDx + dx, stemLen - headLen], [dx, stemLen], [headDx + dx, stemLen - headLen]];
-      coords = [stem, head]; // MultiLineString coords
+      coords = [coords]; // MultiLineString coords
+      if (headLen > 0) {
+        coords.push([[-headDx + dx, stemLen - headLen], [dx, stemLen], [headDx + dx, stemLen - headLen]]);
+      }
     } else {
       // make filled arrow
       // coordinates go counter clockwise, starting from the leftmost head coordinate
-      head = [[stemDx + dx, dy], [headDx + dx, dy],
-          [dx, headLen + dy], [-headDx + dx, dy], [-stemDx + dx, dy]];
-      coords = stem.concat(head);
-      coords.push(stem[0].concat()); // closed path
+      coords.push([stemDx + dx, dy]);
+      if (headLen > 0) {
+        coords.push([headDx + dx, dy], [dx, headLen + dy], [-headDx + dx, dy]);
+      }
+      coords.push([-stemDx + dx, dy], coords[0].concat()); // close path
       coords = [coords]; // Polygon coords
     }
 
@@ -42416,7 +42435,6 @@ ${svg}
     var totalLen = Math.max(d.radius || d.length || d.r || 0, 0),
         scale = 1,
         o = initArrowSize(d); // calc several parameters
-
     if (totalLen >= 0) {
       scale = calcScale(totalLen, o.headLen, d);
       o.stemWidth *= scale;
@@ -42425,7 +42443,7 @@ ${svg}
       o.stemLen = stickArrow ? totalLen : totalLen - o.headLen;
     }
 
-    if (o.headWidth < o.stemWidth) {
+    if (o.headWidth < o.stemWidth && o.headWidth > 0) {
       stop('Arrow head must be at least as wide as the stem.');
     }
     return o;
@@ -42454,14 +42472,18 @@ ${svg}
       headWidth: d['head-width'],
       headLen: d['head-length']
     };
-    if (!o.headWidth) {
-      if (o.headLen) {
+    if (o.headWidth === 0) {
+      o.headLen = 0;
+    } else if (o.headWidth > 0 === false) {
+      if (o.headLen > 0) {
         o.headWidth = o.headLen / sizeRatio;
+      } else if (o.headLen === 0) {
+        o.headWidth = 0;
       } else {
         o.headWidth = o.stemWidth * 3; // assumes stemWidth has been set
       }
     }
-    if (!o.headLen) {
+    if (o.headLen >= 0 === false) {
       o.headLen = o.headWidth * sizeRatio;
     }
     return o;
@@ -42512,11 +42534,8 @@ ${svg}
     var radius = getSymbolRadius(d);
     // TODO: remove duplication with svg-symbols.js
     if (+opts.scale) radius *= +opts.scale;
-    return {
-      type: 'circle',
-      fill: getSymbolFillColor(d),
-      r: radius
-    };
+    var sym = { type: 'circle', r: radius };
+    return applySymbolStyles(sym, d);
   }
 
   function getPolygonCoords(d) {
@@ -42608,11 +42627,13 @@ ${svg}
     var radii = parseRings(d.radii || '2').map(function(r) { return r * scale; });
     var solidCenter = utils.isOdd(radii.length);
     var color = getSymbolFillColor(d);
+    var opacity = opts.opacity || undefined;
     var parts = [];
     if (solidCenter) {
       parts.push({
         type: 'circle',
         fill: color,
+        opacity: opacity,
         r: radii.shift()
       });
     }
@@ -42621,6 +42642,7 @@ ${svg}
         type: 'circle',
         fill: 'none', // TODO remove default black fill so this is not needed
         stroke: color,
+        opacity: opacity,
         'stroke-width':  roundToTenths(radii[i+1] - radii[i]),
         r: roundToTenths(radii[i+1] * 0.5 + radii[i] * 0.5)
       });
@@ -42668,19 +42690,18 @@ ${svg}
     if (geojsonType == 'MultiPolygon' || geojsonType == 'Polygon') {
       sym = {
         type: 'polygon',
-        fill: getSymbolFillColor(properties),
         coordinates: geojsonType == 'Polygon' ? coords : flattenMultiPolygonCoords(coords)
       };
     } else if (geojsonType == 'LineString' || geojsonType == 'MultiLineString') {
       sym = {
         type: 'polyline',
-        stroke: getSymbolStrokeColor(properties),
         'stroke-width': properties['stroke-width'] || 2,
         coordinates: geojsonType == 'LineString' ? [coords] : coords
       };
     } else {
       error('Unsupported type:', geojsonType);
     }
+    applySymbolStyles(sym, properties);
     roundCoordsForSVG(sym.coordinates);
     return sym;
   }
@@ -42740,6 +42761,7 @@ ${svg}
         scaleAndShiftCoords(coords, metersPerPx, shp[0]);
         if (d.fill) rec.fill = d.fill;
         if (d.stroke) rec.stroke = d.stroke;
+        if (d.opacity) rec.opacity = d.opacity;
         return createGeometry(coords, geojsonType);
       } else {
         rec['svg-symbol'] = makePathSymbol(coords, d, geojsonType);

package/package.json

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

package/www/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.6.36";
+  var VERSION = "0.6.38";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -24574,6 +24574,10 @@ ${svg}
       .option('stroke-width', {
         describe: 'symbol line width (linear symbols only)'
       })
+      .option('opacity', {
+        describe: 'symbol opacity',
+        type: 'number'
+      })
       .option('geographic', {
         old_alias: 'polygons',
          describe: 'make geographic shapes instead of SVG objects',
@@ -42281,6 +42285,18 @@ ${svg}
     return d.stroke || d.fill || 'magenta';
   }
 
+  function applySymbolStyles(sym, d) {
+    if (sym.type == 'polyline') {
+      sym.stroke = getSymbolStrokeColor(d);
+    } else {
+      sym.fill = getSymbolFillColor(d);
+    }
+    if (d.opacity) {
+      sym.opacity = d.opacity;
+    }
+    return sym;
+  }
+
   function getSymbolRadius(d) {
     if (d.radius === 0 || d.length === 0 || d.r === 0) return 0;
     return d.radius || d.length || d.r || 5; // use a default value
@@ -42346,7 +42362,7 @@ ${svg}
         headDx = size.headWidth / 2,
         stemDx = size.stemWidth / 2,
         baseDx = stemDx * (1 - stemTaper),
-        head, stem, coords, dx, dy;
+        coords, dx, dy;
 
     if (curvature) {
       // make curved stem
@@ -42359,11 +42375,11 @@ ${svg}
       dy = stemLen * Math.cos(theta / 2);
 
       if (stickArrow) {
-        stem = getCurvedStemCoords(-ax, -ay, dx, dy);
+        coords = getCurvedStemCoords(-ax, -ay, dx, dy);
       } else {
         var leftStem = getCurvedStemCoords(-ax, -ay, -stemDx + dx, dy);
         var rightStem = getCurvedStemCoords(ax, ay, stemDx + dx, dy);
-        stem = leftStem.concat(rightStem.reverse());
+        coords = leftStem.concat(rightStem.reverse());
       }
 
     } else {
@@ -42371,23 +42387,26 @@ ${svg}
       dx = 0;
       dy = stemLen;
       if (stickArrow) {
-        stem = [[0, 0], [0, stemLen]];
+        coords = [[0, 0], [0, stemLen]];
       } else {
-        stem = [[-baseDx, 0], [baseDx, 0]];
+        coords = [[-baseDx, 0], [baseDx, 0]];
       }
     }
 
     if (stickArrow) {
       // make stick arrow
-      head = [[-headDx + dx, stemLen - headLen], [dx, stemLen], [headDx + dx, stemLen - headLen]];
-      coords = [stem, head]; // MultiLineString coords
+      coords = [coords]; // MultiLineString coords
+      if (headLen > 0) {
+        coords.push([[-headDx + dx, stemLen - headLen], [dx, stemLen], [headDx + dx, stemLen - headLen]]);
+      }
     } else {
       // make filled arrow
       // coordinates go counter clockwise, starting from the leftmost head coordinate
-      head = [[stemDx + dx, dy], [headDx + dx, dy],
-          [dx, headLen + dy], [-headDx + dx, dy], [-stemDx + dx, dy]];
-      coords = stem.concat(head);
-      coords.push(stem[0].concat()); // closed path
+      coords.push([stemDx + dx, dy]);
+      if (headLen > 0) {
+        coords.push([headDx + dx, dy], [dx, headLen + dy], [-headDx + dx, dy]);
+      }
+      coords.push([-stemDx + dx, dy], coords[0].concat()); // close path
       coords = [coords]; // Polygon coords
     }
 
@@ -42416,7 +42435,6 @@ ${svg}
     var totalLen = Math.max(d.radius || d.length || d.r || 0, 0),
         scale = 1,
         o = initArrowSize(d); // calc several parameters
-
     if (totalLen >= 0) {
       scale = calcScale(totalLen, o.headLen, d);
       o.stemWidth *= scale;
@@ -42425,7 +42443,7 @@ ${svg}
       o.stemLen = stickArrow ? totalLen : totalLen - o.headLen;
     }
 
-    if (o.headWidth < o.stemWidth) {
+    if (o.headWidth < o.stemWidth && o.headWidth > 0) {
       stop('Arrow head must be at least as wide as the stem.');
     }
     return o;
@@ -42454,14 +42472,18 @@ ${svg}
       headWidth: d['head-width'],
       headLen: d['head-length']
     };
-    if (!o.headWidth) {
-      if (o.headLen) {
+    if (o.headWidth === 0) {
+      o.headLen = 0;
+    } else if (o.headWidth > 0 === false) {
+      if (o.headLen > 0) {
         o.headWidth = o.headLen / sizeRatio;
+      } else if (o.headLen === 0) {
+        o.headWidth = 0;
       } else {
         o.headWidth = o.stemWidth * 3; // assumes stemWidth has been set
       }
     }
-    if (!o.headLen) {
+    if (o.headLen >= 0 === false) {
       o.headLen = o.headWidth * sizeRatio;
     }
     return o;
@@ -42512,11 +42534,8 @@ ${svg}
     var radius = getSymbolRadius(d);
     // TODO: remove duplication with svg-symbols.js
     if (+opts.scale) radius *= +opts.scale;
-    return {
-      type: 'circle',
-      fill: getSymbolFillColor(d),
-      r: radius
-    };
+    var sym = { type: 'circle', r: radius };
+    return applySymbolStyles(sym, d);
   }
 
   function getPolygonCoords(d) {
@@ -42608,11 +42627,13 @@ ${svg}
     var radii = parseRings(d.radii || '2').map(function(r) { return r * scale; });
     var solidCenter = utils.isOdd(radii.length);
     var color = getSymbolFillColor(d);
+    var opacity = opts.opacity || undefined;
     var parts = [];
     if (solidCenter) {
       parts.push({
         type: 'circle',
         fill: color,
+        opacity: opacity,
         r: radii.shift()
       });
     }
@@ -42621,6 +42642,7 @@ ${svg}
         type: 'circle',
         fill: 'none', // TODO remove default black fill so this is not needed
         stroke: color,
+        opacity: opacity,
         'stroke-width':  roundToTenths(radii[i+1] - radii[i]),
         r: roundToTenths(radii[i+1] * 0.5 + radii[i] * 0.5)
       });
@@ -42668,19 +42690,18 @@ ${svg}
     if (geojsonType == 'MultiPolygon' || geojsonType == 'Polygon') {
       sym = {
         type: 'polygon',
-        fill: getSymbolFillColor(properties),
         coordinates: geojsonType == 'Polygon' ? coords : flattenMultiPolygonCoords(coords)
       };
     } else if (geojsonType == 'LineString' || geojsonType == 'MultiLineString') {
       sym = {
         type: 'polyline',
-        stroke: getSymbolStrokeColor(properties),
         'stroke-width': properties['stroke-width'] || 2,
         coordinates: geojsonType == 'LineString' ? [coords] : coords
       };
     } else {
       error('Unsupported type:', geojsonType);
     }
+    applySymbolStyles(sym, properties);
     roundCoordsForSVG(sym.coordinates);
     return sym;
   }
@@ -42740,6 +42761,7 @@ ${svg}
         scaleAndShiftCoords(coords, metersPerPx, shp[0]);
         if (d.fill) rec.fill = d.fill;
         if (d.stroke) rec.stroke = d.stroke;
+        if (d.opacity) rec.opacity = d.opacity;
         return createGeometry(coords, geojsonType);
       } else {
         rec['svg-symbol'] = makePathSymbol(coords, d, geojsonType);