Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
e-n-f merged 1 commit into from
Oct 10, 2018
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

* Create the output tile directory even if there are no valid features
Expand Down
1,244 changes: 1,141 additions & 103 deletions tests/ne_110m_admin_0_countries/out/--coalesce_-z2_-Ccat.json
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions tile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,21 +142,21 @@ int coalcmp(const void *v1, const void *v2) {
}

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;
} else if (c1->full_keys[i] > c1->full_keys[i]) {
} else if (c1->full_keys[i] > c2->full_keys[i]) {
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;
} 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;
}

if (c1->full_values[i].s < c1->full_values[i].s) {
if (c1->full_values[i].s < c2->full_values[i].s) {
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;
}
}
Expand Down
2 changes: 1 addition & 1 deletion version.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#ifndef VERSION_HPP
#define VERSION_HPP

#define VERSION "v1.31.7"
#define VERSION "v1.32.0"

#endif