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

Merge branch 'master' into conv_simplify

Browse source 
Conflicts:
	bindings/python/mapnik_markers_symbolizer.cpp
	plugins/input/ogr/ogr_index_featureset.cpp
	plugins/input/shape/dbfile.cpp
	plugins/input/shape/shapefile.hpp
	src/load_map.cpp
This commit is contained in:
artemp 2012-09-07 16:46:02 +01:00
commit 29423cfc1c
32 changed files with 77 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bindings/python/mapnik_datasource.cpp
View file

@ -81,7 +81,7 @@ boost::shared_ptr<mapnik::datasource> create_datasource(const dict& d)
}
}
return mapnik::datasource_cache::instance()->create(params, bind);
return mapnik::datasource_cache::instance().create(params, bind);
}
boost::python::dict describe(boost::shared_ptr<mapnik::datasource> const& ds)

8
bindings/python/mapnik_datasource_cache.cpp
View file

@ -61,22 +61,22 @@ boost::shared_ptr<mapnik::datasource> create_datasource(const dict& d)
}
}
return mapnik::datasource_cache::instance()->create(params, bind);
return mapnik::datasource_cache::instance().create(params, bind);
}
void register_datasources(std::string const& path)
{
mapnik::datasource_cache::instance()->register_datasources(path);
mapnik::datasource_cache::instance().register_datasources(path);
}
std::vector<std::string> plugin_names()
{
return mapnik::datasource_cache::instance()->plugin_names();
return mapnik::datasource_cache::instance().plugin_names();
}
std::string plugin_directories()
{
return mapnik::datasource_cache::instance()->plugin_directories();
return mapnik::datasource_cache::instance().plugin_directories();
}
}

2
bindings/python/mapnik_layer.cpp
View file

@ -77,7 +77,7 @@ struct layer_pickle_suite : boost::python::pickle_suite
l.set_queryable(extract<bool>(state[3]));
mapnik::parameters params = extract<parameters>(state[4]);
l.set_datasource(datasource_cache::instance()->create(params));
l.set_datasource(datasource_cache::instance().create(params));
boost::python::list s = extract<boost::python::list>(state[5]);
for (int i=0;i<len(s);++i)

4
bindings/python/mapnik_markers_symbolizer.cpp
View file

