sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
7981 commits 112 branches 95 tags 181 MiB
Commit graph

2541 commits

Author SHA1 Message Date
artemp
fe1c88f4a5 topojson : allow individual geometries not just geometry collections 2013-10-29 10:55:13 +00:00
artemp
c7a989ae83 first attempt to re-use generic JSON rules in geojson/topojson parsers 2013-10-28 15:57:51 +00:00
Dane Springmeyer
9755296091 Merge branch '2.3.x' of github.com:mapnik/mapnik 2013-10-24 00:00:53 -07:00
Dane Springmeyer
dcbbcdd8a9 make label-position-tolerance a double, as it should have been all along 2013-10-23 23:48:24 -07:00
Dane Springmeyer
882ee3cb32 Merge branch '2.3.x' of github.com:mapnik/mapnik 2013-10-23 21:12:54 -07:00
Dane Springmeyer
2ef7f13d53 fix indent 2013-10-23 21:12:36 -07:00
Dane Springmeyer
427e1c03b7 polygon clipper: ensure we return from function 2013-10-23 16:10:06 -07:00
Dane Springmeyer
a248f880d6 include <mutex>: fixes compile on ubuntu precise/g++4.7/libstdc++ 2013-10-23 15:43:54 -07:00
artemp
043f52d0a6 style : format 2013-10-22 17:15:27 +01:00
artemp
e1fc9aed82 c++11 
fix mapnik::noncopyable

Conflicts:
	include/mapnik/noncopyable.hpp
 2013-10-21 16:46:41 +01:00
