[Pkg-osm-commits] [SCM] monav branch, master, updated. debian/0.3-6-12-g852bf54

[Jérémy Lal]

The following commit has been merged in the master branch:
commit aa20ac7d72be2bac8a77419d1c85a79e0e46a3cf
Author: Jérémy Lal <kapouer at melix.org>
Date:   Wed Aug 28 22:01:36 2013 +0200

    Update port to mapnik 2.2 patch

diff --git a/debian/patches/07-port_to_mapnik2.patch b/debian/patches/07-port_to_mapnik2.patch
index facb126..5491171 100644
--- a/debian/patches/07-port_to_mapnik2.patch
+++ b/debian/patches/07-port_to_mapnik2.patch
@@ -1,7 +1,8 @@
-From: David Paleino <dapal at debian.org>
-Subject: port code to Mapnik2
-Origin: vendor
+Author: David Paleino <dapal at debian.org>
+Author: Jérémy Lal <kapouer at melix.org>
+Description: port code to libmapnik2.2
 Forwarded: no
+Last-Update: 2013-08-28
 
 ---
  plugins/osmrenderer/mapnikrenderer.cpp |   10 +++++-----
@@ -10,9 +11,32 @@ Forwarded: no
  preprocessor/preprocessor.pro          |    2 +-
  4 files changed, 8 insertions(+), 8 deletions(-)
 
---- monav.orig/plugins/osmrenderer/mapnikrenderer.cpp
-+++ monav/plugins/osmrenderer/mapnikrenderer.cpp
-@@ -264,7 +264,7 @@ bool MapnikRenderer::Preprocess( IImport
+--- a/plugins/osmrenderer/mapnikrenderer.cpp
++++ b/plugins/osmrenderer/mapnikrenderer.cpp
+@@ -28,6 +28,9 @@
+ #include <mapnik/datasource_cache.hpp>
+ #include <mapnik/font_engine_freetype.hpp>
+ #include <mapnik/agg_renderer.hpp>
++#include <mapnik/config_error.hpp>
++#include <mapnik/graphics.hpp>
++#include <mapnik/image_view.hpp>
+ #include <mapnik/image_util.hpp>
+ #include <mapnik/load_map.hpp>
+ #include <omp.h>
+@@ -147,10 +150,9 @@
+ 
+ 		Timer time;
+ 
+-		mapnik::datasource_cache::instance()->register_datasources( m_settings.plugins.toAscii().constData() );
++		mapnik::datasource_cache::instance().register_datasources( m_settings.plugins.toAscii().constData() );
+ 		QDir fonts( m_settings.fonts );
+-		mapnik::projection projection;
+-		projection = mapnik::projection( "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +no_defs +over" );
++		mapnik::projection projection = mapnik::projection( "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +no_defs +over" );
+ 		mapnik::freetype_engine::register_font( fonts.filePath( "DejaVuSans.ttf" ).toAscii().constData() );
+ 		mapnik::freetype_engine::register_font( fonts.filePath( "DejaVuSans-Bold.ttf" ).toAscii().constData() );
+ 		mapnik::freetype_engine::register_font( fonts.filePath( "DejaVuSans-Oblique.ttf" ).toAscii().constData() );
+@@ -264,7 +266,7 @@
  			const int metaTileSize = m_settings.metaTileSize * m_settings.tileSize + 2 * m_settings.margin;
  
  			mapnik::Map map;
@@ -21,7 +45,7 @@ Forwarded: no
  			QTemporaryFile tempOut;
  			QTemporaryFile tempIn;
  			mapnik::load_map( map, m_settings.theme.toLocal8Bit().constData() );
-@@ -288,9 +288,9 @@ bool MapnikRenderer::Preprocess( IImport
+@@ -288,9 +290,9 @@
  				GPSCoordinate drawBottomRightGPS = drawBottomRight.ToGPSCoordinate();
  				projection.forward( drawTopLeftGPS.longitude, drawBottomRightGPS.latitude );
  				projection.forward( drawBottomRightGPS.longitude, drawTopLeftGPS.latitude );
@@ -34,7 +58,7 @@ Forwarded: no
  				renderer.apply();
  
  				std::string data;
-@@ -299,7 +299,7 @@ bool MapnikRenderer::Preprocess( IImport
+@@ -299,7 +301,7 @@
  				for ( int subX = 0; subX < metaTileSizeX; ++subX ) {
  					for ( int subY = 0; subY < metaTileSizeY; ++subY ) {
  						int indexNumber = ( y + subY - info.minY ) * ( info.maxX - info.minX ) + x + subX - info.minX;
@@ -43,30 +67,3 @@ Forwarded: no
  						std::string result;
  						if ( !m_settings.deleteTiles || info.index[( x + subX - info.minX ) + ( y + subY - info.minY ) * ( info.maxX - info.minX )].size == 1 ) {
  							if ( m_settings.reduceColors )
---- monav.orig/plugins/osmrenderer/mapnikrenderer.pro
-+++ monav/plugins/osmrenderer/mapnikrenderer.pro
-@@ -22,7 +22,7 @@ unix {
- 		 -fopenmp
- }
- LIBS += -fopenmp \
--	 -lmapnik
-+	 -lmapnik2
- 
- !nogui {
- 	FORMS += mrsettingsdialog.ui
---- monav.orig/preprocessor/preprocessor-gui.pro
-+++ monav/preprocessor/preprocessor-gui.pro
-@@ -51,4 +51,4 @@ unix {
- 		 -fopenmp
- }
- LIBS += -L../bin/plugins_preprocessor -lmapnikrenderer -lcontractionhierarchies -lgpsgrid -losmrenderer -lqtilerenderer -lunicodetournamenttrie -losmimporter
--LIBS += -fopenmp -lmapnik -lbz2 -lz
-+LIBS += -fopenmp -lmapnik2 -lbz2 -lz
---- monav.orig/preprocessor/preprocessor.pro
-+++ monav/preprocessor/preprocessor.pro
-@@ -45,4 +45,4 @@ unix {
- 		 -fopenmp
- }
- LIBS += -L../bin/plugins_preprocessor -lmapnikrenderer -lcontractionhierarchies -lgpsgrid -losmrenderer -lqtilerenderer -lunicodetournamenttrie -losmimporter -ltestimporter
--LIBS += -fopenmp -lmapnik -lbz2 -lz
-+LIBS += -fopenmp -lmapnik2 -lbz2 -lz

-- 
fast navigation system featuring exact routing