Artem Pavlenko
9b61c0effe
Merge remote-tracking branch 'origin/master'
...
Conflicts:
deps/agg/include/agg_pixfmt_rgba.h
include/mapnik/image_compositing.hpp
src/cairo_renderer.cpp
src/image_compositing.cpp
2012-06-18 14:36:15 -04:00
Artem Pavlenko
c71944bf32
+ use HSV color space (as in GIMP)
...
+ rename 'luminosity' to 'value'
2012-06-18 14:30:01 -04:00
Tom MacWright
f6c10bbb7e
Add color_spin composite operation.
2012-06-18 11:10:04 -04:00
Artem Pavlenko
dc89f6fac4
Merge remote-tracking branch 'origin/master'
2012-06-17 15:21:27 -04:00
Artem Pavlenko
14d365d572
+ hue, saturation, color and luminosity blending modes (HSL based)
...
(http://en.wikipedia.org/wiki/Blend_modes#Hue.2C_saturation_and_luminosity )
2012-06-17 15:19:29 -04:00
Artem Pavlenko
6281dec04b
+ add missing headers
2012-06-17 15:16:13 -04:00
Dane Springmeyer
998bf593ef
svg parsing: support empty paths and avoid leaking file descriptors in the case of invalid paths - closes #1256
2012-06-16 23:54:14 -04:00
Dane Springmeyer
014fe26f70
Merge branch 'master' of github.com:mapnik/mapnik into copy-grid-features
2012-06-16 17:29:45 -04:00
Dane Springmeyer
d0b838b7a4
Merge branch 'master' of github.com:mapnik/mapnik
2012-06-16 15:50:59 -04:00
Dane Springmeyer
0516c2f59a
amend cd7ad3e15e
by avoiding use of setjmp which does not compile with latest png (as per #772 ) - see also #1258
2012-06-16 15:50:46 -04:00
Dane Springmeyer
bd7ad7cd3c
address #1198 by moving away from caching grid features and (back) to copying attributes - also roll back to passing feature_impl& rather than feature_ptr (which is now unneeded)
2012-06-15 22:17:26 -04:00
Dane Springmeyer
00853a118c
expand clipping box for lines to avoid trimmed edges - TODO - make sensitive to line width - refs #1215
2012-06-15 15:37:08 -04:00
Dane Springmeyer
d33496baa7
split up code that handles datasource plugin registration
2012-06-13 19:25:59 -04:00
Mickey Rose
1e3c48afb1
split parse_transform.hpp, set dynamic transform expression from python
2012-06-07 17:06:45 +02:00
Artem Pavlenko
03e6f9d023
Merge pull request #1245 from simonsonc/png-exceptions
...
Catch and throw PNG exceptions - fixes #1213
2012-06-07 04:00:40 -07:00
Artem Pavlenko
11c34b1599
Merge branch 'transform_expr' of https://github.com/mirecta/mapnik
2012-06-07 10:20:05 +01:00
Dane Springmeyer
957c40f763
move to int32 for grid rendering buffer - closes #1196
2012-06-06 16:36:38 -07:00
Carl Simonson
cd7ad3e15e
Catch and throw PNG exceptions - fixes #1213
...
The png library uses setjmp/longjmp to throw exceptions when reading. If this
is not set up, the png library calls abort(). This change handles the errors
and throws a C++ exception instead.
This issue was found by testing images from pngsuite at
http://www.schaik.com/pngsuite/ . These images are included and a unit test was
added to test both images that should be successful and images that should
throw an exception.
2012-06-06 17:52:41 -05:00
Mickey Rose
bd9609c370
new feature: transform expressions are now dynamic
...
(cherry picked from commit 173c402b5c142310087246b0ea54dbec54edcac8)
Conflicts:
include/mapnik/vertex_converters.hpp
src/agg/process_markers_symbolizer.cpp
src/agg/process_point_symbolizer.cpp
src/agg/process_polygon_pattern_symbolizer.cpp
src/load_map.cpp
2012-06-06 17:34:26 +02:00
Mickey Rose
46c2d1c710
add operators for computing the envelope of a transformed box2d
...
(cherry picked from commit 9ad342cbed150948561c08e98957bc014dedc7f3)
2012-06-06 17:34:02 +02:00
Dane Springmeyer
eb779b1580
only link libjpeg if we are building with jpeg support
2012-06-04 15:23:08 -07:00
Dane Springmeyer
11e81fdb03
finish exposing markers symbolizer in python - closes #612
2012-06-04 13:42:51 -07:00
Dane Springmeyer
f3073f3693
agg/grid renderers - match cairo by using buffered detector dimensions for placement_finder collision tests
2012-06-04 13:41:35 -07:00
Dane Springmeyer
c8c2d98c0e
avoid compiler warnings with msvc
2012-06-04 11:36:27 -07:00
Dane Springmeyer
857a6950f7
fix warning message for pending features for markers
2012-06-04 11:11:29 -07:00
Artem Pavlenko
024ebfdfe3
+ better not to use errno (via perror) for std::iostreams
...
(it works with gcc and friends but non-standard)
2012-06-01 12:19:42 +01:00
Artem Pavlenko
90c3415d9b
+ don't premultiply pattern source
...
+ cleanup
2012-05-31 13:26:16 +01:00
Artem Pavlenko
500f57cf60
+ make vertex() and rewind() methods const
...
+ remove unused coord_transforms
+ rename coord_transform2 to coord_transform
2012-05-31 12:13:09 +01:00
Artem Pavlenko
6e23b64244
+ don't draw 'frame' to match AGG renderer output
2012-05-30 16:29:39 +01:00
Artem Pavlenko
f4539474fc
+ scale_factor is 1.0 in cairo renderer
...
TODO: should consider using variable scale_factor as in AGG
2012-05-30 16:27:55 +01:00
Artem Pavlenko
9ae70c4823
+ take into account opacity from fill and stroke rgba8 colour
2012-05-30 16:26:34 +01:00
Dane Springmeyer
a359c60236
include cairo-version header explicitly
2012-05-29 16:57:58 -07:00
Mickey Rose
09b05b48b0
fix/prevent to_expression_string misuse #985
2012-05-29 22:53:39 +02:00
Artem Pavlenko
f3c774baa4
+ add grain-extract blending mode (gimp)
2012-05-29 15:09:33 +01:00
Artem Pavlenko
9dc4cb34cc
+ point symbolizer needs 'image-transform' via @lightmare
2012-05-29 12:03:14 +01:00
Artem Pavlenko
d85605eba1
+ avoid unnecessary mapnik::feature_ptr copying
2012-05-29 11:54:12 +01:00
Hermann Kraus
472e81fe68
Correctly transform marker bounding box.
...
Refs #1119 .
2012-05-28 02:46:34 +02:00
Hermann Kraus
0697461488
Add compatiblity layer for C++ code.
2012-05-27 01:15:03 +02:00
Artem Pavlenko
6bea57d690
+ implement grain-merge blending mode (GIMP)
2012-05-25 10:35:43 +01:00
Dane Springmeyer
09426bf324
remove option to link againt external AGG - our local copy has critical fixes and is required
2012-05-24 17:05:51 -07:00
Dane Springmeyer
5b0351875b
handle older (< 1.10.0) cairo versions that lack support for advanced compositing ops (target: cairo 1.8.10-2ubuntu1 on lucid)
2012-05-18 11:31:08 -07:00
Artem Pavlenko
1b210ba456
+ use compositing renderer for markers,points and shields
2012-05-15 16:13:08 +01:00
Artem Pavlenko
55d5d8596d
+ pass by const-ref
...
+ remove explicit keyword from default ctor
2012-05-15 14:40:24 +01:00
Artem Pavlenko
9c9753d2c8
+ fix: set_image_transform
2012-05-15 14:20:56 +01:00
Artem Pavlenko
9599711e0e
Merge remote-tracking branch 'origin/master'
2012-05-14 17:33:45 +01:00
Artem Pavlenko
e08339aee9
+ use custom span_image_filter preserve alpha
2012-05-14 17:32:12 +01:00
Dane Springmeyer
c1495c0c74
restore the fast line rasterizer (rasterizer_outline_aa) and improve its rendering quality and consistency with standard method - refs #873
2012-05-11 17:40:21 -07:00
Dane Springmeyer
54f54ed775
rename composite args
2012-05-11 15:31:35 -07:00
Dane Springmeyer
8ae867f6de
default values for composite args to maintain api compatibility
2012-05-11 15:19:05 -07:00
Dane Springmeyer
e8f28f6582
rename typedef to avoid confusion with mapnik:filter:filter_type
2012-05-11 12:42:29 -07:00
Artem Pavlenko
7380a6a001
+ fix raster_symbolizer: add x/y dst args to composite
2012-05-11 10:55:58 +01:00
Artem Pavlenko
c469a63615
+ use standard compositing ops (process raster symbolizer)
2012-05-10 18:17:14 +01:00
Artem Pavlenko
5f5ca030b7
+ parse symbolizer_base (raster)
2012-05-10 18:15:32 +01:00
Artem Pavlenko
8085110e8f
+ add opacity parameter
2012-05-10 18:14:53 +01:00
Artem Pavlenko
260a098447
+ update to use non-optional comp_op
2012-05-10 12:10:37 +01:00
Artem Pavlenko
609739d1b7
+ always use compositing renderer
2012-05-10 12:09:03 +01:00
Artem Pavlenko
8cd898ce35
+ make comp_op non-optional ( default: src-over)
...
+ move ctors implementations into *.cpp
2012-05-10 12:05:40 +01:00
Dane Springmeyer
ab73f13525
rename the image transform for clarity
2012-05-09 18:15:34 -07:00
Artem Pavlenko
953db9b209
+ use vertex_converters where applicable
2012-05-09 15:45:44 +01:00
Artem Pavlenko
aad7c5e384
+ implement compositing for text
...
+ refactor image_32
2012-05-09 12:39:23 +01:00
Artem Pavlenko
36c5e348d0
+ fix: add missing smooth_tag()
2012-05-07 16:43:48 +01:00
Artem Pavlenko
426e191f9a
+ simplify/cleanup
2012-05-07 16:38:17 +01:00
Artem Pavlenko
9c88495a07
+ enable 'smooth' converter
2012-05-07 16:37:44 +01:00
Artem Pavlenko
7e49a6f44e
+ move 'smooth' property to symbolizer_base level
...
+ remove 'SYMBOLIZER_FAST' completely
2012-05-07 16:08:16 +01:00
Artem Pavlenko
449a40685a
+ remove "fast" rasterizer as it produces suboptimal results
2012-05-07 14:39:39 +01:00
Artem Pavlenko
1bf6510aeb
+ remove ad-hoc extent multiplier
2012-05-07 12:57:07 +01:00
Artem Pavlenko
960de61bb7
+ add compositing
2012-05-07 12:49:26 +01:00
Artem Pavlenko
835105ddc1
+ cleanup
2012-05-07 12:35:43 +01:00
Artem Pavlenko
d0a24c1ae5
+ pass correct clipping tag
2012-05-07 12:18:16 +01:00
Artem Pavlenko
3607281018
+ fix compositing
2012-05-07 12:15:25 +01:00
Artem Pavlenko
4a9387ea44
+ use typedef's
2012-05-07 12:15:04 +01:00
Artem Pavlenko
a789ffd2a8
Merge branch 'master' into compositing
2012-05-07 10:24:47 +01:00
Artem Pavlenko
9ba04738d6
+ don't expose agg headers
2012-05-04 10:23:49 +01:00
Dane Springmeyer
f571cd9763
fixup clamping logic for markers symbolizer and sync with agg implementation
2012-05-03 16:45:40 -04:00
Artem Pavlenko
c475f2f995
+ cairo: fix polygon pattern rendering
2012-05-03 15:28:57 +01:00
Artem Pavlenko
b0a0ab6d3c
+ Cairo: symbolizer level compositing
2012-05-03 14:34:17 +01:00
Artem Pavlenko
164ba630d9
+ add requirement for renderers-> provide processor_impl_type
...
to allow process_xxx functions declaration in base class
+ re-enanble cairo renderer
2012-05-03 12:19:26 +01:00
Artem Pavlenko
1b33c584e7
+ use MAPNIK_LOG_DEBUG
2012-05-03 12:17:37 +01:00
Artem Pavlenko
e23fdb276f
+ pass scale_factor to vertex_converter
2012-05-02 17:22:54 +01:00
Artem Pavlenko
44c5efbf75
+ add miterlimit parameter
2012-05-02 17:04:24 +01:00
Artem Pavlenko
6d8ce26313
+ allow negative offset
...
+ re-enable affine_transform
2012-05-02 16:30:19 +01:00
Artem Pavlenko
a475b6e0bc
+ add offset_converter
2012-05-02 15:13:46 +01:00
Artem Pavlenko
28b02737cd
fix transform serialization for markers_symbolizer
2012-05-01 16:52:19 +01:00
Artem Pavlenko
77dfac5622
+ re-introduce transform on symbolizer_with_image
2012-05-01 16:47:33 +01:00
Artem Pavlenko
a72ee4ba66
Merge branch 'master' into compositing
...
Conflicts:
include/mapnik/image_compositing.hpp
include/mapnik/util/conversions.hpp
include/mapnik/value.hpp
src/agg/agg_renderer.cpp
src/agg/process_line_symbolizer.cpp
src/agg/process_polygon_symbolizer.cpp
src/png_reader.cpp
src/svg_parser.cpp
utils/svg2png/svg2png.cpp
2012-05-01 12:35:49 +01:00
Artem Pavlenko
f57d2c28f0
+ 'direct' image filter support: apply filter on main rendering buffer
...
(TODO: better user-friendly names)
+ allow empty string e.g image-filters="" (why not?)
2012-04-25 10:54:54 +01:00
Artem Pavlenko
c26ad5706e
+ move 'clip' property to symbolizer_base
...
+ support 'clip' accross relevant symbolizer (agg)
2012-04-24 11:10:54 +01:00
Dane Springmeyer
9d002ee620
fix whitespace post 2f8d08c36
2012-04-23 19:21:26 -07:00
Dane Springmeyer
2f8d08c366
Merge pull request #1190 from ssinger/fix_segfault
...
Avoid dereferencing a null error structure
2012-04-23 19:19:42 -07:00
Steve Singer
4b4f2326cc
Avoid dereferencing a null error structure
2012-04-23 22:00:31 -04:00
Dane Springmeyer
6a27a28de2
avoid taking reference to temporary - fixes segfaul seen on linux (but not on osx)
2012-04-23 21:28:07 -04:00
Dane Springmeyer
3ded9e06bd
ensure libmapnik is built before python bindings are linked
2012-04-23 17:38:01 -07:00
Dane Springmeyer
674f7bc238
fix syntax error - refs #1189
2012-04-23 11:33:59 -07:00
Dane Springmeyer
c3004e7a01
scons: ensure compiles only happen if actually installing - closes #1189
2012-04-23 11:29:50 -07:00
Artem Pavlenko
eb16d2867f
use src-over as a default comp mode
2012-04-23 16:15:56 +01:00
Artem Pavlenko
a4cdc7a1c0
+ make comp_op boost::optional<>
...
+ use plain pixf when style_level_compositing=true
2012-04-23 15:41:18 +01:00
Artem Pavlenko
377f851a69
+ fix src-over lookup
...
+ corrected names to follow SVG spec
2012-04-23 13:02:02 +01:00
Dane Springmeyer
27f601d1f0
fix boost filesystem2 compile
2012-04-20 17:39:52 -07:00
Dane Springmeyer
622ce7e590
skip font files and face names with leading '.' - interpret as hidden
2012-04-20 15:31:06 -07:00
Artem Pavlenko
03d42e59a5
+ allow specifying premultiply flag for src and dst images
...
+ fix logic in agg_renderer (TODO)
2012-04-20 14:53:11 +01:00
Dane Springmeyer
2b92f04926
optimize font rendering with fontsets in the case of some fontset fonts not being available on the users system - closes #1182
2012-04-19 11:22:42 -07:00
Artem Pavlenko
dd7035972d
+ remove debug printing
2012-04-19 13:41:09 +01:00
Dane Springmeyer
cfa2ffc52e
better error output when we fail to parse comp-op or image-filters
2012-04-18 07:37:14 -07:00
Dane Springmeyer
b3c618e764
avoid warnings
2012-04-18 07:09:23 -07:00
Dane Springmeyer
2f65a7612d
allow cairo compile
2012-04-18 07:09:12 -07:00
Artem Pavlenko
668d6f2325
image-filters: initial implementation
2012-04-18 12:14:23 +01:00
Artem Pavlenko
a5a5e74a11
affine transform -> symbolizer_base
2012-04-18 09:47:28 +01:00
Artem Pavlenko
294de4b95a
+ update to read "transform" attribute at symbolizer_base level
2012-04-18 09:46:19 +01:00
Artem Pavlenko
5361550e8d
+ add optional affine-transform converter
2012-04-18 09:45:11 +01:00
Artem Pavlenko
831538b522
move svg transform to symbolizer_base
2012-04-18 09:42:19 +01:00
Artem Pavlenko
9af11c5ef2
only allocate internal buffer if required
2012-04-18 09:37:02 +01:00
Dane Springmeyer
5767c65470
improve the map.query_point/query_map_point implementation, now throwing for invalid coords or projection transformations
2012-04-13 11:28:30 -07:00
Dane Springmeyer
c50c401aa4
make a non-existant marker file a MAPNIK_LOG_ERROR not MAPNIK_LOG_WARN so that the message shows up even if MAPNIK_LOG is off - refs #1175
2012-04-12 16:06:40 -07:00
Dane Springmeyer
44d7a38f23
work around perf issue with logging in wkb.cpp - refs #1175
2012-04-11 18:57:56 -07:00
Dane Springmeyer
19972fb87e
improve svg error output if parsing fails
2012-04-11 11:45:56 -07:00
Dane Springmeyer
d64d2555e1
marker_cache: improve logging output
2012-04-11 11:28:09 -07:00
Dane Springmeyer
1941a700a4
add compile time warning if building against proj < 4.8
2012-04-11 08:23:41 -07:00
Dane Springmeyer
f5da52bb22
Merge branch 'master' of github.com:mapnik/mapnik
2012-04-11 08:06:47 -07:00
Dane Springmeyer
7cca1489b7
fix memory leak of pj_ctx if a projection cannot be initialized
2012-04-11 08:06:29 -07:00
Artem Pavlenko
76b95518c2
call xmlFree before throwing an exception
2012-04-11 14:44:19 +01:00
Artem Pavlenko
57d6d62440
+ support 'display' property, if set to 'none' don't parse children #1137
...
+ fix memory leak : xmlTextReaderGetAttribute -> string must be deallocated by the caller
+ call xmlTextReaderMoveToElement after xmlTextReaderMoveToFirstAttribute loop to restore
reader position.
Conflicts:
src/svg_parser.cpp
2012-04-11 14:36:39 +01:00
Artem Pavlenko
bba21e3d9c
+ support 'display' property, if set to 'none' don't parse children #1137
...
+ fix memory leak : xmlTextReaderGetAttribute -> string must be deallocated by the caller
+ call xmlTextReaderMoveToElement after xmlTextReaderMoveToFirstAttribute loop to restore
reader position.
2012-04-11 14:00:34 +01:00
Artem Pavlenko
7c0824f40b
+ read whole image at once if we have enough memory and x0==0 && y0==0
...
(adds support for Adam7 interlacing )
2012-04-10 15:51:30 +01:00
Artem Pavlenko
5758b47813
+ read whole image at once if we have enough memory and x0==0 && y0==0
...
(adds support for Adam7 interlacing )
2012-04-10 15:47:29 +01:00
Artem Pavlenko
45b0dd6482
+ support smooth conv in polygon_pattern_symbolizer
2012-04-10 15:46:38 +01:00
kunitoki
ee2674cda8
- force a file close to flush debug outputs when setting back logging from file to console
2012-04-10 16:46:11 +02:00
kunitoki
81c9dd7b6b
- added the ability to set the default global severity from scons configure
...
- initial check in of setting global severity from getenv (todo)
2012-04-10 16:19:51 +02:00
kunitoki
1a203d3f85
- cleaned up logger interface to better integrate with python bindings
...
- polished and finished python bindings for logger interaction
2012-04-10 10:14:28 +02:00
kunitoki
fb94e4a2ec
- replace all instances of std::cerr with MAPNIK_LOG_*
2012-04-10 00:51:04 +02:00
kunitoki
a902a08aab
- added logging to file
...
- started working on the logger bindings
- cleanups some error reporting with cerr/clog in the library
2012-04-10 00:25:31 +02:00
kunitoki
efc823a372
Merge branch 'master' of github.com:mapnik/mapnik
2012-04-09 21:42:55 +02:00
kunitoki
b60c508c1c
- finish thrashing all the useless ifdef MAPNIK_LOG
2012-04-09 21:41:56 +02:00
Artem Pavlenko
87ec80b819
+ set SVG path visibility=false if display=none
2012-04-09 14:47:44 +01:00
Artem Pavlenko
6f7457f6b0
format
2012-04-09 14:46:03 +01:00
Artem Pavlenko
2fb00247eb
remove unused headers
2012-04-09 12:34:09 +01:00
Artem Pavlenko
80a1178a08
+ set SVG path visibility=false if display=none
2012-04-09 12:27:19 +01:00
Artem Pavlenko
c5a27d7398
+ use vertex converters
2012-04-09 11:12:34 +01:00
kunitoki
74342e3083
- no need to #ifdef all the time: the compiler should optimize out the log calls when no MAPNIK_LOG is defined
...
- initially got rid of those ifdefs in plugins only
2012-04-09 12:05:49 +02:00
kunitoki
8c58a9aa73
- improved again the logging facilities
...
- aligned the plugins to using the new methods with severity
- implemented per object severity, with fallback to global (with global functions to set them programmatically)
- initial check in of logger python bindings (todo)
2012-04-09 03:00:51 +02:00
Artem Pavlenko
fdc80ad278
+ use BOOST_FOREACH
2012-04-08 12:12:12 +01:00
Dane Springmeyer
65c3e9021c
fix compile error if MAPNIK_LOG is not defined - refs #937
2012-04-07 20:15:48 -07:00
kunitoki
7b59fec405
Merge branch 'master' of github.com:mapnik/mapnik
2012-04-08 04:01:34 +02:00
kunitoki
4ef7343416
- added severity to logger (global variable for now)
...
- added a logger class for each severity level
2012-04-08 03:59:47 +02:00
kunitoki
09f3728db0
- fix a warning
2012-04-08 03:56:32 +02:00
Dane Springmeyer
0015a68e19
throw during zoom_all if a proj_init error is encountered
2012-04-07 17:56:18 -07:00
kunitoki
af201551b8
got rid of old CVS $Id comments kludge in files
2012-04-08 02:45:01 +02:00
kunitoki
1f351e0e09
implement new debug system
2012-04-08 02:20:56 +02:00
Dane Springmeyer
19f5f77417
reuse path_expression_grammar - finishes and closes #1028
2012-04-06 16:50:11 -07:00
Dane Springmeyer
98e470903c
less lexical cast - refs #1055
2012-04-06 13:39:13 -07:00
Dane Springmeyer
e57eb47ba0
cast to const char
2012-04-06 13:05:59 -07:00
Dane Springmeyer
ab776edbf5
reduce string copying slightly in populate_tree - refs #1055
2012-04-06 12:58:08 -07:00
Dane Springmeyer
43d646c759
formatting
2012-04-06 11:42:36 -07:00
Artem Pavlenko
e513b4772d
+ use vertex_converters
2012-04-06 10:10:20 +01:00
Dane Springmeyer
7b84a2ce94
fix linking of postgis.input by using MAPNIK_DECL and ensuring the header is included in src/conversions.cpp - closes #1127
2012-04-05 16:59:36 -07:00
Artem Pavlenko
738ff501fe
remove CompositingSymbolizer
2012-04-05 17:04:11 +01:00
Artem Pavlenko
34c984b2b8
+ support compositing across all symbolizers
...
(currently polygon and line symbolizers)
2012-04-05 15:59:11 +01:00
Dane Springmeyer
4dbadaa7cd
ensure proper reprojection of unbuffered bbox used for geometry clipping - closes #1138
2012-04-04 12:43:32 -07:00
Dane Springmeyer
d29ae14104
make it possible to set the map.maximum_extent back to None/uninitialized from python
2012-04-04 12:07:15 -07:00
Dane Springmeyer
8c41bdc040
remove unused variables
2012-04-04 10:30:37 -07:00
Dane Springmeyer
40e8ceca55
add missing set_color_to_alpha impl - TODO - add advanced algo that supports tolerance - refs #1018
2012-04-03 16:49:05 -07:00
Artem Pavlenko
e7f0e8aac0
+ support configurable vertex converter
2012-04-03 19:49:57 +01:00
Artem Pavlenko
6236a63156
+ make clip_poly converter optional (default: true)
2012-04-03 16:31:01 +01:00
Artem Pavlenko
347fce4db2
+ add 'clip' property
2012-04-03 16:28:49 +01:00
Artem Pavlenko
cbcb8d6aad
+ use fusion::vector to pass arguments
2012-04-03 13:40:51 +01:00
Artem Pavlenko
81566a8f80
+ use pre-multiplied pixel format in agg_renderer
...
(de-multiply in end_map_processing())
+ support for compositing at style level
+ image blur (TODO)
2012-04-03 13:10:30 +01:00
Artem Pavlenko
c9a83837a1
+ add start/end style processing handlers
2012-04-03 13:09:08 +01:00
Dane Springmeyer
9d6c47844c
use more robust transform method in map.zoom_all
2012-04-02 11:33:29 -07:00
Artem Pavlenko
8038561984
+ move renderer to agg_helpers
2012-03-28 12:02:03 +01:00
Dane Springmeyer
2edaefd0d6
cairo: match AGG functionality, adding support for dynamic ellipse drawing and loading from svg icons - closes #1071 (refs #952 - this is stopgap until we refactor and merge with point_symbolizer)
2012-03-27 19:21:11 -04:00
Artem Pavlenko
9840c7df4c
Merge branch 'master' into compositing
...
Conflicts:
include/mapnik/util/dasharray_parser.hpp
src/agg/process_line_symbolizer.cpp
src/image_compositing.cpp
2012-03-26 09:05:02 +01:00
Dane Springmeyer
7c529600eb
Revert "avoid mutex locks on pj_transform for proj 4.7 and above - closes #1072 "
...
This reverts commit 0748d2beea
.
2012-03-24 08:03:15 -07:00
Dane Springmeyer
3f26c439c9
fix marker width/height to mean pixels - which it should have all along - closes #1134
2012-03-23 20:28:12 -07:00
Dane Springmeyer
ea5a46f230
remove the storage and serialization of 'font-directory' and 'minimum-version' since there is no strong need to have them accessible after initial parsing
2012-03-23 18:14:14 -07:00
Dane Springmeyer
35cad0e049
port over bgra -> rgba compositing fix from compositing branch
2012-03-23 17:38:30 -07:00
Dane Springmeyer
586978f345
fix operator
2012-03-23 17:27:01 -07:00
Dane Springmeyer
3b498efbd9
fixup font registration code ensuring invalid fonts will warn but not throw and register_fonts will only return success if > one font is registered and none have failed
2012-03-23 15:07:28 -07:00
Dane Springmeyer
c88a725a7d
Merge pull request #1143 from datendelphin/fontengine
...
fix invalid memory access in font engine
2012-03-23 11:14:18 -07:00
Datendelphin
30f59aac0c
fix invalid memory access in font engine
...
acess of member face->num_faces after free()
fixed by making local copy num_faces before FT_Done_Face(face)
2012-03-23 17:33:35 +01:00
Artem Pavlenko
38fafc14bc
+ impl dasharray parser (supports 'none')
...
+ skip 0,0 dashes in load_map
2012-03-23 13:18:49 +00:00
Artem Pavlenko
d76136ba40
use mapnik::util namespace for conversions
2012-03-23 13:18:33 +00:00
Artem Pavlenko
b4e96c35b5
+ impl dasharray parser (supports 'none')
...
+ skip 0,0 dashes in load_map
2012-03-23 11:58:07 +00:00
Artem Pavlenko
242385f16d
use mapnik::util namespace for conversions
2012-03-23 11:08:39 +00:00
Artem Pavlenko
97eb078adb
+ re-use renderer (TODO)
2012-03-23 09:34:26 +00:00
Dane Springmeyer
caaa8b5392
disable stderr from svg parsing unless in debug mode
2012-03-22 16:41:44 -07:00
Dane Springmeyer
d991427737
formatting
2012-03-22 16:37:24 -07:00
Dane Springmeyer
d23a4b63b9
expose both a clipped and unclipped labeling path type
2012-03-22 16:36:25 -07:00
Dane Springmeyer
61c38d0ec7
avoid copying unbuffered bbox
2012-03-22 16:35:33 -07:00
Artem Pavlenko
f0b6fffcc9
Merge branch 'master' into compositing
2012-03-22 09:14:49 +00:00
Dane Springmeyer
40b0ab8d6c
add missing #else
2012-03-21 17:45:19 -07:00
Dane Springmeyer
d55ad5a4d2
check which cairo surfaces are supported
2012-03-21 15:34:59 -07:00
Artem Pavlenko
bc2589960b
+ add missing files
2012-03-21 17:34:41 +00:00
Artem Pavlenko
05600f64cc
Merge branch 'master' into compositing
2012-03-21 15:50:04 +00:00
Artem Pavlenko
95cfb061af
+ experimental compositing symbolizer (fill only)
2012-03-21 15:47:33 +00:00
Artem Pavlenko
aefa23fb5b
+ boost::bimap based enum<->string lookup table
...
+ fix pixel_format bgra -> rgba
2012-03-21 15:45:23 +00:00
Artem Pavlenko
f78305428a
+ remove duplicate typedef's
2012-03-21 10:52:03 +00:00
Artem Pavlenko
4aaae73e51
use SFINAE to check for process(xxx_symbolizer,..) in derived classes
...
avoid writing dummy process(...) methods
2012-03-21 09:29:37 +00:00
Dane Springmeyer
9c2b3d7144
Merge branch 'master' of github.com:mapnik/mapnik
2012-03-20 23:24:45 -07:00
Dane Springmeyer
3f06747407
braces for readibility
2012-03-20 16:40:07 -07:00
Hermann Kraus
da5ac781a7
Remove old comment.
2012-03-20 23:56:35 +01:00
Hermann Kraus
8b5e5fbb64
Always place text at the same side of a line.
...
Fixes #608 .
2012-03-20 23:50:20 +01:00
Dane Springmeyer
89877edc67
move image_compositing to cpp file
2012-03-19 15:42:44 -07:00
Dane Springmeyer
4843572e1b
move image_compositing to cpp file
2012-03-19 15:42:30 -07:00
Hermann Kraus
9b62a19cf4
Implement justify-alignment=auto.
...
Closes #1125 .
2012-03-19 17:12:53 +01:00
novldp
0ecd5bae45
+add MarkersSymbolizer ignore-placement to save_map and python bindings
2012-03-18 23:30:37 +01:00
ldp
1542e3e513
add ignore-placement to MarkersSymbolizer
2012-03-18 22:35:02 +01:00
Hermann Kraus
725248628d
C++ style.
2012-03-16 01:50:55 +01:00
Hermann Kraus
1b85f42a88
Reapply RTL patch.
...
Fixes #189 .
2012-03-16 01:01:12 +01:00
Artem Pavlenko
c95959c549
+ re-use cairo_context
2012-03-15 11:29:57 +00:00
Artem Pavlenko
66beaaa05b
+ support smoothing in conv_dash
2012-03-15 10:42:30 +00:00
Artem Pavlenko
70512dc03b
+ add optional smothing to line_symbolizer
...
( TODO: conv_dash )
2012-03-15 10:26:53 +00:00
Dane Springmeyer
926404d9ae
properly format abi versions in a few more placesa
2012-03-15 02:03:33 +00:00
Dane Springmeyer
2abe02bd96
make available MAPNIK_VERSION_STRING in c++ header (not just in python) and add MAPNIK_VERSION_IS_RELEASE define that indicates if the code is released
2012-03-14 18:30:32 -07:00
Artem Pavlenko
f0bc1064c6
+ supprt polygon smoothing in cairo backend
2012-03-14 17:38:27 +00:00
Artem Pavlenko
3e4733c51a
+ refactor join/cap settings (agg_helper.hpp)
2012-03-14 17:21:04 +00:00
Artem Pavlenko
959a989f52
Merge remote-tracking branch 'origin/master'
2012-03-14 16:51:49 +00:00
Artem Pavlenko
f1a0887628
+ apply smooth converter after clipping and transformations
...
+ inflate query_extent
2012-03-14 16:12:36 +00:00
Dane Springmeyer
8451e8897d
Merge branch 'master' of github.com:mapnik/mapnik
2012-03-14 08:57:13 -07:00
Dane Springmeyer
81ab02cc72
fix failing test 'bgcolor_broken.xml' when compiled against boost 1.42
2012-03-14 08:56:59 -07:00
Artem Pavlenko
108b99725c
+ refactor gamma setting logic to avoid code duplication
...
( agg_helpers.hpp )
2012-03-14 15:45:35 +00:00
Artem Pavlenko
87b22c29b2
+ add optional polygon smoothing ( 0.0 < smooth < 1.0 )
...
using agg_conv_poly1_curve
2012-03-14 15:01:31 +00:00
Dane Springmeyer
5601731a89
fix macro in conversions.cpp
2012-03-13 08:05:26 -07:00
Dane Springmeyer
76e108ff9d
remove uneeded shared_ptr copy
2012-03-13 07:58:38 -07:00
Dane Springmeyer
93995d7c4b
apply mapnik_format.el formatting
2012-03-13 07:56:11 -07:00
Hermann Kraus
2b68cea0a1
Merge branch 'new-xml'
...
Conflicts:
include/mapnik/config_error.hpp
include/mapnik/ptree_helpers.hpp
src/formatting/text.cpp
src/libxml2_loader.cpp
src/load_map.cpp
src/metawriter_factory.cpp
src/text_placements/registry.cpp
src/text_placements/simple.cpp
2012-03-13 11:11:28 +01:00
Hermann Kraus
150de2aac5
Add rapidxml parser.
2012-03-13 09:02:53 +01:00
Dane Springmeyer
fb6bf401e9
avoid constructing extra temp object
2012-03-12 13:22:07 -07:00
Artem Pavlenko
207ecfd597
remove camel-case names from layer.[h,c]pp
2012-03-12 15:39:59 +00:00
Artem Pavlenko
5ec3fb1121
avoid constructing extra temp object
2012-03-12 13:07:36 +00:00
Hermann Kraus
f25a2231ff
Warn about unused XML elements.
2012-03-12 02:12:58 +01:00
Hermann Kraus
02d8a98b3f
Improve error messages.
2012-03-12 01:09:26 +01:00
Hermann Kraus
502773bea6
Only one grammar object per XML tree.
2012-03-11 23:24:28 +01:00
Dane Springmeyer
a6f89883d7
moar boost::make_shared
2012-03-09 16:20:50 -08:00
Dane Springmeyer
ddd3956f0e
expose a clear method for the marker_cache and mapped_memory_cache - closes #1022
2012-03-09 15:16:01 -08:00
Dane Springmeyer
71333373cc
use boost::make_shared to create new face_ptr
2012-03-09 15:15:04 -08:00
Artem Pavlenko
254b3c9fa7
Merge branch 'master' into geometry-clipping
...
Conflicts:
SConstruct
include/mapnik/symbolizer_helpers.hpp
src/placement_finder.cpp
2012-03-09 14:18:41 +00:00
Artem Pavlenko
5ce18715c3
+ update cairo_renderer to use clipped paths
2012-03-09 13:40:18 +00:00
Artem Pavlenko
61113d7b4e
+ add clipping to text/shield/markers
...
Conflicts:
include/mapnik/symbolizer_helpers.hpp
2012-03-09 13:37:53 +00:00
Artem Pavlenko
a763d03110
resolve conflict
2012-03-09 13:33:16 +00:00
Artem Pavlenko
514ec14cc9
+ add clipping to polygon/line_pattern_syms
2012-03-09 12:57:14 +00:00
Artem Pavlenko
d8d5298f4e
+ update cairo_renderer to use clipped paths
2012-03-09 12:56:54 +00:00
Dane Springmeyer
b67af5cadb
avoid combining default arg with const&
2012-03-09 12:55:41 +00:00
Artem Pavlenko
13ea874585
+ inflate query extent to avoid line joining artifacts
2012-03-09 12:55:22 +00:00
Artem Pavlenko
11511e9b20
+ cleanup
2012-03-09 12:55:03 +00:00
Artem Pavlenko
40b9553722
+ add clipping to text/shield/markers
...
Conflicts:
include/mapnik/symbolizer_helpers.hpp
2012-03-09 12:54:13 +00:00
Artem Pavlenko
c12161bf19
+ clip geometries before applying any
...
transformations.
2012-03-09 12:44:29 +00:00
Dane Springmeyer
86ac497584
minor formatting
...
Conflicts:
src/placement_finder.cpp
2012-03-09 12:42:08 +00:00
Hermann Kraus
b71460d4dd
Don't return pointer to dead object.
2012-03-09 13:26:11 +01:00
Dane Springmeyer
c5c0f92247
save the maps in the right place for visual tests
2012-03-08 17:04:51 -08:00
Dane Springmeyer
5f4734ebe0
fix other potential division by zero conditions - closes #1110
2012-03-08 17:02:58 -08:00
Hermann Kraus
cd8cfc6527
Improve error messages.
2012-03-08 18:52:53 +01:00
Dane Springmeyer
f1aee03912
forward declare marker so marker_cache api access is cleaner
2012-03-08 08:37:58 -08:00
Hermann Kraus
adc8f9df1b
Fix PointSymbolizer problem.
2012-03-08 13:00:40 +01:00
Hermann Kraus
2a7709a0cf
Dump xml tree.
2012-03-08 01:29:19 +01:00
Hermann Kraus
c3cd50ff57
Complete new XML structure.
2012-03-07 19:16:41 +01:00
Dane Springmeyer
adfa73f64a
avoid combining default arg with const&
2012-03-07 08:54:04 -08:00
Hermann Kraus
daf30ca0d1
Update metawriter_factory.hpp
2012-03-07 15:26:13 +01:00
Hermann Kraus
9a05dc1828
Add XML functions.
2012-03-07 03:57:31 +01:00
Hermann Kraus
f214675c69
Modify all other files for new XML structure.
2012-03-07 02:23:16 +01:00
Hermann Kraus
7d3fd0755d
Complete XML changes in load_map.cpp
2012-03-07 01:35:37 +01:00
Hermann Kraus
7a052f81f7
Update more functions.
2012-03-06 18:17:23 +01:00
Hermann Kraus
ac50834d92
Convert parse_map_include to xml_node.
2012-03-06 15:47:08 +01:00
Hermann Kraus
191d0f907a
Convert first function to new XML structure.
2012-03-06 15:18:11 +01:00
Dane Springmeyer
1c6da3893e
minor formatting
2012-03-05 18:00:45 -08:00
Dane Springmeyer
df54f710bc
minor formatting
2012-03-05 18:00:15 -08:00
Dane Springmeyer
943f92fffc
initialize another member in text_properties
2012-03-05 14:54:30 -08:00
Dane Springmeyer
3dafe6080d
rework text_path ctor to ensure members are properly initialized - refs #1114
2012-03-05 14:15:01 -08:00
Dane Springmeyer
f3c4f9eec7
initialize members of text_symbolizer_properties and char_properties - refs #1114
2012-03-05 13:48:35 -08:00
Dane Springmeyer
7dfc6d9ccd
pass doubles by value in find_line_circle_intersection
2012-03-05 11:50:20 -08:00
Dane Springmeyer
84c9ee653a
no need to pass orientation as const& to test_placement, which unlike get_placement_offset to does not change the value
2012-03-05 11:36:48 -08:00
Dane Springmeyer
50a417fc83
formatting
2012-03-05 11:31:58 -08:00
Dane Springmeyer
f90b410ece
formatting to use const& as per 6462af3
2012-03-05 11:10:04 -08:00
Dane Springmeyer
232256e136
load_map_string: do not pass optional arg by const& and better error if string is empty
2012-03-05 10:44:20 -08:00
Hermann Kraus
481271cb76
Add new XML data structure and modify XML parser to work with this structure.
2012-03-05 16:49:54 +01:00
Hermann Kraus
ad86e9aebc
Reenable text meta writers.
2012-03-04 23:25:13 +01:00
Hermann Kraus
5578bdb6f9
Remove has_dimensions and dimensions from text_placement_info.
...
This functionality is better provided by placement_finder.additional_boxes.
2012-03-04 16:38:40 +01:00
Hermann Kraus
46272d836b
Move more variables from text_placements_info to placement_finder.
...
Refs #1048 .
2012-03-04 13:32:10 +01:00
Hermann Kraus
4638b28c36
Store pointer to char_info in text_path instead of pointer to char_properties.
2012-03-04 03:53:39 +01:00
Hermann Kraus
b4eddaab24
Move variables from text_placements_info to placement_finder.
...
Reuse placement_finder objects.
Pass feature to placement_finder.
Refs #1048 .
2012-03-04 01:49:01 +01:00
Hermann Kraus
36918e4a8b
Remove warning. Empty expressions might exist in real applications without being an error.
2012-03-03 17:41:43 +01:00
Hermann Kraus
f8c784b0a6
Correctly center text.
2012-03-03 13:53:08 +01:00
Dane Springmeyer
7163806cda
c++ style
2012-03-02 18:51:19 -08:00
Hermann Kraus
2bf9d9dbdf
Fix handling of empty XML nodes.
...
Closes #1106 .
2012-03-03 01:12:23 +01:00
Hermann Kraus
cc547385e6
Avoid adding the same text to detector twice.
2012-03-02 12:39:38 +01:00
Artem Pavlenko
726724b3c7
pass by ref
...
move conversions impl into .cpp
2012-03-01 18:36:13 +00:00
Hermann Kraus
9e397ae55e
Add iterator increment which I forgot in 96d8dfb356
.
2012-02-28 02:05:44 +01:00
Hermann Kraus
df4eae2f71
Merge branch 'master' of github.com:mapnik/mapnik
...
Conflicts:
src/symbolizer_helpers.cpp
2012-02-28 01:48:26 +01:00
Hermann Kraus
66ef7a450a
Add marker to collision detector.
...
Refs #1106 .
2012-02-28 01:47:24 +01:00
Dane Springmeyer
82bd78d9a5
use boost::make_shared instead of new as per mapnik coding conventions
2012-02-27 16:39:34 -08:00
Dane Springmeyer
a5d7239cfc
fix minor spelling in code comments
2012-02-27 16:15:36 -08:00
Hermann Kraus
96d8dfb356
Improve code a bit.
...
size() can be O(n) but empty() is always O(1).
2012-02-28 00:52:02 +01:00
Dane Springmeyer
1ed193728d
add missing update_detector() - refs #1106
2012-02-27 15:15:27 -08:00
Dane Springmeyer
2f134657b4
speed up xml loading by avoiding repeated grammar creation - refs #1028 (TODO - still need to handle text/shield expressions)
2012-02-24 16:34:39 -08:00
Hermann Kraus
1906cddf04
Improve error messages.
2012-02-25 00:57:05 +01:00
Dane Springmeyer
a917b7b410
fix the ability of external libraries to link mapnik on windows
2012-02-24 11:32:16 -08:00
Artem Pavlenko
917e684bdd
dummy decrement() and advance(p) to compile with vc10 (untested)
2012-02-24 18:07:13 +00:00
Hermann Kraus
99a3c9fec9
Remove multiple consecutive empty <xmltext> nodes.
2012-02-24 12:37:23 +01:00
Dane Springmeyer
6db1ba176b
fix compile on windows by including round() from global.hpp
2012-02-23 11:46:53 -08:00
Hermann Kraus
2955983264
Fix #1095 .
2012-02-23 18:10:50 +01:00
Dane Springmeyer
56aeae1b52
fix broken python linking after 6a0ce99e22
2012-02-22 16:45:02 -08:00
Dane Springmeyer
4a192c319b
ensure mean_sort_cmp adheres to strict weak ordering requirement - more properly fixes #1087
2012-02-22 14:54:10 -08:00
Dane Springmeyer
f17031084c
use new conversions header - refs #1055
2012-02-21 10:59:11 -08:00
Dane Springmeyer
8568c62e8e
Merge branch 'master' of github.com:mapnik/mapnik
2012-02-20 22:54:09 -08:00
Dane Springmeyer
9213dd5426
fixup multi-symbolizer processing function
2012-02-20 22:53:54 -08:00
Dane Springmeyer
6a0ce99e22
maintain compile with boost <= 1.47
2012-02-20 17:09:14 -08:00
Hermann Kraus
a05faceb11
Fix ShieldSymbolizer line placement.
...
Refs #1078 , https://github.com/MapQuest/MapQuest-Mapnik-Style/issues/8 .
2012-02-21 00:06:54 +01:00
Hermann Kraus
46f80cc6aa
Use double instead of int and avoid rounding when possible.
...
Closes #1078 .
2012-02-20 19:32:34 +01:00
Artem Pavlenko
6f5d16bfe3
+ make feature_collection_parser a template so we can
...
instantiate with different iterator types
e.g std::string::const_iterator and
boost::spirit::multi_pass<std::istreambuf_iterator<char> >
2012-02-20 16:23:31 +00:00
Artem Pavlenko
6e498ad062
+ update to use new names
...
+ add geometry_generator
2012-02-20 12:03:56 +00:00
Artem Pavlenko
3953a94636
+ geojson generator interface
2012-02-20 10:53:58 +00:00
Hermann Kraus
2ea6ab216c
Fix text height calculation.
...
Closes #1078 .
2012-02-18 16:43:05 +01:00
Hermann Kraus
6efdb3969e
Handle text position differently.
...
Should fix part of the ShieldSymbolizer problems.
Refs #1078 .
2012-02-18 14:39:13 +01:00
Hermann Kraus
2843ff3da8
Fix placement_finder.hpp includes.
2012-02-18 14:03:21 +01:00
Hermann Kraus
bb3ad18c95
Rename starting_{x,y} to center to reflect actual meaning.
2012-02-18 13:07:23 +01:00
Hermann Kraus
980cdd9e92
Use text_placements registry.
2012-02-18 00:39:14 +01:00
Hermann Kraus
6db956ca83
Split file.
2012-02-17 20:53:00 +01:00
Hermann Kraus
481e172b8e
Add placement registry.
2012-02-17 20:15:16 +01:00
Hermann Kraus
2c6502e791
Merge branch 'master' of github.com:mapnik/mapnik
2012-02-17 19:52:38 +01:00
Hermann Kraus
7c98b8c9c0
Add XML name registry.
...
Allows users to add new types to XML styles.
2012-02-17 19:45:13 +01:00
Hermann Kraus
f06bda1c1c
Split file.
2012-02-17 15:50:24 +01:00
Artem Pavlenko
b5bc17304c
Merge remote-tracking branch 'origin/master'
2012-02-17 10:48:49 +00:00
Artem Pavlenko
c6a091937f
+ add get_optional to mapnik::feature_impl
...
returns -> boost::optional<mapnik::value const&>
+ use get_optional in feature_kv_iterator to avoid
throwing exceptions
2012-02-17 10:46:29 +00:00
Hermann Kraus
7b22d69932
Revert "+ fix shield/text positioning - we still need to floor both text and shield"
...
floor is removed from position calculation now, resulting in better marker and text matching.
Refs #1078 .
This reverts commit 009a1e45a7
.
2012-02-17 00:59:20 +01:00
Hermann Kraus
465a7621bc
Merge pull request #1091 from kkaefer/character-spacing
...
Support character-spacing along a line.
Closes #721 .
2012-02-16 15:08:56 -08:00
Hermann Kraus
44beaf1bdf
Make ShieldSymbolizer variables doubles.
...
Refs #1078 .
2012-02-17 00:03:46 +01:00
Konstantin Käfer
9ad113d724
naïvely replace ci.width with ci.width + ci.format->character_spacing
2012-02-16 23:46:44 +01:00
Artem Pavlenko
63735982ee
+ remove const from parameters passed by-value
2012-02-16 15:35:27 +00:00
Artem Pavlenko
ab56a63f2f
Merge remote-tracking branch 'origin/master'
2012-02-15 23:31:38 +00:00
Artem Pavlenko
009a1e45a7
+ fix shield/text positioning - we still need to floor both text and shield
...
position for consistent rendering.
2012-02-15 23:27:33 +00:00
Hermann Kraus
819ee98041
Rename properties=>defauls, default_format=>format.
2012-02-16 00:17:22 +01:00
Hermann Kraus
4602338e0c
Add ExpressionFormat: Allow changing text format based on expressions.
...
Closes #1036 .
Refs #1048 .
2012-02-15 21:38:24 +01:00
Artem Pavlenko
c83ab1d14e
Merge remote-tracking branch 'origin/master'
2012-02-15 19:20:17 +00:00
Hermann Kraus
a2c2ad40e2
Make markers_placement a bit simpler and add sanity checks.
...
refs #974 .
2012-02-15 20:06:50 +01:00
Artem Pavlenko
01497bfc36
+ add typedef size_type to mapnik::vertex_vector
...
+ remove set_capacity() method - no longer required
2012-02-15 15:16:33 +00:00
Artem Pavlenko
6495ea8996
+ clip polygons
2012-02-14 18:39:36 +00:00
Artem Pavlenko
58b51b208e
use standard_wide::space
2012-02-14 18:33:05 +00:00
Hermann Kraus
be464f0c5b
Move code for makers placement from hpp to cpp.
2012-02-13 20:20:09 +01:00
Dane Springmeyer
e2385178f4
install new headers fixing broken node-mapnik compile: https://github.com/mapnik/node-mapnik/issues/85 - refs #1079
2012-02-12 20:53:48 -08:00
Hermann Kraus
1fd7f9d543
Fix spelling error.
2012-02-12 22:48:44 +01:00
Hermann Kraus
afb2eedbb9
Merge branch 'textplacement-rename'
2012-02-12 14:03:57 +01:00
Hermann Kraus
52702d3a20
Rename filter_factory to expression.
2012-02-12 13:06:39 +01:00
Hermann Kraus
57b835419b
Fix font-set handling for ShieldSymbolizer. Closes #1077 .
...
Was the same problem as #1064 .
2012-02-12 11:39:39 +01:00
Hermann Kraus
69f153bf8f
Fix all includes.
2012-02-12 03:55:13 +01:00
Hermann Kraus
fbe929810b
Fix most includes.
2012-02-12 02:47:26 +01:00
Hermann Kraus
7ef1c3544e
Bugfix: Collect expressions for formating::format_node.
2012-02-11 11:24:33 +01:00
Dane Springmeyer
0acd2137b8
restore agg renderer clip_box, accidentally disabled in 21d05444
- refs #1075
2012-02-10 15:14:15 -08:00
Dane Springmeyer
75e264a594
only form up ostringstream if needed
2012-02-10 12:15:23 -08:00
Dane Springmeyer
bfd79276a7
only encode if image has dimensions (avoid abort in png writer on zero size width or height)
2012-02-10 12:14:53 -08:00
Dane Springmeyer
a682212266
small optimization by avoiding repeated case sensitive checks
2012-02-10 11:20:00 -08:00
Dane Springmeyer
32ac2e464c
restore compile for boost 1.42
2012-02-10 10:20:26 -08:00
Artem Pavlenko
6a015dcd59
Merge remote-tracking branch 'origin/master'
2012-02-10 11:59:12 +00:00
Artem Pavlenko
602264d368
+ implement 'in situ' boost::spirit::qi based geojson parser
2012-02-10 11:56:53 +00:00
Dane Springmeyer
0748d2beea
avoid mutex locks on pj_transform for proj 4.7 and above - closes #1072
2012-02-09 17:28:31 -08:00
Dane Springmeyer
656436d971
Merge branch 'master' of github.com:mapnik/mapnik
2012-02-08 15:45:31 -08:00
Dane Springmeyer
fec0750fcf
remove usage of boost::lexical_cast during image encoding - refs #1055
2012-02-08 15:45:08 -08:00
Hermann Kraus
1d50aa1b85
Make interface consistent with similar classes.
2012-02-08 01:16:37 +01:00
Dane Springmeyer
8e61d9a6d2
remove used typedefs
2012-02-07 13:42:45 -08:00
Dane Springmeyer
a00af6faf8
fix debug output name
2012-02-07 13:42:22 -08:00
Artem Pavlenko
958097600c
add wkt_parser class for grammar re-usage
...
implement from_wkt in terms of wkt_parser
2012-02-06 22:49:47 +00:00
Hermann Kraus
18d24983b6
Fix font-name checking when font-set is available. Fixes #1064 .
2012-02-06 11:47:35 +01:00
Hermann Kraus
e298d141da
Improve expression handling.
2012-02-05 03:11:00 +01:00
Hermann Kraus
9c92bf713d
Easier syntax by hiding internal data type.
2012-02-03 00:34:14 +01:00
Dane Springmeyer
17d13cff67
whitespace fixes - closes #911
2012-02-01 17:53:35 -08:00
Dane Springmeyer
21d05444f7
manual whitespace fix
2012-02-01 17:48:56 -08:00
Dane Springmeyer
07d7d7d537
convert to using feature_ptr rather than const& for renderers
2012-02-01 16:37:05 -08:00
Dane Springmeyer
cf8e036574
warn if non bitmap (svg) files are used for pattern symbolizers as this is not currently supported - refs #1010 and #1045
2012-02-01 12:27:57 -08:00
Hermann Kraus
30bef5c955
Fast math.
...
@de94a3e: Yes, we need them. :-)
2012-02-01 12:49:16 +01:00
Artem Pavlenko
de94a3e82f
comment out unused variables
2012-01-31 18:01:19 +00:00
Hermann Kraus
cc886d1688
Merge branch 'feature-text-merge'
2012-01-31 16:52:28 +01:00
Hermann Kraus
06ce3f7eec
Merge remote-tracking branch 'herm/textplacement-merge'
2012-01-31 16:37:37 +01:00
Hermann Kraus
72f061b75a
Revert 0c5fc9f246
.
...
For new text placment branch a different solution is needed.
2012-01-31 16:36:40 +01:00
Hermann Kraus
1a16e9c5ab
Remove class text_processor.
2012-01-31 16:24:58 +01:00
Artem Pavlenko
a395f974f3
small fix
2012-01-31 12:00:36 +00:00
Artem Pavlenko
e00e8f98aa
if geometries are polygons, default to 'largest_box' only
...
for label placement.
TODO: expose settings in XML
2012-01-31 11:52:43 +00:00
Artem Pavlenko
b90de4874c
Merge branch 'textplacement-merge' into feature-text-merge
...
Conflicts:
docs/textrendering.gv
include/mapnik/building_symbolizer.hpp
include/mapnik/placement_finder.hpp
include/mapnik/symbolizer_helpers.hpp
include/mapnik/text_placements.hpp
include/mapnik/text_placements_list.hpp
include/mapnik/text_placements_simple.hpp
include/mapnik/text_processing.hpp
plugins/input/shape/shape_utils.hpp
src/agg/process_shield_symbolizer.cpp
src/agg/process_text_symbolizer.cpp
src/cairo_renderer.cpp
src/grid/process_shield_symbolizer.cpp
src/grid/process_text_symbolizer.cpp
src/load_map.cpp
src/placement_finder.cpp
src/shield_symbolizer.cpp
src/text_placements.cpp
src/text_processing.cpp
src/text_symbolizer.cpp
tests/visual_tests/clean.sh
tests/visual_tests/test.py
Merge herm/textplacement-merge
2012-01-31 11:09:55 +00:00
Hermann Kraus
49225d7468
Handle additional boxes from ShieldSymbolizer.
2012-01-29 20:28:32 +01:00
Hermann Kraus
16e5fefb4d
Remove text_placement_info::initialize() to avoid incorrect usage of this object.
2012-01-29 20:04:31 +01:00
Hermann Kraus
49a3b3c52c
Make code easier to read by using std::pair instead of boost::tuple for position.
2012-01-29 17:33:43 +01:00
Hermann Kraus
822786e41c
Remove no-text attribute. One can simply leave the text empty if one wants this.
2012-01-29 13:10:14 +01:00
Hermann Kraus
4a3a3fd82c
ShieldSymbolizer for Cairo.
2012-01-29 05:03:38 +01:00
Hermann Kraus
3e59503e25
ShieldSymbolizer for Grid renderer.
2012-01-29 04:57:56 +01:00
Hermann Kraus
09459683e9
Update symbolizer helpers for ShieldSymbolizer.
...
Correctly handle point placement for TextSymbolizer. (Tries each possible placement for each point).
2012-01-29 04:49:02 +01:00
Hermann Kraus
a3871e52b7
Rename set_values_from_xml to from_xml.
2012-01-28 17:13:41 +01:00
Hermann Kraus
ff07b4bce0
placement_element => text_path
2012-01-28 00:09:58 +01:00
Hermann Kraus
d6b8209a9d
Rewrote text processing to use a tree structure.
...
Reduces the number of classes and simplifies extension.
2012-01-27 23:15:12 +01:00
Artem Pavlenko
84b948687d
Merge branch 'master' into feature-text-merge
2012-01-27 13:27:27 +00:00
Artem Pavlenko
fc7e07137d
removing as it doesn't belong in here.
2012-01-27 13:23:15 +00:00
Hermann Kraus
dbc1280731
Process more than one geometry.
...
Start work on ShieldSymbolizer.
2012-01-26 20:05:38 +01:00
Artem Pavlenko
5ebdd84940
format
2012-01-26 16:24:48 +00:00
Artem Pavlenko
5c6fdc780f
return member variable by const reference
2012-01-26 13:07:28 +00:00
Artem Pavlenko
36a23367a6
+ fix compilation issues
2012-01-26 13:05:41 +00:00
Artem Pavlenko
d1f16bb227
merge textplacement-merge into feature_impl
2012-01-26 13:04:08 +00:00
Hermann Kraus
1106dcb445
Support for cairo + grid renderer.
2012-01-25 16:17:38 +01:00
Hermann Kraus
bdc20f766b
Complete symbolizer_helpers.hpp for TextSymbolizer.
2012-01-25 15:44:19 +01:00
Artem Pavlenko
d146bcc380
Merge branch 'master' into feature_impl
2012-01-25 10:04:03 +00:00
Tony Young
d0d692cb82
Add text placements to Python API.
2012-01-25 12:57:26 +13:00
Hermann Kraus
3b887972b8
Start work on new symbolizer helpers.
2012-01-23 19:02:35 +01:00
Artem Pavlenko
4b22636f3b
initial implementation of multipolygon labeling strategy
...
based on ordering by bounding box.
TODO : sync with https://github.com/herm/mapnik/tree/textplacement
2012-01-23 16:00:55 +00:00
Hermann Kraus
2eb3662d87
Add all files to build.py.
2012-01-23 00:20:15 +01:00
Hermann Kraus
1549fd92c3
Float font sizes.
2012-01-22 21:19:35 +01:00
Hermann Kraus
31fd5647f2
Use font manager and char properties in text engine.
2012-01-22 20:51:09 +01:00
Hermann Kraus
fb0c9d6d9c
Fix text_placements.cpp.
2012-01-22 20:04:13 +01:00
Hermann Kraus
b945dff774
Fix metawriters.
2012-01-22 19:57:32 +01:00
Hermann Kraus
02eca0825f
Fix set_displacement().
2012-01-22 19:17:59 +01:00
Hermann Kraus
581d35987e
Disable ShieldSymbolizer in cairo_renderer.cpp (see fdd58903f9
).
2012-01-22 18:47:23 +01:00
Hermann Kraus
9d2a6088b1
New placement finder.
2012-01-22 18:41:04 +01:00
Hermann Kraus
78c4464ad7
Remove next_position_only().
2012-01-22 18:29:55 +01:00
Hermann Kraus
fdd58903f9
Disable rendering of TextSymbolizer and ShieldSymbolizer.
...
This avoids breaking compiles with the next changes.
2012-01-22 18:24:28 +01:00
Hermann Kraus
e66712d722
Update font engine.
2012-01-22 18:13:08 +01:00
Hermann Kraus
67eb73eab9
Return correct size information from font engine.
2012-01-22 17:53:45 +01:00
Hermann Kraus
2f02e2f4c5
Update text symbolizer to use new locations.
2012-01-22 17:27:52 +01:00
Hermann Kraus
4490e1afaf
Add missing get_positions() function.
2012-01-22 16:25:19 +01:00
Hermann Kraus
af42e2decf
Update save_map.cpp.
2012-01-22 16:06:28 +01:00
Hermann Kraus
6ce55a0e94
Update parse_shield_symbolizer().
2012-01-22 04:21:01 +01:00
Hermann Kraus
8244cd0a05
Add code using new functions in parse_text_symbolizer().
2012-01-22 03:56:00 +01:00
Hermann Kraus
06ec0c377b
Remove code using old functions in parse_text_symbolizer().
2012-01-22 03:53:05 +01:00
Hermann Kraus
a9ca2f0c40
Add list placement support to load_map.
2012-01-22 03:39:59 +01:00
Hermann Kraus
7fd9fb0c88
Small fixes.
2012-01-22 03:32:21 +01:00
Hermann Kraus
cae0c31ee8
Update text_placement_info_simple to use new functions and locations.
2012-01-22 03:23:27 +01:00
Hermann Kraus
7d01f509ab
Add text_placement_info_list functions.
2012-01-22 03:11:55 +01:00
Hermann Kraus
2b26044adb
Complete text_placement_info functions.
2012-01-22 03:04:37 +01:00
Hermann Kraus
c407d8340f
Add default get_all_expressions function.
2012-01-22 03:01:34 +01:00
Hermann Kraus
6695fa0f5f
Add functions to read and write text_symbolizer_properties and char_properties from/to XML.
2012-01-22 02:56:28 +01:00
Hermann Kraus
b7f8e356f4
Make text_path use char_info.
2012-01-22 01:43:13 +01:00
Hermann Kraus
5fd7035527
Move font engine functions from .hpp to .cpp.
2012-01-21 01:47:02 +01:00
Hermann Kraus
34405a5d9e
Replace dimension_t by char_info.
2012-01-21 00:35:24 +01:00
Hermann Kraus
533b95f0e6
Enable XML parser to return multiple <xmltext> nodes.
2012-01-21 00:02:44 +01:00
Hermann Kraus
e177cd52a7
Rename opacity to image_opacity.
2012-01-20 22:45:47 +01:00
Hermann Kraus
21a58b7b7a
Add missing includes.
2012-01-20 22:43:05 +01:00
Hermann Kraus
6a50f91a10
Add text_processing.hpp/cpp
2012-01-20 22:30:12 +01:00
Hermann Kraus
6efb7a863d
Add default constructor for shield symbolizer.
2012-01-20 00:56:20 +01:00
Artem Pavlenko
bae5bd292f
move building_symbolizer into separate hpp/cpp
2012-01-19 18:26:15 -05:00
Hermann Kraus
e977df778a
Remove unused "anchor" attribute from Text/ShieldSymbolizer.
2012-01-20 00:09:25 +01:00
Artem Pavlenko
096082ba9b
Merge branch 'master' into feature_impl
2012-01-19 16:11:03 -05:00
Hermann Kraus
537231f60e
Remove glyph symbolizer.
2012-01-19 20:34:09 +01:00
Artem Pavlenko
ed40291b88
+ add missing *.cpp file
2012-01-19 12:54:56 -05:00
Artem Pavlenko
ccb75e0dfb
+ add missing *.cpp file
2012-01-19 12:54:56 -05:00
Artem Pavlenko
63563da28f
+ add missing .cpp file
2012-01-19 12:52:58 -05:00
Artem Pavlenko
ab314b44a4
+ use mapnik::gamma_method_e for all symbolizers
...
+ fixes #1042 : avoid pushin duplcaite name into boost.python registry
2012-01-19 12:45:24 -05:00
Artem Pavlenko
0f002077e1
+ use mapnik::gamma_method_e for all symbolizers
...
+ fixes #1042 : avoid pushin duplcaite name into boost.python registry
2012-01-19 12:45:24 -05:00
Artem Pavlenko
a6a540cb68
Merge branch 'master' into feature_impl
2012-01-18 09:40:55 -05:00
Artem Pavlenko
de402b2450
+ update colorizer call
2012-01-18 09:39:06 -05:00
Artem Pavlenko
034b270eb4
Merge pull request #1023 from tarnowsc/master
...
Making the gamma-method for polygon symbolizer
2012-01-18 06:35:54 -08:00
Artem Pavlenko
8fd505790e
Merge pull request #1023 from tarnowsc/master
...
Making the gamma-method for polygon symbolizer
2012-01-18 06:35:54 -08:00
Artem Pavlenko
f44c3e300d
add feature_type_style.cpp
2012-01-18 09:17:39 -05:00
Artem Pavlenko
43fafa6ca0
+ move feature_kv_iterotor into *.cpp to avoid cyclic deps
...
+ expose kv iterator directly on feature_impl
2012-01-18 09:15:52 -05:00
Dane Springmeyer
820b9a2b25
merge master with feature_impl
2012-01-17 17:47:27 -05:00
Artem Pavlenko
c594595603
update to work with new feature_impl
2012-01-17 14:19:38 -05:00
Artem Pavlenko
fbbd1d4dcf
re-enable colorizer support
2012-01-17 14:16:03 -05:00
Artem Pavlenko
c8c7000551
+ update to new feature_impl
2012-01-17 13:41:37 -05:00
Artem Pavlenko
1de253d3d2
update to use new feature_impl interface
2012-01-17 13:33:01 -05:00
Artem Pavlenko
b838d17680
remove extra empty lines
2012-01-17 13:32:26 -05:00
Dane Springmeyer
136239f88b
remove mapnik::point_datasource from c++ and mapnik.PointDatasource from python bindings
2012-01-17 09:58:45 -05:00
Dane Springmeyer
63891cec15
finish refactor, moving to separate method off datasources to get_geometry_type and using enums all around
2012-01-17 01:09:46 -05:00
Dane Springmeyer
b0d0d06564
finish refactor, moving to separate method off datasources to get_geometry_type and using enums all around
2012-01-17 01:09:46 -05:00
Dane Springmeyer
66a0cfc81f
refactor
2012-01-14 22:35:40 -08:00
Dane Springmeyer
834310f2d8
refactor
2012-01-14 22:35:40 -08:00
Cezary Tarnowski
93ff232ca2
#1023 making gamma power default, making gamma-method awailable for polygon pattern symolizer and stroke
2012-01-13 18:20:03 +01:00
Cezary Tarnowski
53fc770495
#1023 making gamma power default, making gamma-method awailable for polygon pattern symolizer and stroke
2012-01-13 18:20:03 +01:00
Artem Pavlenko
ede232d2c1
+ apply mapnik coding convention
2012-01-13 16:30:03 +00:00
Cezary Tarnowski
e7a751987d
Merge remote-tracking branch 'upstream/master'
2012-01-13 14:49:59 +01:00
Cezary Tarnowski
afa8ecefc4
Merge remote-tracking branch 'upstream/master'
2012-01-13 14:49:59 +01:00
Cezary Tarnowski
c007a608ff
Adding gamma-method to polygon symbolizer
2012-01-12 16:58:10 +01:00
Cezary Tarnowski
c7cfdef8d4
Adding gamma-method to polygon symbolizer
2012-01-12 16:58:10 +01:00
Artem Pavlenko
0eb8e2d246
temp fix to compile FIXME
2012-01-12 10:04:49 +00:00
Artem Pavlenko
46619c17c2
feature impl update
2012-01-12 09:33:43 +00:00
Artem Pavlenko
ff386e686e
Merge remote-tracking branch 'origin/master'
...
Conflicts:
src/feature_style_processor.cpp
2012-01-10 21:38:43 +00:00
Artem Pavlenko
ec8661b5d4
Merge remote-tracking branch 'origin/master'
...
Conflicts:
src/feature_style_processor.cpp
2012-01-10 21:38:43 +00:00
Artem Pavlenko
4bf5ff57b1
+ fix typo
2012-01-10 21:32:51 +00:00
Artem Pavlenko
3011d53e34
+ fix typo
2012-01-10 21:32:51 +00:00
Artem Pavlenko
3f0fdeadf0
Merge pull request #1014 from tmcw/unbuffered_extent
...
Unbuffered extent
2012-01-10 13:31:29 -08:00
Artem Pavlenko
8652bfdae8
Merge pull request #1014 from tmcw/unbuffered_extent
...
Unbuffered extent
2012-01-10 13:31:29 -08:00
Dane Springmeyer
344f855bb6
fix compile with RENDERING_STATS
2012-01-10 13:27:41 -08:00
Dane Springmeyer
c734c516ae
fix compile with RENDERING_STATS
2012-01-10 13:27:41 -08:00
Hermann Kraus
cbcb545b65
Fix the problem reported in #1003 (NE, NW, SE not working for text-placement=simple).
...
Add test cases for this problem.
Conflicts:
src/text_placements.cpp
tests/data/placement/clean.sh
tests/data/placement/test.py
2012-01-09 23:30:22 +01:00
Hermann Kraus
f4f1e84420
Fix the problem reported in #1003 (NE, NW, SE not working for text-placement=simple).
...
Add test cases for this problem.
Conflicts:
src/text_placements.cpp
tests/data/placement/clean.sh
tests/data/placement/test.py
2012-01-09 23:30:22 +01:00
Tom MacWright
54ecfdbe9f
Merge branch 'master' into unbuffered_extent
2012-01-09 13:13:09 -05:00
Tom MacWright
1640252b69
Merge branch 'master' into unbuffered_extent
2012-01-09 13:13:09 -05:00
Artem Pavlenko
e8541e1685
Merge branch 'master' of https://github.com/tarnowsc/mapnik
2012-01-09 13:10:55 +00:00
Artem Pavlenko
ba03c5a28f
Merge branch 'master' of https://github.com/tarnowsc/mapnik
2012-01-09 13:10:55 +00:00
Artem Pavlenko
e9cb534ee3
+ store face index for faster access
...
+ avoid memory leaks
2012-01-09 13:09:19 +00:00
Artem Pavlenko
1ad6e107d3
+ store face index for faster access
...
+ avoid memory leaks
2012-01-09 13:09:19 +00:00
Cezary Tarnowski
88af05fadc
bugfix - a proper bugfix for rewinding geometry in building symbolizer
2012-01-09 13:41:38 +01:00
Cezary Tarnowski
4084d58309
bugfix - a proper bugfix for rewinding geometry in building symbolizer
2012-01-09 13:41:38 +01:00
Artem Pavlenko
2f8557ad12
fix typo
2012-01-09 12:20:25 +00:00
Artem Pavlenko
b90467cbc5
fix typo
2012-01-09 12:20:25 +00:00
Artem Pavlenko
30839b4d17
Merge branch 'master' of https://github.com/tarnowsc/mapnik
2012-01-09 12:20:07 +00:00
Artem Pavlenko
838f6872d4
Merge branch 'master' of https://github.com/tarnowsc/mapnik
2012-01-09 12:20:07 +00:00
Cezary Tarnowski
23631d31a8
bugfix - a proper bugfix for rewinding geometry in building symbolizer
2012-01-09 13:17:03 +01:00
Cezary Tarnowski
7b72898832
bugfix - a proper bugfix for rewinding geometry in building symbolizer
2012-01-09 13:17:03 +01:00
Artem Pavlenko
a95603713a
+ initialize FT_Face to null
...
+ add missing bracket
2012-01-09 12:15:14 +00:00
Artem Pavlenko
d307eff124
+ initialize FT_Face to null
...
+ add missing bracket
2012-01-09 12:15:14 +00:00
cpsandbox
2379b561af
Update src/font_engine_freetype.cpp
2012-01-08 23:06:27 -08:00
cpsandbox
ccb4340164
Update src/font_engine_freetype.cpp
2012-01-08 23:06:27 -08:00
cpsandbox
e75f00cdf4
adding support for multiple fonts in one font file, for instance .ttc
2012-01-08 21:55:18 -08:00
cpsandbox
621ebac674
adding support for multiple fonts in one font file, for instance .ttc
2012-01-08 21:55:18 -08:00
Dane Springmeyer
1b3d2324de
scons: fully workaround potential compile error with gcc/boost 1.42/ubuntu relating to interprocess bug - refs #1001 and #950
2012-01-08 17:21:04 -08:00
Dane Springmeyer
e9bb5666e7
scons: fully workaround potential compile error with gcc/boost 1.42/ubuntu relating to interprocess bug - refs #1001 and #950
2012-01-08 17:21:04 -08:00
Artem Pavlenko
544d834cee
Merge pull request #999 from tarnowsc/master
...
Bugfix for building symbolizer
2012-01-02 04:37:36 -08:00
Artem Pavlenko
883615d454
Merge pull request #999 from tarnowsc/master
...
Bugfix for building symbolizer
2012-01-02 04:37:36 -08:00
Cezary Tarnowski
68febbdbfb
bugfix - if geometry is used twice from cache it will be missing walls in building symbolizer
2011-12-30 12:35:28 +01:00
Cezary Tarnowski
46a15d50bf
bugfix - if geometry is used twice from cache it will be missing walls in building symbolizer
2011-12-30 12:35:28 +01:00
Hermann Kraus
656749de14
Fix unsigned underflow.
2011-12-23 15:01:28 +01:00
Hermann Kraus
133bd16211
Fix unsigned underflow.
2011-12-23 15:01:28 +01:00
Dane Springmeyer
d0e3f683ed
Revert "text rendering: only create objects once rather than per geometry part/placement attempt - refs #162 "
...
This reverts commit eaf8d50422
.
2011-12-22 15:01:41 -08:00
Dane Springmeyer
681930372f
Revert "text rendering: only create objects once rather than per geometry part/placement attempt - refs #162 "
...
This reverts commit eaf8d50422
.
2011-12-22 15:01:41 -08:00
Dane Springmeyer
eaf8d50422
text rendering: only create objects once rather than per geometry part/placement attempt - refs #162
2011-12-22 14:48:40 -08:00
Dane Springmeyer
f47365a927
text rendering: only create objects once rather than per geometry part/placement attempt - refs #162
2011-12-22 14:48:40 -08:00
Tom MacWright
bb5f274265
Adds unbuffered_extent_ to queries from feature_style_processor.
...
Creates a new constructor for query. Currently this is used
by the jit_datasource.
2011-12-20 16:12:37 -05:00
Tom MacWright
0fb717486c
Adds unbuffered_extent_ to queries from feature_style_processor.
...
Creates a new constructor for query. Currently this is used
by the jit_datasource.
2011-12-20 16:12:37 -05:00
Dane Springmeyer
d7c720f0af
python: reflect fontsets to enable fuller test of map.deepcopy - closes #348
2011-12-20 12:34:27 -08:00
Dane Springmeyer
bbeeaada4d
python: reflect fontsets to enable fuller test of map.deepcopy - closes #348
2011-12-20 12:34:27 -08:00
Dane Springmeyer
0f0e04e6dc
fixup fontset error reporting - a likely problem in mapnik2 upgrade - closes #596
2011-12-20 12:31:38 -08:00
Dane Springmeyer
dd8581bf5a
fixup fontset error reporting - a likely problem in mapnik2 upgrade - closes #596
2011-12-20 12:31:38 -08:00
Artem Pavlenko
c71a02e24d
add poor man's deepcopy method :
...
'''
mapnik::util::deepcopy(map_in,map_out);
'''
2011-12-20 16:26:30 +00:00
Artem Pavlenko
b3b330bcb7
add poor man's deepcopy method :
...
'''
mapnik::util::deepcopy(map_in,map_out);
'''
2011-12-20 16:26:30 +00:00
Artem Pavlenko
855a2bd49b
Merge branch 'master' into geometry_cleanup
2011-12-16 09:15:02 +00:00
Artem Pavlenko
9fe444ba29
Merge branch 'master' into geometry_cleanup
2011-12-16 09:15:02 +00:00
Artem Pavlenko
6fe8b8ac7e
untabify
2011-12-15 14:57:57 +00:00
Artem Pavlenko
f1d9a18bc9
untabify
2011-12-15 14:57:57 +00:00
Artem Pavlenko
726cea7ba4
Merge branch 'master' into geometry_cleanup
2011-12-14 14:04:30 +00:00
Artem Pavlenko
ed7abc5c51
Merge branch 'master' into geometry_cleanup
2011-12-14 14:04:30 +00:00
Artem Pavlenko
297a47fd26
Merge remote-tracking branch 'tomtom/master'
2011-12-14 13:59:47 +00:00
Artem Pavlenko
5a654248da
Merge remote-tracking branch 'tomtom/master'
2011-12-14 13:59:47 +00:00
Artem Pavlenko
fad6c614e8
remove title, abstract data members from mapnik::rule
2011-12-13 16:47:45 +00:00
Artem Pavlenko
46fea8e890
remove title, abstract data members from mapnik::rule
2011-12-13 16:47:45 +00:00
Artem Pavlenko
bf9dd32e2c
remove title,abstract members from layer class
2011-12-13 16:34:10 +00:00
Artem Pavlenko
d24e0436ea
remove title,abstract members from layer class
2011-12-13 16:34:10 +00:00
Cezary Tarnowski
4250e5de58
Changing the gamma for better visual effect
2011-12-13 15:40:47 +01:00
Cezary Tarnowski
fbe8829791
Changing the gamma for better visual effect
2011-12-13 15:40:47 +01:00
Cezary Tarnowski
b438a56ada
refactoring following comment on pull request
2011-12-13 15:28:18 +01:00
Cezary Tarnowski
79af8fdbc9
refactoring following comment on pull request
2011-12-13 15:28:18 +01:00
Cezary Tarnowski
85a55d9fa2
Merge branch 'master' of https://github.com/mapnik/mapnik
2011-12-12 11:29:00 +01:00
Cezary Tarnowski
0882f0e668
Merge branch 'master' of https://github.com/mapnik/mapnik
2011-12-12 11:29:00 +01:00
Artem Pavlenko
9d31e0a37c
Merge branch 'master' into geometry_cleanup
2011-12-12 10:17:25 +00:00
Artem Pavlenko
afe488f214
Merge branch 'master' into geometry_cleanup
2011-12-12 10:17:25 +00:00
Artem Pavlenko
b4c3c26b79
copy fontsets
2011-12-12 10:16:39 +00:00
Artem Pavlenko
7422f33811
copy fontsets
2011-12-12 10:16:39 +00:00
Artem Pavlenko
4c8bb5c0d5
Merge branch 'master' into geometry_cleanup
2011-12-12 09:20:21 +00:00
Artem Pavlenko
bf4f442b8d
Merge branch 'master' into geometry_cleanup
2011-12-12 09:20:21 +00:00
Cezary Tarnowski
8bf359451d
Adding support for height as expression for building symbolizer
2011-12-09 12:08:50 +01:00
Cezary Tarnowski
c5eb808059
Adding support for height as expression for building symbolizer
2011-12-09 12:08:50 +01:00
Konstantin Käfer
bd564449d7
fix typo
2011-12-07 23:03:14 +01:00
Konstantin Käfer
8229bcc580
fix typo
2011-12-07 23:03:14 +01:00
Konstantin Käfer
ac8b4c6d2d
Merge branch 'master' into grouped-rendering
...
Conflicts:
include/mapnik/feature_type_style.hpp
src/feature_type_style.cpp
2011-12-07 22:02:29 +01:00
Konstantin Käfer
f7cdee8312
Merge branch 'master' into grouped-rendering
...
Conflicts:
include/mapnik/feature_type_style.hpp
src/feature_type_style.cpp
2011-12-07 22:02:29 +01:00
Artem Pavlenko
00ed6ffd5e
Merge branch 'master' into geometry_cleanup
2011-12-07 09:29:41 +00:00
Artem Pavlenko
39507d30f0
Merge branch 'master' into geometry_cleanup
2011-12-07 09:29:41 +00:00
Dane Springmeyer
556bc2c869
remove special ltdl dladvise usage - no longer needed after #790
2011-12-06 18:23:01 -08:00
Dane Springmeyer
e1d0795617
remove special ltdl dladvise usage - no longer needed after #790
2011-12-06 18:23:01 -08:00
Artem Pavlenko
7209988fb0
Simplify geometry model to support: Point/LineString/Polygon
...
Multi geometries are collections of single geometries
Remove multiple_geometries parameter
2011-12-06 12:53:16 +00:00
Artem Pavlenko
cc60b74921
Simplify geometry model to support: Point/LineString/Polygon
...
Multi geometries are collections of single geometries
Remove multiple_geometries parameter
2011-12-06 12:53:16 +00:00
Dane Springmeyer
410dea5001
only serialize Parameters if one or more exist
2011-12-05 18:22:25 -08:00
Dane Springmeyer
1e8a5b58b4
only serialize Parameters if one or more exist
2011-12-05 18:22:25 -08:00
Dane Springmeyer
9e924bfa11
add ability to have typed arbitrary parameters in xml - refs #977
2011-12-05 14:46:38 -08:00
Dane Springmeyer
b78b8e735b
add ability to have typed arbitrary parameters in xml - refs #977
2011-12-05 14:46:38 -08:00
Dane Springmeyer
9d4290f686
only warn if plugin has no declared name - to avoid warnings on double registration of valid plugins
2011-12-02 19:33:38 -08:00
Dane Springmeyer
a4352a3162
only warn if plugin has no declared name - to avoid warnings on double registration of valid plugins
2011-12-02 19:33:38 -08:00
Dane Springmeyer
60de1c80cd
add support for arbitrary, custom parameters to be attached to the map during load and serialized when saved - refs #977
2011-12-02 17:48:09 -08:00
Dane Springmeyer
b03ce6e607
add support for arbitrary, custom parameters to be attached to the map during load and serialized when saved - refs #977
2011-12-02 17:48:09 -08:00
Artem Pavlenko
938d29018d
add include/mapnik/util target
2011-12-02 16:33:07 +00:00
Artem Pavlenko
1627046943
add include/mapnik/util target
2011-12-02 16:33:07 +00:00
Dane Springmeyer
2626f81a45
print warning if the plugin cannot be loaded as it is lacking an interface
2011-11-30 18:10:10 -08:00
Dane Springmeyer
bb0d204279
print warning if the plugin cannot be loaded as it is lacking an interface
2011-11-30 18:10:10 -08:00
Dane Springmeyer
c731797c53
clean up impl of attr checking for warnings - no functional change just simplified
2011-11-30 16:48:01 -08:00
Dane Springmeyer
6f3860d658
clean up impl of attr checking for warnings - no functional change just simplified
2011-11-30 16:48:01 -08:00
Artem Pavlenko
a842565915
use explicit conversions
2011-11-29 14:36:39 +00:00
Artem Pavlenko
afa08b07a8
use explicit conversions
2011-11-29 14:36:39 +00:00
kunitoki
3b3ff2e927
- palette not supported in tiff images (yet)
2011-11-28 17:18:30 +01:00
kunitoki
9618c36ebb
- palette not supported in tiff images (yet)
2011-11-28 17:18:30 +01:00
kunitoki
cb455625f1
Merge branch 'master' of github.com:mapnik/mapnik
2011-11-28 17:07:37 +01:00
kunitoki
7451846edb
Merge branch 'master' of github.com:mapnik/mapnik
2011-11-28 17:07:37 +01:00
kunitoki
e011cab6e0
- initial support for producing maps as tiff files (should be pretty straightforward to implement geotiff from here)
2011-11-28 16:59:19 +01:00
kunitoki
b0d0c97544
- initial support for producing maps as tiff files (should be pretty straightforward to implement geotiff from here)
2011-11-28 16:59:19 +01:00
Olly Smith
9fd6b0d97e
Use PROJ_ENVELOPE_POINTS for forward projection in bbox calcs too.
2011-11-24 14:45:33 +00:00
Olly Smith
b7d1c49209
Use PROJ_ENVELOPE_POINTS for forward projection in bbox calcs too.
2011-11-24 14:45:33 +00:00
Artem Pavlenko
14700dba16
switch back from mapnik2 to mapnik
...
add mapnik2 module which redirects to mapnik and issues DeprecationWarning
2011-11-23 11:33:58 +00:00
Artem Pavlenko
b689670ffd
switch back from mapnik2 to mapnik
...
add mapnik2 module which redirects to mapnik and issues DeprecationWarning
2011-11-23 11:33:58 +00:00
Artem Pavlenko
b7bf85a4d6
parse text sizes as floats
2011-11-21 13:34:33 +00:00
Artem Pavlenko
9758e256f6
parse text sizes as floats
2011-11-21 13:34:33 +00:00
Dane Springmeyer
7491d08b67
silence a few msvc cast warnings
2011-11-18 15:55:27 -08:00
Dane Springmeyer
4a8b5f27d2
silence a few msvc cast warnings
2011-11-18 15:55:27 -08:00
Artem Pavlenko
771a8ad72f
use mutex from base class
2011-11-18 09:39:57 +00:00
Artem Pavlenko
81c00d9cc5
use mutex from base class
2011-11-18 09:39:57 +00:00
Dane Springmeyer
3520033b0d
in multithreaded mode lock before creating a datasource - closes #951
2011-11-17 18:47:09 -08:00
Dane Springmeyer
1a93e5c407
in multithreaded mode lock before creating a datasource - closes #951
2011-11-17 18:47:09 -08:00
Dane Springmeyer
efa1b95cb8
add support for rendering svg icons with point placement in markers symbolizer (originally markers just supported special line placement) - closes #953 - refs #952
2011-11-16 09:56:35 -08:00
Dane Springmeyer
758428a2ca
add support for rendering svg icons with point placement in markers symbolizer (originally markers just supported special line placement) - closes #953 - refs #952
2011-11-16 09:56:35 -08:00
Dane Springmeyer
43f2fa7075
Merge branch 'master' into gsoc-crundel
2011-11-09 16:57:20 -08:00
Dane Springmeyer
d0d2efbf54
Merge branch 'master' into gsoc-crundel
2011-11-09 16:57:20 -08:00
Dane Springmeyer
c08c96d35a
Merge branch 'master' of github.com:mapnik/mapnik
2011-11-09 15:48:41 -08:00
Dane Springmeyer
686dcb608e
Merge branch 'master' of github.com:mapnik/mapnik
2011-11-09 15:48:41 -08:00
Dane Springmeyer
9e037920e0
c++ style include
2011-11-08 10:34:00 -08:00
Dane Springmeyer
9b3c5b3e03
c++ style include
2011-11-08 10:34:00 -08:00
Dane Springmeyer
6257ac57c9
sqlite: futher refactoring of sqlite plugin, allowing all tests to pass
2011-11-03 19:51:37 -04:00
Dane Springmeyer
d965bcbeae
sqlite: futher refactoring of sqlite plugin, allowing all tests to pass
2011-11-03 19:51:37 -04:00
Dane Springmeyer
b354e5e838
fix logic around icudata linking
2011-11-02 18:52:31 -04:00
Dane Springmeyer
0787fa242e
fix logic around icudata linking
2011-11-02 18:52:31 -04:00
Dane Springmeyer
06ea13fe3c
scons: link icudata if linking statically to deps
2011-11-02 13:55:18 -04:00
Dane Springmeyer
4f9c10fb05
scons: link icudata if linking statically to deps
2011-11-02 13:55:18 -04:00
Artem Pavlenko
a35b9c4eaa
add support for fractional text size
...
( use FT_Set_Char_Size )
NOTE: ensure it works as expected, currently
I see different results from different fonts.
2011-10-28 11:24:08 +01:00
Artem Pavlenko
87c1d126b8
add support for fractional text size
...
( use FT_Set_Char_Size )
NOTE: ensure it works as expected, currently
I see different results from different fonts.
2011-10-28 11:24:08 +01:00
Dane Springmeyer
d8f19fab05
always link to boost system - closes #931
2011-10-25 19:29:51 -07:00
Dane Springmeyer
e3b0e56ff4
always link to boost system - closes #931
2011-10-25 19:29:51 -07:00
Dane Springmeyer
06040d5847
Merge branch 'master' of github.com:mapnik/mapnik
2011-10-25 15:08:19 -07:00
Dane Springmeyer
6761cb0436
Merge branch 'master' of github.com:mapnik/mapnik
2011-10-25 15:08:19 -07:00
kunitoki
a7bd9ad6e8
- modified some ugly error-prone and worse piece of c++ i've ever seen in my life
2011-10-23 21:37:56 +02:00
kunitoki
517e1235e9
- modified some ugly error-prone and worse piece of c++ i've ever seen in my life
2011-10-23 21:37:56 +02:00
kunitoki
4a2151acec
- fix copyright repeats
2011-10-23 15:23:14 +02:00
kunitoki
154fb73d84
- fix copyright repeats
2011-10-23 15:23:14 +02:00
kunitoki
f1fb0c1939
- fix copyright to 2011 (script to do this will follow)
2011-10-23 15:04:25 +02:00
kunitoki
596757a269
- fix copyright to 2011 (script to do this will follow)
2011-10-23 15:04:25 +02:00
Dane Springmeyer
e45948c2ab
formatting
2011-10-22 17:25:09 -07:00
Dane Springmeyer
dffb968f70
formatting
2011-10-22 17:25:09 -07:00
Artem Pavlenko
986edc3c6e
Merge pull request #909 from MapQuest/expose-label-collision-detector
...
Exposed the label collision detector
2011-10-21 12:20:21 -07:00
Artem Pavlenko
c7e1174d6b
Merge pull request #909 from MapQuest/expose-label-collision-detector
...
Exposed the label collision detector
2011-10-21 12:20:21 -07:00
Robert Coup
03d809bb4f
crundel: add set_displacement(position) method to text_symbolizer
2011-10-19 23:58:56 -07:00
Robert Coup
e8c281f593
crundel: add set_displacement(position) method to text_symbolizer
2011-10-19 23:58:56 -07:00
Robert Coup
48311f375c
crundel: add deep-copy option for copying rules and feature_type_styles
2011-10-19 23:57:21 -07:00
Robert Coup
fae9f98014
crundel: add deep-copy option for copying rules and feature_type_styles
2011-10-19 23:57:21 -07:00
Artem Pavlenko
911981aefd
+ various win32 fixes, mainly adding extra namespace qualifiers
...
for vc++10, MAPNIK_DECL ...
2011-10-19 15:29:24 +01:00
Artem Pavlenko
9088d7bbc8
+ various win32 fixes, mainly adding extra namespace qualifiers
...
for vc++10, MAPNIK_DECL ...
2011-10-19 15:29:24 +01:00
Artem Pavlenko
fa7efc9390
remove operator-= from box2d
2011-10-19 15:14:01 +01:00
Artem Pavlenko
9a37fee17d
remove operator-= from box2d
2011-10-19 15:14:01 +01:00
kunitoki
54f312c3ca
- added initial support for 25D geometries in WKB (dropping Z)
...
- works ok for spatialite XYZ geometries 3D
2011-10-19 13:25:42 +02:00
kunitoki
02fb7740c5
- added initial support for 25D geometries in WKB (dropping Z)
...
- works ok for spatialite XYZ geometries 3D
2011-10-19 13:25:42 +02:00
kunitoki
020f870bb7
- fixed a problem in automatic sqlite wkb format determination code
...
- other cosmetics in sqlite datasource
2011-10-18 22:53:47 +02:00
kunitoki
8b9d05db0a
- fixed a problem in automatic sqlite wkb format determination code
...
- other cosmetics in sqlite datasource
2011-10-18 22:53:47 +02:00
kunitoki
2372a60ff7
- cosmetics changes to sqlite datasource plugin
...
- added initial wkbAuto to auto determine WKB type in sqlite
2011-10-18 22:19:03 +02:00
kunitoki
b23697e1b3
- cosmetics changes to sqlite datasource plugin
...
- added initial wkbAuto to auto determine WKB type in sqlite
2011-10-18 22:19:03 +02:00
Dane Springmeyer
8420e8a9c6
use boost:make_shared more widely - refs #909
2011-10-17 16:41:12 -07:00
Dane Springmeyer
3bd19a30b4
use boost:make_shared more widely - refs #909
2011-10-17 16:41:12 -07:00
Dane Springmeyer
1fe029c6e9
Merge pull request #908 from MapQuest/shield-placement-bug
...
Fixed bug in shield line placement
2011-10-17 14:08:50 -07:00
Dane Springmeyer
b7a4906978
Merge pull request #908 from MapQuest/shield-placement-bug
...
Fixed bug in shield line placement
2011-10-17 14:08:50 -07:00
Matt Amos
a2b4f9db59
Use make_shared as suggested by coding guidelines.
2011-10-13 19:34:28 +01:00
Konstantin Käfer
763ece8db6
group-by attribute for Layer
2011-10-13 01:30:18 +02:00
Dane Springmeyer
285591f370
move bundled agg sources into depedencies subdirectory (as we may bundle other deps there too to reduce clutter) and remove all traces of unused tinyxml (ptree now uses rapidxml header-only library internally) - refs #913
2011-10-11 20:22:49 -07:00
Matt Amos
b5c4bb77de
Exposed the label collision detector outside the agg_render object
...
and via Python, allowing detectors to be re-used across renderings.
2011-10-12 01:05:35 +01:00
Matt Amos
3f47de0e81
Fixed bug in shield line placement when dx/dy are used to shift
...
the label relative to the placement point.
2011-10-12 01:02:28 +01:00
Dane Springmeyer
4d5439672d
return early from map.zoom_all() if a map contains no layers
2011-10-03 20:15:57 +00:00
Dane Springmeyer
c1e2715af8
fix raster colorizer_stop comparison operator - avoids clang unused variable warning
2011-10-03 19:54:48 +00:00
Artem Pavlenko
c97399b0f6
+ move <unicode> includes to .cpp
...
+ disble 'ubidi_getBaseDirection' check for ICU < 4.6
2011-09-26 08:58:33 +00:00
Artem Pavlenko
3d6ea00c66
+ linewrap-patch-r3362.patch from dimka ( #189 )
2011-09-25 19:43:02 +00:00
Artem Pavlenko
a88a49960d
+ update shield-symbolizer to use 'transformed' label extent ( #808 )
2011-09-25 17:58:13 +00:00
Artem Pavlenko
12072606d6
+ fixed bounding box calculation to use transform ( #808 )
2011-09-23 15:52:32 +00:00
Dane Springmeyer
00e8f06f13
ensure the experimental svg_renderer compiles
2011-09-16 16:18:10 +00:00
Alberto Valverde
36dcffd2de
forgot to add warp.cpp as a source
2011-09-16 14:57:40 +00:00
Alberto Valverde
43dd7978cf
improved comments
2011-09-16 14:38:36 +00:00
Alberto Valverde
4ff5404a57
added includes for config.hpp (PROJ_ENEVLOPE_POINTS)
2011-09-16 14:35:47 +00:00
Alberto Valverde
4444907855
ported warer warping functionallity to cairo renderer. Closes #887
2011-09-16 14:34:14 +00:00
Alberto Valverde
e41abb0e12
add a label attribute to colorizer_stop
2011-09-16 13:32:16 +00:00
Alberto Valverde
97431c8de4
made mesh_size configurable
2011-09-16 12:21:21 +00:00
Alberto Valverde
dd5713740d
support for other filters other than bilinear when warping rasters. default near scaling is about 20% faster than before. However, for some reason, bilinear is nor about 300% slower
2011-09-16 11:09:08 +00:00
Hermann Kraus
e877b6197a
Support new Shield/TextSymbolizer syntax.
2011-09-16 00:02:42 +00:00
Alberto Valverde
ec11ba8311
fixed calculation of target polygon when warping rasters. Shrinked rasterizer window back to pre r3344 size since it was to mask artifacts due to the badly calculated polygon
2011-09-15 08:29:59 +00:00
Dane Springmeyer
937134430a
only output the total layer rendering time after processing all styles
2011-09-14 22:58:08 +00:00
Alberto Valverde
e6cb8eb8b3
slightly larger rasterizer window for better quality
2011-09-14 16:25:10 +00:00
Alberto Valverde
66b66d0754
using define for PROJ_ENVELOPE_POINTS
2011-09-14 16:22:23 +00:00
Alberto Valverde
8096c1eecb
tentaiove fix for #880
2011-09-14 15:37:14 +00:00
Alberto Valverde
85c165d327
reverted to old calculation of scale_method
2011-09-14 12:36:09 +00:00
Alberto Valverde
a7c12a3765
removed redundant bounds checks (I asuume AGG already makes sure not to write outside the buffer). Moved object creation from inside loop
2011-09-14 11:50:06 +00:00
Alberto Valverde
ad31aa717a
better bounds checking
2011-09-14 00:13:46 +00:00
Alberto Valverde
785303f2dc
not using coords of center of pixel since it is now in origin coordinates
2011-09-13 23:55:04 +00:00
Alberto Valverde
1edc6ceceb
using AGG for interpolating when warping (for real now)
2011-09-13 23:48:55 +00:00
Alberto Valverde
226e382214
projecting map extent before calculating resolution in order to obtain sensible values. Commented out AGG interpolating when warping because it doesn't work. I must have been linking against the wrong thing when developing, sorry, will fix tomorrow
2011-09-13 23:20:51 +00:00
Alberto Valverde
5508af6b76
typo
2011-09-13 17:14:36 +00:00
Alberto Valverde
6ffbd07174
use AGG for interpolation when warping rasters
2011-09-13 15:41:39 +00:00
Artem Pavlenko
c1a12f65c0
+ use 'stroke-dashoffset' to match SVG/CSS specs
2011-09-13 14:51:51 +00:00
Artem Pavlenko
fad2d7739b
+ change wkb interface to work directly on ptr_vector<geometry_type>
...
+ expose ptr_vector<geometry_type> in feature
2011-09-13 11:54:04 +00:00
Dane Springmeyer
6968adaf40
remove unneeded clip
2011-09-13 01:44:08 +00:00
Dane Springmeyer
cd8baba3be
match css exactly for alignment names - fixes #807
2011-09-12 20:15:13 +00:00
Dane Springmeyer
9bda9c7019
support raster reprojection - adapted from work at https://github.com/albertov/mapnik2/ - nice work alberto and meteogrid - closes #663
2011-09-12 18:41:44 +00:00
Dane Springmeyer
67df69834f
allow reprojection of batches of points - patch cherry picked from albertov's work on optimizing raster reprojection performance (upcoming) - closes #877
2011-09-12 18:30:34 +00:00
Dane Springmeyer
93123e8e0e
minor touchups to feature_style_processor to prepare for upcoming changes
2011-09-12 17:54:39 +00:00
Dane Springmeyer
ac3e43e5a4
support faster wgs84->merc transforms, a very common reprojection scenario in web mapping - added benefit of this approach is easy clipping for robust handling of out of bounds mercator coords - closes #839
2011-09-12 02:10:58 +00:00
Dane Springmeyer
0ec7ef6d46
renderers can now report to image if any features have been rendered via im.painted(), and im.background now uses boost optional to allow easy detection of whether a background has been set - closes #875
2011-09-11 06:24:26 +00:00
Dane Springmeyer
3ad234bce8
early return from rendering text labels if polygon width does not meet minimum threashold - refs #840
2011-09-10 08:50:07 +00:00
Dane Springmeyer
ae9dedeb27
add line_symbolizer cpp
2011-09-09 23:46:39 +00:00
Dane Springmeyer
67d7a3a6f0
add alternative line rasterizer that can be enabled to draw faster lines at the expense of dropping short geometries - for thin lines has nicer look but should not be used with think lines - refs #873
2011-09-09 23:45:49 +00:00
Dane Springmeyer
5e704d4b0b
maintain boost 1.42 compatibility by disabling new wkt parser for boost <= 1.46
2011-09-09 09:26:11 +00:00
Artem Pavlenko
aba5f21936
+ applied patch from itayperl (bidi-mirroring-SVN-r3110.patch)
2011-09-08 15:08:17 +00:00
Artem Pavlenko
53b50c871c
+ modify WKT parser to work with ptr_vector<geometry_type>
...
+ fix memory leaks in wkt_grammar
+ add support for GEOMETRYCOLLECTION
2011-09-08 11:52:51 +00:00
Dane Springmeyer
31103e4ea8
apply "fast math" patch from Herm for using faster trigonometric functions for placement - refs #840
2011-09-08 03:47:56 +00:00
Artem Pavlenko
91c315aee7
applied patch from kkaefer (gist: 9e0d59a418f8ca653d26)
2011-09-07 20:01:01 +00:00
Artem Pavlenko
02c143895d
+ refactor palette stuff a bit
...
TODO: We need to change save_to_file|string interface
to avoid passing dummy rgba_palette objects.
2011-09-07 15:01:25 +00:00
Dane Springmeyer
25196e3a8e
revise png palette api by removing default arguments to ensure no temporary references
2011-09-07 00:45:18 +00:00
Dane Springmeyer
4015d0c13b
warn if a layer has no style
2011-09-05 19:32:24 +00:00
Dane Springmeyer
aa5cfad4b7
add minimum-path-length to text_symbolizer - closes #865
2011-09-04 17:33:48 +00:00
Hermann Kraus
a4475b9ac8
Remove redundant trigonometric calculations to improve performance ( #840 ).
2011-09-02 14:44:11 +00:00
Dane Springmeyer
914ad079ec
add back AlsoFilter support - re-closes #820
2011-09-02 13:10:14 +00:00
Dane Springmeyer
a966dfd7f9
scons: ensure cairo flags are set before any special handling of libmapnik env source compile flags
2011-09-01 21:04:41 +00:00
Dane Springmeyer
a8cc348483
rendering stats: print srs values when warning about reprojection
2011-09-01 15:28:08 +00:00
Dane Springmeyer
8e94bf9188
expose first pass at rendering statistics via build option 'RENDERING_STATS' - refs #780
2011-09-01 05:14:25 +00:00
Dane Springmeyer
2052e072c1
remove debug prints and lessen unneeded indenting - no functional change
2011-09-01 04:49:59 +00:00
Dane Springmeyer
d4af1dbfaa
add needed include
2011-09-01 01:18:10 +00:00
Dane Springmeyer
b2dc2fa6d2
move feature_style_processor to cpp
2011-09-01 00:44:27 +00:00
Dane Springmeyer
6003a647f3
add needed include for evaluating expressions to prepare for moving feature_style_processor to cpp file
2011-09-01 00:43:46 +00:00
Dane Springmeyer
a013cd5032
add support for fixed color palettes when encoding to png
2011-08-31 02:28:14 +00:00
Dane Springmeyer
477c317753
fix typo
2011-08-31 00:25:03 +00:00
Dane Springmeyer
ce09895a53
add cache-features of list of attributes not to warn about on layer
2011-08-30 23:10:10 +00:00
Dane Springmeyer
9e87c9f914
apply patch from Peter Körner adding AlsoFilter functionality - closes #820
2011-08-30 17:38:27 +00:00
Dane Springmeyer
22c39d91ba
scons: rename all SConscript files to more friendly name of 'build' with a python extension for quick syntax detection in editors
2011-08-30 05:32:01 +00:00
Dane Springmeyer
2abe4d8960
don't muffle any exceptions during load_map
2011-08-29 23:51:15 +00:00
Dane Springmeyer
2c75feed65
scons: fix bug that propagated libmapnik CXXFLAGS too liberally (in this case to plugins)
2011-08-29 23:01:33 +00:00
Dane Springmeyer
6cb31bd109
scons: better propagation of libmapnik build flags to command line utilities and mapnik-config - also remove conditional flags on specific cairo rendering .cpp files as this was not working right - closes #837
2011-08-29 21:12:22 +00:00
Dane Springmeyer
22f6c9f01a
add a few direct includes
2011-08-29 21:07:45 +00:00
Dane Springmeyer
8a5e7b9f9a
correctly initalize markers_symbolizer default values - avoid segfaul in carto-parser
2011-08-28 16:49:02 +00:00
Dane Springmeyer
caf541d87e
add support for controlling zlib compression level and strategy when encoding to png - patch from kkaefer - closes #841
2011-08-26 05:58:21 +00:00
Dane Springmeyer
1231b96872
link to boost system on all platforms, if available - fixes debian/ubuntu compiles with packaged boost - closes #823
2011-08-17 14:32:08 +00:00
Dane Springmeyer
2922a0db02
scons: don't link agg if runtiming linking is static
2011-08-13 03:25:07 +00:00
Dane Springmeyer
da834706c6
scons: start condensing more global variables and improve support for static linking
2011-08-12 20:01:09 +00:00
Dane Springmeyer
3b424e3767
allow compile against ICU 4.0 - needed to be able to link against osx provided libicucore.dylib
2011-08-11 21:13:55 +00:00
Dane Springmeyer
af62ad9c27
scons: collect and propogate the libs used to link libmapnik
2011-08-11 21:11:11 +00:00
Dane Springmeyer
82ac99611e
add LINKING option to control whether libmapnik is build static or shared and RUNTIME_LINK options to trigger dependency flags to compile against static libs
2011-08-11 19:14:00 +00:00
Dane Springmeyer
731bc4e99c
fix intialization order warning
2011-08-04 19:05:28 +00:00
Dane Springmeyer
81bf8b3d06
expose the name2file mapping of font family/style and font file publically so apps can ask mapnik where a given font face was found on the filesystem
2011-07-29 18:03:45 +00:00
Hermann Kraus
53e0b22c2b
Added metawriter helper function.
2011-07-28 22:59:05 +00:00
Hermann Kraus
607f4e7c99
Applied patch from Peter Körner (with small changes).
2011-07-23 00:11:01 +00:00
Dane Springmeyer
85804b797f
typo
2011-07-16 15:45:40 +00:00
Hermann Kraus
08f1a71e4b
Fix default value.
2011-07-16 12:40:33 +00:00
Hermann Kraus
4a7249ca50
Actually use the new pixel coordinate function.
2011-07-16 12:32:39 +00:00
Hermann Kraus
8bb6df1a07
Optionally output JSON data with pixel coordinates.
2011-07-16 12:24:52 +00:00
Dane Springmeyer
abcba2bc34
#759 is fixed, revert r3008
2011-07-16 00:25:30 +00:00
Robert Coup
8e8f43e50f
Fix incorrect blending of rasters with alpha channel. Use pixfmt_rgba32_plain rather than pixfmt_rgba32, and undo old changes to blender_rgba<>::blender_pix which aren't needed anymore. Thanks @rfw, @cdestigter, @albertov [ fixes #759 ]
2011-07-15 03:59:44 +00:00
Dane Springmeyer
7b871210c7
use namespace to avoid potential clash
2011-07-09 00:28:41 +00:00
Dane Springmeyer
f156e147d3
rollback to using pre r2543 methods for bilinear scaling (non agg) - to be used until #759 is resolved
2011-07-07 21:24:17 +00:00
Dane Springmeyer
7e1c4a58b0
add code comment about ltdl global advise usage in relation to #790
2011-07-05 23:50:30 +00:00
Dane Springmeyer
3bbd4b9b3a
remove uneeded semicolon
2011-07-05 23:39:50 +00:00
Dane Springmeyer
c4fa04cdad
don't suppress exception in mapnik::color constructor when init from a string
2011-07-05 23:01:51 +00:00
Dane Springmeyer
476e04c4c7
add gamma to polygon-pattern-symbolizer, useful for avoiding AA affects at tile edges so that global patterns can have seamless alignment
2011-06-28 22:37:35 +00:00
Dane Springmeyer
4dde8e8d9e
warning if non svg file passed to markers_symbolizer
2011-06-24 20:34:21 +00:00
Dane Springmeyer
e94667a8ae
use std::string
2011-06-24 00:53:00 +00:00
Dane Springmeyer
45965381af
throw if we encounter a font file which lacks any referencable names (freetype family_name and style_name) making it basically invalid
2011-06-24 00:51:21 +00:00
Dane Springmeyer
086138dedc
switch back to using grid width/height to allow for variable size grid to be rendered (purely for testing)
2011-06-16 18:08:04 +00:00
Dane Springmeyer
5f53246337
fix bug in width/height of transform in grid_renderer
2011-06-16 16:48:30 +00:00
Dane Springmeyer
1829093fc9
copy string, don't get reference from boost::filesystem::path
2011-06-13 21:42:44 +00:00
Artem Pavlenko
4a72a7d680
+ fix color(std::string const& ) ctor to initialize r,g,b,a.
...
+ impl eq ops using boost::equality_comparable.
+ output alpha in to_hex_string if not 255.
2011-06-07 16:14:02 +00:00
Dane Springmeyer
104dd25a94
grid_renderer: only clamp markers size if initial grid resolution is reduced
2011-06-04 00:20:29 +00:00
Dane Springmeyer
7da40e3700
grid_renderer: rename step->resolution
2011-06-04 00:16:16 +00:00
Dane Springmeyer
840bb52de6
avoid compiler warning
2011-06-01 18:53:47 +00:00
Dane Springmeyer
c230ed6733
add alternative bbox forward/inverse functions
2011-05-31 22:38:15 +00:00
Hermann Kraus
8474976353
Prepare for merging "text_placement_info" and "placement".
2011-05-30 01:16:21 +00:00
Hermann Kraus
de089f0d68
Add alignment to text_placement_info.
2011-05-29 22:33:41 +00:00
Dane Springmeyer
1d07c81316
add missed commits to complete the support for map 'base'
2011-05-25 23:51:40 +00:00
Dane Springmeyer
7a17c7e597
load_map_from_string has always accepted a base path argument to drive the interpretation of relative paths in the stylesheet when loaded in memory- this really should be a full map property so that it can be known on the map object after parsing and changed if the map is saved to a new location
2011-05-25 23:48:07 +00:00
Dane Springmeyer
ba15947a4f
add Projection.expanded() function to ask proj4 what its internal, normalized definition looks like (useful only for debugging)
2011-05-17 19:05:15 +00:00
Dane Springmeyer
e119dc503c
move to binary grid renderer for non-aa output rather than setting gamma on aa renderer
2011-05-17 06:24:49 +00:00
Dane Springmeyer
3469c20f1c
adapt to new svg renderer template
2011-05-17 06:19:41 +00:00
Dane Springmeyer
b578c02c54
make renderer type a template argument of agg svg renderer
2011-05-17 06:18:06 +00:00
Dane Springmeyer
9458e2d890
stroke-dash-offet -> stroke-dash-offset (spelling)- #762
2011-05-17 00:33:24 +00:00
Alberto Valverde
d5dafdc2be
reverted patch which was committed by mistake
2011-05-12 18:11:16 +00:00
Alberto Valverde
0e0c4aa82c
integrated test case from #759
2011-05-12 18:09:03 +00:00
Dane Springmeyer
aeb1b7f963
renable previous (non-agg) internal bilinear scaling method for testing #759a
2011-05-12 16:43:23 +00:00
Hermann Kraus
1cff36576c
Remove empty files.
2011-05-11 12:04:18 +00:00
Hermann Kraus
f001d46efc
Fix build errors introduced by r2889.
2011-05-11 00:49:52 +00:00
Dane Springmeyer
90fbd6a204
use boost::make_shared to avoid explicit new and ensure fast and exception safe allocation
2011-05-10 21:09:54 +00:00
Artem Pavlenko
53c8225246
+ Shield/text misalignment patch from Ldp
...
( http://trac.mapnik.org/ticket/739 )
2011-05-10 21:05:40 +00:00
Artem Pavlenko
3bef010056
+ move feature_factory.hpp include to impl file
2011-05-09 13:52:06 +00:00
Artem Pavlenko
498809dde8
+ don't scale shield (scale_factor is applied in agg_renderer<T>::render_marker)
2011-05-09 13:51:50 +00:00
Dane Springmeyer
1b1bd4b02e
sync cairo with agg renderer after r2876
2011-05-06 00:36:09 +00:00
Dane Springmeyer
f925c395e5
apply patch from kevin for #756
2011-05-06 00:33:49 +00:00
Dane Springmeyer
1070b293ad
tabs -> spaces
2011-05-04 15:53:36 +00:00
Dane Springmeyer
bae28f509e
wrap raster_colorizer in mapnik ns and remove uneeded includes
2011-05-04 05:19:58 +00:00
Dane Springmeyer
37118c6d5f
ensure valid attributes on the RasterSymbolizer and RasterColorizer, warning if not
2011-05-04 01:57:37 +00:00
Dane Springmeyer
0a278e7c49
slighly more restrictive default max_char_angle_delta
2011-05-04 01:53:20 +00:00
Dane Springmeyer
d05b0c539f
apply major refactor of RasterColorizer by ben moores from https://github.com/BenMoores/mapnik-trunk/wiki/RasterColorizer - closes #523
2011-05-04 00:20:17 +00:00
Dane Springmeyer
2c275729b1
initialize variables
2011-05-03 21:38:35 +00:00
Dane Springmeyer
adb44a6ec2
account for scaling and alpha of bitmap images in grid_renderer
2011-05-02 22:33:11 +00:00
Dane Springmeyer
e69f17eb35
add ability to pass a scaling ratio just to the affine scaling - needed by grid_renderer
2011-05-02 22:30:50 +00:00
Dane Springmeyer
c413d67b82
sync cairo's text rendering with agg
2011-04-30 00:07:03 +00:00
Dane Springmeyer
157d52e38f
add option to collect the total extent of all placement bboxs to enable passing along to metawriters - modified patch from kevin.kreaiser - closes #755
2011-04-30 00:06:27 +00:00
Dane Springmeyer
ab94fd43d8
add test for grid generation, and make sure point_datasource feature id starts at 1 (as datasources should)
2011-04-29 19:25:00 +00:00
Dane Springmeyer
e9e88e0481
remove uneeded includes
2011-04-29 17:40:15 +00:00
Dane Springmeyer
b072de4769
create layer descriptor when memory_datasource is created - TODO - gather attribute descriptors as features are added
2011-04-28 17:36:36 +00:00
Dane Springmeyer
31eea84d85
get iterator type right after r2843
2011-04-27 21:06:07 +00:00
Hermann Kraus
6650f999b9
char is to short for unicode chars. Replace it with unsigned int. Should fix #746 .
2011-04-27 20:28:53 +00:00
Dane Springmeyer
5eea164b5a
add grid_renderer backend
2011-04-26 21:44:52 +00:00
Dane Springmeyer
9da2d701a5
further template the svg_renderer based on pixfmt
2011-04-26 17:38:18 +00:00
Dane Springmeyer
7d394f3d09
load_map: report and check transform in all cases
2011-04-26 17:33:41 +00:00
Dane Springmeyer
5bbc89674e
update comments
2011-04-19 00:20:04 +00:00
Dane Springmeyer
f8b3a4b946
add serialization of all markers_symbolizer attributes
2011-04-18 01:17:57 +00:00
Dane Springmeyer
7d08f76e50
add missing 'base' parameter to parse_shield_symbolizer and correct spelling of 'filter-factor' for parse_raster_symbolizer - closes #752
2011-04-18 01:11:38 +00:00
Dane Springmeyer
e00702cd79
touchup error message if zoom_all() fails
2011-04-15 22:46:53 +00:00
Dane Springmeyer
e79e7a1413
box2d: when copying actually copy exactly rather than using init to enforce validity - closes #749
2011-04-14 19:26:49 +00:00
Dane Springmeyer
7570cb5d73
load and save the new map 'maximum-extent' attribute
2011-04-14 02:32:51 +00:00
Dane Springmeyer
8998296f7b
add 'maximum-extent' attribute to map and use this, if set, in place of calculated layer extents in zoom_all()
2011-04-14 02:20:33 +00:00
Dane Springmeyer
ac3488efb6
fix return from proj_transform when coordinates cannot be reprojected
2011-04-13 21:03:15 +00:00
Dane Springmeyer
9b1080e72e
don't warn if mmap's file is missing (shapefile does not have an index)
2011-04-13 20:09:52 +00:00
Dane Springmeyer
383d8a3f15
add proj_transform forward/backward box2d implementation
2011-04-13 19:40:44 +00:00
Dane Springmeyer
903d1b49ef
add a clip method to mapnik::box2d
2011-04-13 19:19:23 +00:00
Artem Pavlenko
7191d56a16
+ throw image_reader_exception if we can't read tiff file
...
+ catch image_reader_exceptions in raster.input
+ re-throw in bind()
2011-04-11 21:17:10 +00:00
Artem Pavlenko
0e0b7a578c
+ implement memory mapping using boost::interprocess
...
+ cache mapped memory regions for re-use
2011-04-06 13:02:31 +00:00
Dane Springmeyer
2699ba42d0
avoid unused parameter compiler warnings
2011-04-04 04:35:28 +00:00
Dane Springmeyer
33f6cbf13d
jpeg reader: make to sure call jpeg_finish_decompress if scanlines have been read
2011-04-04 04:03:03 +00:00
Dane Springmeyer
2d1e2ef998
add valid() method to box2d, and comment subtraction override as it does not have any function currently
2011-04-04 03:50:09 +00:00
Dane Springmeyer
27cc2f0dc5
catch errors in build time pkg-config parsing - closes #738
2011-04-02 03:11:42 +00:00
Dane Springmeyer
8f4386b7b2
use dynamically allocated, scoped array instead of variable-size array, which ISO C++ forbids
2011-04-02 03:07:45 +00:00
Dane Springmeyer
470f48beab
avoid compiler warning of 'cast between pointer-to-function and pointer-to-object is an extension' with clang/gcc
2011-04-02 00:43:20 +00:00
Dane Springmeyer
d0e98eb3f1
handle return of fread
2011-04-01 23:54:58 +00:00
Dane Springmeyer
c1a6a54060
remove tabs
2011-04-01 20:47:26 +00:00
Dane Springmeyer
b65c932ac0
avoid -pedantic warnings
2011-04-01 07:20:41 +00:00
Dane Springmeyer
84ea9e6101
avoid clang++ -pedantic compiler warnings
2011-04-01 06:24:57 +00:00
Dane Springmeyer
eafac7fc7b
comment out currently unused agg renderer headers
2011-04-01 06:14:55 +00:00
Dane Springmeyer
14068cad23
move segment y_order sort to header that can be used by each renderer
2011-03-22 00:02:50 +00:00
Artem Pavlenko
ec4ef1bb34
+ add missing files from 735_metawriter_inmem.patch
2011-03-16 16:50:02 +00:00
Artem Pavlenko
e580078d26
+ apply MetaWriter patch from zerebubuth
...
( see #735 for details )
2011-03-16 13:32:04 +00:00
Artem Pavlenko
b543d7f1f4
+ add optional length parameter to allow
...
passing not-null terminated char strings
2011-03-16 13:31:56 +00:00
Robert Coup
8ace5b7e6b
position shield symbolizer symbols centered (ie. with text), rather than top-left in cairo output. re #737 - thanks @jburgess for testing and @Ldp for the patch.
2011-03-15 22:25:37 +00:00
Dane Springmeyer
c93984f06f
fix spelling
2011-03-15 20:50:30 +00:00
Hermann Kraus
f9040c6026
Show error message when invalid placement algorithm is selected.
2011-03-11 14:18:34 +00:00
Dane Springmeyer
4079fd7d08
make feature caching optional, and disabled by default (to avoid std::bad_alloc in low memory environments). Can be set as new layer property 'cache-features' - closes #657
2011-03-01 17:09:29 +00:00
Dane Springmeyer
efb19dea6c
make the requirement of boost_regex unicode support optional by detecting if boost_regex was itself built with ICU support
2011-02-28 20:00:56 +00:00
Dane Springmeyer
2ea0340e2d
avoid unintialized variable warnings in g++
2011-02-28 18:30:38 +00:00
Hermann Kraus
714f918332
Fix indentation.
2011-02-28 13:29:39 +00:00
Hermann Kraus
4af0696b9d
Add support for multiple placements.
...
NOTE: In some places indention is not updated to keep this patch readable. This will be fixed in the next revision.
2011-02-28 13:17:46 +00:00
Dane Springmeyer
4206c46f58
revert unintended change
2011-02-25 21:02:33 +00:00
Dane Springmeyer
03ee4570be
make sure to install svg and wkt include files - thanks kiorky for initial patch - closes #718
2011-02-25 21:00:05 +00:00
Dane Springmeyer
545960a340
fix point_placement enum checking
2011-02-24 18:05:07 +00:00
Artem Pavlenko
d5bcf8dccb
+ fix include paths
...
+ update src/SConscript
2011-02-24 15:54:59 +00:00
Artem Pavlenko
57db45095f
+ boost.spirit WKT parser using mapnik::geometry_type
...
as synthesized attribute.
2011-02-24 15:47:53 +00:00
Artem Pavlenko
93514d57a2
+ add missing geometry types
...
+ correct geometry types in wkb reader
2011-02-24 15:47:36 +00:00
Dane Springmeyer
9d351be091
update cairo renderer to include text-transform 'captitalize' support
2011-02-21 20:46:07 +00:00
Dane Springmeyer
a317c5d051
add 'capitalize' option to text-transform - closes #715
2011-02-21 20:43:26 +00:00
Carlos López
83a7b4710e
Fixed a bug that caused half of the vertexes to disappear from the SVG path.
...
+ mapnik::geometry_iterator was replaced by mapnik::svg::path_iterator
+ svg::path_output_grammar was simplified
+ the container for this grammar is now coord_transform2, instead of geometry
+ added typedef size_type to coord_transform2 and removed it from geometry
2011-02-14 03:40:25 +00:00
Dane Springmeyer
f348c489ad
fix property names in load_map error response
2011-02-11 21:32:47 +00:00
Dane Springmeyer
a9cda83300
check XML attributes for markers_symbolizer
2011-02-09 07:51:52 +00:00
Dane Springmeyer
0d5d014474
*warning* breaking change: move to consisten use of dashes (see #644 ), and start validating property names by printing warning if they are not valid ( closes #110 )
2011-02-05 03:15:17 +00:00
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