v0.6.31

CHANGELOG.md

@@ -1,3 +1,7 @@
+v0.6.31
+* Updates to gui file import dialog
+* Updated projection library
+
 v0.6.30
 * Added -filter-fields invert option.
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mapshaper",
-  "version": "0.6.30",
+  "version": "0.6.31",
   "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.36",
+    "mproj": "0.0.37",
     "msgpackr": "^1.8.5",
     "opn": "^5.3.0",
     "rw": "~1.3.3",

src/gui/gui-import-control.mjs

@@ -371,7 +371,7 @@ export function ImportControl(gui, opts) {
       var freeform = El('#import-options .advanced-options').node().value;
       importOpts = GUI.parseFreeformOptions(freeform, 'i');
       importOpts.no_repair = !El("#repair-intersections-opt").node().checked;
-      importOpts.snap = !!El("#snap-points-opt").node().checked;
+      // importOpts.snap = !!El("#snap-points-opt").node().checked;
     }
     return importOpts;
   }

www/index.html

@@ -100,7 +100,8 @@ <h3>Layers</h3>
 				<img class="pin-btn pinned" src="images/eye2.png">
 	</div>
 			<div class="layer-list"></div>
-			<h4>Sources</h4>
+			<!-- <h4>Sources</h4> -->
+			<h4>Source files</h4>
 			<div class="file-list"></div>
 			<div>
 				<div id="add-file-btn" class="dialog-btn btn">Add a file</div>
@@ -192,8 +193,8 @@ <h3>Simplification</h3>
 </div></div></div></div>
 			<div class="planar-opt-wrapper"><label for="planar-opt"><input type="checkbox" class="checkbox planar-opt"/>use planar geometry</label>
 							<div class="tip-button">?<div class="tip-anchor">
-			<div class="tip">Interpret x, y values as Cartesian coordinates
-on a plane, rather than longitude, latitude
+			<div class="tip">Treat x, y values as Cartesian coordinates
+on a plane, rather than as longitude, latitude
 coordinates on a sphere.
 </div></div></div></div>
 		</div>
@@ -256,7 +257,7 @@ <h4>Quick import</h4>
 
 <div id="import-options" class="main-area popup-dialog">
 	<div class="info-box">
-		<!-- <h4>Queued files</h4> -->
+		<h3 class="list-header">Files</h3>
 
 		<div class="dropped-file-list"></div>
 
@@ -272,20 +273,20 @@ <h4>Options</h4>
 self-intersections, to help identify
 topological errors in a dataset.</div></div></div></div>
 
-				<div><label for="snap-points-opt"><input type="checkbox" class="checkbox" id="snap-points-opt" />snap vertices</label>
+				<!-- <div><label for="snap-points-opt"><input type="checkbox" class="checkbox" id="snap-points-opt" />snap vertices</label>
 				<div class="tip-button">?<div class="tip-anchor">
 <div class="tip">Fix topology errors by snapping
 together points with nearly identical
 coordinates. This option does not
-apply to TopoJSON files.</div></div></div></div>
+apply to TopoJSON files.</div></div></div></div> -->
 <div style="height:5px"></div>
 
 		</div>
 
 		<div><input type="text" class="advanced-options" placeholder="import options" /><div class="tip-button">?<div class="tip-anchor">
 <div class="tip">Enter options from the command line
-interface. Examples: "no-topology"
-"encoding=big5"</div></div></div></div>
+interface. Examples: <span id="import-option-examples">no-topology
+encoding=big5</span></div></div></div></div>
 
 		</div>
 

www/modules.js

@@ -12530,7 +12530,10 @@ function wkt_unpack(str) {
   str = convert_wkt_quotes(str);
 
   // Convert WKT entities to JSON arrays
-  str = str.replace(/([A-Z0-9]+)\[/g, '["$1",');
+  // str = str.replace(/([A-Z0-9]+)\[/g, '["$1",');
+  // Changed to ignore some names that look like entities, like "GCS_TWD97[2020]"
+  // allow only [ or , character before the next quote (i.e. block close quotes)
+  str = str.replace(/([A-Z0-9]+)\[(?![^"]*[^\[,"]")/g, '["$1",');
 
   // Enclose axis keywords in quotes to create valid JSON strings
   str = str.replace(/, *([a-zA-Z]+) *(?=[,\]])/g, ',"$1"');

www/page.css

@@ -531,6 +531,10 @@ body.dragover #import-options-drop-area .drop-area {
 	font-weight: normal;
 }
 
+.info-box h3.list-header {
+	margin-bottom: 0.1em;
+}
+
 .info-box h4 {
 	font-size: 1.085em;
 	font-weight: normal;