Commit graph

424 commits

Author SHA1 Message Date
Hermann Kraus
e0f6474d9b Merge commit '95aa6904dfde5732fd330752efaf4fbc15105651' from ramunasd/master
Conflicts:
	tests/visual_tests/shieldsymbolizer-1-500-reference.png
	tests/visual_tests/shieldsymbolizer-1.xml
2012-02-18 17:21:02 +01:00
Hermann Kraus
b449cb5e6d Add correct reference image. 2012-02-18 16:46:36 +01:00
Hermann Kraus
f4ec936202 Improve test case again. 2012-02-18 16:45:35 +01:00
Hermann Kraus
db168a0db7 Update test case. 2012-02-18 13:06:25 +01:00
Hermann Kraus
665f0a51a0 Remove old reference image. 2012-02-18 01:24:00 +01:00
Hermann Kraus
0814824b35 Use uppercase letters. 2012-02-18 01:23:25 +01:00
Hermann Kraus
212171b9ee Add visual test for ShieldSymbolizer. 2012-02-18 01:17:29 +01:00
Ramunas
95aa6904df compute image difference & update reference images 2012-02-18 00:19:07 +02:00
Hermann Kraus
53fa19af5a Update test. 2012-02-17 21:00:40 +01:00
Hermann Kraus
ceda45249f Merge branch 'master' into python-textplacement 2012-02-16 00:18:44 +01:00
Hermann Kraus
4602338e0c Add ExpressionFormat: Allow changing text format based on expressions.
Closes #1036.
Refs #1048.
2012-02-15 21:38:24 +01:00
Hermann Kraus
86d32afac5 Add string constructor for text node. 2012-02-12 01:49:54 +01:00
Hermann Kraus
c94d32b41b Add bindings for formating::list_node. 2012-02-11 11:21:33 +01:00
Hermann Kraus
3cafd214de New test case. 2012-02-05 21:32:03 +01:00
Hermann Kraus
a47019ac7b Better tests.
Reference images.
2012-02-05 16:29:27 +01:00
Hermann Kraus
37b2054041 Copy constructor for CharProperties. 2012-02-05 15:11:08 +01:00
Hermann Kraus
099ec85da6 Implement add_expression and helper classes.
Update test.
2012-02-05 04:09:09 +01:00
Hermann Kraus
4230c72fd6 Test case for python bindings. 2012-02-05 01:48:25 +01:00
Artem Pavlenko
b90de4874c Merge branch 'textplacement-merge' into feature-text-merge
Conflicts:
	docs/textrendering.gv
	include/mapnik/building_symbolizer.hpp
	include/mapnik/placement_finder.hpp
	include/mapnik/symbolizer_helpers.hpp
	include/mapnik/text_placements.hpp
	include/mapnik/text_placements_list.hpp
	include/mapnik/text_placements_simple.hpp
	include/mapnik/text_processing.hpp
	plugins/input/shape/shape_utils.hpp
	src/agg/process_shield_symbolizer.cpp
	src/agg/process_text_symbolizer.cpp
	src/cairo_renderer.cpp
	src/grid/process_shield_symbolizer.cpp
	src/grid/process_text_symbolizer.cpp
	src/load_map.cpp
	src/placement_finder.cpp
	src/shield_symbolizer.cpp
	src/text_placements.cpp
	src/text_processing.cpp
	src/text_symbolizer.cpp
	tests/visual_tests/clean.sh
	tests/visual_tests/test.py

Merge herm/textplacement-merge
2012-01-31 11:09:55 +00:00
Hermann Kraus
e564b00370 New test. 2012-01-29 05:11:59 +01:00
Hermann Kraus
604b8db016 Update tests. 2012-01-27 23:15:12 +01:00
Hermann Kraus
92ca0b74ed Update clean.sh. 2012-01-27 23:15:12 +01:00
Artem Pavlenko
d1f16bb227 merge textplacement-merge into feature_impl 2012-01-26 13:04:08 +00:00
Hermann Kraus
51d8718701 Move tests to new location. 2012-01-25 23:31:07 +01:00