mapshaper 0.6.81 → 0.6.83

package/mapshaper.js

@@ -38860,14 +38860,15 @@ ${svg}
     return mergeDatasetsIntoDataset(target.dataset, datasets);
   };
 
-  cmd.rectangle = function(source, opts) {
+  cmd.rectangle = function(target, opts) {
     var bounds, crsInfo;
-    if (source) {
-      bounds = getLayerBounds(source.layer, source.dataset.arcs);
-      crsInfo = getDatasetCrsInfo(source.dataset);
-    } else if (opts.bbox) {
+    if (opts.bbox) {
       bounds = new Bounds(opts.bbox);
-      crsInfo = probablyDecimalDegreeBounds(bounds) ? getCrsInfo('wgs84') : {};
+      crsInfo = target && getDatasetCrsInfo(target.dataset) ||
+        probablyDecimalDegreeBounds(bounds) && getCrsInfo('wgs84') || {};
+    } else if (target) {
+      bounds = getLayerBounds(target.layer, target.dataset.arcs);
+      crsInfo = getDatasetCrsInfo(target.dataset);
     }
     bounds = bounds && applyRectangleOptions(bounds, crsInfo.crs, opts);
     if (!bounds || !bounds.hasBounds()) {
@@ -39557,7 +39558,7 @@ ${svg}
   }
 
   function isCircleClippedProjection(P) {
-    return inList(P, 'stere,sterea,ups,ortho,gnom,laea,nsper,tpers');
+    return inList(P, 'stere,sterea,ups,ortho,gnom,laea,nsper,tpers,geos');
   }
 
   function getPerspectiveClipAngle(P) {
@@ -39572,7 +39573,7 @@ ${svg}
 
   function getDefaultClipAngle(P) {
     var slug = getCrsSlug(P);
-    if (slug == 'nsper') return getPerspectiveClipAngle(P);
+    if (slug == 'nsper' || slug == 'geos') return getPerspectiveClipAngle(P);
     if (slug == 'tpers') {
       message('Automatic clipping is not supported for the Tilted Perspective projection');
       return 0;
@@ -45371,7 +45372,7 @@ ${svg}
           stop('Command requires a width= argument');
         }
         if (source || opts.bbox || targets.length === 0) {
-          job.catalog.addDataset(cmd.rectangle(source, opts));
+          job.catalog.addDataset(cmd.rectangle(source || targets?.[0], opts));
         } else {
           outputLayers = cmd.rectangle2(targets[0], opts);
         }
@@ -45535,7 +45536,7 @@ ${svg}
     });
   }
 
-  var version = "0.6.81";
+  var version = "0.6.83";
 
   // 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.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mapshaper",
-  "version": "0.6.81",
+  "version": "0.6.83",
   "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.37",
+    "mproj": "0.0.38",
     "msgpackr": "^1.10.1",
     "opn": "^5.3.0",
     "rw": "~1.3.3",

package/www/index.html

@@ -183,9 +183,9 @@ precision=0.001. Click to see all options.</div></div></div></a>
 	<div class="info-box">
 		<div class="close2-btn"></div>
 		<h3>Basemap options</h3>
-		<p class="basemap-note">Your data will be displayed using the Mercator projection.</p>
+		<p class="basemap-note"></p>
 		<p class="basemap-warning"></p>
-		<div class="basemap-styles"></div>
+		<div class="basemap-styles basemap-buttons"></div>
 		<div>
 			<!-- <div class="close-btn btn dialog-btn">Close</div> -->
 			<div class="clear-btn btn dialog-btn disabled">Clear</div>
@@ -298,8 +298,8 @@ encoding=big5</span>. Click to see all options.</div></div></div></div>
 			<span class="intersection-check text-btn colored-text">Check line intersections</span><span class="intersection-count">0 line intersections</span>
 			<img class="close-btn" draggable="false" src="images/close.png">
 			<div class="repair-btn text-btn colored-text">Repair</div>
-			
 		</div>
+		<div class="basemap-overlay-buttons basemap-buttons"></div>
 		<div class="map-layers"></div>
 		<div class="basemap-container"><div class="basemap"></div></div>
 	</div>