From 94cd6976770e8fc6708552648306843b36db094d Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Wed, 26 Sep 2018 10:38:10 -0700 Subject: [PATCH 1/2] remove prefiltering - reverts part of #126 --- src/coalesce.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/coalesce.cpp b/src/coalesce.cpp index ea0d975..097759b 100644 --- a/src/coalesce.cpp +++ b/src/coalesce.cpp @@ -606,7 +606,6 @@ void coalesceMulti(uv_work_t* req) { } } } - maxrelev = std::max(maxrelev, context_relev); if (last) { // Slightly penalize contexts that have no stacking if (covers.size() == 1) { @@ -615,9 +614,7 @@ void coalesceMulti(uv_work_t* req) { } else if (covers[0].mask > covers[1].mask) { context_relev -= 0.01; } - if (maxrelev - context_relev < .25) { - contexts.emplace_back(std::move(covers), context_mask, context_relev); - } + contexts.emplace_back(std::move(covers), context_mask, context_relev); } else if (first || covers.size() > 1) { cit = coalesced.find(zxy); if (cit == coalesced.end()) { @@ -636,9 +633,7 @@ void coalesceMulti(uv_work_t* req) { // append coalesced to contexts by moving memory for (auto&& matched : coalesced) { for (auto&& context : matched.second) { - if (maxrelev - context.relev < .25) { - contexts.emplace_back(std::move(context)); - } + contexts.emplace_back(std::move(context)); } } From e7b336897dc5824da88ce856a2c330766db75257 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Wed, 26 Sep 2018 10:46:46 -0700 Subject: [PATCH 2/2] [publish-binary] for 0.21.5-noprefilter to make testing downstream easy --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 773ab70..8032955 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "url": "git://github.com/mapbox/carmen-cache.git", "type": "git" }, - "version": "0.21.5", + "version": "0.21.5-noprefilter", "dependencies": { "nan": "~2.10.0", "node-pre-gyp": "~0.10.1"