@ -54,11 +54,11 @@ void set_marker_type(mapnik::markers_symbolizer & symbolizer, std::string const&
std::string filename;
if (marker_type == "ellipse")
{
filename = mapnik::marker_cache::instance()->known_svg_prefix_ + "ellipse";
filename = mapnik::marker_cache::instance().known_svg_prefix_ + "ellipse";
}
else if (marker_type == "arrow")
{
filename = mapnik::marker_cache::instance()->known_svg_prefix_ + "arrow";
filename = mapnik::marker_cache::instance().known_svg_prefix_ + "arrow";
}
else
{

4
bindings/python/mapnik_python.cpp
View file

@ -96,8 +96,8 @@ void export_logger();
void clear_cache()
{
mapnik::marker_cache::instance()->clear();
mapnik::mapped_memory_cache::instance()->clear();
mapnik::marker_cache::instance().clear();
mapnik::mapped_memory_cache::instance().clear();
}
#if defined(HAVE_CAIRO) && defined(HAVE_PYCAIRO)

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

@ -56,7 +56,7 @@ int main ( int argc , char** argv)
std::cout << " running demo ... \n";
std::string mapnik_dir(argv[1]);
std::cout << " looking for 'shape.input' plugin in... " << mapnik_dir << "/input/" << "\n";
datasource_cache::instance()->register_datasources(mapnik_dir + "/input/");
datasource_cache::instance().register_datasources(mapnik_dir + "/input/");
std::cout << " looking for DejaVuSans font in... " << mapnik_dir << "/fonts/DejaVuSans.ttf" << "\n";
freetype_engine::register_font(mapnik_dir + "/fonts/DejaVuSans.ttf");
@ -182,7 +182,7 @@ int main ( int argc , char** argv)
p["encoding"]="latin1";
layer lyr("Provinces");
lyr.set_datasource(datasource_cache::instance()->create(p));
lyr.set_datasource(datasource_cache::instance().create(p));
lyr.add_style("provinces");
m.addLayer(lyr);
}
@ -193,7 +193,7 @@ int main ( int argc , char** argv)
p["type"]="shape";
p["file"]="../data/qcdrainage";
layer lyr("Quebec Hydrography");
lyr.set_datasource(datasource_cache::instance()->create(p));
lyr.set_datasource(datasource_cache::instance().create(p));
lyr.add_style("drainage");
m.addLayer(lyr);
}
@ -204,7 +204,7 @@ int main ( int argc , char** argv)
p["file"]="../data/ontdrainage";
layer lyr("Ontario Hydrography");
lyr.set_datasource(datasource_cache::instance()->create(p));
lyr.set_datasource(datasource_cache::instance().create(p));
lyr.add_style("drainage");
m.addLayer(lyr);
}
@ -215,7 +215,7 @@ int main ( int argc , char** argv)
p["type"]="shape";
p["file"]="../data/boundaries_l";
layer lyr("Provincial borders");
lyr.set_datasource(datasource_cache::instance()->create(p));
lyr.set_datasource(datasource_cache::instance().create(p));
lyr.add_style("provlines");
m.addLayer(lyr);
}
@ -226,7 +226,7 @@ int main ( int argc , char** argv)
p["type"]="shape";
p["file"]="../data/roads";
layer lyr("Roads");
lyr.set_datasource(datasource_cache::instance()->create(p));
lyr.set_datasource(datasource_cache::instance().create(p));
lyr.add_style("smallroads");
lyr.add_style("road-border");
lyr.add_style("road-fill");
@ -242,7 +242,7 @@ int main ( int argc , char** argv)
p["file"]="../data/popplaces";
p["encoding"] = "latin1";
layer lyr("Populated Places");
lyr.set_datasource(datasource_cache::instance()->create(p));
lyr.set_datasource(datasource_cache::instance().create(p));
lyr.add_style("popplaces");
m.addLayer(lyr);
}
@ -258,7 +258,7 @@ int main ( int argc , char** argv)
save_to_file(buf,"demo.png","png");
save_to_file(buf,"demo256.png","png256");
save_to_file(buf,"demo.tif","tiff");
std::cout << "Three maps have been rendered using AGG in the current directory:\n"
"- demo.jpg\n"
"- demo.png\n"

2
demo/viewer/main.cpp
View file

@ -45,7 +45,7 @@ int main( int argc, char **argv )
// register input plug-ins
QString plugins_dir = settings.value("mapnik/plugins_dir",
QVariant("/usr/local/lib/mapnik/input/")).toString();
datasource_cache::instance()->register_datasources(plugins_dir.toStdString());
datasource_cache::instance().register_datasources(plugins_dir.toStdString());
// register fonts
int count = settings.beginReadArray("mapnik/fonts");
for (int index=0; index < count; ++index)

4
include/mapnik/utils.hpp
View file

@ -129,7 +129,7 @@ protected:
#endif
singleton() {}
public:
static T* instance()
static T& instance()
{
if (! pInstance_)
{
@ -152,7 +152,7 @@ public:
}
}
}
return pInstance_;
return *pInstance_;
}
};
#ifdef MAPNIK_THREADSAFE

2
plugins/input/ogr/ogr_index_featureset.cpp
View file

