Blake Thompson
735ac5a6e1
Updated visual tests
2015-06-08 21:00:36 -05:00
Blake Thompson
e9ff7b9339
Merge branch 'master' into offset
2015-06-08 20:53:41 -05:00
Dane Springmeyer
c9293b8fd0
actually fix #2894 - refs #2202
2015-06-08 18:51:13 -07:00
Blake Thompson
42de75593d
Updated unit test to be correct
2015-06-08 20:32:21 -05:00
Blake Thompson
a74c4abe57
Reverted to original offset directions for now
2015-06-08 19:33:00 -05:00
Blake Thompson
eb5ca2af87
Merge branch 'offset' of github.com:mapnik/mapnik into offset
2015-06-08 17:13:58 -05:00
Blake Thompson
7aa7860b65
Added tests to offset
2015-06-08 17:13:02 -05:00
Dane Springmeyer
8af1b2def6
Merge branch 'master' of github.com:mapnik/mapnik into offset
2015-06-08 14:22:08 -07:00
Dane Springmeyer
bca0fb872c
update visual test images after #2894
2015-06-08 14:21:00 -07:00
Dane Springmeyer
2a01b2da03
Merge branch 'master' of github.com:mapnik/mapnik into offset
2015-06-08 13:54:04 -07:00
Jiri Drbalek
76b7466719
fix rendering raster without scaling
2015-06-08 17:31:56 +00:00
artemp
82a8735ef8
Merge branch 'master' into large_csv
2015-06-08 17:21:25 +01:00
Dane Springmeyer
fad969421f
ensure visual tests compile if GRID_RENDERER is disabled
2015-06-06 12:42:00 -07:00
Dane Springmeyer
583fbaec14
fix test compile if cairo is disabled
2015-06-06 12:30:56 -07:00
Dane Springmeyer
d7bffd51f2
shuffle marker_helpers includes
2015-06-06 08:19:54 -07:00
Dane Springmeyer
29c9e97d76
minor code cleanup in process_group_symbolizer
2015-06-06 08:09:06 -07:00
artemp
ce33e2d3cc
Merge branch 'master' into large_csv
2015-06-06 10:39:17 +01:00
Blake Thompson
68c5d07634
Merge pull request #2888 from mapycz/makefile-non-bash
...
fix make python for non-bash shells
2015-06-05 17:40:45 -05:00
Blake Thompson
4de33bd483
Updated offset so that it only requires onetime through and rewind is not required to be called. This was done because some adapters do not respond well to rewind.
2015-06-05 17:12:42 -05:00
Blake Thompson
35f4ae5bc7
Tune threshold some for offset converter
2015-06-05 12:03:52 -05:00
Jiri Drbalek
d3baf8041a
fix make python for non-bash shells
2015-06-05 15:14:31 +00:00
Blake Thompson
c3574c1008
Initial commit changing offsets
2015-06-05 10:04:24 -05:00
artemp
f208717070
fix spelling
2015-06-04 17:21:08 +01:00
artemp
e0e46eb3a8
csv plugin : add file_length standalone helper, make file_length local variable
2015-06-04 17:21:08 +01:00
Dane Springmeyer
dcfa0b655c
fix #2863 by adding back compatibility of point symbolizer interior placement on point geometries + update visual tests
2015-06-04 07:45:44 -07:00
Dane Springmeyer
a38cc2aab6
disable tiff test on windows - closes #2838
2015-06-03 15:04:50 -07:00
Dane Springmeyer
e17505686c
fix compile - followup to #2880
2015-06-03 14:16:30 -07:00
Dane Springmeyer
3b0cc75182
Merge pull request #2884 from mapycz/ignore-mapnik-settings-env
...
add mapnik-settings.env to .gitignore
2015-06-03 14:04:19 -07:00
Dane Springmeyer
4bf4bb0104
Merge pull request #2880 from zerebubuth/fix/rapidxml-loader-trim-whitespace
...
Fix rapidxml XML loader to trim whitespace
2015-06-03 14:03:53 -07:00
Matt Amos
1778d19b22
Added headers required on Mac OS - not sure why not on Linux.
2015-06-03 15:56:37 +01:00
artemp
42e1adca84
c++11 - use std::bind
2015-06-03 14:00:14 +01:00
Jiri Drbalek
fa35e1c193
update test data
2015-06-03 13:10:57 +00:00
Jiri Drbalek
aa8197bd6c
add mapnik-settings.env to .gitignore
2015-06-03 12:01:12 +00:00
Artem Pavlenko
a235316573
Merge pull request #2883 from mapycz/missing-style
...
better handling of missing styles
2015-06-03 11:54:06 +01:00
Jiri Drbalek
27ba7483be
xml loader: throw on missing style for strict parsing
2015-06-03 10:36:50 +00:00
artemp
3a4c67c9d6
Merge remote-tracking branch 'origin/master'
2015-06-03 11:30:57 +01:00
Artem Pavlenko
bd4504331d
Merge pull request #2882 from mapnik/remove_clipper
...
Removed angus clipper library from code and updated all visual tests …
2015-06-03 11:30:29 +01:00
artemp
3c159f7163
remove unused dump_xml.hpp
2015-06-03 11:18:32 +01:00
Jiri Drbalek
abf64342f9
raise missing style message to MAPNIK_LOG_ERROR
2015-06-03 10:04:33 +00:00
Blake Thompson
a138b8717d
Removed angus clipper library from code and updated all visual tests to master
2015-06-02 14:14:21 -05:00
Matt Amos
dd112b33e2
Added visibility attribute to XML symbols.
...
Thanks to @flippmoke, symbol visibility is exactly the cause of
the previous compilation error. Until it's decided whether or not
to turn this off (at least for testing & coverage builds?), I've
added the necessary annotations to allow it to compile.
2015-06-02 18:10:59 +01:00
artemp
8fa314c418
follow up from be731f17ce - fix read_polyline (-fsanitize=address)
2015-06-02 17:50:10 +01:00
Matt Amos
b21ed59190
Add test for XML parser whitespace trimming behaviour.
...
This tests the at the XML parser trims whitespace from XML text
nodes. This was already the behaviour of the libxml2 parser, but
not the rapidxml parser.
Note that this makes #2878 pass for the rapidxml parser as well
as the libxml2 parser. It seems that Travis uses the rapidxml
parser only.
2015-06-02 17:50:08 +01:00
Matt Amos
5616d406b4
Trim whitespace in rapidxml parser text nodes.
...
The libxml parser already trims text nodes, which leads to a
difference in behaviour when reading map style XML. This patch
normalises the behaviour between the two.
2015-06-02 17:50:08 +01:00
artemp
8e1e5f19d1
Merge remote-tracking branch 'origin/master'
2015-06-02 15:39:35 +01:00
artemp
59b69846fe
Merge remote-tracking branch 'origin/master'
2015-06-02 15:39:01 +01:00
artemp
90a27abccb
catch and remove more spurious std::move's
2015-06-02 15:36:31 +01:00
Dane Springmeyer
f8370acc9c
fix a few files that need utf_conv_win.hpp
2015-06-02 07:14:31 -07:00
artemp
82a98a6d85
catch and remove more spurious std::move's
2015-06-02 14:48:02 +01:00
artemp
df4226a825
remove spurious std::move's (clang - moving a temporary object prevents copy elision [-Wpessimizing-move])
2015-06-02 14:26:35 +01:00
