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

2128 commits

Author SHA1 Message Date
Dane Springmeyer
071c67d438 iwyu 2013-01-13 22:01:13 -08:00
Dane Springmeyer
bbcd53c6f4 refactor headers involving variant attempting to move as much variant usage out of hpp files to speed up compiles 2013-01-12 21:00:45 -08:00
Dane Springmeyer
40c51089af we only need two integer signatures for to_string if BIGINT is defined 2013-01-10 20:57:02 -08:00
Dane Springmeyer
25bfc45bef fixup includes in expression_string.cpp 2013-01-10 19:52:24 -08:00
Dane Springmeyer
2337a247d3 cairo: properly handle alpha when setting color - fixes failing visual test (marker_line_placement_on_points) 2013-01-10 17:44:34 -08:00
Dane Springmeyer
805664056a append rather than prepend cairo paths to ensure that internal/local paths come first as per the last configure sort by priority 2013-01-10 17:08:58 -08:00
Dane Springmeyer
bb43f2cec1 refactor params interface to move lexical cast out of header 2013-01-09 19:12:20 -08:00
Dane Springmeyer
7aab2bca4f iwyu 2013-01-09 16:45:37 -08:00
Dane Springmeyer
a0c758df9e fix ambiguious remove_const (fixes msvc 2010 compile) 2013-01-09 16:45:17 -08:00
Dane Springmeyer
94ff584190 finish complete removal of any trace of cairomm/libsigc++ - amends f25d4d9279 and closes #1681 2013-01-09 12:49:39 -08:00
artemp
f25d4d9279 + implement cairo_context wrapper and remove unnecessary dependencies 
( cairomm, libsigc++)
 2013-01-09 17:00:30 +00:00
Dane Springmeyer
0121f53f56 refactor and speed up hextree image encoding by using dense_has_map - refs #1629 2013-01-08 19:07:11 -08:00
Dane Springmeyer
f315a87874 further cleanup of expression related headers 2013-01-08 15:12:39 -08:00
Dane Springmeyer
b5c06965ac refactor expression and value type usage to speed up compile time 2013-01-08 14:17:31 -08:00
Dane Springmeyer
ca41be2372 fixup forward declares - amends 2d7c7fed9b 2013-01-06 11:56:35 -08:00
Dane Springmeyer
7e2f5caf0a remove uneeded c_str() call 2013-01-06 11:34:36 -08:00
Dane Springmeyer
7087fb9698 amend c61335c277, unbreak datasource templates, and add a test to ensure it does not regress again 2013-01-04 14:36:24 -08:00
Dane Springmeyer
af3d4486cf fix default log severity 2013-01-04 13:52:50 -08:00
Dane Springmeyer
866597c8c3 Fix -Wshadow warnings 2013-01-04 11:06:03 -08:00
Dane Springmeyer
3304841009 move type conversions code fully to cpp file to reduce compile times across code base 2013-01-04 09:27:39 -08:00
Dane Springmeyer
648105c2c4 move params impl to cpp to avoid overhead of lexical cast header compile which would otherwise be included implicitly in every datasource plugin 2013-01-04 09:24:35 -08:00
Dane Springmeyer
70ef017f8c move karma out of header to radically speed up compile times of files including image_filter_types.hpp 2013-01-04 00:07:57 -08:00
Dane Springmeyer
17b0b1eeb1 iwyu 2013-01-03 23:56:47 -08:00
Dane Springmeyer
e9343ca32c iwyu 2013-01-03 23:56:11 -08:00
Dane Springmeyer
a75cfa111b iwyu 2013-01-03 23:55:09 -08:00
Dane Springmeyer
0812ac871d iwyu 2013-01-03 23:54:04 -08:00
Dane Springmeyer
5c0e52b979 iwyu 2013-01-03 23:53:47 -08:00
Dane Springmeyer
54aa2c040d iwyu 2013-01-03 23:52:58 -08:00
Dane Springmeyer
b6cd17847c iwyu 2013-01-03 23:20:30 -08:00
Dane Springmeyer
32760318a4 iwyu 2013-01-03 23:19:54 -08:00
Dane Springmeyer
a87f7160dd fixup includes for src/map.cpp 2013-01-03 20:07:44 -08:00
Dane Springmeyer
17d80780bd fixup includes for save_map.cpp 2013-01-03 20:06:10 -08:00
Dane Springmeyer
84c3afbd53 report integer type sensitive to BIGINT define 2013-01-03 20:05:06 -08:00
Dane Springmeyer
618e43af06 create path_expression.hpp and leverage to simplify and speed up compiles 2013-01-03 20:00:23 -08:00
Dane Springmeyer
bf649176ae finish move to cpp for rule class and fixup includes 2013-01-03 19:57:09 -08:00
Dane Springmeyer
e682705a86 use the std library tolower over boost::algorithm::to_lower for both better runtime and compile speed - closes #1677 2013-01-03 19:27:53 -08:00
Dane Springmeyer
c61335c277 fix -Wshadow warnings 2013-01-03 19:14:19 -08:00
Dane Springmeyer
c860c9165e various fixes to includes to include what is used 2013-01-03 18:06:07 -08:00
Dane Springmeyer
fa7201e01c fix -Wshadow warning 2013-01-03 18:05:40 -08:00
Dane Springmeyer
ccf10961c7 fix -Wshadow warning 2013-01-03 18:04:01 -08:00
Dane Springmeyer
6434466ee3 fix -Wshadow warning 2013-01-03 18:03:08 -08:00
Dane Springmeyer
000b714eae fix more clang++ -Wshadow warnings 2013-01-03 12:37:45 -08:00
Dane Springmeyer
271e8468fd fix compile of svg output renderer 2013-01-03 12:01:14 -08:00
artemp
6558c5c315 + use uint8_t in get/set methods 
+ update to_string/to_hexstring
 2013-01-03 13:51:16 +00:00