@ -64,7 +64,7 @@ ogr_index_featureset<filterT>::ogr_index_featureset(mapnik::context_ptr const &
fidcolumn_(layer_.GetFIDColumn())
{
boost::optional<mapnik::mapped_region_ptr> memory = mapnik::mapped_memory_cache::instance()->find(index_file.c_str(),true);
boost::optional<mapnik::mapped_region_ptr> memory = mapnik::mapped_memory_cache::instance().find(index_file.c_str(),true);
if (memory)
{
boost::interprocess::ibufferstream file(static_cast<char*>((*memory)->get_address()),(*memory)->get_size());

6
plugins/input/osm/demo/MapSource.cpp
View file

@ -320,7 +320,7 @@ void MapSource::setOSMLayers(Map& m, const parameters &p)
if(boost::get<std::string>(q["type"])=="osm")
{
m.getLayer(count).set_datasource
(datasource_cache::instance()->create(p));
(datasource_cache::instance().create(p));
}
}
}
@ -353,7 +353,7 @@ void MapSource::addSRTMLayers(Map& m,double w,double s,double e,double n)
<<(lon>=0 ? lon:-lon)<<"c10";
p["file"] = str.str();
cerr<<"ADDING SRTM LAYER: " << p["file"] << endl;
m.getLayer(i).set_datasource(datasource_cache::instance()->create(p));
m.getLayer(i).set_datasource(datasource_cache::instance().create(p));
// do we have more than one srtm layer?
if(floor(w) != floor(e) || floor(s) != floor(n))
@ -385,7 +385,7 @@ void MapSource::addSRTMLayers(Map& m,double w,double s,double e,double n)
lyr.add_style("contours");
lyr.add_style("contours-text");
lyr.set_datasource
(datasource_cache::instance()->create(p));
(datasource_cache::instance().create(p));
m.addLayer(lyr);
}
}

2
plugins/input/osm/demo/easymapnik.cpp
View file

@ -32,7 +32,7 @@ int main(int argc,char *argv[])
exit(1);
}
datasource_cache::instance()->register_datasources
datasource_cache::instance().register_datasources
("/usr/local/lib/mapnik/input");
freetype_engine::register_font
("/usr/local/lib/mapnik/fonts/DejaVuSans.ttf");

4
plugins/input/osm/render.cpp
View file

@ -43,7 +43,7 @@ int main(int argc,char *argv[])
exit(0);
}
mapnik::datasource_cache::instance()->register_datasources("/usr/local/lib/mapnik/input");
mapnik::datasource_cache::instance().register_datasources("/usr/local/lib/mapnik/input");
mapnik::freetype_engine::register_font("/usr/local/lib/mapnik/fonts/DejaVuSans.ttf");
mapnik::Map m(800, 800);
@ -57,7 +57,7 @@ int main(int argc,char *argv[])
for (int count = 0; count < m.layer_count(); count++)
{
mapnik::parameters q = m.getLayer(count).datasource()->params();
m.getLayer(count).set_datasource(mapnik::datasource_cache::instance()->create(p));
m.getLayer(count).set_datasource(mapnik::datasource_cache::instance().create(p));
}
}

22
plugins/input/postgis/postgis_datasource.cpp
View file

