ExternalVendorCode/tippecanoe
1
0
Fork 0
mirror of https://github.com/mapbox/tippecanoe.git synced 2025-04-08 03:24:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move mergeable geometry work to its own source file

Browse Source
This commit is contained in:
Eric Fischer 2018-06-12 09:03:48 -07:00
parent 9e089da98e
commit 2079033646
4 changed files with 231 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -53,7 +53,7 @@ tippecanoe: geojson.o jsonpull/jsonpull.o tile.o pool.o mbtiles.o geometry.o pro
tippecanoe-enumerate: enumerate.o
$(CXX) $(PG) $(LIBS) $(FINAL_FLAGS) $(CFLAGS) -o $@ $^ $(LDFLAGS) -lsqlite3
tippecanoe-decode: decode.o projection.o mvt.o write_json.o text.o jsonpull/jsonpull.o dirtiles.o
tippecanoe-decode: decode.o projection.o mvt.o write_json.o text.o jsonpull/jsonpull.o dirtiles.o vt3.o
$(CXX) $(PG) $(LIBS) $(FINAL_FLAGS) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) -lm -lz -lsqlite3
tile-join: tile-join.o projection.o pool.o mbtiles.o mvt.o memfile.o dirtiles.o jsonpull/jsonpull.o text.o evaluator.o csv.o write_json.o

200
decode.cpp
View File

