Commit graph

9218 commits

Author SHA1 Message Date
Dane Springmeyer
523cb96e22 fix wkt_multi_generator typedef - previously accidentally matched mapnik::geometry_container - bug spotted by @mojodna - refs #2098 2013-11-30 16:55:25 -08:00
Dane Springmeyer
199b550e98 fix wkt_multi_generator typedef - previously accidentally matched mapnik::geometry_container - bug spotted by @mojodna - refs #2098 2013-11-30 16:53:39 -08:00
artemp
c98903b7a6 make Map equality comparable (work-in-progress) 2013-11-29 17:00:40 +00:00
artemp
c8466ae654 use static_assert 2013-11-29 17:00:40 +00:00
Artem Pavlenko
36bacf3d91 Merge pull request #2097 from MapQuest/mla-expr-v2-cairo
Cairo support in expr-v2 branch
2013-11-29 08:58:03 -08:00
Matt Amos
ca3d66236c Taking out unnecessary member variable added in 1a22a19a. 2013-11-29 16:37:20 +00:00
Matt Amos
1a22a19a95 Update Cairo renderer so that it compiles. 2013-11-29 16:23:44 +00:00
artemp
85dfd045ec reduce verbosity :D 2013-11-29 14:38:44 +00:00
artemp
06592cedc3 re-use evaluator object 2013-11-29 14:10:58 +00:00
artemp
a1c2bd0d86 pass filter_type by r-value 2013-11-28 15:13:22 +00:00
artemp
62c06eabcc don't set -stdlib in CXXGLAGS 2013-11-28 15:11:31 +00:00
artemp
9e686b519f fix path 2013-11-28 15:10:59 +00:00
Dane Springmeyer
e9ca9c8790 symbolizer-expressions replayed against latest master 2013-11-27 22:50:15 -08:00
artemp
eb3da7d32d c++11 : use nullptr instead of NULL 2013-11-27 15:54:16 +00:00
Dane Springmeyer
3e69c337d2 tests: prefer testing png encoded bytes 2013-11-22 16:41:46 -08:00
Dane Springmeyer
529095d739 Actually convert the python tests - finishes #1460 2013-11-22 16:41:27 -08:00
Dane Springmeyer
adc7ae587d add has_svg_renderer status to python bindings 2013-11-22 15:50:48 -08:00
Dane Springmeyer
dffd0a6e9e add has_svg_renderer status to python bindings 2013-11-22 15:49:39 -08:00
Dane Springmeyer
9a184d73a3 travis: abandon clang++ builds since travis appears unable to use upgraded clang (unlike stock precise) 2013-11-22 15:39:54 -08:00
Dane Springmeyer
9e192c920d tests: update expected cairo outputs after #2087 2013-11-22 21:56:19 +00:00
Dane Springmeyer
e7b32d0899 travis: yes to apt 2013-11-22 13:47:50 -08:00
Dane Springmeyer
46de22da2c use bash in all shell scripts 2013-11-22 13:46:05 -08:00
Dane Springmeyer
cb39896a1f travis: fix typo 2013-11-22 13:42:42 -08:00
Dane Springmeyer
6c63b56fe4 travis: upgrade llvm/clang++ to support c++11 2013-11-22 13:38:08 -08:00
Dane Springmeyer
1eceb18f1e Merge pull request #2088 from plepe/patch-1
INSTALL.md: Add harfbuzz dependency
2013-11-22 13:05:50 -08:00
Dane Springmeyer
1a99020e94 travis: fix typo in variable name 2013-11-22 13:04:17 -08:00
Dane Springmeyer
ff92370c37 travis: further partition c++ from python dependent tests 2013-11-22 12:35:14 -08:00
Dane Springmeyer
49dfa7486f travis: parallize tests: http://about.travis-ci.org/blog/2012-11-28-speeding-up-your-tests-by-parallelizing-them/ 2013-11-22 12:07:58 -08:00
Dane Springmeyer
c3d31993b8 fix return code for python run tests 2013-11-22 12:07:07 -08:00
Dane Springmeyer
38a059298b add localize.sh script that tests can source to run locally 2013-11-22 12:01:32 -08:00
Dane Springmeyer
66347f78e6 rework tests: always run locally 2013-11-22 12:01:02 -08:00
Stephan Bösch-Plepelits
07c3714045 INSTALL.md: Add harfbuzz dependency 2013-11-22 15:35:24 +01:00
Dane Springmeyer
37eaae3a51 travis: build harfbuzz on the fly 2013-11-22 00:52:49 -08:00
Dane Springmeyer
1b71a91668 update expected test grids post #2087 2013-11-22 00:47:47 -08:00
Dane Springmeyer
20a99999dd update expected test images post #2087 2013-11-22 00:47:43 -08:00
Dane Springmeyer
f0a2189de0 Merge pull request #2087 from mapnik/harfbuzz-merge
Improved support for international text
2013-11-22 00:35:30 -08:00
Dane Springmeyer
64d5153aea Improved support for international text
- Implementation by @herm for GSOC 2012 (http://mapnik.org/news/2012/10/06/gsoc2012-status9/)
 - C++11 port, improvements, optimizations by @artemp
 - Testing and integration with master by @springmeyer
 - Thank you to all the support from @behdad along the way
 - Thanks for help testing @toton6868, @stephankn, @nirvn, @mfrasca, @simonsonc and many others

Refs: #2073,#2070,#2038,#2037,#1953,#1820,#1819,#1714,#1634,#1547,#1532,#1319,#1208,#1154,#1146
2013-11-22 00:06:32 -08:00
Dane Springmeyer
59a1eb1382 travis: pull gdal 2013-11-22 00:00:47 -08:00
Dane Springmeyer
821c1aae74 travis: build verbose 2013-11-21 23:54:56 -08:00
Dane Springmeyer
622f95ec28 text rendering benchmark 2013-11-21 22:47:55 -08:00
Dane Springmeyer
e5bb5ed8aa backport geojson parsing/generation fixes from master to 2.3.x - refs #2083 2013-11-21 14:11:47 -08:00
Dane Springmeyer
7b9ca29f60 remove unused code 2013-11-21 13:29:04 -08:00
Dane Springmeyer
e4460150d3 merge with branch 2.3.x 2013-11-21 13:23:27 -08:00
Dane Springmeyer
1c56f0dc19 Merge branch '2.3.x' of github.com:mapnik/mapnik 2013-11-21 13:09:52 -08:00
Dane Springmeyer
cab6d239f2 apply 5eb406c7df to non PHOENIX_V3 code 2013-11-21 13:09:18 -08:00
Dane Springmeyer
5c15ba9e86 add tests for geojson empty/null geoms - #2083 2013-11-21 12:09:55 -08:00
artemp
9d7d024cf4 geojson parser : add phoenix v2 not_empty implementation 2013-11-21 10:10:43 +00:00
artemp
2b8b71fc98 geojson generator : catch empty geometries early
```json
{"type":"Feature","id":1,"geometry":null,"properties":{}}
```
2013-11-21 10:10:43 +00:00
artemp
4aa3023a9d cleanup commented out code 2013-11-21 10:10:43 +00:00
artemp
f50e626661 Revert "geojson parser : support 'null' as valid coordinates property (empty geometry)"
Per GeoJSON spec :

```
A GeoJSON geometry object of any type other than "GeometryCollection" must have a member with the name "coordinates". The value of the coordinates member is always an array. The structure for the elements in this array is determined by the type of geometry.
```

This reverts commit f9ed2ce4e2d623c14df247db0025a549be29d75c.
2013-11-21 10:10:43 +00:00