Dane Springmeyer
e094776fc5 Merge branch 'master' of github.com:mapnik/mapnik 2013-01-02 13:57:05 -08:00
Dane Springmeyer
a78f5c2f70 comment unused function in miniz sources to avoid compiler warning 2013-01-02 13:44:19 -08:00
artemp
600eb07883 + convert colours to doubles in set_color 2013-01-02 19:36:22 +00:00
artemp
bc8ea1c5a7 + sync set_color(...) methods 
+ fix alpha/opacity calc when processing building_symbolizer
 2013-01-02 16:52:06 +00:00
artemp
8b66128c89 + take into account alpha when rendering building frame 
(TODO: consider more options - roof fill,??)
 2013-01-02 16:50:28 +00:00
Dane Springmeyer
88e970841b remove unneeded get_optional method on feature impl 2012-12-26 16:52:06 -08:00
Dane Springmeyer
0d8f415070 avoid unnessary datasource queries if style contains only empty rule(s) - closes #1670 - refs mapbox/carto#219 2012-12-21 20:03:41 -08:00
Dane Springmeyer
00e6316ef8 Merge branch 'master' of github.com:mapnik/mapnik into bigint-feature-id 2012-12-20 17:38:01 -08:00
artemp
6512d2873a + swap patch from @joto : http://www.remote.org/jochen/tmp/swap.patch 2012-12-20 16:36:16 +00:00
Dane Springmeyer
775215e874 Merge branch 'master' of github.com:mapnik/mapnik into bigint-feature-id 2012-12-19 20:13:19 -08:00
Dane Springmeyer
66a5c26fdc leverage mapnik::value_integer for feature.id() and grid rendering buffer - refs #1662 2012-12-19 19:24:52 -08:00
Dane Springmeyer
326b980172 cleanup usage of grid pixel types 2012-12-19 19:19:30 -08:00
Dane Springmeyer
fa1ac1307f use grid value_type instead of hardcoding int for feature id type 2012-12-19 19:17:42 -08:00
artemp
f5dd9e53c4 + calc int_parser/generator type from mapnik::value_integer 2012-12-18 18:05:45 +00:00
artemp
a38b252ccd Merge branch 'master' into bigint 
Conflicts:
	plugins/input/geojson/geojson_datasource.cpp
	plugins/input/postgis/postgis_featureset.cpp
 2012-12-18 13:57:39 +00:00
artemp
274fbf8f7a + ensure 'close path' handled correcly 
(currenlty SEG_CLOSE command must have valid x,y)
+ implement real_policies in wkt and geojson generators
 2012-12-18 11:44:35 +00:00
Dane Springmeyer
c7ed1f93d7 update svg_renderer 2012-12-17 19:13:00 -08:00
Dane Springmeyer
43244efb7d Merge branch 'master' of github.com:mapnik/mapnik into no-bind 2012-12-17 13:03:11 -08:00
Dane Springmeyer
c5410fac7e remove bind option for datasources - refs #962 2012-12-17 10:03:07 -08:00
Dane Springmeyer
bb27156df0 use internal noncopyable class to speed up compile times slightly 2012-12-16 18:19:52 -08:00
artemp
c4bae9d30a Merge branch 'master' into bigint 
Conflicts:
	bindings/python/mapnik_feature.cpp
	plugins/input/shape/dbfile.cpp
 2012-12-14 10:01:21 +00:00
