Hermann Kraus
|
c47eb3642a
|
Reformat test and extend to verify text is centered correctly.
|
2012-03-03 13:53:08 +01:00 |
|
Dane Springmeyer
|
7163806cda
|
c++ style
|
2012-03-02 18:51:19 -08:00 |
|
Dane Springmeyer
|
e622c9548d
|
Merge branch 'master' of github.com:mapnik/mapnik
|
2012-03-02 18:47:11 -08:00 |
|
Hermann Kraus
|
2bf9d9dbdf
|
Fix handling of empty XML nodes.
Closes #1106.
|
2012-03-03 01:12:23 +01:00 |
|
Dane Springmeyer
|
ca3bd722c1
|
Merge branch 'master' of github.com:mapnik/mapnik
|
2012-03-02 10:01:11 -08:00 |
|
Hermann Kraus
|
cc547385e6
|
Avoid adding the same text to detector twice.
|
2012-03-02 12:39:38 +01:00 |
|
Artem Pavlenko
|
c25e8c7d94
|
Merge remote-tracking branch 'origin/master'
|
2012-03-02 09:34:57 +00:00 |
|
Hermann Kraus
|
1fcfbaac52
|
Add test for TextSymbolizer line placement.
|
2012-03-02 01:45:44 +01:00 |
|
Hermann Kraus
|
69824314ed
|
Simplify OSM plugin.
|
2012-03-02 01:01:13 +01:00 |
|
Hermann Kraus
|
9eec4eb1be
|
Fix OSM plugin.
|
2012-03-02 00:51:44 +01:00 |
|
Artem Pavlenko
|
726724b3c7
|
pass by ref
move conversions impl into .cpp
|
2012-03-01 18:36:13 +00:00 |
|
Dane Springmeyer
|
803447a8d8
|
disable non-critical failing test after reverting shapefile polygon handling - refs #1093
|
2012-02-28 20:18:47 -08:00 |
|
Dane Springmeyer
|
a837b1ae80
|
specialize getting strings from ptree to avoid excess copying
|
2012-02-28 20:13:37 -08:00 |
|
Dane Springmeyer
|
7c8341e7c3
|
formatting
|
2012-02-28 20:12:13 -08:00 |
|
Hermann Kraus
|
9e397ae55e
|
Add iterator increment which I forgot in 96d8dfb356.
|
2012-02-28 02:05:44 +01:00 |
|
Hermann Kraus
|
df4eae2f71
|
Merge branch 'master' of github.com:mapnik/mapnik
Conflicts:
src/symbolizer_helpers.cpp
|
2012-02-28 01:48:26 +01:00 |
|
Hermann Kraus
|
66ef7a450a
|
Add marker to collision detector.
Refs #1106.
|
2012-02-28 01:47:24 +01:00 |
|
Dane Springmeyer
|
82bd78d9a5
|
use boost::make_shared instead of new as per mapnik coding conventions
|
2012-02-27 16:39:34 -08:00 |
|
Dane Springmeyer
|
a5d7239cfc
|
fix minor spelling in code comments
|
2012-02-27 16:15:36 -08:00 |
|
Hermann Kraus
|
96d8dfb356
|
Improve code a bit.
size() can be O(n) but empty() is always O(1).
|
2012-02-28 00:52:02 +01:00 |
|
Dane Springmeyer
|
1ed193728d
|
add missing update_detector() - refs #1106
|
2012-02-27 15:15:27 -08:00 |
|
Dane Springmeyer
|
5bdaf44a7a
|
Revert "shape: check if multiple parts are interior rings or separate"
This reverts commit faaa4f6e3f.
|
2012-02-26 22:11:22 -08:00 |
|
Dane Springmeyer
|
ce3078fa98
|
inline to avoid duplicate symbol errors with gcc
|
2012-02-25 09:29:14 -08:00 |
|
Dane Springmeyer
|
9aff28f768
|
fix compile with boost 1.42
|
2012-02-24 19:22:48 -08:00 |
|
Dane Springmeyer
|
e6abd143a8
|
c++ casts to avoid compiler warnings on msvc
|
2012-02-24 18:58:34 -08:00 |
|
Dane Springmeyer
|
5a7de9c0db
|
remove uneeded default cases
|
2012-02-24 18:58:12 -08:00 |
|
Dane Springmeyer
|
8cb23ca382
|
remove uneeded default cases
|
2012-02-24 18:57:37 -08:00 |
|
Dane Springmeyer
|
74502b9d15
|
remove uneeded default cases
|
2012-02-24 18:56:58 -08:00 |
|
Dane Springmeyer
|
039e850572
|
add python test formatting to makefile
|
2012-02-24 18:55:47 -08:00 |
|
Dane Springmeyer
|
954eb5c539
|
reduce usage of boost::lexical_cast during map parsing by using spirit2-based conversion functions - refs #1055
|
2012-02-24 18:26:48 -08:00 |
|
Dane Springmeyer
|
2f134657b4
|
speed up xml loading by avoiding repeated grammar creation - refs #1028 (TODO - still need to handle text/shield expressions)
|
2012-02-24 16:34:39 -08:00 |
|
Dane Springmeyer
|
b1f5f701cc
|
Merge branch 'master' of github.com:mapnik/mapnik
|
2012-02-24 16:27:37 -08:00 |
|
Dane Springmeyer
|
128f43bc79
|
remove used functions in ptree_helpers.hpp
|
2012-02-24 16:25:46 -08:00 |
|
Dane Springmeyer
|
e4ce3d1929
|
cast to avoid msvc warning
|
2012-02-24 16:14:34 -08:00 |
|
Dane Springmeyer
|
adcce7102d
|
be explicit to avoid compile error if includes change
|
2012-02-24 16:14:02 -08:00 |
|
Hermann Kraus
|
1906cddf04
|
Improve error messages.
|
2012-02-25 00:57:05 +01:00 |
|
Dane Springmeyer
|
3839dd363f
|
more pep8 for tests
|
2012-02-24 13:15:48 -08:00 |
|
Dane Springmeyer
|
0a37a1591e
|
fixup whitespace with pep8 tricks from https://gist.github.com/1903033
|
2012-02-24 13:13:56 -08:00 |
|
Dane Springmeyer
|
a917b7b410
|
fix the ability of external libraries to link mapnik on windows
|
2012-02-24 11:32:16 -08:00 |
|
Artem Pavlenko
|
4aa957d373
|
Merge remote-tracking branch 'origin/master'
|
2012-02-24 18:09:15 +00:00 |
|
Artem Pavlenko
|
917e684bdd
|
dummy decrement() and advance(p) to compile with vc10 (untested)
|
2012-02-24 18:07:13 +00:00 |
|
Dane Springmeyer
|
2a4fa323cf
|
declare feature_impl and context_type for windows symbol visibility
|
2012-02-24 09:25:32 -08:00 |
|
Hermann Kraus
|
99a3c9fec9
|
Remove multiple consecutive empty <xmltext> nodes.
|
2012-02-24 12:37:23 +01:00 |
|
Dane Springmeyer
|
dccaff73d9
|
Merge branch 'master' of github.com:mapnik/mapnik
|
2012-02-23 18:55:59 -08:00 |
|
Dane Springmeyer
|
9c2e0f478a
|
c++ style
|
2012-02-23 18:55:48 -08:00 |
|
Dane Springmeyer
|
37d76eccb4
|
Add explicit header
|
2012-02-23 18:55:20 -08:00 |
|
Dane Springmeyer
|
e88b8c9cac
|
boost 1.42 compatibility
|
2012-02-23 15:52:04 -08:00 |
|
Dane Springmeyer
|
871650a3c2
|
specialize string2int conversion to avoid std::string ctor
|
2012-02-23 13:11:25 -08:00 |
|
Dane Springmeyer
|
84daf7a2ad
|
Merge branch 'master' of https://github.com/mapnik/mapnik
|
2012-02-23 11:48:59 -08:00 |
|
Dane Springmeyer
|
02eb9067e0
|
fix linking with msvc by declaring text_placements
|
2012-02-23 11:47:45 -08:00 |
|