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

backport postgis 2.x fix to mapnik 2.0.x series branch - refs #956

Browse source
This commit is contained in:
Dane Springmeyer 2011-11-20 14:43:22 -08:00
parent 5c76218070
commit c4edd2bd59
2 changed files with 2 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -83,8 +83,6 @@ postgis_datasource::postgis_datasource(parameters const& params, bool bind)
persist_connection_(*params_.get<mapnik::boolean>("persist_connection",true)), persist_connection_(*params_.get<mapnik::boolean>("persist_connection",true)),
extent_from_subquery_(*params_.get<mapnik::boolean>("extent_from_subquery",false)), extent_from_subquery_(*params_.get<mapnik::boolean>("extent_from_subquery",false)),
// params below are for testing purposes only (will likely be removed at any time) // params below are for testing purposes only (will likely be removed at any time)
force2d_(*params_.get<mapnik::boolean>("force_2d",false)),
st_(*params_.get<mapnik::boolean>("st_prefix",false)),
intersect_min_scale_(*params_.get<int>("intersect_min_scale",0)), intersect_min_scale_(*params_.get<int>("intersect_min_scale",0)),
intersect_max_scale_(*params_.get<int>("intersect_max_scale",0)) intersect_max_scale_(*params_.get<int>("intersect_max_scale",0))
//show_queries_(*params_.get<mapnik::boolean>("show_queries",false)) //show_queries_(*params_.get<mapnik::boolean>("show_queries",false))
@ -495,13 +493,7 @@ featureset_ptr postgis_datasource::features(const query& q) const
} }
std::ostringstream s; std::ostringstream s;
s << "SELECT "; s << "SELECT ST_AsBinary(\"" << geometryColumn_ << "\") AS geom";
if (st_)
s << "ST_";
if (force2d_)
s << "AsBinary(ST_Force_2D(\"" << geometryColumn_ << "\")) AS geom";
else
s << "AsBinary(\"" << geometryColumn_ << "\") AS geom";
if (!key_field_.empty()) if (!key_field_.empty())
mapnik::quote_attr(s,key_field_); mapnik::quote_attr(s,key_field_);
@ -571,13 +563,7 @@ featureset_ptr postgis_datasource::features_at_point(coord2d const& pt) const
} }
s << "SELECT "; s << "SELECT AsBinary(\"" << geometryColumn_ << "\") AS geom";
if (st_)
s << "ST_";
if (force2d_)
s << "AsBinary(ST_Force_2D(\"" << geometryColumn_ << "\")) AS geom";
else
s << "AsBinary(\"" << geometryColumn_ << "\") AS geom";
if (!key_field_.empty()) if (!key_field_.empty())
mapnik::quote_attr(s,key_field_); mapnik::quote_attr(s,key_field_);

2
plugins/input/postgis/postgis_datasource.hpp
View file

@ -75,8 +75,6 @@ class postgis_datasource : public datasource
bool persist_connection_; bool persist_connection_;
bool extent_from_subquery_; bool extent_from_subquery_;
// params below are for testing purposes only (will likely be removed at any time) // params below are for testing purposes only (will likely be removed at any time)
bool force2d_;
bool st_;
int intersect_min_scale_; int intersect_min_scale_;
int intersect_max_scale_; int intersect_max_scale_;
//bool show_queries_; //bool show_queries_;