Commit graph

7380 commits

Author SHA1 Message Date
Dane Springmeyer
bad6aa9d43 disable failing test in 2.3.x branch - refs #2438 2014-09-30 17:59:57 -07:00
Dane Springmeyer
40a0326130 match fix from #2466 in 2.3.x branch (although no obvious benefit) 2014-09-30 15:54:25 -07:00
Dane Springmeyer
6e8f02c343 drop auto-parallelization of build to stay consistent with master 2014-09-26 13:08:21 -07:00
Dane Springmeyer
bb569bae3b sync text rendering style between master and 2.3.x branch - refs #2326 2014-09-26 12:55:07 -07:00
Dane Springmeyer
a54f621d98 fix make clean - refs #2112 2014-09-24 16:01:32 -07:00
Dane Springmeyer
e2ea6e487d fix return of painted in grid_renderer 2014-09-19 14:34:17 -07:00
Dane Springmeyer
b8d497844a enable painted for svg_renderer 2014-09-19 14:15:59 -07:00
Dane Springmeyer
c2385437f1 apply fix from #2418 to 2.3.x branch 2014-09-19 14:15:21 -07:00
Dane Springmeyer
faa87d42e5 unmask now fixed raster warping test - amends db39528231 - refs #1913 2014-09-11 10:26:12 -07:00
artemp
b0cfbdf2b7 disable AA when warping images #1913
Conflicts:
	src/warp.cpp
2014-09-11 10:26:12 -07:00
Sean Gillies
648dea63ac Fix install doc formatting. 2014-09-04 10:21:12 -06:00
Dane Springmeyer
afe770a708 Merge pull request #2406 from mapnik/user-specified-python
Allow user to specify a python executable.
2014-09-03 15:53:52 -07:00
Sean Gillies
c1e47cc5df 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.¬
2014-09-03 16:00:12 -06:00
Dane Springmeyer
9c548771ce remove useless svg renderer tests 2014-09-02 22:41:24 -07:00
Dane Springmeyer
5ae55a07e2 Merge pull request #2393 from strk/2.3.x-pgis-simplify-20th
Bring postgis simplification factor back to 1/20 of a pixel
2014-08-26 21:25:14 -07:00
Sandro Santilli
22a8946f62 Bring postgis simplification factor back to 1/20 of a pixel
This was the value in 2.2.x and was accidentally changed as part
of a completely unrelated commit, see:
http://github.com/mapnik/mapnik/issues/1639#issuecomment-53388951
2014-08-26 13:00:32 +02:00
Dane Springmeyer
5e96d5d54b fix gdal compile with msvs 2013 - closes #2257 2014-08-25 17:51:11 -07:00
Dane Springmeyer
c0e8fba619 add support for windows unicode paths in rapidxml loader 2014-08-25 14:50:58 -07:00
Dane Springmeyer
b221d571c5 avoid warning from boost geometry 2014-08-24 15:58:44 -07:00
Dane Springmeyer
5103e84ade fix compile with boost 1.56 - refs #2368 2014-08-24 15:58:28 -07:00
Dane Springmeyer
c7cca17494 fix avoid-edges support for shields - closes #983 2014-08-21 23:51:03 -07:00
Dane Springmeyer
3d5655f7e5 update expected visual images after fix for #2381 2014-08-21 23:46:41 -07:00
Dane Springmeyer
bfedde3cc6 visual tests: don't exit without reporting 2014-08-21 23:36:51 -07:00
Dane Springmeyer
5651a8b9db fix collsion box for shields when scale_factor is used #2381 2014-08-21 23:36:27 -07:00
Dane Springmeyer
3db8d34117 testcase for #983 against 2.3.x 2014-08-21 23:11:14 -07:00
Dane Springmeyer
7e725e59e1 Merge pull request #2380 from mapnik/travis-gdal
Travis gdal
2014-08-21 16:34:00 -07:00
Dane Springmeyer
a2ee09646e travis: re-enable devel for proj + image libs 2014-08-21 16:16:46 -07:00
Dane Springmeyer
ef6cabfa8a backport geojson plugin fixes from master - refs #2319 and 2367 2014-08-21 15:56:46 -07:00
Dane Springmeyer
df205e9b34 travis: another attempt at getting both gdal+postgis going - refs #2353 2014-08-21 15:28:18 -07:00
Dane Springmeyer
36bd809361 Merge pull request #2372 from strk/2.3.x-pgraster-credit
Add mention of CartoDB support in pgraster input plugin code
2014-08-20 08:42:26 -07:00
Sandro Santilli
743404d88c Add mention of CartoDB support in pgraster input plugin code 2014-08-20 17:22:44 +02:00
Dane Springmeyer
14b6ba951e tests: fix postgis/pgraster tests if lack of connection 2014-08-19 13:52:03 -07:00
Dane Springmeyer
f939a8f8e7 adapt to new rtree interface in boost geometry >= 1.56 - refs #2367 2014-08-19 13:51:32 -07:00
Dane Springmeyer
d62365cd64 adapt to ptree change in boost 1.56 - closes #2365 2014-08-19 09:07:30 -07:00
Dane Springmeyer
f3495c3e67 fix css_grammar compile error with boost 1.56 - close #2366 2014-08-19 09:06:40 -07:00
Dane Springmeyer
542deba997 fix compile with older OGR 2014-08-18 21:33:18 -07:00
Dane Springmeyer
0be6c2d7e1 don't throw for OGR layers with no features - refs #2260 #2352 #2354 2014-08-15 19:48:27 -07:00
Dane Springmeyer
422f3bd8b0 add RESPECT mode to make 'fixing' of bbox aspect a no-op on map 2014-08-14 20:25:53 -07:00
Dane Springmeyer
a616e9d7e7 postgis: disable NOTICES by default - refs #2296 2014-08-12 20:27:01 -07:00
Dane Springmeyer
a968f972e0 quiet pgraster tests by default 2014-08-12 20:27:01 -07:00
Dane Springmeyer
b302929fb4 make sure pgraster is rebuilt if headers change inside the postgis plugin dir 2014-08-12 20:27:01 -07:00
Dane Springmeyer
e458959ea3 remove unused function 2014-08-12 20:27:01 -07:00
Dane Springmeyer
f566df3fca Merge pull request #2352 from kernelsanders/2.3.x
ogr plugin extent error handling
2014-08-12 17:32:08 -07:00
Dane Springmeyer
cb3281e3a4 travis: disable gdal 2014-08-12 16:41:14 -07:00
Dane Springmeyer
9f2ceb71f1 travis: try upgrading postgis from ubuntugis repo 2014-08-12 16:36:22 -07:00
Dane Springmeyer
df8aa14f9a travis: try by declaring libgdal1h=1.10.0-1~precise1 2014-08-12 16:06:44 -07:00
Dane Springmeyer
60974742e7 travis: try without ubuntugis-unstable 2014-08-12 16:02:41 -07:00
Dane Springmeyer
3032c836a8 travis: see if postgis works with default postgres 2014-08-12 15:56:41 -07:00
Dane Springmeyer
435ebbad91 travis: create and init template_postgis 2014-08-12 15:26:57 -07:00
Dane Springmeyer
ce5d5e4b4c Merge pull request #2329 from strk/2.3.x-pgraster2
Implement input plugin for PostGIS Rasters
2014-08-12 14:53:56 -07:00