mapshaper 0.5.83 → 0.5.84

package/CHANGELOG.md

@@ -1,3 +1,6 @@
+v0.5.84
+* Bug fixes
+
 v0.5.83
 * Added support for importing GeoJSON features with GeometryCollection type geometries.
 * Added "ring" symbol type.

package/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.5.79";
+  var VERSION = "0.5.83";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -13719,7 +13719,7 @@
     'stem-curve': 'number', // degrees of arc
     'stem-taper': 'number',
     'stem-length': 'number',
-    'min-stem': 'number',
+    'min-stem-ratio': 'number',
     'arrow-scaling': 'number',
     effect: null // e.g. "fade"
   }, stylePropertyTypes);
@@ -38063,6 +38063,17 @@ ${svg}
   //   return [stem, head];
   // }
 
+  // function getStickArrowTip(totalLen, curve) {
+  //   // curve/2 intersects the arrowhead at 90deg (trigonometry)
+  //   var theta = Math.abs(curve/2) / 180 * Math.PI;
+  //   var dx = totalLen * Math.sin(theta) * (curve > 0 ? -1 : 1);
+  //   var dy = totalLen * Math.cos(theta);
+  //   return [dx, dy];
+  // }
+
+  // function addPoints(a, b) {
+  //   return [a[0] + b[0], a[1] + b[1]];
+  // }
 
   function getFilledArrowCoords(d) {
     var direction = d.rotation || d.direction || 0,
@@ -38081,7 +38092,7 @@ ${svg}
       coords = calcStraightArrowCoords(size.stemLen, size.headLen, stemDx, headDx, baseDx);
     } else {
       if (direction > 0) stemCurve = -stemCurve;
-      coords = getCurvedArrowCoords(size.stemLen, size.headLen, size.stemCurve, stemDx, headDx, baseDx);
+      coords = getCurvedArrowCoords(size.stemLen, size.headLen, stemCurve, stemDx, headDx, baseDx);
     }
 
     rotateCoords(coords, direction);
