From a96e05a1add0de1a3b68c710b72cc87c36952cf4 Mon Sep 17 00:00:00 2001 From: gerdie Date: Mon, 19 Jul 2021 16:47:33 -0700 Subject: [PATCH] move names.push_back(name) line down --- src/vtcomposite.cpp | 3 +-- test/vtcomposite.test.js | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/vtcomposite.cpp b/src/vtcomposite.cpp index f44d037..1ef8d26 100644 --- a/src/vtcomposite.cpp +++ b/src/vtcomposite.cpp @@ -178,14 +178,13 @@ struct CompositeWorker : Napi::AsyncWorker std::uint32_t const version = layer.version(); if (std::find(std::begin(names), std::end(names), name) == std::end(names)) { - names.push_back(name); - // should we keep this layer? // if include_layers is empty, keep all layers // if include_layers is not empty, keep layer if we can find its name in the vector std::string sname(name); if (include_layers.empty() || std::find(std::begin(include_layers), std::end(include_layers), sname) != std::end(include_layers)) { + names.push_back(name); std::uint32_t extent = layer.extent(); if (zoom_factor == 1) { diff --git a/test/vtcomposite.test.js b/test/vtcomposite.test.js index fb1c8da..b513a94 100644 --- a/test/vtcomposite.test.js +++ b/test/vtcomposite.test.js @@ -333,7 +333,7 @@ test('[composite] success: drop layers if "layers" array is in tiles object', fu composite(tiles, zxy, {}, (err, vtBuffer) => { assert.notOk(err); assert.deepEqual(Object.keys(vtinfo(vtBuffer).layers), ['building', 'poi_label'], 'expected layers'); - assert.notEqual(vtBuffer.length, bufferSF.length, 'buffer is not of the same sie'); + assert.notEqual(vtBuffer.length, bufferSF.length, 'buffer is not of the same size'); assert.end(); }); });