ExternalVendorCode/tippecanoe
1
0
Fork 0
mirror of https://github.com/mapbox/tippecanoe.git synced 2025-04-23 18:13:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Also make tilestats in tile-join

Browse Source
This commit is contained in:
Eric Fischer 2017-07-18 16:53:06 -07:00
parent 9304bc5ca1
commit b3078ddeec
1 changed files with 46 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
tile-join.cpp
View File

@ -153,6 +153,29 @@ void handle(std::string message, int z, unsigned x, unsigned y, std::map<std::st
attributes.insert(std::pair<std::string, mvt_value>(key, val));
types.insert(std::pair<std::string, int>(key, type));
key_order.push_back(key);
auto st = file_keys->second.file_keys.find(key);
if (st == file_keys->second.file_keys.end()) {
file_keys->second.file_keys.insert(std::pair<std::string, type_and_string_stats>(key, type_and_string_stats()));
st = file_keys->second.file_keys.find(key);
}
if (type == mvt_double) {
double d = atof(value.c_str());
if (d < st->second.min) {
st->second.min = d;
}
if (d > st->second.max) {
st->second.max = d;
}
}
if (st->second.sample_values.size() < 1000) {
type_and_string tas;
tas.type = type;
tas.string = value;
st->second.sample_values.insert(tas);
}
}
if (header.size() > 0 && strcmp(key, header[0].c_str()) == 0) {
@ -199,26 +222,35 @@ void handle(std::string message, int z, unsigned x, unsigned y, std::map<std::st
attributes.insert(std::pair<std::string, mvt_value>(sjoinkey, outval));
types.insert(std::pair<std::string, int>(sjoinkey, attr_type));
key_order.push_back(sjoinkey);
auto st = file_keys->second.file_keys.find(joinkey);
if (st == file_keys->second.file_keys.end()) {
file_keys->second.file_keys.insert(std::pair<std::string, type_and_string_stats>(joinkey, type_and_string_stats()));
st = file_keys->second.file_keys.find(joinkey);
}
if (st->second.sample_values.size() < 1000) {
type_and_string tas;
tas.type = outval.type;
tas.string = joinval;
st->second.sample_values.insert(tas);
}
if (outval.type == mvt_double) {
double d = atof(joinval.c_str());
if (d < st->second.min) {
st->second.min = d;
}
if (d > st->second.max) {
st->second.max = d;
}
}
}
}
}
}
}
for (auto tp : types) {
type_and_string_stats st;
st.type = tp.second;
if (st.sample_values.size() < 1000) {
type_and_string tas;
tas.type = tp.second;
tas.string = "XXX"; // XXX tilestats: provide actual values
st.sample_values.insert(tas);
}
file_keys->second.file_keys.insert(std::pair<std::string, type_and_string_stats>(tp.first, st));
}
// To keep attributes in their original order instead of alphabetical
for (auto k : key_order) {
auto fa = attributes.find(k);