-
Notifications
You must be signed in to change notification settings - Fork 2
/
mapnik.twkb.patch
117 lines (114 loc) · 5.48 KB
/
mapnik.twkb.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
diff --git a/plugins/input/sqlite/sqlite_datasource.cpp b/plugins/input/sqlite/sqlite_datasource.cpp
index e76ef41..e1002cf 100644
--- a/plugins/input/sqlite/sqlite_datasource.cpp
+++ b/plugins/input/sqlite/sqlite_datasource.cpp
@@ -68,7 +68,8 @@ sqlite_datasource::sqlite_datasource(parameters const& params)
row_limit_(*params.get<mapnik::value_integer>("row_limit", 0)),
intersects_token_("!intersects!"),
desc_(sqlite_datasource::name(), *params.get<std::string>("encoding", "utf-8")),
- format_(mapnik::wkbAuto)
+ format_(mapnik::wkbAuto),
+ twkb_encoding_(false)
{
/* TODO
- throw if no primary key but spatial index is present?
@@ -113,6 +114,11 @@ sqlite_datasource::sqlite_datasource(parameters const& params)
{
format_ = mapnik::wkbGeneric;
}
+ else if (*wkb == "twkb")
+ {
+ format_ = mapnik::wkbGeneric;
+ twkb_encoding_ = true;
+ }
else
{
format_ = mapnik::wkbAuto;
@@ -448,7 +454,10 @@ boost::optional<mapnik::datasource_geometry_t> sqlite_datasource::get_geometry_t
if (data)
{
- mapnik::geometry::geometry<double> geom = mapnik::geometry_utils::from_wkb(data, size, format_);
+ mapnik::geometry::geometry<double> geom;
+
+ if (twkb_encoding_) geom = mapnik::geometry_utils::from_twkb(data, size);
+ else geom = mapnik::geometry_utils::from_wkb(data, size, format_);
if (mapnik::geometry::is_empty(geom))
{
continue;
@@ -547,6 +556,7 @@ featureset_ptr sqlite_datasource::features(query const& q) const
desc_.get_encoding(),
e,
format_,
+ twkb_encoding_,
has_spatial_index_,
using_subquery_);
}
@@ -627,6 +637,7 @@ featureset_ptr sqlite_datasource::features_at_point(coord2d const& pt, double to
desc_.get_encoding(),
e,
format_,
+ twkb_encoding_,
has_spatial_index_,
using_subquery_);
}
diff --git a/plugins/input/sqlite/sqlite_datasource.hpp b/plugins/input/sqlite/sqlite_datasource.hpp
index e73e0c3..8128b09 100644
--- a/plugins/input/sqlite/sqlite_datasource.hpp
+++ b/plugins/input/sqlite/sqlite_datasource.hpp
@@ -82,6 +82,7 @@ class sqlite_datasource : public mapnik::datasource
const std::string intersects_token_;
mapnik::layer_descriptor desc_;
mapnik::wkbFormat format_;
+ bool twkb_encoding_;
bool use_spatial_index_;
bool has_spatial_index_;
bool using_subquery_;
diff --git a/plugins/input/sqlite/sqlite_featureset.cpp b/plugins/input/sqlite/sqlite_featureset.cpp
index 9226f40..4f3ba50 100644
--- a/plugins/input/sqlite/sqlite_featureset.cpp
+++ b/plugins/input/sqlite/sqlite_featureset.cpp
@@ -49,6 +49,7 @@ sqlite_featureset::sqlite_featureset(std::shared_ptr<sqlite_resultset> rs,
std::string const& encoding,
mapnik::box2d<double> const& bbox,
mapnik::wkbFormat format,
+ bool twkb_encoding,
bool spatial_index,
bool using_subquery)
: rs_(rs),
@@ -56,6 +57,7 @@ sqlite_featureset::sqlite_featureset(std::shared_ptr<sqlite_resultset> rs,
tr_(new transcoder(encoding)),
bbox_(bbox),
format_(format),
+ twkb_encoding_(twkb_encoding),
spatial_index_(spatial_index),
using_subquery_(using_subquery)
{}
@@ -81,7 +83,9 @@ feature_ptr sqlite_featureset::next()
}
feature_ptr feature = feature_factory::create(ctx_,rs_->column_integer64(1));
- mapnik::geometry::geometry<double> geom = geometry_utils::from_wkb(data, size, format_);
+ mapnik::geometry::geometry<double> geom;
+ if (twkb_encoding_) geom = geometry_utils::from_twkb(data, size);
+ else geom = geometry_utils::from_wkb(data, size, format_);
if (mapnik::geometry::is_empty(geom))
{
continue;
diff --git a/plugins/input/sqlite/sqlite_featureset.hpp b/plugins/input/sqlite/sqlite_featureset.hpp
index 9e2f1c2..23f9480 100644
--- a/plugins/input/sqlite/sqlite_featureset.hpp
+++ b/plugins/input/sqlite/sqlite_featureset.hpp
@@ -44,6 +44,7 @@ class sqlite_featureset : public mapnik::Featureset
std::string const& encoding,
mapnik::box2d<double> const& bbox,
mapnik::wkbFormat format,
+ bool twkb_encoding,
bool spatial_index,
bool using_subquery);
virtual ~sqlite_featureset();
@@ -55,6 +56,7 @@ class sqlite_featureset : public mapnik::Featureset
const std::unique_ptr<mapnik::transcoder> tr_;
mapnik::box2d<double> bbox_;
mapnik::wkbFormat format_;
+ bool twkb_encoding_;
bool spatial_index_;
bool using_subquery_;