mapshaper 0.5.97 → 0.5.100

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+v0.5.100
+* Added support for using the basemap feature with datasets in a wide variety of projections.
+
+v0.5.99
+* Added support for viewing data against a Mapbox basemap (enabled on the mapshaper.org site).
+
+v0.5.98
+* Better handling of null data by the -classify command.
+
 v0.5.97
 * Better warnings and error messages.
 

package/mapshaper.js

@@ -1771,6 +1771,8 @@
     // avoid re-allocating memory
     var xx2 = new Float64Array(data.xx.buffer, 0, n-1);
     var yy2 = new Float64Array(data.yy.buffer, 0, n-1);
+    var zz2 = arcs.isFlat() ? null : new Float64Array(data.zz.buffer, 0, n-1);
+    var z = arcs.getRetainedInterval();
     var count = 0;
     var found = false;
     for (var j=0; j<nn.length; j++) {
@@ -1784,24 +1786,31 @@
     utils.copyElements(data.yy, 0, yy2, 0, i);
     utils.copyElements(data.xx, i+1, xx2, i, n-i-1);
     utils.copyElements(data.yy, i+1, yy2, i, n-i-1);
-    arcs.updateVertexData(nn, xx2, yy2, null);
+    if (zz2) {
+      utils.copyElements(data.zz, 0, zz2, 0, i);
+      utils.copyElements(data.zz, i+1, zz2, i, n-i-1);
+    }
+    arcs.updateVertexData(nn, xx2, yy2, zz2);
+    arcs.setRetainedInterval(z);
   }
 
   function insertVertex(arcs, i, p) {
-    // TODO: add extra bytes to the buffers, to reduce new memory allocation
     var data = arcs.getVertexData();
     var nn = data.nn;
     var n = data.xx.length;
     var count = 0;
     var found = false;
-    var xx2, yy2;
+    var xx2, yy2, zz2;
     // avoid re-allocating memory on each insertion
     if (data.xx.buffer.byteLength >= data.xx.length * 8 + 8) {
       xx2 = new Float64Array(data.xx.buffer, 0, n+1);
       yy2 = new Float64Array(data.yy.buffer, 0, n+1);
     } else {
-      xx2 = new Float64Array(new ArrayBuffer((n + 20) * 8), 0, n+1);
-      yy2 = new Float64Array(new ArrayBuffer((n + 20) * 8), 0, n+1);
+      xx2 = new Float64Array(new ArrayBuffer((n + 50) * 8), 0, n+1);
+      yy2 = new Float64Array(new ArrayBuffer((n + 50) * 8), 0, n+1);
+    }
+    if (!arcs.isFlat()) {
+      zz2 = new Float64Array(new ArrayBuffer((n + 1) * 8), 0, n+1);
     }
     for (var j=0; j<nn.length; j++) {
       count += nn[j];
@@ -1816,7 +1825,12 @@
     utils.copyElements(data.yy, i, yy2, i+1, n-i);
     xx2[i] = p[0];
     yy2[i] = p[1];
-    arcs.updateVertexData(nn, xx2, yy2, null);
+    if (zz2) {
+      zz2[i] = Infinity;
+      utils.copyElements(data.zz, 0, zz2, 0, i);
+      utils.copyElements(data.zz, i, zz2, i+1, n-i);
+    }
+    arcs.updateVertexData(nn, xx2, yy2, zz2);
   }
 
   var ArcUtils = /*#__PURE__*/Object.freeze({
@@ -4663,8 +4677,8 @@
     if (isLatLngCRS(P)) {
       return xy.concat();
     }
-    proj = getProjInfo(P, getCRS('wgs84'));
-    return proj(xy);
+    proj = getProjTransform(P, getCRS('wgs84'));
+    return proj(xy[0], xy[1]);
   }
 
   function getProjInfo(dataset) {
@@ -4806,10 +4820,30 @@
     return !isLatLngCRS(P);
   }
 
+  function isInvertibleCRS(P) {
+    if (!P || !P.inv) return false;
+    return true;
+  }
+
   function isLatLngCRS(P) {
     return P && P.is_latlong || false;
   }
 
+  function isWGS84(P) {
+    if (!isLatLngCRS(P)) return false;
+    var proj4 = crsToProj4(P);
+    return proj4.toLowerCase().includes('84');
+  }
+
+  function isWebMercator(P) {
+    if (!P) return false;
+    var str = crsToProj4(P);
+    // e.g. +proj=merc +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +wktext +a=6378137 +b=6378137 +nadgrids=@null
+    // e.g. +proj=merc +a=6378137 +b=6378137
+    // TODO: support  https://proj.org/operations/projections/webmerc.html
+    return str.includes('+proj=merc') && str.includes('+a=6378137') && str.includes('+b=6378137');
+  }
+
   function isLatLngDataset(dataset) {
     return isLatLngCRS(getDatasetCRS(dataset));
   }
@@ -4863,7 +4897,10 @@
     requireDatasetsHaveCompatibleCRS: requireDatasetsHaveCompatibleCRS,
     getScaleFactorAtXY: getScaleFactorAtXY,
     isProjectedCRS: isProjectedCRS,
+    isInvertibleCRS: isInvertibleCRS,
     isLatLngCRS: isLatLngCRS,
+    isWGS84: isWGS84,
+    isWebMercator: isWebMercator,
     isLatLngDataset: isLatLngDataset,
     printProjections: printProjections,
     translatePrj: translatePrj,
@@ -8357,8 +8394,8 @@
   }
 
   function getBoundsPrecisionForDisplay(bbox) {
-    var w = bbox[2] - bbox[0],
-        h = bbox[3] - bbox[1],
+    var w = Math.abs(bbox[2] - bbox[0]),
+        h = Math.abs(bbox[3] - bbox[1]),
         range = Math.min(w, h) + 1e-8,
         digits = 0;
     while (range < 2000) {
@@ -29059,6 +29096,31 @@ ${svg}
     return ramp;
   }
 
+  function getNullValue(opts) {
+    var nullValue;
+    if ('null_value' in opts) {
+      nullValue = parseNullValue(opts.null_value);
+    } else if (opts.colors) {
+      nullValue = '#eee';
+    } else if (opts.values) {
+      nullValue = null;
+    } else {
+      nullValue = -1; // kludge, to match behavior of getClassValues()
+    }
+    return nullValue;
+  }
+
+  // Parse command line string arguments to the correct data type
+  function parseNullValue(val) {
+    if (utils.isString(val) && !isNaN(+val)) {
+      val = +val;
+    }
+    if (val === 'null') {
+      val = null;
+    }
+    return val;
+  }
+
   function getClassValues(method, n, opts) {
     var categorical = method == 'categorical' || method == 'non-adjacent';
     var colorArg = opts.colors && opts.colors.length == 1 ? opts.colors[0] : null;
@@ -29132,27 +29194,36 @@ ${svg}
     return values;
   }
 
-  var sequential = ['quantile', 'nice', 'equal-interval', 'hybrid'];
+  var sequential = ['quantile', 'nice', 'equal-interval', 'hybrid', 'breaks'];
   var all = ['non-adjacent', 'indexed', 'categorical'].concat(sequential);
 
-  function getClassifyMethod(opts, dataFieldType) {
+  function getClassifyMethod(opts, dataType) {
     var method;
     if (opts.method) {
       method = opts.method;
+    } else if (opts.breaks) {
+      method = 'breaks';
     } else if (opts.index_field) {
       method = 'indexed';
-    } else if (opts.categories || dataFieldType == 'string') {
+    } else if (opts.categories || dataType == 'string') {
       method = 'categorical';
-    } else  if (dataFieldType == 'number') {
+    } else  if (dataType == 'number') {
       method = 'quantile'; // TODO: validate data field
+    } else if (dataType == 'date' || dataType == 'object') {
+      stop('Data type does not support classification:', dataType);
+    } else if (dataType === null) {
+      // data field is empty
+      return null; // kludge
+    } else if (dataType === undefined) {
+      // no data field was given
+      stop('Expected a data field to classify or the non-adjacent option');
     } else {
-      // stop('Unable to determine which classification method to use.');
-      stop('Missing a data field and/or classification method');
+      stop('Unable to determine which classification method to use.');
     }
     if (!all.includes(method)) {
       stop('Not a recognized classification method:', method);
     }
-    if (sequential.includes(method) && dataFieldType != 'number') {
+    if (sequential.includes(method) && dataType != 'number' && dataType !== null) {
       stop('The', method, 'method requires a numerical data field');
     }
     return method;
@@ -29165,7 +29236,7 @@ ${svg}
     var opts = optsArg || {};
     var records = lyr.data && lyr.data.getRecords();
     var valuesAreColors = !!opts.colors;
-    var dataField, dataFieldType, outputField;
+    var dataField, fieldType, outputField;
     var values, nullValue;
     var classifyByValue, classifyByRecordId;
     var numClasses, numValues;
@@ -29179,9 +29250,10 @@ ${svg}
     //
     if (opts.index_field) {
       dataField = opts.index_field;
-    } else if (opts.field) {
+      fieldType = getColumnType(opts.field, records);
+   } else if (opts.field) {
       dataField = opts.field;
-      dataFieldType = getColumnType(opts.field, records);
+      fieldType = getColumnType(opts.field, records);
     }
     if (dataField) {
       requireDataField(lyr.data, dataField);
@@ -29189,7 +29261,7 @@ ${svg}
 
     // get classification method
     //
-    method = getClassifyMethod(opts, dataFieldType);
+    method = getClassifyMethod(opts, fieldType);
 
     // validate classification method
     if (method == 'non-adjacent') {
@@ -29207,6 +29279,7 @@ ${svg}
     // get the number of classes and the number of values
     //
     // expand categories if value is '*'
+    // use all unique values if categories option is missing
     if (method == 'categorical') {
       if ((!opts.categories || opts.categories.includes('*')) && dataField) {
         opts.categories = getUniqFieldValues(records, dataField);
@@ -29248,24 +29321,16 @@ ${svg}
       message('Colors:', formatValuesForLogging(values));
     }
 
-    // get null value
-    //
-    if ('null_value' in opts) {
-      nullValue = opts.null_value;
-    } else if (valuesAreColors) {
-      nullValue = '#eee';
-    } else if (opts.values) {
-      nullValue = null;
-    } else {
-      nullValue = -1; // kludge, to match behavior of getClassValues()
-    }
-
+    nullValue = getNullValue(opts);
 
     // get a function to convert input data to class indexes
     //
-    if (method == 'non-adjacent') {
+    if (fieldType === null) {
+      // no valid data -- always return null value
+      classifyByRecordId = function() {return nullValue;};
+    } else if (method == 'non-adjacent') {
       classifyByRecordId = getNonAdjacentClassifier(lyr, dataset, values);
-    } else if (opts.index_field) {
+    } else if (method == 'indexed') {
       // data is pre-classified... just read the index from a field
       classifyByValue = getIndexedClassifier(values, nullValue, opts);
     } else if (method == 'categorical') {
@@ -34082,7 +34147,7 @@ ${svg}
     isCentered = ['tmerc', 'etmerc'].includes(str);
     proj4 = '+proj=' + str;
     if (isConic2SP || isCentered) {
-      bbox = getBBox(dataset);
+      bbox = getBBox(dataset); // TODO: support projected datasets
       decimals = getBoundsPrecisionForDisplay(bbox);
       params = isCentered ? getCenterParams(bbox, decimals) : getConicParams(bbox, decimals);
       proj4 += ' ' + params;
@@ -34287,14 +34352,17 @@ ${svg}
         // old simplification data  will not be optimal after reprojection;
         // re-using for now to avoid error in web ui
         zz = data.zz,
+        z = arcs.getRetainedInterval(),
         p;
 
     for (var i=0, n=xx.length; i<n; i++) {
       p = proj(xx[i], yy[i]);
+      if (!p) error('Unprojectable point:', xx[i], yy[i]);
       xx[i] = p[0];
       yy[i] = p[1];
     }
     arcs.updateVertexData(data.nn, xx, yy, zz);
+    arcs.setRetainedInterval(z);
   }
 
   function projectArcs2(arcs, proj) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mapshaper",
-	"version": "0.5.97",
+	"version": "0.5.100",
 	"description": "A tool for editing vector datasets for mapping and GIS.",
 	"keywords": [
 		"shapefile",
@@ -35,6 +35,7 @@
 	"files": [
 		"/bin/**",
 		"/www/**",
+		"!/www/basemap.js",
 		"!/www/nacis/",
 		"/mapshaper.js",
 		"!.DS_Store"

package/www/index.html

@@ -73,7 +73,7 @@
 		<input type="text" value="label" class="clicktext" />
 	</div></div>
 	<div id="mode-buttons" class="page-header-buttons">
-		<span class="simplify-btn header-btn btn">Simplify</span><span class="separator"></span><span class="console-btn header-btn btn">Console</span><span class="separator"></span><span class="export-btn header-btn btn">Export</span>
+		<span class="basemap-btn header-btn btn">Basemap</span><span class="separator"></span><span class="simplify-btn header-btn btn">Simplify</span><span class="separator"></span><span class="console-btn header-btn btn">Console</span><span class="separator"></span><span class="export-btn header-btn btn">Export</span>
 	</div>
 	<div id="splash-buttons" class="page-header-buttons">
 		<a href="https://github.com/mbloch/mapshaper/wiki"><span id="wiki-btn" class="header-btn btn">Wiki</span></a><span class="separator"></span><a href="https://github.com/mbloch/mapshaper"><span id="github-btn" class="header-btn btn">GitHub</span></a>
@@ -148,6 +148,18 @@
 	</div>
 </div>
 
+<div class="basemap-options main-area popup-dialog">
+	<div class="info-box">
+		<h3>Basemap options</h3>
+		<p class="basemap-note">Your data will be displayed using the Mercator projection.</p>
+		<p class="basemap-warning"></p>
+		<div class="basemap-styles"></div>
+		<div>
+			<div class="close-btn btn dialog-btn">Close</div>
+		</div>
+	</div>
+</div>
+
 <div class="simplify-options main-area popup-dialog">
 	<div class="info-box">
 		<h3>Simplification menu</h3>
@@ -280,6 +292,7 @@ interface. Examples: "no-topology"
 			<div class="repair-btn text-btn colored-text">Repair</div>
 		</div>
 		<div class="map-layers"></div>
+		<div class="basemap-container"><div class="basemap"></div></div>
 	</div>
 </div>
 
@@ -287,6 +300,7 @@ interface. Examples: "no-topology"
 <div class="drop-area"></div>
 </div>
 
+<script src="basemap.js" type="text/javascript"></script>
 <script src="zip.js" type="text/javascript"></script>
 <script src="modules.js" type="text/javascript"></script>
 <script src="mapshaper.js" type="text/javascript"></script>