mapshaper 0.6.100 → 0.6.102

package/mapshaper.js

@@ -267,6 +267,7 @@
     });
   }
 
+
   function defaults(dest) {
     for (var i=1, n=arguments.length; i<n; i++) {
       var src = arguments[i] || {};
@@ -13762,7 +13763,7 @@
             convertIntervalParam(opt[1], crs)];
   }
 
-  // Accepts a single value or a list of four values. List order is l,b,t,r
+  // Accepts a single value or a list of four values. List order is l,b,r,t
   function convertFourSides(opt, crs, bounds) {
     var arr = opt.includes(',') ? opt.split(',') : opt.split(' ');
     if (arr.length == 1) {
@@ -13776,7 +13777,7 @@
         tmp = parseFloat(param) / 100 || 0;
         return tmp * (i == 1 || i == 3 ? bounds.height() : bounds.width());
       }
-      return convertIntervalParam(opt, crs);
+      return convertIntervalParam(param, crs);
     });
   }
 
@@ -18486,18 +18487,30 @@
     type: 'frame'
   }
   */
+
+
   function getFrameData(dataset, exportOpts) {
     var frameLyr = findFrameLayerInDataset(dataset);
-    var frameData;
+    var data;
     if (frameLyr) {
-      frameData = getFrameLayerData(frameLyr, dataset.arcs);
+      data = getFrameLayerData(frameLyr, dataset.arcs);
     } else {
-      frameData = calcFrameData(dataset, exportOpts);
+      data = calcFrameData(dataset, exportOpts);
     }
-    frameData.crs = getDatasetCRS(dataset);
-    return frameData;
+    data.invert_y = !!exportOpts.invert_y;
+    data.crs = getDatasetCRS(dataset);
+    return data;
   }
 
