Commit graph

9674 commits

Author SHA1 Message Date
Dane Springmeyer
ea35569a51 do not generate sqlite spatial index on the fly 2015-02-25 18:57:00 -08:00
Dane Springmeyer
a6df5f9056 tests for line wrap bug (currently non-ideal) refs #2701 2015-02-25 18:54:31 -08:00
Dane Springmeyer
d9d63bb5ca add tests for #2078 and #2151 (currently non-ideal results) 2015-02-25 18:51:57 -08:00
Dane Springmeyer
1506a1d867 avoid : in image paths - refs #2717 2015-02-25 15:25:10 -08:00
Dane Springmeyer
81a3be6e6f Merge pull request #2716 from mapnik/fix-gdal-atexit-crash
Prevent potential for crashes at exit related to libgdal
2015-02-23 15:00:58 -08:00
Dane Springmeyer
7152c7c621 do not call dlclose on plugins linking libgdal 2015-02-23 14:56:18 -08:00
Dane Springmeyer
19cafa00fb makefile: speed up build by using libmapnik-json.a as proxy for whether 'heavy' compiles have run yet 2015-02-23 11:44:36 -08:00
Blake Thompson
8153c1a9fd Removed get_pixel_color from python bindings and added new parameter to get_pixel so that it will return color on demand. 2015-02-23 10:27:00 -06:00
Dane Springmeyer
d603becc28 update expected tests (straggler after png hextree fix) 2015-02-22 23:28:35 -08:00
Dane Springmeyer
8919ae2f35 Merge pull request #2686 from rouault/gdal_input_dataset_rasterio
Gdal.input dataset rasterio improvements
2015-02-22 22:14:52 -08:00
Dane Springmeyer
4b5cc89626 support PG_INCLUDES/PG_LIBS for pointing to libpq (instead of pg_config) 2015-02-20 13:22:23 -08:00
Dane Springmeyer
f08dcf9a83 scons+bootstrap: use absolute paths, but don't resolve symlinks
- relative paths continue to be supported in the config.py to make it easy
   to share config.py versions across systems
 - os.path.realpath was previously used to internally create absolute paths
   but now we use os.path.abspath instead to avoid resolving symlinks to keep
   the internally stored paths as simple as possible
 - this all will allow mapnik-config to report more similar paths to what was
   passed in (just absolute)
2015-02-20 12:56:08 -08:00
Dane Springmeyer
801a92c99f occi: defer symbol resolution till runtime for osx 2015-02-19 23:12:07 -08:00
Dane Springmeyer
8cf7172539 fix linking of occi plugin 2015-02-19 23:06:04 -08:00
Blake Thompson
dc0cfef4bb Merge pull request #2712 from mapnik/release/image_data_any
Release/image data any
2015-02-19 13:56:33 -06:00
Blake Thompson
198be8f1cc Merge branch 'release/image_data_any' of github.com:mapnik/mapnik into release/image_data_any 2015-02-19 12:19:21 -06:00
Blake Thompson
2ebce8e7e1 Updated svg2png for new markers 2015-02-19 12:19:01 -06:00
Dane Springmeyer
dd0b8459f5 insert_marker to take rvalue it if is moved inside the function 2015-02-19 01:37:45 -08:00
Dane Springmeyer
2aa23eca43 fix type of raster_marker_render_thunk' 2015-02-19 01:37:19 -08:00
Dane Springmeyer
cb869e60f3 no need for templated 'raster_marker_render_thunk' 2015-02-19 01:36:43 -08:00
Blake Thompson
5180168491 Merge branch 'master' into release/image_data_any 2015-02-18 23:03:51 -06:00
Blake Thompson
744dc4472f Merge branch 'release/image_data_any' of github.com:mapnik/mapnik into release/image_data_any 2015-02-18 23:02:34 -06:00
Blake Thompson
390fbaac92 BOOM SHAKALAKA:
This update is in Ref #2649. It provides an update to markers and their processing such that:

 * All shared_ptrs are no longer required around markers
 * Markers are now const
2015-02-18 22:58:33 -06:00
Dane Springmeyer
7ab9ade36d fix oracle library name 2015-02-17 11:32:54 -08:00
Dane Springmeyer
a2dabb370d fix build+link of oracle plugin 2015-02-16 23:09:16 -08:00
Dane Springmeyer
817489e97a functions fully defined in hpp do not need MAPNIK_DECL - refs #2708 2015-02-16 19:05:41 -08:00
Dane Springmeyer
842e4bebe6 start fixing windows compile - refs #2708 2015-02-16 18:48:14 -08:00
Blake Thompson
6418a129c1 Removed graphics.hpp from benchmark 2015-02-16 15:56:29 -06:00
Blake Thompson
b2c1c86d99 Merge branch 'master' into release/image_data_Any
Conflicts:
	benchmark/test_polygon_clipping.cpp
2015-02-16 14:37:01 -06:00
Blake Thompson
0cd9c1fc34 Updated image_any building switch statement to support all the correct types, added tests for all the new data formats with get and set in python. 2015-02-16 14:23:55 -06:00
Dane Springmeyer
203ce8b9a6 renable polygon clipping tests despite current flaws 2015-02-15 14:00:20 -08:00
Dane Springmeyer
6a89b37a76 upgrade clipper to v6.2.8 / svn r492 2015-02-15 13:06:01 -08:00
Dane Springmeyer
435f329cef fix agg::conv_clip_polygon validation 2015-02-15 13:01:57 -08:00
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