Merge pull request #116 from mapbox/srs-0.4.0

Upgrade to node-srs@0.4.0
tilemill-project · May 12, 2014 · 685e0d4 · 685e0d4
2 parents 66d4b09 + 381659e
commit 685e0d4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,7 +3,7 @@
 #### FUTURE
 
 * Fixed bug whereby more than one interval timer was being created causing the millstone command to hang rather than exit
-* Upgraded to node-srs@0.3.12
+* Upgraded to node-srs@0.4.0
 
 #### 0.6.12
 

diff --git a/lib/millstone.js b/lib/millstone.js
@@ -935,7 +935,8 @@ function resolve(options, callback) {
                         case '.topojson':
                         case '.json':
                             try {
-                                l.srs = l.srs || srs.parse(d.file).proj4;
+                                var json_obj = JSON.parse(fs.readFileSync(d.file));
+                                l.srs = l.srs || srs.parse(srs.jsonCrs(json_obj)).proj4;
                             } catch (e) {
                                 next(new Error("Could not parse: '" + d.file + "': error: '" + e.message + "'"));
                             }

diff --git a/package.json b/package.json
@@ -19,7 +19,7 @@
         "step": "~0.0.5",
         "generic-pool": "~2.0.3",
         "request": "~2.34.0",
-        "srs": "~0.3.12",
+        "srs": "~0.4.0",
         "zipfile": "~0.5.2",
         "sqlite3": "2.x",
         "mime": "~1.2.9",