Commit graph

11316 commits

Author SHA1 Message Date
Dane Springmeyer
dea5dd5d82 debug configure failure 2015-12-02 11:58:14 -05:00
Dane Springmeyer
a55ff6b33e fix includes 2015-12-02 11:56:42 -05:00
artemp
2a330740cf better targetted include directive 2015-12-02 14:32:55 +00:00
artemp
51920be9a7 move #ifdef/#endif to include include directive and avoid redundant <memory> 2015-12-02 14:30:59 +00:00
artemp
8fbcf58e98 increase number of expressions parsed to get more meaningful numbers 2015-12-02 13:09:02 +00:00
artemp
e7e25bb122 expression_grammar_x3 - remove duplicate logical not (optimise) 2015-12-02 13:02:52 +00:00
artemp
492e39d9ad expression_node - add move semantics 2015-12-02 12:58:49 +00:00
artemp
95c9d89afe expression_grammar_x3 - better names 2015-12-02 11:29:01 +00:00
artemp
dfe41c4930 expression_grammar_x3 - add more expectation points 2015-12-02 11:26:43 +00:00
artemp
6acd0b05ab Merge branch 'master' into spirit-x3 2015-12-02 11:11:28 +00:00
Dane Springmeyer
59723ae693 restore -Wno-unsequenced, accidentally dropped in 7608040906 2015-12-01 13:59:45 -05:00
Dane Springmeyer
6d4abf908d fix -Wshadow warnings 2015-12-01 12:43:24 -05:00
artemp
009ad3b5e7 add negate + hex + fix remaining issues 2015-12-01 16:44:28 +00:00
artemp
fc50e6b19a add geometry_type attribute 2015-12-01 15:31:33 +00:00
artemp
07ed49c1a0 add single/double quoted strings + global attributes + unquoted string (default) 2015-12-01 13:57:39 +00:00
artemp
d2bb56a71f port expression grammar to boost::spirit::x3 [skip ci]
(work-in-progress)
2015-12-01 12:43:16 +00:00
artemp
3606751565 Merge branch 'master' into spirit-x3 2015-12-01 12:14:51 +00:00
artemp
79bdcf3718 default to c++14 2015-12-01 12:13:39 +00:00
bergwerkgis
8235d0ed30 AppVeyor: fix new paths for new GIT version 2015-12-01 10:49:53 +00:00
artemp
b9c65368d2 update CHANGELOG for mapnik v3.0.9 release [skip ci] 2015-11-26 10:13:12 +00:00
artemp
03a0926bf0 update SCons to 2.4.1 2015-11-26 10:09:02 +00:00
artemp
e2cf79260f unit tests - add 'ensure original ordering in geojson.input' test ref #3182 2015-11-25 12:46:21 +00:00
artemp
d288ea0af6 Merge branch 'mapycz-geometry-remove-empty' 2015-11-24 15:49:50 +00:00
Jiri Drbalek
100e3c4995 centroid: enable algorithm on multi-geometries with empty sub-geometries 2015-11-24 15:41:34 +00:00
artemp
a2b1475ef7 port shapeindex_test.py to c++ (#3184) 2015-11-24 10:50:09 +00:00
Artem Pavlenko
1b6ca8bcd0 Merge pull request #3176 from mapycz/fix-warn
csv.input: fix warning
2015-11-23 10:46:10 +00:00
artemp
ec074752cc fix mistype => should be while (shx.is_good() && pos <= file_length - 4) 2015-11-23 10:32:14 +00:00
artemp
aee0149a1a GeoJSON - preserve feature ordering with both cache_features=true' and cache_features=false` (#3182) 2015-11-23 10:19:49 +00:00
artemp
c32166c71f move loop terminatiion condition to the top and avoid potential infinite loop when if (content_length != shp.read_xdr_integer()) + Track empty shapes and don't create *.index when there is no non-empty geometries
(#3184)
2015-11-23 09:58:27 +00:00
Jiri Drbalek
7283b758a0 csv.input: fix warning 2015-11-23 08:54:13 +00:00
artemp
7aa97628e0 revert accidentally pushed changes from WIP branch 2015-11-20 19:55:21 +00:00
artemp
58998f8126 cleanup - remove unused vars 2015-11-20 17:45:10 +00:00
artemp
4fffcdd612 update test data 2015-11-20 17:11:52 +00:00
artemp
1eab1a3a28 CSV - change 'quote' auto-dection logic to handle mixed cases better 2015-11-20 17:10:55 +00:00
artemp
44eb1b69fa revert test-data 2015-11-20 14:13:13 +00:00
artemp
e0d7f8ffcb update test data 2015-11-20 14:10:44 +00:00
Dane Springmeyer
9a29b5005d fix #3178 2015-11-19 20:57:05 -08:00
Dane Springmeyer
c6d6153964 fix multiple -Wunused-parameter warnings [skip ci] 2015-11-19 17:14:58 -08:00
Artem Pavlenko
4dd2202055 Merge pull request #3175 from mapycz/fix-link-mapnik-index
mapnik-index: fix linking on Linux
2015-11-19 12:38:02 +00:00
artemp
da617f92eb add scale_image_agg' and reproject_and_scale_raster` overloads for backward caps 2015-11-19 12:26:16 +00:00
Jiri Drbalek
cb3f0fdcf2 mapnik-index: fix linking on Linux 2015-11-19 11:01:46 +00:00
artemp
7d8f7357ed GeoJSON - refactor FeatureCollection grammar to restore empty features condition (#3167) 2015-11-18 14:44:39 +00:00
artemp
938702dc8b geojson.input - rely on expectation failure to select optional single Feature/Geometry parser 2015-11-18 14:43:40 +00:00
artemp
998164dc72 mapnik c++ style 2015-11-18 14:42:29 +00:00
artemp
d373ae2e93 update visual-data 2015-11-17 15:28:25 +00:00
artemp
21c4438cbe Merge branch 'mapycz-fix-gray-scaling-2' 2015-11-17 15:04:08 +00:00
artemp
6d599dff0a Merge branch 'fix-gray-scaling-2' of https://github.com/mapycz/mapnik into mapycz-fix-gray-scaling-2 2015-11-17 15:03:37 +00:00
Dane Springmeyer
2ee9639f91 Merge branch 'master' of github.com:mapnik/mapnik 2015-11-12 10:19:56 -08:00
Dane Springmeyer
d9d37423b7 use mapnik/warning_ignore.hpp in a few last places 2015-11-12 09:51:41 -08:00
artemp
7a0688edcb mapnik-index - implement validatation callback by comparing bounding boxes from bbox extractor and GeoJSON feature 2015-11-12 16:12:06 +00:00