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

use ST_MakeEnvelope (ref #3317)

Browse source
This commit is contained in:
artemp 2016-02-26 13:50:34 +01:00
parent 776c599185
commit 442cc281e1
2 changed files with 10 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
plugins/input/pgraster/pgraster_datasource.cpp
View file

@ -621,22 +621,15 @@ layer_descriptor pgraster_datasource::get_descriptor() const
std::string pgraster_datasource::sql_bbox(box2d<double> const& env) const
{
std::ostringstream b;
if (srid_ > 0)
{
b << "ST_SetSRID(";
}
b << "'BOX3D(";
b << "ST_MakeEnvelope(";
b << std::setprecision(16);
b << env.minx() << " " << env.miny() << ",";
b << env.maxx() << " " << env.maxy() << ")'::box3d";
b << env.minx() << "," << env.miny() << ",";
b << env.maxx() << "," << env.maxy();
if (srid_ > 0)
{
b << ", " << srid_ << ")";
b << ", " << srid_;
}
b << ")";
return b.str();
}

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

@ -513,22 +513,15 @@ layer_descriptor postgis_datasource::get_descriptor() const
std::string postgis_datasource::sql_bbox(box2d<double> const& env) const
{
std::ostringstream b;
if (srid_ > 0)
{
b << "ST_SetSRID(";
}
b << "'BOX3D(";
b << "ST_MakeEnvelope(";
b << std::setprecision(16);
b << env.minx() << " " << env.miny() << ",";
b << env.maxx() << " " << env.maxy() << ")'::box3d";
b << env.minx() << "," << env.miny() << ",";
b << env.maxx() << "," << env.maxy();
if (srid_ > 0)
{
b << ", " << srid_ << ")";
b << ", " << srid_;
}
b << ")";
return b.str();
}