Dane Springmeyer
772c7f52fc knock out some msvc compiler warnings 2012-12-12 15:59:27 -08:00
Dane Springmeyer
3fd7909ba0 fix compile on windows with msvc 2010 - closes #1646 2012-12-12 15:09:07 -08:00
Dane Springmeyer
6b84269343 add pad method on box2d to help tighten otherwise verbose code 2012-12-11 13:56:25 -08:00
Dane Springmeyer
7c58bf9fcb replace boost::trim with faster custom trim - closes #1633 2012-12-07 14:06:13 -08:00
Dane Springmeyer
c0021d0760 remove unused iostream includes and unnecessary usage of ostringstream - refs #1055 2012-12-06 23:06:12 -08:00
Dane Springmeyer
390706b8c7 remove all remaining stringstream usage in load_map to avoid perf hit from locale lock - refs #1055 2012-12-06 20:15:27 -08:00
Dane Springmeyer
80630e905b formatting 2012-12-06 18:46:23 -08:00
artemp
cd435172d4 + fix expression grammar to work with mapnik::value_integer 2012-12-06 09:51:38 +00:00
artemp
8fa88a71b6 Merge branch 'master' into bigint 2012-12-03 13:14:31 +00:00
artemp
855aea95e0 + mapnik::value and mapnik::parameters - initial support for 64-bit integers 2012-12-03 13:12:09 +00:00
Dane Springmeyer
95ceee84fa sync cairo shield rendering with agg - closes #1602 - amends bd9609c370 2012-12-02 22:46:58 -08:00
Dane Springmeyer
7d408d523c close #1548 with explict handling of point geometries and amend 629d768eae for cairo/grid renderers to ensure proper placement on lines (refs #1604,#1350,#1607) 2012-12-02 19:53:44 -08:00
Dane Springmeyer
388ac9799d add a local symlink on linux to libmapnik.so.MAJOR.MINOR to enable easy local testing (without install) - refs #1618 2012-12-02 19:15:22 -08:00
Dane Springmeyer
be05aa5b60 add palette.to_string() method and add python tests of fixed palette functionality 2012-11-30 12:31:58 -08:00
Dane Springmeyer
4436721371 fix potential compile due to error problematic defines that did not get properly cleaned up in a986aedd05 - refs #1400 2012-11-30 11:27:06 -08:00
Dane Springmeyer
52c3f8ff6e disable bbox intersection testing when caching features on the fly during rendering - closes #1543 2012-11-28 20:56:08 -08:00
Dane Springmeyer
53922be94e fix method name - refs #1562 2012-11-28 20:54:39 -08:00
Dane Springmeyer
57aa6dd052 add serialization of line_symbolizer offset - closes #1562 2012-11-28 20:21:22 -08:00
Dane Springmeyer
5f900206d1 formatting 2012-11-28 19:33:09 -08:00
Dane Springmeyer
46f8ce3ce7 finish bringing back to life the SVG_RENDERER - now outputs geometries again - closes #1438 2012-11-28 17:45:05 -08:00
Dane Springmeyer
f39c3ad857 add marker-multi-policy parameter to support user-configurable rendering behavior for multi-geometries when using either point or interior placement - closes #1573, refs #1555 2012-11-20 17:58:39 -08:00
Dane Springmeyer
1ae4a03f68 avoid calls to fixAspectRatio() if current dimensions == dimension being set 2012-11-11 21:48:51 -08:00
Dane Springmeyer
eebc8cc73e add image/grid clear methods to make it easier to quickly re-use previously allocated objects for rendering - closes #1571 2012-11-11 21:35:50 -08:00
Alexandre Bonnasseau
267975c388 Coding style correction : tabs to spaces 2012-11-09 11:57:10 +01:00
Dane Springmeyer
d0f0f9690f zero color images are not valid - catch this earlier on - closes #1568 2012-11-08 16:39:31 -05:00
Alexandre Bonnasseau
efff5f0ef0 Issue #1545 - override buffer-size parameter at layer level - revised 2012-11-08 15:51:22 +01:00
Dane Springmeyer
211b102ec5 support writing full color png with rgb only (no alpha) - closes #1559 2012-11-06 11:44:44 -05:00
Dane Springmeyer
2874664d70 throw if tdefl_init fails 2012-11-06 11:33:11 -05:00
Dane Springmeyer
cd3cc31752 support writing rgb (no a) images with miniz - refs #1554 2012-11-06 09:19:40 -05:00
Dane Springmeyer
5a99d7fbdb add miniz support - closes #1554 2012-11-04 07:10:05 -05:00
Dane Springmeyer
f9fa9c2461 Add support for missing user ability to set Z_FIXED zlib strategy 2012-11-04 06:58:25 -05:00
Dane Springmeyer
eda4436b51 ensure that the transparency level option is passed to the octree encoder - closes #1556 2012-11-04 06:16:18 -05:00
Dane Springmeyer
2b767d650c fix string representation of expr when not built against a boost with icu support 2012-11-01 10:31:45 -07:00
Dane Springmeyer
cea31234fa allow building svg_renderer again - refs #1438 2012-11-01 10:07:29 -07:00
Dane Springmeyer
2cf429db08 start disabling svg_renderer features to get closer to compiling - refs #1438 2012-11-01 10:05:50 -07:00
Dane Springmeyer
0ccf9254ec include what you use 2012-11-01 10:02:08 -07:00
Dane Springmeyer
82b15bdd68 be more explicit about unsigned type for rgba_palette::quantize 2012-10-30 16:55:06 -07:00
Dane Springmeyer
ee68734975 use empty instead of size as per mapnik c++ style 2012-10-30 11:00:51 -07:00
Dane Springmeyer
10f6fbc731 improve error message when datasource plugin is not available 2012-10-30 11:00:24 -07:00
Dane Springmeyer
9040d2ac9d fix feature-cache for rasters - TODO: no intersection check option for memory_featureset 2012-10-26 18:18:35 -07:00
Dane Springmeyer
f7bd53c0d3 make a note about what Z_DEFAULT_COMPRESSION means to zlib 2012-10-25 13:30:14 -07:00
Dane Springmeyer
42661cf6e4 wrap long code lines 2012-10-20 16:20:32 -07:00
Dane Springmeyer
b46c5ddeb1 fix error language when a file cannot be found 2012-10-16 17:45:33 -07:00
Dane Springmeyer
0cafbc9460 warn if a Datasource template is not found 2012-10-10 14:33:56 -07:00
Dane Springmeyer
ccda92fed1 Revert "finish moving symbolizers out of rule" 
This reverts commit 20a317860d.
 2012-10-10 10:51:06 -07:00
