mapshaper 0.6.21 → 0.6.22

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/mapshaper.js +14 -12
  2. package/package.json +1 -1
  3. package/www/mapshaper-gui.js +11 -8
  4. package/www/mapshaper.js +14 -12
package/mapshaper.js CHANGED
@@ -1,6 +1,6 @@
1
1
  (function () {
2
2
 
3
- var VERSION = "0.6.21";
3
+ var VERSION = "0.6.22";
4
4
 
5
5
 
6
6
  var utils = /*#__PURE__*/Object.freeze({
@@ -1183,17 +1183,19 @@
1183
1183
  return str.replace(',', '.');
1184
1184
  }
1185
1185
 
1186
- function trimQuotes(raw) {
1187
- var len = raw.length, first, last;
1186
+ function trimQuotes(str) {
1187
+ var len = str.length, first, last;
1188
1188
  if (len >= 2) {
1189
- first = raw.charAt(0);
1190
- last = raw.charAt(len-1);
1191
- if (first == '"' && last == '"' && !raw.includes('","') ||
1192
- first == "'" && last == "'" && !raw.includes("','")) {
1193
- return raw.substr(1, len-2);
1189
+ first = str.charAt(0);
1190
+ last = str.charAt(len-1);
1191
+ if (first == '"' && last == '"' && !str.includes('","') ||
1192
+ first == "'" && last == "'" && !str.includes("','")) {
1193
+ str = str.substr(1, len-2);
1194
+ // remove string escapes
1195
+ str = str.replace(first == '"' ? /\\(?=")/g : /\\(?=')/g, '');
1194
1196
  }
1195
1197
  }
1196
- return raw;
1198
+ return str;
1197
1199
  }
1198
1200
 
1199
1201
  var LOGGING = false;
@@ -22338,9 +22340,9 @@ ${svg}
22338
22340
  var assignmentRxp = /^([a-z0-9_+-]+)=(?!=)(.*)$/i; // exclude ==
22339
22341
 
22340
22342
  function splitShellTokens(str) {
22341
- var BAREWORD = '([^\'"\\s])+';
22342
- var DOUBLE_QUOTE = '"((\\\\"|[^"])*?)"';
22343
- var SINGLE_QUOTE = '\'((\\\\\'|[^\'])*?)\'';
22343
+ var BAREWORD = `([^'"\\s])+`;
22344
+ var DOUBLE_QUOTE = `"((\\\\"|[^"])*?)"`;
22345
+ var SINGLE_QUOTE = `'((\\\\'|[^'])*?)'`;
22344
22346
  var rxp = new RegExp('(' + BAREWORD + '|' + SINGLE_QUOTE + '|' + DOUBLE_QUOTE + ')*', 'g');
22345
22347
  var matches = str.match(rxp) || [];
22346
22348
  var chunks = matches.filter(function(chunk) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "mapshaper",
3
- "version": "0.6.21",
3
+ "version": "0.6.22",
4
4
  "description": "A tool for editing vector datasets for mapping and GIS.",
5
5
  "keywords": [
6
6
  "shapefile",
package/www/mapshaper-gui.js CHANGED
@@ -1946,6 +1946,7 @@
1946
1946
  async function receiveFiles(files) {
1947
1947
  var names = getFileNames(files);
1948
1948
  var expanded = [];
1949
+ if (files.length === 0) return;
1949
1950
  try {
1950
1951
  expanded = await expandFiles(files);
1951
1952
  } catch(e) {
@@ -6213,17 +6214,19 @@
6213
6214
  return str.replace(',', '.');
6214
6215
  }
6215
6216
 
6216
- function trimQuotes(raw) {
6217
- var len = raw.length, first, last;
6217
+ function trimQuotes(str) {
6218
+ var len = str.length, first, last;
6218
6219
  if (len >= 2) {
6219
- first = raw.charAt(0);
6220
- last = raw.charAt(len-1);
6221
- if (first == '"' && last == '"' && !raw.includes('","') ||
6222
- first == "'" && last == "'" && !raw.includes("','")) {
6223
- return raw.substr(1, len-2);
6220
+ first = str.charAt(0);
6221
+ last = str.charAt(len-1);
6222
+ if (first == '"' && last == '"' && !str.includes('","') ||
6223
+ first == "'" && last == "'" && !str.includes("','")) {
6224
+ str = str.substr(1, len-2);
6225
+ // remove string escapes
6226
+ str = str.replace(first == '"' ? /\\(?=")/g : /\\(?=')/g, '');
6224
6227
  }
6225
6228
  }
6226
- return raw;
6229
+ return str;
6227
6230
  }
6228
6231
 
6229
6232
  function absArcId(arcId) {
package/www/mapshaper.js CHANGED
@@ -1,6 +1,6 @@
1
1
  (function () {
2
2
 
3
- var VERSION = "0.6.21";
3
+ var VERSION = "0.6.22";
4
4
 
5
5
 
6
6
  var utils = /*#__PURE__*/Object.freeze({
@@ -1183,17 +1183,19 @@
1183
1183
  return str.replace(',', '.');
1184
1184
  }
1185
1185
 
1186
- function trimQuotes(raw) {
1187
- var len = raw.length, first, last;
1186
+ function trimQuotes(str) {
1187
+ var len = str.length, first, last;
1188
1188
  if (len >= 2) {
1189
- first = raw.charAt(0);
1190
- last = raw.charAt(len-1);
1191
- if (first == '"' && last == '"' && !raw.includes('","') ||
1192
- first == "'" && last == "'" && !raw.includes("','")) {
1193
- return raw.substr(1, len-2);
1189
+ first = str.charAt(0);
1190
+ last = str.charAt(len-1);
1191
+ if (first == '"' && last == '"' && !str.includes('","') ||
1192
+ first == "'" && last == "'" && !str.includes("','")) {
1193
+ str = str.substr(1, len-2);
1194
+ // remove string escapes
1195
+ str = str.replace(first == '"' ? /\\(?=")/g : /\\(?=')/g, '');
1194
1196
  }
1195
1197
  }
1196
- return raw;
1198
+ return str;
1197
1199
  }
1198
1200
 
1199
1201
  var LOGGING = false;
@@ -22338,9 +22340,9 @@ ${svg}
22338
22340
  var assignmentRxp = /^([a-z0-9_+-]+)=(?!=)(.*)$/i; // exclude ==
22339
22341
 
22340
22342
  function splitShellTokens(str) {
22341
- var BAREWORD = '([^\'"\\s])+';
22342
- var DOUBLE_QUOTE = '"((\\\\"|[^"])*?)"';
22343
- var SINGLE_QUOTE = '\'((\\\\\'|[^\'])*?)\'';
22343
+ var BAREWORD = `([^'"\\s])+`;
22344
+ var DOUBLE_QUOTE = `"((\\\\"|[^"])*?)"`;
22345
+ var SINGLE_QUOTE = `'((\\\\'|[^'])*?)'`;
22344
22346
  var rxp = new RegExp('(' + BAREWORD + '|' + SINGLE_QUOTE + '|' + DOUBLE_QUOTE + ')*', 'g');
22345
22347
  var matches = str.match(rxp) || [];
22346
22348
  var chunks = matches.filter(function(chunk) {