Conv simplify #1514

Merged
merged 36 commits into from Oct 1, 2012

Conversation

Projects
None yet
2 participants
Owner

artemp commented Oct 1, 2012

updated #1385

kkaefer and others added some commits Aug 14, 2012

Merge branch 'master' into conv_simplify
Conflicts:
	bindings/python/mapnik_line_symbolizer.cpp
	bindings/python/mapnik_polygon_symbolizer.cpp
Merge branch 'master' into conv_simplify
Conflicts:
	include/mapnik/vertex_converters.hpp
+ make client methods non-static in classes derived from
  mapnik::singleton<> (TODO: apply to all)
+ ensure client methods are accessed through instance() method
Merge branch 'master' into conv_simplify
Conflicts:
	bindings/python/mapnik_markers_symbolizer.cpp
	plugins/input/ogr/ogr_index_featureset.cpp
	plugins/input/shape/dbfile.cpp
	plugins/input/shape/shapefile.hpp
	src/load_map.cpp
+ discard 'almost' adjacent vertices
+ enforce 'min_size' in output path
+ make WKT generator templated on geometry type - the goal is to be able
  to use generator for any type that implements 'vertex' concept

artemp added a commit that referenced this pull request Oct 1, 2012

@artemp artemp merged commit f298af6 into master Oct 1, 2012

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment