artemp
7031099b76
Merge branch 'master' into mapnik-geometry
2015-02-20 17:03:46 +01: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
artemp
bd6c90bf00
remove CoordArray and read points directly into line_string or linear_ring
2015-02-19 17:13:43 +01:00
artemp
6d8ff4a476
add temp convinience methods
2015-02-19 17:13:00 +01:00
artemp
1c3dbdd3ab
postgis.input + use mapnik-geometry
2015-02-19 16:05:09 +01:00
artemp
87d60620c2
mapnik-geometry : update wkb reader
2015-02-19 16:04:14 +01:00
artemp
9bb95d208c
add include guard
2015-02-19 16:01:46 +01:00
artemp
9fed6fd571
shape.input - fix multi-polygon handling
2015-02-19 14:32:45 +01:00
artemp
fec1d75e8e
add basic cairo support
2015-02-19 12:03:15 +01:00
artemp
5678e55abf
shapeindex - use range based for loop
2015-02-19 11:04:13 +01:00
artemp
42983ff015
add basic support for point_symbolizer and mapnik::new_geometry::point
2015-02-19 10:45:03 +01: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
artemp
33d45db318
c++ style - better syntax
2015-02-19 10:20:17 +01: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
artemp
b49b8042c1
shape.input/agg - add polygon3 support
2015-02-18 18:12:47 +01:00
artemp
133f7d04ef
agg_renderer - support multi_line_strings
2015-02-18 14:26:11 +01:00
artemp
8e34077aef
more cleanups
2015-02-18 13:51:20 +01:00
artemp
604d7b08af
use reserve to pre-allocate line_strings + cleanups
2015-02-18 13:48:05 +01:00
artemp
2e4e1f71b8
adapt to use mapnik::new_geometry::geometry (shape.input only)
2015-02-18 13:21:16 +01:00
artemp
0223e1f93e
Merge branch 'master' into mapnik-geometry
2015-02-18 11:10:07 +01:00
artemp
a1f7017d45
new geometry implementation - initial barebone framework
2015-02-18 11:07:26 +01: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
