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

gdal: Do not shrink query extent

Browse source
This commit is contained in:
Jiri Drbalek 2018-05-24 13:23:40 +00:00
parent a20c1fc1c4
commit 69f38549c5
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -267,18 +267,14 @@ feature_ptr gdal_featureset::get_feature(mapnik::query const& q)
if (current_width != (int)raster_width_) if (current_width != (int)raster_width_)
{ {
double ratio = (double)current_width / (double)raster_width_; double ratio = (double)current_width / (double)raster_width_;
int adjusted_width = static_cast<int>(std::floor((ratio * im_width) + 0.5)); im_offset_x = std::floor(ratio * im_offset_x);
double adjusted_ratio = (double)adjusted_width / (double)im_width; im_width = static_cast<int>(std::ceil(ratio * im_width));
im_offset_x = adjusted_ratio * im_offset_x;
im_width = adjusted_width;
} }
if (current_height != (int)raster_height_) if (current_height != (int)raster_height_)
{ {
double ratio = (double)current_height / (double)raster_height_; double ratio = (double)current_height / (double)raster_height_;
int adjusted_height = static_cast<int>(std::floor((ratio * im_height) + 0.5)); im_offset_y = std::floor(ratio * im_offset_y);
double adjusted_ratio = (double)adjusted_height / (double)im_height; im_height = static_cast<int>(std::ceil(ratio * im_height));
im_offset_y = adjusted_ratio * im_offset_y;
im_height = adjusted_height;
} }
} }