Dane Springmeyer
|
7de6c181ec
|
Merge pull request #2373 from strk/master-pgraster-credit
Add mention of CartoDB support in pgraster input plugin code
|
2014-08-20 08:42:30 -07:00 |
|
Sandro Santilli
|
01b56c3606
|
Add mention of CartoDB support in pgraster input plugin code
|
2014-08-20 17:31:41 +02:00 |
|
artemp
|
fd7682aab2
|
c++ pedantic
|
2014-08-20 16:11:27 +01:00 |
|
artemp
|
e4b3a46e3e
|
fix geojson plugin, even better name is geometry_index (to avoid confusion)
|
2014-08-20 16:08:41 +01:00 |
|
artemp
|
2d50a2dccc
|
topojson plugin : fix spatial index population, rename 'count' to 'index'
|
2014-08-20 16:00:12 +01:00 |
|
artemp
|
3c99514c85
|
GeoJSON : re-implement grammar to allow any order for "type", "coordinates" and "geometries" elements
Also, ammend positions parser to handle multi-dimensional coordinates e.g [x,y,z,....,N] (we only extract x and y)
|
2014-08-20 15:45:16 +01:00 |
|
artemp
|
1e4368e97a
|
fix compilation with boost < 1.56
|
2014-08-20 09:42:28 +01:00 |
|
Dane Springmeyer
|
9020b8c6df
|
adapt geojson+topojson plugins to boost 1.56 - refs #2367
|
2014-08-19 14:48:21 -07:00 |
|
Dane Springmeyer
|
7d23d49ecb
|
fix #2368
|
2014-08-19 14:47:03 -07:00 |
|
Dane Springmeyer
|
65bd9e6926
|
adapt to ptree change in boost 1.56 - closes #2365
Conflicts:
src/save_map.cpp
|
2014-08-19 09:08:33 -07:00 |
|
Dane Springmeyer
|
144d9a41f0
|
update expected test after 41064ed49d
|
2014-08-19 08:35:57 -07:00 |
|
artemp
|
59b089f65d
|
remove unused (after grammar refactor) support_multi_pass.hpp include
|
2014-08-19 16:04:31 +01:00 |
|
Dane Springmeyer
|
1e19ca2103
|
travis: drop removal of postgis
|
2014-08-18 21:36:36 -07:00 |
|
Dane Springmeyer
|
7c1f9b1490
|
fix compile with older OGR
|
2014-08-18 21:33:37 -07:00 |
|
Dane Springmeyer
|
51baf411c3
|
travis: give up on gdal
|
2014-08-18 21:32:59 -07:00 |
|
Dane Springmeyer
|
bc9102da82
|
travis: yet another try to keep postgis installed
|
2014-08-18 21:19:18 -07:00 |
|
Dane Springmeyer
|
c8def83cd5
|
travis: debug postgis
|
2014-08-18 21:10:21 -07:00 |
|
Dane Springmeyer
|
b86d063bf0
|
travis: another try at gdal
|
2014-08-18 20:39:37 -07:00 |
|
Dane Springmeyer
|
5e379fc00f
|
travis: alt gdal approach
|
2014-08-18 20:33:14 -07:00 |
|
Dane Springmeyer
|
ed568fcc2a
|
attempt to repair postgres install
|
2014-08-18 20:14:50 -07:00 |
|
Dane Springmeyer
|
58d9520c34
|
Travis: remove lto testing code
|
2014-08-18 20:11:29 -07:00 |
|
Dane Springmeyer
|
e768117862
|
update expected image after pixel snapping change
|
2014-08-18 20:11:20 -07:00 |
|
Dane Springmeyer
|
41064ed49d
|
pixel snapping for shields (and points) - closes #1866/refs #1316/amends 2fcd53134
|
2014-08-18 19:45:21 -07:00 |
|
Dane Springmeyer
|
e94b58f678
|
load_map: always parse transform so that xml warning keep working
|
2014-08-18 19:40:34 -07:00 |
|
Dane Springmeyer
|
d6c59d96ec
|
fix simply option + tests for #1484 and #1992
|
2014-08-18 19:23:50 -07:00 |
|
Dane Springmeyer
|
0e87d913ed
|
fix return type
|
2014-08-18 19:19:48 -07:00 |
|
Dane Springmeyer
|
5d424e9389
|
remove unneeded code
|
2014-08-18 19:19:38 -07:00 |
|
Dane Springmeyer
|
83b7ccb3ae
|
optimize set_symbolizer_property_impl
|
2014-08-18 15:37:46 -07:00 |
|
Dane Springmeyer
|
c1bceffb45
|
Travis: drop concurrent jobs for clang
|
2014-08-18 15:36:54 -07:00 |
|
artemp
|
58a78e0d9a
|
Merge branch 'MapQuest-jh-min-repeat-distance'
|
2014-08-18 14:05:33 +01:00 |
|
artemp
|
801848ac97
|
Merge branch 'jh-min-repeat-distance' of git://github.com/MapQuest/mapnik into MapQuest-jh-min-repeat-distance
Conflicts:
include/mapnik/renderer_common/process_group_symbolizer.hpp
src/text/text_properties.cpp
|
2014-08-18 14:05:14 +01:00 |
|
artemp
|
0f3b9e020d
|
Merge branch 'mapycz-3.x-fix-compile'
|
2014-08-18 10:27:32 +01:00 |
|
Jiri Drbalek
|
f3fba6e299
|
fix compile with gcc
|
2014-08-17 13:15:56 +00:00 |
|
Dane Springmeyer
|
a4c926ac8a
|
don't throw for OGR layers with no features - refs #2260 #2352 #2354
Conflicts:
tests/python_tests/ogr_test.py
|
2014-08-15 19:49:33 -07:00 |
|
artemp
|
67379d1bba
|
fix icu_shaper
|
2014-08-15 14:11:44 +01:00 |
|
artemp
|
f41b15f967
|
Merge remote-tracking branch 'origin/master'
y this merge is necessary,
|
2014-08-15 11:51:00 +01:00 |
|
Dane Springmeyer
|
751e039347
|
add RESPECT mode to make 'fixing' of bbox aspect a no-op on map
|
2014-08-14 20:27:27 -07:00 |
|
Dane Springmeyer
|
fe8e9a0094
|
remove unneeded Makefile variable [skip ci]
|
2014-08-14 13:40:08 -07:00 |
|
Dane Springmeyer
|
faeb12f5e9
|
tests: fix warnings in pgraster test
|
2014-08-14 12:53:33 -07:00 |
|
Dane Springmeyer
|
9c0f315588
|
clean up icu singletons to avoid valgrind seeing memory leak in hb_shape
|
2014-08-14 12:47:51 -07:00 |
|
Dane Springmeyer
|
8cfb49de81
|
fix quoting in svg output grammars - regressed in 350c2c29bd
|
2014-08-14 12:28:28 -07:00 |
|
Dane Springmeyer
|
595b81107c
|
variant : make operator<< stricter to avoid unexpected instantiations - refs 7602779836
|
2014-08-14 11:50:58 -07:00 |
|
Dane Springmeyer
|
8ef6558496
|
iwyu
|
2014-08-14 10:04:26 -07:00 |
|
artemp
|
52ba1383ec
|
move hash_value into value_adl_barrier namespace where it expected
|
2014-08-14 18:02:52 +01:00 |
|
artemp
|
454a69c582
|
mapnik::value - revive hash_value function implementation (#2358)
|
2014-08-14 10:00:23 +01:00 |
|
Dane Springmeyer
|
b415549823
|
limit benchmarks
|
2014-08-13 17:21:22 -07:00 |
|
Dane Springmeyer
|
5b52fa94b1
|
fix compile on linux
|
2014-08-13 17:21:11 -07:00 |
|
Dane Springmeyer
|
5e314b04a7
|
iwyu
|
2014-08-13 09:05:02 -07:00 |
|
Dane Springmeyer
|
0d47deb169
|
fix pgraster/postgis logic to skip tests if there is no postgres server running
|
2014-08-13 09:04:54 -07:00 |
|
artemp
|
17e1061536
|
Merge branch 'custom-variant-2'
|
2014-08-13 13:11:31 +01:00 |
|