artemp
7adee4ab36 c++11 : remove boost::make_shared includes 2013-10-17 15:09:56 +01:00
Dane Springmeyer
e01b39729f respect args passed to apply_to_layer which repairs broken mapnik::request usage (#1737) after 7495d2f381 2013-10-16 09:42:57 +01:00
Dane Springmeyer
c881fee7f0 respect args passed to apply_to_layer which repairs broken mapnik::request usage (#1737) after 7495d2f381 2013-10-15 18:12:07 -04:00
Seth Fitzsimmons
1304a6a1b8 Fix reference to non-existent 'colors' 
Allows builds with DEBUG=true to succeed.
 2013-10-14 14:40:19 -07:00
artemp
10f9371088 + fix typo 2013-10-14 13:06:20 +01:00
artemp
582ca02f44 remove unused boost.thread includes 2013-10-11 13:39:39 +01:00
artemp
0e40b3c87d == c++11 
use std::thread (removes boost.thread dependency)
 2013-10-11 13:20:46 +01:00
artemp
3edfc69c81 == c++11 
use std::tuple with std::get<>
 2013-10-11 12:36:04 +01:00
artemp
6fe204ce2a + log clipper errors/warnings 2013-10-11 10:18:05 +01:00
artemp
a71f0b8a93 + fix typo 2013-10-10 13:59:21 +01:00
artemp
07a6fee1ed == polygon clipper 
+ don't build boost::geometry structures when :

 * input bounding box is contained by clipping box (return original verticies)
 * input box is outside of clipping box ( return SEG_END)
 2013-10-10 13:44:32 +01:00
artemp
89586fbdf1 + only extract expected types from mapnik::parameters 
aka mapnik::value_xxx types
 2013-10-09 15:32:47 +01:00
artemp
be127927cb + add operator>> 2013-10-09 15:32:00 +01:00
artemp
01bf5e775e == topojson 
+ allow multiple geometry collections
+ support id parsing
 2013-10-07 17:44:22 +01:00
artemp
d909c6dede + std::unordered_map to store properties 2013-10-07 17:43:38 +01:00
Dane Springmeyer
1e024984e7 correct signed/unsigned comparison in image filter visitor 2013-10-05 17:37:23 -07:00
Dane Springmeyer
ddf2226b6f merge with branch 2.3.x 2013-10-05 15:37:29 -07:00
artemp
e3f18717d3 == topojson == 
support multi geometries
 2013-10-04 15:40:06 +01:00
Dane Springmeyer
732fefb9e1 webp: use WebPConfig instead of custom options struct 2013-10-04 00:24:30 -07:00
Dane Springmeyer
be7d0a55c2 webp: cleanup option handling 2013-10-03 23:59:10 -07:00
Dane Springmeyer
0fb718a4fd default to hextree encoding for 'png' format + png options cleanup 2013-10-03 23:40:19 -07:00
Dane Springmeyer
0224ce3019 add support for seamless blurring - closes #1478 2013-10-03 16:37:09 -07:00
Dane Springmeyer
5f092c7130 ctrans: add getter for offsets 2013-10-03 12:06:52 -07:00
Dane Springmeyer
879aec064a ensure we do not query layers with no active styles 2013-10-03 11:25:05 -07:00
artemp
56a14368bf cleanup usage 2013-10-03 17:16:21 +01:00
artemp
ac8ececf1c == topojson == 
+ use boost::variant<> for storing properties
+ parse properties as top level key/value pairs
 2013-10-03 15:32:07 +01:00
Dane Springmeyer
9c8f7cc90d merge with 2.3.x branch 2013-10-02 18:25:24 -07:00
Dane Springmeyer
f9e630bbd3 Merge remote-tracking branch 'origin/2.3.x' 2013-10-02 18:23:09 -07:00
Dane Springmeyer
371d79774a avoid integer overflows in agg by using clamping in agg:iround with agg::rasterizer_sl_clip_int_sat - closes #2000 2013-10-02 17:08:22 -07:00
artemp
77d0ecc459 c++11 
remove BOOST_FOREACH
 2013-10-02 09:42:03 +01:00
artemp
81159bc006 oops -> don't copy topology object 2013-10-01 19:18:05 +01:00
artemp
20a0f55e7d topojson 
+ bounding box visitor
 2013-10-01 17:16:16 +01:00
artemp
4bf15a04ef topojson 
+ make transform optional to match TopoJSON spec
 2013-10-01 17:16:16 +01:00
artemp
ecc2b39865 mapnik::memory_datasource - qualify virtual methods for brevity 2013-10-01 14:48:54 +01:00
Dane Springmeyer
c34c8a568f merge with branch 2.3.x 2013-09-30 13:33:28 -07:00
Dane Springmeyer
8ebd804360 remove tabs 2013-09-30 13:30:16 -07:00
artemp
fddec700ad TopoJSON input plugin 
skeleton implementation
 2013-09-30 14:14:58 +01:00
artemp
d116ca062f + cleanup 2013-09-30 11:35:42 +01:00
artemp
c860ed4d99 == TopoJSON parser == 
https://github.com/mbostock/topojson/wiki
 2013-09-30 11:16:58 +01:00
artemp
2b50c105c3 + style 2013-09-30 08:56:58 +01:00
Dane Springmeyer
ca6d6df446 fix code formatting 2013-09-27 16:15:16 -07:00
Dane Springmeyer
82e1b37281 allow single color colorize-alpha 2013-09-27 16:11:23 -07:00
Dane Springmeyer
f4c3620d67 protect against invalid memory access if agg gradient lookup fails to build 2013-09-27 15:24:33 -07:00
Dane Springmeyer
b787f4d672 fix image-filter serialization for scale-hsla and colorize-alpha 2013-09-27 14:06:07 -07:00
Dane Springmeyer
7a4bf4e3b0 remove debug prints 2013-09-27 12:20:57 -07:00
Dane Springmeyer
90dd6b9d61 optimize case where image_view is used but is not a subset - refs #2024 2013-09-27 12:17:31 -07:00
Dane Springmeyer
44807673a3 optimize webp pixel copy by moving row chunks rather than pixels - refs #2024 2013-09-27 11:54:12 -07:00
Dane Springmeyer
2010f5f1d9 Merge branch '2.3.x' of github.com:mapnik/mapnik 2013-09-26 20:08:01 -07:00
Dane Springmeyer
0ca2edb206 fix #2024 (TODO - avoid image copy for lossy encoding of views) 2013-09-26 20:07:04 -07:00
Dane Springmeyer
3531276864 fix one part of #2024 2013-09-26 19:29:05 -07:00
Dane Springmeyer
68ff3ceead add color-to-alpha image-filter - closes #2023 2013-09-26 16:14:40 -07:00
Dane Springmeyer
535c580829 std::trunc is not available with g++-4.8 on android (and also likely not msvc) 2013-09-26 12:47:07 -07:00
Dane Springmeyer
f0bebe5b10 iwyu 2013-09-25 21:35:25 -07:00
Dane Springmeyer
0f4ba4dfd5 sync with 2.3.x branch 2013-09-25 20:04:31 -07:00
Dane Springmeyer
843fdc0871 stub in colorize-alpha filter output to avoid crash - refs #2021 2013-09-25 15:33:10 -07:00
Dane Springmeyer
8e047aa98e raster_colorizer: avoid color copy by return unsigned from get_color 2013-09-25 14:58:32 -07:00
Dane Springmeyer
df3a455e19 refactor nodata related code dropping support for user-overide nodata where it does not make sense - refs #2023 2013-09-25 14:37:21 -07:00
Dane Springmeyer
0ffb9ef308 Merge branch '2.3.x' of github.com:mapnik/mapnik 2013-09-25 13:14:01 -07:00
Dane Springmeyer
9e66317af1 branch 2.3.x from master at v2.2.0-242-ge85cdda 2013-09-24 23:21:37 -07:00
Dane Springmeyer
681f8853d3 pull in changes from master 2013-09-24 22:57:01 -07:00
Dane Springmeyer
0b5d70f926 polygon_clipper: detect invalid winding order when in debug mode 2013-09-24 21:18:52 -07:00
Dane Springmeyer
e85cddaaf5 iwyu 2013-09-24 21:13:52 -07:00
Dane Springmeyer
67b2651527 remove unused clipper converter 2013-09-24 21:03:38 -07:00
Dane Springmeyer
2c46300f61 remove dead code (colorize-alpha is now officially an image-filter) 2013-09-24 17:18:14 -07:00
Dane Springmeyer
6e4c911bb6 fix bug in polygon_clipper coincident vertice detection 2013-09-24 14:06:16 -07:00
Dane Springmeyer
5e1f1c2b79 avoid unneccesary projection copy 2013-09-23 19:45:10 -07:00
Dane Springmeyer
75d88f3370 Merge branch 'master' of github.com:mapnik/mapnik into Mappy-master-async-postgis 2013-09-23 14:31:55 -07:00
Dane Springmeyer
81650e59c1 fix to_geojson polygon output after bug introduced in merge 76f111cc97 - closes #2019 2013-09-23 12:16:39 -07:00
Dane Springmeyer
63f97fa4aa lessen header interdependence between placement_finder.hpp and symbolizer_helpers.hpp 2013-09-23 11:42:47 -07:00
Dane Springmeyer
780d6a459d Merge branch 'master' of github.com:mapnik/mapnik into Mappy-master-async-postgis 2013-09-22 22:08:23 -07:00
Dane Springmeyer
bd2a122b19 fix sign compare warning 2013-09-22 22:03:27 -07:00
artemp
0eada70845 + use const std::unique_ptr< []> instead of boost::scoped_array 2013-09-20 15:01:58 +01:00
artemp
09ce29489e use const std::unique_ptr<> instead of boost::scoped_ptr<> 2013-09-20 14:22:58 +01:00
artemp
62af2e6765 + replace <boost/shared_ptr.hpp> with <memory> 2013-09-20 14:13:23 +01:00
artemp
b315eb2167 + use std::shared_ptr and std::make_shared 2013-09-20 14:01:27 +01:00
artemp
6e6cff4613 remove has_nothrow_copy 
as it was triggering requirement for move ctor in UnicodeString
which is not _yet_ available
 2013-09-20 14:01:27 +01:00
Dane Springmeyer
0619477238 optimize rule::active which is called in loop in feature_style_processor_impl 2013-09-19 20:24:59 -07:00
Dane Springmeyer
576271d5ca merge 2013-09-19 18:40:48 -07:00
Dane Springmeyer
9bd3dd0e21 fix viewer compile 2013-09-19 18:39:44 -07:00
Dane Springmeyer
5c534c1ac6 make rule_cache noncopyable 2013-09-19 18:01:51 -07:00
artemp
a8d49b8112 + use mapnik::polygon_clipper by default 2013-09-19 09:12:50 +01:00
Dane Springmeyer
25ee36f74e merge 2013-09-18 20:41:20 -07:00
Dane Springmeyer
2ebd3e9bf8 iwyu 2013-09-18 20:40:30 -07:00
Dane Springmeyer
8b5323f101 drop suncc support from singleton class 2013-09-18 20:29:46 -07:00
Dane Springmeyer
c77e9fed5c c++ style 2013-09-18 20:29:01 -07:00
Dane Springmeyer
5c77edcc5e remove uneeded usage of std::move 2013-09-18 20:24:51 -07:00
Dane Springmeyer
121e5b59b0 mapnik::value: avoid extra copy of value_unicode_string + define copy and assignment 2013-09-18 20:14:50 -07:00
Dane Springmeyer
111bdccebc various post-merge fixes 2013-09-18 19:51:14 -07:00
Dane Springmeyer
ee2378a6d2 port minor fixes around type handling from c++11 branch 2013-09-18 19:50:04 -07:00
Dane Springmeyer
b2d1363011 remove expression optimizer for now since it is currently unused - refs #1002 2013-09-18 19:19:41 -07:00
Dane Springmeyer
6496a44465 drop boost::interprocess::bufferstream and optimized wkb output 2013-09-18 19:12:14 -07:00
Dane Springmeyer
30c8ca5f66 minor formatting to sync cleaner with master 2013-09-18 19:04:44 -07:00
Dane Springmeyer
9770985ead port box2d cleanups from c++11 branch to master 2013-09-18 19:04:20 -07:00
Dane Springmeyer
d79ecf882f merge with master 2013-09-18 18:49:32 -07:00
Dane Springmeyer
d2f50a0158 no need to define BOOST_SPIRIT_USE_PHOENIX_V3 in each header, it is now set in SConstruct 2013-09-18 18:27:04 -07:00
Dane Springmeyer
ebf9dd39d4 be explicit about inlining feature.hpp methods 2013-09-18 14:59:06 -07:00
Dane Springmeyer
d4d5b617d2 re-enable miniz 2013-09-18 14:06:46 -07:00
Dane Springmeyer
33766e9370 merge with master 2013-09-18 13:56:23 -07:00
artemp
ec0bdb21ad Merge branch 'geometry-types' into c++11 2013-09-16 14:18:22 +01:00
Dane Springmeyer
1dd12755c6 optimize expression evaluation of text by avoiding extra copy 2013-09-15 23:18:11 -07:00
Dane Springmeyer
d3ab601e30 integrate various minor c++ style and cast fixes into master from c++11 branch 2013-09-15 23:08:04 -07:00
David Marteau
7495d2f381 [mappy] Parallel feature requests supports - PostGIS async requests 2013-09-11 14:04:10 +02:00
artemp
b690015d63 Merge branch 'master' into c++11 2013-09-09 12:32:47 +01:00
Dane Springmeyer
c5dd5487a5 Merge pull request #1966 from mapnik/background-image-comp-op 
Map background-image-comp-op and background-image-opacity
 2013-09-05 12:25:47 -07:00
artemp
d4b9a48cb1 + geometry::types Exterior/Interior polygon loops 2013-09-03 12:15:31 +01:00
artemp
4f4e2b001e Merge branch 'master' into c++11 
Conflicts:
	SConstruct
	benchmark/run.cpp
	bindings/python/mapnik_datasource.cpp
	bindings/python/mapnik_feature.cpp
	bindings/python/python_optional.hpp
	include/mapnik/css_color_grammar.hpp
	include/mapnik/expression_grammar.hpp
	include/mapnik/feature.hpp
	include/mapnik/feature_style_processor_impl.hpp
	include/mapnik/image_filter_types.hpp
	include/mapnik/image_util.hpp
	include/mapnik/json/geometry_generator_grammar.hpp
	include/mapnik/json/geometry_grammar.hpp
	include/mapnik/processed_text.hpp
	include/mapnik/tiff_io.hpp
	include/mapnik/util/geometry_svg_generator.hpp
	include/mapnik/util/geometry_wkt_generator.hpp
	include/mapnik/utils.hpp
	include/mapnik/webp_io.hpp
	include/mapnik/wkt/wkt_grammar.hpp
	plugins/input/shape/shape_datasource.cpp
	plugins/input/shape/shapefile.hpp
	src/expression_grammar.cpp
	src/expression_string.cpp
	src/image_util.cpp
	src/json/feature_collection_parser.cpp
	src/json/feature_parser.cpp
	src/miniz.c
	src/symbolizer_helpers.cpp
	src/tiff_reader.cpp
	src/webp_reader.cpp
	tests/cpp_tests/geometry_converters_test.cpp
	tests/cpp_tests/image_io_test.cpp
	tests/cpp_tests/map_request_test.cpp
	tests/python_tests/image_test.py
	tests/visual_tests/test.py
 2013-08-30 09:46:09 +01:00
Petr Dlouhý
69185339a5 offset enabled for LinePatternSymbolizer 2013-08-22 10:35:44 +02:00
Dane Springmeyer
42d3bb11af webp: WebPConfig.lossless, WebPPicture.use_argb, and WebPPictureImportRGBX all became available in libwebp v0.1.99 or ABI v1 - refs #1986 2013-08-15 15:15:07 -04:00
Dane Springmeyer
1a8287da06 Add support for webp:alpha=false to create rgb images without alpha + other webp encoding cleanups - closes #1986 2013-08-15 14:47:28 -04:00
Dane Springmeyer
5667343ad9 use U_NAMESPACE_QUALIFIER to most cleanly support when icu is built with -DU_USING_ICU_NAMESPACE=0 - refs #1985 2013-08-14 21:56:40 -04:00
Dane Springmeyer
e0026f3df2 use icu:: namespace and start isolating icu impl by consistenly using mapnik::value_unicode_string 2013-08-13 18:52:04 -04:00
Dane Springmeyer
80cc235ff9 pass by const ref 2013-08-13 18:35:18 -04:00
Dane Springmeyer
134cbc3eec forward declare mapped_region in mapped_memory_cache.hpp and other shared memory fixups 2013-08-13 14:13:56 -04:00
Dane Springmeyer
78b4980352 finish exposing mapnik.Feature.from_geojson 2013-07-30 15:45:46 -04:00
Dane Springmeyer
79d1e6e5c0 add note about miniz porting and #1967 2013-07-30 12:32:32 -04:00
Dane Springmeyer
bbfd111900 fix PHOENIX_V3 compile of svg generator 2013-07-28 12:54:31 -04:00
Dane Springmeyer
76f111cc97 support optionally compiling with -std=c++11 on OSX / clang / apple libc++ / boost 1.53 - refs #1683 2013-07-27 01:57:24 -04:00
Dane Springmeyer
fd14edcd56 fix compile of expression grammer with clang++/libc++/c++11 2013-07-26 19:33:35 -04:00
Dane Springmeyer
fad9af5263 add support for applying custom comp_op and opacity when blending map background image into background color at render time - refs mapnik/mapnik-support#8 2013-07-25 01:00:38 -04:00
Dane Springmeyer
0ac9c7f4c9 re-write scale-hsla filter to work in doubles, allowing proper clamping at the right time - refs #1954 2013-07-24 21:13:46 -04:00
Dane Springmeyer
88d42c48a9 enhance scale-hsla validation - refs #1954 2013-07-24 20:25:07 -04:00
Dane Springmeyer
ec950bd983 handle duplicate hsl hue_to_rgb code 2013-07-24 19:26:26 -04:00
Dane Springmeyer
eaeccc3c3a enforce valid hsla values - refs #1954 2013-07-24 14:24:33 -04:00
artemp
7c63b666f9 cast toff_t to std::streamoff 
remove 'C' style comments!!
 2013-07-24 11:44:19 -04:00
Dane Springmeyer
ef4dfeb747 make it possible to disable compilation of grid_renderer - closes #1962 2013-07-23 19:37:25 -04:00
Dane Springmeyer
f682fcc6d1 deal with various -Wunused-parameter warnings that are not importatn 2013-07-23 18:44:16 -04:00
Dane Springmeyer
72bfa282fa iwyu 2013-07-23 18:43:19 -04:00
Dane Springmeyer
0ac4ec0dd9 iwyu 2013-07-23 18:42:53 -04:00
Dane Springmeyer
fd7164bd3c use pixfmt pre for the sake of clarity 2013-07-23 18:42:47 -04:00
Dane Springmeyer
6269b42ffc iwyu 2013-07-23 18:41:59 -04:00
Dane Springmeyer
c5b7cd0e3e remove dead code 2013-07-23 16:10:00 -04:00
Dane Springmeyer
31931b89cb git rid of a few fixme 2013-07-23 16:00:16 -04:00
Dane Springmeyer
3bd2e6501f fix a batch of unused variable warnings (leaving several with are true bugs/missing features) 2013-07-23 15:51:22 -04:00
Dane Springmeyer
d1667c125c return human readable cairo error 2013-07-22 16:21:18 -04:00
Dane Springmeyer
3beba890f8 make scale_factor accessible off renderers - no need to store as member of feature_style_processor 2013-07-22 13:25:04 -04:00
Dane Springmeyer
b6739efa6a clean up render_style code to avoid excessive function calls for marking a renderer as painted 2013-07-19 19:43:30 -04:00
Dane Springmeyer
a4efd6b73e simplify render_style further after 6bbbe155fe 2013-07-19 19:33:11 -04:00
Dane Springmeyer
032e33cc9f remove filter_factor as option to gdal datasource, clean up pass down from query object - closes #1488 - refs #625 2013-07-19 19:22:45 -04:00
Dane Springmeyer
9b9e42ce5d use featureset_buffer for simplier render time feature cache from @mappy 2013-07-19 18:32:47 -04:00
Dane Springmeyer
3864fada72 pass string by const ref 2013-07-19 15:46:01 -04:00
Dane Springmeyer
6bbbe155fe remove RENDERING_STATS compile time option - refs #1956 2013-07-19 15:09:59 -04:00
Dane Springmeyer
a141c5c27d webp encoding/decoding support - refs #1955 2013-07-19 01:09:17 -04:00
Dane Springmeyer
0872061993 renable hsla filter as 'scale-hsla' - refs #1954 2013-07-19 00:37:51 -04:00
Dane Springmeyer
a834d2941a fix initialization of hue and sat in rgb2hsl + fix rounding in hsl2rgb to be stable on 32 bit systems (no change on 64 bit) - refs #1954 2013-07-19 00:22:52 -04:00
Dane Springmeyer
aedc3512c2 rollback to copying bbox member of filter_in_box - previous change led to odd node-mapnik shapefile query failure 2013-07-17 18:47:07 -04:00
Dane Springmeyer
04c1808703 avoid a few uneeded copies 2013-07-17 18:47:07 -04:00
Dane Springmeyer
9bf6abd988 add missing attribute collector for markers symbolizer path expression - closes #1952 2013-07-16 20:00:51 -04:00
artemp
cbfe228790 + improve c++ style 
+ formatting
 2013-07-16 11:16:52 +01:00
Dane Springmeyer
bcf1454884 optimize svg rendering by moving bbox calc only needed by gradient rendering into gradient code 2013-07-10 16:44:20 -04:00
Dane Springmeyer
068f759fb5 fix height clamping in image_view and grid_view - closes #1940 2013-07-04 13:56:58 -04:00
Dane Springmeyer
c011524b67 add mapnik.Image.premultiplied() to query status of pixel premultiplication 2013-07-02 16:01:23 -04:00
Dane Springmeyer
90c9a39a66 remove debugging line 2013-06-28 15:54:04 -04:00
Dane Springmeyer
3ae432ac96 fix behavior of marker-ignore-placement on lines - closes #1931 2013-06-28 15:53:08 -04:00
Dane Springmeyer
25dabd6f24 support scale_denominator override in save_to_cairo_file - closes #1930 2013-06-27 20:07:25 -04:00
Dane Springmeyer
ba4d06a530 protect against negative image dimensions - closes #1927 2013-06-26 16:46:36 -04:00
Dane Springmeyer
fd428cf11b svg_renderer: group layers in inkscape capatible way - refs #1917 2013-06-24 20:29:57 -07:00
Dane Springmeyer
d1f1104ebe svg_renderer: start paying attention to scale_factor, collision, and fonts 2013-06-24 20:26:30 -07:00
Dane Springmeyer
18ab68f03f iwyu 2013-06-21 12:00:48 -07:00
Dane Springmeyer
e3c5ae9cf4 svg_renderer: use precision of 4, accept map request/scale_factor, and fix output of multipart geometries 2013-06-20 21:27:42 -07:00
artemp
386f6a5b24 + use auto 2013-06-17 10:47:53 +01:00
Dane Springmeyer
64947f8540 now working on mapnik v3.0.0-pre 2013-06-03 18:56:56 -07:00
Dane Springmeyer
9231205573 setting up for mapnik v2.2.0 release 2013-06-03 18:26:28 -07:00
Dane Springmeyer
3b2bdba7b0 iwyu 2013-06-02 20:19:33 -07:00
Dane Springmeyer
0365d3e081 start centralizing filesystem operations in mapnik::util::fs - refs #1177 2013-06-02 19:28:24 -07:00
Dane Springmeyer
e1c299decf remove whitespace 2013-06-02 17:34:36 -07:00
Dane Springmeyer
1036eb1c99 support base_path adjustment when reading from xml file as well as from a string 2013-06-02 16:24:21 -07:00
Dane Springmeyer
7c8dbacdb6 fix compile against boost 1.47 - closes #1885 2013-06-02 13:32:15 -07:00
Dane Springmeyer
88ca6fca5d Followup to #1642, closes #1859 
This change adds back the ability to throw out both empty strings
and null values with the not equals statement like `[attr] != ''`

Note: this does not mean null == '' because the needed compatibility
fix only addresses the "not equals` operator to retain the historical
usage of not matching nulls.
 2013-05-31 13:23:59 -07:00
Dane Springmeyer
1da3bee032 implement == and != operators on the value_null struct - no functional change, but helpful to consolidate logic for comparisions 2013-05-31 12:24:59 -07:00
artemp
4a60bc7be5 + add value_bool support in not_equals 2013-05-31 18:51:11 +01:00
artemp
c8630696d4 + add explicit value_bool/value_integer/value_double equality comparison 2013-05-31 18:48:13 +01:00
Dane Springmeyer
b0f15bf5de avoid muffling proj_init at render time and instead catch at load_map - closes #646 2013-05-29 15:16:44 -07:00
Dane Springmeyer
7302b3b654 fix #1865 2013-05-24 16:45:02 -07:00
Dane Springmeyer
9107046508 avoid including cairo-ft in header 2013-05-22 23:23:22 -07:00
Dane Springmeyer
31ae5e632b rollback accidentally commited change in 126d1b73d6 - not quite yet 2013-05-22 10:22:25 -07:00
Dane Springmeyer
126d1b73d6 reflect debug symbolizer in python 2013-05-22 06:49:38 -07:00
Dane Springmeyer
8634a04938 add support for drawing all geometry verticies with debug symbolizer mode=vertex and expose in python - closes #1848 2013-05-21 19:21:35 -07:00
artem@windows
35a8582043 put implementatio into .cpp to avoid exposing <windows.h> 2013-05-20 13:43:31 -07:00
Dane Springmeyer
84a15f9090 iwyu 2013-05-20 12:50:26 -07:00
Dane Springmeyer
29578410c2 fix marker bbox calculation - closes #1849 2013-05-20 12:50:26 -07:00
artem@windows
15e059a9ac put implementatio into .cpp to avoid exposing <windows.h> 
Conflicts:
	include/mapnik/utils.hpp
 2013-05-20 14:54:06 +01:00
artemp
fa99757154 + add accidentally removed config.hpp 2013-05-20 14:00:03 +01:00
artemp
6e4169d2b9 + utf8 to/from utf16 implementation 
Conflicts:
	include/mapnik/utils.hpp
 2013-05-20 14:00:03 +01:00
Dane Springmeyer
ae2e33de34 msvc on windows breaks with singleton declared but gcc needs default visibility to avoid double singleton registration across dlls when using -fvisiblity=hidden 
Conflicts:
	include/mapnik/utils.hpp
 2013-05-20 14:00:02 +01:00
artemp
9348fffa8d + filter_at_point - cache inflated bbox 2013-05-20 14:00:02 +01:00
artemp
6412b43d6c + utf8 to/from utf16 implementation 2013-05-20 12:05:22 +01:00
artem@windows
293d4829a8 MAPNIK_DECL feature_parser 2013-05-17 16:20:01 -07:00
Dane Springmeyer
03d8b6d9d7 msvc on windows breaks with singleton declared but gcc needs default visibility to avoid double singleton registration across dlls when using -fvisiblity=hidden 2013-05-17 13:16:36 -07:00
artemp
5be9640742 + filter_at_point - cache inflated bbox 2013-05-17 16:22:04 +01:00
Dane Springmeyer
5a6ea9ee6f finish to rename of mapnik::Feature -> mapnik::feature_impl 2013-05-16 11:55:58 -07:00
Dane Springmeyer
3fbf4df67d add support for statically linking datasource input plugins - closes #1810 and #1821 - refs #249 2013-05-16 11:55:58 -07:00
Dane Springmeyer
879225abfb rollback MAPNIK_DECL on exceptions - which breaks linking of python bindings on msvc - refs #1826 2013-05-15 18:47:46 -07:00
Dane Springmeyer
9c66d0ec1d move expresion_grammar impl to impl header 2013-05-15 18:24:49 -07:00
Dane Springmeyer
bedcde02cb rename css_color_grammar_def.hpp -> css_color_grammar_impl.hpp to be consistent with other headers 2013-05-15 18:23:46 -07:00
Dane Springmeyer
14d6c3b80b remove expression_grammar from public api 2013-05-15 18:22:28 -07:00
Dane Springmeyer
9682af53da fix compile in master after 8d5b983cb6 since master still uses phoenix v2 2013-05-14 10:31:13 -07:00
artemp
8d5b983cb6 Geometry/Feature parsers -truncate 'where' message in on_error handler (currently 16 chars max) 2013-05-14 15:02:05 +01:00
artemp
0e5013fb03 + add feature_parser implementation 2013-05-14 14:55:08 +01:00
artemp
5d0c36fb65 Geometry/Feature parsers -truncate 'where' message in on_error handler (currently 16 chars max) 2013-05-14 14:51:28 +01:00
artemp
1e1e2d1e79 + prefer ``const& `` style (mapnik c++ style) 2013-05-14 12:31:05 +01:00
artemp
abc5d39dbd + comment out as msvc++ doesn't support 'noexcept' 2013-05-14 12:06:55 +01:00
artemp
677a0a68c6 TIFF I/O 
+ use c++ casts
+ better naming
 2013-05-13 10:25:09 +01:00
artemp
b816a47de2 + fix writing to std::stringstream 
* if seeking pass the end  - grow buffer (stringstream!)
* seekp beyond current buffer size doesn't set failbit (clang/libcxx)
 2013-05-10 14:17:31 -07:00
artemp
e9733d8a9b + fix writing to std::stringstream 
* if seeking pass the end  - grow buffer (stringstream!)
* seekp beyond current buffer size doesn't set failbit (clang/libcxx)
 2013-05-10 16:50:28 +01:00
artemp
3223836874 + potential boost::variant optimization 2013-05-10 16:45:54 +01:00
Dane Springmeyer
d36a7323ac support -fvisibility=hidden in core library - refs #1826 2013-05-09 18:22:40 -07:00
Dane Springmeyer
7c4adea08e support visibility attribute with gcc/clang - refs #1826 2013-05-09 17:07:58 -07:00
Dane Springmeyer
5bb1c067af fix build on windows by ensuring singleton base is exported (avoids inconsistent dll linkage error) 2013-05-09 17:06:41 -07:00
Dane Springmeyer
a7a106109d make mapped_memory_cache a class not struct for consistency with other singletons 2013-05-09 17:05:39 -07:00
Dane Springmeyer
e6bfd12b95 make public the singleton template to ensure it can be shared across shared library boundaries if the library is built with -fvisibility=hidden - refs #1826 2013-05-09 15:26:50 -07:00
Dane Springmeyer
36bdde82e7 no need to use MAPNIK_DECL with typedefs 2013-05-09 15:25:14 -07:00
artemp
dd0c4701c5 + hold actual values in expressions tree (experimental) 
(result gets converted to mapnik::value)
 2013-05-09 15:31:31 +01:00
artemp
6bfb92811e + make default ctor nothrow 2013-05-09 13:46:09 +01:00
artemp
39f21c16b9 mapnik::value 
to_expression_string - add missing specialization
for mapnik::value_integer and remove usage of std::stringstream
 2013-05-08 10:31:14 -07:00
artemp
656c9e724f + re-arrange expression 2013-05-08 17:21:34 +01:00
artemp
75aa6e94d8 + expression_optimizer (experimental) 
at the moment very basic ops are supported e.g

```
expr = 1+1+1 ---> expr = 3
expr = 1+1+[ATTR] ---> 2+[ATTR]

expr = [ATTR] + 1 + 1  ---> ([ATTR] + 1) + 1  ### stays unchaged
expr = [ATTR] + 1/3.14159 + 1 ---> ([ATTR] + 0.31831) + 1
```
 2013-05-08 16:54:25 +01:00
artemp
4138a70a52 mapnik::value 
to_expression_string - add missing specialization
for mapnik::value_integer and remove usage of std::stringstream
 2013-05-08 16:51:28 +01:00
artemp
b086e2d20c + small optimization - pass and return const ref 2013-05-07 16:12:57 +01:00
artemp
4915bf138e mapnik::value + add move ctor 
mapnik::feature + pass attributes by r-value.
 2013-05-07 12:04:06 +01:00
Dane Springmeyer
944eb5e2f7 rename variable for clarity 2013-05-06 12:38:41 -07:00
artemp
42d8dfa322 + add move ctor and 'canonical' assignment operator 2013-05-06 15:54:17 +01:00
artem@windows
b29fe11e35 + fix font_set::size return type 2013-05-03 16:43:25 -07:00
artemp
6490245218 + remove more cruft 2013-05-03 14:21:34 +01:00
artemp
1847ce581d box2d 
+ re-implement from_string avoiding tokenizer (~10x faster)
 2013-05-03 11:41:43 +01:00
artem@windows
29f9273d3e + msvc : fix warnings (TODO: work-in-progress) 2013-05-02 14:07:06 -07:00
artem@windows
f611892915 remove redundant header 2013-05-02 12:02:13 -07:00
artemp
43968b6c50 + c++ style : formatting 2013-04-30 18:47:17 +01:00
artem@windows
9a64415a03 use std::size_t to avoid conversion warnings 2013-04-30 10:06:47 -07:00
artem@windows
16c0b578bc c++11 
+ use std::size_t
+ re-implement envelope() method in terms of c++11
 2013-04-30 09:51:08 -07:00
artemp
95e3c87f05 + revert to using boost::math::trunc 
+ and mapnik::noncopyable

vc++ (*) doesn't support std::trunc and deleting methods in class/struct definition

* - vc++ 2012 November CTP
 2013-04-30 09:32:22 +01:00
artem@windows
abd42357d6 + add <cmath> header to keep cl.exe happy 2013-04-30 08:55:51 +01:00
Toby Collett
ac09541243 Use shared pointer reference count to track pools 
By using the shared pointer reference count to track the connections
in the connection pool we no longer have to explicitly return them
to the pool.

This resolves an issue where cursor feature sets were returning their
connections before they were done with them, causing a potential race
with another connection user.
 2013-04-29 20:33:57 +00:00
artem@windows
faa8394ef6 + add <cmath> header to keep cl.exe happy 2013-04-29 04:21:28 -07:00
artemp
58927b404c c++11 
+ replace BOOST_FOREACH with for( : )
+ remove boost/foreach.hpp
+ fix benchmarks (17,18)
 2013-04-24 16:40:35 +01:00
artemp
49fe99ac4f + make rule_cache movable 
+ use rule_cache move semantics in feature processor
 2013-04-24 10:08:10 +01:00
artemp
80c5452130 + fix phoenix functions to compile on ubuntu 12.04/c++11 
+ cleanups
 2013-04-23 14:00:08 +01:00
artemp
e38ce37ed3 * use move semantics 
* use light weight wkb_stream wrapper to avoid locale/formatting locking
 2013-04-22 15:24:47 +01:00
artemp
3f6abd3362 + backport image_reader from buffer/string from image-readers-c++11 branch 2013-04-22 11:35:09 +01:00
artemp
800ee1f0dd + c++ style 2013-04-22 09:56:48 +01:00
artemp
d215c09762 + json-generator : don't output coordinates from SEG_CLOSE command 2013-04-19 14:21:12 +01:00
artemp
ae9b518618 + fix coords precision 2013-04-19 14:13:18 +01:00
artemp
b1ea547fa9 + fix grammar to work with phoenix v3 and c++11 2013-04-19 12:10:34 +01:00
artemp
3a2b1dc027 + move preprocessor directive to the top 2013-04-19 12:00:25 +01:00
artemp
8bb6bb1d68 + fix grammar to work with phoenix v3/c++11 2013-04-19 11:59:16 +01:00
artemp
c73e48fa58 + use std::unique_ptr instead of std::auto_ptr (deprecated!) 2013-04-19 09:50:50 +01:00
artemp
a41c83fbce + png_io: disble miniz for now 2013-04-19 09:41:42 +01:00
Dane Springmeyer
60c6592c4e fix spelling of unknown 2013-04-17 14:23:04 -07:00
artemp
da6c630db9 + add webp writing support 2013-04-17 14:50:35 +01:00
artemp
868d60d765 + add getBytes() method ( needed by webp i/o) 2013-04-17 14:46:11 +01:00
artemp
cc5788e9c4 Merge branch 'master' into image-readers-c++11 2013-04-17 10:17:03 +01:00
Dane Springmeyer
294b10229e disable the hsla image-filter - not yet ready for primetime 2013-04-16 19:09:40 -07:00
artemp
9020e6f439 type_from_filename : add webp support 2013-04-16 10:56:10 +01:00
artemp
28ea89fe1c + remove const& qualifier 2013-04-12 16:03:08 +01:00
artemp
438bfad732 + factory : variadic templates based implementation ( requires c++11) 
+ image_reader : stream based reading interface (boost::iostreams)
+ register additional png and jpeg readers with following sigs :

  ```
  std::auto_ptr<mapnik::image_reader> reader(mapnik::get_image_reader(buffer,size));
  // buffer - char const*
  // size - size_t
  ```
+ initial type_from_bytes implementation (TODO: add more types)
+ python : mapnik.Image.fromstring(str) mapnik.Image.frombuffer(buf)
 2013-04-12 12:46:40 +01:00
Dane Springmeyer
5de4636be8 use mapnik::noncopyable 2013-04-10 18:15:09 -07:00
Dane Springmeyer
79a216f349 remove ltdl to reduce dependencies and because calling dlopen/LoadLibrary is easy 2013-04-09 19:37:02 -07:00
artemp
a25f1ccb56 + make image_reader non-copyable 2013-04-09 11:38:50 +01:00
artemp
a4770ac10b + cache fonts in memory 2013-04-02 13:27:05 +01:00
Daniel C. Casimiro
2080d0a986 Add a fix for compiling mapnik against boost 1.53.0. 
Qualify the call to phoenix::construct so that the compiler on RHEL6
(gcc (GCC) 4.4.6 20120305 (Red Hat 4.4.6-4)) doesn't complain. The
compiler complains that "boost::phoenix::tag::construct" is not a function.
 2013-04-01 06:08:53 -04:00
Hermann Kraus
5f137bcc28 Handle large errors in marker placement. 
Closes #1485.
 2013-04-01 05:27:13 +02:00
artemp
682635e975 + mapnik::projection add operator<< 2013-03-27 10:38:20 +00:00
Hermann Kraus
b1bc5a51b3 Apply scale factor to offsets. 2013-03-24 15:21:59 +01:00
Dane Springmeyer
f6870a6b70 correct the ltdl forward declare type 2013-03-22 19:47:57 -07:00
Dane Springmeyer
aaecd92fb6 Merge branch 'master' of github.com:mapnik/mapnik 2013-03-22 17:58:49 -07:00
Dane Springmeyer
55ec6a7942 cleanups around exception handling 2013-03-22 17:58:33 -07:00
Dane Springmeyer
f9514e5d2c formatting 2013-03-22 17:44:27 -07:00
Dane Springmeyer
3256037eb6 forward declare the lt_dlhandle type to avoid needing header in datasource_cache.hpp 2013-03-22 17:37:56 -07:00
artemp
fe092ac7a2 + implement offset 
```
offset = "<number> | <percentage>"
```
 2013-03-21 12:10:08 +00:00
artemp
542805e4d6 + support multiple color stops in colorize-alpha 
( TODO: add support for:  <color-stop>     = <color> [ <percentage> | <length> ]? )
 2013-03-20 17:21:09 +00:00
artemp
4b713f6ed0 + impl colorize-alpha image filter 
NOTE:currently linear interpolation between two colours only
  TODO:support multiple colour stops : https://developer.mozilla.org/en-US/docs/CSS/linear-gradient
 2013-03-20 15:17:41 +00:00
Dane Springmeyer
e47f3e635c remove explicit keyword on boolean to make llvm-gcc happy on os x 2013-03-19 14:10:01 -07:00
Dane Springmeyer
3b807db7e1 avoid gcc unsigned/signed comparison warning 2013-03-18 16:54:26 -07:00
Dane Springmeyer
f759964dbf c++ style 2013-03-15 16:52:02 -07:00
Dane Springmeyer
7d868558d7 fix a variety of msvc compiler warnings about signed/unsigned implicit conversion 2013-03-15 13:37:48 -07:00
Dane Springmeyer
94c5645e8b add new gamma members to agg_renderer 2013-03-14 17:15:35 -07:00
Dane Springmeyer
06803de192 iwyu 2013-03-14 15:13:02 -07:00
artemp
5e224bd705 + better error reporting 2013-03-14 09:52:23 +00:00
artemp
73261346cf + remove unused local vars 2013-03-14 09:35:41 +00:00
Dane Springmeyer
6cbceafc45 avoid direct freetype usage in core/public hpp file so that mapnik C++ depedencies do no need to known the freetype include paths 2013-03-12 18:12:54 -07:00
Dane Springmeyer
c7821889c9 refactor svg parsing so that libxml is not needed in the hpp file 2013-03-12 18:09:59 -07:00
Dane Springmeyer
20fcdc8034 iwyu 2013-03-12 16:56:47 -07:00
Dane Springmeyer
86ad6c0dab snap to pixels for markers because calculating placement 2013-03-12 12:14:01 -07:00
Dane Springmeyer
29ce3b1c75 fix handling of svg opacity, which should be applied to fill/stroke opacity at render time - closes #1744 2013-03-11 14:56:00 -07:00
Dane Springmeyer
3b834b4e6f formatting 2013-03-11 13:46:32 -07:00
artemp
4bdc5cdc10 + boost.geometry based polygon clipper 
(NOTE: subject polygons must be 'valid' as in OGC world)
 2013-03-11 09:44:20 +00:00
Dane Springmeyer
e66d007627 add halo-rasterizer option for text symbolizer 
- closes #1298
  - allows for much faster halo drawing and simliar quality for
    radius values in the 1-2 px range
  - also moves grid_renderer away from using freetype stroker completely
    since halo quality is not critical for this renderer
 2013-03-08 20:32:39 -08:00
Dane Springmeyer
76042a1700 parse and setup ability to known original, declared svg width/height - refs #1122 2013-03-08 17:40:19 -08:00
Dane Springmeyer
2fcd531345 pixel snap raster markers and svg files loaded from the file system - partially addresses #1316 2013-03-08 16:24:41 -08:00
Dane Springmeyer
c36795e0a9 respect both sx and sy in setting up affine transform for raster scaling since they may be different - closes #1748 2013-03-06 17:41:20 -08:00
artemp
f2b795af0b + skip SEG_CLOSE commands as they not used to transfer x/y 2013-03-06 21:31:12 +00:00