artemp
793a2f9ffb
better not to rely on implicit conversion to bool but use pointer comparison with nullptr
2015-06-10 11:42:34 +01:00
artemp
e5f1379fea
handle escape characters
2015-06-10 11:41:45 +01:00
artemp
cb832c0964
format
2015-06-10 11:41:28 +01:00
artemp
f1feedc54c
Merge branch 'master' into large_csv
2015-06-10 11:14:19 +01:00
artemp
8e30a89522
remove wkt_generator_grammar_int to minimise code duplication
...
remove redundant template parameter - we can deduce coord_type from Geometry
add coord generator traits to control generator instantiation at compile time
2015-06-10 11:10:17 +01:00
artemp
89d258743a
use inheritance to define geometry ( struct geometry : geometry_base<T> ) + provide value_type type alias in geometry
2015-06-10 10:55:34 +01:00
Blake Thompson
08602392a3
Merge branch 'master' into offset
2015-06-09 13:18:31 -05:00
Blake Thompson
d209e5bc33
After some tweaking determined what I feel like are the best values for threshold and limiting sharp corners
2015-06-09 13:15:12 -05:00
Blake Thompson
dd104b0b1b
Updated offset converter to remove large spikes
2015-06-09 11:31:50 -05:00
artemp
989af2ea42
use csv_grammar to parse csv lines
2015-06-09 15:22:37 +01:00
artemp
11e58275e9
fix typedef's
2015-06-09 15:22:01 +01:00
Blake Thompson
75f7cb26bb
Reversed the offsets
2015-06-09 09:18:52 -05:00
artemp
f4ec97489d
add 'csv' dir
2015-06-09 10:33:01 +01:00
artemp
908f03bc19
add csv_grammar
2015-06-09 10:21:38 +01:00
artemp
35ff68a7ec
refactor - detect_separator free func
2015-06-09 10:17:55 +01:00
artemp
6bb95d2c85
Merge branch 'master' into large_csv
2015-06-09 09:58:53 +01:00
Dane Springmeyer
804e523e71
update tests after #2897
2015-06-08 19:06:43 -07:00
Dane Springmeyer
32d925b965
fix clipping regression on line patterns #2897 (proper tests depend on 2896)
2015-06-08 19:06:43 -07:00
Blake Thompson
66efe02224
Merge pull request #2898 from mapnik/offset
...
Offset Fix
2015-06-08 21:02:21 -05:00
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
