From 417accfeba7e7dbea2615846ea3f6c60387e0040 Mon Sep 17 00:00:00 2001 From: jakepruitt Date: Mon, 28 Mar 2016 13:21:21 -0700 Subject: [PATCH 1/3] Add test case for missing error code addition --- index.js | 5 ++++- test/fixtures/tm2z/invalid.tm2z | Bin 0 -> 709 bytes test/tm2z.js | 10 ++++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 test/fixtures/tm2z/invalid.tm2z diff --git a/index.js b/index.js index 08aa03c..5b1be93 100644 --- a/index.js +++ b/index.js @@ -341,7 +341,10 @@ Vector.prototype.profile = function(callback) { if (queue.length) { var t = queue.shift(); s.getTile(t.z, t.x, t.y, function(err, run1, headers) { - if (err) return callback(err); + if (err) { + err.code = 'EMAPNIK'; + return callback(err); + } s.getTile(t.z, t.x, t.y, function(err, run2, headers) { if (err) return callback(err); t.drawtime = Math.min(run1._drawtime, run2._drawtime); diff --git a/test/fixtures/tm2z/invalid.tm2z b/test/fixtures/tm2z/invalid.tm2z new file mode 100644 index 0000000000000000000000000000000000000000..d3c3d5b7a4261b79285dab08c27db8904989f181 GIT binary patch literal 709 zcmV;$0y_O4iwFP!000003++{HPunmM=5v3AF(2E!wX~^F5{6(Okh%>GB(xz^xrr0J zCU#^y&{Flk@7$L41*WnwX&`Zx>ht;Dp1ZSidf7wY1*Z!2$e2phv~|&RN-2KOSlgo_ z-+4K?uG{H!kXeB?*H+VSq8+c<@jESd-*^2T*W33!kh%XL_ExHtCK6J4sh>@7Z-jzF z=rOvbQZd0p?Ab0xl*b}rJPUE9Q>%*)qgt?g^5yvA+u29-iIi8@Ab=GqsX|;g!x9!$ z#;8uhPRs9lEg#hfOExFEuT|*UF7Sf)-8nmYV8##3F!an)aR%xIs&kTLk|iqqz^gn* z^}C^_BMoxVPiU%8T|nYEs?~xsB1u6tz=&!HEw_ln8sdSdc%pD*d0n?*b=$Vv_PmDK zEcn3rW%8thm~w4GS)SLl+YeR^cbi=*WI;5JN}hEOituKeJ~LrRtl2Ho<9=?gB#urm zd$TJ#yP?fLbCEKd8|3D!kx&&&R%&SVHZKJk-3w9R$lt2T_*`>qG0Z=Xg59g*lcS5H ztJBS==lVL@=0b@|#;Z;WQVzuEz;PUsjY&piW_S0qVdZJkSW03-(iTmg5kS+Tgn3;J z5hyJM&!Wl1s7$AUvk=rKlf9LaPN%hCAdwRVsvvm|`fG<^HWP!Dvv#nV)yf8@8HW2@ zk8`@nZ+#XpN?8tiRv{8IZA>Z{HiPSHl~cnQh$0_nf}f9zfymiCKn0`R5+#XYLPG4? zK1Q)9N)UxOQQ9I}lrz_Pi1%np+k|4kHFwuzoUZsXwHQ+CjwSjA-VeMGfFViEZ($fX z^Na##h6b2<)1O2I`mg0_nL(bV{24NRbQPB;2I5Q_ZFKAy-X1L(RYyGOks(!o*|fC| riAq1Ku#bbk-r7FO^|$49;Nuhh?=R;&z0*6r)7z$>q{J}n01f~EgoRq< literal 0 HcmV?d00001 diff --git a/test/tm2z.js b/test/tm2z.js index 7eb8a2f..7707be1 100644 --- a/test/tm2z.js +++ b/test/tm2z.js @@ -250,6 +250,16 @@ test('profiles a tm2z file', function(t) { }); }); }); +test('errors with EMAPNIK when profiling invalid tm2z', function(t) { + tilelive.load('tm2z://' + path.join(fixtureDir, 'invalid.tm2z'), function(err, source) { + t.ifError(err); + source.profile(function(err, profile) { + t.equal('EMAPNIK', err.code); + t.equal(err.message, 'Tile does not exist'); + t.end(); + }); + }); +}); test('loads a tm2z+http url', function(t) { tilelive.load('tm2z+' + remotePath, function(err, source) { From dc7b5e0641d3a66e5a04738cb66c3fec8e6b848f Mon Sep 17 00:00:00 2001 From: jakepruitt Date: Mon, 28 Mar 2016 15:22:06 -0700 Subject: [PATCH 2/3] Use 4.2.3 instead of 0.12 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bc50d38..025a1d5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: node_js node_js: - '0.10' -- '0.12' +- '4.2.3' addons: apt: sources: From a08cc34baf9055b39e278e14004046f02273b306 Mon Sep 17 00:00:00 2001 From: gretacb Date: Mon, 28 Mar 2016 18:44:15 -0400 Subject: [PATCH 3/3] fix test to handle different node versions --- test/tm2z.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/tm2z.js b/test/tm2z.js index 7707be1..dc93381 100644 --- a/test/tm2z.js +++ b/test/tm2z.js @@ -179,7 +179,7 @@ test('errors out if unzipped project.xml size exceeds custom max size', function }); test('errors out if not a directory', function(t) { tilelive.load('tm2z://' + path.join(fixtureDir, 'nodirectory.tm2z'), function(err, source) { - t.equal(err.message.split(',')[0], 'EISDIR'); + t.ok(err.message.indexOf('EISDIR') !== -1); t.end(); }); });