Hermann Kraus
725ceaadc1
Fix problem introduced in 060545b9aaa3f96a6c26e509b429a6242ba6b10f.
2012-02-19 17:12:08 +01:00
Hermann Kraus
6fe0637425
Complete support for formatting types.
2012-02-19 02:03:25 +01:00
Hermann Kraus
76cdd7a254
Merge branch 'master' into python-textplacement
2012-02-19 01:00:52 +01:00
Hermann Kraus
d56f05b4ec
Move compare() to own file.
...
Increase threshold.
2012-02-18 17:51:18 +01:00
Hermann Kraus
0ba24d7480
Simply clean script.
2012-02-18 17:29:48 +01:00
Hermann Kraus
e466d5bfd1
Merge commit '1ac4c0ca534c8667f4a13a0756af0b873b44192e'
2012-02-18 17:23:38 +01:00
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
2ea6ab216c
Fix text height calculation.
...
Closes #1078 .
2012-02-18 16:43:05 +01:00
Hermann Kraus
6efdb3969e
Handle text position differently.
...
Should fix part of the ShieldSymbolizer problems.
Refs #1078 .
2012-02-18 14:39:13 +01:00
Hermann Kraus
2843ff3da8
Fix placement_finder.hpp includes.
2012-02-18 14:03:21 +01:00
Hermann Kraus
bb3ad18c95
Rename starting_{x,y} to center to reflect actual meaning.
2012-02-18 13:07:23 +01:00
Hermann Kraus
db168a0db7
Update test case.
2012-02-18 13:06:25 +01:00
Hermann Kraus
93d119464c
Add new class to avoid mixing different types of positions.
2012-02-18 12:12:45 +01:00
Ramunas
1ac4c0ca53
remove notices due to inkscape metadata
2012-02-18 10:45:58 +02:00
Ramunas
5c82265ef8
Merge branch 'master' of git://github.com/mapnik/mapnik
...
Conflicts:
tests/visual_tests/shieldsymbolizer-1.xml
2012-02-18 09:57:23 +02: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
Hermann Kraus
980cdd9e92
Use text_placements registry.
2012-02-18 00:39:14 +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
3508ec5fb4
Merge branch 'master' into python-textplacement
2012-02-17 20:54:48 +01:00
Hermann Kraus
6db956ca83
Split file.
2012-02-17 20:53:00 +01:00
Hermann Kraus
481e172b8e
Add placement registry.
2012-02-17 20:15:16 +01:00
Hermann Kraus
2c6502e791
Merge branch 'master' of github.com:mapnik/mapnik
2012-02-17 19:52:38 +01:00
Hermann Kraus
7c98b8c9c0
Add XML name registry.
...
Allows users to add new types to XML styles.
2012-02-17 19:45:13 +01:00
Hermann Kraus
f06bda1c1c
Split file.
2012-02-17 15:50:24 +01:00
Artem Pavlenko
b5bc17304c
Merge remote-tracking branch 'origin/master'
2012-02-17 10:48:49 +00:00
Artem Pavlenko
c6a091937f
+ add get_optional to mapnik::feature_impl
...
returns -> boost::optional<mapnik::value const&>
+ use get_optional in feature_kv_iterator to avoid
throwing exceptions
2012-02-17 10:46:29 +00:00
Dane Springmeyer
9be9b09d72
Merge branch 'master' of github.com:mapnik/mapnik
2012-02-16 17:44:34 -08:00
Dane Springmeyer
a5e1a66fe6
c++ style in hextree.hpp to aid in debugging - no functional change
2012-02-16 17:44:04 -08:00
Hermann Kraus
7b22d69932
Revert "+ fix shield/text positioning - we still need to floor both text and shield"
...
floor is removed from position calculation now, resulting in better marker and text matching.
Refs #1078 .
This reverts commit 009a1e45a75836385dd6318ac5cc9cc0d2b26c35.
2012-02-17 00:59:20 +01:00
Hermann Kraus
465a7621bc
Merge pull request #1091 from kkaefer/character-spacing
...
Support character-spacing along a line.
Closes #721 .
2012-02-16 15:08:56 -08:00
Hermann Kraus
44beaf1bdf
Make ShieldSymbolizer variables doubles.
...
Refs #1078 .
2012-02-17 00:03:46 +01:00
Konstantin Käfer
9ad113d724
naïvely replace ci.width with ci.width + ci.format->character_spacing
2012-02-16 23:46:44 +01:00
Artem Pavlenko
63735982ee
+ remove const from parameters passed by-value
2012-02-16 15:35:27 +00:00
Artem Pavlenko
ab56a63f2f
Merge remote-tracking branch 'origin/master'
2012-02-15 23:31:38 +00:00
Artem Pavlenko
009a1e45a7
+ fix shield/text positioning - we still need to floor both text and shield
...
position for consistent rendering.
2012-02-15 23:27:33 +00:00
Hermann Kraus
56004ab181
Python bindings: Rename properties=>defauls, default_format=>format.
2012-02-16 00:27:03 +01:00
Hermann Kraus
ceda45249f
Merge branch 'master' into python-textplacement
2012-02-16 00:18:44 +01:00
Hermann Kraus
819ee98041
Rename properties=>defauls, default_format=>format.
2012-02-16 00:17:22 +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
Dane Springmeyer
5869de0bf0
Merge branch 'master' of github.com:mapnik/mapnik
2012-02-15 11:25:33 -08:00
Artem Pavlenko
c83ab1d14e
Merge remote-tracking branch 'origin/master'
2012-02-15 19:20:17 +00:00
Hermann Kraus
a2c2ad40e2
Make markers_placement a bit simpler and add sanity checks.
...
refs #974 .
2012-02-15 20:06:50 +01:00
Artem Pavlenko
01497bfc36
+ add typedef size_type to mapnik::vertex_vector
...
+ remove set_capacity() method - no longer required
2012-02-15 15:16:33 +00:00
Dane Springmeyer
4ad9b4d282
formatting
2012-02-14 16:07:23 -08:00
Dane Springmeyer
81230b2b30
remove uneeded include
2012-02-14 16:05:25 -08:00
