diegoripley/tippecanoe
1
0
Fork 0
mirror of https://github.com/felt/tippecanoe.git synced 2026-10-05 09:55:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Bug fix: mismatched features could be coalesced if from a prefilter

Browse Source
This commit is contained in:
Eric Fischer
2018-10-10 14:35:46 -07:00
parent b7fb576544
commit 1b75ca33b4
4 changed files with 1102 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+5
View File
@@ -1,3 +1,8 @@
## 1.32.0
* Fix a bug that allowed coalescing of features with mismatched attributes
if they had been passed through a shell prefilter
## 1.31.7 ## 1.31.7
* Create the output tile directory even if there are no valid features * Create the output tile directory even if there are no valid features
tests/ne_110m_admin_0_countries/out/--coalesce_-z2_-Ccat.json
+1090 -52
View File
File diff suppressed because one or more lines are too long
tile.cpp
+6 -6
View File
@@ -142,21 +142,21 @@ int coalcmp(const void *v1, const void *v2) {
} }
for (size_t i = 0; i < c1->full_keys.size(); i++) { for (size_t i = 0; i < c1->full_keys.size(); i++) {
if (c1->full_keys[i] < c1->full_keys[i]) { if (c1->full_keys[i] < c2->full_keys[i]) {
return -1; return -1;
} else if (c1->full_keys[i] > c1->full_keys[i]) { } else if (c1->full_keys[i] > c2->full_keys[i]) {
return 1; return 1;
} }
if (c1->full_values[i].type < c1->full_values[i].type) { if (c1->full_values[i].type < c2->full_values[i].type) {
return -1; return -1;
} else if (c1->full_values[i].type > c1->full_values[i].type) { } else if (c1->full_values[i].type > c2->full_values[i].type) {
return 1; return 1;
} }
if (c1->full_values[i].s < c1->full_values[i].s) { if (c1->full_values[i].s < c2->full_values[i].s) {
return -1; return -1;
} else if (c1->full_values[i].s > c1->full_values[i].s) { } else if (c1->full_values[i].s > c2->full_values[i].s) {
return 1; return 1;
} }
} }
version.hpp
+1 -1
View File
@@ -1,6 +1,6 @@
#ifndef VERSION_HPP #ifndef VERSION_HPP
#define VERSION_HPP #define VERSION_HPP
#define VERSION "v1.31.7" #define VERSION "v1.32.0"
#endif #endif