+  function fitDatasetToFrame(dataset, frame) {
+    var bounds = new Bounds(frame.bbox);
+    var bounds2 = frame.bbox2 ? new Bounds(frame.bbox2) : new Bounds(0, 0, frame.width, frame.height);
+    bounds.fillOut(bounds2.width() / bounds2.height());
+    var fwd = bounds.getTransform(bounds2, frame.invert_y);
+    transformPoints(dataset, function(x, y) {
+      return fwd.transform(x, y);
+    });
+  }
 
   function getFrameLayerData(lyr, arcs) {
     var bounds = getLayerBounds(lyr, arcs);
@@ -18515,24 +18528,25 @@
 
 
   function calcFrameData(dataset, opts) {
-    var bounds;
+    var inputBounds, outputBounds;
     if (opts.svg_bbox) {
-      bounds = new Bounds(opts.svg_bbox);
+      inputBounds = new Bounds(opts.svg_bbox);
       opts = Object.assign({margin: 0}, opts); // prevent default pixel margin around content
     } else {
-      bounds = getDatasetBounds(dataset);
+      inputBounds = getDatasetBounds(dataset);
     }
-    var pixBounds = calcOutputSizeInPixels(bounds, opts);
+    // side effect: inputBounds may be expanded to add margins
+    outputBounds = calcOutputBounds(inputBounds, opts);
     return {
-      bbox: bounds.toArray(),
-      bbox2: pixBounds.toArray(),
-      width: Math.round(pixBounds.width()),
-      height: Math.round(pixBounds.height()) || 1,
+      bbox: inputBounds.toArray(),
+      bbox2: outputBounds.toArray(),
+      width: Math.round(outputBounds.width()),
+      height: Math.round(outputBounds.height()) || 1,
       type: 'frame'
     };
   }
 
-  // Used by mapshaper-frame and mapshaper-pixel-transform. TODO: refactor
+  // Used by mapshaper-frame  TODO: refactor
   function getFrameSize(bounds, opts) {
     var aspectRatio = bounds.width() / bounds.height();
     var height, width;
@@ -18601,9 +18615,9 @@
 
 
   // bounds: Bounds object containing bounds of content in geographic coordinates
-  // returns Bounds object containing bounds of pixel output
+  // returns Bounds object containing output bounds
   // side effect: bounds param is modified to match the output frame
-  function calcOutputSizeInPixels(bounds, opts) {
+  function calcOutputBounds(bounds, opts) {
     var padX = 0,
         padY = 0,
         offX = 0,
@@ -18616,65 +18630,59 @@
         // TODO: add option to tweak alignment of content when both width and height are given
         wx = 0.5, // how padding is distributed horizontally (0: left aligned, 0.5: centered, 1: right aligned)
         wy = 0.5, // vertical padding distribution
-        widthPx, heightPx, size, kx, ky;
+        width2, height2, size2, kx, ky;
 
     if (opts.fit_bbox) {
       // scale + shift content to fit within a bbox
       offX = opts.fit_bbox[0];
       offY = opts.fit_bbox[1];
-      widthPx = opts.fit_bbox[2] - offX;
-      heightPx = opts.fit_bbox[3] - offY;
-      if (width / height > widthPx / heightPx) {
-        // data is wider than fit box...
-        // scale the data to fit widthwise
-        heightPx = 0;
-      } else {
-        widthPx = 0; // fit the data to the height
-      }
+      width2 = opts.fit_bbox[2] - offX;
+      height2 = opts.fit_bbox[3] - offY;
       marginX = marginY = 0; // TODO: support margins
 
     } else if (opts.svg_scale > 0) {
       // alternative to using a fixed width (e.g. when generating multiple files
       // at a consistent geographic scale)
-      widthPx = width / opts.svg_scale + marginX;
-      heightPx = 0;
+      width2 = width / opts.svg_scale + marginX;
+      height2 = 0;
     } else if (+opts.pixels) {
-      size = getFrameSize(bounds, opts);
-      widthPx = size[0];
-      heightPx = size[1];
+      size2 = getFrameSize(bounds, opts);
+      width2 = size2[0];
+      height2 = size2[1];
     } else {
-      heightPx = opts.height || 0;
-      widthPx = opts.width || (heightPx > 0 ? 0 : 800); // 800 is default width
+      height2 = opts.height || 0;
+      width2 = opts.width || (height2 > 0 ? 0 : 800); // 800 is default width
     }
 
-    if (heightPx > 0) {
+    if (height2 > 0) {
       // vertical meters per pixel to fit height param
-      ky = (height || width || 1) / (heightPx - marginY);
+      ky = (height || width || 1) / (height2 - marginY);
     }
-    if (widthPx > 0) {
+    if (width2 > 0) {
       // horizontal meters per pixel to fit width param
-      kx = (width || height || 1) / (widthPx - marginX);
+      kx = (width || height || 1) / (width2 - marginX);
     }
 
-    if (!widthPx) { // heightPx and ky are defined, set width to match
+    if (!width2) { // height2 and ky are defined, set width to match
       kx = ky;
-      widthPx = width > 0 ? marginX + width / kx : heightPx; // export square graphic if content has 0 width (reconsider this?)
-    } else if (!heightPx) { // widthPx and kx are set, set height to match
+      width2 = width > 0 ? marginX + width / kx : height2; // export square graphic if content has 0 width (reconsider this?)
+    } else if (!height2) { // width2 and kx are set, set height to match
       ky = kx;
-      heightPx = height > 0 ? marginY + height / ky : widthPx;
+      height2 = height > 0 ? marginY + height / ky : width2;
       // limit height if max_height is defined
-      if (opts.max_height > 0 && heightPx > opts.max_height) {
-        ky = kx * heightPx / opts.max_height;
-        heightPx = opts.max_height;
+      if (opts.max_height > 0 && height2 > opts.max_height) {
+        ky = kx * height2 / opts.max_height;
+        height2 = opts.max_height;
       }
     }
 
+    // add padding, if needed
     if (kx > ky) { // content is wide -- need to pad vertically
       ky = kx;
-      padY = ky * (heightPx - marginY) - height;
+      padY = ky * (height2 - marginY) - height;
     } else if (ky > kx) { // content is tall -- need to pad horizontally
       kx = ky;
-      padX = kx * (widthPx - marginX) - width;
+      padX = kx * (width2 - marginX) - width;
     }
 
     bounds.padBounds(
@@ -18683,14 +18691,14 @@
       margins[2] * kx + padX * (1 - wx),
       margins[3] * ky + padY * (1 - wy));
 
-    if (!(widthPx > 0 && heightPx > 0)) {
+    if (!(width2 > 0 && height2 > 0)) {
       error("Missing valid height and width parameters");
     }
     if (!(kx === ky && kx > 0)) {
       error("Missing valid margin parameters");
     }
 
-    return new Bounds(offX, offY, widthPx + offX, heightPx + offY);
+    return new Bounds(offX, offY, width2 + offX, height2 + offY);
   }
 
   function parseMarginOption(opt) {
@@ -18701,14 +18709,16 @@
     if (margins.length == 3) margins.push(margins[2]);
     return margins.map(function(str) {
       var px = parseFloat(str);
-      return isNaN(px) ? 1 : px; // 1 is default
+      return isNaN(px) ? 0 : px; // 0 is default
     });
   }
 
-  var FrameData = /*#__PURE__*/Object.freeze({
+  var FrameUtils = /*#__PURE__*/Object.freeze({
     __proto__: null,
     getFrameData: getFrameData,
+    fitDatasetToFrame: fitDatasetToFrame,
     getFrameLayerData: getFrameLayerData,
+    calcFrameData: calcFrameData,
     getFrameSize: getFrameSize,
     isFrameLayer: isFrameLayer,
     findFrameLayerInDataset: findFrameLayerInDataset,
@@ -18717,7 +18727,7 @@
     findFrame: findFrame,
     getFrameLayerBounds: getFrameLayerBounds,
     getMapFrameMetersPerPixel: getMapFrameMetersPerPixel,
-    calcOutputSizeInPixels: calcOutputSizeInPixels,
+    calcOutputBounds: calcOutputBounds,
     parseMarginOption: parseMarginOption
   });
 
@@ -18772,6 +18782,9 @@
       geometry_type: 'point', shapes: targetPoints}, {geometry_type: 'polyline',
       shapes: targetShapes}]}, opts);
     transform = getAffineTransform(rotateArg, scaleArg, shiftArg, anchorArg);
+    if (opts.fit_bbox) {
+      transform = getFitBoxTransform(opts.fit_bbox, targetPoints, targetShapes, arcs);
+    }
     if (targetShapes.length > 0) {
       targetFlags = new Uint8Array(arcs.size());
       otherFlags = new Uint8Array(arcs.size());
@@ -18821,6 +18834,33 @@
     };
   }
 
+  function getFitBoxTransform(bbox, points, shapes, arcs) {
+    var dataset = {
+      arcs: arcs,
+      info: {},
+      layers: []
+    };
+    if (points && points.length) {
+      dataset.layers.push({
+        geometry_type: 'point',
+        shapes: points
+      });
+    }
+    if (shapes && shapes.length) {
+      dataset.layers.push({
+        geometry_type: 'polyline',
+        shapes: shapes
+      });
+    }
+    var frame = calcFrameData(dataset, {fit_bbox: bbox});
+    var fromBounds = new Bounds(frame.bbox);
+    var toBounds = new Bounds(frame.bbox2);
+    var fwd = fromBounds.getTransform(toBounds, false);
+    return function(x, y) {
+      return fwd.transform(x, y);
+    };
+  }
+
   function applyArrayMask(destArr, maskArr) {
     for (var i=0, n=destArr.length; i<n; i++) {
       if (maskArr[i] === 0) destArr[i] = 0;
@@ -20120,27 +20160,6 @@
     renderFurnitureLayer: renderFurnitureLayer
   });
 
-  function transformDatasetToPixels(dataset, opts) {
-    var frame = getFrameData(dataset, opts);
-    fitDatasetToFrame(dataset, frame, opts);
-    return [frame.width, frame.height];
-  }
-
-  function fitDatasetToFrame(dataset, frame, opts) {
-    var bounds = new Bounds(frame.bbox);
-    var bounds2 = frame.bbox2 ? new Bounds(frame.bbox2) : new Bounds(0, 0, frame.width, frame.height);
-    var fwd = bounds.getTransform(bounds2, opts.invert_y);
-    transformPoints(dataset, function(x, y) {
-      return fwd.transform(x, y);
-    });
-  }
-
-  var PixelTransform = /*#__PURE__*/Object.freeze({
-    __proto__: null,
-    transformDatasetToPixels: transformDatasetToPixels,
-    fitDatasetToFrame: fitDatasetToFrame
-  });
-
   function stringify(obj) {
     var svg, joinStr;
     if (!obj || !obj.tag) return '';
@@ -20428,10 +20447,11 @@
       dataset = copyDataset(dataset); // Modify a copy of the dataset
     }
 
-    // invert_y setting for screen coordinates and geojson polygon generation
-    utils.extend(opts, {invert_y: true});
+    // use invert_y: 0 setting for screen coordinates and geojson polygon generation
+    // use 1px default margin so typical strokes don't get cut off on the sides
+    opts = Object.assign({invert_y: true, margin: "1"}, opts);
     frame = getFrameData(dataset, opts);
-    fitDatasetToFrame(dataset, frame, opts);
+    fitDatasetToFrame(dataset, frame);
     setCoordinatePrecision(dataset, opts.precision || 0.0001);
 
     // error if one or more svg_data fields are not present in any layers
@@ -22067,10 +22087,14 @@ ${svg}
     }
 
     if (opts.width > 0 || opts.height > 0) {
+      // these options create a TopoJSON with pixel coordinates, including
+      // origin (0,0) in the top left corner of the viewport, generally for
+      // direct conversion to SVG (many online examples using d3 are like this)
+      //
       opts = utils.defaults({invert_y: true}, opts);
-      transformDatasetToPixels(dataset, opts);
+      fitDatasetToFrame(dataset, getFrameData(dataset, opts));
     } else if (opts.fit_bbox) {
-      transformDatasetToPixels(dataset, {fit_bbox: opts.fit_bbox});
+      fitDatasetToFrame(dataset, getFrameData(dataset, {fit_bbox: opts.fit_bbox}));
     }
 
     if (opts.precision && opts.no_quantization) {
@@ -24279,7 +24303,7 @@ ${svg}
           describe: 'aspect ratio as a number or range (e.g. 2 0.8,1.6 ,2)'
         },
         offsetOpt = {
-          describe: 'padding as distance or pct of h/w (single value or list)',
+          describe: 'offset distance or pct of h/w (single value or l,b,r,t list)',
           type: 'distance'
         };
 
@@ -24609,6 +24633,10 @@ ${svg}
         type: 'numbers',
         describe: 'center of rotation/scaling (default is center of selected shapes)'
       })
+      .option('fit-bbox', {
+        type: 'bbox',
+        describe: 'scale and shift coordinates to fit a bbox'
+      })
       .option('where', whereOpt)
       .option('target', targetOpt);
 
@@ -39317,7 +39345,7 @@ ${svg}
     // TODO: consider projections that may or may not be aligned,
     // depending on parameters
     if (inList(P, 'cassini,gnom,bertin1953,chamb,ob_tran,tpeqd,healpix,rhealpix,' +
-      'ocea,omerc,tmerc,etmerc')) {
+      'ocea,omerc,tmerc,etmerc,nicol')) {
       return false;
     }
     if (isAzimuthal(P)) {
@@ -39892,7 +39920,7 @@ ${svg}
   }
 
   function isCircleClippedProjection(P) {
-    return inList(P, 'stere,sterea,ups,ortho,gnom,laea,nsper,tpers,geos');
+    return inList(P, 'stere,sterea,ups,ortho,gnom,laea,nsper,tpers,geos,nicol');
   }
 
   function getPerspectiveClipAngle(P) {
@@ -39917,6 +39945,7 @@ ${svg}
       laea: 179,
       //ortho: 89.9, // projection errors betwen lat +/-35 to 55
       ortho: 89.85, // TODO: investigate
+      nicol: 89.85,
       stere: 142,
       sterea: 142,
       ups: 10.5 // TODO: should be 6.5 deg at north pole
@@ -44521,6 +44550,7 @@ ${svg}
     if (!size) return null;
     var stemLen = size.stemLen,
         headLen = size.headLen,
+        totalLen = stickArrow ? Math.max(stemLen, headLen) : stemLen + headLen,
         headDx = size.headWidth / 2,
         stemDx = size.stemWidth / 2,
         baseDx = stemDx * (1 - stemTaper),
@@ -44573,11 +44603,10 @@ ${svg}
     }
 
     if (d.anchor == 'end') {
-      scaleAndShiftCoords(coords, 1, [-dx, -dy - headLen]);
+      scaleAndShiftCoords(coords, 1, [-dx, -totalLen]);
     } else if (d.anchor == 'middle') {
       // shift midpoint away from the head a bit for a more balanced placement
-      // scaleAndShiftCoords(coords, 1, [-dx/2, (-dy - headLen)/2]);
-      scaleAndShiftCoords(coords, 1, [-dx * 0.5, -dy * 0.5 - headLen * 0.25]);
+      scaleAndShiftCoords(coords, 1, [-dx * 0.5, -dy * 0.5 - totalLen * 0.25]);
     }
 
     rotateCoords(coords, direction);
@@ -44594,15 +44623,16 @@ ${svg}
 
   function calcArrowSize(d, stickArrow) {
     // don't display arrows with negative length
-    var totalLen = Math.max(d.radius || d.length || d.r || 0, 0),
-        scale = 1,
-        o = initArrowSize(d); // calc several parameters
+    var o = initArrowSize(d), // calc several parameters
+        dataLen = Math.max(d.radius || d.length || d.r || 0),
+        totalLen = Math.max(dataLen, o.headLen, 0),
+        scale = 1;
     if (totalLen >= 0) {
       scale = calcScale(totalLen, o.headLen, d);
       o.stemWidth *= scale;
       o.headWidth *= scale;
       o.headLen *= scale;
-      o.stemLen = stickArrow ? totalLen : totalLen - o.headLen;
+      o.stemLen = stickArrow ? dataLen : totalLen - o.headLen;
     }
 
     if (o.headWidth < o.stemWidth && o.headWidth > 0) {
@@ -44651,13 +44681,11 @@ ${svg}
     return o;
   }
 
-
   // Returns ratio of head length to head width
   function getHeadSizeRatio(headAngle) {
     return 1 / Math.tan(Math.PI * headAngle / 180 / 2) / 2;
   }
 
-
   // ax, ay: point on the base
   // bx, by: point on the stem
   function getCurvedStemCoords(ax, ay, bx, by) {
@@ -45870,7 +45898,7 @@ ${svg}
     });
   }
 
