mapshaper 0.5.81 → 0.5.82

package/CHANGELOG.md

@@ -1,3 +1,6 @@
+v0.5.82
+* More options for arrow styling.
+
 v0.5.81
 * Bug fixes
 

package/mapshaper.js

@@ -2359,6 +2359,12 @@
     }, 0);
   }
 
+  // export function getEllipsoidalShapeArea(shp, arcs, crs) {
+  //   return (shp || []).reduce(function(area, ids) {
+  //     return area + getEllipsoidalPathArea(ids, arcs, crs);
+  //   }, 0);
+  // }
+
   // Return true if point is inside or on boundary of a shape
   //
   function testPointInPolygon(x, y, shp, arcs) {
@@ -13699,6 +13705,8 @@
     'arrow-stem-width': 'number',
     'arrow-stem-curve': 'number', // degrees of arc
     'arrow-stem-taper': 'number',
+    'arrow-stem-length': 'number',
+    'arrow-head-length': 'number',
     'arrow-min-stem': 'number',
     'arrow-scaling': 'number',
     effect: null // e.g. "fade"
@@ -20096,9 +20104,18 @@ ${svg}
       .option('arrow-head-width', {
         describe: 'size of arrow head from side to side'
       })
+      .option('arrow-head-length', {
+        describe: 'length of arrow head (alternative to arrow-head-angle)'
+      })
+      .option('arrow-head-shape', {
+        // describe: 'options: a b c'
+      })
       .option('arrow-stem-width', {
         describe: 'width of stem at its widest point'
       })
+      .option('arrow-stem-length', {
+        describe: 'alternative to arrow-length'
+      })
       .option('arrow-stem-taper', {
         describe: 'factor for tapering the width of the stem'
       })
@@ -37929,47 +37946,63 @@ ${svg}
     points.push(p2);
   }
 
-  function getStickArrowCoords(d, totalLen) {
-    var minStemRatio = getMinStemRatio(d);
-    var headAngle = d['arrow-head-angle'] || 90;
-    var curve = d['arrow-stem-curve'] || 0;
-    var unscaledHeadWidth = d['arrow-head-width'] || 9;
-    var unscaledHeadLen = getHeadLength(unscaledHeadWidth, headAngle);
-    var scale = getScale(totalLen, unscaledHeadLen, minStemRatio);
-    var headWidth = unscaledHeadWidth * scale;
-    var headLen = unscaledHeadLen * scale;
-    var tip = getStickArrowTip(totalLen, curve);
-    var stem = [[0, 0], tip.concat()];
-    if (curve) {
-      addBezierArcControlPoints(stem, curve);
-    }
-    if (!headLen) return [stem];
-    var head = [addPoints([-headWidth / 2, -headLen], tip), tip.concat(), addPoints([headWidth / 2, -headLen], tip)];
+  // export function getStickArrowCoords(d, totalLen) {
+  //   var minStemRatio = getMinStemRatio(d);
+  //   var headAngle = d['arrow-head-angle'] || 90;
+  //   var curve = d['arrow-stem-curve'] || 0;
+  //   var unscaledHeadWidth = d['arrow-head-width'] || 9;
+  //   var unscaledHeadLen = getHeadLength(unscaledHeadWidth, headAngle);
+  //   var scale = getScale(totalLen, unscaledHeadLen, minStemRatio);
+  //   var headWidth = unscaledHeadWidth * scale;
+  //   var headLen = unscaledHeadLen * scale;
+  //   var tip = getStickArrowTip(totalLen, curve);
+  //   var stem = [[0, 0], tip.concat()];
+  //   if (curve) {
+  //     addBezierArcControlPoints(stem, curve);
+  //   }
+  //   if (!headLen) return [stem];
+  //   var head = [addPoints([-headWidth / 2, -headLen], tip), tip.concat(), addPoints([headWidth / 2, -headLen], tip)];
 
-    rotateCoords(stem, d.rotation);
-    rotateCoords(head, d.rotation);
-    return [stem, head];
-  }
+  //   rotateCoords(stem, d.rotation);
+  //   rotateCoords(head, d.rotation);
+  //   return [stem, head];
+  // }
 
   function getMinStemRatio(d) {
     return d['arrow-min-stem'] >= 0 ? d['arrow-min-stem'] : 0.4;
   }
 