@@ -38098,34 +38109,25 @@ ${svg}
 
   function calcArrowSize(d) {
     var totalLen = d.radius || d.length || d.r || 0,
-        unscaledStemWidth = d['stem-width'] || 2,
-        unscaledHeadWidth = d['head-width'] || unscaledStemWidth * 3,
-        unscaledHeadLen = d['head-length'] || calcHeadLength(unscaledHeadWidth, d),
         scale = 1,
-        o = {};
+        o = initArrowSize(d); // calc several parameters
 
     if (totalLen > 0) {
-      scale = calcScale(totalLen, unscaledHeadLen, d);
-      o.headWidth = unscaledHeadWidth * scale;
-      o.headLen = unscaledHeadLen * scale;
-      o.stemWidth = unscaledStemWidth * scale;
+      scale = calcScale(totalLen, o.headLen, d);
+      o.stemWidth *= scale;
+      o.headWidth *= scale;
+      o.headLen *= scale;
       o.stemLen = totalLen - o.headLen;
-
-    } else {
-      o.headWidth = unscaledHeadWidth;
-      o.headLen = unscaledHeadLen;
-      o.stemWidth = unscaledStemWidth;
-      o.stemLen = d['stem-length'] || 0;
     }
 
-    if (unscaledHeadWidth < unscaledStemWidth) {
+    if (o.headWidth < o.stemWidth) {
       stop('Arrow head must be at least as wide as the stem.');
     }
     return o;
   }
 
   function calcScale(totalLen, headLen, d) {
-    var minStemRatio = d['min-stem'] >= 0 ? d['min-stem'] : 0;
+    var minStemRatio = d['min-stem-ratio'] >= 0 ? d['min-stem-ratio'] : 0;
     var stemLen = d['stem-length'] || 0;
     var maxHeadPct = 1 - minStemRatio;
     var headPct = headLen / totalLen;
@@ -38139,23 +38141,31 @@ ${svg}
     return scale;
   }
 
-  // function getStickArrowTip(totalLen, curve) {
-  //   // curve/2 intersects the arrowhead at 90deg (trigonometry)
-  //   var theta = Math.abs(curve/2) / 180 * Math.PI;
-  //   var dx = totalLen * Math.sin(theta) * (curve > 0 ? -1 : 1);
-  //   var dy = totalLen * Math.cos(theta);
-  //   return [dx, dy];
-  // }
-
-  function addPoints(a, b) {
-    return [a[0] + b[0], a[1] + b[1]];
+  function initArrowSize(d) {
+    var sizeRatio = getHeadSizeRatio(d['head-angle'] || 40); // length to width
+    var o = {
+      stemWidth: d['stem-width'] || 2,
+      stemLen: d['stem-length'] || 0,
+      headWidth: d['head-width'],
+      headLen: d['head-length']
+    };
+    if (!o.headWidth) {
+      if (o.headLen) {
+        o.headWidth = o.headLen / sizeRatio;
+      } else {
+        o.headWidth = o.stemWidth * 3; // assumes stemWidth has been set
+      }
+    }
+    if (!o.headLen) {
+      o.headLen = o.headWidth * sizeRatio;
+    }
+    return o;
   }
 
 
-  function calcHeadLength(headWidth, d) {
-    var headAngle = d['head-angle'] || 40;
-    var headRatio = 1 / Math.tan(Math.PI * headAngle / 180 / 2) / 2; // length-to-width head ratio
-    return headWidth * headRatio;
+  // Returns ratio of head length to head width
+  function getHeadSizeRatio(headAngle) {
+    return 1 / Math.tan(Math.PI * headAngle / 180 / 2) / 2;
   }
 
   function getCurvedArrowCoords(stemLen, headLen, curvature, stemDx, headDx, baseDx) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mapshaper",
-	"version": "0.5.83",
+	"version": "0.5.84",
 	"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.5.79";
+  var VERSION = "0.5.83";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -13719,7 +13719,7 @@
     'stem-curve': 'number', // degrees of arc
     'stem-taper': 'number',
     'stem-length': 'number',
-    'min-stem': 'number',
+    'min-stem-ratio': 'number',
     'arrow-scaling': 'number',
     effect: null // e.g. "fade"
   }, stylePropertyTypes);
@@ -38063,6 +38063,17 @@ ${svg}
   //   return [stem, head];
   // }
 
+  // function getStickArrowTip(totalLen, curve) {
+  //   // curve/2 intersects the arrowhead at 90deg (trigonometry)
+  //   var theta = Math.abs(curve/2) / 180 * Math.PI;
+  //   var dx = totalLen * Math.sin(theta) * (curve > 0 ? -1 : 1);
+  //   var dy = totalLen * Math.cos(theta);
+  //   return [dx, dy];
+  // }
+
+  // function addPoints(a, b) {
+  //   return [a[0] + b[0], a[1] + b[1]];
+  // }
 
   function getFilledArrowCoords(d) {
     var direction = d.rotation || d.direction || 0,
@@ -38081,7 +38092,7 @@ ${svg}
       coords = calcStraightArrowCoords(size.stemLen, size.headLen, stemDx, headDx, baseDx);
     } else {
       if (direction > 0) stemCurve = -stemCurve;
-      coords = getCurvedArrowCoords(size.stemLen, size.headLen, size.stemCurve, stemDx, headDx, baseDx);
+      coords = getCurvedArrowCoords(size.stemLen, size.headLen, stemCurve, stemDx, headDx, baseDx);
     }
 
     rotateCoords(coords, direction);
@@ -38098,34 +38109,25 @@ ${svg}
 
   function calcArrowSize(d) {
     var totalLen = d.radius || d.length || d.r || 0,
-        unscaledStemWidth = d['stem-width'] || 2,
-        unscaledHeadWidth = d['head-width'] || unscaledStemWidth * 3,
-        unscaledHeadLen = d['head-length'] || calcHeadLength(unscaledHeadWidth, d),
         scale = 1,
-        o = {};
+        o = initArrowSize(d); // calc several parameters
 
     if (totalLen > 0) {
-      scale = calcScale(totalLen, unscaledHeadLen, d);
-      o.headWidth = unscaledHeadWidth * scale;
-      o.headLen = unscaledHeadLen * scale;
-      o.stemWidth = unscaledStemWidth * scale;
+      scale = calcScale(totalLen, o.headLen, d);
+      o.stemWidth *= scale;
+      o.headWidth *= scale;
+      o.headLen *= scale;
       o.stemLen = totalLen - o.headLen;
-
-    } else {
-      o.headWidth = unscaledHeadWidth;
-      o.headLen = unscaledHeadLen;
-      o.stemWidth = unscaledStemWidth;
-      o.stemLen = d['stem-length'] || 0;
     }
 
-    if (unscaledHeadWidth < unscaledStemWidth) {
+    if (o.headWidth < o.stemWidth) {
       stop('Arrow head must be at least as wide as the stem.');
     }
     return o;
   }
 
   function calcScale(totalLen, headLen, d) {
-    var minStemRatio = d['min-stem'] >= 0 ? d['min-stem'] : 0;
+    var minStemRatio = d['min-stem-ratio'] >= 0 ? d['min-stem-ratio'] : 0;
     var stemLen = d['stem-length'] || 0;
     var maxHeadPct = 1 - minStemRatio;
     var headPct = headLen / totalLen;
@@ -38139,23 +38141,31 @@ ${svg}
     return scale;
   }
 
-  // function getStickArrowTip(totalLen, curve) {
-  //   // curve/2 intersects the arrowhead at 90deg (trigonometry)
-  //   var theta = Math.abs(curve/2) / 180 * Math.PI;
-  //   var dx = totalLen * Math.sin(theta) * (curve > 0 ? -1 : 1);
-  //   var dy = totalLen * Math.cos(theta);
-  //   return [dx, dy];
-  // }
-
-  function addPoints(a, b) {
-    return [a[0] + b[0], a[1] + b[1]];
+  function initArrowSize(d) {
+    var sizeRatio = getHeadSizeRatio(d['head-angle'] || 40); // length to width
+    var o = {
+      stemWidth: d['stem-width'] || 2,
+      stemLen: d['stem-length'] || 0,
+      headWidth: d['head-width'],
+      headLen: d['head-length']
+    };
+    if (!o.headWidth) {
+      if (o.headLen) {
+        o.headWidth = o.headLen / sizeRatio;
+      } else {
+        o.headWidth = o.stemWidth * 3; // assumes stemWidth has been set
+      }
+    }
+    if (!o.headLen) {
+      o.headLen = o.headWidth * sizeRatio;
+    }
+    return o;
   }
 
 
-  function calcHeadLength(headWidth, d) {
-    var headAngle = d['head-angle'] || 40;
-    var headRatio = 1 / Math.tan(Math.PI * headAngle / 180 / 2) / 2; // length-to-width head ratio
-    return headWidth * headRatio;
+  // Returns ratio of head length to head width
+  function getHeadSizeRatio(headAngle) {
+    return 1 / Math.tan(Math.PI * headAngle / 180 / 2) / 2;
   }
 
   function getCurvedArrowCoords(stemLen, headLen, curvature, stemDx, headDx, baseDx) {