artemp
45a75fb876
Merge branch 'master' into mapnik-geometry
2015-02-23 10:06:43 +01:00
artemp
e523d648df
formatting
2015-02-23 10:06:13 +01: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
artemp
2a8174831a
mapnik-geometry - simplify and streamline implementation
2015-02-20 17:44:35 +01:00
artemp
9f84ed6950
position_grammar - start using mapnik-geometry
2015-02-20 17:43:59 +01:00
artemp
60f38780b3
boost.geometry <-- mapnik-geometry adapters
2015-02-20 17:43:07 +01:00
artemp
d8dfe69952
add support for reading geometry_collection
2015-02-20 17:21:40 +01:00
artemp
30da25a9c7
add geometry_collection type
2015-02-20 17:21:17 +01:00
artemp
c5c5fc9e62
update viewer
2015-02-20 17:03:55 +01:00
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
