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

..

.gitignore

Update reference images.

2012-02-21 00:06:54 +01:00

clean.sh

Simply clean script.

2012-02-18 17:29:48 +01:00

compare.py

Handle different image sizes correctly.

2012-03-08 18:29:46 +01:00

expressionformat-500-reference.png

compute image difference & update reference images

2012-02-18 00:19:07 +02:00

expressionformat.xml

Add ExpressionFormat: Allow changing text format based on expressions.

2012-02-15 21:38:24 +01:00

formating-1-500-reference.png

compute image difference & update reference images

2012-02-18 00:19:07 +02:00

formating-1.xml

Update tests.

2012-01-27 23:15:12 +01:00

formating-2-500-reference.png

compute image difference & update reference images

2012-02-18 00:19:07 +02:00

formating-2.xml

Update tests.

2012-01-27 23:15:12 +01:00

formating-3-500-reference.png

compute image difference & update reference images

2012-02-18 00:19:07 +02:00

formating-3.xml

Update tests.

2012-01-27 23:15:12 +01:00

formating-4-500-reference.png

Update tests.

2012-01-27 23:15:12 +01:00

formating-4.xml

Update tests.

2012-01-27 23:15:12 +01:00

formating-500-reference.png

Update tests.

2012-01-27 23:15:12 +01:00

formating.xml

Update tests.

2012-01-27 23:15:12 +01:00

lines-1-200-reference.png

New reference images.

2012-03-04 02:06:03 +01:00

lines-1-400-reference.png

New reference images.

2012-03-04 02:06:03 +01:00

lines-1-600-reference.png

New reference images.

2012-03-04 02:06:03 +01:00

lines-1-800-reference.png

New reference images.

2012-03-04 02:06:03 +01:00

lines-1.xml

Reformat test and extend to verify text is centered correctly.

2012-03-03 13:53:08 +01:00

lines-2-200-reference.png

New reference images.

2012-03-04 02:06:03 +01:00

lines-2-400-reference.png

New reference images.

2012-03-04 02:06:03 +01:00

lines-2-600-reference.png

New reference images.

2012-03-04 02:06:03 +01:00

lines-2-800-reference.png

New reference images.

2012-03-04 02:06:03 +01:00

lines-2.xml

Add new test.

2012-03-03 16:32:31 +01:00

lines-3-200-reference.png

New reference images.

2012-03-04 02:06:03 +01:00

lines-3-400-reference.png

New reference images.

2012-03-04 02:06:03 +01:00

lines-3-600-reference.png

New reference images.

2012-03-04 02:06:03 +01:00

lines-3-800-reference.png

New reference images.

2012-03-04 02:06:03 +01:00

lines-3.xml

New tests.

2012-03-04 02:04:43 +01:00

lines-shield-200-reference.png

New reference images.

2012-03-04 02:06:03 +01:00

lines-shield-400-reference.png

New reference images.

2012-03-04 02:06:03 +01:00

lines-shield-600-reference.png

New reference images.

2012-03-04 02:06:03 +01:00

lines-shield-800-reference.png

New reference images.

2012-03-04 02:06:03 +01:00

lines-shield.xml

New tests.

2012-03-04 02:04:43 +01:00

lines.osm

Avoid accidential uploading of test file to OSM server.

2012-03-03 16:31:49 +01:00

list-100-reference.png

compute image difference & update reference images

2012-02-18 00:19:07 +02:00

list-150-reference.png

Update reference images.

2012-02-21 00:06:54 +01:00

list-200-reference.png

compute image difference & update reference images

2012-02-18 00:19:07 +02:00

list-250-reference.png

Update reference images.

2012-02-21 00:06:54 +01:00

list-300-reference.png

compute image difference & update reference images

2012-02-18 00:19:07 +02:00

list-400-reference.png

compute image difference & update reference images

2012-02-18 00:19:07 +02:00

list-600-reference.png

compute image difference & update reference images

2012-02-18 00:19:07 +02:00

list-800-reference.png

compute image difference & update reference images

2012-02-18 00:19:07 +02:00

list.xml

merge textplacement-merge into feature_impl

2012-01-26 13:04:08 +00:00

points.dbf

merge textplacement-merge into feature_impl

2012-01-26 13:04:08 +00:00

points.osm

merge textplacement-merge into feature_impl

2012-01-26 13:04:08 +00:00