@ -120,10 +120,8 @@ void postgis_datasource::bind() const
boost::optional<mapnik::boolean> simplify_opt = params_.get<mapnik::boolean>("simplify_geometries", false);
simplify_geometries_ = simplify_opt && *simplify_opt;
ConnectionManager* mgr = ConnectionManager::instance();
mgr->registerPool(creator_, *initial_size, *max_size);
shared_ptr< Pool<Connection,ConnectionCreator> > pool = mgr->getPool(creator_.id());
ConnectionManager::instance().registerPool(creator_, *initial_size, *max_size);
shared_ptr< Pool<Connection,ConnectionCreator> > pool = ConnectionManager::instance().getPool(creator_.id());
if (pool)
{
shared_ptr<Connection> conn = pool->borrowObject();
@ -430,8 +428,7 @@ postgis_datasource::~postgis_datasource()
{
if (is_bound_ && ! persist_connection_)
{
ConnectionManager* mgr = ConnectionManager::instance();
shared_ptr< Pool<Connection,ConnectionCreator> > pool = mgr->getPool(creator_.id());
shared_ptr< Pool<Connection,ConnectionCreator> > pool = ConnectionManager::instance().getPool(creator_.id());
if (pool)
{
shared_ptr<Connection> conn = pool->borrowObject();
@ -613,8 +610,7 @@ featureset_ptr postgis_datasource::features(const query& q) const
box2d<double> const& box = q.get_bbox();
double scale_denom = q.scale_denominator();
ConnectionManager* mgr = ConnectionManager::instance();
shared_ptr< Pool<Connection,ConnectionCreator> > pool = mgr->getPool(creator_.id());
shared_ptr< Pool<Connection,ConnectionCreator> > pool = ConnectionManager::instance().getPool(creator_.id());
if (pool)
{
shared_ptr<Connection> conn = pool->borrowObject();
@ -723,9 +719,7 @@ featureset_ptr postgis_datasource::features_at_point(coord2d const& pt) const
#ifdef MAPNIK_STATS
mapnik::progress_timer __stats__(std::clog, "postgis_datasource::features_at_point");
#endif
ConnectionManager* mgr = ConnectionManager::instance();
shared_ptr< Pool<Connection,ConnectionCreator> > pool = mgr->getPool(creator_.id());
shared_ptr< Pool<Connection,ConnectionCreator> > pool = ConnectionManager::instance().getPool(creator_.id());
if (pool)
{
shared_ptr<Connection> conn = pool->borrowObject();
@ -814,8 +808,7 @@ box2d<double> postgis_datasource::envelope() const
bind();
}
ConnectionManager* mgr = ConnectionManager::instance();
shared_ptr< Pool<Connection,ConnectionCreator> > pool = mgr->getPool(creator_.id());
shared_ptr< Pool<Connection,ConnectionCreator> > pool = ConnectionManager::instance().getPool(creator_.id());
if (pool)
{
shared_ptr<Connection> conn = pool->borrowObject();
@ -915,8 +908,7 @@ boost::optional<mapnik::datasource::geometry_t> postgis_datasource::get_geometry
boost::optional<mapnik::datasource::geometry_t> result;
ConnectionManager* mgr = ConnectionManager::instance();
shared_ptr< Pool<Connection,ConnectionCreator> > pool = mgr->getPool(creator_.id());
shared_ptr< Pool<Connection,ConnectionCreator> > pool = ConnectionManager::instance().getPool(creator_.id());
if (pool)
{
shared_ptr<Connection> conn = pool->borrowObject();

2
plugins/input/shape/dbfile.cpp
View file

@ -55,7 +55,7 @@ dbf_file::dbf_file(std::string const& file_name)
{
#ifdef SHAPE_MEMORY_MAPPED_FILE
boost::optional<mapnik::mapped_region_ptr> memory = mapped_memory_cache::instance()->find(file_name.c_str(),true);
boost::optional<mapnik::mapped_region_ptr> memory = mapped_memory_cache::instance().find(file_name.c_str(),true);
if (memory)
{
file_.buffer(static_cast<char*>((*memory)->get_address()),(*memory)->get_size());

2
plugins/input/shape/shapefile.hpp
View file

@ -155,7 +155,7 @@ public:
{
#ifdef SHAPE_MEMORY_MAPPED_FILE
boost::optional<mapnik::mapped_region_ptr> memory =
mapnik::mapped_memory_cache::instance()->find(file_name.c_str(),true);
mapnik::mapped_memory_cache::instance().find(file_name.c_str(),true);
if (memory)
{

2
src/agg/agg_renderer.cpp
View file

@ -137,7 +137,7 @@ void agg_renderer<T>::setup(Map const &m)
boost::optional<std::string> const& image_filename = m.background_image();
if (image_filename)
{
boost::optional<mapnik::marker_ptr> bg_marker = mapnik::marker_cache::instance()->find(*image_filename,true);
boost::optional<mapnik::marker_ptr> bg_marker = mapnik::marker_cache::instance().find(*image_filename,true);
if (bg_marker && (*bg_marker)->is_bitmap())
{
mapnik::image_ptr bg_image = *(*bg_marker)->get_bitmap_data();

2
src/agg/process_line_pattern_symbolizer.cpp
View file

@ -67,7 +67,7 @@ void agg_renderer<T>::process(line_pattern_symbolizer const& sym,
std::string filename = path_processor_type::evaluate( *sym.get_filename(), feature);
boost::optional<marker_ptr> mark = marker_cache::instance()->find(filename,true);
boost::optional<marker_ptr> mark = marker_cache::instance().find(filename,true);
if (!mark) return;
if (!(*mark)->is_bitmap())

2
src/agg/process_markers_symbolizer.cpp
View file

@ -75,7 +75,7 @@ void agg_renderer<T>::process(markers_symbolizer const& sym,
if (!filename.empty())
{
boost::optional<marker_ptr> mark = mapnik::marker_cache::instance()->find(filename, true);
boost::optional<marker_ptr> mark = mapnik::marker_cache::instance().find(filename, true);
if (mark && *mark)
{
ras_ptr->reset();

2
src/agg/process_point_symbolizer.cpp
View file

@ -52,7 +52,7 @@ void agg_renderer<T>::process(point_symbolizer const& sym,
boost::optional<mapnik::marker_ptr> marker;
if ( !filename.empty() )
{
marker = marker_cache::instance()->find(filename, true);
marker = marker_cache::instance().find(filename, true);
}
else
{

2
src/agg/process_polygon_pattern_symbolizer.cpp
View file

@ -63,7 +63,7 @@ void agg_renderer<T>::process(polygon_pattern_symbolizer const& sym,
boost::optional<mapnik::marker_ptr> marker;
if ( !filename.empty() )
{
marker = marker_cache::instance()->find(filename, true);
marker = marker_cache::instance().find(filename, true);
}
else
{

8
src/cairo_renderer.cpp
View file

@ -1187,7 +1187,7 @@ void cairo_renderer_base::process(point_symbolizer const& sym,
boost::optional<marker_ptr> marker;
if ( !filename.empty() )
{
marker = marker_cache::instance()->find(filename, true);
marker = marker_cache::instance().find(filename, true);
}
else
{
@ -1280,7 +1280,7 @@ void cairo_renderer_base::process(line_pattern_symbolizer const& sym,
typedef coord_transform<CoordTransform,clipped_geometry_type> path_type;
std::string filename = path_processor_type::evaluate( *sym.get_filename(), feature);
boost::optional<mapnik::marker_ptr> marker = mapnik::marker_cache::instance()->find(filename,true);
boost::optional<mapnik::marker_ptr> marker = mapnik::marker_cache::instance().find(filename,true);
if (!marker && !(*marker)->is_bitmap()) return;
unsigned width((*marker)->width());
@ -1357,7 +1357,7 @@ void cairo_renderer_base::process(polygon_pattern_symbolizer const& sym,
context.set_operator(sym.comp_op());
std::string filename = path_processor_type::evaluate( *sym.get_filename(), feature);
boost::optional<mapnik::marker_ptr> marker = mapnik::marker_cache::instance()->find(filename,true);
boost::optional<mapnik::marker_ptr> marker = mapnik::marker_cache::instance().find(filename,true);
if (!marker && !(*marker)->is_bitmap()) return;
cairo_pattern pattern(**((*marker)->get_bitmap_data()));
@ -1655,7 +1655,7 @@ void cairo_renderer_base::process(markers_symbolizer const& sym,
if (!filename.empty())
{
boost::optional<marker_ptr> mark = mapnik::marker_cache::instance()->find(filename, true);
boost::optional<marker_ptr> mark = mapnik::marker_cache::instance().find(filename, true);
if (mark && *mark)
{
agg::trans_affine geom_tr;

2
src/deepcopy.cpp
View file

@ -101,7 +101,7 @@ namespace mapnik { namespace util {
parameters p(ds_in->params());
// TODO : re-use datasource extent if already set.
datasource_ptr ds_out = datasource_cache::instance()->create(p);
datasource_ptr ds_out = datasource_cache::instance().create(p);
if (ds_out)
{
lyr_out.set_datasource(ds_out);

2
src/formatting/base.cpp
View file

@ -50,7 +50,7 @@ node_ptr node::from_xml(xml_node const& xml)
{
continue;
}
node_ptr n = registry::instance()->from_xml(*itr);
node_ptr n = registry::instance().from_xml(*itr);
if (n) list->push_back(n);
}
if (list->get_children().size() == 1) {

2
src/grid/process_markers_symbolizer.cpp
View file

@ -94,7 +94,7 @@ void grid_renderer<T>::process(markers_symbolizer const& sym,
if (!filename.empty())
{
boost::optional<marker_ptr> mark = mapnik::marker_cache::instance()->find(filename, true);
boost::optional<marker_ptr> mark = mapnik::marker_cache::instance().find(filename, true);
if (mark && *mark)
{
ras_ptr->reset();

2
src/grid/process_point_symbolizer.cpp
View file

@ -54,7 +54,7 @@ void grid_renderer<T>::process(point_symbolizer const& sym,
boost::optional<mapnik::marker_ptr> marker;
if ( !filename.empty() )
{
marker = marker_cache::instance()->find(filename, true);
marker = marker_cache::instance().find(filename, true);
}
else
{

6
src/image_reader.cpp
View file

@ -33,12 +33,12 @@ typedef factory<image_reader,std::string,
bool register_image_reader(std::string const& type,image_reader* (* fun)(std::string const&))
{
return ImageReaderFactory::instance()->register_product(type,fun);
return ImageReaderFactory::instance().register_product(type,fun);
}
image_reader* get_image_reader(std::string const& filename,std::string const& type)
{
return ImageReaderFactory::instance()->create_object(type,filename);
return ImageReaderFactory::instance().create_object(type,filename);
}
image_reader* get_image_reader(std::string const& filename)
@ -46,7 +46,7 @@ image_reader* get_image_reader(std::string const& filename)
boost::optional<std::string> type = type_from_filename(filename);
if (type)
{
return ImageReaderFactory::instance()->create_object(*type,filename);
return ImageReaderFactory::instance().create_object(*type,filename);
}
return 0;
}

14
src/load_map.cpp
View file

@ -699,7 +699,7 @@ void map_parser::parse_layer(Map & map, xml_node const& node)
try
{
boost::shared_ptr<datasource> ds =
datasource_cache::instance()->create(params);
datasource_cache::instance().create(params);
lyr.set_datasource(ds);
}
catch (std::exception const& ex)
@ -974,11 +974,11 @@ void map_parser::parse_markers_symbolizer(rule & rule, xml_node const& sym)
{
if (*marker_type == "ellipse")
{
filename = marker_cache::instance()->known_svg_prefix_ + "ellipse";
filename = marker_cache::instance().known_svg_prefix_ + "ellipse";
}
else if (*marker_type == "arrow")
{
filename = marker_cache::instance()->known_svg_prefix_ + "arrow";
filename = marker_cache::instance().known_svg_prefix_ + "arrow";
}
}
}
@ -1143,7 +1143,7 @@ void map_parser::parse_text_symbolizer(rule & rule, xml_node const& sym)
text_placements_ptr placement_finder;
optional<std::string> placement_type = sym.get_opt_attr<std::string>("placement-type");
if (placement_type) {
placement_finder = placements::registry::instance()->from_xml(*placement_type, sym, fontsets_);
placement_finder = placements::registry::instance().from_xml(*placement_type, sym, fontsets_);
} else {
placement_finder = boost::make_shared<text_placements_dummy>();
placement_finder->defaults.from_xml(sym, fontsets_);
@ -1172,7 +1172,7 @@ void map_parser::parse_shield_symbolizer(rule & rule, xml_node const& sym)
text_placements_ptr placement_finder;
optional<std::string> placement_type = sym.get_opt_attr<std::string>("placement-type");
if (placement_type) {
placement_finder = placements::registry::instance()->from_xml(*placement_type, sym, fontsets_);
placement_finder = placements::registry::instance().from_xml(*placement_type, sym, fontsets_);
} else {
placement_finder = boost::make_shared<text_placements_dummy>();
}
@ -1605,7 +1605,7 @@ void map_parser::ensure_font_face(std::string const& face_name)
std::string map_parser::ensure_relative_to_xml(boost::optional<std::string> opt_path)
{
if (marker_cache::instance()->is_uri(*opt_path))
if (marker_cache::instance().is_uri(*opt_path))
return *opt_path;
if (relative_to_xml_)
@ -1633,7 +1633,7 @@ std::string map_parser::ensure_relative_to_xml(boost::optional<std::string> opt_
void map_parser::ensure_exists(std::string const& file_path)
{
if (marker_cache::instance()->is_uri(file_path))
if (marker_cache::instance().is_uri(file_path))
return;
// validate that the filename exists if it is not a dynamic PathExpression
if (!boost::algorithm::find_first(file_path,"[") && !boost::algorithm::find_first(file_path,"]"))

2
src/symbolizer_helpers.cpp
View file

@ -401,7 +401,7 @@ void shield_symbolizer_helper<FaceManagerT, DetectorT>::init_marker()
marker_.reset();
if (!filename.empty())
{
marker_ = marker_cache::instance()->find(filename, true);
marker_ = marker_cache::instance().find(filename, true);
}
if (!marker_) {
marker_w_ = 0;

14
tests/cpp_tests/exceptions_test.cpp
View file

@ -44,11 +44,11 @@ int main( int, char*[] )
std::string csv_plugin("./plugins/input/csv.input");
if (boost::filesystem::exists(csv_plugin)) {
try {
mapnik::datasource_cache::instance()->register_datasource(csv_plugin);
mapnik::datasource_cache::instance().register_datasource(csv_plugin);
mapnik::parameters p;
p["type"]="csv";
p["inline"]="x,y\n0,0";
mapnik::datasource_ptr ds = mapnik::datasource_cache::instance()->create(p);
mapnik::datasource_ptr ds = mapnik::datasource_cache::instance().create(p);
//mapnik::datasource_ptr ds = boost::make_shared<mapnik::memory_datasource>();
//mapnik::context_ptr ctx = boost::make_shared<mapnik::context_type>();
//mapnik::feature_ptr feature(mapnik::feature_factory::create(ctx, 1));
@ -75,29 +75,29 @@ int main( int, char*[] )
std::string shape_plugin("./plugins/input/shape.input");
if (boost::filesystem::exists(shape_plugin)) {
try {
mapnik::datasource_cache::instance()->register_datasource(shape_plugin);
mapnik::datasource_cache::instance().register_datasource(shape_plugin);
mapnik::parameters p2;
p2["type"]="shape";
p2["file"]="foo";
mapnik::datasource_cache::instance()->create(p2);
mapnik::datasource_cache::instance().create(p2);
BOOST_TEST(false);
} catch (...) {
BOOST_TEST(true);
}
}
/*
// not working, oddly segfaults valgrind
try {
sqlite3_initialize();
// http://stackoverflow.com/questions/11107703/sqlite3-sigsegvs-with-valgrind
sqlite3_config(SQLITE_CONFIG_HEAP, malloc (1024*1024), 1024*1024, 64);
mapnik::datasource_cache::instance()->register_datasource("./plugins/input/sqlite.input");
mapnik::datasource_cache::instance().register_datasource("./plugins/input/sqlite.input");
mapnik::parameters p;
p["type"]="sqlite";
p["file"]="tests/data/sqlite/world.sqlite";
p["table"]="world_merc";
mapnik::datasource_cache::instance()->create(p);
mapnik::datasource_cache::instance().create(p);
sqlite3_shutdown();
BOOST_TEST(true);
} catch (...) {

12
tests/cpp_tests/svg_renderer_tests/path_element_test.cpp
View file

@ -28,7 +28,7 @@ void prepare_map(Map& m)
{
const std::string mapnik_dir("/usr/local/lib/mapnik/");
std::cout << " looking for 'shape.input' plugin in... " << mapnik_dir << "input/" << "\n";
datasource_cache::instance()->register_datasources(mapnik_dir + "input/");
datasource_cache::instance().register_datasources(mapnik_dir + "input/");
// create styles
@ -135,7 +135,7 @@ void prepare_map(Map& m)
p["file"]="../../../demo/data/boundaries";
layer lyr("Provinces");
lyr.set_datasource(datasource_cache::instance()->create(p));
lyr.set_datasource(datasource_cache::instance().create(p));
lyr.add_style("provinces");
m.addLayer(lyr);
}
@ -146,7 +146,7 @@ void prepare_map(Map& m)
p["type"]="shape";
p["file"]="../../../demo/data/qcdrainage";
layer lyr("Quebec Hydrography");
lyr.set_datasource(datasource_cache::instance()->create(p));
lyr.set_datasource(datasource_cache::instance().create(p));
lyr.add_style("drainage");
m.addLayer(lyr);
}
@ -157,7 +157,7 @@ void prepare_map(Map& m)
p["file"]="../../../demo/data/ontdrainage";
layer lyr("Ontario Hydrography");
lyr.set_datasource(datasource_cache::instance()->create(p));
lyr.set_datasource(datasource_cache::instance().create(p));
lyr.add_style("drainage");
m.addLayer(lyr);
}
@ -168,7 +168,7 @@ void prepare_map(Map& m)
p["type"]="shape";
p["file"]="../../../demo/data/boundaries_l";
layer lyr("Provincial borders");
lyr.set_datasource(datasource_cache::instance()->create(p));
lyr.set_datasource(datasource_cache::instance().create(p));
lyr.add_style("provlines");
m.addLayer(lyr);
}
@ -179,7 +179,7 @@ void prepare_map(Map& m)
p["type"]="shape";
p["file"]="../../../demo/data/roads";
layer lyr("Roads");
lyr.set_datasource(datasource_cache::instance()->create(p));
lyr.set_datasource(datasource_cache::instance().create(p));
lyr.add_style("smallroads");
lyr.add_style("road-border");
lyr.add_style("road-fill");

6
utils/geometry_to_wkb/main.cpp
View file

@ -43,7 +43,7 @@ int main (int argc, char ** argv )
std::cerr << "Geometry to WKB converter\n";
mapnik::datasource_cache::instance()->register_datasources("/opt/mapnik/lib/mapnik/input/");
mapnik::datasource_cache::instance().register_datasources("/opt/mapnik/lib/mapnik/input/");
std::string filename(argv[1]);
std::cerr << filename << std::endl;
@ -56,7 +56,7 @@ int main (int argc, char ** argv )
try
{
ds = mapnik::datasource_cache::instance()->create(p);
ds = mapnik::datasource_cache::instance().create(p);
}
catch ( ... )
{
@ -104,5 +104,3 @@ int main (int argc, char ** argv )
return EXIT_SUCCESS;
}

2
utils/svg2png/svg2png.cpp
View file

@ -127,7 +127,7 @@ int main (int argc,char** argv)
}
boost::optional<mapnik::marker_ptr> marker_ptr =
mapnik::marker_cache::instance()->find(svg_name, false);
mapnik::marker_cache::instance().find(svg_name, false);
if (!marker_ptr)
{
std::clog << "svg2png error: could not open: '" << svg_name << "'\n";