archive-gh-me/mapnik
1
0
Fork 0
mirror of https://github.com/mapnik/mapnik.git synced 2025-12-08 20:13:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2739 from mapnik/mapnik-geometry

Browse Source 
New geometry storage and API
This commit is contained in:
Dane Springmeyer 2015-04-22 15:35:07 +02:00
commit 2c35a0f8a1
5 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/mapnik/json/geometry_util.hpp
View File

@ -25,8 +25,6 @@
#include <mapnik/geometry.hpp>
#include <mapnik/geometry_adapters.hpp>
// boost.geometry
#include <boost/geometry/algorithms/correct.hpp>
namespace mapnik { namespace json {
@ -86,7 +84,9 @@ struct create_polygon
mapnik::geometry::polygon<double> poly;
std::size_t num_rings = rings.size();
if (num_rings > 1)
{
poly.interior_rings.reserve(num_rings - 1);
}
for ( std::size_t i = 0; i < num_rings; ++i)
{
@ -100,8 +100,6 @@ struct create_polygon
if (i == 0) poly.set_exterior_ring(std::move(ring));
else poly.add_hole(std::move(ring));
}
// correct oriantations etc
boost::geometry::correct(poly);
geom_ = std::move(poly);
}

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

@ -27,7 +27,6 @@
#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";
@ -196,6 +195,5 @@ mapnik::geometry::geometry<double> shape_io::read_polygon(shape_file::record_typ
} else {
geom = std::move(poly);
}
mapnik::geometry::correct(geom);
return geom;
}

2
src/wkb.cpp
View File

@ -28,7 +28,6 @@
#include <mapnik/feature.hpp>
#include <mapnik/util/noncopyable.hpp>
#include <mapnik/geometry_adapters.hpp>
#include <mapnik/geometry_correct.hpp>
namespace mapnik
{
@ -411,7 +410,6 @@ mapnik::geometry::geometry<double> geometry_utils::from_wkb(const char* wkb,
{
wkb_reader reader(wkb, size, format);
mapnik::geometry::geometry<double> geom(reader.read());
mapnik::geometry::correct(geom);
return geom;
}

6
tests/cpp_tests/wkb_formats_test.cpp
View File

@ -5,6 +5,7 @@
#include <mapnik/feature.hpp>
#include <mapnik/geometry_is_valid.hpp>
#include <mapnik/geometry_is_simple.hpp>
#include <mapnik/geometry_correct.hpp>
#include <mapnik/feature_factory.hpp>
#include <vector>
#include <algorithm>
@ -71,15 +72,16 @@ int main(int argc, char** argv)
mapnik::geometry::geometry<double> geom = mapnik::geometry_utils::from_wkb((const char*)sp_valid_blob,
sizeof(sp_valid_blob) / sizeof(sp_valid_blob[0]),
mapnik::wkbSpatiaLite);
// winding order is not correct per OGC so we'll fix it
mapnik::geometry::correct(geom);
BOOST_TEST(mapnik::geometry::is_valid(geom) && mapnik::geometry::is_simple(geom));
geom = mapnik::geometry_utils::from_wkb((const char*)sp_valid_blob,
sizeof(sp_valid_blob) / sizeof(sp_valid_blob[0]),
mapnik::wkbAuto);
mapnik::geometry::correct(geom);
BOOST_TEST(mapnik::geometry::is_valid(geom) && mapnik::geometry::is_simple(geom));
geom = mapnik::geometry_utils::from_wkb((const char*)sp_invalid_blob,
sizeof(sp_invalid_blob) / sizeof(sp_invalid_blob[0]),
mapnik::wkbAuto);

13
tests/python_tests/feature_test.py
View File

@ -38,12 +38,13 @@ def test_python_extended_constructor():
def test_add_geom_wkb():
# POLYGON ((30 10, 10 20, 20 40, 40 40, 30 10))
wkb = '010300000001000000050000000000000000003e4000000000000024400000000000002440000000000000344000000000000034400000000000004440000000000000444000000000000044400000000000003e400000000000002440'
context = mapnik.Context()
f = mapnik.Feature(context,1)
f.geometry = mapnik.Geometry.from_wkb(unhexlify(wkb))
eq_(f.geometry.is_valid(), True)
eq_(f.geometry.is_simple(), True)
eq_(f.geometry.envelope(), f.envelope())
geometry = mapnik.Geometry.from_wkb(unhexlify(wkb))
eq_(geometry.is_valid(), False) # False because winding order is wrong according to OGC or because end point != first point
eq_(geometry.is_simple(), True)
eq_(geometry.envelope(), mapnik.Box2d(10.0,10.0,40.0,40.0))
geometry.correct()
# valid after calling correct
eq_(geometry.is_valid(), True)
def test_feature_expression_evaluation():
context = mapnik.Context()