Commit graph

12729 commits

Author SHA1 Message Date
artemp
56c6a1ea62 Merge branch 'master' into geometry-refactor 2016-08-24 11:14:01 +01:00
artemp
603879f1c0 Merge remote-tracking branch 'origin/geometry-refactor' into geometry-refactor 2016-08-24 10:46:20 +01:00
artemp
fe007915df Revert "Revert "mapnik::variant - use std::tuple<Typess...> instead of mpl::vector<Types...> and remove Boost.MPL dependency""
and remove `<boost/fusion/adapted/std_tuple.hpp>`

This reverts commit b6cc48fd40.
2016-08-23 15:45:15 +01:00
Dane Springmeyer
f81583554a Merge branch 'master' of github.com:mapnik/mapnik into geometry-refactor 2016-08-22 16:19:17 -07:00
Dane Springmeyer
c6b1abcdb6 update mason deps and test data - refs mapnik/test-data#8 mapnik/test-data-visual#36 2016-08-22 15:12:25 -07:00
Dane Springmeyer
b6cc48fd40 Revert "mapnik::variant - use std::tuple<Typess...> instead of mpl::vector<Types...> and remove Boost.MPL dependency"
This reverts commit 6613222b84.
2016-08-22 11:40:06 -07:00
Dane Springmeyer
4dae4d43c5 restore test/data version - accidentally changed in 0ae2f1311c 2016-08-22 11:15:42 -07:00
Dane Springmeyer
0ae2f1311c update test data if UPDATE env set 2016-08-22 10:50:08 -07:00
artemp
6613222b84 mapnik::variant - use std::tuple<Typess...> instead of mpl::vector<Types...> and remove Boost.MPL dependency 2016-08-22 12:16:48 +01:00
artemp
7c45556138 update font path 2016-08-16 16:00:24 +01:00
artemp
1a29b35717 GeoJSON unit tests- ensure descriptors are ordered by name (ref #3494) 2016-08-16 15:46:10 +01:00
artemp
3788b2781e tiny format 2016-08-16 15:36:43 +01:00
artemp
f3252d00f4 expose "num_features_to_query" datasource parameter (ref #3495) 2016-08-16 10:55:56 +01:00
artemp
1e8f471448 minor formatting 2016-08-16 10:53:57 +01:00
artemp
b9279feee2 fix is_valid logic (ref #3494) 2016-08-15 12:49:43 +01:00
artemp
046c9638e1 GeoJSON - ensure descriptors order is consistent ( ref #3494) 2016-08-15 12:21:02 +01:00
artemp
0471f3369a add order_by_name helper method 2016-08-15 12:20:19 +01:00
artemp
008a6eb4cf test geojson - add empty featurecollection test 2016-08-15 10:44:54 +01:00
artemp
31814b32d0 rename empty_featureset => invalid_featureset to avoid ambiguity + add helper is_valid method 2016-08-15 10:41:30 +01:00
Dane Springmeyer
843f96083d update libwebp, always link mason packages 2016-08-12 16:00:21 -07:00
artemp
f9c321583f update CHANGELOG 2016-08-12 15:56:29 +01:00
artemp
5c11fe49f9 geoson+topojson tests - correct expected test data (ref #3491) 2016-08-12 11:05:50 +01:00
artemp
8dca305e7e json stringifier - add missing quoting in nested json objects (ref #3491) 2016-08-12 11:04:30 +01:00
artemp
9448901907 Merge branch 'windows-unicode' 2016-08-12 09:31:46 +01:00
artemp
cdad126fa3 Merge branch 'master' into windows-unicode 2016-08-12 09:31:29 +01:00
bergwerkgis
74d7726b2d remove unneeded 'u8' 2016-08-12 05:27:55 +00:00
artemp
5298a737c8 update deps 2016-08-11 15:57:22 +01:00
Dane Springmeyer
c777cc50d0 also install boost thread and python to ease python-mapnik build against masonized mapnik [skip ci] 2016-08-10 13:36:46 -07:00
Dane Springmeyer
53fb06e31a install consistent apt packages 2016-08-09 15:14:22 -07:00
Dane Springmeyer
4839b95072 install xutils to speed up mason install/link 2016-08-09 15:12:26 -07:00
Dane Springmeyer
3bfc358cb8 Merge pull request #3485 from mapnik/regex-unicode
Regex unicode
2016-08-09 14:58:51 -07:00
Dane Springmeyer
fc52a818d8 trigger new build 2016-08-09 14:30:13 -07:00
Dane Springmeyer
181feef253 bootstrap: exit trap not called when sourcing 2016-08-09 12:17:39 -07:00
Dane Springmeyer
8e84b6d853 stop caching mason_packages 2016-08-09 10:46:18 -07:00
Dane Springmeyer
f56c45b86b [bootstrap] upgrade to boost_regex package with icu + better error handling 2016-08-09 10:41:38 -07:00
artemp
2afae2a29b Expressions - more tests (ref #3483) 2016-08-09 16:25:59 +01:00
artemp
aa77eb4550 Expressions - add more regex tests to cover #3483 2016-08-09 16:13:12 +01:00
artemp
6eb7783f9e update data-visual 2016-08-08 12:21:31 +01:00
Artem Pavlenko
b0cf57aa53 Merge pull request #3477 from mapycz/cairo-style-level-comp-op
Style level comp-op and opacity for Cairo renderer
2016-08-08 10:52:54 +01:00
Artem Pavlenko
8d8442d647 Merge pull request #3480 from sebastic/spelling-errors
Fix spelling errors
2016-08-08 09:50:40 +01:00
Bas Couwenberg
2003415f09 Fix 'occured' typo, replace with 'occurred'. 2016-08-05 14:50:50 +02:00
Bas Couwenberg
388a8a7c4d Fix 'intialize' typo, replace with 'initialize'. 2016-08-05 14:49:45 +02:00
artemp
d09b6a4810 update font_registration test 2016-08-05 10:25:32 +01:00
artemp
f7fd102c34 update dejavu fonts to v2.37 2016-08-05 10:18:10 +01:00
artemp
922f4c4e1b update SCons to 2.5.0 2016-08-05 10:16:06 +01:00
artemp
4e66c69cf2 update unifont to the latest version 9.0.01 2016-08-05 10:15:31 +01:00
artemp
d9e04518a2 typo 2016-08-04 11:00:57 +01:00
artemp
0775e7bc3c more updates 2016-08-04 10:59:09 +01:00
artemp
9648099155 Add missing release date for 3.0.11 2016-08-04 10:54:39 +01:00
artemp
676d9184b4 update CHANGELOG in anticipation of v3.0.12 release 2016-08-04 10:53:04 +01:00