|
Line
Link Here
|
|
-- |
|
|
| 1 |
plugins/osmrenderer/mapnikrenderer.cpp | 10 +++++----- |
|
plugins/osmrenderer/mapnikrenderer.cpp | 10 +++++----- |
| 2 |
plugins/osmrenderer/mapnikrenderer.pro | 2 +- |
1 |
plugins/osmrenderer/mapnikrenderer.pro | 2 +- |
| 3 |
preprocessor/preprocessor-gui.pro | 2 +- |
2 |
preprocessor/preprocessor-gui.pro | 2 +- |
| 4 |
preprocessor/preprocessor.pro | 2 +- |
3 |
preprocessor/preprocessor.pro | 2 +- |
| 5 |
4 files changed, 8 insertions(+), 8 deletions(-) |
4 |
4 files changed, 8 insertions(+), 8 deletions(-) |
| 6 |
-- monav.orig/plugins/osmrenderer/mapnikrenderer.cpp |
5 |
++ monav/plugins/osmrenderer/mapnikrenderer.cpp |
|
Lines 264-270
bool MapnikRenderer::Preprocess( IImport
Link Here
|
| 264 |
const int metaTileSize = m_settings.metaTileSize * m_settings.tileSize + 2 * m_settings.margin; |
264 |
const int metaTileSize = m_settings.metaTileSize * m_settings.tileSize + 2 * m_settings.margin; |
| 265 |
|
265 |
|
| 266 |
mapnik::Map map; |
266 |
mapnik::Map map; |
| 267 |
mapnik::Image32 image( metaTileSize, metaTileSize ); |
267 |
mapnik::image_32 image( metaTileSize, metaTileSize ); |
| 268 |
QTemporaryFile tempOut; |
268 |
QTemporaryFile tempOut; |
| 269 |
QTemporaryFile tempIn; |
269 |
QTemporaryFile tempIn; |
| 270 |
mapnik::load_map( map, m_settings.theme.toLocal8Bit().constData() ); |
270 |
mapnik::load_map( map, m_settings.theme.toLocal8Bit().constData() ); |
|
Lines 288-296
bool MapnikRenderer::Preprocess( IImport
Link Here
|
| 288 |
GPSCoordinate drawBottomRightGPS = drawBottomRight.ToGPSCoordinate(); |
288 |
GPSCoordinate drawBottomRightGPS = drawBottomRight.ToGPSCoordinate(); |
| 289 |
projection.forward( drawTopLeftGPS.longitude, drawBottomRightGPS.latitude ); |
289 |
projection.forward( drawTopLeftGPS.longitude, drawBottomRightGPS.latitude ); |
| 290 |
projection.forward( drawBottomRightGPS.longitude, drawTopLeftGPS.latitude ); |
290 |
projection.forward( drawBottomRightGPS.longitude, drawTopLeftGPS.latitude ); |
| 291 |
mapnik::Envelope<double> boundingBox( drawTopLeftGPS.longitude, drawTopLeftGPS.latitude, drawBottomRightGPS.longitude, drawBottomRightGPS.latitude ); |
291 |
mapnik::box2d<double> boundingBox( drawTopLeftGPS.longitude, drawTopLeftGPS.latitude, drawBottomRightGPS.longitude, drawBottomRightGPS.latitude ); |
| 292 |
map.zoomToBox( boundingBox ); |
292 |
map.zoom_to_box( boundingBox ); |
| 293 |
mapnik::agg_renderer<mapnik::Image32> renderer( map, image ); |
293 |
mapnik::agg_renderer<mapnik::image_32> renderer( map, image ); |
| 294 |
renderer.apply(); |
294 |
renderer.apply(); |
| 295 |
|
295 |
|
| 296 |
std::string data; |
296 |
std::string data; |
|
Lines 299-305
bool MapnikRenderer::Preprocess( IImport
Link Here
|
| 299 |
for ( int subX = 0; subX < metaTileSizeX; ++subX ) { |
299 |
for ( int subX = 0; subX < metaTileSizeX; ++subX ) { |
| 300 |
for ( int subY = 0; subY < metaTileSizeY; ++subY ) { |
300 |
for ( int subY = 0; subY < metaTileSizeY; ++subY ) { |
| 301 |
int indexNumber = ( y + subY - info.minY ) * ( info.maxX - info.minX ) + x + subX - info.minX; |
301 |
int indexNumber = ( y + subY - info.minY ) * ( info.maxX - info.minX ) + x + subX - info.minX; |
| 302 |
mapnik::image_view<mapnik::ImageData32> view = image.get_view( subX * m_settings.tileSize + m_settings.margin, subY * m_settings.tileSize + m_settings.margin, m_settings.tileSize, m_settings.tileSize ); |
302 |
mapnik::image_view<mapnik::image_data_32> view = image.get_view( subX * m_settings.tileSize + m_settings.margin, subY * m_settings.tileSize + m_settings.margin, m_settings.tileSize, m_settings.tileSize ); |
| 303 |
std::string result; |
303 |
std::string result; |
| 304 |
if ( !m_settings.deleteTiles || info.index[( x + subX - info.minX ) + ( y + subY - info.minY ) * ( info.maxX - info.minX )].size == 1 ) { |
304 |
if ( !m_settings.deleteTiles || info.index[( x + subX - info.minX ) + ( y + subY - info.minY ) * ( info.maxX - info.minX )].size == 1 ) { |
| 305 |
if ( m_settings.reduceColors ) |
305 |
if ( m_settings.reduceColors ) |
