Commit graph

9691 commits

Author SHA1 Message Date
Dane Springmeyer
e1941f87f0 clipping bench: validate per geom 2015-02-15 12:59:55 -08:00
Dane Springmeyer
1ebd6afd9c improve sql subselect parsing + add tests - closes #2704 2015-02-13 01:26:19 -08:00
Dane Springmeyer
54dc9dd0f3 add shapeindex tests - refs #2703 2015-02-13 00:05:34 -08:00
Dane Springmeyer
5424c350cd avoid inf loop on empty point3d shapefile 2015-02-13 00:04:09 -08:00
artemp
884de5a044 fix condition for skipping M (measure) in PointZ 2015-02-12 22:18:00 +01:00
Dane Springmeyer
2aaaecbcaf initialize pos_ variable in path_iterator + fix spelling 2015-02-12 11:38:31 -08:00
Dane Springmeyer
df60a2f37f more tests for object stringify in geojson plugin - refs #2678 2015-02-12 11:37:46 -08:00
artemp
3aaac077cb add test_large_geojson_properties 2015-02-12 15:53:29 +01:00
artemp
bb57ebd258 implement get_geometry_type() for 'large json' strategy
@springmeyer - we should talk re: validity of this approach. I know the baclground but still.
2015-02-12 15:50:13 +01:00
artemp
e8f397c41c instantiate geojson grammar using chr_iterator_type = char const* - via #2700 2015-02-12 11:51:11 +01:00
Dane Springmeyer
81ef45b06c fixup polygon clipping test build 2015-02-11 23:47:26 -08:00
Dane Springmeyer
58645c7842 json error handler: fix -Wunused-parameter warning 2015-02-11 23:13:59 -08:00
Dane Springmeyer
f562f6e5d4 further validate results of clipping tests 2015-02-11 22:42:31 -08:00
Dane Springmeyer
216d1e9324 adapt clipping benchmark to vertex_adapter interface - refs #2688 2015-02-11 15:53:09 -08:00
Dane Springmeyer
7fbc254673 fix polygon_clipper to work with vertex_adapter 2015-02-11 15:52:36 -08:00
Dane Springmeyer
89a58c5879 Merge branch 'master' of github.com:mapnik/mapnik into release/image_data_any 2015-02-11 10:01:42 -08:00
Dane Springmeyer
30c6cf636c make path replace portable 2015-02-10 23:49:00 -08:00
Dane Springmeyer
7d2b34d654 finish fixing windows build - closes #2698 2015-02-10 19:02:32 -08:00
Dane Springmeyer
8608ea3308 only enable geojson memory mapped files if SHAPE_MEMORY_MAPPED_FILE defined (TODO: rename this define) - refs #2698 2015-02-10 18:50:27 -08:00
Dane Springmeyer
1dc5452c74 msvs 2014 compile fixes 2015-02-10 18:20:08 -08:00
Dane Springmeyer
e475464bc9 bootstrap: no trailing slashes in PROJ_LIB and ICU_DATA 2015-02-10 15:18:47 -08:00
Dane Springmeyer
d08e84794f use curl for nose download 2015-02-10 12:51:22 -08:00
Dane Springmeyer
2042ffd824 avoid need to instanciate expensive svg_path_generator twice 2015-02-10 12:16:01 -08:00
Artem Pavlenko
4e5522756a Merge pull request #2688 from mapnik/vertex_adapter
implement vertex interface in vertex_adapter and make mapnik::geometry_type immutable
2015-02-10 19:09:22 +01:00
artemp
109e104971 Merge branch 'master' into vertex_adapter 2015-02-10 15:13:23 +01:00
Artem Pavlenko
38aff0a2a2 Merge pull request #2697 from mapycz/std-replace
prefer stl over boost
2015-02-10 15:12:41 +01:00
Jiri Drbalek
310011a8b9 prefer stl over boost 2015-02-10 12:46:10 +00:00
Dane Springmeyer
6d611b8e1a cleanup commented code 2015-02-09 23:28:27 -08:00
Dane Springmeyer
41ed56df14 Merge branch 'master' of github.com:mapnik/mapnik into vertex_adapter 2015-02-09 18:16:57 -08:00
Dane Springmeyer
2bc761d99a fixup harfbuzz version check - refs #2694 #2544 2015-02-09 17:52:09 -08:00
Dane Springmeyer
ec2d644f6b Merge pull request #2694 from mapycz/scons-harfbuzz-version
scons: check for harfbuzz version
2015-02-09 17:28:52 -08:00
Dane Springmeyer
59f9d802ed Merge pull request #2696 from mapnik/ogr-extra-meta
Report proj4 string in extra metadata for ogr plugin - refs #2650
2015-02-09 16:30:01 -08:00
Dane Springmeyer
578f8a7c29 report proj4 string in extra metadata for ogr plugin - refs #2650 2015-02-09 15:46:00 -08:00
Dane Springmeyer
0e137cd6ee iwyu 2015-02-09 14:18:15 -08:00
Blake Thompson
d31bf5b171 Updated tests from cast to copy 2015-02-09 13:46:48 -08:00
Dane Springmeyer
56d1818862 Makefile clean: remove duplicate pyc cleanup 2015-02-09 13:20:39 -08:00
Jiri Drbalek
4fcf0ea3e8 scons: check for harfbuzz version 2015-02-09 14:15:22 +00:00
artemp
960794b7a0 fix copyright 2015-02-09 13:47:29 +01:00
artemp
1ecf3f0889 use const ref when iterating over geometries in feature 2015-02-09 13:46:01 +01:00
artemp
146dc1c094 fix copyright 2015-02-09 11:38:08 +01:00
artemp
2ece72658a Merge branch 'master' into vertex_adapter 2015-02-09 10:05:02 +01:00
Artem Pavlenko
827e8a29a4 Merge pull request #2689 from mapycz/prefer-stl
prefer STL implementation
2015-02-09 10:03:59 +01:00
artemp
5e6468f9bf update viewer to use vertex_adapter 2015-02-09 10:01:31 +01:00
Blake Thompson
6e0d6d423b Merge branch 'master' into release/image_data_any
Conflicts:
	include/mapnik/grid/grid_marker_helpers.hpp
2015-02-06 16:19:40 -06:00
Blake Thompson
9875335fb8 Renamed image_cast to image_copy 2015-02-06 15:27:19 -06:00
artemp
0f22fb596b enforce geometry_type const by removing ``inline geometry_type& get_geometry(std::size_t index)`` 2015-02-06 17:13:41 +01:00
Jiri Drbalek
1bb1653e69 prefer STL implementation 2015-02-06 16:13:31 +00:00
artemp
e19fdad3a6 implement vertex interface in vertex_adapter and make mapnik::geometry_type immutable 2015-02-06 16:45:51 +01:00
Even Rouault
7c44b2412e gdal.input: take into account nodata_tolerance in optimized code path
Solves failures of https://travis-ci.org/mapnik/mapnik/jobs/49647112
on tiff-nodata-edge-rgba and tiff-nodata-tolerance tests
2015-02-06 00:41:57 +01:00
Jordan Hollinger
187a42f006 Merge pull request #2680 from mapycz/rm-grid_marker_helpers
remove redundant header
2015-02-05 17:01:36 -05:00