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

reverting back to 700

Browse source
This commit is contained in:
Artem Pavlenko 2008-06-29 10:58:29 +00:00
parent c7cbfa5c82
commit 3f9127b5d0
26 changed files with 318 additions and 511 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
SConstruct
View file

@ -45,18 +45,18 @@ opts.Add(PathOption('ICU_INCLUDES', 'Search path for ICU include files', '/usr/i
opts.Add(PathOption('ICU_LIBS','Search path for ICU include files','/usr/' + LIBDIR_SCHEMA)) opts.Add(PathOption('ICU_LIBS','Search path for ICU include files','/usr/' + LIBDIR_SCHEMA))
opts.Add(PathOption('PNG_INCLUDES', 'Search path for libpng include files', '/usr/include')) opts.Add(PathOption('PNG_INCLUDES', 'Search path for libpng include files', '/usr/include'))
opts.Add(PathOption('PNG_LIBS','Search path for libpng include files','/usr/' + LIBDIR_SCHEMA)) opts.Add(PathOption('PNG_LIBS','Search path for libpng include files','/usr/' + LIBDIR_SCHEMA))
opts.Add(PathOption('JPEG_INCLUDES', 'Search path for libjpeg include files', '/usr/local/include')) opts.Add(PathOption('JPEG_INCLUDES', 'Search path for libjpeg include files', '/usr/include'))
opts.Add(PathOption('JPEG_LIBS', 'Search path for libjpeg library files', '/usr/local/' + LIBDIR_SCHEMA)) opts.Add(PathOption('JPEG_LIBS', 'Search path for libjpeg library files', '/usr/' + LIBDIR_SCHEMA))
opts.Add(PathOption('TIFF_INCLUDES', 'Search path for libtiff include files', '/usr/include')) opts.Add(PathOption('TIFF_INCLUDES', 'Search path for libtiff include files', '/usr/include'))
opts.Add(PathOption('TIFF_LIBS', 'Search path for libtiff library files', '/usr/' + LIBDIR_SCHEMA)) opts.Add(PathOption('TIFF_LIBS', 'Search path for libtiff library files', '/usr/' + LIBDIR_SCHEMA))
opts.Add(PathOption('PGSQL_INCLUDES', 'Search path for PostgreSQL include files', '/usr/include')) opts.Add(PathOption('PGSQL_INCLUDES', 'Search path for PostgreSQL include files', '/usr/include'))
opts.Add(PathOption('PGSQL_LIBS', 'Search path for PostgreSQL library files', '/usr/' + LIBDIR_SCHEMA)) opts.Add(PathOption('PGSQL_LIBS', 'Search path for PostgreSQL library files', '/usr/' + LIBDIR_SCHEMA))
opts.Add(PathOption('PROJ_INCLUDES', 'Search path for PROJ.4 include files', '/opt/proj4/include')) opts.Add(PathOption('PROJ_INCLUDES', 'Search path for PROJ.4 include files', '/usr/local/include'))
opts.Add(PathOption('PROJ_LIBS', 'Search path for PROJ.4 library files', '/opt/proj4/' + LIBDIR_SCHEMA)) opts.Add(PathOption('PROJ_LIBS', 'Search path for PROJ.4 library files', '/usr/local/' + LIBDIR_SCHEMA))
opts.Add(PathOption('GDAL_INCLUDES', 'Search path for GDAL include files', '/usr/include')) opts.Add(PathOption('GDAL_INCLUDES', 'Search path for GDAL include files', '/usr/include'))
opts.Add(PathOption('GDAL_LIBS', 'Search path for GDAL library files', '/usr/' + LIBDIR_SCHEMA)) opts.Add(PathOption('GDAL_LIBS', 'Search path for GDAL library files', '/usr/' + LIBDIR_SCHEMA))
opts.Add(PathOption('PYTHON','Python executable', sys.executable)) opts.Add(PathOption('PYTHON','Python executable', sys.executable))
opts.Add(ListOption('INPUT_PLUGINS','Input drivers to include','all',['postgis','shape','raster','gdal','osm'])) opts.Add(ListOption('INPUT_PLUGINS','Input drivers to include','all',['postgis','shape','raster','gdal']))
opts.Add(ListOption('BINDINGS','Language bindings to build','all',['python'])) opts.Add(ListOption('BINDINGS','Language bindings to build','all',['python']))
opts.Add(BoolOption('DEBUG', 'Compile a debug version of mapnik', 'False')) opts.Add(BoolOption('DEBUG', 'Compile a debug version of mapnik', 'False'))
opts.Add('DESTDIR', 'The root directory to install into. Useful mainly for binary package building', '/') opts.Add('DESTDIR', 'The root directory to install into. Useful mainly for binary package building', '/')
@ -154,7 +154,7 @@ CXX_LIBSHEADERS = [
] ]
BOOST_LIBSHEADERS = [ BOOST_LIBSHEADERS = [
['system', 'boost/system/system_error.hpp', True], # uncomment this on Darwin + boost_1_35 # ['system', 'boost/system/system_error.hpp', True], # uncomment this on Darwin + boost_1_35
['filesystem', 'boost/filesystem/operations.hpp', True], ['filesystem', 'boost/filesystem/operations.hpp', True],
['regex', 'boost/regex.hpp', True], ['regex', 'boost/regex.hpp', True],
['iostreams','boost/iostreams/device/mapped_file.hpp',True], ['iostreams','boost/iostreams/device/mapped_file.hpp',True],
@ -178,11 +178,10 @@ if len(env['BOOST_TOOLKIT']):
env['BOOST_APPEND'] = '-%s' % env['BOOST_TOOLKIT'] env['BOOST_APPEND'] = '-%s' % env['BOOST_TOOLKIT']
else: else:
env['BOOST_APPEND']='' env['BOOST_APPEND']=''
for count, libinfo in enumerate(BOOST_LIBSHEADERS): for count, libinfo in enumerate(BOOST_LIBSHEADERS):
if env['THREADING'] == 'multi' : if env['THREADING'] == 'multi' :
if not conf.CheckLibWithHeader('boost_%s%s%s' % (libinfo[0],thread_suffix,env['BOOST_APPEND']), libinfo[1], 'C++') and libinfo[2] : if not conf.CheckLibWithHeader('boost_%s%s%s' % (libinfo[0],env['BOOST_APPEND'],thread_suffix), libinfo[1], 'C++') and libinfo[2] :
color_print(1,'Could not find header or shared library for boost %s, exiting!' % libinfo[0]) color_print(1,'Could not find header or shared library for boost %s, exiting!' % libinfo[0])
Exit(1) Exit(1)
elif not conf.CheckLibWithHeader('boost_%s%s' % (libinfo[0], env['BOOST_APPEND']), libinfo[1], 'C++') : elif not conf.CheckLibWithHeader('boost_%s%s' % (libinfo[0], env['BOOST_APPEND']), libinfo[1], 'C++') :
@ -204,13 +203,11 @@ SConscript('agg/SConscript')
SConscript('src/SConscript') SConscript('src/SConscript')
# Build shapeindex and remove its dependency from the LIBS # Build shapeindex and remove its dependency from the LIBS
# if 'boost_program_options%s%s-1_35' % (env['BOOST_APPEND'],thread_suffix) in env['LIBS']: if 'boost_program_options%s%s' % (env['BOOST_APPEND'],thread_suffix) in env['LIBS']:
if 'boost_program_options-mt-1_35' in env['LIBS']:
SConscript('utils/shapeindex/SConscript') SConscript('utils/shapeindex/SConscript')
env['LIBS'].remove('boost_program_options-mt-1_35') env['LIBS'].remove('boost_program_options%s%s' % (env['BOOST_APPEND'],thread_suffix))
# Build the input plug-ins # Build the input plug-ins
if 'postgis' in inputplugins and 'pq' in env['LIBS']: if 'postgis' in inputplugins and 'pq' in env['LIBS']:
SConscript('plugins/input/postgis/SConscript') SConscript('plugins/input/postgis/SConscript')
env['LIBS'].remove('pq') env['LIBS'].remove('pq')
@ -224,8 +221,8 @@ if 'raster' in inputplugins:
if 'gdal' in inputplugins and 'gdal' in env['LIBS']: if 'gdal' in inputplugins and 'gdal' in env['LIBS']:
SConscript('plugins/input/gdal/SConscript') SConscript('plugins/input/gdal/SConscript')
if 'osm' in inputplugins : if 'gigabase' in inputplugins and 'gigabase_r' in env['LIBS']:
SConscript('plugins/input/osm/SConscript') SConscript('plugins/input/gigabase/SConscript')
# Build the Python bindings. # Build the Python bindings.
if 'python' in env['BINDINGS']: if 'python' in env['BINDINGS']:

2
agg/include/agg_config.h
View file

@ -33,7 +33,7 @@
// Provides faster access for massive pixel operations, // Provides faster access for massive pixel operations,
// such as blur, image filtering: // such as blur, image filtering:
//#define AGG_RENDERING_BUFFER row_ptr_cache<int8u> #define AGG_RENDERING_BUFFER row_ptr_cache<int8u>
// //
// Provides cheaper creation and destruction (no mem allocs): // Provides cheaper creation and destruction (no mem allocs):
// #define AGG_RENDERING_BUFFER row_accessor<int8u> // #define AGG_RENDERING_BUFFER row_accessor<int8u>

21
bindings/python/SConscript
View file

@ -40,22 +40,19 @@ if env['PLATFORM'] == 'FreeBSD':
linkflags = '' linkflags = ''
libraries = ['mapnik','png','jpeg'] libraries = ['mapnik','png','jpeg']
if env['THREADING'] == 'multi': if env['THREADING'] == 'multi':
#libraries.append('boost_python%s%s-1_35' % (env['BOOST_APPEND'],thread_suffix)) libraries.append('boost_python%s%s' % (env['BOOST_APPEND'],thread_suffix))
libraries.append('boost_python%s-1_35' % (thread_suffix)) else :
#else : libraries.append('boost_python%s' % env['BOOST_APPEND'])
# libraries.append('boost_python%s' % env['BOOST_APPEND'])
if env['PLATFORM'] == 'Darwin': if env['PLATFORM'] == 'Darwin':
libraries.append(env['LIBS'])
libraries.append('icuuc') libraries.append('icuuc')
libraries.append('icudata') libraries.append('icudata')
#if env['THREADING'] == 'multi': if env['THREADING'] == 'multi':
# libraries.append('boost_regex%s%s' % (env['BOOST_APPEND'],thread_suffix)) libraries.append('boost_regex%s%s' % (env['BOOST_APPEND'],thread_suffix))
#else : else :
# libraries.append('boost_regex%s' % env['BOOST_APPEND']) libraries.append('boost_regex%s' % env['BOOST_APPEND'])
if env['THREADING'] == 'multi':
#if env['THREADING'] == 'multi': libraries.append('boost_thread%s%s' % (env['BOOST_APPEND'],thread_suffix))
# libraries.append('boost_thread%s%s' % (env['BOOST_APPEND'],thread_suffix))
if '-DHAVE_PYCAIRO' in env['CXXFLAGS']: if '-DHAVE_PYCAIRO' in env['CXXFLAGS']:
libraries.append([lib for lib in env['LIBS'] if lib.startswith('cairo')]) libraries.append([lib for lib in env['LIBS'] if lib.startswith('cairo')])
linkflags = '-F/ -framework Python' linkflags = '-F/ -framework Python'

230
demo/c++/rundemo.cpp
View file

@ -28,7 +28,6 @@
#include <mapnik/datasource_cache.hpp> #include <mapnik/datasource_cache.hpp>
#include <mapnik/font_engine_freetype.hpp> #include <mapnik/font_engine_freetype.hpp>
#include <mapnik/agg_renderer.hpp> #include <mapnik/agg_renderer.hpp>
#include <mapnik/cairo_renderer.hpp>
#include <mapnik/filter_factory.hpp> #include <mapnik/filter_factory.hpp>
#include <mapnik/color_factory.hpp> #include <mapnik/color_factory.hpp>
#include <mapnik/image_util.hpp> #include <mapnik/image_util.hpp>
@ -53,47 +52,206 @@ int main ( int argc , char** argv)
freetype_engine::register_font(mapnik_dir + "/lib/mapnik/fonts/DejaVuSans.ttf"); freetype_engine::register_font(mapnik_dir + "/lib/mapnik/fonts/DejaVuSans.ttf");
Map m(800,600); Map m(800,600);
m.set_background(color_factory::from_string("white"));
mapnik::load_map(m,"/Users/artem/projects/openstreetmap/mapnik/openstreetmap_kleptog.xml"); // create styles
m.zoomToBox(Envelope<double>(-762470.6985688356,4004842.088052442,-761928.349698612,4005328.834769584));
//Image32 buf(m.getWidth(),m.getHeight());
//agg_renderer<Image32> ren(m,buf);
//ren.apply();
//save_to_file<ImageData32>(buf.data(),"demo.jpg","jpeg");
//save_to_file<ImageData32>(buf.data(),"demo.png","png");
//save_to_file<ImageData32>(buf.data(),"demo256.png","png256");
//std::cout << "Three maps have been rendered in the current directory:\n"
// "- demo.jpg\n"
// "- demo.png\n"
// "- demo256.png\n"
// "Have a look!\n";
// Cairo renderer // Provinces (polygon)
feature_type_style provpoly_style;
rule_type provpoly_rule_on;
provpoly_rule_on.set_filter(create_filter("[NAME_EN] = 'Ontario'"));
provpoly_rule_on.append(polygon_symbolizer(Color(250, 190, 183)));
provpoly_style.add_rule(provpoly_rule_on);
rule_type provpoly_rule_qc;
provpoly_rule_qc.set_filter(create_filter("[NAME_EN] = 'Quebec'"));
provpoly_rule_qc.append(polygon_symbolizer(Color(217, 235, 203)));
provpoly_style.add_rule(provpoly_rule_qc);
m.insert_style("provinces",provpoly_style);
// Pdf // Provinces (polyline)
Cairo::RefPtr<Cairo::PdfSurface> pdf = Cairo::PdfSurface::create("mapnik.pdf",m.getWidth(),m.getHeight()); feature_type_style provlines_style;
mapnik::cairo_renderer<Cairo::Surface> cairo1(m, pdf);
cairo1.apply();
// Svg
//Cairo::RefPtr<Cairo::SvgSurface> svg = Cairo::SvgSurface::create("demo.svg",m.getWidth(),m.getHeight());
//mapnik::cairo_renderer<Cairo::Surface> cairo2(m, svg);
//cairo2.apply();
// Png
//Cairo::RefPtr<Cairo::ImageSurface> image = Cairo::ImageSurface::create(Cairo::FORMAT_ARGB32,m.getWidth(),m.getHeight());
//mapnik::cairo_renderer<Cairo::Surface> cairo3(m, image);
//cairo3.apply();
//std::string filename = "demo_cairo.png"; stroke provlines_stk (Color(0,0,0),1.0);
//image->write_to_png(filename); provlines_stk.add_dash(8, 4);
provlines_stk.add_dash(2, 2);
provlines_stk.add_dash(2, 2);
// Ps rule_type provlines_rule;
//Cairo::RefPtr<Cairo::PsSurface> ps = Cairo::PsSurface::create("demo.ps",m.getWidth(),m.getHeight()); provlines_rule.append(line_symbolizer(provlines_stk));
//mapnik::cairo_renderer<Cairo::Surface> cairo4(m, ps); provlines_style.add_rule(provlines_rule);
//cairo4.apply();
m.insert_style("provlines",provlines_style);
// Drainage
feature_type_style qcdrain_style;
rule_type qcdrain_rule;
qcdrain_rule.set_filter(create_filter("[HYC] = 8"));
qcdrain_rule.append(polygon_symbolizer(Color(153, 204, 255)));
qcdrain_style.add_rule(qcdrain_rule);
m.insert_style("drainage",qcdrain_style);
// Roads 3 and 4 (The "grey" roads)
feature_type_style roads34_style;
rule_type roads34_rule;
roads34_rule.set_filter(create_filter("[CLASS] = 3 or [CLASS] = 4"));
stroke roads34_rule_stk(Color(171,158,137),2.0);
roads34_rule_stk.set_line_cap(ROUND_CAP);
roads34_rule_stk.set_line_join(ROUND_JOIN);
roads34_rule.append(line_symbolizer(roads34_rule_stk));
roads34_style.add_rule(roads34_rule);
m.insert_style("smallroads",roads34_style);
// Roads 2 (The thin yellow ones)
feature_type_style roads2_style_1;
rule_type roads2_rule_1;
roads2_rule_1.set_filter(create_filter("[CLASS] = 2"));
stroke roads2_rule_stk_1(Color(171,158,137),4.0);
roads2_rule_stk_1.set_line_cap(ROUND_CAP);
roads2_rule_stk_1.set_line_join(ROUND_JOIN);
roads2_rule_1.append(line_symbolizer(roads2_rule_stk_1));
roads2_style_1.add_rule(roads2_rule_1);
m.insert_style("road-border", roads2_style_1);
feature_type_style roads2_style_2;
rule_type roads2_rule_2;
roads2_rule_2.set_filter(create_filter("[CLASS] = 2"));
stroke roads2_rule_stk_2(Color(255,250,115),2.0);
roads2_rule_stk_2.set_line_cap(ROUND_CAP);
roads2_rule_stk_2.set_line_join(ROUND_JOIN);
roads2_rule_2.append(line_symbolizer(roads2_rule_stk_2));
roads2_style_2.add_rule(roads2_rule_2);
m.insert_style("road-fill", roads2_style_2);
// Roads 1 (The big orange ones, the highways)
feature_type_style roads1_style_1;
rule_type roads1_rule_1;
roads1_rule_1.set_filter(create_filter("[CLASS] = 1"));
stroke roads1_rule_stk_1(Color(188,149,28),7.0);
roads1_rule_stk_1.set_line_cap(ROUND_CAP);
roads1_rule_stk_1.set_line_join(ROUND_JOIN);
roads1_rule_1.append(line_symbolizer(roads1_rule_stk_1));
roads1_style_1.add_rule(roads1_rule_1);
m.insert_style("highway-border", roads1_style_1);
feature_type_style roads1_style_2;
rule_type roads1_rule_2;
roads1_rule_2.set_filter(create_filter("[CLASS] = 1"));
stroke roads1_rule_stk_2(Color(242,191,36),5.0);
roads1_rule_stk_2.set_line_cap(ROUND_CAP);
roads1_rule_stk_2.set_line_join(ROUND_JOIN);
roads1_rule_2.append(line_symbolizer(roads1_rule_stk_2));
roads1_style_2.add_rule(roads1_rule_2);
m.insert_style("highway-fill", roads1_style_2);
// Populated Places
feature_type_style popplaces_style;
rule_type popplaces_rule;
text_symbolizer popplaces_text_symbolizer("GEONAME","DejaVu Sans Book",10,Color(0,0,0));
popplaces_text_symbolizer.set_halo_fill(Color(255,255,200));
popplaces_text_symbolizer.set_halo_radius(1);
popplaces_rule.append(popplaces_text_symbolizer);
popplaces_style.add_rule(popplaces_rule);
m.insert_style("popplaces",popplaces_style );
// Layers
// Provincial polygons
{
parameters p;
p["type"]="shape";
p["file"]="../data/boundaries";
Layer lyr("Provinces");
lyr.set_datasource(datasource_cache::instance()->create(p));
lyr.add_style("provinces");
m.addLayer(lyr);
}
// Drainage
{
parameters p;
p["type"]="shape";
p["file"]="../data/qcdrainage";
Layer lyr("Quebec Hydrography");
lyr.set_datasource(datasource_cache::instance()->create(p));
lyr.add_style("drainage");
m.addLayer(lyr);
}
{
parameters p;
p["type"]="shape";
p["file"]="../data/ontdrainage";
Layer lyr("Ontario Hydrography");
lyr.set_datasource(datasource_cache::instance()->create(p));
lyr.add_style("drainage");
m.addLayer(lyr);
}
// Provincial boundaries
{
parameters p;
p["type"]="shape";
p["file"]="../data/boundaries_l";
Layer lyr("Provincial borders");
lyr.set_datasource(datasource_cache::instance()->create(p));
lyr.add_style("provlines");
m.addLayer(lyr);
}
// Roads
{
parameters p;
p["type"]="shape";
p["file"]="../data/roads";
Layer lyr("Roads");
lyr.set_datasource(datasource_cache::instance()->create(p));
lyr.add_style("smallroads");
lyr.add_style("road-border");
lyr.add_style("road-fill");
lyr.add_style("highway-border");
lyr.add_style("highway-fill");
m.addLayer(lyr);
}
// popplaces
{
parameters p;
p["type"]="shape";
p["file"]="../data/popplaces";
p["encoding"] = "latin1";
Layer lyr("Populated Places");
lyr.set_datasource(datasource_cache::instance()->create(p));
lyr.add_style("popplaces");
m.addLayer(lyr);
}
m.zoomToBox(Envelope<double>(1405120.04127408,-247003.813399447,
1706357.31328276,-25098.593149577));
Image32 buf(m.getWidth(),m.getHeight());
agg_renderer<Image32> ren(m,buf);
ren.apply();
save_to_file<ImageData32>(buf.data(),"demo.jpg","jpeg");
save_to_file<ImageData32>(buf.data(),"demo.png","png");
save_to_file<ImageData32>(buf.data(),"demo256.png","png256");
std::cout << "Three maps have been rendered in the current directory:\n"
"- demo.jpg\n"
"- demo.png\n"
"- demo256.png\n"
"Have a look!\n";
} }
catch ( const mapnik::config_error & ex ) catch ( const mapnik::config_error & ex )
{ {

2
demo/python/rundemo.py
View file

@ -316,8 +316,6 @@ images.append('demo256.png')
im.save('demo.jpg', 'jpeg') im.save('demo.jpg', 'jpeg')
images.append('demo.jpg') images.append('demo.jpg')
save_map(m,'map.xml')
# Render cairo examples # Render cairo examples
try: try:
import cairo import cairo

7
demo/viewer/main.cpp
View file

@ -35,11 +35,8 @@ int main( int argc, char **argv )
freetype_engine::register_font("/opt/mapnik/lib/mapnik/fonts/DejaVuSans.ttf"); freetype_engine::register_font("/opt/mapnik/lib/mapnik/fonts/DejaVuSans.ttf");
freetype_engine::register_font("/opt/mapnik/lib/mapnik/fonts/DejaVuSans-Bold.ttf"); freetype_engine::register_font("/opt/mapnik/lib/mapnik/fonts/DejaVuSans-Bold.ttf");
freetype_engine::register_font("/opt/mapnik/lib/mapnik/fonts/DejaVuSansMono.ttf"); freetype_engine::register_font("/opt/mapnik/lib/mapnik/fonts/DejaVuSansMono.ttf");
freetype_engine::register_font("/System/Library/Fonts/Monaco.dfont");
freetype_engine::register_font("/Users/artem/Desktop/japanese.otf");
freetype_engine::register_font("/Users/artem/Desktop/IPAfont00201/ipagp.ttf");
freetype_engine::register_font("/Users/artem/Desktop/IPAfont00201/ipag.ttf");
QApplication app( argc, argv ); QApplication app( argc, argv );
MainWindow window; MainWindow window;
window.show(); window.show();

2
demo/viewer/mainwindow.cpp
View file

@ -92,7 +92,7 @@ MainWindow::MainWindow()
// slider // slider
connect(slider_,SIGNAL(valueChanged(int)),mapWidget_,SLOT(zoomToLevel(int))); connect(slider_,SIGNAL(valueChanged(int)),mapWidget_,SLOT(zoomToLevel(int)));
// //
connect(layerTab_,SIGNAL(update_mapwidget()),mapWidget_,SLOT(renderMap())); connect(layerTab_,SIGNAL(update_mapwidget()),mapWidget_,SLOT(updateMap()));
connect(layerTab_,SIGNAL(layerSelected(int)), connect(layerTab_,SIGNAL(layerSelected(int)),
mapWidget_,SLOT(layerSelected(int))); mapWidget_,SLOT(layerSelected(int)));
} }

63
demo/viewer/mapwidget.cpp
View file

@ -29,7 +29,6 @@
#include <mapnik/memory_datasource.hpp> #include <mapnik/memory_datasource.hpp>
#include "mapwidget.hpp" #include "mapwidget.hpp"
#include "info_dialog.hpp" #include "info_dialog.hpp"
#include <unicode/unistr.h>
using mapnik::Image32; using mapnik::Image32;
using mapnik::Map; using mapnik::Map;
@ -80,8 +79,6 @@ MapWidget::MapWidget(QWidget *parent)
pen_.setWidth(3); pen_.setWidth(3);
pen_.setCapStyle(Qt::RoundCap); pen_.setCapStyle(Qt::RoundCap);
pen_.setJoinStyle(Qt::RoundJoin); pen_.setJoinStyle(Qt::RoundJoin);
connect(&thread_, SIGNAL(renderedMap(const QImage &)),
this, SLOT(updateMap(const QImage &)));
} }
void MapWidget::setTool(eTool tool) void MapWidget::setTool(eTool tool)
@ -124,7 +121,7 @@ void MapWidget::resizeEvent(QResizeEvent * ev)
if (map_) if (map_)
{ {
map_->resize(ev->size().width(),ev->size().height()); map_->resize(ev->size().width(),ev->size().height());
renderMap(); updateMap();
} }
} }
@ -174,9 +171,8 @@ void MapWidget::mousePressEvent(QMouseEvent* e)
{ {
if (itr->second.to_string().length() > 0) if (itr->second.to_string().length() > 0)
{ {
UnicodeString unicode = itr->second.to_unicode();
info.push_back(QPair<QString,QString>(QString(itr->first.c_str()), info.push_back(QPair<QString,QString>(QString(itr->first.c_str()),
QString((QChar*)unicode.getBuffer(),unicode.length()))); itr->second.to_string().c_str()));
} }
} }
typedef mapnik::coord_transform2<mapnik::CoordTransform,mapnik::geometry2d> path_type; typedef mapnik::coord_transform2<mapnik::CoordTransform,mapnik::geometry2d> path_type;
@ -227,7 +223,7 @@ void MapWidget::mousePressEvent(QMouseEvent* e)
} }
else if (e->button()==Qt::RightButton) else if (e->button()==Qt::RightButton)
{ {
//renderMap(); //updateMap();
} }
} }
@ -255,7 +251,7 @@ void MapWidget::mouseReleaseEvent(QMouseEvent* e)
CoordTransform t(map_->getWidth(),map_->getHeight(),map_->getCurrentExtent()); CoordTransform t(map_->getWidth(),map_->getHeight(),map_->getCurrentExtent());
Envelope<double> box = t.backward(Envelope<double>(start_x_,start_y_,end_x_,end_y_)); Envelope<double> box = t.backward(Envelope<double>(start_x_,start_y_,end_x_,end_y_));
map_->zoomToBox(box); map_->zoomToBox(box);
renderMap(); updateMap();
} }
} }
else if (cur_tool_==Pan) else if (cur_tool_==Pan)
@ -268,7 +264,7 @@ void MapWidget::mouseReleaseEvent(QMouseEvent* e)
int dx = end_x_ - start_x_; int dx = end_x_ - start_x_;
int dy = end_y_ - start_y_; int dy = end_y_ - start_y_;
map_->pan(cx - dx ,cy - dy); map_->pan(cx - dx ,cy - dy);
renderMap(); updateMap();
} }
} }
} }
@ -337,7 +333,7 @@ void MapWidget::zoomToBox(mapnik::Envelope<double> const& bbox)
if (map_) if (map_)
{ {
map_->zoomToBox(bbox); map_->zoomToBox(bbox);
renderMap(); updateMap();
} }
} }
@ -347,7 +343,7 @@ void MapWidget::defaultView()
{ {
map_->resize(width(),height()); map_->resize(width(),height());
map_->zoom_all(); map_->zoom_all();
renderMap(); updateMap();
} }
} }
@ -356,7 +352,7 @@ void MapWidget::zoomIn()
if (map_) if (map_)
{ {
map_->zoom(0.5); map_->zoom(0.5);
renderMap(); updateMap();
} }
} }
@ -365,7 +361,7 @@ void MapWidget::zoomOut()
if (map_) if (map_)
{ {
map_->zoom(2.0); map_->zoom(2.0);
renderMap(); updateMap();
} }
} }
@ -376,7 +372,7 @@ void MapWidget::panUp()
double cx = 0.5*map_->getWidth(); double cx = 0.5*map_->getWidth();
double cy = 0.5*map_->getHeight(); double cy = 0.5*map_->getHeight();
map_->pan(int(cx),int(cy - cy*0.25)); map_->pan(int(cx),int(cy - cy*0.25));
renderMap(); updateMap();
} }
} }
@ -387,7 +383,7 @@ void MapWidget::panDown()
double cx = 0.5*map_->getWidth(); double cx = 0.5*map_->getWidth();
double cy = 0.5*map_->getHeight(); double cy = 0.5*map_->getHeight();
map_->pan(int(cx),int(cy + cy*0.25)); map_->pan(int(cx),int(cy + cy*0.25));
renderMap(); updateMap();
} }
} }
@ -398,7 +394,7 @@ void MapWidget::panLeft()
double cx = 0.5*map_->getWidth(); double cx = 0.5*map_->getWidth();
double cy = 0.5*map_->getHeight(); double cy = 0.5*map_->getHeight();
map_->pan(int(cx - cx * 0.25),int(cy)); map_->pan(int(cx - cx * 0.25),int(cy));
renderMap(); updateMap();
} }
} }
@ -409,7 +405,7 @@ void MapWidget::panRight()
double cx = 0.5*map_->getWidth(); double cx = 0.5*map_->getWidth();
double cy = 0.5*map_->getHeight(); double cy = 0.5*map_->getHeight();
map_->pan(int(cx + cx * 0.25),int(cy)); map_->pan(int(cx + cx * 0.25),int(cy));
renderMap(); updateMap();
} }
} }
@ -432,7 +428,7 @@ void MapWidget::zoomToLevel(int level)
pt.x + 0.5 * width * res, pt.x + 0.5 * width * res,
pt.y + 0.5 * height*res); pt.y + 0.5 * height*res);
map_->zoomToBox(box); map_->zoomToBox(box);
renderMap(); updateMap();
} }
} }
@ -445,19 +441,24 @@ void MapWidget::export_to_file(unsigned ,unsigned ,std::string const&,std::strin
} }
void MapWidget::renderMap() void MapWidget::updateMap()
{ {
thread_.render(map_); if (map_)
} {
unsigned width=map_->getWidth();
void MapWidget::updateMap(QImage const& image) unsigned height=map_->getHeight();
{
std::cout << "updateMap called \n"; Image32 buf(width,height);
pix_ = QPixmap::fromImage(image); mapnik::agg_renderer<Image32> ren(*map_,buf);
update(); ren.apply();
// emit signal to interested widgets
emit mapViewChanged(); QImage image((uchar*)buf.raw_data(),width,height,QImage::Format_ARGB32);
std::cout << map_->getCurrentExtent() << "\n"; pix_=QPixmap::fromImage(image.rgbSwapped());
update();
// emit signal to interested widgets
emit mapViewChanged();
std::cout << map_->getCurrentExtent() << "\n";
}
} }
boost::shared_ptr<Map> MapWidget::getMap() boost::shared_ptr<Map> MapWidget::getMap()

