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