-  var version = "0.6.100";
+  var version = "0.6.102";
 
   // 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.
@@ -46563,7 +46591,7 @@ ${svg}
     FileTypes,
     FilterGeom,
     Frame,
-    FrameData,
+    FrameUtils,
     Furniture,
     Geodesic,
     GeojsonExport,
@@ -46598,7 +46626,7 @@ ${svg}
     PathImport,
     PathRepair,
     PathUtils,
-    PixelTransform,
+    // PixelTransform,
     PointPolygonJoin,
     Points,
     PointToGrid,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mapshaper",
-  "version": "0.6.100",
+  "version": "0.6.102",
   "description": "A tool for editing vector datasets for mapping and GIS.",
   "keywords": [
     "shapefile",
@@ -56,7 +56,7 @@
     "iconv-lite": "^0.6.3",
     "idb-keyval": "^6.2.0",
     "kdbush": "^3.0.0",
-    "mproj": "0.0.39",
+    "mproj": "0.0.40",
     "msgpackr": "^1.10.1",
     "opn": "^5.3.0",
     "rw": "~1.3.3",

package/www/mapshaper-gui.js

@@ -6843,6 +6843,7 @@
     });
   }
 
+
   function defaults(dest) {
     for (var i=1, n=arguments.length; i<n; i++) {
       var src = arguments[i] || {};
@@ -12974,7 +12975,7 @@ GUI and setting the size and crop of SVG output.</p><div><input type="text" clas
     function calcFullBounds() {
       var b;
       if (isPreviewView()) {
-        b = new Bounds(getFrameData().bbox);
+        b = new Bounds(getFrameLayerData().bbox);
       } else {
         b = getContentLayerBounds();
       }
@@ -13014,10 +13015,10 @@ GUI and setting the size and crop of SVG output.</p><div><input type="text" clas
 
     // Preview view: symbols are scaled based on display size of frame layer
     function isPreviewView() {
-      return !isTableView() && !!getFrameData();
+      return !isTableView() && !!getFrameLayerData();
     }
 
-    function getFrameData() {
+    function getFrameLayerData() {
       var lyr = findFrameLayer();
       return lyr && internal.getFrameLayerData(lyr, lyr.gui.displayArcs) || null;
     }
@@ -13138,7 +13139,7 @@ GUI and setting the size and crop of SVG output.</p><div><input type="text" clas
       }
       if (layersMayHaveChanged) {
         // kludge to handle layer visibility toggling
-        _ext.setFrameData(isPreviewView() ? getFrameData() : null);
+        _ext.setFrameData(isPreviewView() ? getFrameLayerData() : null);
         updateFullBounds();
         updateLayerStyles(contentLayers);
         updateLayerStackOrder(model.getLayers());// update menu_order property of all layers

package/www/mapshaper.js

@@ -267,6 +267,7 @@
     });
   }
 
+
   function defaults(dest) {
     for (var i=1, n=arguments.length; i<n; i++) {
       var src = arguments[i] || {};
@@ -13762,7 +13763,7 @@
             convertIntervalParam(opt[1], crs)];
   }
 
-  // Accepts a single value or a list of four values. List order is l,b,t,r
+  // Accepts a single value or a list of four values. List order is l,b,r,t
   function convertFourSides(opt, crs, bounds) {
     var arr = opt.includes(',') ? opt.split(',') : opt.split(' ');
     if (arr.length == 1) {
@@ -13776,7 +13777,7 @@
         tmp = parseFloat(param) / 100 || 0;
         return tmp * (i == 1 || i == 3 ? bounds.height() : bounds.width());
       }
-      return convertIntervalParam(opt, crs);
+      return convertIntervalParam(param, crs);
     });
   }
 
