Jgraves/app 2163

README.md

@@ -3,7 +3,7 @@
 # shp-write
 
 Writes shapefile in pure javascript. Uses [dbf](https://github.com/tmcw/dbf)
-for the data component, and [jsZIP](http://stuk.github.io/jszip/) to generate
+for the data component, [FileSaver](https://github.com/eligrey/FileSaver.js/) and [jsZIP](http://stuk.github.io/jszip/) to generate
 ZIP file downloads in-browser.
 
 ## Usage
@@ -22,7 +22,7 @@ Or in a browser
   support
 * Geometries: Point, LineString, Polygon, MultiLineString, MultiPolygon
 * Tabular-style properties export with Shapefile's field name length limit
-* Uses jsZip for ZIP files, but [compression is buggy](https://github.com/Stuk/jszip/issues/53) so it uses STORE instead of DEFLATE.
+* Uses jsZip for ZIP files.
 
 ## Example
 
@@ -36,7 +36,8 @@ var options = {
         point: 'mypoints',
         polygon: 'mypolygons',
         line: 'mylines'
-    }
+    },
+    filename: 'my-filename'
 }
 // a GeoJSON bridge for features
 shpwrite.download({
@@ -104,3 +105,4 @@ object.
 ## Contributors
 
 * Nick Baugh <[email protected]>
+* Jason Graves <[email protected]>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "shp-write",
-  "version": "0.3.2",
+  "version": "0.3.5",
   "description": "write shapefiles from pure javascript",
   "main": "index.js",
   "scripts": {
@@ -27,6 +27,10 @@
     {
       "name": "Nick Baugh",
       "email": "[email protected]"
+    },
+    {
+      "name": "Jason Graves",
+      "email": "[email protected]"
     }
   ],
   "license": "BSD-2-Clause",
@@ -35,7 +39,8 @@
   },
   "dependencies": {
     "dbf": "0.1.4",
-    "jszip": "2.5.0"
+    "jszip": "3.2.0",
+    "file-saver": "^2.0.2"
   },
   "devDependencies": {
     "browserify": "^13.0.0",

src/download.js

@@ -1,6 +1,11 @@
 var zip = require('./zip');
+var FileSaver = require('file-saver');
 
 module.exports = function(gj, options) {
-    var content = zip(gj, options);
-    location.href = 'data:application/zip;base64,' + content;
+    zip(gj, options)
+        .then(content => {
+            options = options ? options : {};
+            const filename = options.filename ? `${options.filename}.zip` : "download.zip";
+            FileSaver.saveAs(content, filename);
+        });
 };

src/zip.js

@@ -19,7 +19,7 @@ module.exports = function(gj, options) {
                 // geometries
                 l.geometries,
                 function(err, files) {
-                    var fileName = options && options.types[l.type.toLowerCase()] ? options.types[l.type.toLowerCase()] : l.type;
+                    var fileName = options && options.types && options.types[l.type.toLowerCase()] ? options.types[l.type.toLowerCase()] : l.type;
                     layers.file(fileName + '.shp', files.shp.buffer, { binary: true });
                     layers.file(fileName + '.shx', files.shx.buffer, { binary: true });
                     layers.file(fileName + '.dbf', files.dbf.buffer, { binary: true });
@@ -28,11 +28,13 @@ module.exports = function(gj, options) {
         }
     });
 
-    var generateOptions = { compression:'STORE' };
+    const generateOptions = {
+        type: "blob"
+    };
 
     if (!process.browser) {
       generateOptions.type = 'nodebuffer';
     }
 
-    return zip.generate(generateOptions);
+    return zip.generateAsync(generateOptions);
 };