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

Fix signedness warnings, missing #includes, and code formatting.

Browse Source
This commit is contained in:
Eric Fischer 2016-04-22 23:32:02 -07:00
parent b15956b476
commit 9e9afb06d2
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
decode.cc
View File

@ -61,7 +61,7 @@ void handle(std::string message, int z, unsigned x, unsigned y, int describe) {
printf(", \"features\": [\n");
for (int l = 0; l < tile.layers.size(); l++) {
for (size_t l = 0; l < tile.layers.size(); l++) {
mvt_layer &layer = tile.layers[l];
int extent = layer.extent;
@ -79,7 +79,7 @@ void handle(std::string message, int z, unsigned x, unsigned y, int describe) {
within = 0;
}
for (int f = 0; f < layer.features.size(); f++) {
for (size_t f = 0; f < layer.features.size(); f++) {
mvt_feature &feat = layer.features[f];
if (within) {
@ -146,7 +146,7 @@ void handle(std::string message, int z, unsigned x, unsigned y, int describe) {
std::vector<draw> ops;
for (int g = 0; g < feat.geometry.size(); g++) {
for (size_t g = 0; g < feat.geometry.size(); g++) {
int op = feat.geometry[g].op;
long long px = feat.geometry[g].x;
long long py = feat.geometry[g].y;

19
mvt.cc
View File

@ -154,7 +154,8 @@ bool mvt_decode(std::string &message, mvt_tile &out) {
}
layer.values.push_back(value);
} break;
break;
}
case 5: /* extent */
layer.extent = layer_reader.get_uint32();
@ -174,7 +175,8 @@ bool mvt_decode(std::string &message, mvt_tile &out) {
for (auto it = pi.first; it != pi.second; ++it) {
feature.tags.push_back(*it);
}
} break;
break;
}
case 3: /* feature type */
feature.type = feature_reader.get_enum();
@ -186,7 +188,8 @@ bool mvt_decode(std::string &message, mvt_tile &out) {
for (auto it = pi.first; it != pi.second; ++it) {
geoms.push_back(*it);
}
} break;
break;
}
default:
feature_reader.skip();
@ -214,7 +217,8 @@ bool mvt_decode(std::string &message, mvt_tile &out) {
}
layer.features.push_back(feature);
} break;
break;
}
default:
layer_reader.skip();
@ -223,7 +227,8 @@ bool mvt_decode(std::string &message, mvt_tile &out) {
}
out.layers.push_back(layer);
} break;
break;
}
default:
reader.skip();
@ -243,8 +248,8 @@ std::string mvt_encode(mvt_tile &in) {
std::string layer_string;
protozero::pbf_writer layer_writer(layer_string);
layer_writer.add_uint32(15, 1); /* version */
layer_writer.add_string(1, in.layers[i].name); /* name */
layer_writer.add_uint32(15, 1); /* version */
layer_writer.add_string(1, in.layers[i].name); /* name */
layer_writer.add_uint32(5, in.layers[i].extent); /* extent */
for (size_t j = 0; j < in.layers[i].keys.size(); j++) {

1
tile-join.cc
View File

@ -1,5 +1,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <sqlite3.h>
#include <limits.h>