mapnik

sij/mapnik

Author	SHA1	Message	Date
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 Käfer	ae865a59fb	Merge branch 'master' into conv_simplify Conflicts: include/mapnik/vertex_converters.hpp	2012-08-28 20:37:27 +02:00
Dane Springmeyer	f348d177ee	fix the include install directory nesting	2012-08-27 18:54:08 -07:00
Dane Springmeyer	a56c63bed1	start installing agg headers so that c++ programs using mapnik can use more of the mapnik api - closes #1383	2012-08-27 18:45:04 -07:00
Dane Springmeyer	83e2bc70ff	include what you use	2012-08-27 18:39:33 -07: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
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
Dane Springmeyer	fa0678cc5a	json generator: fix escape chars as per json spec, which is a subset of c/c++	2012-08-25 11:24:45 -07:00
Konstantin Käfer	fd3aa8a01a	Merge branch 'expose_feature_style_processor' into conv_simplify	2012-08-25 15:02:18 +02:00
Konstantin Kä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 Kä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 Kä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	13bcd3f17f	now working on mapnik v2.2.0-pre	2012-08-23 15:19:56 -07:00
Dane Springmeyer	a25aac80f7	setting up for mapnik v2.1.0 release	2012-08-23 14:50:36 -07:00
Dane Springmeyer	c0539406d8	fix includes post `bf3efbeab8` - refs #1435	2012-08-23 11:34:13 -07:00
Dane Springmeyer	a3254965fe	double csv parsing speeds when handling wkt encoded geometries - refs #1436	2012-08-23 09:07:06 -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	ce03b3599b	expose svg output for geometries - refs #1437 (TODO: support svg_multi_generator)	2012-08-22 19:13:37 -07:00
Dane Springmeyer	fc63bd0d24	avoid compile error due to namespace clash with wkt generator - refs #1437	2012-08-22 19:11:01 -07:00
Dane Springmeyer	23808b0523	finish full back comptibility for raster-mode - refs #1206 and #1432	2012-08-22 18:09:01 -07:00
Dane Springmeyer	6edbec86d9	apply patch from @lightmare to better hanle 2 point geometries - refs #1425	2012-08-22 13:34:31 -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	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	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	a75014c056	convert interior_position to return bool	2012-08-21 11:23:36 -07:00
Dane Springmeyer	b76c8e5c64	+reflect building symbolizer in python	2012-08-20 18:17:00 -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	372f384365	fix typo: missing comma in severity enum	2012-08-16 16:09:52 -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 Käfer	b243f03c90	use a set to make visvalingam a lot faster	2012-08-16 22:26:58 +02:00
Dane Springmeyer	bfc92a469c	fix and doc out behavior of register_fonts	2012-08-16 12:29:13 -07:00
Konstantin Käfer	22150f908f	add facilities to choose the simplification algorithm	2012-08-16 16:53:38 +02:00
Konstantin Käfer	eace6eeb2b	don't crash on empty geometries	2012-08-16 15:59:05 +02:00
Dane Springmeyer	c7c8d910c4	fix linking with svg2png on windows - closes #1375	2012-08-15 19:16:11 -07:00
Dane Springmeyer	de3afda3bc	remove css_color_grammar_deprecated.hpp	2012-08-15 16:59:22 -07:00
Dane Springmeyer	4cf1484b53	disable colorize-alpha comp-op as per #1371	2012-08-15 14:46:58 -07:00
Dane Springmeyer	71e0edc7bf	forward declare CoordTransform in map.hpp	2012-08-15 10:33:31 -07:00
Dane Springmeyer	2b108b7cdb	fixup includes	2012-08-15 10:26:20 -07:00
artemp	a991c73a98	+ geojson grammar : close linear_rings	2012-08-15 16:53:28 +01:00
artemp	c4765d72ce	+ close linear_rings in WKT parser	2012-08-15 16:42:46 +01:00
artemp	aecf0531f5	+ remove metawriters for the upcoming 2.1 release	2012-08-15 09:47:03 +01:00
Dane Springmeyer	7a5f06656c	allow setting marker width/height together with transform	2012-08-14 17:11:08 -07:00
artemp	34ce663460	+ change agg-stack-filter grammar to expect fun(a,b) notation	2012-08-14 20:03:49 +01:00
artemp	8d14ac7e00	+ use comma and space as delimiters	2012-08-14 19:57:28 +01:00
Konstantin Käfer	483ba77084	otf visvalingam/whyatt simplification	2012-08-14 20:40:37 +02:00
Konstantin Käfer	dcd7a07c8e	simplify-tolerance property boilerplate	2012-08-14 17:04:57 +02:00
Dane Springmeyer	e2b3322934	use typedef for color_type	2012-08-13 11:26:34 -07:00
artemp	b05344863a	+ implement markers_dispatch to match AGG output	2012-08-09 17:46:55 +01:00
artemp	973bc00fd7	+ correct types	2012-08-09 12:41:08 +01:00
artemp	67b93fac50	+ geojson generator : allow empty properties	2012-08-08 16:00:01 +01:00
Dane Springmeyer	cf192ee771	further refactoring of marker_helpers to help set up for using from grid renderer	2012-08-06 11:39:09 -07:00
Dane Springmeyer	53c873ca49	make public the grid_renderer buffer type like AGG renderer	2012-08-06 11:37:27 -07:00
Dane Springmeyer	9284c6369d	correct rendering behavior of marker-opacity, which should not, as per svg, override fill-opacity and stroke-opacity but should combine with it	2012-08-03 14:14:03 -07:00
artemp	9e95d88acd	+ make typedefs public	2012-08-03 15:39:20 +01:00
artemp	5f26d82ca2	+ correct typedef logic (avoid redefining types)	2012-08-03 15:38:02 +01:00
Dane Springmeyer	8ea21d866d	move more code to marker_helpers.hpp to set up for grid impl of new markers code - refs #1282	2012-08-02 22:52:21 -07:00
Dane Springmeyer	e62739d146	fix render_marker for grid renderer and other minor syncing - refs #1309	2012-08-02 13:10:05 -07:00
Dane Springmeyer	6f15731c37	use std::fixed when outputting bbox's to string	2012-08-01 16:40:06 -07:00
artemp	5541ea0271	+ layer : minimum-extent and buffer-size + agg::process_xxx : remove ad-hoc query_extent modifiers + ctrans : simplify vertex skipping	2012-08-01 15:44:36 +01:00
artemp	2dcf940853	Merge remote-tracking branch 'origin/master'	2012-08-01 14:00:36 +01:00
artemp	fc6a22c014	+ c++ style	2012-08-01 11:07:45 +01:00
Dane Springmeyer	16084ff335	support both interior placement and point for markers - helps prepare for #952	2012-07-31 18:13:50 -07:00
Dane Springmeyer	9d9c525de0	revert `1dfde78` and properly avoid clipping for point type geometries in markers_symbolizer while moving markers_placement to cpp file to avoid overhead of declaring all possible permutations of vertex convertors - closes #1341	2012-07-31 17:27:52 -07:00
Dane Springmeyer	48c391da0d	reduce copying of svg attributes via @lightmare - refs #1360	2012-07-31 16:56:22 -07:00
Dane Springmeyer	c3c2902b92	move ellipse contruction code to marker_helpers	2012-07-31 16:40:30 -07:00
Hermann Kraus	f3326115ac	Add debug symbolizer.	2012-08-01 01:16:48 +02:00
Dane Springmeyer	e69c6037b7	mapnik coding style	2012-07-30 23:07:12 -07:00
Dane Springmeyer	e482998c51	rename path_ptr to the more explicit svg_path_ptr and set up markers_symbolizer rendering for upcoming changed	2012-07-30 21:45:46 -07:00
Dane Springmeyer	0d97b851fa	markers: support opacity on bitmaps, and move to supporting both opacity and fill-opacity	2012-07-30 18:31:21 -07:00
artemp	b963b6c2b3	Merge remote-tracking branch 'origin'	2012-07-30 18:35:03 +01:00
artemp	8931509adc	+ move middle_point into label namespace	2012-07-30 18:31:15 +01:00
Dane Springmeyer	81937f7317	only allow restyling of svg paths that already have visible display of stroke/fill	2012-07-28 09:27:37 -07:00
artemp	1b805abc23	+ add close(x,y) method to geometry	2012-07-26 15:21:25 +01:00
artemp	1844217615	+ fix SEG_CLOSE value to be compatible with agg	2012-07-26 15:19:11 +01:00
Dane Springmeyer	fa052c5021	amend `516f7c7` to suport filtering on collections and rename line to linestring for consistency - refs #546	2012-07-25 14:43:32 -07:00
Dane Springmeyer	2680f941eb	clean up unused code and includes	2012-07-25 09:31:57 -07:00
Dane Springmeyer	4e60c0cc9b	Merge branch 'master' of github.com:mapnik/mapnik	2012-07-25 08:47:19 -07:00
Dane Springmeyer	b68ea3bb1d	new patch from @lightmare for protecting against expression.to_string misusage - closes #1232	2012-07-25 08:47:10 -07:00
artemp	e48057b274	+ remove unused member variable + format	2012-07-25 10:00:58 +01:00
Dane Springmeyer	b6fa8dc0ed	include what you use	2012-07-24 18:36:31 -07:00
Dane Springmeyer	80b0b4a888	do not attempt to inline complex templated method on grid - refs #1330	2012-07-24 17:41:08 -07:00
Hermann Kraus	3860ae9447	Merge branch 'master' of github.com:mapnik/mapnik	2012-07-25 01:18:51 +02:00
Hermann Kraus	08cbf1c71c	Fix deprecation warnings. Part 2 Closes #1340.	2012-07-25 01:15:44 +02:00
Dane Springmeyer	ebf87969e4	move css_color and path_expression grammars to cpp	2012-07-24 15:43:32 -07:00
Dane Springmeyer	3f444302f0	move wkb_generator.cpp to cpp to reduce grammar compilation burden in the python bindings	2012-07-24 15:04:39 -07:00
Dane Springmeyer	881ff0180a	suppress gcc Wunused-but-set-variable warnings	2012-07-24 14:35:19 -07:00
Dane Springmeyer	25a7c6bc01	+ use assignment op to initialize built-in types.	2012-07-24 14:20:57 -07:00
artemp	139b5e710f	+ centroid: return first vertex if num_vertices == 1	2012-07-24 17:34:59 +01:00
artemp	045ef86f41	+ formatting..	2012-07-24 14:03:52 +01:00
artemp	8de27eaf6f	+ use assignment op to initialize built-in types.	2012-07-24 09:43:05 +01:00
Dane Springmeyer	29deca8db8	shave off 4 seconds from xml_node.cpp compile time (16 -> 12) by moving transform grammar to cpp - refs #1267	2012-07-23 18:12:10 -07:00
Dane Springmeyer	5c20a9f72a	suppress unused variable compiler warnings with gcc	2012-07-23 17:29:10 -07:00
Dane Springmeyer	348dfff0c7	move feature_grammar to cpp file reducing compile time mem usage for feature_collection_parser.cpp - refs #1267	2012-07-23 17:03:06 -07:00
Dane Springmeyer	8f803b9897	reduce build time of xml_tree by half and memory usage by 1/3 - refs #1267	2012-07-23 16:15:27 -07:00
Dane Springmeyer	bbd1b052f7	fix spelling in comment	2012-07-23 11:38:59 -07:00
Dane Springmeyer	669c4906d4	avoid c-linkage warning with datasources - closes #1323	2012-07-20 18:34:41 -07:00
Dane Springmeyer	e36081a5c0	change geometry_utils::from_wkb to return a bool that signifies if at least one wkb path was parsed - refs #1333 and #1305	2012-07-20 15:09:01 -07:00
Dane Springmeyer	a968150f6b	fix compile after geometry util namespacing	2012-07-20 11:18:33 -07:00
artemp	fd209b2958	+ put labeling routines into its owm 'label' namespace	2012-07-20 17:32:38 +01:00
artemp	516f7c75b1	+ expose geometry type in expression grammar to allow following filter expressions : [mapnik::geometry_type] = Polygon (#546)	2012-07-20 12:28:25 +01:00
artemp	e0c2304d42	+ store size by value	2012-07-19 18:44:29 +01:00
artemp	4625e509b4	+ rename vertex() back to get_vertex() to avoid g++ getting confused	2012-07-19 17:10:27 +01:00
artemp	7b10400be9	+ update rendering code to work with new labeling methods + rename num_points() to size() + rename get_vertex() to vertex()	2012-07-19 16:36:44 +01:00
artemp	9e1914a4df	+ remove label position alogos from geometry class	2012-07-19 16:36:06 +01:00
artemp	f6fa57da26	+ add VertexSource based implementations of label position algos	2012-07-19 16:31:47 +01:00
artemp	994f9abb01	+ apply _mapnik_ coding style	2012-07-19 16:23:39 +01:00
artemp	c8cfde58f7	+ pass box2d<double> by const ref + make member const& too	2012-07-19 16:22:45 +01:00
Dane Springmeyer	6d95076954	sync grid renderer with agg for text/shields/point - refs #1309	2012-07-16 11:51:14 -07:00
artemp	1e6be7abc3	+ add accessor methods	2012-07-13 10:25:12 +01:00
Dane Springmeyer	b20481115f	marker width/height should be double	2012-07-12 18:39:12 -07:00
Dane Springmeyer	02644aeed1	add explicit bool operator to negate to silence msvc warnings - closes #1307	2012-07-12 16:38:13 -07:00
artemp	d828377c7c	+ fix operator= typo	2012-07-12 20:00:02 +01:00
artemp	461f5cfe08	+ use separate stroke-opacity and fill-opacity	2012-07-12 15:38:25 +01:00
artemp	d3bc55761b	+ define keys container in client code not in grid/grid_view, e.g doesn't have to be std::map<...>	2012-07-12 10:57:57 +01:00
artemp	279bfe7f0f	+ remove unused mutating methods + cleanup&style	2012-07-12 10:21:57 +01:00
artemp	030639a7b8	+ remove meaningless -> std::set<std::string> property_names()	2012-07-12 10:18:35 +01:00
artemp	da5d4961f1	+ return from operator=	2012-07-12 09:54:03 +01:00
Dane Springmeyer	da775051ea	allow non const copy access to property_names on grid and grid_view objects	2012-07-11 18:58:25 -07:00
artemp	c7960a2093	+ support clipping on/off in text_symbolizer_helper, shield_symbolizer_helper and process_markers_symbolizer TODO: revisit implementation to avoid code duplication	2012-07-11 14:47:39 +01:00
artemp	8cf9a5a082	+ more const correctness	2012-07-11 10:32:08 +01:00
artemp	35ab93667f	+ enforce const + pass arguments by const ref	2012-07-11 10:13:38 +01:00
Dane Springmeyer	3e895ac6b7	implement built in support for ellipse and arrow markers, make markers_symbolizer default to POINT placement and ellipse drawing, add back compatibility for deprecated marker-type property - refs #1285 and #1304	2012-07-10 22:38:53 -07:00
Dane Springmeyer	cd66495ec5	support setting fill and stroke opacity on the fly in svg marker rendering	2012-07-10 22:36:03 -07:00
Dane Springmeyer	3efab11bdb	start carrying through the geometry clipping extent in the grid renderer	2012-07-10 18:39:06 -07:00
Dane Springmeyer	310ed4a05d	remove references to now unused mapnik::arrow	2012-07-10 18:11:43 -07:00
Dane Springmeyer	afa9dc3c7c	move svg marker modifiers to hpp file for re-use in other renderers	2012-07-10 18:09:19 -07:00
Dane Springmeyer	4f507e2fa3	expose the ability to parse an svg from an in-memory string	2012-07-10 08:59:35 -07:00
artemp	db2bd535de	+ impl operator<< for filters + boost::karma based filter generator	2012-07-10 12:51:08 +01:00
artemp	fe8daa4a2a	pass filter_tag by const ref	2012-07-10 12:50:27 +01:00
artemp	e18fe4eccd	+ fix unused parameter warning	2012-07-10 12:49:14 +01:00
artemp	c8b2031428	+ fix unused parameter warning	2012-07-10 12:48:32 +01:00
artemp	73e15f0c75	+ fix unused parameter warnings	2012-07-10 12:48:09 +01:00
Dane Springmeyer	79ef09d1a3	create grid feature context with correct sorting - closes #1306	2012-07-09 18:40:41 -07:00
Dane Springmeyer	cbf821c762	move key grid functions to cpp file	2012-07-09 17:32:36 -07:00
artemp	20d935ea1e	+ remove explicit keyword + make width and height 'optional' - default init (0) + change members order	2012-07-09 10:18:41 +01:00
Dane Springmeyer	3823890b40	rollback `34c3128b0c`, move 'scaling' to proper enum, and move image_scaling functions to new cpp/hpp	2012-07-06 16:45:58 -07:00
artemp	a9cb16303f	+ fix member variables names	2012-07-06 13:55:46 +01:00
artemp	8598202f8f	Merge remote-tracking branch 'origin/master'	2012-07-06 13:51:49 +01:00
artemp	04589282bb	+ format	2012-07-06 13:50:44 +01:00
artemp	6e03fd7bb1	+ store last 'move_to' coordinates + ensure sub-paths use correct 'last_vertex' when relative move_to commands is used	2012-07-06 13:41:54 +01:00
Dane Springmeyer	7499013843	deprecate 'mode' on raster_symbolizer and map it to new comp-op - closes #1257	2012-07-05 17:47:26 -07:00
Dane Springmeyer	2f45de8fea	serialize comp-op in save_map - refs #1292	2012-07-05 17:06:41 -07:00
Dane Springmeyer	9dd69d091b	merge with master	2012-07-05 15:40:16 -07:00
Dane Springmeyer	d8c719f05e	finish exposing scale_factor to cairo_renderer	2012-07-05 14:54:58 -07:00
artemp	847f284a97	+ make stroke and fill optional + return expression_ptr by const ref + change init order	2012-07-05 17:11:52 +01:00
Dane Springmeyer	c677b4f47c	ensure the bounds used for avoid-edges and minimum-padding is non-buffered - refs #1283	2012-07-04 18:34:04 -07:00
Hermann Kraus	6af5fd7151	Merge branch 'master' of github.com:mapnik/mapnik	2012-07-04 21:00:59 +02:00
Hermann Kraus	7a967d7047	Correctly perform get_text() on <xmltext> nodes.	2012-07-04 20:51:34 +02:00
Hermann Kraus	c709f17761	Add namespace.	2012-07-04 20:39:07 +02:00
artemp	9b14a7206a	remove arrow/ellipse ad-hoc markers - see #1285	2012-07-04 14:50:11 +01:00
artemp	0a146e0b5c	remove unused renderer_scanline_solid	2012-07-04 09:23:01 +01:00
artemp	4b9346ab5f	+ better name for boolean member to avoid clashing with object name.	2012-07-03 12:45:07 +01:00
artemp	a6784270bb	+ pass args by const ref	2012-07-03 11:16:10 +01:00
artemp	7d2c695849	+ remove unused font_manager_	2012-07-02 13:28:40 +01:00
Dane Springmeyer	7f531498c6	pass scale_factor to text_renderer in order to scale up halo_radius - refs #1273 and refs #695	2012-06-29 13:05:28 -07:00
artemp	8849ba7d4d	Merge remote-tracking branch 'origin/master'	2012-06-29 08:57:11 +01:00
Dane Springmeyer	67e9b0d616	move marker width/height to expressions - closes #1102 and replaces #1255	2012-06-28 19:54:25 -07:00
Artem Pavlenko	36d5a20a8a	Merge remote-tracking branch 'mirecta/line-offset'	2012-06-28 13:05:04 +01:00
Mickey Rose	9ccce2f1d9	offset_converter: add threshold to avoid cutting large closed rings off	2012-06-26 22:38:38 +02:00
Artem Pavlenko	cec9b5798e	Revert "cleaner approach to a compile time magic alpha number for grid buffers" (doesn't link : clang version 3.2 (trunk 158601)) This reverts commit `98753db9fd`.	2012-06-26 16:53:07 +01:00
Artem Pavlenko	f8a7d06034	Merge remote-tracking branch 'origin/master'	2012-06-26 15:02:28 +01:00
Artem Pavlenko	5bc9f73506	+ markers_symbolizer: support affine geometry transformations + fix markers bounding box calc + fix spacing logic to use transformed marker width	2012-06-26 15:00:42 +01:00
Dane Springmeyer	98753db9fd	cleaner approach to a compile time magic alpha number for grid buffers	2012-06-25 17:57:52 -07:00
Dane Springmeyer	b71553682b	grid_pixel does not need a 32bit base_shift since alpha is not used	2012-06-25 17:31:43 -07:00
Mickey Rose	61e3c4dde7	offset_converter: pre-compute offset vertices and detect self-intersection on-the-fly	2012-06-25 18:34:42 +02:00
Artem Pavlenko	20255966c3	+ text_symbolizer: add largest-bbox-only boolean property default:true	2012-06-25 15:00:53 +01:00
Artem Pavlenko	048316232c	+ fix: remove clip_ member var	2012-06-25 14:57:45 +01:00
Dane Springmeyer	5b61c093e5	initialize grid buffers to std::numeric_limits<int>::min() and use that value to mean no-hit or non-interactive pixels - closes #1065	2012-06-23 22:41:07 -04:00
Dane Springmeyer	eb4740b50f	fix behavior of compositing via python api now that we have premultiplication issues sorted out in core - refs #1262 and #314 and #1211	2012-06-21 15:44:57 -04:00
Dane Springmeyer	9193ac4446	Merge branch 'master' of github.com:mapnik/mapnik	2012-06-19 17:37:45 -04:00
Dane Springmeyer	f60d85e2e7	fix handling of premultiplication in svg rendering - refs #1262	2012-06-19 17:37:24 -04:00
Tom MacWright	aa5a726b92	Rename color-spin composite operation to colorize alpha to make it less confusing alongside actual color manipulation modes.	2012-06-19 17:16:25 -04:00
Dane Springmeyer	48a543b5d5	implement style-level opacity - closes #314	2012-06-19 15:10:28 -04:00
Artem Pavlenko	c5864453a0	+ only premultiply src	2012-06-18 18:50:32 -04:00
Artem Pavlenko	38f35d6f97	+ add missing ','	2012-06-18 14:41:43 -04:00
Artem Pavlenko	9b61c0effe	Merge remote-tracking branch 'origin/master' Conflicts: deps/agg/include/agg_pixfmt_rgba.h include/mapnik/image_compositing.hpp src/cairo_renderer.cpp src/image_compositing.cpp	2012-06-18 14:36:15 -04:00
Artem Pavlenko	c71944bf32	+ use HSV color space (as in GIMP) + rename 'luminosity' to 'value'	2012-06-18 14:30:01 -04:00
Tom MacWright	f6c10bbb7e	Add color_spin composite operation.	2012-06-18 11:10:04 -04:00
Artem Pavlenko	dc89f6fac4	Merge remote-tracking branch 'origin/master'	2012-06-17 15:21:27 -04:00
Artem Pavlenko	14d365d572	+ hue, saturation, color and luminosity blending modes (HSL based) (http://en.wikipedia.org/wiki/Blend_modes#Hue.2C_saturation_and_luminosity)	2012-06-17 15:19:29 -04:00
Dane Springmeyer	bd7ad7cd3c	address #1198 by moving away from caching grid features and (back) to copying attributes - also roll back to passing feature_impl& rather than feature_ptr (which is now unneeded)	2012-06-15 22:17:26 -04:00
Dane Springmeyer	7da01b9605	Merge branch 'master' of github.com:mapnik/mapnik	2012-06-15 05:18:26 -07:00
Dane Springmeyer	b12e73fbc7	Merge branch 'master' of github.com:mapnik/mapnik	2012-06-14 19:44:28 -04:00
Artem Pavlenko	689e8ec96d	+ make feature's optional: -(feature % lit(','))	2012-06-14 14:40:54 +01:00
Artem Pavlenko	34470af474	+ allow empty arrays in "coordinates" property	2012-06-14 14:40:14 +01:00
Dane Springmeyer	d33496baa7	split up code that handles datasource plugin registration	2012-06-13 19:25:59 -04:00
Artem Pavlenko	1f383abbad	+ fix conflict	2012-06-12 14:18:29 +01:00
Artem Pavlenko	1774456a2e	+ fix GeoJSON output in metawriter_json (FIXME: output proper geometry types - don't shortcut to Multi***) Conflicts: include/mapnik/metawriter_json.hpp	2012-06-12 14:05:53 +01:00
Dane Springmeyer	eb8f27bee7	Merge branch 'master' of github.com:mapnik/mapnik	2012-06-07 13:17:44 -05:00
Mickey Rose	1e3c48afb1	split parse_transform.hpp, set dynamic transform expression from python	2012-06-07 17:06:45 +02:00
Dane Springmeyer	51d3310012	grid encoding: reuse key string	2012-06-07 07:27:42 -07:00
Artem Pavlenko	013f0aa62f	+ add templated ctor and avoid including agg_trans_affine.h	2012-06-07 11:51:23 +01:00
Artem Pavlenko	11c34b1599	Merge branch 'transform_expr' of https://github.com/mirecta/mapnik	2012-06-07 10:20:05 +01:00
Dane Springmeyer	957c40f763	move to int32 for grid rendering buffer - closes #1196	2012-06-06 16:36:38 -07:00
Dane Springmeyer	76211243a4	remove now unused blending modes as they have been replaced with AGG compositing modes - refs #1206	2012-06-06 16:16:30 -07:00
Mickey Rose	bd9609c370	new feature: transform expressions are now dynamic (cherry picked from commit 173c402b5c142310087246b0ea54dbec54edcac8) Conflicts: include/mapnik/vertex_converters.hpp src/agg/process_markers_symbolizer.cpp src/agg/process_point_symbolizer.cpp src/agg/process_polygon_pattern_symbolizer.cpp src/load_map.cpp	2012-06-06 17:34:26 +02:00
Mickey Rose	dad0bdacfc	add value_null operators, improve is_null, move mapnik::value definition into separate namespace (cherry picked from commit 653bca6bea1abb2e45c66e76fd5e4fe7dc10a91a)	2012-06-06 17:34:17 +02:00
Mickey Rose	46c2d1c710	add operators for computing the envelope of a transformed box2d (cherry picked from commit 9ad342cbed150948561c08e98957bc014dedc7f3)	2012-06-06 17:34:02 +02:00
Dane Springmeyer	291bc9b8ba	explicitly include projection header	2012-06-04 17:16:44 -07:00
Dane Springmeyer	11e81fdb03	finish exposing markers symbolizer in python - closes #612	2012-06-04 13:42:51 -07:00
Artem Pavlenko	404ddf329d	Revert "+ avoid copying" This reverts commit `de71db7d38`. Conflicts: include/mapnik/vertex_converters.hpp	2012-05-31 15:55:20 +01:00
Artem Pavlenko	bf7500a8b0	Merge pull request #1234 from mirecta/unary_expr unary minus operator on mapnik::value and in expression_grammar	2012-05-31 05:51:07 -07:00
Artem Pavlenko	500f57cf60	+ make vertex() and rewind() methods const + remove unused coord_transforms + rename coord_transform2 to coord_transform	2012-05-31 12:13:09 +01:00
Artem Pavlenko	6190cf22f1	+ pass Args by const-ref	2012-05-31 10:40:23 +01:00
Artem Pavlenko	7eb8d175da	+ cleanup	2012-05-31 09:37:00 +01:00
Artem Pavlenko	de71db7d38	+ avoid copying	2012-05-31 09:33:55 +01:00
Dane Springmeyer	9a18cb2cf6	amend `733c2df0a8` - graphics.hpp is needed on windows	2012-05-29 17:10:41 -07:00
Dane Springmeyer	5feb9750e5	amend `eaa53b0` and #1232 to compile with clang++ by avoiding first pass instanciation of intentionally invalid templates - refs #985	2012-05-29 15:28:35 -07:00
Mickey Rose	a6b4bb88ce	unary minus operator on mapnik::value and in expression_grammar	2012-05-29 23:45:13 +02:00
Dane Springmeyer	eaa53b0904	Merge pull request #1232 from mirecta/issue-985 fix/prevent to_expression_string misuse #985	2012-05-29 14:41:23 -07:00
Dane Springmeyer	109081bef3	Revert "fix transform (patch from #1204 )" This reverts commit `b42e4988ec`.	2012-05-29 14:06:47 -07:00
Dane Springmeyer	e8e8ba1f96	Revert "followup to `b42e4988e`, fix svg transforms for svg render as well as render_id - refs #1204 " This reverts commit `ac9dc4762a`.	2012-05-29 14:06:23 -07:00
Mickey Rose	09b05b48b0	fix/prevent to_expression_string misuse #985	2012-05-29 22:53:39 +02:00
Mickey Rose	44538e29d4	agg::conv_transform: changed transformer to non-const reference (replaces `ba270e0`)	2012-05-29 18:32:04 +02:00
Artem Pavlenko	f3c774baa4	+ add grain-extract blending mode (gimp)	2012-05-29 15:09:33 +01:00
Artem Pavlenko	e7ae5121a2	+ correct image_width padding calc - via @lightmare	2012-05-29 12:38:10 +01:00
Artem Pavlenko	6bea57d690	+ implement grain-merge blending mode (GIMP)	2012-05-25 10:35:43 +01:00
Dane Springmeyer	28b9729ae7	Revert "restore pristine agg2.4 agg:span_image_resample_rgba_affine - refs #1227 " This reverts commit `225678eccb`.	2012-05-24 14:11:42 -07:00
Dane Springmeyer	225678eccb	restore pristine agg2.4 agg:span_image_resample_rgba_affine - refs #1227	2012-05-24 14:10:52 -07:00
Artem Pavlenko	181c470bd6	+ correct calculations	2012-05-24 12:51:12 +01:00
Artem Pavlenko	bd25a9af92	+ handle boundary pixels in x/y gradients	2012-05-24 12:44:07 +01:00
Artem Pavlenko	0542994c4d	+ implement y-gradient in terms of x-gradient	2012-05-24 12:11:55 +01:00
Artem Pavlenko	1077b79a63	Revert "initialise blur radius's to 1 for real this time" This reverts commit `f76c6ee25f`.	2012-05-24 11:37:24 +01:00
Artem Pavlenko	f76c6ee25f	initialise blur radius's to 1 for real this time	2012-05-23 20:38:42 +01:00
Artem Pavlenko	4fc4535c95	+ initialise blur radius's to 1 in default ctor	2012-05-23 20:29:07 +01:00
Artem Pavlenko	fb34c7ef5a	+ handle boundary cases in 3x3 convolution	2012-05-23 20:26:24 +01:00
Artem Pavlenko	6471cfc597	+ unnamed args in image-filters #1222	2012-05-23 20:23:10 +01:00
Artem Pavlenko	42dc568034	+ don't rely on C99 support, use <boost/cstdint.hpp> instead	2012-05-17 08:49:18 +01:00
Dane Springmeyer	fb0ef869d6	Merge branch 'master' of github.com:mapnik/mapnik	2012-05-15 10:35:56 -07:00
Dane Springmeyer	8f79641383	only use skipping if >= boost 1.47 - corrects #1209 (refs #1210 )	2012-05-15 10:35:04 -07:00
Artem Pavlenko	1b210ba456	+ use compositing renderer for markers,points and shields	2012-05-15 16:13:08 +01:00
Artem Pavlenko	55d5d8596d	+ pass by const-ref + remove explicit keyword from default ctor	2012-05-15 14:40:24 +01:00
Dane Springmeyer	3d89e4001a	expose no-args agg_stack_blur constructor	2012-05-14 19:00:29 -07:00
Artem Pavlenko	9599711e0e	Merge remote-tracking branch 'origin/master'	2012-05-14 17:33:45 +01:00
Artem Pavlenko	983db006e9	+ custom span_image_filter	2012-05-14 17:30:50 +01:00
Artem Pavlenko	733c2df0a8	remove unused header	2012-05-14 17:14:05 +01:00
Dane Springmeyer	c1495c0c74	restore the fast line rasterizer (rasterizer_outline_aa) and improve its rendering quality and consistency with standard method - refs #873	2012-05-11 17:40:21 -07:00
Dane Springmeyer	54f54ed775	rename composite args	2012-05-11 15:31:35 -07:00
Dane Springmeyer	8ae867f6de	default values for composite args to maintain api compatibility	2012-05-11 15:19:05 -07:00
Dane Springmeyer	c9bedf8bd4	restore compile with boost < 1.47 - disables stacked image filters for now	2012-05-11 14:08:46 -07:00
Dane Springmeyer	ac9dc4762a	followup to `b42e4988e`, fix svg transforms for svg render as well as render_id - refs #1204	2012-05-11 07:16:42 -07:00
Artem Pavlenko	b42e4988ec	fix transform (patch from #1204 )	2012-05-11 12:46:46 +01:00
Artem Pavlenko	7380a6a001	+ fix raster_symbolizer: add x/y dst args to composite	2012-05-11 10:55:58 +01:00
Artem Pavlenko	8085110e8f	+ add opacity parameter	2012-05-10 18:14:53 +01:00
Artem Pavlenko	8cd898ce35	+ make comp_op non-optional ( default: src-over) + move ctors implementations into *.cpp	2012-05-10 12:05:40 +01:00
Dane Springmeyer	ab73f13525	rename the image transform for clarity	2012-05-09 18:15:34 -07:00
Artem Pavlenko	aad7c5e384	+ implement compositing for text + refactor image_32	2012-05-09 12:39:23 +01:00
Artem Pavlenko	a2115c718b	+ fix ctor's	2012-05-07 16:37:12 +01:00
Artem Pavlenko	7e49a6f44e	+ move 'smooth' property to symbolizer_base level + remove 'SYMBOLIZER_FAST' completely	2012-05-07 16:08:16 +01:00
Artem Pavlenko	3a8d3c5042	+ better formatting	2012-05-07 16:06:33 +01:00
Artem Pavlenko	9ba04738d6	+ don't expose agg headers	2012-05-04 10:23:49 +01:00
Artem Pavlenko	b0f87ee9b2	+ remove unused enum value	2012-05-04 10:22:50 +01:00
Artem Pavlenko	164ba630d9	+ add requirement for renderers-> provide processor_impl_type to allow process_xxx functions declaration in base class + re-enanble cairo renderer	2012-05-03 12:19:26 +01:00
Artem Pavlenko	3d12c63740	+ use scale_factor fix	2012-05-03 12:18:54 +01:00
Artem Pavlenko	e23fdb276f	+ pass scale_factor to vertex_converter	2012-05-02 17:22:54 +01:00
Artem Pavlenko	44c5efbf75	+ add miterlimit parameter	2012-05-02 17:04:24 +01:00
Artem Pavlenko	2f0fa10db5	cleanup	2012-05-02 16:32:09 +01:00
Artem Pavlenko	a475b6e0bc	+ add offset_converter	2012-05-02 15:13:46 +01:00
Artem Pavlenko	77dfac5622	+ re-introduce transform on symbolizer_with_image	2012-05-01 16:47:33 +01:00
Artem Pavlenko	2e9a7d9cc8	+ explicit keyword only makes sense for 1 arg ctor's	2012-05-01 14:24:53 +01:00
Artem Pavlenko	a72ee4ba66	Merge branch 'master' into compositing Conflicts: include/mapnik/image_compositing.hpp include/mapnik/util/conversions.hpp include/mapnik/value.hpp src/agg/agg_renderer.cpp src/agg/process_line_symbolizer.cpp src/agg/process_polygon_symbolizer.cpp src/png_reader.cpp src/svg_parser.cpp utils/svg2png/svg2png.cpp	2012-05-01 12:35:49 +01:00
Artem Pavlenko	f57d2c28f0	+ 'direct' image filter support: apply filter on main rendering buffer (TODO: better user-friendly names) + allow empty string e.g image-filters="" (why not?)	2012-04-25 10:54:54 +01:00
Artem Pavlenko	c26ad5706e	+ move 'clip' property to symbolizer_base + support 'clip' accross relevant symbolizer (agg)	2012-04-24 11:10:54 +01:00
Artem Pavlenko	a4cdc7a1c0	+ make comp_op boost::optional<> + use plain pixf when style_level_compositing=true	2012-04-23 15:41:18 +01:00
Artem Pavlenko	03d42e59a5	+ allow specifying premultiply flag for src and dst images + fix logic in agg_renderer (TODO)	2012-04-20 14:53:11 +01:00
Dane Springmeyer	16a16b1818	only print failed face_set_ptr loading for fontsets if MAPNIK_LOG is defined - refs #1175	2012-04-19 11:27:04 -07:00
Dane Springmeyer	703d4ab7f2	for >= boost 1.45 (compile does not work with 1.42) move to karma for to_string conversions to avoid lexical cast - refs #1055	2012-04-19 10:29:37 -07:00
Artem Pavlenko	720035102b	remove lexical_cast usage	2012-04-19 13:36:21 +01:00
Artem Pavlenko	145f83b806	boost::spirit::karma based to_string impl	2012-04-19 13:35:41 +01:00
Artem Pavlenko	7ae0383a4b	disable unused vars warnings cleanup	2012-04-18 17:00:49 +01:00
Artem Pavlenko	d0f0d0b35d	Merge branch 'compositing' of github.com:mapnik/mapnik into compositing	2012-04-18 16:48:25 +01:00
Artem Pavlenko	bb86fd285e	consistent naming unsigned int parser with max 3 digits	2012-04-18 16:46:38 +01:00
Dane Springmeyer	dab6936f05	embose -> emboss	2012-04-18 07:37:46 -07:00
Dane Springmeyer	2f65a7612d	allow cairo compile	2012-04-18 07:09:12 -07:00
Artem Pavlenko	668d6f2325	image-filters: initial implementation	2012-04-18 12:14:23 +01:00
Artem Pavlenko	e54aaba09b	impl affine tranform converter	2012-04-18 09:44:26 +01:00
Artem Pavlenko	831538b522	move svg transform to symbolizer_base	2012-04-18 09:42:19 +01:00
Artem Pavlenko	9af11c5ef2	only allocate internal buffer if required	2012-04-18 09:37:02 +01:00
Dane Springmeyer	f3bc7f011f	fix linking errors experienced by node-mapnik on windows	2012-04-17 18:58:24 -07:00
Dane Springmeyer	b0d857a66a	do not list mapping in feature init list - creates -Worder warning	2012-04-16 22:33:16 -07:00
Dane Springmeyer	f77d9b6df1	formatting	2012-04-16 22:24:34 -07:00
Dane Springmeyer	8fd0a40749	finish work on populating initialization lists - closes #1114	2012-04-16 21:57:24 -07:00
Dane Springmeyer	77ac2992ab	remove uneeded semicolon	2012-04-16 21:19:58 -07:00
Dane Springmeyer	a4b3daf181	close #1176 again	2012-04-12 17:25:57 -07:00
Dane Springmeyer	422fe6e6be	fix compile with boost 1.44 or 1.45 - closes #1176	2012-04-12 16:18:33 -07:00
kunitoki	d717c715fc	- always log errors and fatals, regardless of MAPNIK_LOG definition	2012-04-12 23:45:03 +02:00
Dane Springmeyer	00ab1b672d	svg icon rendering: fix for thin lines displaying slightly too thick compared to other renderers (safari/chrome) - closes #1129 - refs #975	2012-04-11 10:27:37 -07:00
Artem Pavlenko	57d6d62440	+ support 'display' property, if set to 'none' don't parse children #1137 + fix memory leak : xmlTextReaderGetAttribute -> string must be deallocated by the caller + call xmlTextReaderMoveToElement after xmlTextReaderMoveToFirstAttribute loop to restore reader position. Conflicts: src/svg_parser.cpp	2012-04-11 14:36:39 +01:00
Artem Pavlenko	bba21e3d9c	+ support 'display' property, if set to 'none' don't parse children #1137 + fix memory leak : xmlTextReaderGetAttribute -> string must be deallocated by the caller + call xmlTextReaderMoveToElement after xmlTextReaderMoveToFirstAttribute loop to restore reader position.	2012-04-11 14:00:34 +01:00
Artem Pavlenko	45b0dd6482	+ support smooth conv in polygon_pattern_symbolizer	2012-04-10 15:46:38 +01:00
kunitoki	81c9dd7b6b	- added the ability to set the default global severity from scons configure - initial check in of setting global severity from getenv (todo)	2012-04-10 16:19:51 +02:00
kunitoki	1a203d3f85	- cleaned up logger interface to better integrate with python bindings - polished and finished python bindings for logger interaction	2012-04-10 10:14:28 +02:00
kunitoki	67ba40080c	- fixing remaining cerr traces	2012-04-10 00:58:18 +02:00
kunitoki	fb94e4a2ec	- replace all instances of std::cerr with MAPNIK_LOG_*	2012-04-10 00:51:04 +02:00
kunitoki	a902a08aab	- added logging to file - started working on the logger bindings - cleanups some error reporting with cerr/clog in the library	2012-04-10 00:25:31 +02:00
kunitoki	b60c508c1c	- finish thrashing all the useless ifdef MAPNIK_LOG	2012-04-09 21:41:56 +02:00
Artem Pavlenko	f727cb81b8	+ format	2012-04-09 12:24:52 +01:00
Artem Pavlenko	f7c406bf80	remove empty lines	2012-04-09 12:24:04 +01:00
kunitoki	74342e3083	- no need to #ifdef all the time: the compiler should optimize out the log calls when no MAPNIK_LOG is defined - initially got rid of those ifdefs in plugins only	2012-04-09 12:05:49 +02:00
kunitoki	2df8e99af2	Merge branch 'master' of github.com:mapnik/mapnik	2012-04-09 03:03:31 +02:00
kunitoki	8c58a9aa73	- improved again the logging facilities - aligned the plugins to using the new methods with severity - implemented per object severity, with fallback to global (with global functions to set them programmatically) - initial check in of logger python bindings (todo)	2012-04-09 03:00:51 +02:00
Dane Springmeyer	55ea1e4621	get stats output working on windows	2012-04-08 10:52:48 -07:00
kunitoki	50de846082	- fixed a compilation error when no logging is defined	2012-04-08 04:09:48 +02:00
kunitoki	4ef7343416	- added severity to logger (global variable for now) - added a logger class for each severity level	2012-04-08 03:59:47 +02:00
kunitoki	af201551b8	got rid of old CVS $Id comments kludge in files	2012-04-08 02:45:01 +02:00
kunitoki	1f351e0e09	implement new debug system	2012-04-08 02:20:56 +02:00
Dane Springmeyer	19f5f77417	reuse path_expression_grammar - finishes and closes #1028	2012-04-06 16:50:11 -07:00
Dane Springmeyer	215f7a911c	remove lexical cast from value_type conversions - refs #1055	2012-04-06 14:20:32 -07:00
Dane Springmeyer	ab776edbf5	reduce string copying slightly in populate_tree - refs #1055	2012-04-06 12:58:08 -07:00
Dane Springmeyer	cb048b92d4	formatting	2012-04-06 12:29:51 -07:00
Dane Springmeyer	36516c00e2	Merge branch 'master' of https://github.com/mapnik/mapnik	2012-04-05 16:59:52 -07:00
Dane Springmeyer	7b84a2ce94	fix linking of postgis.input by using MAPNIK_DECL and ensuring the header is included in src/conversions.cpp - closes #1127	2012-04-05 16:59:36 -07:00
Dane Springmeyer	f90a07eb94	add explicit include for MAPNIK_DECL	2012-04-05 14:41:52 -07:00
Artem Pavlenko	738ff501fe	remove CompositingSymbolizer	2012-04-05 17:04:11 +01:00
Artem Pavlenko	34c984b2b8	+ support compositing across all symbolizers (currently polygon and line symbolizers)	2012-04-05 15:59:11 +01:00
Dane Springmeyer	d29ae14104	make it possible to set the map.maximum_extent back to None/uninitialized from python	2012-04-04 12:07:15 -07:00
Artem Pavlenko	46b3594000	+ fix compilation with i686-apple-darwin11-llvm-g++-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2336.1.00)	2012-04-03 22:19:36 +01:00
Artem Pavlenko	e7f0e8aac0	+ support configurable vertex converter	2012-04-03 19:49:57 +01:00
Artem Pavlenko	030650f949	+ impl converter_traits for 'transform_tag' + support proj_transform and CoordTransform as args	2012-04-03 16:29:27 +01:00
Artem Pavlenko	347fce4db2	+ add 'clip' property	2012-04-03 16:28:49 +01:00
Artem Pavlenko	55ed40cbc2	attach proj_trans and tr at later stage (to work with vertex_converters interface).	2012-04-03 16:26:18 +01:00
Artem Pavlenko	cbcb8d6aad	+ use fusion::vector to pass arguments	2012-04-03 13:40:51 +01:00
Artem Pavlenko	81566a8f80	+ use pre-multiplied pixel format in agg_renderer (de-multiply in end_map_processing()) + support for compositing at style level + image blur (TODO)	2012-04-03 13:10:30 +01:00
Artem Pavlenko	2e7ed0f589	+ format/correct doc string	2012-04-03 13:08:10 +01:00
Artem Pavlenko	1bc2af9104	+ expose pixel_format_type	2012-04-03 13:03:59 +01:00
Artem Pavlenko	84cb7b4c54	vertex converter dispatch - intial impl	2012-04-03 13:01:06 +01:00
Dane Springmeyer	d9cb76f7a1	postgis: support mixed case table names - closes #1159	2012-04-02 19:21:14 -07:00
kunitoki	d516cf9f46	- cosmetics	2012-03-28 21:59:40 +02:00
Artem Pavlenko	8038561984	+ move renderer to agg_helpers	2012-03-28 12:02:03 +01:00
Dane Springmeyer	2edaefd0d6	cairo: match AGG functionality, adding support for dynamic ellipse drawing and loading from svg icons - closes #1071 (refs #952 - this is stopgap until we refactor and merge with point_symbolizer)	2012-03-27 19:21:11 -04:00
Artem Pavlenko	9840c7df4c	Merge branch 'master' into compositing Conflicts: include/mapnik/util/dasharray_parser.hpp src/agg/process_line_symbolizer.cpp src/image_compositing.cpp	2012-03-26 09:05:02 +01:00
Dane Springmeyer	18774354a6	support case insensitive booleans - closes #1141	2012-03-23 20:08:47 -07:00
Dane Springmeyer	149fca1626	I need a beer - followup to `e4ae1f660d`	2012-03-23 19:19:50 -07:00
Dane Springmeyer	e4ae1f660d	boost 1.42 compatibility - fixes #1145	2012-03-23 19:09:38 -07:00
Dane Springmeyer	ea5a46f230	remove the storage and serialization of 'font-directory' and 'minimum-version' since there is no strong need to have them accessible after initial parsing	2012-03-23 18:14:14 -07:00
Dane Springmeyer	2ff8c3344e	avoid copy	2012-03-23 11:22:00 -07:00
Artem Pavlenko	76054df89d	+ add 'wsp' delimiter support + re-arrange grammar a bit	2012-03-23 13:19:02 +00:00
Artem Pavlenko	38fafc14bc	+ impl dasharray parser (supports 'none') + skip 0,0 dashes in load_map	2012-03-23 13:18:49 +00:00
Artem Pavlenko	d76136ba40	use mapnik::util namespace for conversions	2012-03-23 13:18:33 +00:00
Artem Pavlenko	97a9abc8f3	+ add 'wsp' delimiter support + re-arrange grammar a bit	2012-03-23 12:56:26 +00:00
Artem Pavlenko	b4e96c35b5	+ impl dasharray parser (supports 'none') + skip 0,0 dashes in load_map	2012-03-23 11:58:07 +00:00
Artem Pavlenko	242385f16d	use mapnik::util namespace for conversions	2012-03-23 11:08:39 +00:00
Artem Pavlenko	97eb078adb	+ re-use renderer (TODO)	2012-03-23 09:34:26 +00:00
Dane Springmeyer	d23a4b63b9	expose both a clipped and unclipped labeling path type	2012-03-22 16:36:25 -07:00
Dane Springmeyer	2e2bce3126	formatting	2012-03-22 16:31:57 -07:00
Artem Pavlenko	bc2589960b	+ add missing files	2012-03-21 17:34:41 +00:00
Artem Pavlenko	95cfb061af	+ experimental compositing symbolizer (fill only)	2012-03-21 15:47:33 +00:00
Artem Pavlenko	aefa23fb5b	+ boost::bimap based enum<->string lookup table + fix pixel_format bgra -> rgba	2012-03-21 15:45:23 +00:00
Dane Springmeyer	4843572e1b	move image_compositing to cpp file	2012-03-19 15:42:30 -07:00
Artem Pavlenko	b2ca10f3a0	+ always premultiply destination buffer for correct ops (ensure no color component exceeds alpha channel)	2012-03-19 21:19:52 +00:00
Artem Pavlenko	9e3e5bb74a	Merge remote-tracking branch 'origin/master'	2012-03-19 19:45:32 +00:00
Hermann Kraus	9b62a19cf4	Implement justify-alignment=auto. Closes #1125.	2012-03-19 17:12:53 +01:00
Artem Pavlenko	e06c456789	even better, use BOOST_FOREACH	2012-03-19 10:46:44 +00:00
Artem Pavlenko	aef214292e	don't rely on compiler for-loop optimisation	2012-03-19 10:11:55 +00:00
ldp	1542e3e513	add ignore-placement to MarkersSymbolizer	2012-03-18 22:35:02 +01:00
Dane Springmeyer	cdc6376719	be explicit about zero-division protection	2012-03-16 14:49:56 -07:00
Artem Pavlenko	70512dc03b	+ add optional smothing to line_symbolizer ( TODO: conv_dash )	2012-03-15 10:26:53 +00:00
Dane Springmeyer	2abe02bd96	make available MAPNIK_VERSION_STRING in c++ header (not just in python) and add MAPNIK_VERSION_IS_RELEASE define that indicates if the code is released	2012-03-14 18:30:32 -07:00
Artem Pavlenko	3e4733c51a	+ refactor join/cap settings (agg_helper.hpp)	2012-03-14 17:21:04 +00:00
Dane Springmeyer	8e0ed96756	fix whitespace	2012-03-14 09:12:26 -07:00
Dane Springmeyer	8451e8897d	Merge branch 'master' of github.com:mapnik/mapnik	2012-03-14 08:57:13 -07:00
Dane Springmeyer	07d4e45521	fix compile with boost 1.42-1.44 after `2b68cea0a1`	2012-03-14 08:56:07 -07:00
Artem Pavlenko	108b99725c	+ refactor gamma setting logic to avoid code duplication ( agg_helpers.hpp )	2012-03-14 15:45:35 +00:00
Artem Pavlenko	87b22c29b2	+ add optional polygon smoothing ( 0.0 < smooth < 1.0 ) using agg_conv_poly1_curve	2012-03-14 15:01:31 +00:00
Dane Springmeyer	2f10469c8d	apply mapnik_format.el formatting	2012-03-13 07:54:32 -07:00
Hermann Kraus	2b68cea0a1	Merge branch 'new-xml' Conflicts: include/mapnik/config_error.hpp include/mapnik/ptree_helpers.hpp src/formatting/text.cpp src/libxml2_loader.cpp src/load_map.cpp src/metawriter_factory.cpp src/text_placements/registry.cpp src/text_placements/simple.cpp	2012-03-13 11:11:28 +01:00
Hermann Kraus	150de2aac5	Add rapidxml parser.	2012-03-13 09:02:53 +01:00
Dane Springmeyer	42f9fe03d2	remove old shim	2012-03-12 13:21:38 -07:00
Artem Pavlenko	207ecfd597	remove camel-case names from layer.[h,c]pp	2012-03-12 15:39:59 +00:00
Hermann Kraus	f25a2231ff	Warn about unused XML elements.	2012-03-12 02:12:58 +01:00
Hermann Kraus	02d8a98b3f	Improve error messages.	2012-03-12 01:09:26 +01:00
Hermann Kraus	502773bea6	Only one grammar object per XML tree.	2012-03-11 23:24:28 +01:00
Dane Springmeyer	ddd3956f0e	expose a clear method for the marker_cache and mapped_memory_cache - closes #1022	2012-03-09 15:16:01 -08:00
Dane Springmeyer	9d0bfa9d4e	the std::map storing font_face pointers is a cache - name it clearly	2012-03-09 14:47:04 -08:00
Artem Pavlenko	e8758b96a6	+ fix init order	2012-03-09 14:26:52 +00:00
Artem Pavlenko	254b3c9fa7	Merge branch 'master' into geometry-clipping Conflicts: SConstruct include/mapnik/symbolizer_helpers.hpp src/placement_finder.cpp	2012-03-09 14:18:41 +00:00
Artem Pavlenko	961ab51aef	+ fix previous merge error	2012-03-09 13:23:50 +00:00
Artem Pavlenko	d8d5298f4e	+ update cairo_renderer to use clipped paths	2012-03-09 12:56:54 +00:00
Artem Pavlenko	40b9553722	+ add clipping to text/shield/markers Conflicts: include/mapnik/symbolizer_helpers.hpp	2012-03-09 12:54:13 +00:00
Artem Pavlenko	c12161bf19	+ clip geometries before applying any transformations.	2012-03-09 12:44:29 +00:00
Dane Springmeyer	99a181e196	fix spelling	2012-03-09 12:37:27 +00:00
Hermann Kraus	b71460d4dd	Don't return pointer to dead object.	2012-03-09 13:26:11 +01:00
Hermann Kraus	cd8cfc6527	Improve error messages.	2012-03-08 18:52:53 +01:00
Dane Springmeyer	f1aee03912	forward declare marker so marker_cache api access is cleaner	2012-03-08 08:37:58 -08:00
Hermann Kraus	2a7709a0cf	Dump xml tree.	2012-03-08 01:29:19 +01:00
Hermann Kraus	c3cd50ff57	Complete new XML structure.	2012-03-07 19:16:41 +01:00
Hermann Kraus	daf30ca0d1	Update metawriter_factory.hpp	2012-03-07 15:26:13 +01:00
Hermann Kraus	9a05dc1828	Add XML functions.	2012-03-07 03:57:31 +01:00
Hermann Kraus	f214675c69	Modify all other files for new XML structure.	2012-03-07 02:23:16 +01:00
Hermann Kraus	7d3fd0755d	Complete XML changes in load_map.cpp	2012-03-07 01:35:37 +01:00
Hermann Kraus	7a052f81f7	Update more functions.	2012-03-06 18:17:23 +01:00
Hermann Kraus	ac50834d92	Convert parse_map_include to xml_node.	2012-03-06 15:47:08 +01:00
Hermann Kraus	191d0f907a	Convert first function to new XML structure.	2012-03-06 15:18:11 +01:00
Dane Springmeyer	3c594efec8	fix spelling	2012-03-05 17:59:07 -08:00
Dane Springmeyer	2287668562	initialize members of char_info - refs #1114	2012-03-05 14:51:14 -08:00
Dane Springmeyer	3dafe6080d	rework text_path ctor to ensure members are properly initialized - refs #1114	2012-03-05 14:15:01 -08:00
Dane Springmeyer	f3c4f9eec7	initialize members of text_symbolizer_properties and char_properties - refs #1114	2012-03-05 13:48:35 -08:00
Dane Springmeyer	e9c043a42a	ensure members are initialized (refs #1114 )	2012-03-05 13:32:02 -08:00
Dane Springmeyer	90fb50b158	initialize sx,sy in ctrans (refs #1114 ) and avoid possible divide by zero condition (refs #1110 )	2012-03-05 13:29:20 -08:00
Dane Springmeyer	87da7c2e3e	ptree_helpers: ensure proper return type upon exception (TODO: needs larger cleanup)	2012-03-05 12:34:10 -08:00
Dane Springmeyer	f81108d5b3	formatting	2012-03-05 12:09:22 -08:00
Dane Springmeyer	7dfc6d9ccd	pass doubles by value in find_line_circle_intersection	2012-03-05 11:50:20 -08:00
Dane Springmeyer	f90b410ece	formatting to use const& as per `6462af3`	2012-03-05 11:10:04 -08:00
Dane Springmeyer	232256e136	load_map_string: do not pass optional arg by const& and better error if string is empty	2012-03-05 10:44:20 -08:00
Hermann Kraus	481271cb76	Add new XML data structure and modify XML parser to work with this structure.	2012-03-05 16:49:54 +01:00
Hermann Kraus	ad86e9aebc	Reenable text meta writers.	2012-03-04 23:25:13 +01:00
Hermann Kraus	5578bdb6f9	Remove has_dimensions and dimensions from text_placement_info. This functionality is better provided by placement_finder.additional_boxes.	2012-03-04 16:38:40 +01:00
Hermann Kraus	46272d836b	Move more variables from text_placements_info to placement_finder. Refs #1048.	2012-03-04 13:32:10 +01:00
Hermann Kraus	4638b28c36	Store pointer to char_info in text_path instead of pointer to char_properties.	2012-03-04 03:53:39 +01:00
Hermann Kraus	b4eddaab24	Move variables from text_placements_info to placement_finder. Reuse placement_finder objects. Pass feature to placement_finder. Refs #1048.	2012-03-04 01:49:01 +01:00
Dane Springmeyer	e622c9548d	Merge branch 'master' of github.com:mapnik/mapnik	2012-03-02 18:47:11 -08:00
Hermann Kraus	2bf9d9dbdf	Fix handling of empty XML nodes. Closes #1106.	2012-03-03 01:12:23 +01:00
Dane Springmeyer	ca3bd722c1	Merge branch 'master' of github.com:mapnik/mapnik	2012-03-02 10:01:11 -08:00
Artem Pavlenko	726724b3c7	pass by ref move conversions impl into .cpp	2012-03-01 18:36:13 +00:00
Dane Springmeyer	a837b1ae80	specialize getting strings from ptree to avoid excess copying	2012-02-28 20:13:37 -08:00
Dane Springmeyer	7c8341e7c3	formatting	2012-02-28 20:12:13 -08:00
Dane Springmeyer	ce3078fa98	inline to avoid duplicate symbol errors with gcc	2012-02-25 09:29:14 -08:00
Dane Springmeyer	9aff28f768	fix compile with boost 1.42	2012-02-24 19:22:48 -08:00
Dane Springmeyer	e6abd143a8	c++ casts to avoid compiler warnings on msvc	2012-02-24 18:58:34 -08:00
Dane Springmeyer	8cb23ca382	remove uneeded default cases	2012-02-24 18:57:37 -08:00
Dane Springmeyer	954eb5c539	reduce usage of boost::lexical_cast during map parsing by using spirit2-based conversion functions - refs #1055	2012-02-24 18:26:48 -08:00
Dane Springmeyer	2f134657b4	speed up xml loading by avoiding repeated grammar creation - refs #1028 (TODO - still need to handle text/shield expressions)	2012-02-24 16:34:39 -08:00
Dane Springmeyer	b1f5f701cc	Merge branch 'master' of github.com:mapnik/mapnik	2012-02-24 16:27:37 -08:00
Dane Springmeyer	128f43bc79	remove used functions in ptree_helpers.hpp	2012-02-24 16:25:46 -08:00
Hermann Kraus	1906cddf04	Improve error messages.	2012-02-25 00:57:05 +01:00
Dane Springmeyer	a917b7b410	fix the ability of external libraries to link mapnik on windows	2012-02-24 11:32:16 -08:00
Artem Pavlenko	4aa957d373	Merge remote-tracking branch 'origin/master'	2012-02-24 18:09:15 +00:00
Artem Pavlenko	917e684bdd	dummy decrement() and advance(p) to compile with vc10 (untested)	2012-02-24 18:07:13 +00:00
Dane Springmeyer	2a4fa323cf	declare feature_impl and context_type for windows symbol visibility	2012-02-24 09:25:32 -08:00
Dane Springmeyer	dccaff73d9	Merge branch 'master' of github.com:mapnik/mapnik	2012-02-23 18:55:59 -08:00
Dane Springmeyer	9c2e0f478a	c++ style	2012-02-23 18:55:48 -08:00
Dane Springmeyer	37d76eccb4	Add explicit header	2012-02-23 18:55:20 -08:00
Dane Springmeyer	e88b8c9cac	boost 1.42 compatibility	2012-02-23 15:52:04 -08:00
Dane Springmeyer	871650a3c2	specialize string2int conversion to avoid std::string ctor	2012-02-23 13:11:25 -08:00
Dane Springmeyer	02eb9067e0	fix linking with msvc by declaring text_placements	2012-02-23 11:47:45 -08:00
Dane Springmeyer	2d1f2d19cc	fix compile of shield_symbolizer.hpp on windows	2012-02-23 09:22:51 -08:00
Hermann Kraus	e79f13df1f	Add debug helper for XML.	2012-02-23 18:10:49 +01:00
Artem Pavlenko	abd57d2acb	+ use boost::scoped_ptr for auto memory managment + remove delete/new from create_palette	2012-02-23 12:26:16 +00:00
Artem Pavlenko	61c6b7e6b2	+ use boost::range algorithms for brevity	2012-02-23 12:10:32 +00:00
Artem Pavlenko	9db9e7d161	Merge remote-tracking branch 'origin/master'	2012-02-23 10:23:31 +00:00
Artem Pavlenko	00787ec12d	+ implement 'filter' iterator to output key/value pairs where value is not value_null(). + use it in json::feature_generator to have more compact json	2012-02-23 10:21:29 +00:00
Dane Springmeyer	56aeae1b52	fix broken python linking after `6a0ce99e22`	2012-02-22 16:45:02 -08:00
Artem Pavlenko	8fe79f910f	Merge remote-tracking branch 'origin/master'	2012-02-22 22:47:28 +00:00
Artem Pavlenko	00abb57ffa	add missing image_width fix	2012-02-22 22:46:35 +00:00
Dane Springmeyer	188ba774b9	rollback part of `5dee576` - avoiding skipping nodes with <= 3 pixels as this fixed only symptoms of the hextree crash and not the root cause (note: divide by zero fix is maintained)	2012-02-22 14:32:12 -08:00
Artem Pavlenko	5b49d64a48	Merge remote-tracking branch 'origin/master'	2012-02-22 17:17:25 +00:00
Artem Pavlenko	199adc17d0	fix reduced image width calc	2012-02-22 17:16:07 +00:00
Dane Springmeyer	5dee576df2	hextree: avoid memory corruption in create_palette_rek() by not skipping <3 pixel nodes and avoid potential divide by zero in assign_node_colors() (led to hang on osx) - closes #1087	2012-02-21 22:37:56 -05:00
Dane Springmeyer	3c2938b812	add header with simple spirit string conversion functions- refs #1055	2012-02-21 10:57:58 -08:00
Dane Springmeyer	9213dd5426	fixup multi-symbolizer processing function	2012-02-20 22:53:54 -08:00
Hermann Kraus	a05faceb11	Fix ShieldSymbolizer line placement. Refs #1078, https://github.com/MapQuest/MapQuest-Mapnik-Style/issues/8.	2012-02-21 00:06:54 +01:00
Artem Pavlenko	80cf0c2bd5	make generators noncopyable	2012-02-20 22:19:50 +00:00
Hermann Kraus	46f80cc6aa	Use double instead of int and avoid rounding when possible. Closes #1078.	2012-02-20 19:32:34 +01:00
Artem Pavlenko	6f5d16bfe3	+ make feature_collection_parser a template so we can instantiate with different iterator types e.g std::string::const_iterator and boost::spirit::multi_pass<std::istreambuf_iterator<char> >	2012-02-20 16:23:31 +00:00
Artem Pavlenko	6e498ad062	+ update to use new names + add geometry_generator	2012-02-20 12:03:56 +00:00
Artem Pavlenko	8536b8a536	+ better naming	2012-02-20 12:03:07 +00:00
Artem Pavlenko	3953a94636	+ geojson generator interface	2012-02-20 10:53:58 +00:00
Artem Pavlenko	8e40537c48	+ fix ident	2012-02-20 10:53:15 +00:00
Artem Pavlenko	256d23d5bc	+ cleanup	2012-02-20 10:52:39 +00:00
Artem Pavlenko	d8005e3486	+ feature/geometry geojson generator impl	2012-02-20 10:51:45 +00:00
Hermann Kraus	76cdd7a254	Merge branch 'master' into python-textplacement	2012-02-19 01:00:52 +01:00
Hermann Kraus	6efdb3969e	Handle text position differently. Should fix part of the ShieldSymbolizer problems. Refs #1078.	2012-02-18 14:39:13 +01:00
Hermann Kraus	2843ff3da8	Fix placement_finder.hpp includes.	2012-02-18 14:03:21 +01:00
Hermann Kraus	bb3ad18c95	Rename starting_{x,y} to center to reflect actual meaning.	2012-02-18 13:07:23 +01:00
Hermann Kraus	93d119464c	Add new class to avoid mixing different types of positions.	2012-02-18 12:12:45 +01:00
Hermann Kraus	980cdd9e92	Use text_placements registry.	2012-02-18 00:39:14 +01:00
Hermann Kraus	3508ec5fb4	Merge branch 'master' into python-textplacement	2012-02-17 20:54:48 +01:00
Hermann Kraus	481e172b8e	Add placement registry.	2012-02-17 20:15:16 +01:00
Hermann Kraus	2c6502e791	Merge branch 'master' of github.com:mapnik/mapnik	2012-02-17 19:52:38 +01:00
Hermann Kraus	7c98b8c9c0	Add XML name registry. Allows users to add new types to XML styles.	2012-02-17 19:45:13 +01:00
Artem Pavlenko	b5bc17304c	Merge remote-tracking branch 'origin/master'	2012-02-17 10:48:49 +00:00
Artem Pavlenko	c6a091937f	+ add get_optional to mapnik::feature_impl returns -> boost::optional<mapnik::value const&> + use get_optional in feature_kv_iterator to avoid throwing exceptions	2012-02-17 10:46:29 +00:00
Dane Springmeyer	9be9b09d72	Merge branch 'master' of github.com:mapnik/mapnik	2012-02-16 17:44:34 -08:00
Dane Springmeyer	a5e1a66fe6	c++ style in hextree.hpp to aid in debugging - no functional change	2012-02-16 17:44:04 -08:00
Hermann Kraus	44beaf1bdf	Make ShieldSymbolizer variables doubles. Refs #1078.	2012-02-17 00:03:46 +01:00
Artem Pavlenko	63735982ee	+ remove const from parameters passed by-value	2012-02-16 15:35:27 +00:00
Hermann Kraus	ceda45249f	Merge branch 'master' into python-textplacement	2012-02-16 00:18:44 +01:00
Hermann Kraus	819ee98041	Rename properties=>defauls, default_format=>format.	2012-02-16 00:17:22 +01:00
Hermann Kraus	4602338e0c	Add ExpressionFormat: Allow changing text format based on expressions. Closes #1036. Refs #1048.	2012-02-15 21:38:24 +01:00
Artem Pavlenko	c83ab1d14e	Merge remote-tracking branch 'origin/master'	2012-02-15 19:20:17 +00:00
Hermann Kraus	a2c2ad40e2	Make markers_placement a bit simpler and add sanity checks. refs #974.	2012-02-15 20:06:50 +01:00
Artem Pavlenko	01497bfc36	+ add typedef size_type to mapnik::vertex_vector + remove set_capacity() method - no longer required	2012-02-15 15:16:33 +00:00
Dane Springmeyer	a13b3f650c	when feature put/get throws, print the key that does not exist	2012-02-14 14:57:03 -08:00
Artem Pavlenko	8116ba4809	ident	2012-02-14 18:35:00 +00:00
Artem Pavlenko	7e8207236e	ident	2012-02-14 18:34:29 +00:00
Artem Pavlenko	dc4cc8f197	+ base class already derived from boost::noncopyable	2012-02-14 18:33:39 +00:00
Artem Pavlenko	58b51b208e	use standard_wide::space	2012-02-14 18:33:05 +00:00
Dane Springmeyer	9d5591b77a	add argument	2012-02-13 22:02:23 -08:00
Dane Springmeyer	a18927a0b1	Add include	2012-02-13 11:59:04 -08:00
Dane Springmeyer	cafb98ed88	qi::omit works with boost >=1.46 but not <=1.45 - refs #1074	2012-02-13 11:47:55 -08:00
Hermann Kraus	be464f0c5b	Move code for makers placement from hpp to cpp.	2012-02-13 20:20:09 +01:00
Dane Springmeyer	08216606ee	formatting	2012-02-13 11:01:25 -08:00
Hermann Kraus	043dba3786	Merge branch 'cleanup-includes'	2012-02-13 19:37:20 +01:00
Hermann Kraus	f3dc78506b	Remove almost empty unused headers.	2012-02-13 18:07:47 +01:00
Hermann Kraus	01e3450dff	Add warning for filter_factory.hpp.	2012-02-13 17:03:42 +01:00
Artem Pavlenko	06ae6ae845	+ fix #1042 - don't use omit[...] directive with boost_1_42_0	2012-02-13 12:12:13 +00:00
Hermann Kraus	828316bffd	Remove unused file.	2012-02-12 23:44:05 +01:00
Hermann Kraus	d3e191ff73	Merge branch 'master' into python-textplacement Conflicts: include/mapnik/formatting/list.hpp	2012-02-12 22:58:02 +01:00
Hermann Kraus	1fd7f9d543	Fix spelling error.	2012-02-12 22:48:44 +01:00
Hermann Kraus	2b5274c21b	Merge branch 'textplacement-rename' into python-textplacement	2012-02-12 13:57:51 +01:00
Hermann Kraus	52702d3a20	Rename filter_factory to expression.	2012-02-12 13:06:39 +01:00
Hermann Kraus	32b492fac1	Fix includes.	2012-02-12 04:06:34 +01:00
Hermann Kraus	9eccd58ed5	Merge branch 'textplacement-rename' into python-textplacement Conflicts: include/mapnik/text_processing.hpp	2012-02-12 04:01:58 +01:00
Hermann Kraus	69f153bf8f	Fix all includes.	2012-02-12 03:55:13 +01:00
Hermann Kraus	91ddbd4f73	Move other text placement files.	2012-02-12 03:16:33 +01:00
Hermann Kraus	34638b9e3c	Split text_placements.hpp	2012-02-12 03:11:58 +01:00
Hermann Kraus	18004ca7fb	Move processed_text.	2012-02-12 02:52:00 +01:00
Hermann Kraus	fbe929810b	Fix most includes.	2012-02-12 02:47:26 +01:00
Hermann Kraus	6c29a12f24	Move text_symbolizer_properties.	2012-02-12 02:24:26 +01:00
Hermann Kraus	d7da55be15	Move char_properties.	2012-02-12 02:19:31 +01:00
Hermann Kraus	508ce0b65d	Move formating::format_node.	2012-02-12 02:10:08 +01:00
Hermann Kraus	390b70eb44	Move formating::list_node.	2012-02-12 02:07:36 +01:00
Hermann Kraus	e37070f177	Move formating::text_node.	2012-02-12 02:05:27 +01:00
Hermann Kraus	e2c75c5eef	Move formating::node.	2012-02-12 02:01:25 +01:00
Hermann Kraus	dc665bdea1	Merge branch 'master' into python-textplacement	2012-02-12 01:49:15 +01:00
Hermann Kraus	3b2767f167	Add additional constructor for common use case.	2012-02-12 01:48:25 +01:00
Hermann Kraus	67faac351b	Merge branch 'master' into python-textplacement	2012-02-11 11:25:28 +01:00
Hermann Kraus	7ef1c3544e	Bugfix: Collect expressions for formating::format_node.	2012-02-11 11:24:33 +01:00
Hermann Kraus	c94d32b41b	Add bindings for formating::list_node.	2012-02-11 11:21:33 +01:00
Dane Springmeyer	4bf8a7f69e	boost 1.42 compatibility	2012-02-10 10:31:11 -08:00
Artem Pavlenko	6a015dcd59	Merge remote-tracking branch 'origin/master'	2012-02-10 11:59:12 +00:00
Artem Pavlenko	602264d368	+ implement 'in situ' boost::spirit::qi based geojson parser	2012-02-10 11:56:53 +00:00
Artem Pavlenko	f19bcafbf6	+ make wkt_parser noncopyable	2012-02-10 10:53:04 +00:00
Artem Pavlenko	ff66cc1326	+ check if index is valid in to_string() + output feature id	2012-02-10 10:52:06 +00:00
Hermann Kraus	1d50aa1b85	Make interface consistent with similar classes.	2012-02-08 01:16:37 +01:00
Artem Pavlenko	958097600c	add wkt_parser class for grammar re-usage implement from_wkt in terms of wkt_parser	2012-02-06 22:49:47 +00:00
Artem Pavlenko	8366da08ee	fix compiler warnings about ref to temp obj (@springmeyer)	2012-02-06 09:42:53 +00:00
Hermann Kraus	b5627c0f5c	Reduce warnings.	2012-02-05 18:10:29 +01:00
Hermann Kraus	a8e2fb1301	Enable depreaction warnings.	2012-02-05 16:31:29 +01:00
Hermann Kraus	e298d141da	Improve expression handling.	2012-02-05 03:11:00 +01:00
Hermann Kraus	0a030d55e6	Remove left over declaration.	2012-02-03 23:33:34 +01:00
Hermann Kraus	9c92bf713d	Easier syntax by hiding internal data type.	2012-02-03 00:34:14 +01:00
Dane Springmeyer	17d13cff67	whitespace fixes - closes #911	2012-02-01 17:53:35 -08:00
Dane Springmeyer	1cafc03a46	whitespace fixes	2012-02-01 17:49:28 -08:00
Dane Springmeyer	07d7d7d537	convert to using feature_ptr rather than const& for renderers	2012-02-01 16:37:05 -08:00
Dane Springmeyer	915addc51d	update grid rendering interface to new feature impl	2012-02-01 10:43:23 -08:00
Hermann Kraus	cc886d1688	Merge branch 'feature-text-merge'	2012-01-31 16:52:28 +01:00
Hermann Kraus	06ce3f7eec	Merge remote-tracking branch 'herm/textplacement-merge'	2012-01-31 16:37:37 +01:00
Hermann Kraus	72f061b75a	Revert `0c5fc9f246`. For new text placment branch a different solution is needed.	2012-01-31 16:36:40 +01:00
Hermann Kraus	1a16e9c5ab	Remove class text_processor.	2012-01-31 16:24:58 +01:00
Artem Pavlenko	b90de4874c	Merge branch 'textplacement-merge' into feature-text-merge Conflicts: docs/textrendering.gv include/mapnik/building_symbolizer.hpp include/mapnik/placement_finder.hpp include/mapnik/symbolizer_helpers.hpp include/mapnik/text_placements.hpp include/mapnik/text_placements_list.hpp include/mapnik/text_placements_simple.hpp include/mapnik/text_processing.hpp plugins/input/shape/shape_utils.hpp src/agg/process_shield_symbolizer.cpp src/agg/process_text_symbolizer.cpp src/cairo_renderer.cpp src/grid/process_shield_symbolizer.cpp src/grid/process_text_symbolizer.cpp src/load_map.cpp src/placement_finder.cpp src/shield_symbolizer.cpp src/text_placements.cpp src/text_processing.cpp src/text_symbolizer.cpp tests/visual_tests/clean.sh tests/visual_tests/test.py Merge herm/textplacement-merge	2012-01-31 11:09:55 +00:00
Artem Pavlenko	7f91fb7b1e	change read_xxx_xxx methods to not return input value by ref.	2012-01-31 09:46:21 +00:00
Artem Pavlenko	cad0261e55	check if index is valid before pushing back value.	2012-01-31 09:45:06 +00:00
Artem Pavlenko	f53122ea04	add setter for geometry type add default ctor (eGeomType->Unknown)	2012-01-30 20:46:39 +00:00
Artem Pavlenko	39bafa0cf1	add push_new member function which allows modifying current features context (useful when datasource schema is unknown, so we update context as we go along).	2012-01-30 14:05:41 +00:00
Hermann Kraus	49225d7468	Handle additional boxes from ShieldSymbolizer.	2012-01-29 20:28:32 +01:00
Hermann Kraus	16e5fefb4d	Remove text_placement_info::initialize() to avoid incorrect usage of this object.	2012-01-29 20:04:31 +01:00
Hermann Kraus	49a3b3c52c	Make code easier to read by using std::pair instead of boost::tuple for position.	2012-01-29 17:33:43 +01:00
Hermann Kraus	822786e41c	Remove no-text attribute. One can simply leave the text empty if one wants this.	2012-01-29 13:10:14 +01:00
Hermann Kraus	09459683e9	Update symbolizer helpers for ShieldSymbolizer. Correctly handle point placement for TextSymbolizer. (Tries each possible placement for each point).	2012-01-29 04:49:02 +01:00
Hermann Kraus	a3871e52b7	Rename set_values_from_xml to from_xml.	2012-01-28 17:13:41 +01:00
Hermann Kraus	ff07b4bce0	placement_element => text_path	2012-01-28 00:09:58 +01:00
Hermann Kraus	d6b8209a9d	Rewrote text processing to use a tree structure. Reduces the number of classes and simplifies extension.	2012-01-27 23:15:12 +01:00
Artem Pavlenko	be9b622d1d	revert previous bogus change	2012-01-27 17:01:07 +00:00
Artem Pavlenko	09687ce331	Merge branch 'master' into feature-text-merge	2012-01-27 12:51:13 +00:00
Artem Pavlenko	f646aa2228	add support for escaped characters/hex notataion i.e \x20 allow both single and double quoted strings	2012-01-27 12:43:43 +00:00
Artem Pavlenko	77772e8470	add basic polygon sorting	2012-01-27 09:47:04 +00:00
Hermann Kraus	dbc1280731	Process more than one geometry. Start work on ShieldSymbolizer.	2012-01-26 20:05:38 +01:00
Hermann Kraus	1bd3e3678c	Really use filtered geometries.	2012-01-26 18:13:40 +01:00
Artem Pavlenko	ff44b53583	use geometries_to_process	2012-01-26 16:25:26 +00:00
Artem Pavlenko	5c6fdc780f	return member variable by const reference	2012-01-26 13:07:28 +00:00
Artem Pavlenko	36a23367a6	+ fix compilation issues	2012-01-26 13:05:41 +00:00
Artem Pavlenko	d1f16bb227	merge textplacement-merge into feature_impl	2012-01-26 13:04:08 +00:00
Artem Pavlenko	c405d61e1c	remove <config.hpp>	2012-01-25 20:23:14 +00:00
Artem Pavlenko	06e91a56c6	remove <config.hpp>	2012-01-25 20:21:06 +00:00
Hermann Kraus	37ba77550c	More documentation.	2012-01-25 18:46:27 +01:00
Hermann Kraus	1106dcb445	Support for cairo + grid renderer.	2012-01-25 16:17:38 +01:00
Hermann Kraus	bdc20f766b	Complete symbolizer_helpers.hpp for TextSymbolizer.	2012-01-25 15:44:19 +01:00
Artem Pavlenko	d146bcc380	Merge branch 'master' into feature_impl	2012-01-25 10:04:03 +00:00
Hermann Kraus	0c5fc9f246	Merge pull request #1050 from rfw/text-placements-python Add text placements to Python API.	2012-01-24 18:11:13 -08:00
Tony Young	d0d692cb82	Add text placements to Python API.	2012-01-25 12:57:26 +13:00
Hermann Kraus	469568862b	Add documentation.	2012-01-24 23:42:54 +01:00
Hermann Kraus	3b887972b8	Start work on new symbolizer helpers.	2012-01-23 19:02:35 +01:00
Artem Pavlenko	663b4adfa2	feature_impl : add get paths by const reference method python : fix helper functions declarations	2012-01-23 14:22:14 +00:00
Hermann Kraus	31fd5647f2	Use font manager and char properties in text engine.	2012-01-22 20:51:09 +01:00
Hermann Kraus	1527fed59c	Remove unused includes.	2012-01-22 20:08:45 +01:00
Hermann Kraus	b945dff774	Fix metawriters.	2012-01-22 19:57:32 +01:00
Hermann Kraus	9d2a6088b1	New placement finder.	2012-01-22 18:41:04 +01:00
Hermann Kraus	a95524ae35	Remove old variables.	2012-01-22 18:36:17 +01:00
Hermann Kraus	3dab67732e	Remove old variables.	2012-01-22 18:33:53 +01:00
Hermann Kraus	78c4464ad7	Remove next_position_only().	2012-01-22 18:29:55 +01:00
Hermann Kraus	e0b5e15507	Remove old functions from text_placements.	2012-01-22 18:20:34 +01:00
Hermann Kraus	67eb73eab9	Return correct size information from font engine.	2012-01-22 17:53:45 +01:00
Hermann Kraus	2143267db3	Remove boost::make_shared().	2012-01-22 17:06:14 +01:00
Hermann Kraus	4490e1afaf	Add missing get_positions() function.	2012-01-22 16:25:19 +01:00
Hermann Kraus	7fd9fb0c88	Small fixes.	2012-01-22 03:32:21 +01:00
Hermann Kraus	7d03b46079	Update attribute_collector to use get_all_expressions().	2012-01-22 03:25:19 +01:00
Hermann Kraus	7d01f509ab	Add text_placement_info_list functions.	2012-01-22 03:11:55 +01:00
Hermann Kraus	cc048986d8	Text size as float.	2012-01-22 02:38:46 +01:00
Hermann Kraus	6506edebf2	Add deprecation warnings.	2012-01-22 02:33:00 +01:00
Hermann Kraus	5f62584385	Add header for list placement. (Unused so far.)	2012-01-22 02:23:39 +01:00
Hermann Kraus	f460f90ec6	Add new text_placement functions, but keep old stuff to ensure mapnik compiles.	2012-01-22 02:22:55 +01:00
Hermann Kraus	b7f8e356f4	Make text_path use char_info.	2012-01-22 01:43:13 +01:00
Hermann Kraus	5fd7035527	Move font engine functions from .hpp to .cpp.	2012-01-21 01:47:02 +01:00
Hermann Kraus	34405a5d9e	Replace dimension_t by char_info.	2012-01-21 00:35:24 +01:00
Hermann Kraus	533b95f0e6	Enable XML parser to return multiple <xmltext> nodes.	2012-01-21 00:02:44 +01:00
Hermann Kraus	e177cd52a7	Rename opacity to image_opacity.	2012-01-20 22:45:47 +01:00
Hermann Kraus	21a58b7b7a	Add missing includes.	2012-01-20 22:43:05 +01:00
Hermann Kraus	6a50f91a10	Add text_processing.hpp/cpp	2012-01-20 22:30:12 +01:00
Hermann Kraus	abae1a1fec	Remove unused file.	2012-01-20 22:28:06 +01:00
Hermann Kraus	e553dbcd82	Add missing includes.	2012-01-20 22:23:14 +01:00
Hermann Kraus	b14e6c57db	Remove unused include.	2012-01-20 22:22:42 +01:00
Hermann Kraus	2a95f7271b	Add char_info.hpp	2012-01-20 22:22:14 +01:00
Hermann Kraus	7d8924921c	Fix header for ShieldSymbolizer (`6efb7a863d`). Add more default constructors.	2012-01-20 22:14:08 +01:00
Artem Pavlenko	bae5bd292f	move building_symbolizer into separate hpp/cpp	2012-01-19 18:26:15 -05:00
Hermann Kraus	e977df778a	Remove unused "anchor" attribute from Text/ShieldSymbolizer.	2012-01-20 00:09:25 +01:00
Artem Pavlenko	7601095e24	move context's typedef inside to avoid poluting global namespace	2012-01-19 17:36:27 -05:00
Artem Pavlenko	29e8bcc47c	add method to access attribute values by index	2012-01-19 16:57:15 -05:00
Artem Pavlenko	096082ba9b	Merge branch 'master' into feature_impl	2012-01-19 16:11:03 -05:00
Hermann Kraus	537231f60e	Remove glyph symbolizer.	2012-01-19 20:34:09 +01:00
Artem Pavlenko	e7fdf1fa51	more files...	2012-01-19 12:57:34 -05:00
Artem Pavlenko	6dc4aaac9d	more files...	2012-01-19 12:57:34 -05:00
Artem Pavlenko	ab314b44a4	+ use mapnik::gamma_method_e for all symbolizers + fixes #1042 : avoid pushin duplcaite name into boost.python registry	2012-01-19 12:45:24 -05:00
Artem Pavlenko	0f002077e1	+ use mapnik::gamma_method_e for all symbolizers + fixes #1042 : avoid pushin duplcaite name into boost.python registry	2012-01-19 12:45:24 -05:00
Artem Pavlenko	a6a540cb68	Merge branch 'master' into feature_impl	2012-01-18 09:40:55 -05:00
Artem Pavlenko	034b270eb4	Merge pull request #1023 from tarnowsc/master Making the gamma-method for polygon symbolizer	2012-01-18 06:35:54 -08:00
Artem Pavlenko	8fd505790e	Merge pull request #1023 from tarnowsc/master Making the gamma-method for polygon symbolizer	2012-01-18 06:35:54 -08:00
Artem Pavlenko	43fafa6ca0	+ move feature_kv_iterotor into *.cpp to avoid cyclic deps + expose kv iterator directly on feature_impl	2012-01-18 09:15:52 -05:00
Artem Pavlenko	745a20d4c3	make mapnik::Feature base class noncopyable	2012-01-18 09:12:46 -05:00
Artem Pavlenko	63a3399036	Merge branch 'feature_impl' of github.com:mapnik/mapnik into feature_impl	2012-01-17 17:58:34 -05:00
Dane Springmeyer	820b9a2b25	merge master with feature_impl	2012-01-17 17:47:27 -05:00
Artem Pavlenko	0658bf8f5a	+ check index in valid range+ + add size() and context() methods	2012-01-17 17:32:33 -05:00
Artem Pavlenko	fbbd1d4dcf	re-enable colorizer support	2012-01-17 14:16:03 -05:00
Artem Pavlenko	50b5d06a48	Merge remote-tracking branch 'origin/feature_impl' into feature_impl Conflicts: include/mapnik/feature.hpp	2012-01-17 12:39:16 -05:00
Artem Pavlenko	7944d31c2e	use key_value (typedef to std::string) throw std::out_of_range if key doesn't exist add has_key(key_value const&) method	2012-01-17 11:23:32 -05:00
Dane Springmeyer	5414648538	use std::size_t for mapnik::context mapping type	2012-01-17 10:56:59 -05:00
Dane Springmeyer	136239f88b	remove mapnik::point_datasource from c++ and mapnik.PointDatasource from python bindings	2012-01-17 09:58:45 -05:00
Dane Springmeyer	eec02f02bb	cleanup	2012-01-17 01:47:42 -05:00
Dane Springmeyer	c42e0901d2	cleanup	2012-01-17 01:47:42 -05:00
Dane Springmeyer	63891cec15	finish refactor, moving to separate method off datasources to get_geometry_type and using enums all around	2012-01-17 01:09:46 -05:00
Dane Springmeyer	b0d0d06564	finish refactor, moving to separate method off datasources to get_geometry_type and using enums all around	2012-01-17 01:09:46 -05:00
Artem Pavlenko	7b8934933e	add size() method	2012-01-16 13:20:26 -05:00
Dane Springmeyer	66a0cfc81f	refactor	2012-01-14 22:35:40 -08:00
Dane Springmeyer	834310f2d8	refactor	2012-01-14 22:35:40 -08:00
Cezary Tarnowski	93ff232ca2	#1023 making gamma power default, making gamma-method awailable for polygon pattern symolizer and stroke	2012-01-13 18:20:03 +01:00
Cezary Tarnowski	53fc770495	#1023 making gamma power default, making gamma-method awailable for polygon pattern symolizer and stroke	2012-01-13 18:20:03 +01:00
Artem Pavlenko	946667948f	fix names	2012-01-13 17:18:43 +00:00
Artem Pavlenko	d75eb788f3	+ expose iterator interface in mapnik::context + make feature_kv_iterator friend of feature_impl	2012-01-13 17:17:40 +00:00
Artem Pavlenko	ede232d2c1	+ apply mapnik coding convention	2012-01-13 16:30:03 +00:00
Artem Pavlenko	8a4fb0b47e	+ add typedefs	2012-01-13 14:50:36 +00:00
Cezary Tarnowski	e7a751987d	Merge remote-tracking branch 'upstream/master'	2012-01-13 14:49:59 +01:00
Cezary Tarnowski	afa8ecefc4	Merge remote-tracking branch 'upstream/master'	2012-01-13 14:49:59 +01:00
Artem Pavlenko	da7574065d	+ envelope() method + put(std::string const&, mapnik::value const&)	2012-01-13 12:02:02 +00:00
Artem Pavlenko	3ed378e09e	fix include	2012-01-12 17:31:32 +00:00
Artem Pavlenko	45e867aac1	feature_impl: key/value forward iterator	2012-01-12 17:29:42 +00:00
Cezary Tarnowski	c007a608ff	Adding gamma-method to polygon symbolizer	2012-01-12 16:58:10 +01:00
Cezary Tarnowski	c7cfdef8d4	Adding gamma-method to polygon symbolizer	2012-01-12 16:58:10 +01:00
Artem Pavlenko	0bb8adbbdc	factor out common code to reduce duplication (shape_utils)	2012-01-12 12:18:50 +00:00
Artem Pavlenko	14aa8281ce	format	2012-01-12 10:18:15 +00:00
Artem Pavlenko	4cd95d9d1c	fix init order	2012-01-12 10:10:40 +00:00
Artem Pavlenko	0eb8e2d246	temp fix to compile FIXME	2012-01-12 10:04:49 +00:00
Artem Pavlenko	f02ef7ed0e	keep old names	2012-01-12 09:43:54 +00:00
Artem Pavlenko	377aad79ce	more friendly interface	2012-01-12 09:40:58 +00:00
Artem Pavlenko	dd4007bc51	+ return bvalue by const ref + feature impl update	2012-01-12 09:35:57 +00:00
Artem Pavlenko	d65186106f	update feature factory to work with new features	2012-01-12 09:32:21 +00:00
Artem Pavlenko	f4d3a536f2	new leaner feature impl (shared context)	2012-01-12 09:31:11 +00:00
Dane Springmeyer	967652efb6	include/ add utility for converting paths to string geometry type name - refs #701	2012-01-11 20:02:38 -08:00
Dane Springmeyer	e7f1c58dee	include/ add utility for converting paths to string geometry type name - refs #701	2012-01-11 20:02:38 -08:00
Dane Springmeyer	33bd76f24f	add geometry_type to mapnik::layer_descriptor - empty unless set by datasources - refs #701	2012-01-11 20:02:30 -08:00
Dane Springmeyer	ca68a77a46	add geometry_type to mapnik::layer_descriptor - empty unless set by datasources - refs #701	2012-01-11 20:02:30 -08:00
Dane Springmeyer	aad26ace9f	formatting	2012-01-11 15:58:59 -08:00
Dane Springmeyer	d865555af2	formatting	2012-01-11 15:58:59 -08:00
Tom MacWright	54ecfdbe9f	Merge branch 'master' into unbuffered_extent	2012-01-09 13:13:09 -05:00
Tom MacWright	1640252b69	Merge branch 'master' into unbuffered_extent	2012-01-09 13:13:09 -05:00
Artem Pavlenko	e9cb534ee3	+ store face index for faster access + avoid memory leaks	2012-01-09 13:09:19 +00:00
Artem Pavlenko	1ad6e107d3	+ store face index for faster access + avoid memory leaks	2012-01-09 13:09:19 +00:00
Dane Springmeyer	ca1b5ea7ac	Revert "recommend 1.46 since that dodges the ubuntu issue with interprocess - refs #950 and #1001 " This reverts commit `60059970fa`.	2012-01-08 16:07:17 -08:00
Dane Springmeyer	156026c581	Revert "recommend 1.46 since that dodges the ubuntu issue with interprocess - refs #950 and #1001 " This reverts commit `60059970fa`.	2012-01-08 16:07:17 -08:00
Dane Springmeyer	60059970fa	recommend 1.46 since that dodges the ubuntu issue with interprocess - refs #950 and #1001	2012-01-08 16:03:04 -08:00
Dane Springmeyer	69f4cece93	recommend 1.46 since that dodges the ubuntu issue with interprocess - refs #950 and #1001	2012-01-08 16:03:04 -08:00
Artem Pavlenko	884e83cda8	delete trailing white space	2012-01-05 11:40:27 +00:00
Artem Pavlenko	9e6e7d0211	delete trailing white space	2012-01-05 11:40:27 +00:00
Artem Pavlenko	cb8ee2e239	don't use boost foreach on geometry_container - type deduction issues ??	2012-01-05 11:38:43 +00:00
Artem Pavlenko	0aa44b84f9	don't use boost foreach on geometry_container - type deduction issues ??	2012-01-05 11:38:43 +00:00
Artem Pavlenko	1b5e281647	implement wkb converter for multi geometries	2012-01-05 10:57:22 +00:00
Artem Pavlenko	e33326a561	implement wkb converter for multi geometries	2012-01-05 10:57:22 +00:00
Tom MacWright	bb5f274265	Adds unbuffered_extent_ to queries from feature_style_processor. Creates a new constructor for query. Currently this is used by the jit_datasource.	2011-12-20 16:12:37 -05:00
Tom MacWright	0fb717486c	Adds unbuffered_extent_ to queries from feature_style_processor. Creates a new constructor for query. Currently this is used by the jit_datasource.	2011-12-20 16:12:37 -05:00
Dane Springmeyer	d7c720f0af	python: reflect fontsets to enable fuller test of map.deepcopy - closes #348	2011-12-20 12:34:27 -08:00
Dane Springmeyer	bbeeaada4d	python: reflect fontsets to enable fuller test of map.deepcopy - closes #348	2011-12-20 12:34:27 -08:00
Artem Pavlenko	c71a02e24d	add poor man's deepcopy method : ''' mapnik::util::deepcopy(map_in,map_out); '''	2011-12-20 16:26:30 +00:00
Artem Pavlenko	b3b330bcb7	add poor man's deepcopy method : ''' mapnik::util::deepcopy(map_in,map_out); '''	2011-12-20 16:26:30 +00:00
Artem Pavlenko	43c837399d	copy filter expressions fix use const_iterator	2011-12-20 16:16:17 +00:00
Artem Pavlenko	6c248c70f9	copy filter expressions fix use const_iterator	2011-12-20 16:16:17 +00:00
Artem Pavlenko	145362c6f7	refactor symbolizer deepcopy semantics into internal structure	2011-12-19 13:30:30 +00:00
Artem Pavlenko	a99392d3df	refactor symbolizer deepcopy semantics into internal structure	2011-12-19 13:30:30 +00:00
Dane Springmeyer	b62cebf9b5	renable to_wkt after g++ compile fix in `0aef7cc55a`	2011-12-17 11:55:30 -08:00
Dane Springmeyer	d940a7cc52	renable to_wkt after g++ compile fix in `0aef7cc55a`	2011-12-17 11:55:30 -08:00
Artem Pavlenko	b4fd857a66	Merge remote-tracking branch 'origin/master'	2011-12-17 11:45:08 +00:00
Artem Pavlenko	365e42cd0e	Merge remote-tracking branch 'origin/master'	2011-12-17 11:45:08 +00:00
Artem Pavlenko	0aef7cc55a	provide attribute customization point : template <> struct is_container<mapnik::geometry_container> : mpl::false_ {}; TODO: This is somewhat non-intuitive in this context but keeps gcc and darwin toolsets happy.	2011-12-17 11:41:24 +00:00
Artem Pavlenko	843411df86	provide attribute customization point : template <> struct is_container<mapnik::geometry_container> : mpl::false_ {}; TODO: This is somewhat non-intuitive in this context but keeps gcc and darwin toolsets happy.	2011-12-17 11:41:24 +00:00
Dane Springmeyer	261c9e41e5	temporarily comment to_wkt until we can fix compile with g++ (only works currently with clang++)	2011-12-16 10:07:30 -08:00
Dane Springmeyer	05a09de211	temporarily comment to_wkt until we can fix compile with g++ (only works currently with clang++)	2011-12-16 10:07:30 -08:00
Dane Springmeyer	5357080dc6	c++ style cast	2011-12-16 10:06:18 -08:00
Dane Springmeyer	4b28739274	c++ style cast	2011-12-16 10:06:18 -08:00
Artem Pavlenko	726cea7ba4	Merge branch 'master' into geometry_cleanup	2011-12-14 14:04:30 +00:00
Artem Pavlenko	ed7abc5c51	Merge branch 'master' into geometry_cleanup	2011-12-14 14:04:30 +00:00
Artem Pavlenko	fad6c614e8	remove title, abstract data members from mapnik::rule	2011-12-13 16:47:45 +00:00
Artem Pavlenko	46fea8e890	remove title, abstract data members from mapnik::rule	2011-12-13 16:47:45 +00:00
Artem Pavlenko	bf9dd32e2c	remove title,abstract members from layer class	2011-12-13 16:34:10 +00:00
Artem Pavlenko	d24e0436ea	remove title,abstract members from layer class	2011-12-13 16:34:10 +00:00
Artem Pavlenko	e228b1143d	+ support GEOMETRYCOLLECTION in WKT generator	2011-12-13 16:33:27 +00:00
Artem Pavlenko	98e8164ce1	+ support GEOMETRYCOLLECTION in WKT generator	2011-12-13 16:33:27 +00:00
Cezary Tarnowski	b438a56ada	refactoring following comment on pull request	2011-12-13 15:28:18 +01:00
Cezary Tarnowski	79af8fdbc9	refactoring following comment on pull request	2011-12-13 15:28:18 +01:00
Artem Pavlenko	7e8e600790	+ WKT generator for mapnik::geometry_container	2011-12-12 18:19:52 +00:00
Artem Pavlenko	4f1438db01	+ WKT generator for mapnik::geometry_container	2011-12-12 18:19:52 +00:00
Cezary Tarnowski	85a55d9fa2	Merge branch 'master' of https://github.com/mapnik/mapnik	2011-12-12 11:29:00 +01:00
Cezary Tarnowski	0882f0e668	Merge branch 'master' of https://github.com/mapnik/mapnik	2011-12-12 11:29:00 +01:00
Artem Pavlenko	4c8bb5c0d5	Merge branch 'master' into geometry_cleanup	2011-12-12 09:20:21 +00:00
Artem Pavlenko	bf4f442b8d	Merge branch 'master' into geometry_cleanup	2011-12-12 09:20:21 +00:00
Dane Springmeyer	1c4b67ba98	Merge pull request #916 from kkaefer/grouped-rendering Grouped rendering	2011-12-11 22:36:22 -08:00
Dane Springmeyer	e5ab14a298	Merge pull request #916 from kkaefer/grouped-rendering Grouped rendering	2011-12-11 22:36:22 -08:00
Artem Pavlenko	14c3102c31	fix typo	2011-12-09 12:24:51 +00:00
Artem Pavlenko	9d5d52a48f	fix typo	2011-12-09 12:24:51 +00:00
Artem Pavlenko	0236a7af27	Merge branch 'master' into geometry_cleanup	2011-12-09 11:43:51 +00:00
Artem Pavlenko	4ca89c4801	Merge branch 'master' into geometry_cleanup	2011-12-09 11:43:51 +00:00
Artem Pavlenko	0d0f9fa0ba	SVG generator impl	2011-12-09 11:29:34 +00:00
Artem Pavlenko	05fbb2b646	SVG generator impl	2011-12-09 11:29:34 +00:00
Artem Pavlenko	d700162834	+ increase coordinates precision	2011-12-09 11:28:41 +00:00
Artem Pavlenko	9f89ce17a6	+ increase coordinates precision	2011-12-09 11:28:41 +00:00
Cezary Tarnowski	8bf359451d	Adding support for height as expression for building symbolizer	2011-12-09 12:08:50 +01:00
Cezary Tarnowski	c5eb808059	Adding support for height as expression for building symbolizer	2011-12-09 12:08:50 +01:00
Artem Pavlenko	108d1559c1	Merge branch 'master' into geometry_cleanup	2011-12-08 16:51:21 +00:00
Artem Pavlenko	3a20edbfbd	Merge branch 'master' into geometry_cleanup	2011-12-08 16:51:21 +00:00
Artem Pavlenko	446b55fc87	pass const reference	2011-12-08 16:20:04 +00:00
Artem Pavlenko	a5de8154d6	pass const reference	2011-12-08 16:20:04 +00:00
Artem Pavlenko	32ba92d063	fix include	2011-12-08 16:07:51 +00:00
Artem Pavlenko	525fc6ecbc	fix include	2011-12-08 16:07:51 +00:00
Artem Pavlenko	f77fb2a530	add bool to_wkt(std::string & wkt, mapnik::geometry_type const& geom)	2011-12-08 15:34:34 +00:00
Artem Pavlenko	3f27b184ba	add bool to_wkt(std::string & wkt, mapnik::geometry_type const& geom)	2011-12-08 15:34:34 +00:00
Artem Pavlenko	00e621c8b9	remove unused header	2011-12-08 15:27:26 +00:00
Artem Pavlenko	b923c3679f	remove unused header	2011-12-08 15:27:26 +00:00
Artem Pavlenko	bc9fc07d20	rename to reflect 'generator' bit	2011-12-08 15:25:06 +00:00
Artem Pavlenko	495d3eac40	rename to reflect 'generator' bit	2011-12-08 15:25:06 +00:00
Artem Pavlenko	6d0f5c066b	boost::spirit::karma based WKT generator	2011-12-08 15:18:01 +00:00
Artem Pavlenko	67180bcc64	boost::spirit::karma based WKT generator	2011-12-08 15:18:01 +00:00
Artem Pavlenko	1941a87de9	initial SVG generator support (TODO)	2011-12-08 15:17:22 +00:00
Artem Pavlenko	9fe561d442	initial SVG generator support (TODO)	2011-12-08 15:17:22 +00:00
Artem Pavlenko	b4c0d9bdee	better naming	2011-12-08 15:15:51 +00:00
Artem Pavlenko	8e49054aa6	better naming	2011-12-08 15:15:51 +00:00
Artem Pavlenko	ee404ff8c4	adapt mapnik::geometry_type to work with boost::spirit	2011-12-08 15:12:56 +00:00
Artem Pavlenko	e7faae1069	adapt mapnik::geometry_type to work with boost::spirit	2011-12-08 15:12:56 +00:00
Konstantin Käfer	ac8b4c6d2d	Merge branch 'master' into grouped-rendering Conflicts: include/mapnik/feature_type_style.hpp src/feature_type_style.cpp	2011-12-07 22:02:29 +01:00
Konstantin Käfer	f7cdee8312	Merge branch 'master' into grouped-rendering Conflicts: include/mapnik/feature_type_style.hpp src/feature_type_style.cpp	2011-12-07 22:02:29 +01:00
Artem Pavlenko	00ed6ffd5e	Merge branch 'master' into geometry_cleanup	2011-12-07 09:29:41 +00:00
Artem Pavlenko	39507d30f0	Merge branch 'master' into geometry_cleanup	2011-12-07 09:29:41 +00:00
Artem Pavlenko	283e2066e9	fix missing qualifier	2011-12-07 09:16:24 +00:00
Artem Pavlenko	0aab8c0944	fix missing qualifier	2011-12-07 09:16:24 +00:00
Dane Springmeyer	59d0e306cf	include <cstring> to std::memcpy on linux - refs #76 and closes #987	2011-12-06 16:57:34 -08:00
Dane Springmeyer	a016dbe2c7	include <cstring> to std::memcpy on linux - refs #76 and closes #987	2011-12-06 16:57:34 -08:00
Artem Pavlenko	77adf6cec6	+ make geometry noncopyable + make ctor explicit	2011-12-06 16:25:30 +00:00
Artem Pavlenko	9f27706e81	+ make geometry noncopyable + make ctor explicit	2011-12-06 16:25:30 +00:00
Artem Pavlenko	7209988fb0	Simplify geometry model to support: Point/LineString/Polygon Multi geometries are collections of single geometries Remove multiple_geometries parameter	2011-12-06 12:53:16 +00:00
Artem Pavlenko	cc60b74921	Simplify geometry model to support: Point/LineString/Polygon Multi geometries are collections of single geometries Remove multiple_geometries parameter	2011-12-06 12:53:16 +00:00
Artem Pavlenko	77ddcaf81b	implement vertex_iterator on vertex_vector	2011-12-06 11:19:24 +00:00
Artem Pavlenko	2c9e151c41	implement vertex_iterator on vertex_vector	2011-12-06 11:19:24 +00:00
Artem Pavlenko	91617e7b21	cleanup typedefs, changed template params: vertex_type -> coord_type	2011-12-06 11:17:14 +00:00
Artem Pavlenko	d09fe46a04	cleanup typedefs, changed template params: vertex_type -> coord_type	2011-12-06 11:17:14 +00:00
Artem Pavlenko	2b05d69fef	fix typedef names, expose value_type	2011-12-06 11:15:37 +00:00
Artem Pavlenko	a4e08da00b	fix typedef names, expose value_type	2011-12-06 11:15:37 +00:00
Artem Pavlenko	b8ce995acd	better typedef names remove unused header	2011-12-06 10:34:25 +00:00
Artem Pavlenko	2d95518b22	better typedef names remove unused header	2011-12-06 10:34:25 +00:00
Artem Pavlenko	4e57134c8c	geometry type is known at this stage.	2011-12-06 09:04:44 +00:00
Artem Pavlenko	b8bd9676fc	geometry type is known at this stage.	2011-12-06 09:04:44 +00:00
Artem Pavlenko	a0f216a7cd	+ fix spelling	2011-12-05 15:04:54 +00:00
Artem Pavlenko	a4f024bfd2	+ fix spelling	2011-12-05 15:04:54 +00:00
Artem Pavlenko	c683be63d2	Merge remote-tracking branch 'origin/master'	2011-12-05 14:28:03 +00:00
Artem Pavlenko	42fb73a41e	Merge remote-tracking branch 'origin/master'	2011-12-05 14:28:03 +00:00
Artem Pavlenko	5335a144bd	vertex iterator implementation (forward traversal)	2011-12-05 14:23:20 +00:00
Artem Pavlenko	10cc71834a	vertex iterator implementation (forward traversal)	2011-12-05 14:23:20 +00:00
kunitoki	d6cbdd3412	Merge branch 'master' of github.com:mapnik/mapnik	2011-12-05 11:12:02 +01:00
kunitoki	b883f4ad75	Merge branch 'master' of github.com:mapnik/mapnik	2011-12-05 11:12:02 +01:00
kunitoki	784ec6f22e	- initial implementation of the geotiff output by using libgeotiff, not complete (issue #967 )	2011-12-05 11:10:13 +01:00
kunitoki	e5ba275794	- initial implementation of the geotiff output by using libgeotiff, not complete (issue #967 )	2011-12-05 11:10:13 +01:00
Dane Springmeyer	fde9d9c0b7	fix compile on linux by adding <cstdio> include - thx misterboo for report - closes #978	2011-12-03 13:50:26 -08:00
Dane Springmeyer	1b4b0e6eb0	fix compile on linux by adding <cstdio> include - thx misterboo for report - closes #978	2011-12-03 13:50:26 -08:00
Dane Springmeyer	60de1c80cd	add support for arbitrary, custom parameters to be attached to the map during load and serialized when saved - refs #977	2011-12-02 17:48:09 -08:00
Dane Springmeyer	b03ce6e607	add support for arbitrary, custom parameters to be attached to the map during load and serialized when saved - refs #977	2011-12-02 17:48:09 -08:00
Dane Springmeyer	437f71cdef	allow mapnik::value_holder to store nulls, mainly to make it possible to return PyNone in python bindings	2011-12-02 17:01:38 -08:00
Dane Springmeyer	744eca6555	allow mapnik::value_holder to store nulls, mainly to make it possible to return PyNone in python bindings	2011-12-02 17:01:38 -08:00
Artem Pavlenko	797477de51	geometry to wkb initial implementation	2011-12-02 16:33:50 +00:00
Artem Pavlenko	4659a4d697	geometry to wkb initial implementation	2011-12-02 16:33:50 +00:00
kunitoki	e011cab6e0	- initial support for producing maps as tiff files (should be pretty straightforward to implement geotiff from here)	2011-11-28 16:59:19 +01:00
kunitoki	b0d0c97544	- initial support for producing maps as tiff files (should be pretty straightforward to implement geotiff from here)	2011-11-28 16:59:19 +01:00
Artem Pavlenko	e940fb374d	add vc++ 2008 to the list.	2011-11-22 10:01:40 +00:00
Artem Pavlenko	cfc05aac6d	add vc++ 2008 to the list.	2011-11-22 10:01:40 +00:00
Dane Springmeyer	e1de25318d	allow compile with msvs - make_shared is preferable but vs compiler cannot handle it	2011-11-21 20:28:47 -08:00
Dane Springmeyer	fc005aa050	allow compile with msvs - make_shared is preferable but vs compiler cannot handle it	2011-11-21 20:28:47 -08:00
Dane Springmeyer	7491d08b67	silence a few msvc cast warnings	2011-11-18 15:55:27 -08:00
Dane Springmeyer	4a8b5f27d2	silence a few msvc cast warnings	2011-11-18 15:55:27 -08:00
Dane Springmeyer	6c76896677	keep proper type in text sym deep copy - refs #946	2011-11-18 15:09:16 -08:00
Dane Springmeyer	07291106a9	keep proper type in text sym deep copy - refs #946	2011-11-18 15:09:16 -08:00
Artem Pavlenko	771a8ad72f	use mutex from base class	2011-11-18 09:39:57 +00:00
Artem Pavlenko	81c00d9cc5	use mutex from base class	2011-11-18 09:39:57 +00:00
Dane Springmeyer	3520033b0d	in multithreaded mode lock before creating a datasource - closes #951	2011-11-17 18:47:09 -08:00
Dane Springmeyer	1a93e5c407	in multithreaded mode lock before creating a datasource - closes #951	2011-11-17 18:47:09 -08:00
Dane Springmeyer	43f2fa7075	Merge branch 'master' into gsoc-crundel	2011-11-09 16:57:20 -08:00
Dane Springmeyer	d0d2efbf54	Merge branch 'master' into gsoc-crundel	2011-11-09 16:57:20 -08:00
Dane Springmeyer	da56cbd392	minor includes fixups	2011-11-09 16:41:07 -08:00
Dane Springmeyer	9b3c42190d	minor includes fixups	2011-11-09 16:41:07 -08:00
Dane Springmeyer	6257ac57c9	sqlite: futher refactoring of sqlite plugin, allowing all tests to pass	2011-11-03 19:51:37 -04:00
Dane Springmeyer	d965bcbeae	sqlite: futher refactoring of sqlite plugin, allowing all tests to pass	2011-11-03 19:51:37 -04:00
Dane Springmeyer	1adbbdb571	grid: initialize variables to avoid compiler warnings	2011-11-02 13:31:15 -04:00
Dane Springmeyer	2169bcb92f	grid: initialize variables to avoid compiler warnings	2011-11-02 13:31:15 -04:00
Dane Springmeyer	4ba7f5218a	formatting	2011-10-28 18:04:24 -07:00
Dane Springmeyer	4ffb26d78d	formatting	2011-10-28 18:04:24 -07:00
Artem Pavlenko	cfe071fbc4	don't skip white space in attributes names	2011-10-28 11:24:19 +01:00
Artem Pavlenko	14ab337363	don't skip white space in attributes names	2011-10-28 11:24:19 +01:00
Artem Pavlenko	9c5e988098	return by value	2011-10-28 11:24:17 +01:00
Artem Pavlenko	d1401b9e07	return by value	2011-10-28 11:24:17 +01:00
Artem Pavlenko	a3ba07f6b4	avoid creating default initialised values if key doesn't exist	2011-10-28 11:24:10 +01:00
Artem Pavlenko	694094d28b	avoid creating default initialised values if key doesn't exist	2011-10-28 11:24:10 +01:00
Artem Pavlenko	a35b9c4eaa	add support for fractional text size ( use FT_Set_Char_Size ) NOTE: ensure it works as expected, currently I see different results from different fonts.	2011-10-28 11:24:08 +01:00
Artem Pavlenko	87c1d126b8	add support for fractional text size ( use FT_Set_Char_Size ) NOTE: ensure it works as expected, currently I see different results from different fonts.	2011-10-28 11:24:08 +01:00
unknown	91f15d9e30	add missing overload # Please enter the commit message for your changes. Lines starting	2011-10-28 10:52:29 +01:00
unknown	a8348c5bf5	add missing overload # Please enter the commit message for your changes. Lines starting	2011-10-28 10:52:29 +01:00
Dane Springmeyer	06040d5847	Merge branch 'master' of github.com:mapnik/mapnik	2011-10-25 15:08:19 -07:00
Dane Springmeyer	6761cb0436	Merge branch 'master' of github.com:mapnik/mapnik	2011-10-25 15:08:19 -07:00
kunitoki	9a251e972d	- small cosmetics	2011-10-23 16:36:51 +02:00
kunitoki	592e97ffe7	- small cosmetics	2011-10-23 16:36:51 +02:00
kunitoki	eb13c8c6be	- another bunch of coding style fixes in includes	2011-10-23 16:09:47 +02:00
kunitoki	d574d4da0c	- another bunch of coding style fixes in includes	2011-10-23 16:09:47 +02:00
kunitoki	4a2151acec	- fix copyright repeats	2011-10-23 15:23:14 +02:00
kunitoki	154fb73d84	- fix copyright repeats	2011-10-23 15:23:14 +02:00
kunitoki	f1fb0c1939	- fix copyright to 2011 (script to do this will follow)	2011-10-23 15:04:25 +02:00
kunitoki	596757a269	- fix copyright to 2011 (script to do this will follow)	2011-10-23 15:04:25 +02:00
Dane Springmeyer	2f7d85e6d8	touchup feature.to_string() operator to display id differently than attributes	2011-10-22 17:27:02 -07:00
Dane Springmeyer	95035b2519	touchup feature.to_string() operator to display id differently than attributes	2011-10-22 17:27:02 -07:00
Dane Springmeyer	cad0c600cc	add a new, experimental coord_transform impl to support offsetting line verticies - closes #180 - next task of exposing functionality refs #927	2011-10-21 17:39:20 -07:00
Dane Springmeyer	c92e7ab497	add a new, experimental coord_transform impl to support offsetting line verticies - closes #180 - next task of exposing functionality refs #927	2011-10-21 17:39:20 -07:00
Dane Springmeyer	e0e47f50dd	remove area as it is unused (not needed by anything yet) - closes #846	2011-10-21 15:55:58 -07:00
Dane Springmeyer	d1c8818029	remove area as it is unused (not needed by anything yet) - closes #846	2011-10-21 15:55:58 -07:00
Artem Pavlenko	986edc3c6e	Merge pull request #909 from MapQuest/expose-label-collision-detector Exposed the label collision detector	2011-10-21 12:20:21 -07:00
Artem Pavlenko	c7e1174d6b	Merge pull request #909 from MapQuest/expose-label-collision-detector Exposed the label collision detector	2011-10-21 12:20:21 -07:00
Artem Pavlenko	f762059d5c	use static_cast	2011-10-21 20:02:34 +01:00
Artem Pavlenko	b8ed785d7d	use static_cast	2011-10-21 20:02:34 +01:00
Artem Pavlenko	2fadf1f2d3	Merge pull request #922 from xificurk/ctrans-cleanup code cleanup	2011-10-21 09:55:23 -07:00
Artem Pavlenko	ba0bdbd07e	Merge pull request #922 from xificurk/ctrans-cleanup code cleanup	2011-10-21 09:55:23 -07:00

... 15 16 17 18 19 ...

2457 commits