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

fix compile of occi plugin after late binding patch

Browse source
This commit is contained in:
Dane Springmeyer 2010-11-08 21:06:37 +00:00
parent 3fed886576
commit 6b08f1c793
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
plugins/input/occi/occi_datasource.cpp
View file

@ -93,18 +93,15 @@ std::string table_from_sql(std::string const& sql)
occi_datasource::occi_datasource(parameters const& params, bool bind)
: datasource (params),
table_(*params.get<std::string>("table","")),
geometry_field_(*params.get<std::string>("geometry_field","GEOLOC")),
table_(*params_.get<std::string>("table","")),
geometry_field_(*params_.get<std::string>("geometry_field","GEOLOC")),
type_(datasource::Vector),
extent_initialized_(false),
row_limit_(*params_.get<int>("row_limit",0)),
row_prefetch_(*params_.get<int>("row_prefetch",100)),
desc_(*params.get<std::string>("type"), *params.get<std::string>("encoding","utf-8")),
desc_(*params_.get<std::string>("type"), *params_.get<std::string>("encoding","utf-8")),
pool_(0)
{
boost::optional<int> initial_size = params_.get<int>("inital_size",1);
boost::optional<int> max_size = params_.get<int>("max_size",10);
multiple_geometries_ = *params_.get<mapnik::boolean>("multiple_geometries",false);
use_spatial_index_ = *params_.get<mapnik::boolean>("use_spatial_index",true);
@ -148,9 +145,12 @@ occi_datasource::occi_datasource(parameters const& params, bool bind)
}
}
void occi_datasource::bind()
void occi_datasource::bind() const
{
if (is_bound_) return;
boost::optional<int> initial_size = params_.get<int>("initial_size",1);
boost::optional<int> max_size = params_.get<int>("max_size",10);
// connect to environment
try
@ -158,9 +158,9 @@ void occi_datasource::bind()
Environment* env = occi_environment::get_environment();
pool_ = env->createStatelessConnectionPool(
*params.get<std::string>("user"),
*params.get<std::string>("password"),
*params.get<std::string>("host"),
*params_.get<std::string>("user"),
*params_.get<std::string>("password"),
*params_.get<std::string>("host"),
*max_size,
*initial_size,
1,

4
plugins/input/occi/occi_datasource.hpp
View file

@ -47,7 +47,7 @@ class occi_datasource : public mapnik::datasource
mapnik::featureset_ptr features_at_point(mapnik::coord2d const& pt) const;
mapnik::Envelope<double> envelope() const;
mapnik::layer_descriptor get_descriptor() const;
void bind() bind;
void bind() const;
private:
const std::string uri_;
const std::string username_;
@ -55,7 +55,7 @@ class occi_datasource : public mapnik::datasource
const std::string table_;
const std::string geometry_field_;
std::string geometryColumn_;
int type_;
mutable int type_;
int srid_;
mutable bool extent_initialized_;
mutable mapnik::Envelope<double> extent_;