refs #928: bookmarking working build of refactor

This commit is contained in:
Justin R. Miller
2015-03-04 13:37:03 -08:00
committed by John Firebaugh
parent 831264d530
commit 41c3b82d3e
13 changed files with 234 additions and 244 deletions

View File

@@ -15,15 +15,39 @@ std::ostream& mbgl::operator<<(std::ostream& os, const GeometryFeatureType& type
}
}
GeometryTileFeature::GeometryTileFeature() {}
Geometry GeometryTileFeature::nextGeometry() {
Geometry result;
result.set<std::false_type>();
return result;
}
std::ostream& mbgl::operator<<(std::ostream& os, const GeometryTileFeature& feature) {
os << "Feature(" << feature.id << "): " << feature.type << std::endl;
for (const auto& prop : feature.properties) {
os << " - " << prop.first << ": " << prop.second << std::endl;
}
return os;
}
GeometryFilteredTileLayer::GeometryFilteredTileLayer(const GeometryTileLayer& layer_, const FilterExpression& filterExpression_)
: layer(layer_),
filterExpression(filterExpression_) {}
GeometryTileFeature GeometryFilteredTileLayer::nextMatchingFeature() {
GeometryTileFeature result;
result.type = GeometryFeatureType::Unknown;
return result;
}
GeometryTileFeature GeometryTileLayer::nextFeature() {
return GeometryTileFeature();
}
GeometryTile& GeometryTile::operator=(GeometryTile&& other) {
if (this != &other) {
layers.swap(other.layers);
}
return *this;
}
template <typename T>
GeometryFilteredTileLayer<T>::iterator::iterator(const GeometryFilteredTileLayer<T>& parent_)
: parent(parent_) {
operator++();
}