@@ -18486,18 +18487,30 @@
     type: 'frame'
   }
   */
+
+
   function getFrameData(dataset, exportOpts) {
     var frameLyr = findFrameLayerInDataset(dataset);
-    var frameData;
+    var data;
     if (frameLyr) {
-      frameData = getFrameLayerData(frameLyr, dataset.arcs);
+      data = getFrameLayerData(frameLyr, dataset.arcs);
     } else {
-      frameData = calcFrameData(dataset, exportOpts);
+      data = calcFrameData(dataset, exportOpts);
     }
-    frameData.crs = getDatasetCRS(dataset);
-    return frameData;
+    data.invert_y = !!exportOpts.invert_y;
+    data.crs = getDatasetCRS(dataset);
+    return data;
   }
 
+  function fitDatasetToFrame(dataset, frame) {
+    var bounds = new Bounds(frame.bbox);
+    var bounds2 = frame.bbox2 ? new Bounds(frame.bbox2) : new Bounds(0, 0, frame.width, frame.height);
+    bounds.fillOut(bounds2.width() / bounds2.height());
+    var fwd = bounds.getTransform(bounds2, frame.invert_y);
+    transformPoints(dataset, function(x, y) {
+      return fwd.transform(x, y);
+    });
+  }
 
   function getFrameLayerData(lyr, arcs) {
     var bounds = getLayerBounds(lyr, arcs);
@@ -18515,24 +18528,25 @@
 
 
   function calcFrameData(dataset, opts) {
-    var bounds;
+    var inputBounds, outputBounds;
     if (opts.svg_bbox) {
-      bounds = new Bounds(opts.svg_bbox);
+      inputBounds = new Bounds(opts.svg_bbox);
       opts = Object.assign({margin: 0}, opts); // prevent default pixel margin around content
     } else {
-      bounds = getDatasetBounds(dataset);
+      inputBounds = getDatasetBounds(dataset);
     }
-    var pixBounds = calcOutputSizeInPixels(bounds, opts);
+    // side effect: inputBounds may be expanded to add margins
+    outputBounds = calcOutputBounds(inputBounds, opts);
     return {
-      bbox: bounds.toArray(),
-      bbox2: pixBounds.toArray(),
-      width: Math.round(pixBounds.width()),
-      height: Math.round(pixBounds.height()) || 1,
+      bbox: inputBounds.toArray(),
+      bbox2: outputBounds.toArray(),
+      width: Math.round(outputBounds.width()),
+      height: Math.round(outputBounds.height()) || 1,
       type: 'frame'
     };
   }
 
-  // Used by mapshaper-frame and mapshaper-pixel-transform. TODO: refactor
+  // Used by mapshaper-frame  TODO: refactor
   function getFrameSize(bounds, opts) {
     var aspectRatio = bounds.width() / bounds.height();
     var height, width;
@@ -18601,9 +18615,9 @@
 
 
   // bounds: Bounds object containing bounds of content in geographic coordinates
-  // returns Bounds object containing bounds of pixel output
+  // returns Bounds object containing output bounds
   // side effect: bounds param is modified to match the output frame
-  function calcOutputSizeInPixels(bounds, opts) {
+  function calcOutputBounds(bounds, opts) {
     var padX = 0,
         padY = 0,
         offX = 0,
@@ -18616,65 +18630,59 @@
         // TODO: add option to tweak alignment of content when both width and height are given
         wx = 0.5, // how padding is distributed horizontally (0: left aligned, 0.5: centered, 1: right aligned)
         wy = 0.5, // vertical padding distribution
-        widthPx, heightPx, size, kx, ky;
+        width2, height2, size2, kx, ky;
 
     if (opts.fit_bbox) {
       // scale + shift content to fit within a bbox
       offX = opts.fit_bbox[0];
       offY = opts.fit_bbox[1];
-      widthPx = opts.fit_bbox[2] - offX;
-      heightPx = opts.fit_bbox[3] - offY;
-      if (width / height > widthPx / heightPx) {
-        // data is wider than fit box...
-        // scale the data to fit widthwise
-        heightPx = 0;
-      } else {
-        widthPx = 0; // fit the data to the height
-      }
+      width2 = opts.fit_bbox[2] - offX;
+      height2 = opts.fit_bbox[3] - offY;
       marginX = marginY = 0; // TODO: support margins
 
     } else if (opts.svg_scale > 0) {
       // alternative to using a fixed width (e.g. when generating multiple files
       // at a consistent geographic scale)
-      widthPx = width / opts.svg_scale + marginX;
-      heightPx = 0;
+      width2 = width / opts.svg_scale + marginX;
+      height2 = 0;
     } else if (+opts.pixels) {
-      size = getFrameSize(bounds, opts);
-      widthPx = size[0];
-      heightPx = size[1];
+      size2 = getFrameSize(bounds, opts);
+      width2 = size2[0];
+      height2 = size2[1];
     } else {
-      heightPx = opts.height || 0;
-      widthPx = opts.width || (heightPx > 0 ? 0 : 800); // 800 is default width
+      height2 = opts.height || 0;
+      width2 = opts.width || (height2 > 0 ? 0 : 800); // 800 is default width
     }
 
-    if (heightPx > 0) {
+    if (height2 > 0) {
       // vertical meters per pixel to fit height param
-      ky = (height || width || 1) / (heightPx - marginY);
+      ky = (height || width || 1) / (height2 - marginY);
     }
-    if (widthPx > 0) {
+    if (width2 > 0) {
       // horizontal meters per pixel to fit width param
-      kx = (width || height || 1) / (widthPx - marginX);
+      kx = (width || height || 1) / (width2 - marginX);
     }
 
-    if (!widthPx) { // heightPx and ky are defined, set width to match
+    if (!width2) { // height2 and ky are defined, set width to match
       kx = ky;
-      widthPx = width > 0 ? marginX + width / kx : heightPx; // export square graphic if content has 0 width (reconsider this?)
-    } else if (!heightPx) { // widthPx and kx are set, set height to match
+      width2 = width > 0 ? marginX + width / kx : height2; // export square graphic if content has 0 width (reconsider this?)
+    } else if (!height2) { // width2 and kx are set, set height to match
       ky = kx;
-      heightPx = height > 0 ? marginY + height / ky : widthPx;
+      height2 = height > 0 ? marginY + height / ky : width2;
       // limit height if max_height is defined
-      if (opts.max_height > 0 && heightPx > opts.max_height) {
-        ky = kx * heightPx / opts.max_height;
-        heightPx = opts.max_height;
+      if (opts.max_height > 0 && height2 > opts.max_height) {
+        ky = kx * height2 / opts.max_height;
+        height2 = opts.max_height;
       }
     }
 
+    // add padding, if needed
     if (kx > ky) { // content is wide -- need to pad vertically
       ky = kx;
-      padY = ky * (heightPx - marginY) - height;
+      padY = ky * (height2 - marginY) - height;
     } else if (ky > kx) { // content is tall -- need to pad horizontally
       kx = ky;
-      padX = kx * (widthPx - marginX) - width;
+      padX = kx * (width2 - marginX) - width;
     }
 
     bounds.padBounds(
@@ -18683,14 +18691,14 @@
       margins[2] * kx + padX * (1 - wx),
       margins[3] * ky + padY * (1 - wy));
 
-    if (!(widthPx > 0 && heightPx > 0)) {
+    if (!(width2 > 0 && height2 > 0)) {
       error("Missing valid height and width parameters");
     }
     if (!(kx === ky && kx > 0)) {
       error("Missing valid margin parameters");
     }
 
-    return new Bounds(offX, offY, widthPx + offX, heightPx + offY);
+    return new Bounds(offX, offY, width2 + offX, height2 + offY);
   }
 
   function parseMarginOption(opt) {
@@ -18701,14 +18709,16 @@
     if (margins.length == 3) margins.push(margins[2]);
     return margins.map(function(str) {
       var px = parseFloat(str);
-      return isNaN(px) ? 1 : px; // 1 is default
+      return isNaN(px) ? 0 : px; // 0 is default
     });
   }
 
-  var FrameData = /*#__PURE__*/Object.freeze({
+  var FrameUtils = /*#__PURE__*/Object.freeze({
     __proto__: null,
     getFrameData: getFrameData,
+    fitDatasetToFrame: fitDatasetToFrame,
     getFrameLayerData: getFrameLayerData,
+    calcFrameData: calcFrameData,
     getFrameSize: getFrameSize,
     isFrameLayer: isFrameLayer,
     findFrameLayerInDataset: findFrameLayerInDataset,
@@ -18717,7 +18727,7 @@
     findFrame: findFrame,
     getFrameLayerBounds: getFrameLayerBounds,
     getMapFrameMetersPerPixel: getMapFrameMetersPerPixel,
-    calcOutputSizeInPixels: calcOutputSizeInPixels,
+    calcOutputBounds: calcOutputBounds,
     parseMarginOption: parseMarginOption
   });
 
@@ -18772,6 +18782,9 @@
       geometry_type: 'point', shapes: targetPoints}, {geometry_type: 'polyline',
       shapes: targetShapes}]}, opts);
     transform = getAffineTransform(rotateArg, scaleArg, shiftArg, anchorArg);
+    if (opts.fit_bbox) {
+      transform = getFitBoxTransform(opts.fit_bbox, targetPoints, targetShapes, arcs);
+    }
     if (targetShapes.length > 0) {
       targetFlags = new Uint8Array(arcs.size());
       otherFlags = new Uint8Array(arcs.size());
@@ -18821,6 +18834,33 @@
     };
   }
 
+  function getFitBoxTransform(bbox, points, shapes, arcs) {
+    var dataset = {
+      arcs: arcs,
+      info: {},
+      layers: []
+    };
+    if (points && points.length) {
+      dataset.layers.push({
+        geometry_type: 'point',
+        shapes: points
+      });
+    }
+    if (shapes && shapes.length) {
+      dataset.layers.push({
+        geometry_type: 'polyline',
+        shapes: shapes
+      });
+    }
+    var frame = calcFrameData(dataset, {fit_bbox: bbox});
+    var fromBounds = new Bounds(frame.bbox);
+    var toBounds = new Bounds(frame.bbox2);
+    var fwd = fromBounds.getTransform(toBounds, false);
+    return function(x, y) {
+      return fwd.transform(x, y);
+    };
+  }
+
   function applyArrayMask(destArr, maskArr) {
     for (var i=0, n=destArr.length; i<n; i++) {
       if (maskArr[i] === 0) destArr[i] = 0;
@@ -20120,27 +20160,6 @@
     renderFurnitureLayer: renderFurnitureLayer
   });
 
-  function transformDatasetToPixels(dataset, opts) {
-    var frame = getFrameData(dataset, opts);
-    fitDatasetToFrame(dataset, frame, opts);
-    return [frame.width, frame.height];
-  }
-
-  function fitDatasetToFrame(dataset, frame, opts) {
-    var bounds = new Bounds(frame.bbox);
-    var bounds2 = frame.bbox2 ? new Bounds(frame.bbox2) : new Bounds(0, 0, frame.width, frame.height);
-    var fwd = bounds.getTransform(bounds2, opts.invert_y);
-    transformPoints(dataset, function(x, y) {
-      return fwd.transform(x, y);
-    });
-  }
-
-  var PixelTransform = /*#__PURE__*/Object.freeze({
-    __proto__: null,
-    transformDatasetToPixels: transformDatasetToPixels,
-    fitDatasetToFrame: fitDatasetToFrame
-  });
-
   function stringify(obj) {
     var svg, joinStr;
     if (!obj || !obj.tag) return '';
@@ -20428,10 +20447,11 @@
       dataset = copyDataset(dataset); // Modify a copy of the dataset
     }
 
-    // invert_y setting for screen coordinates and geojson polygon generation
-    utils.extend(opts, {invert_y: true});
+    // use invert_y: 0 setting for screen coordinates and geojson polygon generation
+    // use 1px default margin so typical strokes don't get cut off on the sides
+    opts = Object.assign({invert_y: true, margin: "1"}, opts);
     frame = getFrameData(dataset, opts);
-    fitDatasetToFrame(dataset, frame, opts);
+    fitDatasetToFrame(dataset, frame);
     setCoordinatePrecision(dataset, opts.precision || 0.0001);
 
     // error if one or more svg_data fields are not present in any layers
@@ -22067,10 +22087,14 @@ ${svg}
     }
 
     if (opts.width > 0 || opts.height > 0) {
+      // these options create a TopoJSON with pixel coordinates, including
+      // origin (0,0) in the top left corner of the viewport, generally for
+      // direct conversion to SVG (many online examples using d3 are like this)
+      //
       opts = utils.defaults({invert_y: true}, opts);
-      transformDatasetToPixels(dataset, opts);
+      fitDatasetToFrame(dataset, getFrameData(dataset, opts));
     } else if (opts.fit_bbox) {
-      transformDatasetToPixels(dataset, {fit_bbox: opts.fit_bbox});
+      fitDatasetToFrame(dataset, getFrameData(dataset, {fit_bbox: opts.fit_bbox}));
     }
 
     if (opts.precision && opts.no_quantization) {
@@ -24279,7 +24303,7 @@ ${svg}
           describe: 'aspect ratio as a number or range (e.g. 2 0.8,1.6 ,2)'
         },
         offsetOpt = {
-          describe: 'padding as distance or pct of h/w (single value or list)',
+          describe: 'offset distance or pct of h/w (single value or l,b,r,t list)',
           type: 'distance'
         };
 
@@ -24609,6 +24633,10 @@ ${svg}
         type: 'numbers',
         describe: 'center of rotation/scaling (default is center of selected shapes)'
       })
+      .option('fit-bbox', {
+        type: 'bbox',
+        describe: 'scale and shift coordinates to fit a bbox'
+      })
       .option('where', whereOpt)
       .option('target', targetOpt);
 
@@ -39317,7 +39345,7 @@ ${svg}
     // TODO: consider projections that may or may not be aligned,
     // depending on parameters
     if (inList(P, 'cassini,gnom,bertin1953,chamb,ob_tran,tpeqd,healpix,rhealpix,' +
-      'ocea,omerc,tmerc,etmerc')) {
+      'ocea,omerc,tmerc,etmerc,nicol')) {
       return false;
     }
     if (isAzimuthal(P)) {
@@ -39892,7 +39920,7 @@ ${svg}
   }
 
   function isCircleClippedProjection(P) {
-    return inList(P, 'stere,sterea,ups,ortho,gnom,laea,nsper,tpers,geos');
+    return inList(P, 'stere,sterea,ups,ortho,gnom,laea,nsper,tpers,geos,nicol');
   }
 
   function getPerspectiveClipAngle(P) {
@@ -39917,6 +39945,7 @@ ${svg}
       laea: 179,
       //ortho: 89.9, // projection errors betwen lat +/-35 to 55
       ortho: 89.85, // TODO: investigate
+      nicol: 89.85,
       stere: 142,
       sterea: 142,
       ups: 10.5 // TODO: should be 6.5 deg at north pole
@@ -44521,6 +44550,7 @@ ${svg}
     if (!size) return null;
     var stemLen = size.stemLen,
         headLen = size.headLen,
+        totalLen = stickArrow ? Math.max(stemLen, headLen) : stemLen + headLen,
         headDx = size.headWidth / 2,
         stemDx = size.stemWidth / 2,
         baseDx = stemDx * (1 - stemTaper),
@@ -44573,11 +44603,10 @@ ${svg}
     }
 
     if (d.anchor == 'end') {
-      scaleAndShiftCoords(coords, 1, [-dx, -dy - headLen]);
+      scaleAndShiftCoords(coords, 1, [-dx, -totalLen]);
     } else if (d.anchor == 'middle') {
       // shift midpoint away from the head a bit for a more balanced placement
-      // scaleAndShiftCoords(coords, 1, [-dx/2, (-dy - headLen)/2]);
-      scaleAndShiftCoords(coords, 1, [-dx * 0.5, -dy * 0.5 - headLen * 0.25]);
+      scaleAndShiftCoords(coords, 1, [-dx * 0.5, -dy * 0.5 - totalLen * 0.25]);
     }
 
     rotateCoords(coords, direction);
@@ -44594,15 +44623,16 @@ ${svg}
 
   function calcArrowSize(d, stickArrow) {
     // don't display arrows with negative length
-    var totalLen = Math.max(d.radius || d.length || d.r || 0, 0),
-        scale = 1,
-        o = initArrowSize(d); // calc several parameters
+    var o = initArrowSize(d), // calc several parameters
+        dataLen = Math.max(d.radius || d.length || d.r || 0),
+        totalLen = Math.max(dataLen, o.headLen, 0),
+        scale = 1;
     if (totalLen >= 0) {
       scale = calcScale(totalLen, o.headLen, d);
       o.stemWidth *= scale;
       o.headWidth *= scale;
       o.headLen *= scale;
-      o.stemLen = stickArrow ? totalLen : totalLen - o.headLen;
+      o.stemLen = stickArrow ? dataLen : totalLen - o.headLen;
     }
 
     if (o.headWidth < o.stemWidth && o.headWidth > 0) {
@@ -44651,13 +44681,11 @@ ${svg}
     return o;
   }
 
-
   // Returns ratio of head length to head width
   function getHeadSizeRatio(headAngle) {
     return 1 / Math.tan(Math.PI * headAngle / 180 / 2) / 2;
   }
 
-
   // ax, ay: point on the base
   // bx, by: point on the stem
   function getCurvedStemCoords(ax, ay, bx, by) {
@@ -45870,7 +45898,7 @@ ${svg}
     });
   }
 
