sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix rendering of multiple styles with OGR plugin - refs #2048 and mapbox/tilemill#2202

Browse source
This commit is contained in:
Dane Springmeyer 2014-01-31 19:12:31 -08:00
parent 79a82cd8ff
commit 538af2515d
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
plugins/input/ogr/ogr_featureset.cpp
View file

@ -52,7 +52,7 @@ ogr_featureset::ogr_featureset(mapnik::context_ptr const& ctx,
layer_(layer), layer_(layer),
layerdef_(layer.GetLayerDefn()), layerdef_(layer.GetLayerDefn()),
tr_(new transcoder(encoding)), tr_(new transcoder(encoding)),
fidcolumn_(layer_.GetFIDColumn()), fidcolumn_(layer_.GetFIDColumn()), // TODO - unused
count_(0) count_(0)
{ {
layer_.SetSpatialFilterRect (extent.minx(), layer_.SetSpatialFilterRect (extent.minx(),
@ -67,6 +67,13 @@ ogr_featureset::~ogr_featureset()
feature_ptr ogr_featureset::next() feature_ptr ogr_featureset::next()
{ {
if (count_ == 0)
{
// Reset the layer reading on the first feature read
// this is a hack, but needed due to https://github.com/mapnik/mapnik/issues/2048
// Proper solution is to avoid storing layer state in featureset
layer_.ResetReading();
}
OGRFeature *poFeature; OGRFeature *poFeature;
while ((poFeature = layer_.GetNextFeature()) != nullptr) while ((poFeature = layer_.GetNextFeature()) != nullptr)
{ {