Dane Springmeyer
1f11aeb95a Revert "move symbolizers typedef out of rule and be explicit about including config.hpp for MAPNIK_DECL - refs #1527" 
This reverts commit bf5ffd04f4.
 2012-10-10 10:50:56 -07:00
Dane Springmeyer
a7f2eacd76 scons: only depend on libagg if it will be built 2012-10-10 10:19:24 -07:00
Dane Springmeyer
20a317860d finish moving symbolizers out of rule 2012-10-10 10:02:45 -07:00
Dane Springmeyer
bf5ffd04f4 move symbolizers typedef out of rule and be explicit about including config.hpp for MAPNIK_DECL - refs #1527 2012-10-10 09:32:29 -07:00
Dane Springmeyer
a4b5549282 before caching marker premultiply only those image formats that might potentially need to be premultiplied 2012-10-04 16:07:24 -07:00
Dane Springmeyer
357e711312 -avoid potentially premultiplying colors more than once in agg_renderer::setup - closes #1515 2012-10-04 14:24:29 -07:00
Dane Springmeyer
a6129e9a80 add premultiply/demultiply methods for mapnik::color - refs #1519 2012-10-04 13:53:58 -07:00
Dane Springmeyer
72793fe9b6 explicitly include deque - thanks @lightmare - should fix gcc compile 2012-10-04 12:03:40 -07:00
Dane Springmeyer
c0fd6802ed pattern source is only used by line_pattern_symbolizer so move it to that cpp 2012-10-03 18:23:07 -07:00
Dane Springmeyer
7d5642640d use the proper premultiplied pixel type for render_marker 2012-10-03 13:49:06 -07:00
Dane Springmeyer
a27b95558b remove uneeded includes 2012-10-03 13:48:05 -07:00
Dane Springmeyer
05195ca68d Merge pull request #1444 from sigmapi/issue1107 
Fix for issue #1107
 2012-10-03 13:06:45 -07:00
Dane Springmeyer
86e805b33e Merge pull request #1499 from manelclos/master 
Query tolerance for features_at_point
 2012-10-03 11:50:29 -07:00
Dane Springmeyer
8674e463a6 premultiply before image scaling - closes #1508 (at least for gdal.input) and refs #1498 2012-10-02 21:50:42 -07:00
Dane Springmeyer
1b5a1f0ffc agg scaling assumes/requires a premulitiplied renderer (and optionally a source defined as premultiplied) - to avoid any confusion use purely premultiplied types - refs #1508 and #1489 2012-10-02 21:49:52 -07:00
Dane Springmeyer
1468133bc0 ensure we rebuild libmapnik if agg sources change 2012-10-01 18:22:12 -07:00
Dane Springmeyer
798b101f0c finish #1512 and adjust tests to use new parameter 2012-10-01 17:09:28 -07:00
Dane Springmeyer
09726626cf add 'premultiplied' property on raster symbolizer to allow user to control (in rare cases) the premultiplied status of images in cases where tiffs mis-report it - closes #1512 2012-10-01 16:14:41 -07:00
Dane Springmeyer
acaee09598 fix debug output symbolizer name 2012-10-01 15:35:35 -07:00
Dane Springmeyer
ef28a1db80 cleanup includes in rule/feature_style_processor and move code to rule.cpp and raster_symbolizer.cpp 2012-10-01 15:01:12 -07:00
Dane Springmeyer
3845d56c06 add code comments from mcseem relevant to agg usage questions around scaling and compositing 2012-10-01 14:13:54 -07:00
artemp
30f14e0878 Merge branch 'master' into conv_simplify 2012-10-01 10:21:56 +01:00
artemp
b9fed932b9 + template vertex_iterator on path_type 
+ rename vertex_iterator to path_iterator
 2012-10-01 10:20:10 +01:00
