mapshaper 0.5.74 → 0.5.78

package/www/modules.js

@@ -12464,8 +12464,9 @@ function wkt_parse(str) {
 // WKT format: http://docs.opengeospatial.org/is/12-063r5/12-063r5.html#11
 function wkt_unpack(str) {
   var obj;
-  // Convert WKT escaped quote to JSON escaped quote
-  str = str.replace(/""/g, '\\"');
+  // Convert WKT escaped quotes to JSON escaped quotes
+  // str = str.replace(/""/g, '\\"'); // BUGGY
+  str = convert_wkt_quotes(str);
 
   // Convert WKT entities to JSON arrays
   str = str.replace(/([A-Z0-9]+)\[/g, '["$1",');
@@ -12487,6 +12488,23 @@ function wkt_unpack(str) {
   return obj;
 }
 
+// Convert WKT escaped quotes to JSON escaped quotes ("" -> \")
+function convert_wkt_quotes(str) {
+  var c = 0;
+  return str.replace(/"+/g, function(s) {
+    var even = c % 2 == 0;
+    c += s.length;
+    // ordinary, unescaped quotes
+    if (s == '"' || s == '""' && even) return s;
+    // WKT-escaped quotes
+    if (even) {
+      return '"' + s.substring(1).replace(/""/g, '\\"');
+    } else {
+      return s.replace(/""/g, '\\"');
+    }
+  });
+}
+
 // Rearrange a subarray of a parsed WKT file for easier traversal
 // E.g.
 //   ["WGS84", ...]  to  {NAME: "WGS84"}
@@ -21706,6 +21724,7 @@ api.internal = {
   RAD_TO_DEG: RAD_TO_DEG,
   wkt_parse: wkt_parse,
   wkt_unpack: wkt_unpack,
+  convert_wkt_quotes: convert_wkt_quotes,
   wkt_to_proj4: wkt_to_proj4,
   wkt_from_proj4: wkt_from_proj4,
   wkt_make_projcs: wkt_make_projcs,

package/www/page.css

@@ -32,7 +32,7 @@ html, body {
 body {
 	overflow: hidden;
 	background-color: #fff;
-	font: 14px/1.4 'Source Sans Pro', Helvetica, sans-serif;
+	font: 14px/1.4 'Source Sans Pro', Arial, sans-serif;
 	color: #444;
 	user-select: none;
 	-webkit-user-select: none;