Merge branch 'master' into plugins

This commit is contained in:
Eric Fischer
2017-03-28 16:42:22 -07:00
17 changed files with 411 additions and 87 deletions
+12
View File
@@ -13,6 +13,18 @@ struct mvt_geometry {
int /* mvt_operation */ op;
mvt_geometry(int op, long long x, long long y);
bool operator<(mvt_geometry const &s) const {
if (y < s.y || (y == s.y && x < s.x)) {
return true;
} else {
return false;
}
}
bool operator==(mvt_geometry const &s) const {
return y == s.y && x == s.x;
}
};
enum mvt_geometry_type {