Commit graph

9461 commits

Author SHA1 Message Date
artemp
38a184a18b unicode string grammar via boost/libs/spirit/example/qi/json/json/parser/grammar.hpp
update json based grammars
2015-02-02 11:20:23 +01:00
artemp
822581977d Merge branch 'master' into geobuf 2015-01-30 19:17:36 +01:00
artemp
9d69416a27 Merge branch 'master' into geobuf 2015-01-30 11:22:57 +01:00
artemp
fd1a3a5fc7 remove stderr + don't throw on supported messages 2015-01-30 11:19:21 +01:00
artemp
f8decad01e use feature call back to stuff features into container 2015-01-30 11:02:53 +01:00
artemp
c6e681d244 template geobuf class on 'feature' functor + fix signed varint type + apply transform (scaling) 2015-01-30 11:02:00 +01:00
artemp
2600451072 remove copyleft as we're using this header 'as it is' at the moment 2015-01-30 11:00:15 +01:00
Dane Springmeyer
5ebdbe5703 bootstrap: update sqlite 2015-01-29 22:45:46 -08:00
Dane Springmeyer
dab31989c5 bootstrap: use libpng 1.6.16 2015-01-29 22:03:23 -08:00
Dane Springmeyer
6004fd2c93 Merge pull request #2669 from mapycz/fix-gcc-compile
fix gcc compile
2015-01-29 13:26:28 -08:00
Jiri Drbalek
711fc8ccf2 fix gcc compile 2015-01-29 20:50:37 +00:00
Dane Springmeyer
f300b9f777 bootstrap: simplify mason setup 2015-01-29 09:09:43 -08:00
artemp
e3c96666c4 json - make feature_collection_grammar "on-feature" callback based 2015-01-29 12:33:18 +01:00
artemp
4e3ac8ff0c json - make feature_collection_grammar "on-feature" callback based 2015-01-29 12:21:01 +01:00
artemp
d60e2da44e Merge branch 'master' into geobuf 2015-01-29 09:50:47 +01:00
Dane Springmeyer
4b3f69e851 #2651 is fixed, remove workaround in postgis plugin 2015-01-28 18:18:09 -08:00
Dane Springmeyer
c433dbcd68 bootstrap cleanups 2015-01-28 17:59:01 -08:00
artemp
18dae530ce Merge branch 'master' into geobuf 2015-01-28 13:09:47 +01:00
artemp
0d62e0f83c link to Oracle client library (libclntsh) to avoid missing symbols - ref #2659 2015-01-28 13:07:03 +01:00
artemp
610f01bd0b update params_test - #2651 2015-01-28 12:56:10 +01:00
artemp
1f3e36c3ec use perfect forwarding to resolve copy/move semantics of universal references - #2651 2015-01-28 12:55:57 +01:00
artemp
ff56e3f7e1 update params_test - #2651 2015-01-28 12:54:33 +01:00
artemp
a8443df1a1 use perfect forwarding to resolve copy/move semantics of universal references - #2651 2015-01-28 12:54:18 +01:00
artemp
c1f6b12d73 Merge branch 'master' into geobuf
Conflicts:
	SConstruct
2015-01-28 11:21:31 +01:00
Dane Springmeyer
1753d0ab47 require boost >= 1.56 for geojson/topojson plugins 2015-01-27 22:20:03 -08:00
Dane Springmeyer
f8523ef728 scons: hack to make sure makefile pre-build does not break if grid renderer is not enabled 2015-01-27 22:18:25 -08:00
Dane Springmeyer
4e5fa8490a scons: hack to make sure makefile pre-build does not break if grid or cairo renderers are not enabled 2015-01-27 22:17:30 -08:00
Dane Springmeyer
cbb364085f move aside variant io 2015-01-27 21:52:05 -08:00
artemp
cf16f5e6c9 move operator<< into separate header <mapnik/util/variant_io.hpp> 2015-01-27 21:42:35 -08:00
Dane Springmeyer
1c4799f680 remove stray remains of large_geojson plugin (now part of geojson plugin formally) 2015-01-27 18:16:56 -08:00
Dane Springmeyer
b80ae5740a Merge pull request #2665 from mapnik/double-jobs
Double jobs
2015-01-27 18:12:57 -08:00
Dane Springmeyer
60d219a2aa makefile pre-build: fix target names 2015-01-27 16:22:40 -08:00
Dane Springmeyer
8d233becdc build process_group_symbolizer.cpp first along with markers 2015-01-27 15:54:36 -08:00
Dane Springmeyer
0ec4d3101c travis: try doubling jobs 2015-01-27 15:21:40 -08:00
Robert Coup
93f67f9bc9 Merge pull request #2657 from rcoup/antimeridian-box-projection-2648
Handle bounds reprojections which cross the anti-meridian. Fixes #2648
2015-01-28 11:44:50 +13:00
Dane Springmeyer
d38b3bb2cf respect alpha in cairo comparisons (reasons for ignoring it once no longer apply - refs #2662) 2015-01-27 14:38:38 -08:00
Dane Springmeyer
6d5e2b1865 add support for UPDATE=1 to update visual tests (whether failing or not) 2015-01-27 14:29:48 -08:00
Robert Coup
65ef3bc625 Handle bounds reprojections which cross the anti-meridian. #2648
When doing an envelope-points reprojection to a geographic CS, check
the points stay in clockwise order. Otherwise expand the resulting bounds
to include the world.

Includes visual test. Cairo tests aren't finding differences, but the renderer
is doing the right thing.
2015-01-28 11:18:16 +13:00
Dane Springmeyer
3d68084b88 bootstrap: add cairo / cleanup variables in config 2015-01-27 14:12:18 -08:00
Dane Springmeyer
835f34c976 Merge pull request #2664 from mapnik/zero-visual-pixel-threshold
drop pixel threshold to 0 - refs #2662 and #2663
2015-01-27 13:23:04 -08:00
Dane Springmeyer
584ca5d92f drop pixel threshold to 0 - refs #2662 and #2663 2015-01-27 12:26:28 -08:00
Dane Springmeyer
4e57be6b86 Merge pull request #2663 from mapnik/low-visual-test-thresholds
try zero thresholds for visual tests - refs #2662
2015-01-27 11:58:31 -08:00
Dane Springmeyer
44ceb77438 try zero thresholds for visual tests - refs #2662 2015-01-27 11:28:33 -08:00
artemp
78a6a1c129 + add support for MultiPoint and MultiLineString 2015-01-27 18:18:42 +01:00
artemp
6faf7efa36 return actual features 2015-01-27 16:13:12 +01:00
artemp
863ae6a8b3 geobuf.input - initial barebones implementation 2015-01-27 15:51:11 +01:00
artemp
76df4a2117 move operator<< into separate header <mapnik/util/variant_io.hpp> 2015-01-27 15:50:32 +01:00
Dane Springmeyer
eb598f4435 bootstrap: avoid need for bash 4.x 2015-01-26 23:38:22 -08:00
Dane Springmeyer
1b771593b5 travis: fix bash syntax 2015-01-26 23:07:44 -08:00
Dane Springmeyer
ca59ed1cd6 travis/osx: put bash on PATH 2015-01-26 23:02:04 -08:00