Commit graph

87 commits

Author SHA1 Message Date
Hermann Kraus
85e075b8ea Merge branch 'master' into harfbuzz
Conflicts:
	bindings/python/mapnik_text_placement.cpp
	include/mapnik/font_engine_freetype.hpp
	include/mapnik/map.hpp
	include/mapnik/metawriter.hpp
	include/mapnik/metawriter_inmem.hpp
	include/mapnik/metawriter_json.hpp
	include/mapnik/placement_finder.hpp
	include/mapnik/symbolizer.hpp
	include/mapnik/symbolizer_helpers.hpp
	include/mapnik/text_properties.hpp
	src/agg/process_shield_symbolizer.cpp
	src/build.py
	src/cairo_renderer.cpp
	src/feature_style_processor.cpp
	src/grid/process_shield_symbolizer.cpp
	src/metawriter.cpp
	src/metawriter_inmem.cpp
	src/placement_finder.cpp
	src/processed_text.cpp
	src/symbolizer_helpers.cpp
	tests/visual_tests/images/lines-shield-200-reference.png
	tests/visual_tests/images/lines-shield-400-reference.png
	tests/visual_tests/images/lines-shield-600-reference.png
	tests/visual_tests/images/lines-shield-800-reference.png
	tests/visual_tests/styles/formatting.xml
	tests/visual_tests/test.py
2012-09-07 19:07:31 +02:00
Dane Springmeyer
0e0cd08ccb ensure opacity naming fix works - closes #1470 2012-09-04 13:30:24 -07:00
Dane Springmeyer
d133db55f6 remove unused style 2012-09-04 13:21:40 -07:00
Dane Springmeyer
f431193a90 update test images 2012-08-22 14:49:10 -07:00
Hermann Kraus
c8eb8e5775 Switch tests from shapefile to osm.
Closes #1121.
2012-08-22 00:06:26 +02:00
Hermann Kraus
610a0906d1 Update tests. 2012-08-21 22:36:05 +02:00
Hermann Kraus
020e79f53b Add new test mode. 2012-08-21 22:36:04 +02:00
Hermann Kraus
a1f0af112e Support ShieldSymbolizer. 2012-08-17 18:31:55 +02:00
Hermann Kraus
f72527da8b Add tests. 2012-08-17 01:56:43 +02:00
Dane Springmeyer
af413aa959 conditionally run tests based on availability of datasources 2012-08-15 19:22:47 -07:00
Hermann Kraus
79ad6b395e Implement label-position-tolerance. 2012-08-13 02:31:08 +02:00
Hermann Kraus
2a0a52fba2 Update tests. 2012-08-12 15:30:54 +02:00
Hermann Kraus
0c90f0f22b Update all tests which return obviously correct results. 2012-08-02 01:28:19 +02:00
Hermann Kraus
c529bf7b06 Implement font sets. 2012-08-02 01:12:52 +02:00
Hermann Kraus
f2e2483109 Better text positions. 2012-08-01 23:09:47 +02:00
Hermann Kraus
5929c3c9db Add "rotate-displacement". 2012-07-31 23:05:31 +02:00
Hermann Kraus
a41eafd8ee Add rotation tests. 2012-07-30 18:06:06 +02:00
Hermann Kraus
a57123f8be Add collision detector support. 2012-07-30 02:17:43 +02:00
Hermann Kraus
00ae551564 Merge branch 'master' into harfbuzz 2012-07-30 01:26:31 +02:00
Hermann Kraus
5fedfc8a52 Fix problem with python tests. 2012-07-30 01:25:21 +02:00
Hermann Kraus
2e3e76ebaa Merge branch 'master' into harfbuzz 2012-07-29 01:48:48 +02:00
Hermann Kraus
19ed8718a3 Fix test crashes when reference image doesn't exists.
Refs #1296 and commit 269569250c
2012-07-29 01:47:16 +02:00
Hermann Kraus
b53849d441 Merge branch 'master' into harfbuzz
Conflicts:
	include/mapnik/font_engine_freetype.hpp
	include/mapnik/symbolizer_helpers.hpp
	src/agg/process_shield_symbolizer.cpp
	src/agg/process_text_symbolizer.cpp
	src/cairo_renderer.cpp
	src/font_engine_freetype.cpp
	src/formatting/list.cpp
	src/grid/process_shield_symbolizer.cpp
	src/grid/process_text_symbolizer.cpp
	src/symbolizer_helpers.cpp
	tests/visual_tests/styles/harfbuzz.xml
