3560 commits

Author	SHA1	Message	Date
Dane Springmeyer	154dc59c5a	serialize all dashes, no underscores, as per #644	2011-02-05 03:11:09 +00:00
Dane Springmeyer	c5833a6db8	remove unmaintained autotools scripts	2011-02-04 22:22:16 +00:00
Artem Pavlenko	046d99f3be	+ remove debug printout	2011-02-02 15:09:54 +00:00
Dane Springmeyer	50532801f3	change min_distance and min_padding to minimum_distance and minimum_padding to match python and mimimum_version	2011-02-02 04:20:53 +00:00
Dane Springmeyer	c8b816e498	add missing serialization of marker width and height	2011-02-02 03:47:52 +00:00
Dane Springmeyer	3197bea9ee	add missing serialization of max_char_angle_delta and label_position_tolerance	2011-02-02 03:42:15 +00:00
Dane Springmeyer	c52c91c98a	serialize point_placement	2011-02-02 02:17:06 +00:00
Dane Springmeyer	fd2d9d7ff3	enable aliased lines using stroke-gamma for line_symbolizer - closes #689	2011-02-02 01:46:14 +00:00
Dane Springmeyer	7043c416fa	enable if/else type behavior in rules using style level keyword to control whether all rules will be evaluated or just the first that matches - closes #706 - thanks to original patch from kkaefer	2011-02-01 22:55:50 +00:00
Dane Springmeyer	75649b8863	add 'interior' point placement option to point_symbolizer - closes #709	2011-02-01 08:16:32 +00:00
Dane Springmeyer	e803b1c2ec	add 'interior' placement option to text_symbolizr - patch from Toby Collet - closes #709	2011-02-01 08:13:08 +00:00
Robert Coup	bea611a185	Fix positioning problem with scale() transforms for SVG symbols. Centering transform applied in the wrong order. Thanks to Toby Collett.	2011-01-31 09:56:31 +00:00
Dane Springmeyer	78ec8b1724	fix reading of height value for building_symbolizer - TODO: make expression (#704)	2011-01-28 20:46:49 +00:00
Dane Springmeyer	5bf6efafb0	apply patch from Craig de Stigter for better scaling methods using agg image filters - closes #656	2011-01-27 03:47:54 +00:00
Dane Springmeyer	57f15aa74e	forward declare agg:trans_affine and mapnik::marker classes to allow compiling against libmapnik without agg headers - see #703	2011-01-26 09:19:00 +00:00
Dane Springmeyer	481aeb6c98	comment debug output	2011-01-26 09:17:01 +00:00
Robert Coup	386a4f5daf	#654 - add support for linear and radial gradients in SVG symbols. Thanks to Toby Collett for the coding & Paul Wicks for funding.	2011-01-26 01:18:40 +00:00
Dane Springmeyer	a79018d0a0	make sure to check relative paths behavior up front, and handle background-image properly - closes #702	2011-01-25 20:47:56 +00:00
Carlos López	85bfb11c03	SVG renderer grammars working with iterator of geometry, but generating wrong path vertexes (all vertexes are output as 0s).	2011-01-23 23:10:05 +00:00
Marcin Rudowski	5a55d99f9a	making TextSymbolizer label placement consistant with agg renderer to give more similar output	2011-01-23 22:45:28 +00:00
Carlos López	bdfaee32a6	SVG_RENDERER is compiling now, but it won't generate path data, only simple svg tags. ... + It is working with vertex_vector, instead of vertex_vector2. + The body of every function related to path generation was commented out so mapnik would compile with SVG_RENDERER=True. + TODO: Create an iterator for geometry.	2011-01-22 06:47:20 +00:00
Artem Pavlenko	98b7f62155	+ remove template from mapnik::rule ... + rename globaly rule_type -> rule ( ticket #552 )	2011-01-13 21:35:01 +00:00
Dane Springmeyer	d54a767dd4	make sure to put cairo/cairomm ldflags into the linkflags for the libmapnik environment	2011-01-13 20:32:19 +00:00
Dane Springmeyer	e0a765429f	if a directory is not passed to register_fonts, then assume it is a font file and try registering it	2011-01-11 00:15:57 +00:00
Dane Springmeyer	2fa027855a	don't return reference to temporary, and intialize metawriter values	2011-01-10 23:04:34 +00:00
Artem Pavlenko	be458e7ac0	+ add support for boost::filesystem v3 ... (http://www.boost.org/doc/libs/1_45_0/libs/filesystem/v3/doc/deprecated.html)	2011-01-04 15:22:49 +00:00
Dane Springmeyer	47232c265a	formatting	2010-12-15 00:42:37 +00:00
Dane Springmeyer	ed22d073c3	fix serialization of missing shield symbolizer properties	2010-12-11 02:07:47 +00:00
Dane Springmeyer	7fc193729c	warn or throw if svg transform fails	2010-12-11 01:10:45 +00:00
Dane Springmeyer	7955178468	respect alpha of symbolizer for LINE placement as well as POINT and VERTEX placement	2010-12-10 22:31:57 +00:00
Robert Coup	1acc54f1fb	TextSymbolizer: make '\n' trigger line break. fixes #584. Thanks bcrosby for porting to trunk	2010-12-09 08:48:46 +00:00
Dane Springmeyer	0eb3718934	actually parse label_position_tolerance from xml	2010-12-01 17:40:33 +00:00
Dane Springmeyer	baaf8041bb	scons: linking libmapnik to boost_system is required solaris in 64 bit	2010-12-01 02:49:06 +00:00
Artem Pavlenko	6713df5937	+ if avoid_edges=true check 'contains' using un-buffered extent.	2010-11-22 11:25:36 +00:00
Dane Springmeyer	b71c75bdeb	clang++ caught bug - we need to first call lt_dlinit. Also add better error output based on returns from dladvise functions and simplify compile flag	2010-11-19 23:02:58 +00:00
Lucio Asnaghi	ba034abb1f	+ support of WKB geometry collection	2010-11-18 21:52:20 +00:00
Lucio Asnaghi	23e1904dca	+ fixed bad errors when parsing wkb	2010-11-18 20:33:45 +00:00
Dane Springmeyer	0b1d68f1f6	if libtool >=2.x.x is available, utilize the ability to set dlopen flags, so that plugins can be registered on linux without direct linking or modifying dlopen flags at runtime (like we currently do in python bindings)	2010-11-17 19:45:51 +00:00
Lucio Asnaghi	86a248d443	- leverage building extent (box2d) from string: multiple usage in datasources	2010-11-14 14:38:43 +00:00
Artem Pavlenko	d5f0a497a8	+ auto detect paths orientation ... + not need to set clip box on rasterizer it's already set (fixes gap when label is overlapping border)	2010-11-10 14:40:05 +00:00
Dane Springmeyer	4f9dce9a0c	only zoom to active layers	2010-11-08 18:57:30 +00:00
Dane Springmeyer	209b0697dc	upgrade a hello world plugin and cairo renderer to fully use new geometry_type	2010-11-03 16:26:30 +00:00
Artem Pavlenko	ab101401cd	+ simplify geometry implementation ... + removed multiple geometry typedefs + use geometry_type + revert to storing vertices in vector_vertex (previous implementation using std::vector was fragmenting heap causing performance issues with large geometries) + FIXME: hit_test is broken!	2010-11-03 13:19:15 +00:00
Artem Pavlenko	0361061053	+ fix text_minimum_padding.diff (#547) patch	2010-11-03 13:19:04 +00:00
Artem Pavlenko	0823b83900	+ apply Nino Walker's patch text_minimum_padding.diff #547 ... TODO: consider simplifying text symbolizer options	2010-11-03 13:18:56 +00:00
Dane Springmeyer	9281e6dcd8	avoid compiler warnings	2010-10-24 06:44:48 +00:00
Robert Coup	1dce437120	#622 add optional late-binding of datasources	2010-10-24 06:34:18 +00:00
Dane Springmeyer	aef676c090	add changes missed in r2287	2010-10-15 02:16:37 +00:00
Dane Springmeyer	3011f53205	add support to PointSymbolizer for 'ignore_placement' - #564	2010-10-15 02:15:40 +00:00
Dane Springmeyer	5d13869da1	if only width or height are supplied for a marker, make a circle - ellipses can be drawn by different width/height values	2010-10-15 00:14:18 +00:00
Dane Springmeyer	c8d5280b00	only render stroke on markers if it actually has a width	2010-10-15 00:12:51 +00:00
Dane Springmeyer	ca5d44032e	explicitly set the runpath to libmapnik for the python bindings - in combination with ability to set 'CUSTOM_LDFLAGS' this closes #354	2010-10-12 04:40:00 +00:00
Dane Springmeyer	688b1f2299	add an 'extra_attributes' property to the map to store mapnik::parameters that don't make sense as full attributes but need to be carried through from load_map() to save_map() for applications that use mapnik to serialize to xml such as Cascadenik and Quantumnik (currently useful storage for 'minimum_version' and 'font_directory')	2010-10-07 19:34:36 +00:00
Dane Springmeyer	2fc2b4c443	add 'font_directory' attribute to map to allow for regstration of fonts within - in combination with r2025 this closes #168	2010-10-07 01:49:07 +00:00
Dane Springmeyer	806971e56d	formatting	2010-10-05 20:13:03 +00:00
Artem Pavlenko	2f84e31e09	+ revert using shield displacement in placement_finder ... + correct shield placement logic (TODO: ensure scale_factor works correctly)	2010-10-05 11:41:07 +00:00
Alberto Valverde	9c79d52ca0	Modified cairo_pattern in order to let cairo handle ownership of the image ... buffer. This solves the issue mentioned in [2254] properly as it wasn't solved properly before. The bug is uncovered in cairo 1.10.0 and caused that images added to pdf surfaces did not appear at all. My guess is that newest cairo reads the pattern surface lazily when "trasnfering" it to the target surface and by the time it does it the cairo_pattern which owns the buffer has already been destroyed.	2010-10-01 11:22:39 +00:00
Alberto Valverde	215c223f68	Fixing issue when painting images into cairo PDFSurfaces which appears when using cairo 1.10.0. The context's surface needs to be marked as dirty after painting or else images won't be flushed. Earlier versions of cairo weren't as strict abouth this. Thanks to Company @ #cairo for helping out	2010-09-30 15:26:38 +00:00
Artem Pavlenko	4dbafdcec0	+ apply scale_factor to shield/text displacement ... + fix recentering logic	2010-09-30 11:40:24 +00:00
Dane Springmeyer	49e6fa4480	fixup compile of cairo rendering backend after r2248	2010-09-28 18:27:42 +00:00
Artem Pavlenko	69221d1438	+ apply scale_factor to spacing and minimum_distance ... in placement_finder	2010-09-27 10:36:53 +00:00
Artem Pavlenko	8163be1cc2	+ align text to pixel dim for svg shields	2010-09-27 10:07:21 +00:00
Artem Pavlenko	bbc797aeff	+ pass scale_factor to text placement	2010-09-27 09:58:30 +00:00
Artem Pavlenko	0727df6319	+ recentre svg symbol before applying user transform	2010-09-27 09:58:21 +00:00
Artem Pavlenko	77da818cd9	+ recentre SVG symbols before rendering ... (todo: maybe better recentre SVGs at loading time)	2010-09-25 12:12:59 +00:00
Dane Springmeyer	5c424d2e7c	add impl for grayscale_to_alpha (e.g. devseed world glass effect) - #609	2010-09-24 17:08:12 +00:00
Dane Springmeyer	0a300c8be7	impl of alpha setting in C++ core - should work now via python - #609	2010-09-24 16:12:23 +00:00
Dane Springmeyer	b3810a5f6a	stub in new alpha manipulation functions for mapnik image - #609	2010-09-24 15:37:19 +00:00
Tom Hughes	05ab656b57	The upcoming 4.8.0 release of PROJ.4 is supposed to be threadsafe, so ... lets believe them and not use any locks if we are building against version 4.8.0 or later. Instead we use the new proj_ctx_alloc routine to create a context and pass that when initialising the projection structure.	2010-09-24 15:26:50 +00:00
Artem Pavlenko	8b92943608	+ max_char_angle default to 25 degrees	2010-09-24 12:55:14 +00:00
Artem Pavlenko	86f4027d9d	+ store max_char_angle in radians ... + default to 25.0 degrees	2010-09-24 12:55:08 +00:00
Artem Pavlenko	71bfe37601	+ align text placement to pixel boundary	2010-09-24 12:55:03 +00:00
Dane Springmeyer	c35310445a	rename text_convert to text_transform to match css naming convention (also matching enums to css)	2010-09-18 19:10:18 +00:00
Dane Springmeyer	523b09701e	Add the ability to pass custom CXXFLAGS and LDFLAGS that will be prioritized above other compiler and linker flags	2010-09-18 18:02:15 +00:00
Dane Springmeyer	e22c187e95	expose an indexing operator on box2d to allow for easy pythonic access to bounds parts	2010-09-16 14:41:29 +00:00
Artem Pavlenko	46f9a7188a	+ don't compensate dx/dy	2010-09-10 13:49:21 +00:00
Artem Pavlenko	acd05cb5cd	+ align text and shields to pixels	2010-09-10 13:15:34 +00:00
Artem Pavlenko	14971ed88c	+ initialise displacement_ with shield_displacement	2010-09-10 13:15:25 +00:00
Artem Pavlenko	56bca0d194	+ re-use placement for subsequent points	2010-09-10 13:15:06 +00:00
Dane Springmeyer	df42fcde56	locking is required around pj_init_plus (partial revert of 2063) as it appears pj_init_plus will fail under high concurrent load even with proj 4.7.0 (only seen when reprojecting data) and will likely require use of a context (available in next release) if we wish to remove locks	2010-08-27 22:05:15 +00:00
Dane Springmeyer	9674171eb4	fixes for building on solaris and opensolaris, in addition to automatic running of ldconfig (will benefit builds on linux and fail silently otherwise)	2010-08-26 01:21:47 +00:00
Dane Springmeyer	22fc14ef05	+ ability to pass coord2d to box2d::re_center in core and python	2010-08-19 21:35:27 +00:00
Dane Springmeyer	b307013ba2	add additional support for dynamically drawing ellipses in the markers_symbolizer, now supporting both line/point placement, metawriters for point placement, and width/height/stroke attributes - TODO - reflect in python bindings, buggy matrix transform for ellipses	2010-08-19 17:33:01 +00:00
Dane Springmeyer	1fcb0eebec	serialize stroke separately from line_symbolizer, setting up for other symbolizers to share stroke attributes	2010-08-19 15:45:53 +00:00
Dane Springmeyer	b5f36154fc	parse stroke properties separately from parsing a line symbolizer - setting up for being able to easily add strokes to other symbolizers	2010-08-19 12:20:30 +00:00
Dane Springmeyer	a7e9cc7e87	make output of empty json (if no features are hit) on by default, and rename parameter from 'only-nonempty' to 'output-empty'	2010-08-19 05:50:08 +00:00
Hermann Kraus	d3bb11456f	Last Summer of Code changes: Support metawriter in upgrade_map_xml.py, fix attribute collector.	2010-08-16 19:14:21 +00:00
Hermann Kraus	55d9bf3290	Add glyph dimension caching and move functions from .hpp to .cpp	2010-08-13 18:41:54 +00:00
Hermann Kraus	b6f839b0f1	Calculate exact bounding boxes for GlyphSymbolizer.	2010-08-13 00:51:58 +00:00
Hermann Kraus	7fea0f7a6c	Metawriter support for LineSymbolizer and LinePatternSymbolizer	2010-08-12 21:39:29 +00:00
Hermann Kraus	fb4baa4fcf	Metawriter support for LineSymbolizer and LinePatternSymbolizer	2010-08-12 19:12:15 +00:00
Hermann Kraus	4cb09a8aca	Fix small bugs.	2010-08-12 16:58:37 +00:00
Marcin Rudowski	bd8f189bd1	fix raster blending, ported r2137, fixing #589	2010-08-12 06:59:35 +00:00
Hermann Kraus	24fb874c7d	Add metawriter support to save_map.cpp	2010-08-12 00:11:01 +00:00
Hermann Kraus	7dea58b625	Metawriter for Cairo.	2010-08-11 11:45:56 +00:00
Hermann Kraus	5867aadb66	Metawriter support for ShieldSymbolizer.	2010-08-11 03:25:15 +00:00
Hermann Kraus	a88ab24a72	Handle straight lines specially. ... Add comment about coordinate systems.	2010-08-11 02:26:14 +00:00
Dane Springmeyer	0637d59b5c	make SVG processor dependent (for now) on SVG_RENDERER scons option	2010-08-10 23:46:11 +00:00
Dane Springmeyer	6cce96dd06	upgrade default projection of epsg:4326 to match exactly what proj4 stores in /usr/local/share/epsg for 4326 (aka WGS84)	2010-08-10 18:18:31 +00:00
Hermann Kraus	7c5d0336c9	Small fixes + improvements.	2010-08-10 15:31:14 +00:00
Hermann Kraus	990df317fd	"size" is not an optional GlyphSymbolizer attribute.	2010-08-10 14:46:39 +00:00
Hermann Kraus	de5d191a02	Metawriter support for GlyphSymbolizer.	2010-08-10 12:44:29 +00:00
Hermann Kraus	4dc2a466f8	Add symbolizer_base constructor to all symbolizers.	2010-08-10 12:43:21 +00:00
Hermann Kraus	ada706844a	Remove unused function.	2010-08-10 12:20:02 +00:00
Hermann Kraus	30470bd52b	Metawriter support for TextSymbolizer.	2010-08-10 12:19:19 +00:00
Hermann Kraus	85cd4b67c3	Get full fontsize information.	2010-08-10 12:05:38 +00:00
Hermann Kraus	9857583064	Parse metawriter attributes in all symbolizers.	2010-08-10 12:03:45 +00:00
Carlos López	fda7f66204	Added missing files from last commit.	2010-08-10 08:25:09 +00:00
Carlos López	e390715c58	Added support for processing multiple symbolizers to svg renderer.	2010-08-10 08:23:02 +00:00
Dane Springmeyer	6da5983e94	add xinclude support for libxml2 based parser - thanks oldtopos - closes #567	2010-08-10 06:01:16 +00:00
Hermann Kraus	0fdf3a2463	Pass parameter as const&.	2010-08-07 20:03:05 +00:00
Hermann Kraus	fb7913619a	Bug fix: Don't warn about undefined metawriter when no metawriter is assigned to a symbolizer.	2010-08-07 20:00:43 +00:00
Dane Springmeyer	ca2aec8463	remove unneeded mutex include	2010-08-07 17:54:45 +00:00
Artem Pavlenko	f9b9c14500	pass parameters by const ref	2010-08-05 11:56:11 +00:00
Hermann Kraus	5725c694c6	Add "only-nonempty" to XML config.	2010-08-02 12:37:15 +00:00
Hermann Kraus	035e99d2f0	Only initialize proj_transform once in metawriter_json_stream.	2010-08-02 12:14:27 +00:00
Hermann Kraus	03718169b1	Only write non-empty tiles.	2010-08-02 01:35:18 +00:00
Hermann Kraus	75dcf67c92	Add some helper functions.	2010-08-02 00:37:15 +00:00
Hermann Kraus	0ae110015b	Metawriter: Only write features that are actually rendered.	2010-08-01 15:07:50 +00:00
Hermann Kraus	8f8903baa5	Bugfix + better performance.	2010-07-31 10:20:56 +00:00
Carlos López	eec4864f41	SVG renderer now outputs path tags for polygons, with a fixed stroke color and size.	2010-07-30 22:15:50 +00:00
Carlos López	9af87ba8db	SVG generator outputs path vertices in user coordinates.	2010-07-30 18:40:41 +00:00
Hermann Kraus	3791e95eda	Some metawriter fixes.	2010-07-29 16:49:47 +00:00
Artem Pavlenko	170c36b14b	+ correct SVG_RENDERER flag usage in src/SConscript	2010-07-29 10:10:37 +00:00
Carlos López	6872d13968	Implemented svg_renderer::process_polygon_symbolier that uses the SVG path grammar, which outputs coords in map coords.	2010-07-28 06:50:25 +00:00
Carlos López	39a1038eb8	Added missing files: include/mapnik/svg/svg_generator.hpp and include/mapnik/svg/svg_generator_path_grammar.hpp.	2010-07-26 06:23:43 +00:00
Carlos López	f44333fa4e	Added dummy grammar to generate SVG paths from geometries, as well as an SVG generator component.	2010-07-26 04:25:09 +00:00
Hermann Kraus	87fd78f313	Add support for dynamic filename in metawriters.	2010-07-25 22:41:18 +00:00
Hermann Kraus	7df4474f0b	Add metawriter properties to Map object.	2010-07-25 21:05:30 +00:00
Hermann Kraus	20d5eb5698	Make "default-output" attribute optional.	2010-07-25 21:03:35 +00:00
Dane Springmeyer	dc99025348	make compile of svg renderer optional (but on by default)	2010-07-22 21:53:52 +00:00
Carlos López	b5b94a868c	Changed template parameter type from stream to iterator and added a specialization for std::ostream_iterator.	2010-07-22 04:48:11 +00:00
Dane Springmeyer	f802d21865	speed optimizations by more careful use (or avoidance) of locking around projection code	2010-07-21 23:05:22 +00:00
Carlos López	f2a419bda7	Added template specialization svg_renderer<std::ofstream> to output SVG to file. Run tests/cpp_tests/svg_renderer_tests/file_output_test.cpp to generate one.	2010-07-21 07:43:13 +00:00
Carlos López	94e8ee3a9f	Generation of output is now done through a stream iterator instead of the stream directly, which improves performance. Also made more compact generator for xml header, root element and bgcolor.	2010-07-21 03:34:46 +00:00
Dane Springmeyer	e021f27f96	explicitly convert doubles to int to avoid compiler warnings	2010-07-21 00:59:40 +00:00
Carlos López	07f329a538	Added generation of background color to svg_renderer.	2010-07-20 17:37:42 +00:00
Carlos López	bb44d76ee1	Added generation of SVG root element with width and height attributes. Also added test for testing the output generated by svg_renderer (combined_test.cpp).	2010-07-20 06:41:16 +00:00
Carlos López	789ff19824	Added generation of XML declaration and doctype definition to svg_renderer.	2010-07-20 01:35:01 +00:00
Carlos López	30e85c4d58	Added template parameter and data member to svg_renderer for holding the output stream.	2010-07-20 00:40:37 +00:00
Carlos López	eb7da9bcf5	Added the path of the svg_renderer's files to scons for compilation. There is no variable yet to disable their compilation.	2010-07-19 19:48:34 +00:00
Artem Pavlenko	91a109120b	+ align attribute names with W3C standards ... rename 'bgcolor' to 'background-color' + update upgrade_map_xml.py	2010-07-19 12:01:34 +00:00
Artem Pavlenko	c943447509	+ fix comment	2010-07-19 11:10:20 +00:00
Artem Pavlenko	8b8e247e62	+ add support for background-image attribute ... ( background image is repeated both vertically and horizontally )	2010-07-19 11:10:03 +00:00
Artem Pavlenko	4bf42fe2d7	+ pass std::string argument by const&	2010-07-19 11:09:44 +00:00
Hermann Kraus	384c703557	Remove unneeded headers from save_map.{cpp,hpp}	2010-07-19 00:21:53 +00:00
Hermann Kraus	2c10bb68ef	Enable metawriter_json to operate on any stream object.	2010-07-18 23:49:11 +00:00
Dane Springmeyer	51a791eb77	scons: only attach uninstall actions if actually uninstalling - #311	2010-07-18 21:26:50 +00:00
Dane Springmeyer	267b48de49	add ability to uninstall all tracked scons targets using an 'uninstall' argument like 'scons uninstall' - closes #311	2010-07-18 20:39:05 +00:00
Dane Springmeyer	7918184d13	add helper functions for recursively registering fonts, and ensure they match one of the known freetype2 supported fonts (by ext) - closes #559	2010-07-15 23:04:51 +00:00
Dane Springmeyer	4f9d6e135c	output metadata about the searched plugin directories if a plugin cannot be found - closes #568	2010-07-15 21:11:41 +00:00
Carlos López	d273101adc	Added empty svg_renderer class, with unimplemented methods.	2010-07-15 05:32:31 +00:00
Dane Springmeyer	08e96be4a1	scons: better handling of PYTHON_INCLUDES and HAVE_LIBXML2	2010-07-15 00:20:50 +00:00
Dane Springmeyer	d549cfe30a	scons: only apply HAS_CAIRO & HAS_PYCAIRO flags to cairo related files	2010-07-14 22:47:34 +00:00
Artem Pavlenko	a2909f30bf	+ call arrange_orienrtations which fixes polygon orientations	2010-07-14 15:52:15 +00:00
Artem Pavlenko	5c2f51504a	+ call base class ctor	2010-07-14 14:46:26 +00:00
Artem Pavlenko	c7770ce6b1	Scaled text of shield symbolizer ... (cherry-picked from mapnik-resolution branch)	2010-07-14 13:51:27 +00:00
Hermann Kraus	7e10a32503	Created a class for metawriter_properties.	2010-07-14 10:34:18 +00:00
Dane Springmeyer	4d477a47cd	scons: conditionally add CXXFLAGS for headers needing Cairo support	2010-07-14 04:40:33 +00:00
Dane Springmeyer	ae0274cc6b	make sure to only use mutexes if THREADING=multi/MAPNIK_THREADSAFE=True	2010-07-14 01:28:28 +00:00
Hermann Kraus	03d6ef98c9	Undo accidential change.	2010-07-13 20:27:06 +00:00
Hermann Kraus	b218480835	Added default attributes for metawriter.	2010-07-13 20:24:44 +00:00
Hermann Kraus	d5b0432dd7	Many metawriter improvements: ... - Easier to configure - Correct JSON output - Handling more than one renderer run (writing pre-/postamble is no longer done in constructor/destructor) - Collect all attributes required by metawriters	2010-07-12 15:27:33 +00:00
Dane Springmeyer	9889517497	only print info about metawriter when in debug mode	2010-07-06 05:49:48 +00:00
Hermann Kraus	9a0bcf23be	Added basic infrastructure for metawriter and support for JSON output (limited to PointSymbolizer atm)	2010-07-06 00:37:05 +00:00
Artem Pavlenko	4fbcb989c1	+ fixed to_expression_string converter for ... <expr>.match(<pattern>) operator	2010-06-29 11:56:42 +00:00
Artem Pavlenko	70b2453065	+ add explicit support for shield displacement ... (NOTE:text displacement is relative shield!)	2010-06-28 21:32:30 +00:00
Artem Pavlenko	9b3809443c	+ fix naming style in mapnik::Map	2010-06-25 15:23:35 +00:00
Dane Springmeyer	83f91867bc	remove raster_symbolizer and line_pattern_symbolizer from agg_renderer, moved to src/agg in r1929	2010-06-24 19:51:51 +00:00
Artem Pavlenko	36928706bb	+ apply scale_factor in building sym	2010-06-24 16:02:50 +00:00
Artem Pavlenko	b472808fb1	+ refactor remaining processing methods in agg_renderer ... + move agg_renderer.cpp to src/agg	2010-06-24 15:57:25 +00:00
Artem Pavlenko	392ae66941	+ catch config_error in color::color(str) ctor	2010-06-21 11:06:42 +00:00
Artem Pavlenko	088f18263c	+ reverting r1734 (alberto)	2010-06-21 10:48:26 +00:00
Dane Springmeyer	0959f8ef16	+ add support to polygon_patter_symbolizer for global pattern alignment in addition to local/feature (default) alignment - closes #203	2010-06-20 22:36:49 +00:00
Dane Springmeyer	74850a4839	break out polygon_pattern_symbolizer	2010-06-20 03:56:03 +00:00
Dane Springmeyer	43bc58f158	break out text symbolizer	2010-06-19 21:01:30 +00:00
Dane Springmeyer	1566b486fa	break out agg-based glyph, line, and polygon symbolizers	2010-06-19 20:52:44 +00:00
Dane Springmeyer	fd17b14120	restore rendering of default point_symbolizer square, useful for debugging	2010-06-19 20:32:00 +00:00
Dane Springmeyer	36a8e19ad4	fixup more enums as done in r1893	2010-06-19 05:27:11 +00:00
Artem Pavlenko	e81b1abb8f	+ add implementation files	2010-06-18 15:39:57 +00:00
Artem Pavlenko	cf26db081a	+ refactor path expressions parser	2010-06-18 15:39:32 +00:00
Artem Pavlenko	b6089295e7	+ put enumerartion macros into mapnik namespace ... ( clang++ emmits errors otherwise)	2010-06-18 15:39:07 +00:00
Artem Pavlenko	c99dff801a	+ forward decl mapnik::Map	2010-06-18 15:38:29 +00:00
Artem Pavlenko	79458691a1	+ 'mutable' can't be applied to ref	2010-06-18 10:53:42 +00:00
Artem Pavlenko	e645338237	+ use FT_Stroker to stroke glyphs outlines ... (we can have outlined text now!) + allow fractional halo_radius + TODO: Rename halo_fill to stroke halo_radius to stroke-width + TODO: Implement proper 'halo' effect	2010-06-16 15:15:13 +00:00
Artem Pavlenko	f0d579f742	+ fixed ctor	2010-06-15 13:43:27 +00:00
Artem Pavlenko	e572b83d3a	+ fix copy ctor in symbolizer_with_image	2010-06-15 13:36:41 +00:00
Artem Pavlenko	b27357848d	+ set opacity on markers_symbolizer	2010-06-15 13:36:33 +00:00
Artem Pavlenko	9c47291f88	+ use text-opacity in text_renderer	2010-06-15 12:28:13 +00:00
Artem Pavlenko	f7fe6dbf15	+ apply opacity and text-opacity	2010-06-15 12:28:06 +00:00
Artem Pavlenko	d69dfe6656	+ update load/save opacity/text-opacity	2010-06-15 12:27:58 +00:00
Artem Pavlenko	d4643e6d87	+ add get/set opacity impl	2010-06-15 12:27:50 +00:00
Artem Pavlenko	9826cf98c5	+ move opacity parameter to the base class ... (symbolizer_with_image) + rename opacity to text_opacity in text_symbolizer to avoid name clashing	2010-06-15 12:27:42 +00:00
Artem Pavlenko	f43c36daad	+ separate state mutating svg ops from underlying data ... to allow multi-threded access to svg symbols (SVG commands are stored in std::vector<vertex_type> )	2010-06-14 16:38:02 +00:00
Artem Pavlenko	6030efab50	+ specialise svg parsers to expect const char* input	2010-06-14 13:18:17 +00:00
Artem Pavlenko	d0b1e62c2d	+ removed deprecated direct access to io_ptr	2010-06-14 13:18:09 +00:00
Artem Pavlenko	d410377f10	+ corrected <defs> skipping logic	2010-06-14 10:29:37 +00:00
Artem Pavlenko	b309bba36e	+ pass scale_factor to feature_style_processor	2010-06-14 10:29:29 +00:00
Artem Pavlenko	68522e39fc	+ use agg implementation for circle,ellipse and rounded_rect	2010-06-13 13:45:59 +00:00
Artem Pavlenko	30b87400ca	+ put rasterizer def into sepatate header	2010-06-13 12:03:42 +00:00
Artem Pavlenko	d272326d88	+ skip <defs>...</defs>	2010-06-11 14:09:05 +00:00
Artem Pavlenko	7f03186cdf	+ don't recentre SVG markers	2010-06-10 16:35:01 +00:00
Artem Pavlenko	b1b730d94c	+ add middle_point() method ... + fixed 'point' positioning in shield_symbolizer	2010-06-10 16:34:52 +00:00
Artem Pavlenko	d39ed1d364	+ apply scale_factor in agg_renderer	2010-06-10 14:12:28 +00:00
Artem Pavlenko	11fad966cb	+ add experimental 'scale_factor' ... TODO: discuss with Carlos and Dane if this is a better approach than having scale_factor in mapnik::Map object.	2010-06-10 14:12:20 +00:00
Artem Pavlenko	25dcebc18a	+ correct 'opacity' parameter logic ... (SVG spec: 'The uniform opacity setting to be applied across an entire object.')	2010-06-10 14:12:12 +00:00
Artem Pavlenko	4dcef9d1a3	+ disable setting paths orientation	2010-06-10 14:11:55 +00:00
Artem Pavlenko	9d98df89f1	+ parse 'transform' parameter	2010-06-10 14:11:48 +00:00
Artem Pavlenko	48921a412d	+ refactor (TODO!)	2010-06-08 11:14:31 +00:00
Artem Pavlenko	4a986bc5ff	+ format	2010-06-08 11:14:23 +00:00
Artem Pavlenko	2b3858df07	+ cache SVG marker bounding box	2010-06-08 10:16:31 +00:00
Artem Pavlenko	c500451cd8	+ refactor SVG parsing/rendering code into separate logical units ... to facilitate multi-threading: * SVG data (todo: enforce const) * SVG parsing/reading mutable * SVG rendering (read-only access to the data)	2010-06-08 10:16:22 +00:00
Artem Pavlenko	a47f6214a7	+ add markers_symbolizer.cpp	2010-06-06 12:10:36 +00:00
Dane Springmeyer	1b4f034ee5	add header needed for fopen on linux in jpeg_reader.cpp	2010-06-03 22:43:25 +00:00
Dane Springmeyer	6fc4d6f780	add support for reading jpeg images - closes #518	2010-06-03 21:24:58 +00:00
Dane Springmeyer	9804e7e90d	scons: make libjpeg dependency optional (still required by default)	2010-06-03 19:50:27 +00:00
Dane Springmeyer	7d8bdb2f94	avoid compiler warning about uninittialized variable on osx	2010-06-03 18:46:13 +00:00
Artem Pavlenko	f67f6c4ec1	+ add transformation matrix support	2010-06-03 12:36:00 +00:00
Artem Pavlenko	bc5730f006	+ shield_symbolizer: support SVG images rendering ... TODO: This is a first take, proper refactoring required!!!	2010-06-03 12:35:51 +00:00
Artem Pavlenko	5e43fefdba	+ don't qualify with mapnik:: namespace	2010-06-03 12:35:43 +00:00
Artem Pavlenko	d5a8f89d64	+load transform parameter in markers_symbolizer	2010-06-03 12:35:31 +00:00
Artem Pavlenko	f72fc9b397	+ move transformation matrix to the parent class	2010-06-03 12:35:11 +00:00
Artem Pavlenko	b6414778d6	+ add transformation matrix	2010-06-03 12:35:02 +00:00
Artem Pavlenko	816ebd2017	+ remove mapnik:: (we're in mapnik namespace!)	2010-06-03 12:34:53 +00:00
Artem Pavlenko	ac468f05c2	+ removed commented out lines	2010-06-03 12:34:45 +00:00
Artem Pavlenko	6cc6eac442	+ move marker init out of geometry loop	2010-06-02 12:53:23 +00:00
Artem Pavlenko	246731874b	+ apply 'mapnik-format' to *.cpp *.hpp	2010-06-02 11:03:30 +00:00
Artem Pavlenko	9069df6492	+ cleanup	2010-06-02 10:53:13 +00:00
Dane Springmeyer	218c75385d	complete XML syntax change from CSSParameter to attributes (for BuildingSymbolizer and RasterSymbolizer) and update tests	2010-06-01 21:58:24 +00:00
Artem Pavlenko	484dce8943	+ impl transform parameter (follow SVG spec) in point_symbolizer	2010-06-01 15:27:19 +00:00
Artem Pavlenko	b5362aa71a	+ tidy	2010-06-01 13:31:29 +00:00
Artem Pavlenko	9beb12b56b	+ split agg_renderer impl into different ... translation units + add SVG support in point_symbolizer	2010-06-01 13:31:18 +00:00
Artem Pavlenko	12b74bc1cc	+ split agg_renderer implementation into diff ... translation units	2010-06-01 13:31:08 +00:00
Dane Springmeyer	33145b18ae	fix default initializations in markers_symbolizer	2010-05-30 16:09:39 +00:00
Dane Springmeyer	89f6b32b76	apply patch from Herm from #553 adding support for markers_symbolizer to Cairo renderer, new placement finder, and fill/spacing/overlap options - works nicely with new svg support being tested against markers_symbolizer	2010-05-30 03:16:51 +00:00
Dane Springmeyer	c9a4433666	make sure to return marker from cache, as noticed by Herm and mentioned in #553	2010-05-30 03:09:22 +00:00
Artem Pavlenko	f1986d1b85	+ remove expat deps ... + correct includes	2010-05-28 16:34:58 +00:00
Artem Pavlenko	83c0f1ca59	+ remove agg_svg_parser	2010-05-28 16:34:45 +00:00
Artem Pavlenko	a15e86e528	+ add libxml2 based svg parser implementation	2010-05-28 16:34:34 +00:00
Artem Pavlenko	6a5ea3f1a1	+ SVG markers rendering	2010-05-27 14:21:31 +00:00
Artem Pavlenko	bb0ae08280	+ marker_cache impl	2010-05-27 11:41:02 +00:00
Artem Pavlenko	823b7ba0fc	+ SVG markers initial import	2010-05-27 11:19:09 +00:00
Artem Pavlenko	4584b05ff0	+ small correction	2010-05-27 11:18:53 +00:00
Artem Pavlenko	e6e165f1e0	+ use path-like geometries	2010-05-27 10:20:41 +00:00
Artem Pavlenko	cbf1356e4d	+ parse 'orientation' parameter	2010-05-27 10:20:10 +00:00
Artem Pavlenko	2085b3bc08	+ apply orientation from text_symbolizer ... + fix building symbolizer	2010-05-27 10:20:03 +00:00
Artem Pavlenko	258a62616e	+ implement rotated text logic in placement finder	2010-05-27 10:19:47 +00:00
Artem Pavlenko	77c31e8643	+ add orientation parameter ... orientation="<expr>" e.g orientation="10+35" -> rotate by 45 degrees anti-clockwise (TODO: consider using standard SVG transform!)	2010-05-27 10:19:39 +00:00
Alberto Valverde	38e1570b8b	added a max_value attribute to color_band to handle the case of the last band more gracefully	2010-05-06 07:21:11 +00:00
Dane Springmeyer	a688c36fdb	serialize the experimental MarkersSymbolizer and avoid serializing defaults of GlyphSymbolizer unless requested	2010-04-15 21:42:28 +00:00
Dane Springmeyer	63ab05c112	ensure proper setting of allow_overlap and opacity when contructing a point_symbolizer without an image file	2010-04-15 06:09:21 +00:00
Artem Pavlenko	c20f16358c	+ save PolygobSymbolizer properties as attributes	2010-04-09 18:47:27 +00:00
Artem Pavlenko	23aac57a1f	+ use attributes instead of CssParameter	2010-04-09 18:47:19 +00:00
Artem Pavlenko	f776f8cd1e	+ add dash_offset	2010-04-09 18:46:41 +00:00
Artem Pavlenko	ca20f80ea8	+ use attributes for LineSymbolizer properties	2010-04-09 18:46:33 +00:00
Artem Pavlenko	5fcc311764	+ add stroke-dashoffset property ... + replace <CssParameter name='xxx'>yyy</CssParameter> element with 'xxx'=yyy attribute	2010-04-09 18:46:25 +00:00
Artem Pavlenko	5890f17df3	+ directly ctor default mapnik::color to avoid css color parsing	2010-03-24 18:02:10 +00:00
Artem Pavlenko	1a2b320252	+ sanitize header inclusion a bit	2010-03-24 18:01:53 +00:00
Alberto Valverde	c79865586b	added an angle_mode attribute to GlyphSymbolizer to define the way the angle expression should be interpreted: as an azimuth or as a trigonometric angle	2010-03-22 11:21:17 +00:00
Alberto Valverde	a613dc6397	Created python binding to memory_datasource which can be added Features built programaticcaly. See tests for sample use until docs are done. #528 is almost closed.	2010-03-19 16:16:15 +00:00
Alberto Valverde	2e04c5422a	fixed serialization of expressions in glyph_symbolizer	2010-03-19 11:20:16 +00:00
Alberto Valverde	2d601f1bd7	fixed color's to_string method since alpha seems to no longer be parsed as a double. serializing a color to xml and deserializing it back did not work before	2010-03-19 11:20:00 +00:00
Alberto Valverde	aea5dd563a	XML de/serialization for glyph_symbolizer. Some issues remain regarding unicode expr	2010-03-19 11:19:43 +00:00
Alberto Valverde	1e2ffb22b7	cairo rendering for the glyph_symbolizer. Small refactoring in cairo_context::add_text to pass the paramaters which were picked up from the text_symbolizer param (size, fill, halo_radius and halo_fill) explicitly. This allows the glyph_symbolizer to piggy back on that functionality without specilizing add_text() for the glyph_symbolizer (which would have involved heavy amounts of copy+paste or a more elaborate refactoring strategy. Please ping me if this was not a good idea	2010-03-19 09:33:57 +00:00
Alberto Valverde	e91c41e494	removed unneeded parenthesis	2010-03-19 09:33:41 +00:00
Alberto Valverde	f5409000f3	cosmetic changes and comments	2010-03-19 09:33:25 +00:00
Alberto Valverde	d098c98c5e	pre-eliminary GlyphSymbolizer implementation. TODO: XML de/serializing. more tests. remove workaround mentioned in test	2010-03-18 20:05:08 +00:00
Alberto Valverde	31c3d20e43	modified the old arrow_symbolizer interface on glyph_symbolizer and documented it	2010-03-18 20:04:51 +00:00
Alberto Valverde	fc3a1beeef	initial skeleton of glyph_symbolizer (coarsely ported from arrow_symbolizer). Mapnik compiles but symbolizer does nothing useful yet and is going to be heavily modified to make use of expressions to be general enough to be usable for purposes other than rendering arrows representing vector direction/intensity	2010-03-18 20:04:35 +00:00
Artem Pavlenko	e7bfba10fe	+ enanble installation of mapnik2 side by side with mapnik	2010-03-17 21:03:02 +00:00
Artem Pavlenko	83b20c3036	Revert "re factor expression grammar/parser stuff" ... This reverts commit c58b8c4f71813a2490cf135573009c92be1a90c4.	2010-03-15 21:08:56 +00:00
Artem Pavlenko	0f8deb5e73	re factor expression grammar/parser stuff	2010-03-15 21:08:46 +00:00
Dane Springmeyer	d7256295ae	port r1680/r1683/r1690 from 0.7.1-dev branch to trunk	2010-03-12 18:23:06 +00:00
Alberto Valverde	e9748abc5f	xml de/serialization support for RasterColorizer	2010-03-12 14:49:50 +00:00
Alberto Valverde	807881c47a	XML deserialization support for a raster_symbolizer with a colorizer	2010-03-12 14:49:34 +00:00
Alberto Valverde	2f1d60b666	pre-eliminary raster coloring support	2010-03-12 13:34:13 +00:00
Dane Springmeyer	6b76b3b9e8	properly serialize the map_buffer when saving map	2010-03-11 23:21:22 +00:00
Dane Springmeyer	3a44dd3258	+ use rint(v) instead of int(round(v)) + add rint implementation - msvc hasn't got one + minor cleanups	2010-03-11 23:19:12 +00:00
Artem Pavlenko	c3a0b1a72f	+ revert to a024c947499994e1e8aaaff2b8ea73a8eec489dd	2010-03-08 11:55:15 +00:00
Dane Springmeyer	b8511eca65	restore default behavior of PointSymbolizer when used without an image, by defaulting to 4x4 black pixel - TODO - expose colors, shapes, and size for this in the future	2010-03-03 03:26:12 +00:00
Dane Springmeyer	b540dab73b	apply slighly modified (env->box2d) mapnik-trunk.mr.raster-position2.diff from mar_rud to close #475	2010-03-03 03:23:53 +00:00
Dane Springmeyer	dd36810321	print warning if images are not found	2010-03-02 03:31:50 +00:00
Dane Springmeyer	07186fc6bb	ensure shapeindex links against boost system if available (boost >=1.35) to avoid potential problems in indirect linking on linux (essentially directly dynamically linking like we previously only did on os x) - closes #517	2010-02-21 01:00:09 +00:00
Dane Springmeyer	e03c997024	assume byteorder arrives in native arch (from postgis), and therefore ensure byteswapping for wkb on big endian systems - closes #515 - TODO check breakage in other plugins as per #516 - thanks Brad Simpson for the report and fix	2010-02-19 07:50:47 +00:00
Dane Springmeyer	2cd0b55e88	enforce default gamma function - improves upon #428, closes #512	2010-02-09 17:28:17 +00:00
Dane Springmeyer	c3ea59c3c8	don't pass expression_ptr as const	2010-02-03 18:36:01 +00:00
Artem Pavlenko	05f5473924	+ correct image bonding box calculation ... + check for zero sized images	2010-02-03 12:19:49 +00:00
Dane Springmeyer	ede29a1aff	image 'type' is not longer needed or used so don't attempt to parse from XML	2010-02-01 21:32:09 +00:00
Dane Springmeyer	1af24f1eb8	Serialize FontSet instead of font_set as that is what the loader expects	2010-02-01 21:31:14 +00:00
Dane Springmeyer	c950e38a46	reenamble python access to TextSymbolizer 'name' expression	2010-01-30 03:08:03 +00:00
Dane Springmeyer	d599067a14	restore pretty printing of xml output (indent=4) now that we are using the new boost ptree which changed its defaults	2010-01-30 02:05:01 +00:00
Dane Springmeyer	aef4d350be	repair serialization of XML filters and Text/ShieldSymbolizer 'name' attribute, which are how properly converted from expressions into strings	2010-01-30 00:47:06 +00:00
Dane Springmeyer	b1660b2152	fix formatting	2010-01-30 00:44:35 +00:00
Dane Springmeyer	da8ddb09ab	gah, use the version header that actually exists for older versions of icu	2010-01-29 19:40:26 +00:00
Dane Springmeyer	05654f18bc	quick fix to allow compiling without unicode regex support to enable builds against ICU <4.2	2010-01-29 19:22:15 +00:00
Dane Springmeyer	9b69f65ea9	add backwards compatibility support to the expressions parser so that the TextSymbolizer and ShieldSymbolizer 'name' parameter (and others in the future) syntax is understood as pre-0.8.0 syntax, while printing a deprecation warning - should allow older stylesheets to be used with Mapnik 0.8.0 - addresses #501	2010-01-26 23:03:42 +00:00
Dane Springmeyer	52d08e7d1a	restore reading of paths relative to xml as default=true, print xml filename when errors are encountered, and remove unneeded check for pointsymbolizer file type which is now automatically handled in parse_path()	2010-01-26 22:54:03 +00:00
Dane Springmeyer	0fbd46a045	report the map/xml name when an error is encountered when loading a map	2010-01-25 19:10:01 +00:00
Dane Springmeyer	6115a1590d	add 'gamma' attribute to PolygonSymbolizer, along with tests against simplified world borders shapefile - setting gamma to .5-.7 can remove gaps in processed_p.shp depending on background color - closes #428	2010-01-13 00:31:45 +00:00
Dane Springmeyer	067fdb884d	sync trunk with new cairo support added previously to 0.7 branch in r1531	2010-01-11 18:55:30 +00:00
Dane Springmeyer	e5673e239b	increment ABI versions	2010-01-11 18:53:50 +00:00
Dane Springmeyer	f87790cd5b	merge a few small 0.7 branch changes back into trunk	2010-01-11 00:36:51 +00:00
Dane Springmeyer	6abbfca492	fix default values for vertical_alignment in the TextSymbolizer and ShieldSymbolizer - closes #468	2010-01-07 02:21:07 +00:00
Dane Springmeyer	9750e6cd24	fix memory leak in load_map when using libxml2 by freeing the libxml tree as per http://xmlsoft.org/xmlmem.html - closes #473 - thanks mishok13 for the detailed report and testing	2010-01-01 22:41:43 +00:00
Artem Pavlenko	47dc1e197b	+ merge mapnik2 to trunk	2009-12-16 20:02:06 +00:00
Dane Springmeyer	5e2e6a76ad	apply fixes from David Eastcott originally applied to 0.7 branch	2009-12-13 23:30:36 +00:00
Dane Springmeyer	bd0a1ee08f	cherry pick one more changeset from mapnik2 into trunk	2009-12-07 06:43:02 +00:00
Dane Springmeyer	c01d1d0c69	integrate a few changes from mapnik2 branch - making sure to pass strings by const ref + formatting	2009-12-07 04:15:17 +00:00
Dane Springmeyer	fe3ffe6c2d	rename map.save_map_string to map.save_map_to_string	2009-12-06 22:33:47 +00:00
Dane Springmeyer	d0b4db9ba3	add support for relative paths for entities when using libxml2 and loading xml from string - thanks dodobas for the initial patch	2009-12-06 22:18:45 +00:00
Dane Springmeyer	0e18aa63cd	add feature to Map node to allow for throwing a friendly error if the map styles use features not supported by the installed mapnik version - thanks Ldp for the review - closes #395	2009-12-05 03:58:48 +00:00
Dane Springmeyer	b104253d9c	Add ability to link to custom icu lib name, and remove the unneeded linking to icudata on osx, while offering compiler flags required for compiling against libicucore provided by Apple	2009-11-24 20:32:41 +00:00
Dane Springmeyer	75d67f4b43	only serialize non-default values for layers as well as styles	2009-11-16 00:04:47 +00:00
Dane Springmeyer	b89f468eaf	add support for using CDATA with libxml2 parser. New tests for filters work nicely - TODO add datasource tests for CDATA in sql 'table' param	2009-11-11 23:37:57 +00:00
Artem Pavlenko	d2f3e669b0	* correct operator= implementation	2009-11-08 10:35:36 +00:00
Dane Springmeyer	4df684c50e	PointSymbolizer serialization was missing 'opacity' and 'allow_overlap'	2009-11-06 20:56:34 +00:00
Artem Pavlenko	a3a5859466	Patch from David Eastcott : ... 1. Modified Text Symbolizer a) corrected line fragment centering (for 2nd and subsequent lines, when line breaks occur). b) adjusted vertical alignment calculation so that: i) middle -> has the center of the text line(s) at the point origin ii) bottom -> has the text line(s) below the point origin iii) top -> has the text line(s) above the point origin c) added new text_symbolizer attribute: 'wrap_before', value range: true/false, default == false allows line breaks at first wrap_char before wrap_width as an alternative to the original which was to create the line break at the first wrap_char after wrap_width d) added new text_symbolizer attribute: 'horizontal_alignment', value range: left/middle/right, default == middle i) left -> has all text line(s) to left of the point origin ii) middle -> has all text line(s) centered on the the point origin iii) right -> has all text line(s) to the right of the point origin NOTE: dx, dy position adjustments are applied after alignments and before Justify. e) added new text_symbolizer attribute: 'justify_alignment', value range: left/middle/right, default == middle i) left -> after alignments, has all text line(s) are left justified (left to right reading) ii) middle -> after alignments, has all text line(s) center justified iii) right -> after alignments, has all text line(s) right justified (right to left reading) f) added new text_symbolizer attribute: 'opacity', value range: 0.0 thru 1.0; 1.0 == fully opaque g) modified positioning to compensate for both line_spacing and character_spacing, to ensure proper centering of the text envelope. Also ensure that centering occurs correctly even if no wrapping occurs. Line spacing is uniform and consistent and compensates for errors between text_size and the actual size (ci.height is inconsistent, depending on case and character); fixes issue with multi-line text where some lines have a slight gap and others are compressed together. 2. Modified shield_symbolizer a) added the attributes: i) allow_overlap ii) vertical_alignment iii) horizontal_alignment iv) justify_alignment v) wrap_width vi) wrap_character vii) wrap_before viii) text_convert ix) line_spacing x) character_spacing xi) opacity b) added new shield_symbolizer attribute: 'unlock_image', value range: true/false, default == false i) false == image and text placement behaviour same as before ii) true == image placement independant of text, image is always centered at geometry point, text placed per attributes, dx/dy only affect text. Allows user to create point markers with text, but both the text and image rendering collision detection are done as a pair (they come and go together - solves problem if using point_symbolizer and text_symbolizers where one or the other are omitted due to overlaps, but not both) c) extended choices for the attribute 'placement' to include vertex; effect is limited to the shield_symbolizer Allows an attempted placement at every vertex available, gives additional shield placement volume when using line geometry d) ensured that the text placement was not updating the detector unless a shield image was actually placed. e) added new shield_symbolizer attribute: 'no_text', value range: true/false, default = false When set true, the text for the feature is ignored ('space' subsituted) so that pure graphic symbols can be used and no text is rendered over top of them.	2009-10-19 13:52:53 +00:00
Dane Springmeyer	5fccc3ae62	improve formatting of error message during xml loading if document is not well formed	2009-09-28 17:35:50 +00:00
Dane Springmeyer	d9d15bb081	avoid segfault when pickling a TextSymbolizer using wrap_character by removing const declaration	2009-09-25 20:29:03 +00:00
Dane Springmeyer	767afe3f76	scons: pull exact libagg name out of env['LIBS'], since on debian we are actually needing to link to 'libagg_pic'	2009-08-28 15:44:06 +00:00
Dane Springmeyer	0519584644	scons: make sure to still link to libagg even if internal lib is not used - need because before r1196 we were not filtering out libs	2009-08-27 23:18:09 +00:00
Dane Springmeyer	5c184a5075	load_map: improve formatting of error message within layer	2009-08-27 04:48:32 +00:00
Dane Springmeyer	e897b832a4	+reflect new text symbolizer options added in r1254 - closes #391	2009-08-17 22:54:50 +00:00
Dane Springmeyer	e7dd9094a5	revert unintended file changes from r1275	2009-07-26 01:15:44 +00:00
Dane Springmeyer	45266074c8	scons: fix typo, and ensure all temp output is writeable	2009-07-26 01:08:51 +00:00
Dane Springmeyer	8850d19bfc	in load_map, fix type declaration for dx,dy as double	2009-07-24 07:24:36 +00:00
Dane Springmeyer	286ad12c47	add method to save a map to a string (closes #396)	2009-07-24 06:15:58 +00:00
Dane Springmeyer	e0c9e5c826	add missing serialization of building symbolizer height, be explicit of double in polygon_symbolizer	2009-07-24 06:10:42 +00:00
Artem Pavlenko	85ecc33d7f	+ applied patch from Jochen Topf : ... * text_convert="none|toupper|tolower" Convert all text to upper/lower case before rendering. "none" doesn't do anything with the text and is the default. Works for labels along lines or at points. * line_spacing="<number>" Add this many pixels space between two lines in text labels that have been broken into several lines. Default is 0. Doesn't do anything for labels along lines. * character_spacing="<number>" Add this many pixels space between two characters in a text. Default is 0. Currently only works for text labels on point geometries. This should also be implemented for labels along lines, but I'll leave that for another day. * wrap_character="<character>" Instead of breaking text into lines on spaces, use this character. This is useful, when you want to make sure that labels are broken at the right spot. Note that you'll probably want to make wrap_width small so that your lines are actually broken, otherwise you'll see the wrap_character in the output. Default is ' ' (space). Doesn't do anything for labels along lines.	2009-07-20 15:30:19 +00:00
Artem Pavlenko	cba404058e	+ formatting	2009-07-13 22:36:16 +00:00
Dane Springmeyer	817720e1c5	increment ABI version numbers	2009-07-09 01:16:52 +00:00
Dane Springmeyer	f8559c07b6	remove unneeded header	2009-07-08 23:01:36 +00:00
Artem Pavlenko	6e993fb388	+ added <iostream> header	2009-07-08 21:26:40 +00:00
Artem Pavlenko	5d193947ae	+ avoid implicit conversion by passing expected types to read_intxx_{ndr,xdr} ... ( msvc compiler generates an error otherwise )	2009-07-08 20:52:22 +00:00
Artem Pavlenko	ae96fffee0	+ use MAPNIK_BIG_ENDIAN ... + support for reading int16_t + allow compiling shape.input with or without memory mapped files support ( define SHAPE_MEMORY_MAPPED_FILE to enable)	2009-07-07 23:56:01 +00:00
Dane Springmeyer	e26e46788a	better formatting of error when plugin lib can't be loaded	2009-07-07 23:44:12 +00:00
Artem Pavlenko	a6075c97b5	+ fixed read_coord method	2009-07-07 19:00:55 +00:00
Artem Pavlenko	d20a2de459	+ move byte order depended I/O to global.hpp ... this should fix shape.input PPC issues	2009-07-03 13:29:50 +00:00
Artem Pavlenko	8d820d4761	+ use boost::scoped_ptr	2009-07-03 09:25:18 +00:00
Dane Springmeyer	1ce6266738	more robust cairo lib addition - addresses #371	2009-06-30 22:12:11 +00:00
Dane Springmeyer	40adc2c03f	limit linking to libmapnik by selectively specifying libraries - closes #371	2009-06-30 21:58:05 +00:00
Artem Pavlenko	186236cba6	+ replace 'long long' with int64_t	2009-06-29 14:15:31 +00:00
Artem Pavlenko	71786bff63	+ applied patch 'avoid_edges' from albertov, thanks!	2009-06-25 20:06:01 +00:00
Dane Springmeyer	eed058f034	fix scope issue in previous commit	2009-06-22 07:19:02 +00:00
Dane Springmeyer	14ef2b36f0	expose list of registered plugins as a 'plugin_names()' method of DatasourceCache similar to the FontEngine.face_names() - closes #246	2009-06-22 06:59:56 +00:00
Dane Springmeyer	7eb01c0be4	+make cairo compilation conditional on CFLAG (as well as Scons) like bindings/python/python_cairo.cpp	2009-06-08 19:43:49 +00:00
Dane Springmeyer	bc463c2a75	use BOOST_BIG_ENDIAN instead of WORDS_BIGENDIAN	2009-06-08 07:08:30 +00:00
Dane Springmeyer	e7aff375db	std namespacing	2009-06-03 05:26:46 +00:00
Dane Springmeyer	07597bc594	fix interpretation of SheildSymbolizer displacement values as doubles in load_map.cpp- closes #353	2009-06-01 02:13:32 +00:00
Dane Springmeyer	8d6c5dac6b	fix interpretation of TextSymbolizer displacement values as doubles in load_map.cpp- closes #353	2009-06-01 02:11:07 +00:00
Dane Springmeyer	e7457a139a	+add pickle support to text_symbolizer, improve support for stroke, and add tests for stroke and text pickling via python - see: #345	2009-05-26 01:50:58 +00:00
Dane Springmeyer	dadd64519b	+add pickle support for proj_transform and view/coord_transform - see #345	2009-05-24 06:31:32 +00:00
Dane Springmeyer	7d9ac2a094	add missing include	2009-05-19 22:59:56 +00:00
Dane Springmeyer	fd98a4a49a	shuffle guess_type to image_utils for logical re-use	2009-05-19 22:43:54 +00:00
Dane Springmeyer	13fa57e61f	expose setting of symbolizer_with_image filename	2009-05-14 22:54:36 +00:00
Dane Springmeyer	6c8a5f805a	xml: make sure to explicitly declare the default relative_paths option as true - thanks Ldp	2009-05-06 23:42:28 +00:00
Dane Springmeyer	404a43f5f0	+ensure relative paths to symbols and datasources in xml are based on working directory of xml file, added 'paths_from_xml' parameter that is true by default but can be made false to maintain previous behavior - closes #326 (has no effect on load_map_from_string)	2009-05-01 01:59:01 +00:00
Lucio Asnaghi	eaa49ca028	+ applying patch proposed by dane that add explicit_defaults selection when saving maps (closes #327)	2009-04-28 21:44:34 +00:00
Lucio Asnaghi	158989fc56	+ fix text_symbolizer support for vertical_alignment in save_map() (closes #328)	2009-04-28 21:23:43 +00:00
Dane Springmeyer	4226f293b2	Add ABI info to os x dylib - closes #322	2009-04-26 04:28:00 +00:00
Dane Springmeyer	3dd616007d	Add FULL_LIB_PATH option for OS X to link in the full path to libmapnik.dylib in the library itself	2009-04-26 03:33:29 +00:00
Dane Springmeyer	b46996ff8b	catch error and raise UserWarning if an input plugin cannot be found during load_map() - closes #302	2009-04-13 23:22:00 +00:00
Artem Pavlenko	d100cb7587	+ this change was needed to avoid raster tiles alignment problems ... TODO: Review raster handling pipeline to ensure correct alignments across all sources.	2009-04-10 12:07:13 +00:00
Dane Springmeyer	544cbb249a	Apply patch from Marcin to handle smooth transitions between raster layers for both gdal and raster plugin - closed #295	2009-04-07 23:06:51 +00:00
Dane Springmeyer	4276ae24fe	allow customization of JPEG output image quality using syntax similar to png256, but using 0-100 as suffix, e.g. render_to_file(m,'image.jpeg','jpeg80') - closes #198 - patch from Dennis Luxen	2009-04-07 15:48:51 +00:00
Andreas Volz	42d659a19f	compile utils with autotools	2009-04-04 16:33:25 +00:00
Artem Pavlenko	4a3a9128ec	+ move compositing modes implementation out of Image class	2009-03-31 10:08:33 +00:00
Artem Pavlenko	0b20e2a768	+ removed specializations for text renderer	2009-03-31 09:23:23 +00:00
Dane Springmeyer	5d976513b8	scons: remove print statement of PREFIX introduced in r1043	2009-03-30 23:32:36 +00:00
Artem Pavlenko	10f55a678b	+ add support for vertical_alignment (text_symbolizer) ... valid values are : top, middle, bottom default to middle which can now center multi-line text	2009-03-30 20:47:26 +00:00
Artem Pavlenko	2eec236fc2	+ applied "hill shading" patch from Marcin Rudowski ... a) Raster opacity b) Raster merging modes (TODO:add more modes, consider agg impl) c) Raster scaling algos: fast,bilinear,bilinear8 (TODO: add alpha support in bilinear8) d) improvements to png256 *Great work, thanks!*	2009-03-29 11:05:20 +00:00
Artem Pavlenko	ae568d3223	make text_symbolizer behave like shield_symbolizer	2009-03-29 09:46:02 +00:00
Artem Pavlenko	e598348e56	+ only allow LINE_PLACEMENT for geometries with more than one point	2009-03-29 09:37:51 +00:00
Andreas Volz	cab469eefb	- added new et input plugin ... - add missing files to plugins Makefile.am - split debugging and tracing - documentation	2009-03-22 22:26:42 +00:00
Artem Pavlenko	570fe611f4	+ qualify 'value' to avoid names clashing ... + use _enumeration helper wrapper	2009-03-21 12:39:06 +00:00
Artem Pavlenko	fb186a5269	disable libtiff warning handler	2009-03-15 23:32:36 +00:00
Lucio Asnaghi	556095af04	- sqlite.input: added row_offset and row_limit to parameters ... - sqlite.input: added wkb_format parameter for selecting WKB format (generic/spatialite) - sqlite.input: commented check of the spatial index - wkb.hpp: removed wkqSQLite in favour of wkbSpatiaLite	2009-02-23 15:00:25 +00:00
Andreas Volz	3c1b67ccd4	missed color class	2009-02-18 22:54:51 +00:00
Andreas Volz	1dc3aae33e	profiling	2009-02-18 22:25:02 +00:00
Artem Pavlenko	56b15031d0	+ support load_map_string for all xml parsers	2009-02-18 00:33:26 +00:00
Artem Pavlenko	97a40d7e7e	+ fix msvc-9.0 compiler warnings	2009-02-17 23:19:28 +00:00
Dane Springmeyer	b90f620901	+ inherit libmapnik ABI version from environment (now calculated in SConstruct)	2009-02-17 20:32:46 +00:00
Jon Burgess	5a216d01b5	Read spacing parameter on ShieldSymbolizer from XML	2009-02-16 21:45:32 +00:00
Jon Burgess	d1b365098f	Includes png.h early to avoid ordering issues with setjmp.h. Fixes #231	2009-02-15 11:56:54 +00:00
Lucio Asnaghi	2c81706eb5	Following #223: ... + improvements to the wkb converter + improved sqlite index usage + added more parameters to sqlite datasource	2009-02-10 19:09:16 +00:00
Artem Pavlenko	7d2f492ef2	+ sqlite-input-plugin.patch (kunitoki) ... + wkb-sqlite.patch (kunitoki) + very preliminary spatial index support (idx_<tablename>_<geometry_field>)	2009-02-09 19:43:57 +00:00
Jon Burgess	79c350678a	The final line_to is not required in the WKB reader since the last and first points of the polygon geometry will be the same	2009-02-07 23:43:53 +00:00
Jon Burgess	d11654895b	Utilise color alpha information when rendering. Multiplies the color alpha with the rendering opacity. Fixes 221.	2009-02-07 14:09:23 +00:00
Tom Hughes	220bb3e99a	Revert the patch to add a show_page flag to the cairo renderer and ... replace it with support for rendering to a cairo context rather than a cairo surface. When rendering to a surface a show_page is done, when rendering to a context it is not so that multiple renders can be done, possibly with modified scaling and/or translation.	2009-02-06 00:46:29 +00:00
Dane Springmeyer	51293f64ba	+ apply show_page.patch (thanks Berteun) (closes #201)	2009-02-05 18:09:14 +00:00
Artem Pavlenko	a45e93b79a	+ more property goodness on the TextSymbolizer from Python (springmeyer)	2009-02-05 11:54:07 +00:00
Artem Pavlenko	e27a71cc39	+ mapnik_text_overlap.patch (Marcin Rudowski)	2009-02-02 23:37:16 +00:00
Artem Pavlenko	866f5f98eb	+ implement buffered_extent method on Map object	2009-02-02 23:07:18 +00:00
Artem Pavlenko	fbb102b975	+ changed operator* and operator/ behaviour as per #206	2009-02-01 12:15:30 +00:00
Artem Pavlenko	f657a2dfe4	+ Alpha background patch for Cairo (Berteun)	2009-01-29 15:27:27 +00:00
Dane Springmeyer	f5127d6ee4	Remove reference to CAIRO_HAS_IMAGE_SURFACE macro since this is not supported until cairo 1.8 release	2009-01-28 21:11:10 +00:00
Artem Pavlenko	6f98c95c1f	+ mapnik-fix-cairo-polygon-patterns.patch (jonb)	2009-01-24 18:02:33 +00:00
Artem Pavlenko	78f10770ec	mapnik-polygon-symbolizer-wants-fill-opacity.patch (jonb) ... The save_map & load_map disagree about the name of the CSS parameter for the opacity in PolygonSymbolizer. Make them consistent changing save_map to output fill-opacity.	2009-01-21 15:41:44 +00:00
Artem Pavlenko	6c0977099d	+ mapnik-use-rgba-in-color-to-string.patch (jonb) ... Make color::to_string() generate appropriate rgb() or rgba() strings depending on alpha() value. It also changes the alpha range to be 0.0-1.0, not 0-255.	2009-01-21 15:37:55 +00:00
Artem Pavlenko	5b5eb9d2ee	+ support building with < 1.34 (e.g. 1.33.1) boost libraries	2009-01-19 22:53:05 +00:00
Artem Pavlenko	8b298729bf	+ mapnik-centralise-image-tostring-functions.patch (jonb) ... (moves Image.tostring() to core c++ code)	2009-01-19 22:51:55 +00:00
Artem Pavlenko	97ad49c067	+ mapnik-load-map-checks.patch (jonb) ... This patch adds more reporting of unknown elements during parsing. This helps catch some typos etc. It also consistently skips <xmlcomment>'s which used to cause errors when used in some places.	2009-01-17 23:53:04 +00:00
Artem Pavlenko	bf598cf487	+ mapnik-check-fonts-during-load-map.patch from jonb ... This patch adds some extra exceptions for missing fontsets. Without this checking, you only notice the error at rendering time when it first needs to render a missing font. It also cleans up the font exception messages which were displaying the font name twice. Some minor questions: * Should I wrap the fontset exceptions with if(strict_)? * Should strict default to true?	2009-01-17 20:52:24 +00:00
Artem Pavlenko	387ff213ef	+ mapnik-serialize-fontset.patch from jonb ... This adds the fontset support into save_xml - Adds fontset_name into the text attributes - Adds the fontset definitions - glue to read fontsets from map	2009-01-17 20:18:41 +00:00
Artem Pavlenko	cad0a839b6	+ mapnik-load-map-from-string.patch (jonb)	2009-01-15 23:51:07 +00:00
Artem Pavlenko	32d21d7c80	+ use fully qualified names from stl	2009-01-15 23:12:56 +00:00
Artem Pavlenko	e3658a7a1a	+ applied mapnik-image32-from-cairo.patch (jonb)	2009-01-15 22:51:12 +00:00
Artem Pavlenko	fe20652629	+ removed unused parameter from has_point_placement	2009-01-14 12:34:56 +00:00
Artem Pavlenko	a07767ef3d	+ (c++) renamed mapnik::Color to mapnik::color ... + (c++) added mapnik::color ctor from named colours (TODO: consider not to export color_factory) + (Python) fixed pickling + (Python) added to_hex_string method	2009-01-14 12:10:24 +00:00
Dane Springmeyer	689b1eb018	Made Scale Denominator available as a property of the Map	2009-01-14 06:12:55 +00:00
Artem Pavlenko	54f4d3bc51	+ corrected init order	2009-01-13 01:35:27 +00:00
Artem Pavlenko	a11cc119e4	+ applied intersection patch from randomjunk - #127	2009-01-13 00:35:45 +00:00
Dane Springmeyer	a97bbb52af	Avoid serialization of maxzoom if value is infinity (default)	2009-01-11 20:09:32 +00:00
Dane Springmeyer	68e784dfdd	+ add load_map() and save_map() support for reading and writing of abstract, title, minzoom, maxzoom, and queryable attributes	2009-01-11 18:55:29 +00:00
Artem Pavlenko	8c81b688a2	+ don't link to iconv on OSX	2008-12-07 16:27:06 +00:00
Artem Pavlenko	65ea5bca98	+ applied mapnik-skip-projection-if-equal.patch (jonb)	2008-12-07 16:23:57 +00:00
Artem Pavlenko	7cbb0ab35a	+ added support for 'min_distance' for 'POINT' label placement.	2008-11-21 12:48:19 +00:00
Artem Pavlenko	6062f42bbe	+ applied patch avoid_extent from rcoup	2008-11-19 21:50:12 +00:00
Artem Pavlenko	190f8e5cb9	+ return boost::optional in find_style (c++) ... + return feature_type_style by value, raise KeyError otherwise (Python)	2008-11-18 21:15:46 +00:00
Tom Hughes	9408a41a5c	Add opacity support to the point symbolizer - taken from r743 which ... added the same support to the agg renderer.	2008-10-31 00:51:41 +00:00
Tom Hughes	9d6a7f1075	Port shield placement enhancements from r741 and r745 from the agg ... renderer to the cairo renderer. Should close #136.	2008-10-31 00:39:22 +00:00
Artem Pavlenko	df8cfcab03	+ fixed building with boost-1_36 ... + corrected order of BOOST_TOOLKIT (create symlinks on OSX + boost-1_35)	2008-10-08 06:30:38 +00:00
Artem Pavlenko	11100cf30e	+ apply has_dimensions for line_placement only	2008-09-21 10:42:51 +00:00
Artem Pavlenko	20f3a9460d	+ expose buffer_size parameter (default 0) ... influences envelope used by placement detector ( i.e. 'avoid_edges' parameter)	2008-09-21 10:14:38 +00:00
Artem Pavlenko	565da55742	+ point symbolizer opacity patch from Brian (openstreetmap@brian.quinion.co.uk)	2008-09-19 08:27:32 +00:00
Artem Pavlenko	3b85ebad9b	make shield_symbolizer to work with point geometries (TODO!!)	2008-09-15 08:48:21 +00:00
Dominic Hargreaves	2d6bdf0a4d	Add missing #include to fix GNU/kFreeBSD build	2008-08-09 22:16:58 +00:00
Andreas Volz	bd2b9e2ea0	- add new files ... - optional check for gdal	2008-08-02 20:39:26 +00:00
Tom Hughes	7d173be190	Add support for font sets on shield sumbolizers.	2008-07-29 23:21:39 +00:00
Tom Hughes	6472af9289	Add an INTERNAL_LIBAGG build option that can be used to make mapnik ... build against the system libagg instead of mapnik's copy.	2008-07-29 18:35:27 +00:00
Tom Hughes	dd9435f50c	Fix compiler warnings.	2008-07-29 18:06:15 +00:00
Tom Hughes	791874a859	Improve alignment of wrapped text. ... Patch from Jon Burgess <jburgess777@googlemail.com>.	2008-07-27 11:12:32 +00:00
Tom Hughes	7e137e3ad7	Remove unused variable. ... Patch from Jon Burgess <jburgess777@googlemail.com>.	2008-07-27 11:08:02 +00:00
Tom Hughes	5432c8a7d0	Make sure we set the height of the string if it doesn't contain ... any spaces where we could break the line. Patch from Jon Burgess <jburgess777@googlemail.com>.	2008-07-27 11:07:12 +00:00
Tom Hughes	779a0e67b2	Make the cairo renderer build again, with font fallback support now.	2008-07-25 23:26:02 +00:00
Tom Hughes	026e4e71e7	Refactor some of the font set stuff so that the cairo renderer can be ... made to work again.	2008-07-25 00:23:33 +00:00
Tom Hughes	dc34115e21	Commit missing font_set.cpp file. Closes #100.	2008-07-24 22:57:40 +00:00
Artem Pavlenko	48d7d639f9	added missing avoid_edges parameter	2008-06-30 16:05:25 +00:00
Artem Pavlenko	376cdeb453	applied aspect ratio patch from Frederik Ramm	2008-06-29 10:59:28 +00:00
Artem Pavlenko	1b47afde07	applied font fallback patch from Beau Gunderson	2008-06-29 10:58:48 +00:00
Artem Pavlenko	3f9127b5d0	reverting back to 700	2008-06-29 10:58:29 +00:00
Artem Pavlenko	c7cbfa5c82	reverting back to 700	2008-06-29 10:56:29 +00:00
Artem Pavlenko	3275cf9ce6	applied font fallbacj patch from Beau Gunderson	2008-06-29 10:40:08 +00:00
Andreas Volz	81ce983d5f	link against boost and version bump	2008-06-12 20:35:52 +00:00
Tom Hughes	25c831378f	Don't clip coordinates to 16 bits if we're using cairo 1.6 as it is no ... longer limited to 16 bit coordinates.	2008-04-20 11:30:10 +00:00
Tom Hughes	0e6237270e	Remove unused ifdefs.	2008-04-20 10:45:59 +00:00
Tom Hughes	889f36b8df	Enable clipping for cairo 1.6.0 and later.	2008-04-19 23:22:03 +00:00
Tom Hughes	4483d59797	Revert previous fix for #89 and add a new improved fix that enhances the ... value class to have a proper null type and do comparisions SQL style so that null is neither equal nor not equal to other things.	2008-04-12 15:22:27 +00:00
Tom Hughes	a27bde741e	Don't try and render text if the attribute containing the text does ... not exist for the feature. Closes #89.	2008-04-11 23:11:35 +00:00
Andreas Volz	e29743d933	- updated autotools build files ... - build now osm plugin automatic if libxml2 is used - moved osm/Makefile to osm/Makefile.example because if name collision -> better move the example to another directory later - optional CAIRO support - changed libxml2 switch comment	2008-04-06 18:13:13 +00:00
Artem Pavlenko	ab29b03833	reverting r681	2008-04-06 09:23:17 +00:00
Dominic Hargreaves	e128d51534	Patch to disallow placement if segment_length=0 from jonb (fixes #86)	2008-03-29 20:02:16 +00:00
Artem Pavlenko	7bcba5f1be	applied http://snecker.fedorapeople.org/mapnik/devel/gcc43-warnings.patch from Christopher Brown	2008-03-26 09:56:17 +00:00
Artem Pavlenko	bb9290be8a	fixed line_pattern_symbolizer transformations	2008-03-17 22:04:22 +00:00
Tom Hughes	2f67c036fe	Make cairo components conditional on the relevant libaries etc existing.	2008-03-12 19:14:51 +00:00
Artem Pavlenko	e1ea0a72db	use range based 'parse' method ... transcode strings in filter expressions (default to utf8 input) -- we can use map definition *.xml to define encoding -- and in case of Python from # -*- coding: utf-8 -*- utf8 encoded filters are working now.	2008-02-26 11:43:49 +00:00
Artem Pavlenko	cb905b533a	restored templated version	2008-02-26 08:48:47 +00:00
Tom Hughes	02962156c5	Add support for rendering to a cairo surface.	2008-02-23 00:17:53 +00:00
Artem Pavlenko	f3a3ce04db	convert to degrees if projection is geographic	2008-02-20 12:44:34 +00:00
Artem Pavlenko	b54aa9091b	removed unneeded headers	2008-02-19 11:27:06 +00:00
Artem Pavlenko	308e315432	added Unicode support based on ICU	2008-02-18 21:40:34 +00:00
Artem Pavlenko	1ea7bffd4c	pass parameter by reference ... store reference to wstring in text_path	2008-02-12 20:05:04 +00:00
Artem Pavlenko	01f4984804	don't fail if file can not be open	2008-02-12 20:03:04 +00:00
Andreas Volz	ba5c156c45	fixed autotools build	2008-02-08 19:41:57 +00:00
Dave	a3652c6e66	Return old label_position_tolerance=0 behaviour. ... - Place within 1/2 of spacing rather than 1/3.	2008-02-06 20:38:54 +00:00
Artem Pavlenko	1b03c81e84	hide implementation details	2008-02-05 13:58:47 +00:00
Artem Pavlenko	b44762e592	allow multi/single threaded variants	2008-02-04 16:12:13 +00:00
Artem Pavlenko	f4949ffca5	patch from TomH adds a global mutex to protect all access to the ... proj4 library and ensure that only one thread can be inside a call to the library at a time.	2008-02-04 11:54:07 +00:00
Dave	6b2285f237	Fix placing 1 character line labels.	2008-01-28 21:41:53 +00:00
Artem Pavlenko	3c5b7f02f3	applied freebsd patch from Beau Gunderson	2008-01-28 14:51:10 +00:00
Artem Pavlenko	a9348db058	part of previous commit	2008-01-25 14:42:13 +00:00
Artem Pavlenko	651cdbe968	added support for saving images into Python String object ... (NOTE: some methods have different signitures now- API changed)	2008-01-25 14:40:48 +00:00
Dave	5bbe90b85f	Remove find_placements, build_path_follow, build_path_horizontal. ... Add new find_point_placements to cover the gap left. Change shield symbolizer to use find_point_placements. Results are the same as before, but with much less duplicate code.	2008-01-24 01:16:14 +00:00
Dave	f11a62b849	throw an exception rather than exit the program when an unknown font is specified. ... It would be better if this was done when contructing the text_symbolizer, but this will do.	2008-01-23 21:56:04 +00:00
Dave	a73687aeee	Woops, remove debug output.	2008-01-23 21:39:49 +00:00
Dave	1d556b54fd	Make line placement retry if it places >= 50% of the characters upside down.	2008-01-23 21:38:48 +00:00
Dave	671c215ae6	Make specifying an invalid font a fatal error. ticket #31	2008-01-23 20:31:50 +00:00
Artem Pavlenko	f802250e0f	refactored image i/o , see ticket #15 for more details.	2008-01-23 11:34:59 +00:00
Dave	918bd1ef6b	Improved character placement code. ... Slightly changes the result of max_char_angle_delta as now character angles aren't strict against the line angles. Example screenshots on mailing list! :)	2008-01-23 04:18:17 +00:00
Artem Pavlenko	2b60d6d425	applied patch to build on OSX Leopard and Sun's C++ compiler on Solaris from Justin Bronn	2008-01-21 20:15:07 +00:00
Artem Pavlenko	2fe6e6a0cb	link to iconv on Darwin	2008-01-21 16:40:50 +00:00
Artem Pavlenko	a61553edb8	removed redundant bounding box from label_placement	2008-01-21 16:18:46 +00:00
Dave	d3ec70aff9	Return pre-r557 rendering of line aligned labels. (Not the code, the algorithm ideas) ... Spacing and no spacing line rendering are done by the same function. Code is cleaner, performance should be equal or improved. Text displacement is "Different", better in some cases and worse in others, I can revert it if wanted. Old non spacing code is not yet removed as it is used by ShieldSymbolizer which I haven't investigated yet. Individual character placement still has issues, that is my next task to fix!	2008-01-21 03:08:18 +00:00
Dave	e96e7b18fa	Fix find_placements_with_spacing in relation to http://trac.mapnik.org/ticket/62 ... force_odd_labels also works again.	2008-01-16 01:13:27 +00:00
Dave	a401a26ccb	Additional comments for the placement finder.	2008-01-15 22:32:14 +00:00
Dave	017a966ea1	Fix blending onto transparent background. Detailed on mailing list.	2008-01-14 20:43:55 +00:00
Artem Pavlenko	30968b337e	only print to clog when MAPNIK_DEBUG is defined	2008-01-11 10:09:54 +00:00
Artem Pavlenko	16f481fc27	applied mapniksoname.patch from Martjin	2008-01-03 12:16:27 +00:00
Artem Pavlenko	0390f129a1	refactored transcoder stuff	2008-01-03 11:41:00 +00:00
Artem Pavlenko	0c7b9e3736	setup install_name (soname on Darwin) for libmapnik	2007-12-31 12:34:31 +00:00
Artem Pavlenko	52bed0b89a	applied patch from Jochen (throw an exception if unknown type)	2007-12-19 16:34:36 +00:00
Artem Pavlenko	37f49e29cc	Applied patches from Martijn van Oosterhout: ... 1. The first allows the user to add a <FileSource name="foo">/home/bar/baz/</FileSource> to the beginning of the file and then in any of the symbolisers you can say: <FooSymboliser base="foo" name="bridge"> It it will refer to the file /home/bar/baz/bridge. 2. The second allows you to create Datasource templates at the top level, which can be used later in the actual layers like so: <Map> <Datasource name="db"> <Paramaeter name="host">/tmp</Parameter> </Datasource> <Layer name="lay"> <Datasource base="db"> <Parameter name="table">points</Parameter> </Datasource> </Layer> </Map> And the host parameter will be used in the layer. 3. The third adds the "base" parameter to the raster and shape input plugins. All it does is specify a path to prefix to the filename prior to using it. Together with the above feature it allows things like: <Map> <Datasource name="shapes"> <Paramaeter name="base">/home/foo/shapes</Parameter> </Datasource> <Layer name="lay"> <Datasource base="shapes"> <Parameter name="file">places</Parameter> </Datasource> </Layer> </Map> And it will use the shapefile /home/foo/shapes/places	2007-12-17 14:21:04 +00:00
Artem Pavlenko	002f37bdc9	corrected parameters order	2007-12-17 12:46:11 +00:00
Artem Pavlenko	58f4431df1	support for palette based PNGs, user 'png256' as a format parameter (see updated rundemo.py)	2007-12-10 19:59:17 +00:00
Artem Pavlenko	4586586448	added convinence overloads for 'save_to_file' and 'render_to_file' ... Example: >>> from mapnik import * >>> im = Image(200,200) >> save_to_file('test.png',im) # Guess image type from file extension >> save_to_file('test.png,'jpeg',im) # Explicitly save as JPEG	2007-12-06 12:14:29 +00:00
Artem Pavlenko	27f88c9ec0	small fix	2007-12-06 10:59:28 +00:00
Artem Pavlenko	c5bca5ab96	removed unused variables to calm msvc toolset	2007-11-08 21:11:12 +00:00
Artem Pavlenko	c0d411d14e	small cleanup	2007-11-07 14:07:12 +00:00
Artem Pavlenko	6eadaafd49	use 'avoid_edges' parameter for point placement	2007-11-06 09:07:18 +00:00
Artem Pavlenko	01de9d9e8c	1. revived 'avoid_edges' option ... 2. fixed 'placement_finder' extent in agg_renderer.cpp 3. added 'avoid_edges' to map loader	2007-11-05 10:32:01 +00:00
Artem Pavlenko	ce6985aaad	use 'contains' instead of 'intersects' test to provide 'avoid_edges' functionality. ... (Should 'avoid_edges' be always enabled ???)	2007-11-05 09:15:53 +00:00
Artem Pavlenko	8d51cb421b	1. re-factored placement_finder to be more efficient. 'find_*' methods are templated on PathType. ... 2. PostGIS plug-in - optional 'multiple_geometries' parameter to control how Multi* geometries built. 3. MarkersSymbolizer (work in progress) to render vector shapes (markers) alonh a path with collision detection.	2007-11-02 12:50:15 +00:00
David	2cf8278f1d	Generic python binding for mapnik::enumeration	2007-10-19 22:17:16 +00:00
Artem Pavlenko	b40706c295	1. templated save_as_png and save_as_jpeg ... 2. use std::iostream for I/O in save_to_file TODO: allow writing an output image to memory buffer (i.e Python StringIO)	2007-10-17 14:47:56 +00:00
David	bc54b150ea	- reversed header include order	2007-10-08 17:42:41 +00:00
Artem Pavlenko	d1a345a3d2	1.don't share FT_Library object between threads (TODO : implement freetype_engine pool) ... 2. merged changes with latest load_map	2007-10-05 11:27:00 +00:00
Andreas Volz	f0cca52c3b	optional build with libxml2	2007-10-02 21:43:13 +00:00
David	b2df387a9d	- merged strict-xml-branch r530:532 to trunk: ... - libxml2 support - strict error handling while parsing XML map files - implemented save_map() - removed some duplicate defaults - all symbolizers with icons share a common base class now	2007-09-25 18:47:12 +00:00
Artem Pavlenko	8e071f84c7	1. Changed internal geometry representation (explicit support for multi geometries) ... (FIXME : label_spacing is still, too slow!!) 2. Re-use some agg objects. 3. placement_finder cleanups! 4. Added support for 'building_symbolizer' - extruded polygons	2007-09-16 11:23:51 +00:00
Andreas Volz	d38dedad68	+ added GNU autotools build environment ... + raster and gdal input isn't tested. Not working currently... + *-input.so plugins created. Change loader in source or link plugin to correct place + use pkg-config uninstalled feature -> define project root to PKG_CONFIG_PATH to use mapnik without installation + added various library checks + don't install fonts + don't use included AGG -> check for a installed libagg + Added Makefile for c++ demo + don't build any python wrapper stuff -> this follows if all other building works + added Anjuta file -> not needed to build anything, but helps much if you use Anjuta	2007-09-14 23:07:16 +00:00
Artem Pavlenko	beebee468b	fixed is_datasource_plugin predicate	2007-08-28 10:19:48 +00:00
Artem Pavlenko	7f3bbace30	check if file ends with '.input' before attempting to load it	2007-08-15 17:23:45 +00:00
Artem Pavlenko	80566ea1ba	added accesor to styles	2007-08-07 12:02:24 +00:00
Artem Pavlenko	a53fbf2ca3	applied patch that makes sure names of vertical roads are ... rendered in a consistent direction (from Cameron Patrick)	2007-08-01 10:57:27 +00:00
Artem Pavlenko	d959701d5a	1. added boost::optional<T> to/form Python converter ... 2. make background color optional (Map object) 3. exposed 'blend' method for Image object	2007-08-01 09:59:23 +00:00
Artem Pavlenko	8eac22911a	applied mapnik_line_displacement patch from Cameron Patrick	2007-07-26 21:09:40 +00:00
Artem Pavlenko	7c8a9f3075	added support for min_distance in shield/text symbolizer	2007-07-25 14:36:08 +00:00
vspader	9fe4a94c98	Added minimum_distance property to text symbolizers. This prevents the same label from appearing within N pixels (across features). ... Shield symbolizer is now a subclass of text symbolizer. Some small improvements to text rendering. Fixed up placement finder for horizontal placement. Cleaned up placement finder.	2007-07-02 13:39:08 +00:00
vspader	560de0b9b1	Fix so labels stay within the road.	2007-06-21 15:29:47 +00:00
Artem Pavlenko	f3ae318ca3	1. added 'allow_overlap' in load_map from xml ... 2. added overlap_ field to TextSymbolizer (ignored by renderer at the moment)	2007-06-20 21:08:23 +00:00
Artem Pavlenko	8010d5433f	1. Removed srid from geometry class ... 2. Pass resolution to bbox query 3. Use variant<int,double,string> as parameter value e.g in Python: ds = Raster(file="/path/to/file",lox = 12312.4,.....) Added extractor facility to work with mapnik::parameter (C++): mapnik::parameters params; params["parameter0"] = 123.456; params["parameter1"] = "123.456"; // initialize with string extract double later boost::optional<double> val0 = params.get<double>("parameter0"); if (val0) { std::cout << *val0; } // with default value. NOTE: there is no 'parameter2' in params boost::optional<double> val2 = params.get<double>("parameter2",654.321); std::cout << * val2; // 4. Added Gdal factory method in __init__.py ds = Gdal(file="/tmp/file.tiff")	2007-06-12 08:59:54 +00:00
Artem Pavlenko	15e73b98f4	small formatting	2007-06-05 09:10:40 +00:00
Artem Pavlenko	d3d40234c9	share collision detector between labels and text.	2007-05-12 11:34:55 +00:00
Artem Pavlenko	a6a31f42f6	implelmented optional 'clear' text labels cache at the layer level	2007-05-01 07:53:20 +00:00
Artem Pavlenko	cacea81bce	1. check if plug-ins path is a directory ... 2. wrap dynamic loading into try/catch to play nicer on win32	2007-04-25 08:59:57 +00:00
Artem Pavlenko	5daa49ff41	forward declare ltdl stuff	2007-03-22 10:55:43 +00:00
Artem Pavlenko	e0d243dcec	1.Added support for building on Darwin (Xcode 2.4.1, gcc4.0.1). ... Mainly taming gcc4.0.1 (anonymous enum bug) 2.Input plug-ins now have .input extension on all platforms	2007-03-16 10:11:37 +00:00
Artem Pavlenko	4cc771546d	small cleanup	2007-02-25 10:54:36 +00:00
Artem Pavlenko	2d256166b4	Store text attributes as USC-2 encoded std::wstring	2007-02-14 19:54:39 +00:00
Artem Pavlenko	d024c86b1b	Restored support for the text displacement (point placement only at moment)	2007-02-09 16:32:44 +00:00
Artem Pavlenko	e016bd61f8	Added transcoder based on iconv. Internally we use UCS-2 at the moment. ... * Postgis plug-in determines encoding by querying 'client_encoding' parameter (libpq). * Shapfiles (dbf!) don't store character encoding information. Users can apply 'encoding' parameter at datasource creation stage (defaults to Latin1 (ISO-8859-1)) * Raster plug-in utf-8	2007-02-06 14:27:21 +00:00
Artem Pavlenko	085f832a77	in query_point method expect (x,y) in Map coordinate system	2007-01-16 15:18:25 +00:00
Artem Pavlenko	199f3f6c12	include Layer instead of forward declaration	2007-01-11 17:19:51 +00:00
Artem Pavlenko	85f4bfc697	added queryable property and visible method to Layer (Python)	2007-01-09 11:23:19 +00:00
Artem Pavlenko	bb035bdc54	don't project query point if host projection is geographic	2006-12-31 11:42:57 +00:00
Artem Pavlenko	4772a16eb6	boost/filesystem.hpp is not in boost 1.33.1 ... reverted to <boost/filesystem/operations.hpp>	2006-12-30 21:48:15 +00:00
Artem Pavlenko	37ebe481c9	1. is_regular is not supported in boost 1.33.* ... 2. cleanups	2006-12-21 22:51:53 +00:00
Artem Pavlenko	b5cf9da686	1.added more accessors ... 2.in tiff_reader check for valid file prior opening.	2006-12-20 00:22:45 +00:00
Artem Pavlenko	77854e7d76	use PNG_MMX_CODE_SUPPORTED instead of PNG_ASSEMBLER_CODE_SUPPORTED (mmx.patch from Dominic Hargreaves)	2006-12-18 10:27:09 +00:00
Artem Pavlenko	31442b6bac	Added DESTDIR option which is used as an additional prefix for the purposes of ... installing files. It is useful for binary distributions (eg RPM etc). Thanks to Dominic Hargreaves!	2006-12-17 12:05:47 +00:00
Artem Pavlenko	c7c4659e30	check if featureset is valid before passing to filter_featureset	2006-12-07 15:02:08 +00:00
Artem Pavlenko	05424a5f12	added query_point method that accepts lat,lon coordinates : ... >>> for f in m.query_point([ layer.name for layer in m.layers ].index('world'),51,0): ... print f ... feature ( f_code:FA001 fac_id:193 id:3147 na2:UK na3:E nam:ENGLAND tile_id:10 ) >>>	2006-12-06 21:21:17 +00:00
Artem Pavlenko	af44541598	implemented query_map_point method on map object: ... fs = m.query_map_point(x,y) # Map (screen) coordinates for feature in fs: print feature TODO: provide interface to feature in Python, at the moment only __str__ implemented which dumps attributes	2006-12-06 20:26:59 +00:00
Artem Pavlenko	dcfe5d3fad	oops, fixed	2006-12-05 13:15:43 +00:00
Artem Pavlenko	00fd2a9f00	1. placement_finder.cpp ... fixed 'for' loops to work correctly when geom->num_points() < 2 always use prefix increment even for built-in types (good practice!) e.g ++i 2. agg_renderer.cpp check for number points in geometries when applying text/shield_symbolizer.	2006-12-05 00:16:05 +00:00
Artem Pavlenko	a688c06035	added support for PolygonPatternSymbolizer	2006-12-04 11:36:39 +00:00
Artem Pavlenko	bbab2d90bf	fixed png reader bug : ... fill alpha channel with 0xff on expansion	2006-12-01 15:23:19 +00:00
Artem Pavlenko	c6ee7ce438	trim strings at data source level	2006-12-01 10:37:15 +00:00
Artem Pavlenko	4d4e9f5d91	Tiling patch from Toby allows for a selected pixel region within an extent ... to be rendered. This allows for a large extent (larger than can be rendered into a single image in memory) to be rendered out as tiles. Since the full extent is used for the placement calculations text crossing tile boundaries will be consistent. This method is a little inefficient when a large number of labels need placed, an improved method would be to cache these placements between tiles, but the attached is a start. c++ users should simple call the render method with a start X and Y coordinate specified, for (int TileX = 0;TileX < 5;++TileX) { for(int TileY = 0;TileY < 5; ++TileY) { int TileSize=250; int StartX = TileX*TileSize; int StartY = TileY*TileSize; Image32 buf(TileSize,TileSize); agg_renderer<Image32> ren(m,buf,StartX,StartY); ren.apply(); char name[324]; sprintf(name,"tile_%d_%d.png",TileX,TileY); ImageUtils::save_to_file(name,"png",buf); } } python users should call render_tile_to_file for y in range(tile_count_y): for x in range(tile_count_x): if not os.path.exists("tiles/%d/%d/" % (map_scale, y)): os.makedirs("tiles/%d/%d/" % (map_scale, y)) render_tile_to_file(m, x*tile_size, y*tile_size, tile_size, tile_size, 'tiles/%d/%d/%d.png' % (map_scale,y,x), 'png')	2006-12-01 09:37:37 +00:00
Artem Pavlenko	8c374a22a6	Label position tolerance and text spacing patch from David Leaver. Thanks!	2006-11-29 10:44:42 +00:00
Artem Pavlenko	6b88293808	use 2*M_PI for max_char_angle_delta normalizing.	2006-11-28 22:24:24 +00:00
Artem Pavlenko	7ee890bc12	define M_PI if undef	2006-11-28 10:38:56 +00:00
Artem Pavlenko	6fd7d3e488	use libpng native alloc/dealloc ... (/valgrind-new-delete2.patch from Jon Burgess)	2006-11-28 00:13:31 +00:00
Artem Pavlenko	f1393cc019	1. hit_test implementation for geometry objects: ... bool hit_test(double x, double y, double tol); 2. added image_view(unsigned x, unsigned y, unsigned width, unsigned height) allowing to select region from image data e.g (in Python): im = Image(2048,2048) view = im.view(0,0,256,256) save_to_file(filename,type, view) 3. changed envelope method to return vy value in datasource classes 4. features_at_point impl for shape and postgis plug-ins	2006-11-25 11:02:59 +00:00
vspader	a6994cfc45	Fixed up text placement. ... Removed the patch for better cornering from r365, since it wasn't working properly.	2006-11-22 22:09:11 +00:00
Artem Pavlenko	1c5eeb19af	added basic support for unicode string	2006-11-22 22:01:37 +00:00
Artem Pavlenko	ebdd0f6030	disable clog printing in release mode. Pass -DMAPNIK_DEBUG to enable.	2006-11-19 17:13:33 +00:00
Artem Pavlenko	004f720fbd	commented out usage of rasterizer_outline_aa for strokes <= 1.0	2006-11-18 16:47:29 +00:00
vspader	d7b94f5d8c	Added avoid_edges property to shield and text symbolizers. ... If this is enabled, no shield/text symbolizers will be cut off at the edges of the image.	2006-11-17 14:07:41 +00:00
Artem Pavlenko	81fbe706a6	fixed scale_denomitator	2006-11-17 02:01:21 +00:00
Artem Pavlenko	bf297ec3ca	1.upgrade to latest agg2.4 ... 2.added default PointSymbolizer in load_map.cpp	2006-11-09 23:44:34 +00:00
Artem Pavlenko	e7bab0b8c8	1. fixed vertical alignement (??) ... 2. initialize overlap_ in ctor	2006-11-08 20:58:40 +00:00
Artem Pavlenko	889ac41694	Patch from Toby: adds a maximum angle delta for text placement (if the ... angle changes too much between characters it finds an alternate placement), this is specified in the max_char_angle_delta property in radians (feel free to change it to degrees). It also improves the text placement around corners trying to minimise the distance between the center of the character and the line on each side. This is the major portion of the patch.	2006-11-04 10:38:24 +00:00
Artem Pavlenko	e924b597f4	1. patch from Toby that allows repeated labels to be placed on a line ... geometry (such as roads) 2. restored text labels for point geometry. 3. process 'spacing' attribute in load_map.cpp	2006-11-01 23:17:05 +00:00
Artem Pavlenko	d7fcefc848	1. applied text-wrap patch from Robert Coup. Thanks! ... 2. by default use tinyxml as a property_tree parser 3. modified load_map.cpp to allow to test new features	2006-10-27 17:29:39 +00:00
Artem Pavlenko	c091289ffa	added extra check to compile on x86_64 Gentoo. ... && defined(PNG_ASSEMBLER_CODE_SUPPORTED) Thanks to Vincent Schut!	2006-10-26 20:23:12 +00:00
Artem Pavlenko	62a0fb5f89	support for ShieldSymbolizer and LinePatternSymbolizer tags	2006-10-26 20:20:41 +00:00
Artem Pavlenko	a3817cc362	added missing projection transformation for label placement. ... TODO: move to geometry class to always return transformed label position	2006-10-21 12:16:19 +00:00
vspader	118e8f0d52	Added face_name parameter to text and shield symbolizers, ... which specifies the font face to be used for rendering. New constructor is: text_symbolizer(name, face_name, size, ...)	2006-10-19 17:11:45 +00:00
Artem Pavlenko	7cae55f73f	* trim leading and trailing whitespace from all strings before ... rendering them as labels when using the text or shield symbolisers (blame my horrible datasets) * correctly recognise the Postgis "text" data type (it was in postgisfs.cpp just not postgis.cpp) - my initial workaround to the above was "SELECT trim(from label) AS label ..." which failed miserably because it returned a text data type. Thanks to Robert Coup for the patch!	2006-10-19 09:24:26 +00:00
Artem Pavlenko	69bde0b206	added scale_denominator calc + great-circle distance ... (needs checking with different projections)	2006-10-18 22:44:37 +00:00
Artem Pavlenko	110016fe78	1. refactored proj stuff into separate files ... 2. added is_geographic property 3. added basic support for text_symbolizer in load_map	2006-10-17 17:26:35 +00:00
vspader	f76079f15b	1) Added line following labels. Use set_label_placement(POINT_PLACEMENT) or set_label_placement(LINE_PLACEMENT) on a text symbolizer. ... 2) Added placement_finder class so labels try to avoid each other. 3) Added Shield Symbolizer which is essentially a combined image/text symbolizer.	2006-10-17 14:12:53 +00:00
Artem Pavlenko	bb235fa316	1.added projection transformation support based on proj4 (new dependency!!!) ... Map and Layer objects both have a new parameter 'srs', initialized to "+proj=latlong +datum=WGS84" by default. Basic usage (Python): p = Projection("+proj=merc +datum=WGS84") point = p.forward(Coord(-2,51)) ... 2.reflected arithmetic operators for Envelope/Coord into Python 3.altered return policies for python objects 4.modified build system to require proj4 lib and headers	2006-10-16 13:44:52 +00:00
Artem Pavlenko	1988181bd7	added operators +,-,*,/	2006-10-16 13:31:52 +00:00
Artem Pavlenko	72e296945f	added <ElseFilter/> tag support in map loader.	2006-10-09 20:49:56 +00:00
Artem Pavlenko	9cc2237290	in remove_all clear all styles as well!	2006-10-09 10:29:57 +00:00
Artem Pavlenko	e2d645ad80	simplified coord transformation interface.	2006-10-09 09:52:15 +00:00
Artem Pavlenko	b2ce94166b	added remove_all	2006-10-09 09:43:09 +00:00
Artem Pavlenko	c8042c959f	removed boost::foreach.hpp	2006-10-04 18:54:27 +00:00
Artem Pavlenko	a71c36ec2e	BOOST_FOREACH is not released yet, revert to std::const_iterator	2006-10-04 13:57:08 +00:00
Artem Pavlenko	992af4747d	1. move include to mapnik/include ... 2. update demos,bibdibgs etc.	2006-10-04 11:22:18 +00:00
Artem Pavlenko	c1cce2742f	added missing header	2006-10-03 10:04:28 +00:00
Artem Pavlenko	0c32c2bf4a	update build system to include map_{load,save}	2006-10-03 10:03:31 +00:00
Artem Pavlenko	8328424af5	1. datasource is now a property of Layer object. ... 2. modified python/c++ demos to reflect the above. 3. removed large 'blobby' mapnik.hpp (compilation times!!!)	2006-10-03 08:44:04 +00:00
Artem Pavlenko	88892c196b	added save/load functionality based on boost::property_tree (aka ElementTree in c++)	2006-10-03 08:39:43 +00:00
Artem Pavlenko	c0fa1a6004	* create_filter moved to core lib ... * modified demo/c++/rundemo.cpp to reflect the above	2006-09-17 19:45:01 +00:00
Artem Pavlenko	2f360a6549	1.removed map width/height from query interface ... 2.small cleanups	2006-09-12 14:29:22 +00:00
Artem Pavlenko	31d04c3131	added support for building on x86_64 platform e.g. /usr/lib64 etc.	2006-09-06 09:14:41 +00:00
Artem Pavlenko	26a406706e	wrap C headers with : ... extern "C" { // }	2006-08-31 21:32:07 +00:00
Artem Pavlenko	4ae66cef36	small cleanup	2006-08-23 20:34:24 +00:00
Artem Pavlenko	72fae1daa1	1. removed dependency on boost_serialization ( we don't really need it) at this time. ... 2. coord and envelope operator<< to use 16 digit precision. 3. added 'inside polygon' method impl.	2006-08-20 18:49:22 +00:00
Artem Pavlenko	0bb121a747	formatting mostly	2006-07-24 20:08:32 +00:00
Artem Pavlenko	1cacabdc2b	corrected operator=	2006-05-30 21:59:47 +00:00
Artem Pavlenko	ffe47e4816	1. return shared_ptr from point_symbolizer ... 2. small cleanup	2006-05-26 13:11:31 +00:00
Artem Pavlenko	10b7debd72	oops..layer.cpp got broken by mistake, reverting back.	2006-05-24 22:15:04 +00:00
Artem Pavlenko	b73ca350fb	added const Style iterators to Map	2006-05-23 17:23:20 +00:00
Artem Pavlenko	d0ddc88253	1. move parameters to datasource ... 2. general cleanup	2006-05-23 16:52:10 +00:00
Jean-Francois Doyon	799d5d9691	- Fix a bug with missing version. ... - Add support for layer title and asbtract to c++ and python - Make WMS server use above changes, edit docs	2006-05-22 17:00:35 +00:00
Artem Pavlenko	ef5931d915	added default point_symbolizer 4x4px black square	2006-05-22 10:30:55 +00:00
Artem Pavlenko	f59a949464	replaced tabs with spaces	2006-05-19 16:09:32 +00:00
Artem Pavlenko	d3a8570a78	added set_name method	2006-05-19 16:07:13 +00:00
Jean-Francois Doyon	4705e9526e	Oops, that previous problem was from local modifications, setting everything back to normal. ... Sorry!	2006-05-03 23:56:47 +00:00
Jean-Francois Doyon	5775a9be0e	Switched from <fstream.h> to <fstream> as per the warning the compiler gave me, and the C++ standard.	2006-05-03 23:46:32 +00:00
Artem Pavlenko	62019e0849	small cleanup	2006-04-22 19:37:59 +00:00
Artem Pavlenko	cdc48edfd6	1. validate image reader ... 2. open files in binary mode (win32)	2006-04-05 08:27:45 +00:00
Artem Pavlenko	61fd258fd1	changing licence from GPL to LGPL	2006-03-31 10:32:02 +00:00
Artem Pavlenko	ead91700c2	small optimization	2006-03-31 08:55:35 +00:00
Artem Pavlenko	bb606d04f5	added non-const getLayer	2006-03-28 15:39:38 +00:00
Artem Pavlenko	8986108775	added set_datasource method (TODO!!!) ... fixed pointz in shapeindex	2006-03-28 08:29:36 +00:00
Artem Pavlenko	fce4076ad5	refactored font engine to export symbols correctly on win32	2006-03-23 11:54:50 +00:00
Artem Pavlenko	ddaa9b5368	removed unused static gamma member	2006-03-22 15:57:12 +00:00
Artem Pavlenko	f69ac02a65	removed unused files	2006-03-22 15:53:38 +00:00
Artem Pavlenko	3848515e6e	removed unused files	2006-03-22 15:48:54 +00:00
Artem Pavlenko	e21c3b36f6	removed save and load to text archive functionality to keep x86_64 build happy	2006-03-19 21:59:16 +00:00
Artem Pavlenko	673bd4bc19	replaced cout and cerr with clog (by default redirected to cerr)	2006-03-19 21:53:47 +00:00
Artem Pavlenko	e8d68b615e	removed unused text.{hpp,cpp}	2006-03-19 21:51:40 +00:00
Artem Pavlenko	89cad86d8e	added anchor and displacement to text_symbolizer	2006-03-10 12:08:55 +00:00
Artem Pavlenko	cba1063346	fixed label bbox calc	2006-03-08 23:03:19 +00:00
Artem Pavlenko	0f3fcc7f34	updated text symboilizer ... fixed memory leak in FT_Glyph	2006-03-01 15:16:45 +00:00
Artem Pavlenko	3818da6bc5	added quad_tree implementaion	2006-02-27 21:25:25 +00:00
Jean-Francois Doyon	34dc842d2d	Reworked all the svn:ignore properties. They are all set explicitely now, and nothing should be left unacounted for. ... Changed SConstruct to use freetype-config. Updated INSTALL to reflect. Added a RAM requirement for building in the INSTALL doc. Fixed some python styling and added some basic docstrings.	2006-02-26 21:47:35 +00:00
Artem Pavlenko	9de253198b	1.python bindings updated to reflect symbolizers changes ... 2.added label collision detector ( TODO - proper impl!)	2006-02-25 11:03:30 +00:00
Artem Pavlenko	1728bdbc7e	added: ... 1. start/end map/layer handlers 2. some cleanups	2006-02-21 20:17:08 +00:00
Artem Pavlenko	bd173527a0	added font_engine impl - work in progress:)	2006-02-21 19:55:24 +00:00
Artem Pavlenko	9f8460fb0b	changed headers order to keep boost::serialization (1_33_0) happy! (trunk)	2006-02-13 20:28:21 +00:00
Artem Pavlenko	e3c1365043	some line rendering fixes and optimizations	2006-02-11 00:39:50 +00:00
Artem Pavlenko	aed5516197	1. new feature model - based on boost::property_map concept ... f = feature(id); f["name"] = "what is my name?"; boost.put(f,"area",123123.4325); 2. simplified and corrected value class and operators 3. updated input plug-ins to work with new features 4. add text_symbolizer (getting there:) 5. template version of agg_renderer 6. attribute_collector how accepts rules (to collect attribute names for text labels)	2006-02-10 17:13:02 +00:00
Artem Pavlenko	6a4070a32a	added raster_symbolizer	2006-02-07 16:16:54 +00:00
Artem Pavlenko	af2601eea0	1. new style/feature processor abstraction allowing plugable backends. ... (to construct custom 'Output' derive from feature_style_processor (CRTP) e.g class MyOutput : public feature_style_processor<MyOutput> and implement: process(***_symbolizer const&, Feature const&) methods At the moment only AGG renderer is implemented	2006-02-07 14:41:41 +00:00
Artem Pavlenko	2a858bcd19	1.removed named_style_cache ... 2.styles moved to Map object	2006-02-05 09:45:51 +00:00
Artem Pavlenko	d8dc53bcf4	new build system	2006-01-31 23:09:52 +00:00
Artem Pavlenko	c97fb0bf57	added check for num_points in line/polygon symbolizers: ... 1. don't bother with line_symbolizer unless at least 2 points 2. at least 3 points for polygon_symbolizer	2006-01-31 17:35:18 +00:00
Artem Pavlenko	6b7d874ff3	1.corrected set_rectangle and set_rectangle_alpha to use envelope intersection for proper clipping ... 2. clean up render.cpp	2006-01-28 16:05:51 +00:00
Artem Pavlenko	0875208c5b	some minor changes (+fast line rendering needs fixing clipping)	2006-01-26 16:46:56 +00:00
Artem Pavlenko	db433452b6	switched on optimization in png writing code	2006-01-26 16:44:46 +00:00
Artem Pavlenko	b89195f9e6	added label_position method for geometry objects (todo line_string)	2006-01-26 16:43:10 +00:00
Artem Pavlenko	a6f96ea5c1	changed symbolizer interface to accept 'feature' and CoordTransform, instead of ... geometry (feature centric OGC model:).	2006-01-23 22:33:37 +00:00
Artem Pavlenko	245be985e2	1.symbolizers refactored - split into hpp/cpp ... (all AGG is private to libmapnik and not exposed to client code) 2.removed unused files (more todo) 3.added line pattern symbolizer to python bindings	2006-01-23 13:24:41 +00:00
Artem Pavlenko	390b9c4655	1.added line pattern symbolizer ... 2.added layer envelope check in main rendering loop	2006-01-23 10:33:32 +00:00
Artem Pavlenko	119c352fe7	added alpha blending for image copying	2006-01-01 17:41:55 +00:00
Artem Pavlenko	955ff4c4f5	1. fixed shape datasource bug - attributes were ignored for point/pointz/pointm types ... 2. use boost::thread for mutex/lock 3 use boost::noncopyable 4 build agg as a shared lib for now 5. corrected panning code in map.cpp 6. improved coord_transform	2005-12-23 12:31:54 +00:00
Artem Pavlenko	ec9b301364	removed unused headers	2005-12-16 16:08:41 +00:00
Artem Pavlenko	3814396eea	removed erroneous break statement (was added to render OS MasterMap)	2005-12-14 20:33:14 +00:00
Artem Pavlenko	6f9528c2e3	1.added serialization support ... 2.some class names changes	2005-12-14 17:01:09 +00:00
Artem Pavlenko	a6191fade0	1. corrected LIBS in SConsctipt files ... 2. use boost::shared_ptr instead of ref_ptr	2005-12-12 13:15:33 +00:00
Artem Pavlenko	2d08614042	return object in envelope()	2005-12-01 10:06:40 +00:00
Artem Pavlenko	aaba4d08cf	check datasource in envelope method	2005-11-30 00:24:08 +00:00
Artem Pavlenko	7f4df91371	check for valid datasource in the main loop	2005-11-30 00:21:07 +00:00
Artem Pavlenko	01f9df9b43	added feature factory	2005-11-24 15:51:29 +00:00
Artem Pavlenko	70f79a3e19	fixed path portability issue	2005-09-09 09:38:37 +00:00
Artem Pavlenko	e9fff475be	try to dlopen any file in datasources dir	2005-09-08 13:52:42 +00:00
Artem Pavlenko	f5dda2f207	1. more pythonic feel:) ... 2. added CSS color string parser and color factory 3. added docs dir	2005-09-08 13:20:37 +00:00
Artem Pavlenko	820b6bb23a	return ref_ptr<Feature> from datasource next() method ... should play better with python	2005-09-08 13:09:04 +00:00
Artem Pavlenko	03467ac96e	removed unused color.cpp	2005-09-08 13:05:39 +00:00
Artem Pavlenko	c946127bba	removed unused color.cpp	2005-09-08 13:04:36 +00:00
Artem Pavlenko	b20007b440	gcc4.0.1 doesn't like volatile locals?	2005-08-31 19:30:54 +00:00
Artem Pavlenko	c7f9d1e568	1.polygon_symbolizer + using agg rasterrizer ... 2.render.cpp - exit rules loop (mastermap styles-?? not sure) 3.pre-allocate space for attributes	2005-06-24 08:39:47 +00:00
Artem Pavlenko	32c76d5a5f	1.added copyright notice to SConstruct/SConscript files ... 2.fixed include/libs in datasources 3.revived shapeindex utility (+ boost::program_options)	2005-06-17 12:40:51 +00:00
Artem Pavlenko	a8ec856a15	initial import	2005-06-14 15:06:59 +00:00