mapshaper 0.5.80 → 0.5.81

package/CHANGELOG.md

@@ -1,3 +1,6 @@
+v0.5.81
+* Bug fixes
+
 v0.5.80
 * Added arrows, stars and polygons to undocumented -symbols command.
 

package/mapshaper.js

@@ -18032,9 +18032,9 @@ ${svg}
     // Updated: don't trim space from tokens like [delimeter= ]
     argv = argv.map(function(s) {
       if (!/= $/.test(s)) {
-        s = s.trimEnd();
+        s = utils.rtrim(s);
       }
-      s = s.trimStart();
+      s = utils.ltrim(s);
       return s;
     });
     argv = argv.filter(function(s) {return s !== '';}); // remove empty tokens
@@ -37968,13 +37968,16 @@ ${svg}
         stemWidth = unscaledStemWidth * scale,
         stemTaper = d['arrow-stem-taper'] || 0,
         stemCurve = d['arrow-stem-curve'] || 0,
-        stemLen = totalLen - headLen;
+        stemLen = totalLen - headLen,
+        coords;
 
     var headDx = headWidth / 2,
         stemDx = stemWidth / 2,
         baseDx = stemDx * (1 - stemTaper);
 
-    var coords;
+    if (unscaledHeadWidth < unscaledStemWidth) {
+      stop('Arrow head must be at least as wide as the stem.');
+    }
 
     if (!stemCurve || Math.abs(stemCurve) > 90) {
       coords = [[baseDx, 0], [stemDx, stemLen], [headDx, stemLen], [0, stemLen + headLen],
@@ -38028,15 +38031,18 @@ ${svg}
     var ay = baseDx * Math.sin(theta) * -sign;
     var leftStem = getCurvedStemCoords(-ax, -ay, -stemDx + dx, dy, theta);
     var rightStem = getCurvedStemCoords(ax, ay, stemDx + dx, dy, theta);
-    // if (stemTaper == 1) leftStem.pop();
     var stem = leftStem.concat(rightStem.reverse());
-    stem.pop();
+    // stem.pop();
     return stem.concat(head);
   }
 
   // ax, ay: point on the base
   // bx, by: point on the stem
   function getCurvedStemCoords(ax, ay, bx, by, theta0) {
+    // case: curved side intrudes into head (because stem is too short)
+    if (ay > by) {
+      return [[ax * by / ay, by]];
+    }
     var dx = bx - ax,
         dy = by - ay,
         dy1 = (dy * dy - dx * dx) / (2 * dy),
@@ -38048,10 +38054,9 @@ ${svg}
         leftBend = bx > ax,
         sign = leftBend ? 1 : -1,
         points = Math.round(degrees / 5) + 2,
-        // points = theta > 2 && 7 || theta > 1 && 6 || 5,
-        increment = theta / (points + 1);
+        increment = theta / (points + 1),
+        coords = [[bx, by]];
 
-    var coords = [[bx, by]];
     for (var i=1; i<= points; i++) {
       var phi = i * increment / 2;
       var sinPhi = Math.sin(phi);

package/package.json

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

package/www/mapshaper-gui.js

@@ -5986,7 +5986,6 @@
         return parent.querySelector(sel);
       }
 
-
       function getTextTarget3(e) {
         if (e.id > -1 === false || !e.container) return null;
         return getSymbolNodeById(e.id, e.container);

package/www/mapshaper.js

@@ -18032,9 +18032,9 @@ ${svg}
     // Updated: don't trim space from tokens like [delimeter= ]
     argv = argv.map(function(s) {
       if (!/= $/.test(s)) {
-        s = s.trimEnd();
+        s = utils.rtrim(s);
       }
-      s = s.trimStart();
+      s = utils.ltrim(s);
       return s;
     });
     argv = argv.filter(function(s) {return s !== '';}); // remove empty tokens
@@ -37968,13 +37968,16 @@ ${svg}
         stemWidth = unscaledStemWidth * scale,
         stemTaper = d['arrow-stem-taper'] || 0,
         stemCurve = d['arrow-stem-curve'] || 0,
-        stemLen = totalLen - headLen;
+        stemLen = totalLen - headLen,
+        coords;
 
     var headDx = headWidth / 2,
         stemDx = stemWidth / 2,
         baseDx = stemDx * (1 - stemTaper);
 
-    var coords;
+    if (unscaledHeadWidth < unscaledStemWidth) {
+      stop('Arrow head must be at least as wide as the stem.');
+    }
 
     if (!stemCurve || Math.abs(stemCurve) > 90) {
       coords = [[baseDx, 0], [stemDx, stemLen], [headDx, stemLen], [0, stemLen + headLen],
@@ -38028,15 +38031,18 @@ ${svg}
     var ay = baseDx * Math.sin(theta) * -sign;
     var leftStem = getCurvedStemCoords(-ax, -ay, -stemDx + dx, dy, theta);
     var rightStem = getCurvedStemCoords(ax, ay, stemDx + dx, dy, theta);
-    // if (stemTaper == 1) leftStem.pop();
     var stem = leftStem.concat(rightStem.reverse());
-    stem.pop();
+    // stem.pop();
     return stem.concat(head);
   }
 
   // ax, ay: point on the base
   // bx, by: point on the stem
   function getCurvedStemCoords(ax, ay, bx, by, theta0) {
+    // case: curved side intrudes into head (because stem is too short)
+    if (ay > by) {
+      return [[ax * by / ay, by]];
+    }
     var dx = bx - ax,
         dy = by - ay,
         dy1 = (dy * dy - dx * dx) / (2 * dy),
@@ -38048,10 +38054,9 @@ ${svg}
         leftBend = bx > ax,
         sign = leftBend ? 1 : -1,
         points = Math.round(degrees / 5) + 2,
-        // points = theta > 2 && 7 || theta > 1 && 6 || 5,
-        increment = theta / (points + 1);
+        increment = theta / (points + 1),
+        coords = [[bx, by]];
 
-    var coords = [[bx, by]];
     for (var i=1; i<= points; i++) {
       var phi = i * increment / 2;
       var sinPhi = Math.sin(phi);