5
demo/viewer/mapwidget.hpp
View file

@ -31,7 +31,6 @@
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
#include <mapnik/map.hpp> #include <mapnik/map.hpp>
#include "renderthread.hpp"
class MapWidget : public QWidget class MapWidget : public QWidget
{ {
@ -59,7 +58,6 @@ class MapWidget : public QWidget
bool first_; bool first_;
QPen pen_; QPen pen_;
int selectedLayer_; int selectedLayer_;
RenderThread thread_;
public: public:
MapWidget(QWidget *parent=0); MapWidget(QWidget *parent=0);
void setTool(eTool tool); void setTool(eTool tool);
@ -74,10 +72,9 @@ class MapWidget : public QWidget
void panRight(); void panRight();
void panUp(); void panUp();
void panDown(); void panDown();
void renderMap();
public slots: public slots:
void zoomToLevel(int level); void zoomToLevel(int level);
void updateMap(QImage const&); void updateMap();
void layerSelected(int); void layerSelected(int);
signals: signals:
void mapViewChanged(); void mapViewChanged();

12
demo/viewer/viewer.pro
View file

@ -5,12 +5,12 @@ CC = g++
TEMPLATE = app TEMPLATE = app
INCLUDEPATH += /opt/mapnik/include INCLUDEPATH += /opt/mapnik/include
INCLUDEPATH += /opt/boost-trunk/include/boost-1_35 INCLUDEPATH += /opt/boost/include/boost-1_34_1
INCLUDEPATH += /usr/X11/include INCLUDEPATH += /usr/local/include/freetype2
INCLUDEPATH += . INCLUDEPATH += .
QMAKE_CXXFLAGS +=' -DDARWIN' QMAKE_CXXFLAGS +=' -DDARWIN'
unix:LIBS = -L/opt/mapnik/lib -L/opt/boost-trunk/lib -L/usr/X11/lib -lmapnik -lfreetype -licuuc -licudata -lboost_regex-mt-1_35 -lboost_filesystem-mt-1_35 -lboost_thread-mt-1_35 -lboost_system-mt-1_35 -lboost_program_options-mt-1_35 unix:LIBS = -L/opt/mapnik/lib -lmapnik -lfreetype
# Input # Input
@ -24,8 +24,7 @@ HEADERS += mainwindow.hpp \
layerwidget.hpp \ layerwidget.hpp \
layerlistmodel.hpp \ layerlistmodel.hpp \
layerdelegate.hpp \ layerdelegate.hpp \
styles_model.hpp \ styles_model.hpp
renderthread.hpp
HEADERS += about_dialog.hpp \ HEADERS += about_dialog.hpp \
info_dialog.hpp \ info_dialog.hpp \
@ -37,8 +36,7 @@ SOURCES += main.cpp \
layerwidget.cpp \ layerwidget.cpp \
layerlistmodel.cpp \ layerlistmodel.cpp \
layerdelegate.cpp \ layerdelegate.cpp \
styles_model.cpp \ styles_model.cpp
renderthread.cpp
SOURCES += about_dialog.cpp \ SOURCES += about_dialog.cpp \
info_dialog.cpp \ info_dialog.cpp \

2
include/mapnik/agg_renderer.hpp
View file

@ -39,7 +39,7 @@
namespace mapnik { namespace mapnik {
struct rasterizer; class rasterizer;
template <typename T> template <typename T>
class MAPNIK_DECL agg_renderer : public feature_style_processor<agg_renderer<T> >, class MAPNIK_DECL agg_renderer : public feature_style_processor<agg_renderer<T> >,

58
include/mapnik/ctrans.hpp
View file

@ -85,64 +85,6 @@ namespace mapnik {
proj_transform const& prj_trans_; proj_transform const& prj_trans_;
}; };
template <typename Transform,typename Geometry>
struct MAPNIK_DECL coord_transform4
{
coord_transform4(Transform const& t,
Geometry const& geom,
proj_transform const& prj_trans)
: t_(t),
geom_(geom),
prj_trans_(prj_trans),
prev_x_(0),
prev_y_(0) {}
unsigned vertex(double * x , double * y) const
{
unsigned command = geom_.vertex(x,y);
double z=0;
prj_trans_.backward(*x,*y,z);
t_.forward(x,y);
if (command == 1)
{
prev_x_ = *x;
prev_y_ = *y;
}
else
{
double dx = *x-prev_x_;
double dy = *y-prev_y_;
double d = dx*dx + dy*dy;
while ( d < 1)
{
command = geom_.vertex(x,y);
prj_trans_.backward(*x,*y,z);
t_.forward(x,y);
if (command == 1) break;
dx = *x-prev_x_;
dy = *y-prev_y_;
d = dx*dx+dy*dy;
}
prev_x_ = *x;
prev_y_ = *y;
}
return command;
}
void rewind (unsigned pos)
{
geom_.rewind(pos);
}
private:
Transform const& t_;
Geometry const& geom_;
proj_transform const& prj_trans_;
mutable double prev_x_;
mutable double prev_y_;
};
template <typename Transform,typename Geometry> template <typename Transform,typename Geometry>
struct MAPNIK_DECL coord_transform3 struct MAPNIK_DECL coord_transform3
{ {

54
include/mapnik/font_set.hpp
View file

@ -1,54 +0,0 @@
/*****************************************************************************
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*****************************************************************************/
//$Id$
#ifndef FONT_SET_HPP
#define FONT_SET_HPP
// mapnik
#include <mapnik/config.hpp>
// boost
#include <boost/shared_ptr.hpp>
// stl
#include <string>
#include <vector>
namespace mapnik
{
class MAPNIK_DECL FontSet
{
public:
FontSet();
FontSet(std::string const& name);
FontSet(FontSet const& rhs);
FontSet& operator=(FontSet const& rhs);
std::string const& get_name() const;
void add_face_name(std::string);
std::vector<std::string> const& get_face_names() const;
~FontSet();
private:
std::string name_;
std::vector<std::string> face_names_;
};
}
#endif //FONT_SET_HPP

4
include/mapnik/unicode.hpp
View file

@ -27,12 +27,10 @@
#include <unicode/unistr.h> #include <unicode/unistr.h>
#include <unicode/ucnv.h> #include <unicode/ucnv.h>
#include <mapnik/config.hpp>
#include <boost/utility.hpp> #include <boost/utility.hpp>
#include <string>
namespace mapnik { namespace mapnik {
class MAPNIK_DECL transcoder : private boost::noncopyable class transcoder : private boost::noncopyable
{ {
public: public:
explicit transcoder (std::string const& encoding); explicit transcoder (std::string const& encoding);

5
plugins/input/gdal/SConscript
View file

@ -34,9 +34,8 @@ gdal_src = Split(
libraries = ['gdal' ] libraries = ['gdal' ]
if env['PLATFORM'] == 'Darwin': if env['PLATFORM'] == 'Darwin':
libraries.append('mapnik') libraries.append('mapnik')
#libraries.append('icuuc') libraries.append('icuuc')
#libraries.append('icudata') libraries.append('icudata')
libraries.append(env['LIBS'])
gdal_inputdriver = env.SharedLibrary('gdal', source=gdal_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries) gdal_inputdriver = env.SharedLibrary('gdal', source=gdal_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries)

9
plugins/input/postgis/SConscript
View file

@ -35,11 +35,10 @@ libraries = ['pq']
if env['PLATFORM'] == 'Darwin': if env['PLATFORM'] == 'Darwin':
libraries.append('mapnik') libraries.append('mapnik')
#libraries.append('icuuc') libraries.append('icuuc')
#libraries.append('icudata') libraries.append('icudata')
libraries.append(env['LIBS']) if env['THREADING'] == 'multi':
#if env['THREADING'] == 'multi': libraries.append('boost_thread%s-mt' % env['BOOST_APPEND'])
# libraries.append('boost_thread%s-mt' % env['BOOST_APPEND'])
postgis_inputdriver = env.SharedLibrary('postgis', source=postgis_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries) postgis_inputdriver = env.SharedLibrary('postgis', source=postgis_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries)

5
plugins/input/raster/SConscript
View file

@ -35,9 +35,8 @@ raster_src = Split(
libraries = [] libraries = []
if env['PLATFORM'] == 'Darwin': if env['PLATFORM'] == 'Darwin':
libraries.append('mapnik') libraries.append('mapnik')
#libraries.append('icuuc') libraries.append('icuuc')
#libraries.append('icudata') libraries.append('icudata')
libraries.append(env['LIBS'])
raster_inputdriver = env.SharedLibrary('raster', source=raster_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries) raster_inputdriver = env.SharedLibrary('raster', source=raster_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries)

11
plugins/input/shape/SConscript
View file

@ -39,16 +39,15 @@ thread_suffix = '-mt'
if env['PLATFORM'] == 'FreeBSD': if env['PLATFORM'] == 'FreeBSD':
thread_suffix = '' thread_suffix = ''
#if env['THREADING'] == 'multi': if env['THREADING'] == 'multi':
# libraries = ['boost_iostreams%s%s' % (env['BOOST_APPEND'],thread_suffix) ] libraries = ['boost_iostreams%s%s' % (env['BOOST_APPEND'],thread_suffix) ]
#else: else:
# libraries = ['boost_iostreams%s' % (env['BOOST_APPEND']) ] libraries = ['boost_iostreams%s' % (env['BOOST_APPEND']) ]
libraries = []
if env['PLATFORM'] == 'Darwin': if env['PLATFORM'] == 'Darwin':
libraries.append('mapnik') libraries.append('mapnik')
libraries.append('icuuc') libraries.append('icuuc')
libraries.append('icudata') libraries.append('icudata')
libraries.append(env['LIBS'])
shape_inputdriver = env.SharedLibrary('shape', SHLIBSUFFIX='.input', source=shape_src, SHLIBPREFIX='', LIBS = libraries) shape_inputdriver = env.SharedLibrary('shape', SHLIBSUFFIX='.input', source=shape_src, SHLIBPREFIX='', LIBS = libraries)

1
plugins/input/shape/dbffile.hpp
View file

@ -36,6 +36,7 @@
using mapnik::transcoder; using mapnik::transcoder;
using mapnik::Feature; using mapnik::Feature;
class mapnik::transcoder;
struct field_descriptor struct field_descriptor
{ {

55
src/agg_renderer.cpp
View file

@ -29,12 +29,9 @@
#include <mapnik/markers_converter.hpp> #include <mapnik/markers_converter.hpp>
#include <mapnik/arrow.hpp> #include <mapnik/arrow.hpp>
#include <mapnik/config_error.hpp> #include <mapnik/config_error.hpp>
#include <mapnik/font_set.hpp>
// agg // agg
#define AGG_RENDERING_BUFFER row_accessor<int8u> #define AGG_RENDERING_BUFFER row_ptr_cache<int8u>
//row_ptr_cache<int8u>
#include "agg_rendering_buffer.h" #include "agg_rendering_buffer.h"
#include "agg_pixfmt_rgba.h" #include "agg_pixfmt_rgba.h"
#include "agg_rasterizer_scanline_aa.h" #include "agg_rasterizer_scanline_aa.h"
@ -172,7 +169,7 @@ namespace mapnik
Feature const& feature, Feature const& feature,
proj_transform const& prj_trans) proj_transform const& prj_trans)
{ {
typedef coord_transform4<CoordTransform,geometry2d> path_type; typedef coord_transform2<CoordTransform,geometry2d> path_type;
typedef agg::renderer_base<agg::pixfmt_rgba32_plain> ren_base; typedef agg::renderer_base<agg::pixfmt_rgba32_plain> ren_base;
typedef agg::renderer_scanline_aa_solid<ren_base> renderer; typedef agg::renderer_scanline_aa_solid<ren_base> renderer;
@ -283,6 +280,7 @@ namespace mapnik
frame->move_to(itr->get<0>(),itr->get<1>()); frame->move_to(itr->get<0>(),itr->get<1>());
frame->line_to(itr->get<0>(),itr->get<1>()+height); frame->line_to(itr->get<0>(),itr->get<1>()+height);
} }
geom.rewind(0); geom.rewind(0);
@ -312,6 +310,7 @@ namespace mapnik
ras_ptr->add_path(roof_path); ras_ptr->add_path(roof_path);
ren.color(agg::rgba8(r, g, b, int(255 * sym.get_opacity()))); ren.color(agg::rgba8(r, g, b, int(255 * sym.get_opacity())));
agg::render_scanlines(*ras_ptr, sl, ren); agg::render_scanlines(*ras_ptr, sl, ren);
} }
} }
} }
@ -322,7 +321,7 @@ namespace mapnik
proj_transform const& prj_trans) proj_transform const& prj_trans)
{ {
typedef agg::renderer_base<agg::pixfmt_rgba32_plain> ren_base; typedef agg::renderer_base<agg::pixfmt_rgba32_plain> ren_base;
typedef coord_transform4<CoordTransform,geometry2d> path_type; typedef coord_transform2<CoordTransform,geometry2d> path_type;
typedef agg::renderer_outline_aa<ren_base> renderer_oaa; typedef agg::renderer_outline_aa<ren_base> renderer_oaa;
typedef agg::rasterizer_outline_aa<renderer_oaa> rasterizer_outline_aa; typedef agg::rasterizer_outline_aa<renderer_oaa> rasterizer_outline_aa;
typedef agg::renderer_scanline_aa_solid<ren_base> renderer; typedef agg::renderer_scanline_aa_solid<ren_base> renderer;
@ -461,20 +460,15 @@ namespace mapnik
boost::shared_ptr<ImageData32> const& data = sym.get_image(); boost::shared_ptr<ImageData32> const& data = sym.get_image();
if (text.length() > 0 && data) if (text.length() > 0 && data)
{ {
std::vector<face_ptr> faces; face_ptr face = font_manager_.get_face(sym.get_face_name());
if (face)
faces.push_back(font_manager_.get_face(sym.get_face_name()));
if (faces.size() > 0)
{ {
text_renderer<mapnik::Image32> ren(pixmap_, faces); text_renderer<mapnik::Image32> ren(pixmap_,face);
ren.set_pixel_size(sym.get_text_size()); ren.set_pixel_size(sym.get_text_size());
ren.set_fill(sym.get_fill()); ren.set_fill(sym.get_fill());
string_info info(text); string_info info(text);
face->get_string_info(info);
ren.get_string_info(info);
placement_finder<label_collision_detector4> finder(detector_); placement_finder<label_collision_detector4> finder(detector_);
@ -675,31 +669,11 @@ namespace mapnik
UnicodeString text = feature[sym.get_name()].to_unicode(); UnicodeString text = feature[sym.get_name()].to_unicode();
if ( text.length() > 0 ) if ( text.length() > 0 )
{ {
Color const& fill = sym.get_fill(); Color const& fill = sym.get_fill();
face_ptr face = font_manager_.get_face(sym.get_face_name());
std::vector<face_ptr> faces; if (face)
FontSet fontset = sym.get_fontset();
std::vector<std::string> face_names = fontset.get_face_names();
if (face_names.size() > 0)
{ {
std::vector<std::string>::iterator itr = face_names.begin(); text_renderer<mapnik::Image32> ren(pixmap_,face);
std::vector<std::string>::iterator end = face_names.end();
for (; itr != end; ++itr)
{
faces.push_back(font_manager_.get_face(*itr));
}
}
else
{
faces.push_back(font_manager_.get_face(sym.get_face_name()));
}
if (faces.size() > 0)
{
text_renderer<mapnik::Image32> ren(pixmap_, faces);
ren.set_pixel_size(sym.get_text_size()); ren.set_pixel_size(sym.get_text_size());
ren.set_fill(fill); ren.set_fill(fill);
ren.set_halo_fill(sym.get_halo_fill()); ren.set_halo_fill(sym.get_halo_fill());
@ -708,8 +682,7 @@ namespace mapnik
placement_finder<label_collision_detector4> finder(detector_); placement_finder<label_collision_detector4> finder(detector_);
string_info info(text); string_info info(text);
face->get_string_info(info);
ren.get_string_info(info);
unsigned num_geom = feature.num_geometries(); unsigned num_geom = feature.num_geometries();
for (unsigned i=0;i<num_geom;++i) for (unsigned i=0;i<num_geom;++i)
{ {

2
src/cairo_renderer.cpp
View file

@ -2,7 +2,7 @@
* *
* This file is part of Mapnik (c++ mapping toolkit) * This file is part of Mapnik (c++ mapping toolkit)
* *
* Copyright (C) 2008 Tom Hughes, Artem Pavlenko * Copyright (C) 2008 Tom Hughes
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public

122
src/load_map.cpp
View file

@ -29,7 +29,6 @@
#include <mapnik/layer.hpp> #include <mapnik/layer.hpp>
#include <mapnik/datasource_cache.hpp> #include <mapnik/datasource_cache.hpp>
#include <mapnik/font_engine_freetype.hpp> #include <mapnik/font_engine_freetype.hpp>
#include <mapnik/font_set.hpp>
#include <mapnik/ptree_helpers.hpp> #include <mapnik/ptree_helpers.hpp>
#include <mapnik/libxml2_loader.hpp> #include <mapnik/libxml2_loader.hpp>
@ -67,10 +66,7 @@ namespace mapnik
private: private:
void parse_style( Map & map, ptree const & sty); void parse_style( Map & map, ptree const & sty);
void parse_layer( Map & map, ptree const & lay); void parse_layer( Map & map, ptree const & lay);
void parse_fontset(Map & map, ptree const & fset);
void parse_font(FontSet & fset, ptree const & f);
void parse_rule( feature_type_style & style, ptree const & r); void parse_rule( feature_type_style & style, ptree const & r);
void parse_point_symbolizer( rule_type & rule, ptree const & sym); void parse_point_symbolizer( rule_type & rule, ptree const & sym);
@ -83,14 +79,13 @@ namespace mapnik
void parse_building_symbolizer( rule_type & rule, ptree const & sym ); void parse_building_symbolizer( rule_type & rule, ptree const & sym );
void parse_markers_symbolizer( rule_type & rule, ptree const & sym ); void parse_markers_symbolizer( rule_type & rule, ptree const & sym );
void ensure_font_face( const std::string & face_name ); void ensure_font_face( const text_symbolizer & text_symbol );
bool strict_; bool strict_;
std::map<std::string,parameters> datasource_templates_; std::map<std::string,parameters> datasource_templates_;
freetype_engine font_engine_; freetype_engine font_engine_;
face_manager<freetype_engine> font_manager_; face_manager<freetype_engine> font_manager_;
std::map<std::string,std::string> file_sources_; std::map<std::string,std::string> file_sources_;
std::map<std::string,FontSet> fontsets_;
}; };
void load_map(Map & map, std::string const& filename, bool strict) void load_map(Map & map, std::string const& filename, bool strict)
@ -147,12 +142,9 @@ namespace mapnik
} }
else if (v.first == "Layer") else if (v.first == "Layer")
{ {
parse_layer(map, v.second ); parse_layer(map, v.second );
} }
else if (v.first == "FontSet")
{
parse_fontset(map, v.second);
}
else if (v.first == "FileSource") else if (v.first == "FileSource")
{ {
std::string name = get_attr<string>( v.second, "name"); std::string name = get_attr<string>( v.second, "name");
@ -235,71 +227,6 @@ namespace mapnik
} }
} }
void map_parser::parse_fontset( Map & map, ptree const & fset )
{
string name("<missing name>");
try
{
name = get_attr<string>(fset, "name");
FontSet fontset(name);
ptree::const_iterator itr = fset.begin();
ptree::const_iterator end = fset.end();
for (; itr != end; ++itr)
{
ptree::value_type const& font_tag = *itr;
if (font_tag.first == "Font")
{
parse_font(fontset, font_tag.second);
}
else if (font_tag.first != "<xmlcomment>" &&
font_tag.first != "<xmlattr>" )
{
throw config_error(std::string("Unknown child node in 'FontSet'.") +
"Expected 'Font' but got '" + font_tag.first + "'");
}
}
map.insert_fontset(name, fontset);
// XXX Hack because map object isn't accessible by text_symbolizer
// when it's parsed
fontsets_.insert(pair<std::string, FontSet>(name, fontset));
} catch (const config_error & ex) {
if ( ! name.empty() ) {
ex.append_context(string("in FontSet '") + name + "'");
}
throw;
}
}
void map_parser::parse_font(FontSet & fset, ptree const & f)
{
std::string face_name;
try
{
face_name = get_attr(f, "face_name", string());
if ( strict_ )
{
ensure_font_face( face_name );
}
}
catch (const config_error & ex)
{
if (!face_name.empty())
{
ex.append_context(string("in Font '") + face_name + "'");
}
throw;
}
fset.add_face_name(face_name);
}
void map_parser::parse_layer( Map & map, ptree const & lay ) void map_parser::parse_layer( Map & map, ptree const & lay )
{ {
std::string name; std::string name;
@ -676,39 +603,12 @@ namespace mapnik
try try
{ {
std::string name = get_attr<string>(sym, "name"); std::string name = get_attr<string>(sym, "name");
std::string face_name = get_attr<string>(sym, "face_name");
optional<std::string> face_name = unsigned size = get_attr(sym, "size", 10U );
get_opt_attr<std::string>(sym, "face_name");
optional<std::string> fontset_name =
get_opt_attr<std::string>(sym, "fontset_name");
unsigned size = get_attr(sym, "size", 10U);
Color c = get_attr(sym, "fill", Color(0,0,0)); Color c = get_attr(sym, "fill", Color(0,0,0));
text_symbolizer text_symbol = text_symbolizer(name, size, c); text_symbolizer text_symbol(name, face_name, size, c);
if (fontset_name && face_name)
{
throw config_error(std::string("Can't have both face_name and fontset_name"));
}
else if (fontset_name)
{
std::map<std::string,FontSet>::const_iterator itr = fontsets_.find(*fontset_name);
if (itr != fontsets_.end())
{
text_symbol.set_fontset(itr->second);
}
}
else if (face_name)
{
text_symbol.set_face_name(*face_name);
}
else
{
throw config_error(std::string("Must have face_name or fontset_name"));
}
int dx = get_attr(sym, "dx", 0); int dx = get_attr(sym, "dx", 0);
int dy = get_attr(sym, "dy", 0); int dy = get_attr(sym, "dy", 0);
@ -783,7 +683,7 @@ namespace mapnik
if ( strict_ ) if ( strict_ )
{ {
ensure_font_face( text_symbol.get_face_name() ); ensure_font_face( text_symbol );
} }
rule.append(text_symbol); rule.append(text_symbol);
@ -1013,12 +913,12 @@ namespace mapnik
} }
} }
void map_parser::ensure_font_face( const std::string & face_name ) void map_parser::ensure_font_face( const text_symbolizer & text_symbol )
{ {
if ( ! font_manager_.get_face( face_name ) ) if ( ! font_manager_.get_face( text_symbol.get_face_name() ) )
{ {
throw config_error("Failed to find font face '" + throw config_error("Failed to find font face '" +
face_name + "'"); text_symbol.get_face_name() + "'");
} }
} }
} // end of namespace mapnik } // end of namespace mapnik

70
src/map.cpp
View file

@ -34,14 +34,12 @@ namespace mapnik
Map::Map() Map::Map()
: width_(400), : width_(400),
height_(400), height_(400),
srs_("+proj=latlong +datum=WGS84"), srs_("+proj=latlong +datum=WGS84") {}
aspectFixMode_(GROW_BBOX) {}
Map::Map(int width,int height, std::string const& srs) Map::Map(int width,int height, std::string const& srs)
: width_(width), : width_(width),
height_(height), height_(height),
srs_(srs), srs_(srs) {}
aspectFixMode_(GROW_BBOX) {}
Map::Map(const Map& rhs) Map::Map(const Map& rhs)
: width_(rhs.width_), : width_(rhs.width_),
@ -50,7 +48,6 @@ namespace mapnik
background_(rhs.background_), background_(rhs.background_),
styles_(rhs.styles_), styles_(rhs.styles_),
layers_(rhs.layers_), layers_(rhs.layers_),
aspectFixMode_(rhs.aspectFixMode_),
currentExtent_(rhs.currentExtent_) {} currentExtent_(rhs.currentExtent_) {}
Map& Map::operator=(const Map& rhs) Map& Map::operator=(const Map& rhs)
@ -62,7 +59,6 @@ namespace mapnik
background_=rhs.background_; background_=rhs.background_;
styles_=rhs.styles_; styles_=rhs.styles_;
layers_=rhs.layers_; layers_=rhs.layers_;
aspectFixMode_=rhs.aspectFixMode_;
return *this; return *this;
} }
@ -105,21 +101,7 @@ namespace mapnik
{ {
styles_.erase(name); styles_.erase(name);
} }
bool Map::insert_fontset(std::string const& name, FontSet const& fontset)
{
return fontsets_.insert(make_pair(name, fontset)).second;
}
FontSet const& Map::find_fontset(std::string const& name) const
{
std::map<std::string,FontSet>::const_iterator itr = fontsets_.find(name);
if (itr!=fontsets_.end())
return itr->second;
static FontSet default_fontset;
return default_fontset;
}
feature_type_style const& Map::find_style(std::string const& name) const feature_type_style const& Map::find_style(std::string const& name) const
{ {
std::map<std::string,feature_type_style>::const_iterator itr = styles_.find(name); std::map<std::string,feature_type_style>::const_iterator itr = styles_.find(name);
@ -299,47 +281,15 @@ namespace mapnik
{ {
double ratio1 = (double) width_ / (double) height_; double ratio1 = (double) width_ / (double) height_;
double ratio2 = currentExtent_.width() / currentExtent_.height(); double ratio2 = currentExtent_.width() / currentExtent_.height();
if (ratio1 == ratio2) return;
if (ratio2 > ratio1)
switch(aspectFixMode_)
{ {
case ADJUST_BBOX_HEIGHT: currentExtent_.height(currentExtent_.width() / ratio1);
currentExtent_.height(currentExtent_.width() / ratio1);
break;
case ADJUST_BBOX_WIDTH:
currentExtent_.width(currentExtent_.height() * ratio1);
break;
case ADJUST_CANVAS_HEIGHT:
height_ = int (width_ / ratio2 + 0.5);
break;
case ADJUST_CANVAS_WIDTH:
width_ = int (height_ * ratio2 + 0.5);
break;
case GROW_BBOX:
if (ratio2 > ratio1)
currentExtent_.height(currentExtent_.width() / ratio1);
else
currentExtent_.width(currentExtent_.height() * ratio1);
break;
case SHRINK_BBOX:
if (ratio2 < ratio1)
currentExtent_.height(currentExtent_.width() / ratio1);
else
currentExtent_.width(currentExtent_.height() * ratio1);
break;
case GROW_CANVAS:
if (ratio2 > ratio1)
width_ = (int) (height_ * ratio2 + 0.5);
else
height_ = int (width_ / ratio2 + 0.5);
break;
case SHRINK_CANVAS:
if (ratio2 > ratio1)
height_ = int (width_ / ratio2 + 0.5);
else
width_ = (int) (height_ * ratio2 + 0.5);
break;
} }
else if (ratio2 < ratio1)
{
currentExtent_.width(currentExtent_.height() * ratio1);
}
} }
const Envelope<double>& Map::getCurrentExtent() const const Envelope<double>& Map::getCurrentExtent() const

47
src/text_symbolizer.cpp
View file

@ -35,35 +35,13 @@ static const char * label_placement_strings[] = {
"" ""
}; };
IMPLEMENT_ENUM( mapnik::label_placement_e, label_placement_strings ); IMPLEMENT_ENUM( mapnik::label_placement_e, label_placement_strings );
namespace mapnik namespace mapnik
{ {
text_symbolizer::text_symbolizer(std::string const& name, std::string const& face_name, unsigned size, Color const& fill) text_symbolizer::text_symbolizer(std::string const& name, std::string const& face_name, unsigned size,Color const& fill)
: name_(name), : name_(name),
face_name_(face_name), face_name_(face_name),
//fontset_(default_fontset),
size_(size),
text_ratio_(0),
wrap_width_(0),
label_spacing_(0),
label_position_tolerance_(0),
force_odd_labels_(false),
max_char_angle_delta_(0),
fill_(fill),
halo_fill_(Color(255,255,255)),
halo_radius_(0),
label_p_(POINT_PLACEMENT),
anchor_(0.0,0.5),
displacement_(0.0,0.0),
avoid_edges_(false),
minimum_distance_(0.0),
overlap_(false) {}
text_symbolizer::text_symbolizer(std::string const& name, unsigned size, Color const& fill)
: name_(name),
//face_name_(""),
//fontset_(default_fontset),
size_(size), size_(size),
text_ratio_(0), text_ratio_(0),
wrap_width_(0), wrap_width_(0),
@ -83,7 +61,6 @@ namespace mapnik
text_symbolizer::text_symbolizer(text_symbolizer const& rhs) text_symbolizer::text_symbolizer(text_symbolizer const& rhs)
: name_(rhs.name_), : name_(rhs.name_),
face_name_(rhs.face_name_), face_name_(rhs.face_name_),
fontset_(rhs.fontset_),
size_(rhs.size_), size_(rhs.size_),
text_ratio_(rhs.text_ratio_), text_ratio_(rhs.text_ratio_),
wrap_width_(rhs.wrap_width_), wrap_width_(rhs.wrap_width_),
@ -107,7 +84,6 @@ namespace mapnik
return *this; return *this;
name_ = other.name_; name_ = other.name_;
face_name_ = other.face_name_; face_name_ = other.face_name_;
fontset_ = other.fontset_;
size_ = other.size_; size_ = other.size_;
text_ratio_ = other.text_ratio_; text_ratio_ = other.text_ratio_;
wrap_width_ = other.wrap_width_; wrap_width_ = other.wrap_width_;
@ -137,25 +113,10 @@ namespace mapnik
{ {
return face_name_; return face_name_;
} }
void text_symbolizer::set_face_name(std::string face_name)
{
face_name_ = face_name;
}
void text_symbolizer::set_fontset(FontSet fontset)
{
fontset_ = fontset;
}
FontSet const& text_symbolizer::get_fontset() const
{
return fontset_;
}
unsigned text_symbolizer::get_text_ratio() const unsigned text_symbolizer::get_text_ratio() const
{ {
return text_ratio_; return text_ratio_;
} }
void text_symbolizer::set_text_ratio(unsigned ratio) void text_symbolizer::set_text_ratio(unsigned ratio)
@ -165,7 +126,7 @@ namespace mapnik
unsigned text_symbolizer::get_wrap_width() const unsigned text_symbolizer::get_wrap_width() const
{ {
return wrap_width_; return wrap_width_;
} }
void text_symbolizer::set_wrap_width(unsigned width) void text_symbolizer::set_wrap_width(unsigned width)

2
src/unicode.cpp
View file

@ -196,7 +196,7 @@ namespace mapnik {
size_t inleft = input.size(); size_t inleft = input.size();
std::wstring output(inleft,0); std::wstring output(inleft,0);
size_t outleft = inleft * sizeof(wchar_t); size_t outleft = inleft * sizeof(wchar_t);
#if (!defined(OSX_LEOPARD) && defined(DARWIN)) || defined(SUNOS) || defined(FREEBSD) || defined(_WIN32) #if (!defined(OSX_LEOPARD) && defined(DARWIN)) || defined(SUNOS) || defined(FREEBSD)
const char * in = input.c_str(); const char * in = input.c_str();
#else #else
char * in = const_cast<char*>(input.data()); char * in = const_cast<char*>(input.data());

13
utils/shapeindex/SConscript
View file

@ -41,14 +41,11 @@ source = Split(
headers = ['#plugins/input/shape'] + env['CPPPATH'] headers = ['#plugins/input/shape'] + env['CPPPATH']
#boost_program_options = 'boost_program_options%s' % env['BOOST_APPEND'] boost_program_options = 'boost_program_options%s' % env['BOOST_APPEND']
#boost_iostreams = 'boost_iostreams%s' % env['BOOST_APPEND'] boost_iostreams = 'boost_iostreams%s' % env['BOOST_APPEND']
boost_program_options = 'boost_program_options-mt-1_35' if env['THREADING'] == 'multi':
boost_iostreams = 'boost_iostreams-mt-1_35' boost_program_options = '%s%s' % (boost_program_options,thread_suffix)
boost_iostreams = '%s%s' % (boost_iostreams,thread_suffix)
#if env['THREADING'] == 'multi':
# boost_program_options = '%s%s' % (boost_program_options,thread_suffix)
# boost_iostreams = '%s%s' % (boost_iostreams,thread_suffix)
libraries = [boost_program_options,boost_iostreams] libraries = [boost_program_options,boost_iostreams]
shapeindex = env.Program('shapeindex', source, CPPPATH=headers, LIBS=libraries) shapeindex = env.Program('shapeindex', source, CPPPATH=headers, LIBS=libraries)