From 93f58b1ef31f0e4d8cf4371864e2b1995cb75ffd Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Wed, 5 Dec 2012 20:07:49 -0800 Subject: [PATCH] backport support for postgis literal type to 2.1.x - refs #1464 - closes #1626 --- CHANGELOG.md | 2 ++ plugins/input/postgis/postgis_datasource.cpp | 1 + plugins/input/postgis/postgis_featureset.cpp | 1 + 3 files changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e7c07d130..09a0f87fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,8 @@ For a complete change history, see the git log. - Add DebugSymbolizer (#1366) +- Added support for literal types in PostGIS Plugin (#1464) + ## Mapnik 2.1.0 diff --git a/plugins/input/postgis/postgis_datasource.cpp b/plugins/input/postgis/postgis_datasource.cpp index 3f95865cd..0adc4e8d0 100644 --- a/plugins/input/postgis/postgis_datasource.cpp +++ b/plugins/input/postgis/postgis_datasource.cpp @@ -391,6 +391,7 @@ void postgis_datasource::bind() const case 1042: // bpchar case 1043: // varchar case 25: // text + case 705: // literal desc_.add_descriptor(attribute_descriptor(fld_name, mapnik::String)); break; default: // should not get here diff --git a/plugins/input/postgis/postgis_featureset.cpp b/plugins/input/postgis/postgis_featureset.cpp index dd121a36d..746fd2cff 100644 --- a/plugins/input/postgis/postgis_featureset.cpp +++ b/plugins/input/postgis/postgis_featureset.cpp @@ -174,6 +174,7 @@ feature_ptr postgis_featureset::next() case 25: //text case 1043: //varchar + case 705: //literal { feature->put(name, tr_->transcode(buf)); break;