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

Merge pull request #3859 from mapycz/fix-dgal-default-nodata

Browse source 
Respect raster_has_nodata
This commit is contained in:
Artem Pavlenko 2018-02-14 16:51:57 +01:00 committed by GitHub
commit b8e6a0accc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
plugins/input/gdal/gdal_featureset.cpp
View file

@ -586,8 +586,14 @@ feature_ptr gdal_featureset::get_feature(mapnik::query const& q)
} }
mapnik::raster_ptr raster = std::make_shared<mapnik::raster>(feature_raster_extent, intersect, image, filter_factor); mapnik::raster_ptr raster = std::make_shared<mapnik::raster>(feature_raster_extent, intersect, image, filter_factor);
// set nodata value to be used in raster colorizer // set nodata value to be used in raster colorizer
if (nodata_value_) raster->set_nodata(*nodata_value_); if (nodata_value_)
else raster->set_nodata(raster_nodata); {
raster->set_nodata(*nodata_value_);
}
else if (raster_has_nodata)
{
raster->set_nodata(raster_nodata);
}
feature->set_raster(raster); feature->set_raster(raster);
} }
// report actual/original source nodata in feature attributes // report actual/original source nodata in feature attributes