artemp
|
17e1061536
|
Merge branch 'custom-variant-2'
|
2014-08-13 13:11:31 +01:00 |
|
artemp
|
e8b7d50ebb
|
feature_generator_grammar - fix escaping
|
2014-08-13 13:06:38 +01:00 |
|
artemp
|
4ebd824368
|
make to_expression_string accept quotting char (default: '\'')
|
2014-08-13 13:05:22 +01:00 |
|
artemp
|
c8148f780e
|
comment out implicitly_convertible<mapnik::value_bool, mapnik::symbolizer_base::value_type>();
|
2014-08-13 13:04:49 +01:00 |
|
artemp
|
6972bc30d2
|
use mapnik_value_type promotion traits for better type mapping
in symbolizer and params + move mapnik_value_type traits to
value_types.hpp
|
2014-08-13 10:22:43 +01:00 |
|
artemp
|
1d02eb0d1d
|
Merge branch 'master' into custom-variant-2
|
2014-08-13 09:06:58 +01:00 |
|
Dane Springmeyer
|
6ec3905fc5
|
fix redefinition warnings + dodge a compile error due to clashing toupper in python + clib by using iosfwd - closes #2355
|
2014-08-12 23:52:31 -07:00 |
|
Dane Springmeyer
|
5db9daaff1
|
fix compile error in svg_renderer_tests/path_element_test.cpp - refs #2355
|
2014-08-12 23:37:29 -07:00 |
|
Dane Springmeyer
|
522417835b
|
Merge pull request #2354 from kernelsanders/master
add ogr plugin error handling to master/3.x
|
2014-08-12 23:20:27 -07:00 |
|
Dane Springmeyer
|
7da05accc0
|
Merge branch 'master' of github.com:mapnik/mapnik into custom-variant-2
|
2014-08-12 23:19:26 -07:00 |
|
Joel Brown
|
c517b20237
|
add ogr plugin error handling to master/3.x
|
2014-08-12 23:09:42 -07:00 |
|
Dane Springmeyer
|
44844f7bd0
|
postgis: disable NOTICES by default - refs #2296
|
2014-08-12 20:30:34 -07:00 |
|
Dane Springmeyer
|
78258a9459
|
quiet pgraster tests by default
|
2014-08-12 20:30:21 -07:00 |
|
Dane Springmeyer
|
e4c7e2419c
|
make sure pgraster is rebuilt if headers change inside the postgis plugin dir
|
2014-08-12 20:29:51 -07:00 |
|
Dane Springmeyer
|
e03448ecb9
|
port pg_raster plugin to c++11/recent 3.x changes
|
2014-08-12 15:14:25 -07:00 |
|
Dane Springmeyer
|
4e12b999f0
|
pull in pgraster plugin by @strk from 2.3.x to master/3.x - refs #2329 #1660
|
2014-08-12 15:03:51 -07:00 |
|
Dane Springmeyer
|
8b6a0a32f6
|
improve interior position algorithm - patch from @mrwojo - closes #2137
|
2014-08-12 14:42:51 -07:00 |
|
Dane Springmeyer
|
a000df5e46
|
add testcase from #2137
|
2014-08-12 14:33:59 -07:00 |
|
Dane Springmeyer
|
04a9a050a7
|
note png8 default change in master changelog still (no longer 2.3.x) - refs #2110
|
2014-08-12 13:50:56 -07:00 |
|
Dane Springmeyer
|
9b789a398b
|
remove bilinear8 from master/3.x - closes #2076
|
2014-08-12 13:43:37 -07:00 |
|
artemp
|
9f8b88ae4d
|
we do need <iostrea> in non-debug
|
2014-08-12 20:08:52 +01:00 |
|
artemp
|
6136a32092
|
Merge branch 'master' into custom-variant-2
|
2014-08-12 19:44:37 +01:00 |
|
Dane Springmeyer
|
c604e925f5
|
apply #2350 to master/3.x too
|
2014-08-12 11:44:34 -07:00 |
|
Dane Springmeyer
|
072a914906
|
add visual test confirming ttc are read okay - refs #2274
|
2014-08-12 11:34:48 -07:00 |
|
Dane Springmeyer
|
5b3340413b
|
update visual tests after fix in 04e4b47 - refs #2348
|
2014-08-12 11:33:52 -07:00 |
|
Dane Springmeyer
|
04e4b47d91
|
stricter string2bool conversion - refs #2348
|
2014-08-12 11:33:20 -07:00 |
|
Dane Springmeyer
|
3715217b2d
|
Add string2bool test
|
2014-08-12 11:32:34 -07:00 |
|
Dane Springmeyer
|
bd66ead3fd
|
adapt csv tests to boolean change - refs #1540
|
2014-08-12 11:32:02 -07:00 |
|
Dane Springmeyer
|
a13fa6720a
|
csv: parse true/false as boolean in csv plugin - closes #1540
|
2014-08-12 11:16:05 -07:00 |
|
artemp
|
fb2dd283c0
|
fix DEBUG=yes compilation
|
2014-08-12 19:10:32 +01:00 |
|
artemp
|
b38dc14188
|
fix include order and ensure mapnik/config.hpp is before boost_shim_..
|
2014-08-12 18:44:11 +01:00 |
|
Dane Springmeyer
|
c55a3c3130
|
csv plugin: support conversion to boolean types - closes #1540
|
2014-08-12 10:00:37 -07:00 |
|
artemp
|
82142a54cc
|
fix compiler warnings
|
2014-08-12 17:43:04 +01:00 |
|
artemp
|
f57f3a7f83
|
ammend topojson_grammar and remove last boost::variant usage
|
2014-08-12 16:16:17 +01:00 |
|
artemp
|
7f8e18f89b
|
cleanup
|
2014-08-12 16:15:57 +01:00 |
|
artemp
|
95cea92a4a
|
convert all boost::variant to util::variant
apart from topojson (TODO)
|
2014-08-12 13:40:45 +01:00 |
|
artemp
|
8c7be886bd
|
fix typo - uncomment column_collector
|
2014-08-12 10:47:29 +01:00 |
|
artemp
|
e5c316ae0b
|
Merge branch 'master' into custom-variant-2
|
2014-08-12 10:41:58 +01:00 |
|
artemp
|
3f8c459195
|
make mapnik::symbolizer a mapnik::util::variant<Symbolizers...>
|
2014-08-12 10:40:38 +01:00 |
|
Dane Springmeyer
|
f76ea12700
|
enable other test from #2349
|
2014-08-11 23:08:17 -07:00 |
|
Dane Springmeyer
|
80aeceafc7
|
remove duplicate typedef for dash_array
|
2014-08-11 22:22:12 -07:00 |
|
Dane Springmeyer
|
01c6b42269
|
Merge pull request #2349 from plepe/allow-overlap-ignore-placement
allow-overlap, ignore-placement
|
2014-08-11 19:54:51 -07:00 |
|
Dane Springmeyer
|
fe31aed576
|
fix #2274 in master/3.x
|
2014-08-11 19:50:50 -07:00 |
|
Dane Springmeyer
|
a966929571
|
add license ref for NotoSans
|
2014-08-11 19:26:26 -07:00 |
|
Dane Springmeyer
|
19c6e26c5c
|
tests for ttc support in master/3.x - refs #2274
|
2014-08-11 19:25:30 -07:00 |
|
Jordan Hollinger
|
c63e3a55f1
|
Merge branch 'master' of github.com:mapnik/mapnik into jh-min-repeat-distance
|
2014-08-11 17:43:51 -04:00 |
|
Dane Springmeyer
|
bbeb9fb631
|
disable font test until #2341 is fixed [skip ci]
|
2014-08-11 12:31:24 -07:00 |
|
Dane Springmeyer
|
7a0d316593
|
update visual tests after fix from 9a1639a1d6
|
2014-08-11 11:47:11 -07:00 |
|
artemp
|
eabba25948
|
fix cairo_renderer usage in demo/viewer + revert aac69d0b34
|
2014-08-11 15:43:38 +01:00 |
|
artemp
|
9a1639a1d6
|
AGG/Cairo - fix pattern opacity
|
2014-08-11 15:42:45 +01:00 |
|