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

Start calling geometry::correct everywhere possible - refs #2834

Browse source
This commit is contained in:
Dane Springmeyer 2015-05-20 14:00:30 -07:00
parent 0f8b379eea
commit 84e4d8bf22
6 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/mapnik/json/geometry_util.hpp
View file

@ -24,6 +24,7 @@
#define MAPNIK_JSON_GEOMETRY_UTIL_HPP
#include <mapnik/geometry.hpp>
#include <mapnik/geometry_correct.hpp>
namespace mapnik { namespace json {
@ -100,6 +101,7 @@ struct create_polygon
else poly.add_hole(std::move(ring));
}
geom_ = std::move(poly);
mapnik::geometry::correct(geom_);
}
template <typename T>
@ -194,6 +196,7 @@ struct create_multipolygon
multi_poly.emplace_back(std::move(poly));
}
geom_ = std::move(multi_poly);
mapnik::geometry::correct(geom_);
}
template <typename T>

3
plugins/input/csv/csv_datasource.cpp
View file

@ -34,6 +34,7 @@
#include <mapnik/feature_layer_desc.hpp>
#include <mapnik/feature_factory.hpp>
#include <mapnik/geometry.hpp>
#include <mapnik/geometry_correct.hpp>
#include <mapnik/memory_featureset.hpp>
#include <mapnik/wkt/wkt_factory.hpp>
#include <mapnik/json/geometry_parser.hpp>
@ -543,6 +544,8 @@ void csv_datasource::parse_csv(T & stream,
mapnik::geometry::geometry<double> geom;
if (mapnik::from_wkt(value, geom))
{
// correct orientations etc
mapnik::geometry::correct(geom);
// set geometry
feature->set_geometry(std::move(geom));
parsed_wkt = true;

5
plugins/input/ogr/ogr_featureset.cpp
View file

@ -31,6 +31,7 @@
#include <mapnik/unicode.hpp>
#include <mapnik/value_types.hpp>
#include <mapnik/feature_factory.hpp>
#include <mapnik/geometry_correct.hpp>
// ogr
#include "ogr_featureset.hpp"
@ -100,7 +101,9 @@ feature_ptr ogr_featureset::next()
OGRGeometry* geom = poFeature->GetGeometryRef();
if (geom && ! geom->IsEmpty())
{
feature->set_geometry(std::move(ogr_converter::convert_geometry(geom)));
auto geom_corrected = ogr_converter::convert_geometry(geom);
mapnik::geometry::correct(geom_corrected);
feature->set_geometry(std::move(geom_corrected));
}
else
{

5
plugins/input/ogr/ogr_index_featureset.cpp
View file

@ -30,6 +30,7 @@
#include <mapnik/wkb.hpp>
#include <mapnik/unicode.hpp>
#include <mapnik/feature_factory.hpp>
#include <mapnik/geometry_correct.hpp>
// boost
#ifdef SHAPE_MEMORY_MAPPED_FILE
@ -121,7 +122,9 @@ feature_ptr ogr_index_featureset<filterT>::next()
geom->getEnvelope(&feature_envelope_);
if (!filter_.pass(mapnik::box2d<double>(feature_envelope_.MinX,feature_envelope_.MinY,
feature_envelope_.MaxX,feature_envelope_.MaxY))) continue;
feature->set_geometry(std::move(ogr_converter::convert_geometry(geom)));
auto geom_corrected = ogr_converter::convert_geometry(geom);
mapnik::geometry::correct(geom_corrected);
feature->set_geometry(std::move(geom_corrected));
}
else
{

2
plugins/input/shape/shape_io.cpp
View file

@ -27,6 +27,7 @@
#include <mapnik/make_unique.hpp>
#include <mapnik/datasource.hpp>
#include <mapnik/util/is_clockwise.hpp>
#include <mapnik/geometry_correct.hpp>
using mapnik::datasource_exception;
const std::string shape_io::SHP = ".shp";
@ -195,5 +196,6 @@ mapnik::geometry::geometry<double> shape_io::read_polygon(shape_file::record_typ
} else {
geom = std::move(poly);
}
mapnik::geometry::correct(geom);
return geom;
}

3
src/wkb.cpp
View file

@ -27,6 +27,7 @@
#include <mapnik/wkb.hpp>
#include <mapnik/feature.hpp>
#include <mapnik/util/noncopyable.hpp>
#include <mapnik/geometry_correct.hpp>
namespace mapnik
{
@ -409,6 +410,8 @@ mapnik::geometry::geometry<double> geometry_utils::from_wkb(const char* wkb,
{
wkb_reader reader(wkb, size, format);
mapnik::geometry::geometry<double> geom(reader.read());
// note: this will only be applied to polygons
mapnik::geometry::correct(geom);
return geom;
}