Dane Springmeyer
|
4d82a97814
|
implement support in cairo and grid renderer for mapnik::request - refs #1737
|
2013-02-26 15:05:44 -05:00 |
|
Dane Springmeyer
|
e16567fecb
|
fixup std:: prefixing of cmath functions - closes #1694
|
2013-01-17 13:53:48 -08:00 |
|
Dane Springmeyer
|
18e23be9c0
|
merge work from mappy/abonnasseau allowing buffer-size to be overiddend by layer - closes #1566
|
2013-01-15 18:53:34 -08:00 |
|
Dane Springmeyer
|
f315a87874
|
further cleanup of expression related headers
|
2013-01-08 15:12:39 -08:00 |
|
Dane Springmeyer
|
c860c9165e
|
various fixes to includes to include what is used
|
2013-01-03 18:06:07 -08:00 |
|
Dane Springmeyer
|
775215e874
|
Merge branch 'master' of github.com:mapnik/mapnik into bigint-feature-id
|
2012-12-19 20:13:19 -08:00 |
|
Dane Springmeyer
|
66a5c26fdc
|
leverage mapnik::value_integer for feature.id() and grid rendering buffer - refs #1662
|
2012-12-19 19:24:52 -08:00 |
|
Dane Springmeyer
|
326b980172
|
cleanup usage of grid pixel types
|
2012-12-19 19:19:30 -08:00 |
|
Dane Springmeyer
|
fa1ac1307f
|
use grid value_type instead of hardcoding int for feature id type
|
2012-12-19 19:17:42 -08:00 |
|
Dane Springmeyer
|
772c7f52fc
|
knock out some msvc compiler warnings
|
2012-12-12 15:59:27 -08:00 |
|
Dane Springmeyer
|
6b84269343
|
add pad method on box2d to help tighten otherwise verbose code
|
2012-12-11 13:56:25 -08:00 |
|
Dane Springmeyer
|
f39c3ad857
|
add marker-multi-policy parameter to support user-configurable rendering behavior for multi-geometries when using either point or interior placement - closes #1573, refs #1555
|
2012-11-20 17:58:39 -08:00 |
|
Dane Springmeyer
|
eebc8cc73e
|
add image/grid clear methods to make it easier to quickly re-use previously allocated objects for rendering - closes #1571
|
2012-11-11 21:35:50 -08:00 |
|
Alexandre Bonnasseau
|
efff5f0ef0
|
Issue #1545 - override buffer-size parameter at layer level - revised
|
2012-11-08 15:51:22 +01:00 |
|
Dane Springmeyer
|
72793fe9b6
|
explicitly include deque - thanks @lightmare - should fix gcc compile
|
2012-10-04 12:03:40 -07:00 |
|
Dane Springmeyer
|
a27b95558b
|
remove uneeded includes
|
2012-10-03 13:48:05 -07:00 |
|
artemp
|
29423cfc1c
|
Merge branch 'master' into conv_simplify
Conflicts:
bindings/python/mapnik_markers_symbolizer.cpp
plugins/input/ogr/ogr_index_featureset.cpp
plugins/input/shape/dbfile.cpp
plugins/input/shape/shapefile.hpp
src/load_map.cpp
|
2012-09-07 16:46:02 +01:00 |
|
artemp
|
967d6110bf
|
+ singleton: return ref from instance() method
|
2012-09-07 16:23:03 +01:00 |
|
Konstantin Käfer
|
ae865a59fb
|
Merge branch 'master' into conv_simplify
Conflicts:
include/mapnik/vertex_converters.hpp
|
2012-08-28 20:37:27 +02:00 |
|
Dane Springmeyer
|
5120d0398d
|
add build file for headers and svg/output code directories to hold the svg_renderer used for output - refs #1438
|
2012-08-27 17:58:49 -07:00 |
|
Konstantin Käfer
|
13c46b6cc6
|
Merge branch 'master' into conv_simplify
Conflicts:
bindings/python/mapnik_line_symbolizer.cpp
bindings/python/mapnik_polygon_symbolizer.cpp
|
2012-08-24 23:29:43 +02:00 |
|
Konstantin Käfer
|
4e1423cefe
|
Merge branch 'master' of git://github.com/mapnik/mapnik into conv_simplify
Conflicts:
src/cairo_renderer.cpp
|
2012-08-24 23:24:31 +02:00 |
|
Dane Springmeyer
|
a256008283
|
fix typo
|
2012-08-22 18:08:06 -07:00 |
|
Dane Springmeyer
|
c3dae01055
|
avoid clipping polygons if reprojecting to work around #1399 until we have a more proper solution (refs #1282)
|
2012-08-22 17:38:34 -07:00 |
|
Dane Springmeyer
|
57363c13c1
|
sync agg with grid renderer for polygon patterns - refs #1309
|
2012-08-22 17:37:03 -07:00 |
|
Dane Springmeyer
|
9539ce96a6
|
for 2.1 release hold back clipping on lines with markers to avoid #1426 (refs #1424)
|
2012-08-21 13:27:35 -07:00 |
|
Dane Springmeyer
|
0eff77c03e
|
return without rendering if label placement algorithm returns false indicating a degenerate geometry - closes #1423 and refs #1424
|
2012-08-21 12:51:39 -07:00 |
|
Dane Springmeyer
|
a57996e661
|
sync markers rendering between agg and grid - closes #1309
|
2012-08-14 17:18:44 -07:00 |
|
Dane Springmeyer
|
7a5f06656c
|
allow setting marker width/height together with transform
|
2012-08-14 17:11:08 -07:00 |
|
Konstantin Käfer
|
dcd7a07c8e
|
simplify-tolerance property boilerplate
|
2012-08-14 17:04:57 +02:00 |
|
Dane Springmeyer
|
3d91ca3821
|
sync agg/grid line symbolizer rendering - refs #1309
|
2012-08-06 08:29:08 -06:00 |
|
Dane Springmeyer
|
e62739d146
|
fix render_marker for grid renderer and other minor syncing - refs #1309
|
2012-08-02 13:10:05 -07:00 |
|
Dane Springmeyer
|
693cc88142
|
sync grid renderer with agg for point_symbolizer - refs #1309
|
2012-08-02 11:13:44 -07:00 |
|
Dane Springmeyer
|
295c661af2
|
start setting up to sync markers_symbolizer between agg and grid renderer
|
2012-07-31 19:19:45 -07:00 |
|
Dane Springmeyer
|
e482998c51
|
rename path_ptr to the more explicit svg_path_ptr and set up markers_symbolizer rendering for upcoming changed
|
2012-07-30 21:45:46 -07:00 |
|
Dane Springmeyer
|
0d97b851fa
|
markers: support opacity on bitmaps, and move to supporting both opacity and fill-opacity
|
2012-07-30 18:31:21 -07:00 |
|
Dane Springmeyer
|
b4f3d6da11
|
include what you use
|
2012-07-24 18:35:41 -07:00 |
|
Dane Springmeyer
|
a968150f6b
|
fix compile after geometry util namespacing
|
2012-07-20 11:18:33 -07:00 |
|
artemp
|
fd209b2958
|
+ put labeling routines into its owm 'label' namespace
|
2012-07-20 17:32:38 +01:00 |
|
artemp
|
7b10400be9
|
+ update rendering code to work with new labeling methods
+ rename num_points() to size()
+ rename get_vertex() to vertex()
|
2012-07-19 16:36:44 +01:00 |
|
Dane Springmeyer
|
6d95076954
|
sync grid renderer with agg for text/shields/point - refs #1309
|
2012-07-16 11:51:14 -07:00 |
|
Dane Springmeyer
|
e9c5ab3d94
|
sync polygon rendering between agg and grid backends
|
2012-07-13 16:42:23 -07:00 |
|
Dane Springmeyer
|
bc8d6568f5
|
sync line rendering between grid and agg - refs #1309
|
2012-07-12 19:34:39 -07:00 |
|
Dane Springmeyer
|
fad8eff676
|
fix scaling of markers when render time resolution != 1
|
2012-07-12 19:01:59 -07:00 |
|
Dane Springmeyer
|
2fe306e34f
|
fix marker clamping and sync with agg renderer- refs #1309
|
2012-07-12 18:41:03 -07:00 |
|
artemp
|
279bfe7f0f
|
+ remove unused mutating methods
+ cleanup&style
|
2012-07-12 10:21:57 +01:00 |
|
artemp
|
35ab93667f
|
+ enforce const
+ pass arguments by const ref
|
2012-07-11 10:13:38 +01:00 |
|
Dane Springmeyer
|
75d2d5bdca
|
remove duplicate variable
|
2012-07-10 22:34:46 -07:00 |
|
Dane Springmeyer
|
e67463661c
|
sync grid markers_symbolizer rendering with agg
|
2012-07-10 22:32:19 -07:00 |
|
Dane Springmeyer
|
3efab11bdb
|
start carrying through the geometry clipping extent in the grid renderer
|
2012-07-10 18:39:06 -07:00 |
|
Dane Springmeyer
|
310ed4a05d
|
remove references to now unused mapnik::arrow
|
2012-07-10 18:11:43 -07:00 |
|
Dane Springmeyer
|
79ef09d1a3
|
create grid feature context with correct sorting - closes #1306
|
2012-07-09 18:40:41 -07:00 |
|
Dane Springmeyer
|
cbf821c762
|
move key grid functions to cpp file
|
2012-07-09 17:32:36 -07:00 |
|
Dane Springmeyer
|
9dd69d091b
|
merge with master
|
2012-07-05 15:40:16 -07:00 |
|
Dane Springmeyer
|
c677b4f47c
|
ensure the bounds used for avoid-edges and minimum-padding is non-buffered - refs #1283
|
2012-07-04 18:34:04 -07:00 |
|
artemp
|
9b14a7206a
|
remove arrow/ellipse ad-hoc markers - see #1285
|
2012-07-04 14:50:11 +01:00 |
|
artemp
|
8ab8f7c420
|
+ add missing miterlimit (grid,cairo)
|
2012-07-04 10:07:37 +01:00 |
|
Dane Springmeyer
|
7f531498c6
|
pass scale_factor to text_renderer in order to scale up halo_radius - refs #1273 and refs #695
|
2012-06-29 13:05:28 -07:00 |
|
Dane Springmeyer
|
67e9b0d616
|
move marker width/height to expressions - closes #1102 and replaces #1255
|
2012-06-28 19:54:25 -07:00 |
|
Artem Pavlenko
|
cec9b5798e
|
Revert "cleaner approach to a compile time magic alpha number for grid buffers"
(doesn't link : clang version 3.2 (trunk 158601))
This reverts commit 98753db9fd.
|
2012-06-26 16:53:07 +01:00 |
|
Artem Pavlenko
|
f8a7d06034
|
Merge remote-tracking branch 'origin/master'
|
2012-06-26 15:02:28 +01:00 |
|
Artem Pavlenko
|
5bc9f73506
|
+ markers_symbolizer: support affine geometry transformations
+ fix markers bounding box calc
+ fix spacing logic to use transformed marker width
|
2012-06-26 15:00:42 +01:00 |
|
Dane Springmeyer
|
98753db9fd
|
cleaner approach to a compile time magic alpha number for grid buffers
|
2012-06-25 17:57:52 -07:00 |
|
Dane Springmeyer
|
18cf6b1bdd
|
remove unneeded header
|
2012-06-25 17:28:01 -07:00 |
|
Dane Springmeyer
|
5b61c093e5
|
initialize grid buffers to std::numeric_limits<int>::min() and use that value to mean no-hit or non-interactive pixels - closes #1065
|
2012-06-23 22:41:07 -04:00 |
|
Dane Springmeyer
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
a789ffd2a8
|
Merge branch 'master' into compositing
|
2012-05-07 10:24:47 +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
|
77dfac5622
|
+ re-introduce transform on symbolizer_with_image
|
2012-05-01 16:47:33 +01:00 |
|
kunitoki
|
b60c508c1c
|
- finish thrashing all the useless ifdef MAPNIK_LOG
|
2012-04-09 21:41:56 +02:00 |
|
kunitoki
|
af201551b8
|
got rid of old CVS $Id comments kludge in files
|
2012-04-08 02:45:01 +02:00 |
|
kunitoki
|
1f351e0e09
|
implement new debug system
|
2012-04-08 02:20:56 +02:00 |
|
Dane Springmeyer
|
3f26c439c9
|
fix marker width/height to mean pixels - which it should have all along - closes #1134
|
2012-03-23 20:28:12 -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 |
|
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
|
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 |
|
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
|
ad86e9aebc
|
Reenable text meta writers.
|
2012-03-04 23:25:13 +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
|
46f80cc6aa
|
Use double instead of int and avoid rounding when possible.
Closes #1078.
|
2012-02-20 19:32:34 +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 |
|
Dane Springmeyer
|
17d13cff67
|
whitespace fixes - closes #911
|
2012-02-01 17:53:35 -08:00 |
|
Dane Springmeyer
|
07d7d7d537
|
convert to using feature_ptr rather than const& for renderers
|
2012-02-01 16:37:05 -08:00 |
|
Hermann Kraus
|
3e59503e25
|
ShieldSymbolizer for Grid renderer.
|
2012-01-29 04:57:56 +01:00 |
|
Hermann Kraus
|
dbc1280731
|
Process more than one geometry.
Start work on ShieldSymbolizer.
|
2012-01-26 20:05:38 +01:00 |
|
Hermann Kraus
|
1106dcb445
|
Support for cairo + grid renderer.
|
2012-01-25 16:17:38 +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
|
5fd7035527
|
Move font engine functions from .hpp to .cpp.
|
2012-01-21 01:47:02 +01:00 |
|
Hermann Kraus
|
21a58b7b7a
|
Add missing includes.
|
2012-01-20 22:43:05 +01:00 |
|
Hermann Kraus
|
537231f60e
|
Remove glyph symbolizer.
|
2012-01-19 20:34:09 +01:00 |
|
Cezary Tarnowski
|
8bf359451d
|
Adding support for height as expression for building symbolizer
|
2011-12-09 12:08:50 +01:00 |
|
Artem Pavlenko
|
a35b9c4eaa
|
add support for fractional text size
( use FT_Set_Char_Size )
NOTE: ensure it works as expected, currently
I see different results from different fonts.
|
2011-10-28 11:24:08 +01:00 |
|
kunitoki
|
f1fb0c1939
|
- fix copyright to 2011 (script to do this will follow)
|
2011-10-23 15:04:25 +02: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 |
|
Dane Springmeyer
|
8420e8a9c6
|
use boost:make_shared more widely - refs #909
|
2011-10-17 16:41:12 -07: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
|
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
|
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 |
|
Hermann Kraus
|
8474976353
|
Prepare for merging "text_placement_info" and "placement".
|
2011-05-30 01:16:21 +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
|
adb44a6ec2
|
account for scaling and alpha of bitmap images in grid_renderer
|
2011-05-02 22:33:11 +00:00 |
|
Dane Springmeyer
|
5eea164b5a
|
add grid_renderer backend
|
2011-04-26 21:44:52 +00:00 |
|