-  function getFilledArrowCoords(totalLen, d) {
-    var minStemRatio = getMinStemRatio(d),
-        headAngle = d['arrow-head-angle'] || 40,
+  function getFilledArrowCoords(d) {
+    var totalLen = d['arrow-length'] || d.radius || d.length || d.r || 0,
         direction = d.rotation || d['arrow-direction'] || 0,
         unscaledStemWidth = d['arrow-stem-width'] || 2,
         unscaledHeadWidth = d['arrow-head-width'] || unscaledStemWidth * 3,
-        unscaledHeadLen = getHeadLength(unscaledHeadWidth, headAngle),
-        scale = getScale(totalLen, unscaledHeadLen, minStemRatio),
-        headWidth = unscaledHeadWidth * scale,
-        headLen = unscaledHeadLen * scale,
-        stemWidth = unscaledStemWidth * scale,
+        unscaledHeadLen = getHeadLength(unscaledHeadWidth, d),
         stemTaper = d['arrow-stem-taper'] || 0,
-        stemCurve = d['arrow-stem-curve'] || 0,
-        stemLen = totalLen - headLen,
-        coords;
+        stemCurve = d['arrow-stem-curve'] || 0;
+
+    var headLen, headWidth, stemLen, stemWidth;
+
+    var scale = 1;
+
+    if (totalLen > 0) {
+      scale = getScale(totalLen, unscaledHeadLen,  getMinStemRatio(d));
+      headWidth = unscaledHeadWidth * scale;
+      headLen = unscaledHeadLen * scale;
+      stemWidth = unscaledStemWidth * scale;
+      stemLen = totalLen - headLen;
+
+    } else {
+      headWidth = unscaledHeadWidth;
+      headLen = unscaledHeadLen;
+      stemWidth = unscaledStemWidth;
+      stemLen = d['arrow-stem-length'] || 0;
+      totalLen = headLen + stemLen;
+    }
+
+    if (totalLen > 0 === false) return null;
+
+    var coords;
 
     var headDx = headWidth / 2,
         stemDx = stemWidth / 2,
@@ -38001,20 +38034,23 @@ ${svg}
     return 1;
   }
 
-  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 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 getHeadLength(headWidth, headAngle) {
+  function getHeadLength(headWidth, d) {
+    var headLength = d['arrow-head-length'];
+    if (headLength > 0) return headLength;
+    var headAngle = d['arrow-head-angle'] || 40;
     var headRatio = 1 / Math.tan(Math.PI * headAngle / 180 / 2) / 2; // length-to-width head ratio
     return headWidth * headRatio;
   }
@@ -38073,7 +38109,9 @@ ${svg}
   // sides: e.g. 5-pointed star has 10 sides
   // radius: distance from center to point
   //
-  function getPolygonCoords(radius, opts) {
+  function getPolygonCoords(opts) {
+    var radius = opts.radius || opts.length || opts.r;
+    if (radius > 0 === false) return null;
     var type = opts.type;
     var sides = +opts.sides || getDefaultSides(type);
     var isStar = type == 'star';
@@ -38133,16 +38171,13 @@ ${svg}
       if (!shp) return null;
       var d = getSymbolData(i);
       var rec = records[i] || {};
-      var coords, size, constructor;
+      var coords;
       if (d.type == 'arrow') {
-        size = d.radius || d.length || d['arrow-length'] || d.r;
-        constructor = getFilledArrowCoords;
+        coords = getFilledArrowCoords(d);
       } else {
-        size = d.radius || d.length || d.r;
-        constructor = getPolygonCoords;
+        coords = getPolygonCoords(d);
       }
-      if (size > 0 === false) return null;
-      coords = constructor(size, d, opts);
+      if (!coords) return null;
       rotateCoords(coords, +d.rotation || 0);
       if (!polygonMode) {
         flipY(coords);

package/package.json

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

package/www/mapshaper.js

@@ -2359,6 +2359,12 @@
     }, 0);
   }
 
+  // export function getEllipsoidalShapeArea(shp, arcs, crs) {
+  //   return (shp || []).reduce(function(area, ids) {
+  //     return area + getEllipsoidalPathArea(ids, arcs, crs);
+  //   }, 0);
+  // }
+
   // Return true if point is inside or on boundary of a shape
   //
   function testPointInPolygon(x, y, shp, arcs) {
@@ -13699,6 +13705,8 @@
     'arrow-stem-width': 'number',
     'arrow-stem-curve': 'number', // degrees of arc
     'arrow-stem-taper': 'number',
+    'arrow-stem-length': 'number',
+    'arrow-head-length': 'number',
     'arrow-min-stem': 'number',
     'arrow-scaling': 'number',
     effect: null // e.g. "fade"
@@ -20096,9 +20104,18 @@ ${svg}
       .option('arrow-head-width', {
         describe: 'size of arrow head from side to side'
       })
+      .option('arrow-head-length', {
+        describe: 'length of arrow head (alternative to arrow-head-angle)'
+      })
+      .option('arrow-head-shape', {
+        // describe: 'options: a b c'
+      })
       .option('arrow-stem-width', {
         describe: 'width of stem at its widest point'
       })
+      .option('arrow-stem-length', {
+        describe: 'alternative to arrow-length'
+      })
       .option('arrow-stem-taper', {
         describe: 'factor for tapering the width of the stem'
       })
@@ -37929,47 +37946,63 @@ ${svg}
     points.push(p2);
   }
 
-  function getStickArrowCoords(d, totalLen) {
-    var minStemRatio = getMinStemRatio(d);
-    var headAngle = d['arrow-head-angle'] || 90;
-    var curve = d['arrow-stem-curve'] || 0;
-    var unscaledHeadWidth = d['arrow-head-width'] || 9;
-    var unscaledHeadLen = getHeadLength(unscaledHeadWidth, headAngle);
-    var scale = getScale(totalLen, unscaledHeadLen, minStemRatio);
-    var headWidth = unscaledHeadWidth * scale;
-    var headLen = unscaledHeadLen * scale;
-    var tip = getStickArrowTip(totalLen, curve);
-    var stem = [[0, 0], tip.concat()];
-    if (curve) {
-      addBezierArcControlPoints(stem, curve);
-    }
-    if (!headLen) return [stem];
-    var head = [addPoints([-headWidth / 2, -headLen], tip), tip.concat(), addPoints([headWidth / 2, -headLen], tip)];
+  // export function getStickArrowCoords(d, totalLen) {
+  //   var minStemRatio = getMinStemRatio(d);
+  //   var headAngle = d['arrow-head-angle'] || 90;
+  //   var curve = d['arrow-stem-curve'] || 0;
+  //   var unscaledHeadWidth = d['arrow-head-width'] || 9;
+  //   var unscaledHeadLen = getHeadLength(unscaledHeadWidth, headAngle);
+  //   var scale = getScale(totalLen, unscaledHeadLen, minStemRatio);
+  //   var headWidth = unscaledHeadWidth * scale;
+  //   var headLen = unscaledHeadLen * scale;
+  //   var tip = getStickArrowTip(totalLen, curve);
+  //   var stem = [[0, 0], tip.concat()];
+  //   if (curve) {
+  //     addBezierArcControlPoints(stem, curve);
+  //   }
+  //   if (!headLen) return [stem];
+  //   var head = [addPoints([-headWidth / 2, -headLen], tip), tip.concat(), addPoints([headWidth / 2, -headLen], tip)];
 
-    rotateCoords(stem, d.rotation);
-    rotateCoords(head, d.rotation);
-    return [stem, head];
-  }
+  //   rotateCoords(stem, d.rotation);
+  //   rotateCoords(head, d.rotation);
+  //   return [stem, head];
+  // }
 
   function getMinStemRatio(d) {
     return d['arrow-min-stem'] >= 0 ? d['arrow-min-stem'] : 0.4;
   }
 
-  function getFilledArrowCoords(totalLen, d) {
-    var minStemRatio = getMinStemRatio(d),
-        headAngle = d['arrow-head-angle'] || 40,
+  function getFilledArrowCoords(d) {
+    var totalLen = d['arrow-length'] || d.radius || d.length || d.r || 0,
         direction = d.rotation || d['arrow-direction'] || 0,
         unscaledStemWidth = d['arrow-stem-width'] || 2,
         unscaledHeadWidth = d['arrow-head-width'] || unscaledStemWidth * 3,
-        unscaledHeadLen = getHeadLength(unscaledHeadWidth, headAngle),
-        scale = getScale(totalLen, unscaledHeadLen, minStemRatio),
-        headWidth = unscaledHeadWidth * scale,
-        headLen = unscaledHeadLen * scale,
-        stemWidth = unscaledStemWidth * scale,
+        unscaledHeadLen = getHeadLength(unscaledHeadWidth, d),
         stemTaper = d['arrow-stem-taper'] || 0,
-        stemCurve = d['arrow-stem-curve'] || 0,
-        stemLen = totalLen - headLen,
-        coords;
+        stemCurve = d['arrow-stem-curve'] || 0;
+
+    var headLen, headWidth, stemLen, stemWidth;
+
+    var scale = 1;
+
+    if (totalLen > 0) {
+      scale = getScale(totalLen, unscaledHeadLen,  getMinStemRatio(d));
+      headWidth = unscaledHeadWidth * scale;
+      headLen = unscaledHeadLen * scale;
+      stemWidth = unscaledStemWidth * scale;
+      stemLen = totalLen - headLen;
+
+    } else {
+      headWidth = unscaledHeadWidth;
+      headLen = unscaledHeadLen;
+      stemWidth = unscaledStemWidth;
+      stemLen = d['arrow-stem-length'] || 0;
+      totalLen = headLen + stemLen;
+    }
+
+    if (totalLen > 0 === false) return null;
+
+    var coords;
 
     var headDx = headWidth / 2,
         stemDx = stemWidth / 2,
@@ -38001,20 +38034,23 @@ ${svg}
     return 1;
   }
 
-  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 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 getHeadLength(headWidth, headAngle) {
+  function getHeadLength(headWidth, d) {
+    var headLength = d['arrow-head-length'];
+    if (headLength > 0) return headLength;
+    var headAngle = d['arrow-head-angle'] || 40;
     var headRatio = 1 / Math.tan(Math.PI * headAngle / 180 / 2) / 2; // length-to-width head ratio
     return headWidth * headRatio;
   }
@@ -38073,7 +38109,9 @@ ${svg}
   // sides: e.g. 5-pointed star has 10 sides
   // radius: distance from center to point
   //
-  function getPolygonCoords(radius, opts) {
+  function getPolygonCoords(opts) {
+    var radius = opts.radius || opts.length || opts.r;
+    if (radius > 0 === false) return null;
     var type = opts.type;
     var sides = +opts.sides || getDefaultSides(type);
     var isStar = type == 'star';
@@ -38133,16 +38171,13 @@ ${svg}
       if (!shp) return null;
       var d = getSymbolData(i);
       var rec = records[i] || {};
-      var coords, size, constructor;
+      var coords;
       if (d.type == 'arrow') {
-        size = d.radius || d.length || d['arrow-length'] || d.r;
-        constructor = getFilledArrowCoords;
+        coords = getFilledArrowCoords(d);
       } else {
-        size = d.radius || d.length || d.r;
-        constructor = getPolygonCoords;
+        coords = getPolygonCoords(d);
       }
-      if (size > 0 === false) return null;
-      coords = constructor(size, d, opts);
+      if (!coords) return null;
       rotateCoords(coords, +d.rotation || 0);
       if (!polygonMode) {
         flipY(coords);