Commit graph

8687 commits

Author SHA1 Message Date
Dane Springmeyer
8b059b0d42 initial tests for marker avoid-edges - 2727eddf9 2014-09-05 09:25:34 -07:00
artemp
fef3d22154 support avoid-edges in all markers placements 2014-09-05 16:33:20 +01:00
artemp
2727eddf90 implement 'avoid-adges' for markers placements (point placement)
(TODO: support all placement types)
2014-09-05 16:19:55 +01:00
artemp
3cb047fc5c avoid callling TIFFs global structures ref #2391 2014-09-05 12:30:33 +01:00
artemp
aea77a7155 use generic_json types in topojson grammar
refactor value_converters into separate header
usd value_converters in geojson parser
2014-09-05 12:13:58 +01:00
Dane Springmeyer
a8ce980594 Merge pull request #2410 from pnorman/patch-1
Update memory requirements for g++ compiling
2014-09-05 00:31:06 -07:00
Paul Norman
0ed67daf10 Update memory requirements for g++ compiling
Compiling with g++ fails with out of ram on Launchpad VMs with 4GB RAM + 1 GB swap
2014-09-05 00:14:10 -07:00
Dane Springmeyer
035a947892 no need for harfbuzz-icu 2014-09-04 23:16:25 -07:00
Dane Springmeyer
492e084714 add copy ctor to rule: avoids last copy of syms in load_map - closes #1293 2014-09-04 22:03:54 -07:00
Dane Springmeyer
1c0de9e978 add visual test for fitting markers between text - refs #1666 2014-09-04 20:35:14 -07:00
Dane Springmeyer
ecdb12ac07 speed up topojson parsing - closes #2397 2014-09-04 20:26:52 -07:00
Dane Springmeyer
1b8e74e8a9 Merge branch 'master' of github.com:mapnik/mapnik 2014-09-04 20:02:42 -07:00
Dane Springmeyer
25a41ae31b restore value hash + add test harness 2014-09-04 19:38:53 -07:00
Dane Springmeyer
3025b0e9e4 fix save_map test on windows 2014-09-05 02:34:25 +00:00
Dane Springmeyer
41e07e3083 Merge pull request #2398 from mapnik/3x-msvs
Support for Windows 2013/2014 + C++11
2014-09-04 16:43:12 -07:00
Dane Springmeyer
3c1ad84f95 remove mapnik-config.bat 2014-09-04 16:40:37 -07:00
Dane Springmeyer
cdefc71488 Revert "start fixing visual tests to run on windows"
This reverts commit 79c6ab46a5.
2014-09-04 16:40:28 -07:00
Dane Springmeyer
d787e59718 remove gyp specific build files 2014-09-04 16:37:29 -07:00
Dane Springmeyer
7ee9f3268a Merge branch 'master' of github.com:mapnik/mapnik into 3x-msvs 2014-09-04 13:06:02 -07:00
Dane Springmeyer
f73eef6f7a rollback png8 default in 2.3.x - closes #2110 2014-09-04 12:08:47 -07:00
Dane Springmeyer
038cc41cd4 we are targeting 2014 so rollback 2013 CTP workarounds 2014-09-04 18:26:17 +00:00
Dane Springmeyer
eed46b87cf fix gdal,proj,icu share creation 2014-09-04 17:14:26 +00:00
Dane Springmeyer
2cc7c5a4f7 attempt to get all save_map tests working cross platform 2014-09-04 09:48:04 -07:00
Dane Springmeyer
7d5d02e031 Merge branch 'master' of github.com:mapnik/mapnik into 3x-msvs 2014-09-04 09:22:53 -07:00
Dane Springmeyer
c30f1715e6 Revert "workaround msvs variant init bug"
This reverts commit be44b647fa.
2014-09-04 09:22:43 -07:00
Dane Springmeyer
98c881432a Revert "attempt to workaround other mapnik_value_type->variant bugs"
This reverts commit 7dc1aed9ee.
2014-09-04 09:21:14 -07:00
artemp
72e2f4446f re-implement mapnik::value deriving from value_base and update across core
fix mapnik::value conversions in topojson plugin
2014-09-04 17:10:13 +01:00
artemp
0985cc907d remove copy converting ctor and fix converting move constuctor to use 'universal reference' and perfect forwarding
( re : http://isocpp.org/blog/2012/11/universal-references-in-c11-scott-meyers)
2014-09-04 14:54:42 +01:00
Sean Gillies
c52994ff8b Allow user to specify a python executable.¬
¬
Fall back on `python`. Unlike the solution in PR #2395 this¬
puts all the responsibility for selecting the right python in the¬
case that "python" is Python 3 on the user. I've followed the lead¬
of the Python documentation Makefile. See

http://hg.python.org/cpython/file/340d48347295/Doc/README.txt
http://hg.python.org/cpython/file/340d48347295/Doc/Makefile

Intent is that if your `python` is Python 2 everything works as
before and that is your `python` is Python 3 but you have a
`python2` you can specify that instead.¬

Conflicts:
	run_tests
2014-09-03 15:56:58 -07:00
Dane Springmeyer
b6bd5d744e travis: more debugging of mapnik-test-data 2014-09-03 12:29:10 -07:00
Dane Springmeyer
55a0ce5fdb update visual tests after #2399 2014-09-03 11:57:24 -07:00
Jiri Drbalek
67d8f41a1b fix angle calculation
Conflicts:
	src/text/vertex_cache.cpp
2014-09-03 11:53:23 -07:00
Dane Springmeyer
21d213a653 travis: debug mapnik-test-data 2014-09-02 13:17:35 -07:00
Dane Springmeyer
27fbd2dcbe add https://github.com/mapbox/mapnik-test-data to tests - /cc @GretaCB 2014-09-02 11:55:09 -07:00
Dane Springmeyer
58a8f19b16 add csv test with utf8 data inlined 2014-08-31 20:28:51 -07:00
Dane Springmeyer
4227862660 fix broken path remove on windows 2014-08-31 20:24:41 -07:00
Dane Springmeyer
dbdf9c8180 don't test whitespace 2014-08-31 20:14:15 -07:00
Dane Springmeyer
72ca8d6faa spruce up mapnik-config.bat 2014-08-31 20:09:39 -07:00
Dane Springmeyer
cfe79a6fe3 make sure postgis test does not run on windows if no server is availabl 2014-08-31 20:09:16 -07:00
Dane Springmeyer
f4ba1eba15 fixup python bootstrapping 2014-08-31 19:16:39 -07:00
Dane Springmeyer
d8f8831417 Merge branch 'master' of https://github.com/mapnik/mapnik into 3x-msvs 2014-08-31 17:51:38 -07:00
Dane Springmeyer
1ba744162b Add nik2img.cpp 2014-08-31 17:51:02 -07:00
Dane Springmeyer
afee619e63 support windows in nik2img.cpp 2014-08-31 17:32:48 -07:00
Dane Springmeyer
7dc1aed9ee attempt to workaround other mapnik_value_type->variant bugs 2014-08-31 17:18:15 -07:00
Dane Springmeyer
dcdd580f98 stash notes on getting python tests running 2014-08-31 13:58:38 -07:00
Dane Springmeyer
351c0894fa avoid inconsistent dll linkage warnings with python + switch back to python.org install 2014-08-31 13:58:25 -07:00
Dane Springmeyer
be44b647fa workaround msvs variant init bug 2014-08-31 12:44:12 -07:00
Dane Springmeyer
79c6ab46a5 start fixing visual tests to run on windows 2014-08-31 08:08:52 +00:00
Dane Springmeyer
18d759f0db reference fonts locally for now 2014-08-31 08:08:14 +00:00
Dane Springmeyer
6828dd5b1e get python bindings working 2014-08-31 07:45:26 +00:00