-  var version = "0.6.100";
+  var version = "0.6.102";
 
   // 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.
@@ -46563,7 +46591,7 @@ ${svg}
     FileTypes,
     FilterGeom,
     Frame,
-    FrameData,
+    FrameUtils,
     Furniture,
     Geodesic,
     GeojsonExport,
@@ -46598,7 +46626,7 @@ ${svg}
     PathImport,
     PathRepair,
     PathUtils,
-    PixelTransform,
+    // PixelTransform,
     PointPolygonJoin,
     Points,
     PointToGrid,

package/www/modules.js

@@ -20279,6 +20279,7 @@ function pj_phi2(ts, e) {
 
 
 pj_add(pj_merc, 'merc', 'Mercator', 'Cyl, Sph&Ell\nlat_ts=');
+pj_add(pj_webmerc, 'webmerc', 'Web Mercator / Pseudo Mercator', 'Cyl, Ell');
 
 function pj_merc(P) {
   var EPS10 = 1e-10;
@@ -20333,6 +20334,26 @@ function pj_merc(P) {
   }
 }
 
+function pj_webmerc(P) {
+  P.k0 = 1;
+  P.inv = s_inv;
+  P.fwd = s_fwd;
+
+  function s_fwd(lp, xy) {
+    if (fabs(fabs(lp.phi) - M_HALFPI) <= EPS10) {
+      f_error();
+    }
+    xy.x = P.k0 * lp.lam;
+    xy.y = P.k0 * log(tan(M_FORTPI + 0.5 * lp.phi));
+  }
+
+  function s_inv(xy, lp) {
+    lp.phi = M_HALFPI - 2 * atan(exp(-xy.y / P.k0));
+    lp.lam = xy.x / P.k0;
+  }
+}
+
+
 
 pj_add(pj_mill, 'mill', 'Miller Cylindrical', 'Cyl, Sph');
 
@@ -20790,6 +20811,45 @@ var NITER = 9,
 }
 
 