artemp
780ea26af3 Merge remote-tracking branch 'origin' into conv_simplify 2012-09-28 19:49:01 +01:00
artemp
3ffe8ec21c + add premultiplied_alpha flag to mapnik::raster 2012-09-28 16:43:05 +01:00
artemp
77e585895f + add premultiplied_alpha method to image_reader 
* tiff - TIFFTAG_EXTRASAMPLES
  * png  - non-premultiplied alpha (http://www.libpng.org/pub/png/spec/1.1/PNG-Rationale.html)
  * jpeg - no-alpha channel, ensure pre-multiplied model
 2012-09-28 16:37:21 +01:00
Manel Clos
8f7083d14d Add tolerance parameter to features_at_point 
Make map.query_point() always pass tolerance to datasources
 2012-09-28 15:12:10 +02:00
artemp
2427daa403 + make WKT generator templated on geometry type - the goal is to be able 
to use generator for any type that implements 'vertex' concept
 2012-09-27 16:07:14 +01:00
artemp
42bcf4ea98 + make WKT generator templated on geometry type - the goal is to be able 
to use generator for any type that implements 'vertex' concept
 2012-09-27 16:04:29 +01:00
artemp
d7abfc267b Merge branch 'master' into conv_simplify 2012-09-27 08:54:32 +01:00
Dane Springmeyer
b9b97ba652 after #1483 fontset is boost optional so check appropriately in load_map (solves assert) 2012-09-26 12:56:57 -07:00
Dane Springmeyer
b6c7e319d6 Merge branch 'master' of github.com:mapnik/mapnik 2012-09-26 08:49:40 -07:00
artemp
d91cd510aa + ensure warp polygons are aligned exactly (avoid padding!) - #1501 2012-09-26 14:27:42 +01:00
artemp
a63df933d5 + only log transform evaluation if trans_expr is not null 2012-09-26 14:26:58 +01:00
artemp
fe011a988d + only log transform evaluation if trans_expr is not null 2012-09-26 14:24:26 +01:00
Dane Springmeyer
1af2faf56b formatting 2012-09-25 14:52:32 -07:00
artemp
32d52a1a78 Merge branch 'master' into conv_simplify 2012-09-25 10:35:53 +01:00
artemp
8fe932b7d1 + tiff_reader: make TIFF* 'cacheable', to avoid initialization under 
certain conditions.
 2012-09-24 13:35:22 +01:00
artemp
a7c02cf1d8 Merge remote-tracking branch 'origin/master' into conv_simplify 2012-09-19 14:07:34 +01:00
artemp
97463abf3d + ensure mesh doesn't overflow source raster extent - #1480 2012-09-19 13:53:56 +01:00
artemp
2834b2ad92 + not sure why we have do { } while(false); - removing 2012-09-19 13:51:53 +01:00
artemp
01ae1a179d Merge branch 'master' into conv_simplify 2012-09-17 11:35:15 +01:00
Dane Springmeyer
2d5287c298 rollback 1b4e7a8fd5 - refs #1489 and #1227 2012-09-14 18:45:09 -07:00
Dane Springmeyer
f3589ab4f9 Revert "no need for premultiplied types in warper" 
This reverts commit 61e8a9c236.
 2012-09-14 18:42:47 -07:00
Dane Springmeyer
ad8e4e4cc7 Merge pull request #1366 from mapnik/debugsymbolizer 
Debug Symbolizer
 2012-09-14 16:43:38 -07:00
Dane Springmeyer
1b3dcda87d add method off style to check for active rules 2012-09-14 16:11:37 -07:00
Dane Springmeyer
8cfb40ae2f refactor fontsets making them optional on the symbolizer and removing the dangerous default contructor - closes #1483 (TODO - consider modifying insert_fontset to only take single arg of fontset instance) 2012-09-14 14:17:45 -07:00
artemp
f66d4b1afe Merge branch 'master' into conv_simplify 2012-09-13 08:50:59 +01:00
Dane Springmeyer
2a3a402f5d finish fixing pixel alignment for raster rendering in cairo - closes #1471 2012-09-12 13:25:40 -07:00
Dane Springmeyer
61e8a9c236 no need for premultiplied types in warper 2012-09-12 13:22:37 -07:00
Dane Springmeyer
1b4e7a8fd5 the blender is not called when scaling and if it were using pixfmt_rgba32_pre would be wrong, so switch back to pixfmt_rgba32 2012-09-12 12:34:35 -07:00
artemp
8cb2ce41ac raster scaling issue 
+ fix rasterizer polygon to be equal to target image
+ align raster to pixel bouyndaries (?)
  ( fixes grey border issue - #1471)
 2012-09-12 14:41:27 +01:00
artemp
f5b4ff9429 Merge branch 'master' into conv_simplify 2012-09-10 10:26:14 +01:00
Dane Springmeyer
0de2beac3e improve interplay of maximum-extent and map.zoom_all, now properly clipping to maximum-extent - closes #1473 2012-09-07 10:36:14 -07:00
artemp
29423cfc1c Merge branch 'master' into conv_simplify 
Conflicts:
	bindings/python/mapnik_markers_symbolizer.cpp
	plugins/input/ogr/ogr_index_featureset.cpp
	plugins/input/shape/dbfile.cpp
	plugins/input/shape/shapefile.hpp
	src/load_map.cpp
 2012-09-07 16:46:02 +01:00
artemp
967d6110bf + singleton: return ref from instance() method 2012-09-07 16:23:03 +01:00
artemp
11e6ba0c09 + make client methods non-static in classes derived from 
mapnik::singleton<> (TODO: apply to all)
+ ensure client methods are accessed through instance() method
 2012-09-07 14:56:30 +01:00
artemp
8fa0742a53 + make client methods non-static in classes derived from 
mapnik::singleton<> (TODO: apply to all)
+ ensure client methods are accessed through instance() method
 2012-09-07 14:51:25 +01:00
artemp
5f8bb423e8 Merge branch 'conv_simplify' of git://github.com/kkaefer/mapnik into kkaefer-conv_simplify 2012-09-06 13:12:39 +01:00
artemp
a513d3f97d + code: avoid exposing unsafe static methods in datasource_cache ( #1451) 
+ python: remove redundent 'instance' method (mapnik.DatasourceCache)
+ python: reflect plugin_directories method
+ tests: update python usage

TODO: consider using similar approach in FontEngine etc..
TODO: consider returning reference from singleton::instance() to
      safeguard from accidental deleting a 'singleton' pointer
 2012-09-05 12:53:37 +01:00
Hermann Kraus
786f798cab Use double instead of unsigned while parsing XML. 
Closes #1469.
 2012-09-05 02:15:58 +02:00
Dane Springmeyer
b385370126 fix spelling of opacity in text/formatting - refs #1470 2012-09-04 13:17:09 -07:00
Dane Springmeyer
551f1e0c66 c++ style 2012-09-03 10:52:36 -07:00
Dane Springmeyer
a12b8f1d2f c++ style 2012-09-03 10:27:48 -07:00
Dane Springmeyer
b8f6b16a56 more portable rounding behavior - refs ##1454 2012-08-31 20:31:06 -07:00
Dane Springmeyer
3d9aa3db10 avoid double drawing of lines with RASTERIZER_FAST 2012-08-30 23:34:43 -07:00
Colin Rundel
bd5df80f75 Minimal roll back const changes 
Changes to expression_ptr and path_expression_ptr are causing runtime issues with the python bindings
 2012-08-29 16:41:48 -04:00
Colin Rundel
dc3763885c More parser clean up - color parser 
Dropped color_factory class in favor of single color_parser function. Moved implementation to new color_factory.cpp since it is odd to have two headers (color.hpp, color_factory.hpp) and only one source file.
 2012-08-29 16:41:48 -04:00
Colin Rundel
10001f1d4b Expression parsing simplification 
Similar idea to path expression parsing cleanup
 2012-08-29 16:41:44 -04:00
Colin Rundel
1d0c817170 Make path_expression_ptr have const contents, cleanup 2012-08-29 16:41:43 -04:00
Colin Rundel
0e5f71408e Simplified path_parse implementation 
path_parse and path_parse_from_string were redundant, replaced with overloaded path_parse function to achieve the same functionality.

Additional consistency cleanup in load_map.cpp.
 2012-08-29 16:41:43 -04:00
Dane Springmeyer
de5970f45e shuffle the mapnik::hue_to_rgb method - no need for it to be in the cpp file 2012-08-28 20:08:43 -07:00
Konstantin Käfer
ae865a59fb Merge branch 'master' into conv_simplify 
Conflicts:
	include/mapnik/vertex_converters.hpp
 2012-08-28 20:37:27 +02:00
Dane Springmeyer
c9bd0c8e51 Merge branch 'master' of github.com:mapnik/mapnik 2012-08-27 17:59:14 -07:00
Dane Springmeyer
5120d0398d add build file for headers and svg/output code directories to hold the svg_renderer used for output - refs #1438 2012-08-27 17:58:49 -07:00
Dane Springmeyer
ac418a7d4e remote the last references 2012-08-27 16:43:40 -07:00
Colin Rundel
12f2c247b3 Added set_name to font_set class 2012-08-27 16:09:29 -04:00
Dane Springmeyer
c7c8c468ab apply patch from @rundel to make color grammar more modular (TODO - do this with all grammars) - closes #1440 2012-08-26 17:50:30 -07:00
Konstantin Käfer
49a07c64f5 copy algorithm value when copying symbolizer 2012-08-25 15:33:24 +02:00
Konstantin Käfer
fd3aa8a01a Merge branch 'expose_feature_style_processor' into conv_simplify 2012-08-25 15:02:18 +02:00
Konstantin Käfer
7c9700237f move feature_style_processor to an implementation header file 
This allows other applications to create custom instances of the feature_style_processor with their own template arguments without forcing freuquent recompiles in mapnik itself
 2012-08-25 13:35:41 +02:00
Panagiotis Skintzos
e34dc99f3a Exposed the label collision detector outside of Cairo renderer and added Python bindings (issue #1107) 2012-08-25 11:43:31 +02:00
Konstantin Käfer
13c46b6cc6 Merge branch 'master' into conv_simplify 
Conflicts:
	bindings/python/mapnik_line_symbolizer.cpp
	bindings/python/mapnik_polygon_symbolizer.cpp
 2012-08-24 23:29:43 +02:00
Konstantin Käfer
4e1423cefe Merge branch 'master' of git://github.com/mapnik/mapnik into conv_simplify 
Conflicts:
	src/cairo_renderer.cpp
 2012-08-24 23:24:31 +02:00
Dane Springmeyer
6806ca1509 load in load_map if image/svg files are not available when not using stock markers or dynamic expressions - closes #1439 2012-08-23 14:31:50 -07:00
Dane Springmeyer
1ca4bcf78d further improve the reporting of unprocessed nodes and attributes - refs #1441 2012-08-23 14:11:25 -07:00
Dane Springmeyer
03860b1728 improve error messages for exceptions thrown in symbolizers during load_map - closes #1441 2012-08-23 14:04:03 -07:00
Dane Springmeyer
05fdb5424b more fully disable the svg_renderer backend - refs #1438 2012-08-23 10:10:18 -07:00
Dane Springmeyer
bf3efbeab8 move image filter grammar to cpp and re-use in load map by attaching to xml_tree - closes #1435 2012-08-23 08:13:22 -07:00
Dane Springmeyer
a256008283 fix typo 2012-08-22 18:08:06 -07:00
Dane Springmeyer
c3dae01055 avoid clipping polygons if reprojecting to work around #1399 until we have a more proper solution (refs #1282) 2012-08-22 17:38:34 -07:00
Dane Springmeyer
57363c13c1 sync agg with grid renderer for polygon patterns - refs #1309 2012-08-22 17:37:03 -07:00
Dane Springmeyer
eecffc264b better fontset and font failure messages - refs #1101 2012-08-22 17:01:24 -07:00
Dane Springmeyer
a02801beb9 geometry.hpp does not need to use geom_util.hpp - this include cleanup exposed #1430 2012-08-22 13:27:44 -07:00
Dane Springmeyer
50e603c896 use correct total_distance variable - closes #1430 2012-08-22 13:25:40 -07:00
Dane Springmeyer
948531e9d0 fix namespacing for wkt generator code - refs #1330 2012-08-22 09:54:01 -07:00
Dane Springmeyer
e8101a070a partially repair backward compatibility in python for 'marker-type' - refs #1427 and #1285 2012-08-21 16:36:15 -07:00
Dane Springmeyer
d1d782254b xml: support 'label-spacing' as alias to 'spacing' - refs #1427 2012-08-21 14:50:24 -07:00
Dane Springmeyer
9539ce96a6 for 2.1 release hold back clipping on lines with markers to avoid #1426 (refs #1424) 2012-08-21 13:27:35 -07:00
Dane Springmeyer
0eff77c03e return without rendering if label placement algorithm returns false indicating a degenerate geometry - closes #1423 and refs #1424 2012-08-21 12:51:39 -07:00
Dane Springmeyer
b76c8e5c64 +reflect building symbolizer in python 2012-08-20 18:17:00 -07:00
Dane Springmeyer
7b7e556850 formatting 2012-08-20 16:27:38 -07:00
Dane Springmeyer
55646ce236 fix group_by on layer to be std::string const& and reflect in python 2012-08-20 16:26:41 -07:00
Mickey Rose
5ca715c1e0 transform expressions: disallow space-separated compound arguments, refs #1389 2012-08-19 19:30:51 +02:00
artemp
9810557cdc + geojson geometry parser implementation 2012-08-17 12:47:41 +01:00
artemp
21f86761a7 + json: split feature_grammar into geometry and feature grammars 2012-08-17 11:25:21 +01:00
Dane Springmeyer
ad2250a4b5 back compatibility for raster-mode values using _ and shield-no-text 2012-08-16 19:20:29 -07:00
Dane Springmeyer
d95f81a588 c++ style 2012-08-16 17:58:08 -07:00
Dane Springmeyer
e0608a4aa4 only throw for unknown attributes if in strict mode 2012-08-16 16:10:23 -07:00
Dane Springmeyer
a986aedd05 remove 'info' and 'fatal' severities for logging to simplify framework - closes #1400 2012-08-16 15:52:32 -07:00
Konstantin Käfer
b243f03c90 use a set to make visvalingam a lot faster 2012-08-16 22:26:58 +02:00
Dane Springmeyer
a3e27ed726 Merge branch 'master' of github.com:mapnik/mapnik 2012-08-16 12:29:27 -07:00
Dane Springmeyer
bfc92a469c fix and doc out behavior of register_fonts 2012-08-16 12:29:13 -07:00
Dane Springmeyer
9964eefb55 remove now unused variable 2012-08-16 12:28:36 -07:00
Dane Springmeyer
d850ee8b76 correct various old trac links to point to github - closes #1396 2012-08-16 12:27:58 -07:00
Konstantin Käfer
22150f908f add facilities to choose the simplification algorithm 2012-08-16 16:53:38 +02:00
artemp
572f3d3f49 + avoid applying scale_factor twice 2012-08-16 10:42:12 +01:00
artemp
7702a904f3 + cairo : fix point_symbolizer transform calc 2012-08-16 10:37:51 +01:00
Dane Springmeyer
2af768a69b restore compile with <= boost 1.47 2012-08-15 18:15:01 -07:00
Dane Springmeyer
d87d9fd16d Merge branch 'master' of github.com:mapnik/mapnik 2012-08-15 16:59:30 -07:00
Dane Springmeyer
de3afda3bc remove css_color_grammar_deprecated.hpp 2012-08-15 16:59:22 -07:00
Dane Springmeyer
5c0e1de35b repair boost 1.46 compile in json/feature_grammar.cpp - closes #1342 2012-08-15 16:49:13 -07:00
Dane Springmeyer
4390f14e9e repair boost 1.42 compile with transform_expression_grammar.cpp 2012-08-15 16:45:18 -07:00
Dane Springmeyer
9aa0eec63d fix naming of wkt_generator 2012-08-15 16:44:23 -07:00
Dane Springmeyer
4cf1484b53 disable colorize-alpha comp-op as per #1371 2012-08-15 14:46:58 -07:00
Dane Springmeyer
f8e563b4fa fixup includes 2012-08-15 10:25:29 -07:00
artemp
a991c73a98 + geojson grammar : close linear_rings 2012-08-15 16:53:28 +01:00
artemp
e2b657251d + various cleanups 
+ remove alpha pre-multiplication from cairo_pattern to
  match agg output
 2012-08-15 10:55:12 +01:00
artemp
aecf0531f5 + remove metawriters for the upcoming 2.1 release 2012-08-15 09:47:03 +01:00
Dane Springmeyer
a57996e661 sync markers rendering between agg and grid - closes #1309 2012-08-14 17:18:44 -07:00
Dane Springmeyer
7a5f06656c allow setting marker width/height together with transform 2012-08-14 17:11:08 -07:00
Dane Springmeyer
7961a12281 Merge branch 'master' of github.com:mapnik/mapnik 2012-08-14 10:44:29 -07:00
Dane Springmeyer
fbf9ac8399 support new clipping extent padding method in cairo line_symbolizer rendering as per #1282 - partial revert of 76569cccb8 2012-08-14 10:43:46 -07:00
artemp
bee09477a8 + cairo : fix shield scaling 2012-08-14 17:14:30 +01:00
Konstantin Käfer
dcd7a07c8e simplify-tolerance property boilerplate 2012-08-14 17:04:57 +02:00
artemp
f35f394b30 + cairo : impl raster markers support 2012-08-14 12:58:00 +01:00
Dane Springmeyer
9f450bd986 avoid silencing invalid transform throw and use LOG_ERROR for invalid maximum-extent - closes #1363 2012-08-13 15:35:22 -07:00
artemp
2d20e4aee4 + agg : building_symbolizer - apply scale_factor to stroke width 2012-08-10 11:12:31 +01:00
artemp
b05344863a + implement markers_dispatch to match AGG output 2012-08-09 17:46:55 +01:00
artemp
3a8ef52eb1 + cairo: apply scale_factor to dash calc 2012-08-08 12:24:51 +01:00