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

Merge pull request #3942 from lightmare/postgis-float-tokens

Browse source 
postgis: always put decimal point in substituted tokens in SQL
This commit is contained in:
lightmare 2019-08-11 11:57:44 +02:00 committed by GitHub
commit 8a44f7ffbb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -49,7 +49,6 @@
#include <algorithm>
#include <set>
#include <sstream>
#include <iomanip>
DATASOURCE_PLUGIN(pgraster_datasource)
@ -598,6 +597,7 @@ layer_descriptor pgraster_datasource::get_descriptor() const
std::string pgraster_datasource::sql_bbox(box2d<double> const& env) const
{
std::ostringstream b;
b.precision(16);
if (srid_ > 0)
{
@ -605,7 +605,6 @@ std::string pgraster_datasource::sql_bbox(box2d<double> const& env) const
}
b << "'BOX(";
b << std::setprecision(16);
b << env.minx() << " " << env.miny() << ",";
b << env.maxx() << " " << env.maxy() << ")'::box2d";
@ -637,6 +636,9 @@ std::string pgraster_datasource::populate_tokens(std::string const& sql,
char const* start = sql.data();
char const* end = start + sql.size();
populated_sql.precision(16);
populated_sql << std::showpoint;
while (std::regex_search(start, end, m, re_tokens_))
{
populated_sql.write(start, m[0].first - start);

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

@ -47,7 +47,6 @@
#include <algorithm>
#include <set>
#include <sstream>
#include <iomanip>
DATASOURCE_PLUGIN(postgis_datasource)
@ -508,6 +507,7 @@ layer_descriptor postgis_datasource::get_descriptor() const
std::string postgis_datasource::sql_bbox(box2d<double> const& env) const
{
std::ostringstream b;
b.precision(16);
if (srid_ > 0)
{
@ -515,7 +515,6 @@ std::string postgis_datasource::sql_bbox(box2d<double> const& env) const
}
b << "'BOX3D(";
b << std::setprecision(16);
b << env.minx() << " " << env.miny() << ",";
b << env.maxx() << " " << env.maxy() << ")'::box3d";
@ -548,6 +547,9 @@ std::string postgis_datasource::populate_tokens(
char const* start = sql.data();
char const* end = start + sql.size();
populated_sql.precision(16);
populated_sql << std::showpoint;
while (std::regex_search(start, end, m, re_tokens_))
{
populated_sql.write(start, m[0].first - start);

20
test/unit/datasource/postgis.cpp
View file

@ -290,6 +290,26 @@ TEST_CASE("postgis") {
REQUIRE(ext.maxy() == 4);
}
SECTION("Postgis substitutes numeric !tokens! always with decimal point")
{
mapnik::parameters params(base_params);
params["table"] = "(SELECT geom,"
" pg_typeof(!pixel_width!)::text as t_pixel_width,"
" pg_typeof(!pixel_height!)::text as t_pixel_height,"
" pg_typeof(!scale_denominator!)::text as t_scale_denom"
" FROM public.test LIMIT 1) as data";
auto ds = mapnik::datasource_cache::instance().create(params);
REQUIRE(ds != nullptr);
auto featureset = all_features(ds);
auto feature = featureset->next();
CHECKED_IF(feature != nullptr)
{
CHECK(feature->get("t_pixel_width").to_string() == "numeric");
CHECK(feature->get("t_pixel_height").to_string() == "numeric");
CHECK(feature->get("t_scale_denom").to_string() == "numeric");
}
}
SECTION("Postgis doesn't interpret @domain in email address as @variable")
{
mapnik::parameters params(base_params);