@ -22,6 +22,7 @@
#include "write_json.hpp"
#include "jsonpull/jsonpull.h"
#include "dirtiles.hpp"
#include "vt3.hpp"
int minzoom = 0;
int maxzoom = 32;
@ -85,205 +86,6 @@ void do_stats(mvt_tile &tile, size_t size, bool compressed, int z, unsigned x, u
state.json_write_newline();
}
void split_feature(mvt_layer const &layer, mvt_feature const &feature, std::vector<std::vector<mvt_tile>> subtiles, size_t n) {
static long clipid_pool = 0;
const std::vector<mvt_geometry> &geom = feature.geometry;
long extent = layer.extent;
long nextent = extent / n;
// Calculate bounding box of feature
long minx = LONG_MAX;
long miny = LONG_MAX;
long maxx = LONG_MIN;
long maxy = LONG_MIN;
for (size_t i = 0; i < geom.size(); i++) {
if (geom[i].op == mvt_moveto || geom[i].op == mvt_lineto) {
if (geom[i].x < minx) {
minx = geom[i].x;
}
if (geom[i].y < miny) {
miny = geom[i].y;
}
if (geom[i].x > maxx) {
maxx = geom[i].x;
}
if (geom[i].y > maxy) {
maxy = geom[i].y;
}
}
}
// Is it bigger than one sub-tile?
// If so, generate an ID for matching
// XXX Is this right for edges on the border?
long nclipid = 0;
if (minx / nextent != maxx / nextent ||
miny / nextent != maxy / nextent) {
nclipid = ++clipid_pool;
}
// Set up a corresponding feature within each sub-tile
// (Empty features will have to get torn down later)
for (size_t x = 0; x < n; x++) {
for (size_t y = 0; y < n; y++) {
mvt_feature nf;
nf.tags = feature.tags;
nf.type = feature.type;
nf.id = feature.id;
nf.has_id = feature.has_id;
nf.clipid = nclipid;
mvt_tile &nt = subtiles[x][y];
mvt_layer &nl = nt.layers[nt.layers.size() - 1];
nl.features.push_back(nf);
}
}
if (feature.type == mvt_linestring) {
std::vector<mvt_geometry> ogeom = geom;
std::vector<mvt_geometry> ngeom;
long pointid = 0;
// XXX shift coordinate system so division will round downward?
// Part 1: Assign (phantom) point IDs in the middle of any
// segments that cross from one sub-tile to another
for (size_t i = 0; i < ogeom.size(); i++) {
if (i > 0 && (ogeom[i].x / nextent != ogeom[i - 1].x / nextent)) {
long first = (ogeom[i - 1].x / nextent) * nextent;
long second = (ogeom[i].x / nextent) * nextent;
if (second > first) {
for (long x = first + 1; x <= second; x += nextent) {
long y = ogeom[i - 1].y + (double) (ogeom[i].y - ogeom[i - 1].y) * (x - first) / (ogeom[i].x - ogeom[i - 1].x);
mvt_geometry p(ogeom[i].op, x, y);
p.id = ++pointid;
p.phantom = true;
ngeom.push_back(p);
}
} else {
for (long x = first; x >= second + 1; x -= nextent) {
long y = ogeom[i - 1].y + (double) (ogeom[i].y - ogeom[i - 1].y) * (x - first) / (ogeom[i].x - ogeom[i - 1].x);
mvt_geometry p(ogeom[i].op, x, y);
p.id = ++pointid;
p.phantom = true;
ngeom.push_back(p);
}
}
}
ngeom.push_back(ogeom[i]);
}
// Part 1a: same, but for Y axis crossings
ogeom = ngeom;
ngeom.clear();
for (size_t i = 0; i < ogeom.size(); i++) {
if (i > 0 && (ogeom[i].y / nextent != ogeom[i - 1].y / nextent)) {
long first = (ogeom[i - 1].y / nextent) * nextent;
long second = (ogeom[i].y / nextent) * nextent;
if (second > first) {
for (long y = first + 1; y <= second; y += nextent) {
long x = ogeom[i - 1].x + (double) (ogeom[i].x - ogeom[i - 1].x) * (y - first) / (ogeom[i].y - ogeom[i - 1].y);
mvt_geometry p(ogeom[i].op, x, y);
p.id = ++pointid;
p.phantom = true;
ngeom.push_back(p);
}
} else {
for (long y = first; y >= second + 1; y -= nextent) {
long x = ogeom[i - 1].x + (double) (ogeom[i].x - ogeom[i - 1].x) * (y - first) / (ogeom[i].y - ogeom[i - 1].y);
mvt_geometry p(ogeom[i].op, x, y);
p.id = ++pointid;
p.phantom = true;
ngeom.push_back(p);
}
}
}
ngeom.push_back(ogeom[i]);
}
// Part 2: Assign (real) point IDs for both ends of any
// segments that travel along a sub-tile edge
for (size_t i = 0; i < ngeom.size(); i++) {
if (i > 0 && ((ngeom[i].x == ngeom[i - 1].x && ngeom[i].x % nextent == 0) ||
(ngeom[i].y == ngeom[i - 1].y && ngeom[i].y % nextent == 0))) {
if (ogeom[i].id == 0) {
ogeom[i].id = ++pointid;
}
if (ogeom[i - 1].id == 0) {
ogeom[i - 1].id = ++pointid;
}
}
}
} else {
// deal with other feature types later
mvt_tile &nt = subtiles[0][0];
mvt_layer &nl = nt.layers[nt.layers.size() - 1];
mvt_feature &nf = nl.features[nl.features.size() - 1];
nf.geometry = geom;
}
}
mvt_tile split_and_merge(mvt_tile tile, int tile_zoom) {
// Features will be split into an NxN grid of sub-tiles,
// to be merged back together at the end,
// which should result in the original set of features
// except (perhaps) for their sequence.
size_t n = 1 << tile_zoom;
std::vector<std::vector<mvt_tile>> subtiles;
subtiles.resize(n);
for (size_t i = 0; i < n; i++) {
subtiles[i].resize(n);
}
for (size_t i = 0; i < tile.layers.size(); i++) {
mvt_layer &layer = tile.layers[i];
// Set up a corresponding layer within each sub-tile
// (Empty layers will have to get torn down later)
for (size_t x = 0; x < n; x++) {
for (size_t y = 0; y < n; y++) {
mvt_layer nl;
// Note that for simplicity this is copying *all* the
// keys and values to the sub-layers, not only the ones
// actually needed for the sub-features.
nl.version = layer.version;
nl.extent = layer.extent >> tile_zoom;
nl.name = layer.name;
nl.keys = layer.keys;
nl.values = layer.values;
subtiles[x][y].layers.push_back(nl);
}
}
// Iterate through features, copying them into sub-tiles
for (size_t j = 0; j < layer.features.size(); j++) {
mvt_feature &feature = layer.features[j];
split_feature(layer, feature, subtiles, n);
}
}
return tile;
}
void handle(std::string message, int z, unsigned x, unsigned y, std::set<std::string> const &to_decode, bool pipeline, bool stats, json_writer &state, int tile_zoom) {
mvt_tile tile;
bool was_compressed;

221
vt3.cpp Normal file
View File

@ -0,0 +1,221 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <sqlite3.h>
#include <getopt.h>
#include <string>
#include <vector>
#include <map>
#include <set>
#include <zlib.h>
#include <math.h>
#include <fcntl.h>
#include <dirent.h>
#include <sys/stat.h>
#include <sys/mman.h>
#include <protozero/pbf_reader.hpp>
#include <sys/stat.h>
#include "mvt.hpp"
#include "projection.hpp"
#include "geometry.hpp"
#include "vt3.hpp"
void split_feature(mvt_layer const &layer, mvt_feature const &feature, std::vector<std::vector<mvt_tile>> subtiles, size_t n) {
static long clipid_pool = 0;
const std::vector<mvt_geometry> &geom = feature.geometry;
long extent = layer.extent;
long nextent = extent / n;
// Calculate bounding box of feature
long minx = LONG_MAX;
long miny = LONG_MAX;
long maxx = LONG_MIN;
long maxy = LONG_MIN;
for (size_t i = 0; i < geom.size(); i++) {
if (geom[i].op == mvt_moveto || geom[i].op == mvt_lineto) {
if (geom[i].x < minx) {
minx = geom[i].x;
}
if (geom[i].y < miny) {
miny = geom[i].y;
}
if (geom[i].x > maxx) {
maxx = geom[i].x;
}
if (geom[i].y > maxy) {
maxy = geom[i].y;
}
}
}
// Is it bigger than one sub-tile?
// If so, generate an ID for matching
// XXX Is this right for edges on the border?
long nclipid = 0;
if (minx / nextent != maxx / nextent ||
miny / nextent != maxy / nextent) {
nclipid = ++clipid_pool;
}
// Set up a corresponding feature within each sub-tile
// (Empty features will have to get torn down later)
for (size_t x = 0; x < n; x++) {
for (size_t y = 0; y < n; y++) {
mvt_feature nf;
nf.tags = feature.tags;
nf.type = feature.type;
nf.id = feature.id;
nf.has_id = feature.has_id;
nf.clipid = nclipid;
mvt_tile &nt = subtiles[x][y];
mvt_layer &nl = nt.layers[nt.layers.size() - 1];
nl.features.push_back(nf);
}
}
if (feature.type == mvt_linestring) {
std::vector<mvt_geometry> ogeom = geom;
std::vector<mvt_geometry> ngeom;
long pointid = 0;
// XXX shift coordinate system so division will round downward?
// Part 1: Assign (phantom) point IDs in the middle of any
// segments that cross from one sub-tile to another
for (size_t i = 0; i < ogeom.size(); i++) {
if (i > 0 && (ogeom[i].x / nextent != ogeom[i - 1].x / nextent)) {
long first = (ogeom[i - 1].x / nextent) * nextent;
long second = (ogeom[i].x / nextent) * nextent;
if (second > first) {
for (long x = first + 1; x <= second; x += nextent) {
long y = ogeom[i - 1].y + (double) (ogeom[i].y - ogeom[i - 1].y) * (x - first) / (ogeom[i].x - ogeom[i - 1].x);
mvt_geometry p(ogeom[i].op, x, y);
p.id = ++pointid;
p.phantom = true;
ngeom.push_back(p);
}
} else {
for (long x = first; x >= second + 1; x -= nextent) {
long y = ogeom[i - 1].y + (double) (ogeom[i].y - ogeom[i - 1].y) * (x - first) / (ogeom[i].x - ogeom[i - 1].x);
mvt_geometry p(ogeom[i].op, x, y);
p.id = ++pointid;
p.phantom = true;
ngeom.push_back(p);
}
}
}
ngeom.push_back(ogeom[i]);
}
// Part 1a: same, but for Y axis crossings
ogeom = ngeom;
ngeom.clear();
for (size_t i = 0; i < ogeom.size(); i++) {
if (i > 0 && (ogeom[i].y / nextent != ogeom[i - 1].y / nextent)) {
long first = (ogeom[i - 1].y / nextent) * nextent;
long second = (ogeom[i].y / nextent) * nextent;
if (second > first) {
for (long y = first + 1; y <= second; y += nextent) {
long x = ogeom[i - 1].x + (double) (ogeom[i].x - ogeom[i - 1].x) * (y - first) / (ogeom[i].y - ogeom[i - 1].y);
mvt_geometry p(ogeom[i].op, x, y);
p.id = ++pointid;
p.phantom = true;
ngeom.push_back(p);
}
} else {
for (long y = first; y >= second + 1; y -= nextent) {
long x = ogeom[i - 1].x + (double) (ogeom[i].x - ogeom[i - 1].x) * (y - first) / (ogeom[i].y - ogeom[i - 1].y);
mvt_geometry p(ogeom[i].op, x, y);
p.id = ++pointid;
p.phantom = true;
ngeom.push_back(p);
}
}
}
ngeom.push_back(ogeom[i]);
}
// Part 2: Assign (real) point IDs for both ends of any
// segments that travel along a sub-tile edge
for (size_t i = 0; i < ngeom.size(); i++) {
if (i > 0 && ((ngeom[i].x == ngeom[i - 1].x && ngeom[i].x % nextent == 0) ||
(ngeom[i].y == ngeom[i - 1].y && ngeom[i].y % nextent == 0))) {
if (ogeom[i].id == 0) {
ogeom[i].id = ++pointid;
}
if (ogeom[i - 1].id == 0) {
ogeom[i - 1].id = ++pointid;
}
}
}
} else {
// deal with other feature types later
mvt_tile &nt = subtiles[0][0];
mvt_layer &nl = nt.layers[nt.layers.size() - 1];
mvt_feature &nf = nl.features[nl.features.size() - 1];
nf.geometry = geom;
}
}
mvt_tile split_and_merge(mvt_tile tile, int tile_zoom) {
// Features will be split into an NxN grid of sub-tiles,
// to be merged back together at the end,
// which should result in the original set of features
// except (perhaps) for their sequence.
size_t n = 1 << tile_zoom;
std::vector<std::vector<mvt_tile>> subtiles;
subtiles.resize(n);
for (size_t i = 0; i < n; i++) {
subtiles[i].resize(n);
}
for (size_t i = 0; i < tile.layers.size(); i++) {
mvt_layer &layer = tile.layers[i];
// Set up a corresponding layer within each sub-tile
// (Empty layers will have to get torn down later)
for (size_t x = 0; x < n; x++) {
for (size_t y = 0; y < n; y++) {
mvt_layer nl;
// Note that for simplicity this is copying *all* the
// keys and values to the sub-layers, not only the ones
// actually needed for the sub-features.
nl.version = layer.version;
nl.extent = layer.extent >> tile_zoom;
nl.name = layer.name;
nl.keys = layer.keys;
nl.values = layer.values;
subtiles[x][y].layers.push_back(nl);
}
}
// Iterate through features, copying them into sub-tiles
for (size_t j = 0; j < layer.features.size(); j++) {
mvt_feature &feature = layer.features[j];
split_feature(layer, feature, subtiles, n);
}
}
return tile;
}

8
vt3.hpp Normal file
View File

@ -0,0 +1,8 @@
#ifndef VT3_HPP
#define VT3_HPP
#include "mvt.hpp"
mvt_tile split_and_merge(mvt_tile tile, int tile_zoom);
#endif