Commit graph

10051 commits

Author SHA1 Message Date
artemp
1dd202a282 Merge branch 'mapnik-geometry' 2015-04-22 12:33:00 +02:00
artemp
7de7139242 Merge branch 'master' into mapnik-geometry 2015-04-22 12:32:29 +02:00
Dane Springmeyer
2e2bbfad7d avoid potential access of uninitialized text_placements_ptr - closes #2766 2015-04-22 12:30:38 +02:00
artemp
0f998c28b2 Merge branch 'mapnik-geometry-template' into mapnik-geometry 2015-04-22 12:28:21 +02:00
artemp
06d77865db update to templated geometry 2015-04-22 12:23:51 +02:00
artemp
1f83eaa6ac geometry_adapters - make generic 2015-04-22 12:22:52 +02:00
artemp
2768aa6a4a Merge branch 'mapnik-geometry' into mapnik-geometry-template 2015-04-22 12:13:29 +02:00
Dane Springmeyer
2679559f15 Merge pull request #2761 from mapnik/debug-rings
Add DebugSymbolizer mode=rings
2015-04-22 01:29:44 +02:00
Blake Thompson
1bb8136390 Fix for bench 2015-04-21 10:29:22 -05:00
Blake Thompson
d7f7bc18c1 A large set of changes that help allow WKT for int64_t type geometeries, modified some strategies, made it so that the clipper would use mapnik geometries. 2015-04-21 09:34:52 -05:00
Blake Thompson
edda6cb13f Updated several sections of code, noteably added strategy_group_first as another way to perform transforms with groups, added tests similar to uses of vector tiles in geometry_strategy_test.cpp 2015-04-17 15:49:23 -05:00
Blake Thompson
8ad5648c10 Working version of strategy grouping 2015-04-17 11:15:45 -05:00
Dane Springmeyer
a621022536 Merge pull request #2763 from mapycz/test-polygon-interior
Test polygon interior
2015-04-17 15:37:18 +02:00
Jiri Drbalek
ac4c090feb add visual test - polygon interior 3 2015-04-17 12:40:36 +00:00
Jiri Drbalek
2bddb31419 add visual test - polygon interior 2 2015-04-17 12:40:23 +00:00
Jiri Drbalek
85b370dfd7 add visual test - polygon interior 1 2015-04-17 12:35:17 +00:00
Blake Thompson
75ccfdf934 A venture into variadic templates for strategies and transforms. 2015-04-16 23:37:20 -05:00
Dane Springmeyer
0a1fc7e476 Merge branch 'mapnik-geometry' of github.com:mapnik/mapnik into debug-rings 2015-04-16 16:29:29 +02:00
Blake Thompson
a19da799e0 Slight fixes after merge 2015-04-15 16:05:56 -05:00
Blake Thompson
7a50bb5214 Merge branch 'mapnik-geometry' into mapnik-geometry-template 2015-04-15 15:16:47 -05:00
Blake Thompson
26131fb708 Updated clipper 2015-04-15 00:35:31 -05:00
Dane Springmeyer
97fd53f650 Merge branch 'mapnik-geometry' of github.com:mapnik/mapnik into debug-rings 2015-04-14 20:00:29 +02:00
Dane Springmeyer
1a7b6729d1 regenerate new expected images 2015-04-14 15:38:08 +02:00
Dane Springmeyer
748fe3d228 fix polygon winding order for shapefiles + add test enforcing it 2015-04-14 15:35:32 +02:00
Dane Springmeyer
3fb41e865a fix outline drawing in debugsymbolizer ring mode 2015-04-14 15:33:05 +02:00
Blake Thompson
feca4d9f9b Updated the clipper dependency to allow it to have some methods linked externally 2015-04-14 01:02:33 -05:00
Dane Springmeyer
cdb9a2ead4 add debug symbolizer mode for visualizing exterior and interior rings and their winding order 2015-04-14 02:44:14 +02:00
Dane Springmeyer
1dc77443ab add vertex_adapter to work per polygon ring 2015-04-13 18:48:45 +02:00
artemp
87e978a6b9 prefer c++11 alias type declaration over typedef for consistency 2015-04-13 15:03:19 +02:00
artemp
41aa591878 Merge branch 'master' into mapnik-geometry 2015-04-13 12:47:41 +02:00
artemp
4f3c8663a3 visual tests : fix marker-on-hex-grid 2015-04-13 11:38:38 +02:00
artemp
c1bc8ffc64 simlified_converter - use start (move_to) x,y on close_path command (drops tiny islands) 2015-04-13 11:17:17 +02:00
Blake Thompson
f98fd0da7c Added tests for non standard projections, forcing use of proj4. 2015-04-10 14:05:58 -05:00
Blake Thompson
2392c7eb12 Added geometry_reprojection_impl 2015-04-10 10:55:30 -05:00
artemp
33661c818d Merge branch 'mapnik-geometry' into mapnik-geometry-template
Conflicts:
	benchmark/test_polygon_clipping.cpp
	include/mapnik/geometry.hpp
	include/mapnik/geometry_adapters.hpp
	include/mapnik/marker_helpers.hpp
2015-04-10 14:52:40 +02:00
artemp
d5f9a14b58 more fixes (dependent names etc) 2015-04-10 14:17:36 +02:00
artemp
61f42b229d update to templated mapnik-geometry 2015-04-10 14:16:26 +02:00
artemp
90b6fee2ac don't return from void function 2015-04-10 14:15:12 +02:00
artemp
2ebc729cc8 Clipper - fix PolyTree traversal 2015-04-10 14:13:08 +02:00
Blake Thompson
87fb41907a Added template to geometries 2015-04-09 15:22:51 -05:00
artemp
fb61a2bb90 ref #2755 test if centroid is within bounding box 2015-04-09 12:40:06 +02:00
artemp
3f1aa7b4b4 geometry : allow boost::geoemetry algorithms to work directly with box2d<double>, removing bounding_box 2015-04-09 12:33:31 +02:00
artemp
2581e48087 vertex_converters - attempt to improve size and compilation times 2015-04-09 10:55:09 +02:00
artemp
938709955e support all geomtry types 2015-04-08 18:48:41 +02:00
artemp
2bc2e6b85e use geometry_to_path to convert geometry 2015-04-08 18:48:41 +02:00
artemp
24dbaf5217 add geometry_to_path implementation 2015-04-08 18:48:41 +02:00
artemp
bfae2a8df6 cleanup 2015-04-08 18:48:41 +02:00
Blake Thompson
bb7f965d6c Updated geometry_reprojection tests to include all variant types, put in fix for geometry_equal tool which wasn't working properly with geometry_collections, corrected result of failing hit_test in python tests after the correct implementation of hit test was throwing out invalid polygons. 2015-04-08 11:36:10 -05:00
artemp
310865a0c3 help compiler to apply RVO ( return the same object by value) 2015-04-08 13:10:22 +02:00
Blake Thompson
431c581759 Added a lot of additional tests for geometry_reprojection 2015-04-07 18:37:30 -05:00