2013-09-30 15:14:58 +02:00
|
|
|
/*****************************************************************************
|
|
|
|
*
|
|
|
|
* This file is part of Mapnik (c++ mapping toolkit)
|
|
|
|
*
|
2015-06-16 12:49:16 +02:00
|
|
|
* Copyright (C) 2015 Artem Pavlenko
|
2013-09-30 15:14:58 +02:00
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* Lesser General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
|
|
* License along with this library; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
|
|
*
|
|
|
|
*****************************************************************************/
|
|
|
|
|
|
|
|
// mapnik
|
|
|
|
#include <mapnik/feature.hpp>
|
2013-10-02 16:14:27 +02:00
|
|
|
#include <mapnik/feature_factory.hpp>
|
2013-10-11 13:34:15 +02:00
|
|
|
#include <mapnik/json/topology.hpp>
|
2014-08-08 13:13:49 +02:00
|
|
|
#include <mapnik/util/variant.hpp>
|
2015-03-04 14:54:11 +01:00
|
|
|
#include <mapnik/geometry_adapters.hpp>
|
2015-05-20 23:09:52 +02:00
|
|
|
#include <mapnik/geometry_correct.hpp>
|
|
|
|
|
2013-09-30 15:14:58 +02:00
|
|
|
// stl
|
|
|
|
#include <string>
|
|
|
|
#include <vector>
|
|
|
|
#include <fstream>
|
2014-10-22 01:37:27 +02:00
|
|
|
|
2013-10-02 16:14:27 +02:00
|
|
|
// boost
|
2014-10-22 01:37:27 +02:00
|
|
|
#pragma GCC diagnostic push
|
|
|
|
#pragma GCC diagnostic ignored "-Wunused-parameter"
|
|
|
|
#pragma GCC diagnostic ignored "-Wunused-variable"
|
|
|
|
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
|
2013-10-02 16:14:27 +02:00
|
|
|
#include <boost/range/adaptor/reversed.hpp>
|
2014-10-22 01:37:27 +02:00
|
|
|
#pragma GCC diagnostic pop
|
2013-10-11 13:34:15 +02:00
|
|
|
|
2013-09-30 15:14:58 +02:00
|
|
|
#include "topojson_featureset.hpp"
|
|
|
|
|
2013-10-02 16:14:27 +02:00
|
|
|
namespace mapnik { namespace topojson {
|
|
|
|
|
2013-10-03 18:12:33 +02:00
|
|
|
struct attribute_value_visitor
|
2015-01-07 11:35:21 +01:00
|
|
|
|
2013-10-03 18:12:33 +02:00
|
|
|
{
|
|
|
|
public:
|
|
|
|
attribute_value_visitor(mapnik::transcoder const& tr)
|
|
|
|
: tr_(tr) {}
|
|
|
|
|
|
|
|
mapnik::value operator()(std::string const& val) const
|
|
|
|
{
|
|
|
|
return mapnik::value(tr_.transcode(val.c_str()));
|
|
|
|
}
|
|
|
|
|
|
|
|
template <typename T>
|
|
|
|
mapnik::value operator()(T const& val) const
|
|
|
|
{
|
|
|
|
return mapnik::value(val);
|
|
|
|
}
|
|
|
|
|
|
|
|
mapnik::transcoder const& tr_;
|
|
|
|
};
|
|
|
|
|
|
|
|
template <typename T>
|
|
|
|
void assign_properties(mapnik::feature_impl & feature, T const& geom, mapnik::transcoder const& tr)
|
|
|
|
{
|
|
|
|
if ( geom.props)
|
|
|
|
{
|
|
|
|
for (auto const& p : *geom.props)
|
|
|
|
{
|
2014-08-08 13:13:49 +02:00
|
|
|
feature.put_new(std::get<0>(p), mapnik::util::apply_visitor(attribute_value_visitor(tr),std::get<1>(p)));
|
2013-10-03 18:12:33 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-10-02 16:14:27 +02:00
|
|
|
template <typename Context>
|
2015-01-07 11:35:21 +01:00
|
|
|
struct feature_generator
|
2013-10-02 16:14:27 +02:00
|
|
|
{
|
2013-10-03 18:12:33 +02:00
|
|
|
feature_generator(Context & ctx, mapnik::transcoder const& tr, topology const& topo, std::size_t feature_id)
|
2013-10-02 16:14:27 +02:00
|
|
|
: ctx_(ctx),
|
2013-10-03 18:12:33 +02:00
|
|
|
tr_(tr),
|
2013-10-02 16:14:27 +02:00
|
|
|
topo_(topo),
|
2015-05-09 16:04:03 +02:00
|
|
|
num_arcs_(topo.arcs.size()),
|
2013-10-02 16:14:27 +02:00
|
|
|
feature_id_(feature_id) {}
|
|
|
|
|
|
|
|
feature_ptr operator() (point const& pt) const
|
|
|
|
{
|
2013-10-03 18:12:33 +02:00
|
|
|
mapnik::feature_ptr feature(mapnik::feature_factory::create(ctx_,feature_id_));
|
|
|
|
double x = pt.coord.x;
|
|
|
|
double y = pt.coord.y;
|
|
|
|
if (topo_.tr)
|
|
|
|
{
|
|
|
|
x = x * (*topo_.tr).scale_x + (*topo_.tr).translate_x;
|
|
|
|
y = y * (*topo_.tr).scale_y + (*topo_.tr).translate_y;
|
|
|
|
}
|
2015-04-09 22:22:51 +02:00
|
|
|
mapnik::geometry::point<double> point(x, y);
|
2015-02-24 15:59:26 +01:00
|
|
|
feature->set_geometry(std::move(point));
|
2013-10-03 18:12:33 +02:00
|
|
|
assign_properties(*feature, pt, tr_);
|
|
|
|
return feature;
|
2013-10-02 16:14:27 +02:00
|
|
|
}
|
|
|
|
|
2013-10-04 16:40:06 +02:00
|
|
|
feature_ptr operator() (multi_point const& multi_pt) const
|
|
|
|
{
|
|
|
|
mapnik::feature_ptr feature(mapnik::feature_factory::create(ctx_,feature_id_));
|
2015-04-09 22:22:51 +02:00
|
|
|
mapnik::geometry::multi_point<double> multi_point;
|
2015-02-24 15:59:26 +01:00
|
|
|
multi_point.reserve(multi_pt.points.size());
|
2013-10-04 16:40:06 +02:00
|
|
|
for (auto const& pt : multi_pt.points)
|
|
|
|
{
|
|
|
|
double x = pt.x;
|
|
|
|
double y = pt.y;
|
|
|
|
if (topo_.tr)
|
|
|
|
{
|
|
|
|
x = x * (*topo_.tr).scale_x + (*topo_.tr).translate_x;
|
|
|
|
y = y * (*topo_.tr).scale_y + (*topo_.tr).translate_y;
|
|
|
|
}
|
2015-02-24 15:59:26 +01:00
|
|
|
multi_point.add_coord(x, y);
|
2013-10-04 16:40:06 +02:00
|
|
|
}
|
2015-02-24 15:59:26 +01:00
|
|
|
feature->set_geometry(std::move(multi_point));
|
2013-10-04 16:40:06 +02:00
|
|
|
assign_properties(*feature, multi_pt, tr_);
|
|
|
|
return feature;
|
|
|
|
}
|
|
|
|
|
2013-10-02 16:14:27 +02:00
|
|
|
feature_ptr operator() (linestring const& line) const
|
|
|
|
{
|
2013-10-03 18:12:33 +02:00
|
|
|
mapnik::feature_ptr feature(mapnik::feature_factory::create(ctx_,feature_id_));
|
2015-05-09 16:04:03 +02:00
|
|
|
if (num_arcs_ > 0)
|
2013-10-03 18:12:33 +02:00
|
|
|
{
|
2015-05-09 16:04:03 +02:00
|
|
|
index_type index = line.ring;
|
|
|
|
index_type arc_index = index < 0 ? std::abs(index) - 1 : index;
|
2015-06-16 04:36:36 +02:00
|
|
|
if (arc_index >= 0 && arc_index < static_cast<int>(num_arcs_))
|
2015-06-16 12:49:16 +02:00
|
|
|
{
|
2015-05-09 16:04:03 +02:00
|
|
|
auto const& arcs = topo_.arcs[arc_index];
|
|
|
|
double px = 0, py = 0;
|
|
|
|
mapnik::geometry::line_string<double> line_string;
|
|
|
|
line_string.reserve(arcs.coordinates.size());
|
|
|
|
|
|
|
|
for (auto pt : arcs.coordinates)
|
|
|
|
{
|
|
|
|
double x = pt.x;
|
|
|
|
double y = pt.y;
|
|
|
|
if (topo_.tr)
|
|
|
|
{
|
|
|
|
x = (px += x) * (*topo_.tr).scale_x + (*topo_.tr).translate_x;
|
|
|
|
y = (py += y) * (*topo_.tr).scale_y + (*topo_.tr).translate_y;
|
|
|
|
}
|
|
|
|
line_string.add_coord(x,y);
|
|
|
|
}
|
|
|
|
feature->set_geometry(std::move(line_string));
|
|
|
|
assign_properties(*feature, line, tr_);
|
2013-10-03 18:12:33 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return feature;
|
2013-10-02 16:14:27 +02:00
|
|
|
}
|
|
|
|
|
2013-10-04 16:40:06 +02:00
|
|
|
feature_ptr operator() (multi_linestring const& multi_line) const
|
|
|
|
{
|
|
|
|
mapnik::feature_ptr feature(mapnik::feature_factory::create(ctx_,feature_id_));
|
2015-05-09 16:04:03 +02:00
|
|
|
if (num_arcs_ > 0)
|
2013-10-04 16:40:06 +02:00
|
|
|
{
|
2015-05-09 16:04:03 +02:00
|
|
|
mapnik::geometry::multi_line_string<double> multi_line_string;
|
|
|
|
bool hit = false;
|
|
|
|
multi_line_string.reserve(multi_line.rings.size());
|
|
|
|
for (auto const& index : multi_line.rings)
|
2013-10-04 16:40:06 +02:00
|
|
|
{
|
2015-05-09 16:04:03 +02:00
|
|
|
index_type arc_index = index < 0 ? std::abs(index) - 1 : index;
|
2015-06-16 04:36:36 +02:00
|
|
|
if (arc_index >= 0 && arc_index < static_cast<int>(num_arcs_))
|
2013-10-04 16:40:06 +02:00
|
|
|
{
|
2015-05-09 16:04:03 +02:00
|
|
|
hit = true;
|
|
|
|
double px = 0, py = 0;
|
|
|
|
mapnik::geometry::line_string<double> line_string;
|
|
|
|
auto const& arcs = topo_.arcs[arc_index];
|
|
|
|
line_string.reserve(arcs.coordinates.size());
|
|
|
|
for (auto pt : arcs.coordinates)
|
|
|
|
{
|
|
|
|
double x = pt.x;
|
|
|
|
double y = pt.y;
|
|
|
|
if (topo_.tr)
|
|
|
|
{
|
|
|
|
x = (px += x) * (*topo_.tr).scale_x + (*topo_.tr).translate_x;
|
|
|
|
y = (py += y) * (*topo_.tr).scale_y + (*topo_.tr).translate_y;
|
|
|
|
}
|
|
|
|
line_string.add_coord(x, y);
|
|
|
|
}
|
|
|
|
multi_line_string.push_back(std::move(line_string));
|
2013-10-04 16:40:06 +02:00
|
|
|
}
|
|
|
|
}
|
2015-05-09 16:04:03 +02:00
|
|
|
if (hit)
|
|
|
|
{
|
|
|
|
feature->set_geometry(std::move(multi_line_string));
|
2015-06-16 12:49:16 +02:00
|
|
|
assign_properties(*feature, multi_line, tr_);
|
2015-05-09 16:04:03 +02:00
|
|
|
}
|
2013-10-04 16:40:06 +02:00
|
|
|
}
|
|
|
|
return feature;
|
|
|
|
}
|
|
|
|
|
2013-10-02 16:14:27 +02:00
|
|
|
feature_ptr operator() (polygon const& poly) const
|
|
|
|
{
|
|
|
|
mapnik::feature_ptr feature(mapnik::feature_factory::create(ctx_,feature_id_));
|
2015-05-09 16:04:03 +02:00
|
|
|
if (num_arcs_ > 0)
|
2013-10-02 16:14:27 +02:00
|
|
|
{
|
2015-05-09 16:04:03 +02:00
|
|
|
std::vector<mapnik::topojson::coordinate> processed_coords;
|
|
|
|
mapnik::geometry::polygon<double> polygon;
|
|
|
|
if (poly.rings.size() > 1) polygon.interior_rings.reserve(poly.rings.size() - 1);
|
|
|
|
bool first = true;
|
|
|
|
bool hit = false;
|
|
|
|
for (auto const& ring : poly.rings)
|
2013-10-02 16:14:27 +02:00
|
|
|
{
|
2015-05-09 16:04:03 +02:00
|
|
|
mapnik::geometry::linear_ring<double> linear_ring;
|
|
|
|
for (auto const& index : ring)
|
2013-10-02 16:14:27 +02:00
|
|
|
{
|
2015-05-09 16:04:03 +02:00
|
|
|
double px = 0, py = 0;
|
|
|
|
bool reverse = index < 0;
|
|
|
|
index_type arc_index = reverse ? std::abs(index) - 1 : index;
|
2015-06-16 04:36:36 +02:00
|
|
|
if (arc_index >= 0 && arc_index < static_cast<int>(num_arcs_))
|
2013-10-02 16:14:27 +02:00
|
|
|
{
|
2015-05-09 16:04:03 +02:00
|
|
|
hit = true;
|
|
|
|
auto const& arcs = topo_.arcs[arc_index];
|
|
|
|
auto const& coords = arcs.coordinates;
|
|
|
|
processed_coords.clear();
|
|
|
|
processed_coords.reserve(coords.size());
|
|
|
|
for (auto const& pt : coords )
|
|
|
|
{
|
|
|
|
double x = pt.x;
|
|
|
|
double y = pt.y;
|
|
|
|
|
|
|
|
if (topo_.tr)
|
|
|
|
{
|
|
|
|
transform const& tr = *topo_.tr;
|
|
|
|
x = (px += x) * tr.scale_x + tr.translate_x;
|
|
|
|
y = (py += y) * tr.scale_y + tr.translate_y;
|
|
|
|
}
|
|
|
|
processed_coords.emplace_back(coordinate{x,y});
|
|
|
|
}
|
|
|
|
|
|
|
|
if (reverse)
|
|
|
|
{
|
|
|
|
for (auto const& c : processed_coords | boost::adaptors::reversed)
|
|
|
|
{
|
|
|
|
linear_ring.emplace_back(c.x, c.y);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
for (auto const& c : processed_coords)
|
|
|
|
{
|
|
|
|
linear_ring.emplace_back(c.x, c.y);
|
|
|
|
}
|
|
|
|
}
|
2013-10-02 16:14:27 +02:00
|
|
|
}
|
|
|
|
}
|
2015-05-09 16:04:03 +02:00
|
|
|
if (first)
|
2013-10-07 11:52:19 +02:00
|
|
|
{
|
2015-05-09 16:04:03 +02:00
|
|
|
first = false;
|
|
|
|
polygon.set_exterior_ring(std::move(linear_ring));
|
2013-10-07 11:52:19 +02:00
|
|
|
}
|
|
|
|
else
|
2013-10-02 16:14:27 +02:00
|
|
|
{
|
2015-05-09 16:04:03 +02:00
|
|
|
polygon.add_hole(std::move(linear_ring));
|
2013-10-02 16:14:27 +02:00
|
|
|
}
|
|
|
|
}
|
2015-05-09 16:04:03 +02:00
|
|
|
if (hit)
|
2015-02-24 15:59:26 +01:00
|
|
|
{
|
2015-05-20 23:09:52 +02:00
|
|
|
mapnik::geometry::correct(polygon);
|
2015-05-09 16:04:03 +02:00
|
|
|
feature->set_geometry(std::move(polygon));
|
2015-06-16 12:49:16 +02:00
|
|
|
assign_properties(*feature, poly, tr_);
|
2015-02-24 15:59:26 +01:00
|
|
|
}
|
2013-10-02 16:14:27 +02:00
|
|
|
}
|
|
|
|
return feature;
|
|
|
|
}
|
|
|
|
|
2013-10-04 16:40:06 +02:00
|
|
|
feature_ptr operator() (multi_polygon const& multi_poly) const
|
|
|
|
{
|
|
|
|
mapnik::feature_ptr feature(mapnik::feature_factory::create(ctx_,feature_id_));
|
2015-05-09 16:04:03 +02:00
|
|
|
if (num_arcs_ > 0)
|
2013-10-04 16:40:06 +02:00
|
|
|
{
|
2015-05-09 16:04:03 +02:00
|
|
|
std::vector<mapnik::topojson::coordinate> processed_coords;
|
|
|
|
mapnik::geometry::multi_polygon<double> multi_polygon;
|
|
|
|
multi_polygon.reserve(multi_poly.polygons.size());
|
|
|
|
bool hit = false;
|
|
|
|
for (auto const& poly : multi_poly.polygons)
|
2013-10-04 16:40:06 +02:00
|
|
|
{
|
2015-05-09 16:04:03 +02:00
|
|
|
bool first = true;
|
|
|
|
mapnik::geometry::polygon<double> polygon;
|
|
|
|
if (poly.size() > 1) polygon.interior_rings.reserve(poly.size() - 1);
|
|
|
|
|
|
|
|
for (auto const& ring : poly)
|
2013-10-04 16:40:06 +02:00
|
|
|
{
|
2015-05-09 16:04:03 +02:00
|
|
|
mapnik::geometry::linear_ring<double> linear_ring;
|
|
|
|
for (auto const& index : ring)
|
2013-10-04 16:40:06 +02:00
|
|
|
{
|
2015-05-09 16:04:03 +02:00
|
|
|
double px = 0, py = 0;
|
|
|
|
bool reverse = index < 0;
|
|
|
|
index_type arc_index = reverse ? std::abs(index) - 1 : index;
|
2015-06-16 04:36:36 +02:00
|
|
|
if (arc_index >= 0 && arc_index < static_cast<int>(num_arcs_))
|
2013-10-04 16:40:06 +02:00
|
|
|
{
|
2015-05-09 16:04:03 +02:00
|
|
|
hit = true;
|
|
|
|
auto const& arcs = topo_.arcs[arc_index];
|
|
|
|
auto const& coords = arcs.coordinates;
|
|
|
|
processed_coords.clear();
|
|
|
|
processed_coords.reserve(coords.size());
|
|
|
|
for (auto const& pt : coords )
|
|
|
|
{
|
|
|
|
double x = pt.x;
|
|
|
|
double y = pt.y;
|
|
|
|
|
|
|
|
if (topo_.tr)
|
|
|
|
{
|
|
|
|
x = (px += x) * (*topo_.tr).scale_x + (*topo_.tr).translate_x;
|
|
|
|
y = (py += y) * (*topo_.tr).scale_y + (*topo_.tr).translate_y;
|
|
|
|
}
|
|
|
|
processed_coords.emplace_back(coordinate{x,y});
|
|
|
|
}
|
|
|
|
|
|
|
|
using namespace boost::adaptors;
|
|
|
|
|
|
|
|
if (reverse)
|
|
|
|
{
|
|
|
|
for (auto const& c : (processed_coords | reversed))
|
|
|
|
{
|
|
|
|
linear_ring.add_coord(c.x, c.y);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
for (auto const& c : processed_coords)
|
|
|
|
{
|
|
|
|
linear_ring.add_coord(c.x, c.y);
|
|
|
|
}
|
|
|
|
}
|
2013-10-04 16:40:06 +02:00
|
|
|
}
|
|
|
|
}
|
2015-05-09 16:04:03 +02:00
|
|
|
if (first)
|
2013-10-04 16:40:06 +02:00
|
|
|
{
|
2015-05-09 16:04:03 +02:00
|
|
|
first = false;
|
|
|
|
polygon.set_exterior_ring(std::move(linear_ring));
|
2013-10-07 11:52:19 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2015-05-09 16:04:03 +02:00
|
|
|
polygon.add_hole(std::move(linear_ring));
|
2013-10-04 16:40:06 +02:00
|
|
|
}
|
|
|
|
}
|
2015-05-09 16:04:03 +02:00
|
|
|
multi_polygon.push_back(std::move(polygon));
|
|
|
|
}
|
|
|
|
if (hit)
|
|
|
|
{
|
2015-05-20 23:09:52 +02:00
|
|
|
mapnik::geometry::correct(multi_polygon);
|
2015-05-09 16:04:03 +02:00
|
|
|
feature->set_geometry(std::move(multi_polygon));
|
2015-06-16 12:49:16 +02:00
|
|
|
assign_properties(*feature, multi_poly, tr_);
|
2013-10-04 16:40:06 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return feature;
|
|
|
|
}
|
|
|
|
|
2013-10-02 16:14:27 +02:00
|
|
|
template<typename T>
|
|
|
|
feature_ptr operator() (T const& ) const
|
|
|
|
{
|
|
|
|
return feature_ptr();
|
|
|
|
}
|
|
|
|
|
|
|
|
Context & ctx_;
|
2013-10-03 18:12:33 +02:00
|
|
|
mapnik::transcoder const& tr_;
|
2013-10-02 16:14:27 +02:00
|
|
|
topology const& topo_;
|
2015-05-09 16:04:03 +02:00
|
|
|
std::size_t num_arcs_;
|
2013-10-02 16:14:27 +02:00
|
|
|
std::size_t feature_id_;
|
|
|
|
};
|
|
|
|
|
|
|
|
}}
|
|
|
|
|
2013-09-30 15:14:58 +02:00
|
|
|
topojson_featureset::topojson_featureset(mapnik::topojson::topology const& topo,
|
2013-10-03 18:12:33 +02:00
|
|
|
mapnik::transcoder const& tr,
|
2014-08-19 23:48:21 +02:00
|
|
|
array_type && index_array)
|
2013-10-02 16:14:27 +02:00
|
|
|
: ctx_(std::make_shared<mapnik::context_type>()),
|
|
|
|
topo_(topo),
|
2013-10-03 18:12:33 +02:00
|
|
|
tr_(tr),
|
2013-10-23 16:01:29 +02:00
|
|
|
index_array_(std::move(index_array)),
|
|
|
|
index_itr_(index_array_.begin()),
|
|
|
|
index_end_(index_array_.end()),
|
2015-05-09 15:07:16 +02:00
|
|
|
feature_id_(1) {}
|
2013-09-30 15:14:58 +02:00
|
|
|
|
|
|
|
topojson_featureset::~topojson_featureset() {}
|
|
|
|
|
|
|
|
mapnik::feature_ptr topojson_featureset::next()
|
|
|
|
{
|
|
|
|
if (index_itr_ != index_end_)
|
|
|
|
{
|
2014-08-19 23:48:21 +02:00
|
|
|
topojson_datasource::item_type const& item = *index_itr_++;
|
|
|
|
std::size_t index = item.second;
|
2013-09-30 15:14:58 +02:00
|
|
|
if ( index < topo_.geometries.size())
|
|
|
|
{
|
2013-10-01 20:17:07 +02:00
|
|
|
mapnik::topojson::geometry const& geom = topo_.geometries[index];
|
2014-08-12 17:16:17 +02:00
|
|
|
mapnik::feature_ptr feature = mapnik::util::apply_visitor(
|
2013-10-03 18:12:33 +02:00
|
|
|
mapnik::topojson::feature_generator<mapnik::context_ptr>(ctx_, tr_, topo_, feature_id_++),
|
2013-10-02 16:14:27 +02:00
|
|
|
geom);
|
|
|
|
return feature;
|
2013-09-30 15:14:58 +02:00
|
|
|
}
|
|
|
|
}
|
2013-10-02 16:14:27 +02:00
|
|
|
|
2013-09-30 15:14:58 +02:00
|
|
|
return mapnik::feature_ptr();
|
|
|
|
}
|