+pj_add(pj_nicol, 'nicol', 'Nicolosi Globular', 'Misc Sph, no inv');
+
+function pj_nicol(P) {
+  P.es = 0;
+  P.fwd = s_fwd;
+
+  function s_fwd(lp, xy) {
+    var EPS = 1e-10;
+    if (fabs(lp.lam) < EPS) {
+      xy.x = 0;
+      xy.y = lp.phi;
+    } else if (fabs(lp.phi) < EPS) {
+      xy.x = lp.lam;
+      xy.y = 0;
+    } else if (fabs(fabs(lp.lam) - M_HALFPI) < EPS) {
+      xy.x = lp.lam * cos(lp.phi);
+      xy.y = M_HALFPI * sin(lp.phi);
+    } else if (fabs(fabs(lp.phi) - M_HALFPI) < EPS) {
+      xy.x = 0;
+      xy.y = lp.phi;
+    } else {
+      var tb = M_HALFPI / lp.lam - lp.lam / M_HALFPI;
+      var c = lp.phi / M_HALFPI;
+      var sp = sin(lp.phi);
+      var d = (1 - c * c) / (sp - c);
+      var r2 = tb / d;
+      r2 *= r2;
+      var m = (tb * sp / d - 0.5 * tb) / (1 + r2);
+      var n = (sp / r2 + 0.5 * d) / (1 + 1 / r2);
+      xy.x = cos(lp.phi);
+      xy.x = sqrt(m * m + xy.x * xy.x / (1 + r2));
+      xy.x = M_HALFPI * (m + (lp.lam < 0. ? -xy.x : xy.x));
+      xy.y = sqrt(n * n - (sp * sp / r2 + d * sp - 1) / (1 + 1 / r2));
+      xy.y = M_HALFPI * (n + (lp.phi < 0. ? xy.y : -xy.y));
+    }
+  }
+}
+
+
 pj_add(pj_nsper, 'nsper', 'Near-sided perspective', 'Azi, Sph\nh=');
 pj_add(pj_tpers, 'tpers', 'Tilted perspective', 'Azi, Sph\ntilt= azi= h=');