2012-07-21 20:19:22 +02:00
Hermann Kraus
019a44da80 Add new tests for Khmer text.
Reference renderings: http://licadho-cambodia.org/mapnik/khmer.html
Thanks to github user "nirvn" for providing these images.
Refs #1208.
2012-07-17 22:03:25 +02:00
Hermann Kraus
beed2d08f2 Implement missing functions.
This is the first version that actually renders text. And it's working correctly!
2012-07-11 02:21:30 +02:00
Dane Springmeyer
269569250c use mapnik.Image for visual tests - closes #1296 2012-07-06 17:44:15 -07:00
Hermann Kraus
c805cbcfe1 Add test for ShieldSymbolizer with text placements. 2012-07-05 10:37:39 +02:00
Hermann Kraus
eb682c1f4f Fix visual_tests/test.py. 2012-07-03 23:39:34 +02:00
Hermann Kraus
993395c510 Add test case with mixed text. 2012-07-01 23:13:54 +02:00
Hermann Kraus
0caebc52ae Add tests for international text. 2012-06-28 20:49:41 +02:00
Dane Springmeyer
b8e0366fdf improve readibility of error output from visual tests 2012-06-07 15:26:50 -05:00
Dane Springmeyer
66ff9b1492 show expected image path for visual test failures 2012-04-23 16:13:59 -07:00
Dane Springmeyer
e3982081d8 save test renders outside of source tree 2012-04-16 22:07:14 -07:00
Dane Springmeyer
0e64cc157e tests: allow the visual tests to be run in quiet mode 2012-04-04 14:54:07 -07:00
Dane Springmeyer
e570ea3a98 hook up visual tests to the 'make test' target 2012-03-23 12:42:11 -07:00
Hermann Kraus
620f3f943e Add reference image. 2012-03-20 23:52:13 +01:00
Hermann Kraus
eac133952c Add line-offset test. 2012-03-20 23:13:15 +01:00
Hermann Kraus
eb911deca5 Change visual tests config format. 2012-03-20 23:13:15 +01:00
Hermann Kraus
fe2879ac42 Update python tests. 2012-03-20 23:13:15 +01:00
Hermann Kraus
f7a387f8af Change visual tests directory structure. 2012-03-20 23:13:15 +01:00
Hermann Kraus
9b62a19cf4 Implement justify-alignment=auto.
Closes #1125.
2012-03-19 17:12:53 +01:00
Hermann Kraus
ff78217276 Add reference image for RTL test. 2012-03-16 01:51:19 +01:00
Hermann Kraus
f9b2e5fb56 Add test for RTL text. 2012-03-16 00:38:03 +01:00
Hermann Kraus
2b68cea0a1 Merge branch 'new-xml'
Conflicts:
	include/mapnik/config_error.hpp
	include/mapnik/ptree_helpers.hpp
	src/formatting/text.cpp
	src/libxml2_loader.cpp
	src/load_map.cpp
	src/metawriter_factory.cpp
	src/text_placements/registry.cpp
	src/text_placements/simple.cpp
2012-03-13 11:11:28 +01:00
Hermann Kraus
502773bea6 Only one grammar object per XML tree. 2012-03-11 23:24:28 +01:00
Dane Springmeyer
c5c0f92247 save the maps in the right place for visual tests 2012-03-08 17:04:51 -08:00
Dane Springmeyer
9fb45ebf75 allow visual tests to be run from root 2012-03-08 17:01:51 -08:00
Hermann Kraus
cd8cfc6527 Improve error messages. 2012-03-08 18:52:53 +01:00
Hermann Kraus
8b0b9ed5fe Handle different image sizes correctly. 2012-03-08 18:29:46 +01:00
Hermann Kraus
7d3fd0755d Complete XML changes in load_map.cpp 2012-03-07 01:35:37 +01:00