points.shp

merge textplacement-merge into feature_impl

2012-01-26 13:04:08 +00:00

python-IfElse-reference.png

New test case.

2012-02-05 21:32:03 +01:00

python-MyText-reference.png

Better tests.

2012-02-05 16:29:27 +01:00

python-TextNode-reference.png

Better tests.

2012-02-05 16:29:27 +01:00

shieldsymbolizer-1-490-reference.png

Update reference images.

2012-02-21 00:06:54 +01:00

shieldsymbolizer-1-495-reference.png

Update reference images.

2012-02-21 00:06:54 +01:00

shieldsymbolizer-1-497-reference.png

Update reference images.

2012-02-21 00:06:54 +01:00

shieldsymbolizer-1-498-reference.png

Update reference images.

2012-02-21 00:06:54 +01:00

shieldsymbolizer-1-499-reference.png

Update reference images.

2012-02-21 00:06:54 +01:00

shieldsymbolizer-1-500-reference.png

Add correct reference image.

2012-02-18 16:46:36 +01:00

shieldsymbolizer-1-501-reference.png

Update reference images.

2012-02-21 00:06:54 +01:00

shieldsymbolizer-1-502-reference.png

Update reference images.

2012-02-21 00:06:54 +01:00

shieldsymbolizer-1-505-reference.png

Update reference images.

2012-02-21 00:06:54 +01:00

shieldsymbolizer-1-510-reference.png

Update reference images.

2012-02-21 00:06:54 +01:00

shieldsymbolizer-1.xml

Only one grammar object per XML tree.

2012-03-11 23:24:28 +01:00

simple-100-reference.png

compute image difference & update reference images

2012-02-18 00:19:07 +02:00

simple-150-reference.png

Update reference images.

2012-02-21 00:06:54 +01:00

simple-200-reference.png

compute image difference & update reference images

2012-02-18 00:19:07 +02:00

simple-250-reference.png

Update reference images.

2012-02-21 00:06:54 +01:00

simple-300-reference.png

compute image difference & update reference images

2012-02-18 00:19:07 +02:00

simple-400-reference.png

compute image difference & update reference images

2012-02-18 00:19:07 +02:00

simple-600-reference.png

compute image difference & update reference images

2012-02-18 00:19:07 +02:00

simple-800-reference.png

compute image difference & update reference images

2012-02-18 00:19:07 +02:00

simple-E-500-reference.png

compute image difference & update reference images

2012-02-18 00:19:07 +02:00

simple-E.xml

merge textplacement-merge into feature_impl

2012-01-26 13:04:08 +00:00

simple-N-500-reference.png

compute image difference & update reference images

2012-02-18 00:19:07 +02:00

simple-N.xml

merge textplacement-merge into feature_impl

2012-01-26 13:04:08 +00:00

simple-NE-500-reference.png

compute image difference & update reference images

2012-02-18 00:19:07 +02:00

simple-NE.xml

merge textplacement-merge into feature_impl

2012-01-26 13:04:08 +00:00

simple-NW-500-reference.png

compute image difference & update reference images

2012-02-18 00:19:07 +02:00

simple-NW.xml

merge textplacement-merge into feature_impl

2012-01-26 13:04:08 +00:00

simple-S-500-reference.png

compute image difference & update reference images

2012-02-18 00:19:07 +02:00

simple-S.xml

merge textplacement-merge into feature_impl

2012-01-26 13:04:08 +00:00

simple-SE-500-reference.png

compute image difference & update reference images

2012-02-18 00:19:07 +02:00

simple-SE.xml

merge textplacement-merge into feature_impl

2012-01-26 13:04:08 +00:00

simple-SW-500-reference.png

compute image difference & update reference images

2012-02-18 00:19:07 +02:00

simple-SW.xml

merge textplacement-merge into feature_impl

2012-01-26 13:04:08 +00:00

simple-W-500-reference.png

compute image difference & update reference images

2012-02-18 00:19:07 +02:00

simple-W.xml

merge textplacement-merge into feature_impl

2012-01-26 13:04:08 +00:00

simple.xml

merge textplacement-merge into feature_impl

2012-01-26 13:04:08 +00:00

test_python.py

Complete support for formatting types.

2012-02-19 02:03:25 +01:00

test.py

Merge branch 'new-xml'

2012-03-13 11:11:28 +01:00