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 |
|
Dane Springmeyer
|
7327a646f0
|
fix memory datasource test
|
2012-02-14 15:01:41 -08:00 |
|
Dane Springmeyer
|
1c07372a13
|
postgis: make sure to add key_field to feature context
|
2012-02-14 14:58:09 -08:00 |
|
Dane Springmeyer
|
da845cfaa3
|
update feature expression test to new feature attr api that will throw if attr is not found
|
2012-02-14 14:57:36 -08:00 |
|
Dane Springmeyer
|
a13b3f650c
|
when feature put/get throws, print the key that does not exist
|
2012-02-14 14:57:03 -08:00 |
|
Dane Springmeyer
|
6dfb3604a4
|
postgis: remove last usage of deprecated functions - fully supporting postgis 2.0 - closes #1083
|
2012-02-14 13:07:05 -08:00 |
|
Dane Springmeyer
|
ca89dd7b31
|
Merge branch 'master' of github.com:mapnik/mapnik
|
2012-02-14 12:18:46 -08:00 |
|
Dane Springmeyer
|
c272835335
|
yet another -fpermissive - refs #1082, #950 and #1001
|
2012-02-14 12:03:44 -08:00 |
|
Artem Pavlenko
|
843537247a
|
Merge remote-tracking branch 'origin/master'
|
2012-02-14 18:40:16 +00:00 |
|
Artem Pavlenko
|
6495ea8996
|
+ clip polygons
|
2012-02-14 18:39:36 +00:00 |
|
Artem Pavlenko
|
8116ba4809
|
ident
|
2012-02-14 18:35:00 +00:00 |
|
Artem Pavlenko
|
7e8207236e
|
ident
|
2012-02-14 18:34:29 +00:00 |
|
Dane Springmeyer
|
e2d398f6db
|
add permissive flag to ogr and shape plugins to work around boost interprocess compile bug - closes #1082 - refs #950 and #1001
|
2012-02-14 10:33:40 -08:00 |
|
Artem Pavlenko
|
dc4cc8f197
|
+ base class already derived from boost::noncopyable
|
2012-02-14 18:33:39 +00:00 |
|
Artem Pavlenko
|
58b51b208e
|
use standard_wide::space
|
2012-02-14 18:33:05 +00:00 |
|
Dane Springmeyer
|
9d5591b77a
|
add argument
|
2012-02-13 22:02:23 -08:00 |
|
Dane Springmeyer
|
a18927a0b1
|
Add include
|
2012-02-13 11:59:04 -08:00 |
|
Dane Springmeyer
|
cafb98ed88
|
qi::omit works with boost >=1.46 but not <=1.45 - refs #1074
|
2012-02-13 11:47:55 -08:00 |
|
Dane Springmeyer
|
c74a6390ca
|
Merge branch 'master' of github.com:mapnik/mapnik
|
2012-02-13 11:30:38 -08:00 |
|
Dane Springmeyer
|
ab11f48ce4
|
avoid compiler warning
|
2012-02-13 11:30:27 -08:00 |
|
Hermann Kraus
|
be464f0c5b
|
Move code for makers placement from hpp to cpp.
|
2012-02-13 20:20:09 +01:00 |
|
Dane Springmeyer
|
00a2bec062
|
silence signed/unsigned compiler warning
|
2012-02-13 11:01:58 -08:00 |
|
Dane Springmeyer
|
b866b6d51c
|
remove uneeded variables
|
2012-02-13 11:01:44 -08:00 |
|
Dane Springmeyer
|
08216606ee
|
formatting
|
2012-02-13 11:01:25 -08:00 |
|
Dane Springmeyer
|
6b6d069f3e
|
silence compiler warning about signed/unsigned comparison
|
2012-02-13 11:01:16 -08:00 |
|
Hermann Kraus
|
043dba3786
|
Merge branch 'cleanup-includes'
|
2012-02-13 19:37:20 +01:00 |
|
Hermann Kraus
|
f3dc78506b
|
Remove almost empty unused headers.
|
2012-02-13 18:07:47 +01:00 |
|
Hermann Kraus
|
01e3450dff
|
Add warning for filter_factory.hpp.
|
2012-02-13 17:03:42 +01:00 |
|
Artem Pavlenko
|
06ae6ae845
|
+ fix #1042 - don't use omit[...] directive with boost_1_42_0
|
2012-02-13 12:12:13 +00:00 |
|
Dane Springmeyer
|
e2385178f4
|
install new headers fixing broken node-mapnik compile: https://github.com/mapnik/node-mapnik/issues/85 - refs #1079
|
2012-02-12 20:53:48 -08:00 |
|
Hermann Kraus
|
828316bffd
|
Remove unused file.
|
2012-02-12 23:44:05 +01:00 |
|
Hermann Kraus
|
be0f110a76
|
Fix spelling error.
|
2012-02-12 23:00:38 +01:00 |
|
Hermann Kraus
|
d3e191ff73
|
Merge branch 'master' into python-textplacement
Conflicts:
include/mapnik/formatting/list.hpp
|
2012-02-12 22:58:02 +01:00 |
|
Hermann Kraus
|
1fd7f9d543
|
Fix spelling error.
|
2012-02-12 22:48:44 +01:00 |
|
Hermann Kraus
|
afb2eedbb9
|
Merge branch 'textplacement-rename'
|
2012-02-12 14:03:57 +01:00 |
|
Hermann Kraus
|
2b5274c21b
|
Merge branch 'textplacement-rename' into python-textplacement
|
2012-02-12 13:57:51 +01:00 |
|
Hermann Kraus
|
52702d3a20
|
Rename filter_factory to expression.
|
2012-02-12 13:06:39 +01:00 |
|