solve #101

lib/millstone.js

@@ -352,7 +352,7 @@ function unzip(file, callback) {
     }
 
     var remain = zf.names.length;
-    var ds_file = _(zf.names).chain()
+    var ds_files = _(zf.names).chain()
         .reject(function(name) {
             return (name && (name[0] === '.' || path.basename(name)[0] === '.'));
         })
@@ -364,10 +364,27 @@ function unzip(file, callback) {
                 path.extname(name).toLowerCase()
             );
         })
+        .uniq()
         .compact()
-        .first()
         .value();
 
+    var ds_file = ds_files[0];
+
+    if (ds_files.length > 1) {
+        // prefer first .shp
+        for (var i=0;i<ds_files.length;++i) {
+            var fname = ds_files[i];
+            if (path.extname(fname) == '.shp') {
+                ds_file = fname;
+                break;
+            }
+        }
+        if (env == 'development') {
+            console.error('[millstone] warning: detected more than one file type in zip (by ext) that may be valid: ' + ds_files);
+            console.error('[millstone] warning: chose: ' + ds_file);
+        }
+    }
+
     if (!ds_file) return callback(new Error("Valid datasource not detected (by extension) in zip: '" + file + "'"));
 
     zf.names.forEach(function(name) {

test/zip-with-shapefile-and-txt.test.js

@@ -0,0 +1,38 @@
+var fs = require('fs');
+var path = require('path');
+var assert = require('assert');
+
+// switch to 'development' for more verbose logging
+process.env.NODE_ENV = 'production'
+var utils = require('../lib/util.js');
+var millstone = require('../lib/millstone');
+var tests = module.exports = {};
+var rm = require('./support.js').rm;
+
+var existsSync = require('fs').existsSync || require('path').existsSync;
+
+beforeEach(function(){
+  rm(path.join(__dirname, '/tmp/millstone-test'));
+})
+
+// https://github.com/mapbox/millstone/issues/101
+it('correctly prefers (for back compatibility) shapefiles over .txt files in zip archive', function(done) {
+    var mml = JSON.parse(fs.readFileSync(path.join(__dirname, 'zip-with-shapefile-and-txt/project.mml')));
+
+    var cache = '/tmp/millstone-test';
+    var options = {
+        mml: mml,
+        base: path.join(__dirname, 'zip-with-shapefile-and-txt'),
+        cache: cache
+    };
+
+    try {
+        fs.mkdirSync(options.cache, 0777);
+    } catch (e) {}
+
+    millstone.resolve(options, function(err, resolved) {
+        assert.equal(err,undefined,err);
+        assert.deepEqual(resolved.Layer[0].Datasource.type, 'shape');
+        done();
+    });
+});

test/zip-with-shapefile-and-txt/project.mml

@@ -0,0 +1,11 @@
+{
+    "Stylesheet": [ ],
+    "Layer": [
+        {
+            "name": "zip-with-shapefile-and-txt",
+            "Datasource": {
+                "file": "../data/ne_10m_admin_0_boundary_lines_disputed_areas.zip"
+            }
+        }
+    ]
+}