artemp
|
9810557cdc
|
+ geojson geometry parser implementation
|
2012-08-17 12:47:41 +01:00 |
|
artemp
|
21f86761a7
|
+ json: split feature_grammar into geometry and feature grammars
|
2012-08-17 11:25:21 +01:00 |
|
Dane Springmeyer
|
372f384365
|
fix typo: missing comma in severity enum
|
2012-08-16 16:09:52 -07:00 |
|
Dane Springmeyer
|
a986aedd05
|
remove 'info' and 'fatal' severities for logging to simplify framework - closes #1400
|
2012-08-16 15:52:32 -07:00 |
|
Konstantin Käfer
|
b243f03c90
|
use a set to make visvalingam a lot faster
|
2012-08-16 22:26:58 +02:00 |
|
Dane Springmeyer
|
bfc92a469c
|
fix and doc out behavior of register_fonts
|
2012-08-16 12:29:13 -07:00 |
|
Konstantin Käfer
|
22150f908f
|
add facilities to choose the simplification algorithm
|
2012-08-16 16:53:38 +02:00 |
|
Konstantin Käfer
|
eace6eeb2b
|
don't crash on empty geometries
|
2012-08-16 15:59:05 +02:00 |
|
Dane Springmeyer
|
c7c8d910c4
|
fix linking with svg2png on windows - closes #1375
|
2012-08-15 19:16:11 -07:00 |
|
Dane Springmeyer
|
de3afda3bc
|
remove css_color_grammar_deprecated.hpp
|
2012-08-15 16:59:22 -07:00 |
|
Dane Springmeyer
|
4cf1484b53
|
disable colorize-alpha comp-op as per #1371
|
2012-08-15 14:46:58 -07:00 |
|
Dane Springmeyer
|
71e0edc7bf
|
forward declare CoordTransform in map.hpp
|
2012-08-15 10:33:31 -07:00 |
|
Dane Springmeyer
|
2b108b7cdb
|
fixup includes
|
2012-08-15 10:26:20 -07:00 |
|
artemp
|
a991c73a98
|
+ geojson grammar : close linear_rings
|
2012-08-15 16:53:28 +01:00 |
|
artemp
|
c4765d72ce
|
+ close linear_rings in WKT parser
|
2012-08-15 16:42:46 +01:00 |
|
artemp
|
aecf0531f5
|
+ remove metawriters for the upcoming 2.1 release
|
2012-08-15 09:47:03 +01:00 |
|
Dane Springmeyer
|
7a5f06656c
|
allow setting marker width/height together with transform
|
2012-08-14 17:11:08 -07:00 |
|
artemp
|
34ce663460
|
+ change agg-stack-filter grammar to expect fun(a,b) notation
|
2012-08-14 20:03:49 +01:00 |
|
artemp
|
8d14ac7e00
|
+ use comma and space as delimiters
|
2012-08-14 19:57:28 +01:00 |
|
Konstantin Käfer
|
483ba77084
|
otf visvalingam/whyatt simplification
|
2012-08-14 20:40:37 +02:00 |
|
Konstantin Käfer
|
dcd7a07c8e
|
simplify-tolerance property boilerplate
|
2012-08-14 17:04:57 +02:00 |
|
Dane Springmeyer
|
e2b3322934
|
use typedef for color_type
|
2012-08-13 11:26:34 -07:00 |
|
artemp
|
b05344863a
|
+ implement markers_dispatch to match AGG output
|
2012-08-09 17:46:55 +01:00 |
|
artemp
|
973bc00fd7
|
+ correct types
|
2012-08-09 12:41:08 +01:00 |
|
artemp
|
67b93fac50
|
+ geojson generator : allow empty properties
|
2012-08-08 16:00:01 +01:00 |
|
Dane Springmeyer
|
cf192ee771
|
further refactoring of marker_helpers to help set up for using from grid renderer
|
2012-08-06 11:39:09 -07:00 |
|
Dane Springmeyer
|
53c873ca49
|
make public the grid_renderer buffer type like AGG renderer
|
2012-08-06 11:37:27 -07:00 |
|
Dane Springmeyer
|
9284c6369d
|
correct rendering behavior of marker-opacity, which should not, as per svg, override fill-opacity and stroke-opacity but should combine with it
|
2012-08-03 14:14:03 -07:00 |
|
artemp
|
9e95d88acd
|
+ make typedefs public
|
2012-08-03 15:39:20 +01:00 |
|
artemp
|
5f26d82ca2
|
+ correct typedef logic (avoid redefining types)
|
2012-08-03 15:38:02 +01:00 |
|
Dane Springmeyer
|
8ea21d866d
|
move more code to marker_helpers.hpp to set up for grid impl of new markers code - refs #1282
|
2012-08-02 22:52:21 -07:00 |
|
Dane Springmeyer
|
e62739d146
|
fix render_marker for grid renderer and other minor syncing - refs #1309
|
2012-08-02 13:10:05 -07:00 |
|
Dane Springmeyer
|
6f15731c37
|
use std::fixed when outputting bbox's to string
|
2012-08-01 16:40:06 -07:00 |
|
artemp
|
5541ea0271
|
+ layer : minimum-extent and buffer-size
+ agg::process_xxx : remove ad-hoc query_extent modifiers
+ ctrans : simplify vertex skipping
|
2012-08-01 15:44:36 +01:00 |
|
artemp
|
2dcf940853
|
Merge remote-tracking branch 'origin/master'
|
2012-08-01 14:00:36 +01:00 |
|
artemp
|
fc6a22c014
|
+ c++ style
|
2012-08-01 11:07:45 +01:00 |
|
Dane Springmeyer
|
16084ff335
|
support both interior placement and point for markers - helps prepare for #952
|
2012-07-31 18:13:50 -07:00 |
|
Dane Springmeyer
|
9d9c525de0
|
revert 1dfde78 and properly avoid clipping for point type geometries in markers_symbolizer while moving markers_placement to cpp file to avoid overhead of declaring all possible permutations of vertex convertors - closes #1341
|
2012-07-31 17:27:52 -07:00 |
|
Dane Springmeyer
|
48c391da0d
|
reduce copying of svg attributes via @lightmare - refs #1360
|
2012-07-31 16:56:22 -07:00 |
|
Dane Springmeyer
|
c3c2902b92
|
move ellipse contruction code to marker_helpers
|
2012-07-31 16:40:30 -07:00 |
|
Hermann Kraus
|
f3326115ac
|
Add debug symbolizer.
|
2012-08-01 01:16:48 +02:00 |
|
Dane Springmeyer
|
e69c6037b7
|
mapnik coding style
|
2012-07-30 23:07:12 -07:00 |
|
Dane Springmeyer
|
e482998c51
|
rename path_ptr to the more explicit svg_path_ptr and set up markers_symbolizer rendering for upcoming changed
|
2012-07-30 21:45:46 -07:00 |
|
Dane Springmeyer
|
0d97b851fa
|
markers: support opacity on bitmaps, and move to supporting both opacity and fill-opacity
|
2012-07-30 18:31:21 -07:00 |
|
artemp
|
b963b6c2b3
|
Merge remote-tracking branch 'origin'
|
2012-07-30 18:35:03 +01:00 |
|
artemp
|
8931509adc
|
+ move middle_point into label namespace
|
2012-07-30 18:31:15 +01:00 |
|
Dane Springmeyer
|
81937f7317
|
only allow restyling of svg paths that already have visible display of stroke/fill
|
2012-07-28 09:27:37 -07:00 |
|
artemp
|
1b805abc23
|
+ add close(x,y) method to geometry
|
2012-07-26 15:21:25 +01:00 |
|
artemp
|
1844217615
|
+ fix SEG_CLOSE value to be compatible with agg
|
2012-07-26 15:19:11 +01:00 |
|
Dane Springmeyer
|
fa052c5021
|
amend 516f7c7 to suport filtering on collections and rename line to linestring for consistency - refs #546
|
2012-07-25 14:43:32 -07:00 |
|
Dane Springmeyer
|
2680f941eb
|
clean up unused code and includes
|
2012-07-25 09:31:57 -07:00 |
|
Dane Springmeyer
|
4e60c0cc9b
|
Merge branch 'master' of github.com:mapnik/mapnik
|
2012-07-25 08:47:19 -07:00 |
|
Dane Springmeyer
|
b68ea3bb1d
|
new patch from @lightmare for protecting against expression.to_string misusage - closes #1232
|
2012-07-25 08:47:10 -07:00 |
|
artemp
|
e48057b274
|
+ remove unused member variable
+ format
|
2012-07-25 10:00:58 +01:00 |
|
Dane Springmeyer
|
b6fa8dc0ed
|
include what you use
|
2012-07-24 18:36:31 -07:00 |
|
Dane Springmeyer
|
80b0b4a888
|
do not attempt to inline complex templated method on grid - refs #1330
|
2012-07-24 17:41:08 -07:00 |
|
Hermann Kraus
|
3860ae9447
|
Merge branch 'master' of github.com:mapnik/mapnik
|
2012-07-25 01:18:51 +02:00 |
|
Hermann Kraus
|
08cbf1c71c
|
Fix deprecation warnings. Part 2
Closes #1340.
|
2012-07-25 01:15:44 +02:00 |
|
Dane Springmeyer
|
ebf87969e4
|
move css_color and path_expression grammars to cpp
|
2012-07-24 15:43:32 -07:00 |
|
Dane Springmeyer
|
3f444302f0
|
move wkb_generator.cpp to cpp to reduce grammar compilation burden in the python bindings
|
2012-07-24 15:04:39 -07:00 |
|
Dane Springmeyer
|
881ff0180a
|
suppress gcc Wunused-but-set-variable warnings
|
2012-07-24 14:35:19 -07:00 |
|
Dane Springmeyer
|
25a7c6bc01
|
+ use assignment op to initialize built-in types.
|
2012-07-24 14:20:57 -07:00 |
|
artemp
|
139b5e710f
|
+ centroid: return first vertex if num_vertices == 1
|
2012-07-24 17:34:59 +01:00 |
|
artemp
|
045ef86f41
|
+ formatting..
|
2012-07-24 14:03:52 +01:00 |
|
artemp
|
8de27eaf6f
|
+ use assignment op to initialize built-in types.
|
2012-07-24 09:43:05 +01:00 |
|
Dane Springmeyer
|
29deca8db8
|
shave off 4 seconds from xml_node.cpp compile time (16 -> 12) by moving transform grammar to cpp - refs #1267
|
2012-07-23 18:12:10 -07:00 |
|
Dane Springmeyer
|
5c20a9f72a
|
suppress unused variable compiler warnings with gcc
|
2012-07-23 17:29:10 -07:00 |
|
Dane Springmeyer
|
348dfff0c7
|
move feature_grammar to cpp file reducing compile time mem usage for feature_collection_parser.cpp - refs #1267
|
2012-07-23 17:03:06 -07:00 |
|
Dane Springmeyer
|
8f803b9897
|
reduce build time of xml_tree by half and memory usage by 1/3 - refs #1267
|
2012-07-23 16:15:27 -07:00 |
|
Dane Springmeyer
|
bbd1b052f7
|
fix spelling in comment
|
2012-07-23 11:38:59 -07:00 |
|
Dane Springmeyer
|
669c4906d4
|
avoid c-linkage warning with datasources - closes #1323
|
2012-07-20 18:34:41 -07:00 |
|
Dane Springmeyer
|
e36081a5c0
|
change geometry_utils::from_wkb to return a bool that signifies if at least one wkb path was parsed - refs #1333 and #1305
|
2012-07-20 15:09:01 -07:00 |
|
Dane Springmeyer
|
a968150f6b
|
fix compile after geometry util namespacing
|
2012-07-20 11:18:33 -07:00 |
|
artemp
|
fd209b2958
|
+ put labeling routines into its owm 'label' namespace
|
2012-07-20 17:32:38 +01:00 |
|
artemp
|
516f7c75b1
|
+ expose geometry type in expression grammar to allow following
filter expressions : [mapnik::geometry_type] = Polygon (#546)
|
2012-07-20 12:28:25 +01:00 |
|
artemp
|
e0c2304d42
|
+ store size by value
|
2012-07-19 18:44:29 +01:00 |
|
artemp
|
4625e509b4
|
+ rename vertex() back to get_vertex() to avoid g++ getting confused
|
2012-07-19 17:10:27 +01:00 |
|
artemp
|
7b10400be9
|
+ update rendering code to work with new labeling methods
+ rename num_points() to size()
+ rename get_vertex() to vertex()
|
2012-07-19 16:36:44 +01:00 |
|
artemp
|
9e1914a4df
|
+ remove label position alogos from geometry class
|
2012-07-19 16:36:06 +01:00 |
|
artemp
|
f6fa57da26
|
+ add VertexSource based implementations of label position algos
|
2012-07-19 16:31:47 +01:00 |
|
artemp
|
994f9abb01
|
+ apply _mapnik_ coding style
|
2012-07-19 16:23:39 +01:00 |
|
artemp
|
c8cfde58f7
|
+ pass box2d<double> by const ref
+ make member const& too
|
2012-07-19 16:22:45 +01:00 |
|
Dane Springmeyer
|
6d95076954
|
sync grid renderer with agg for text/shields/point - refs #1309
|
2012-07-16 11:51:14 -07:00 |
|
artemp
|
1e6be7abc3
|
+ add accessor methods
|
2012-07-13 10:25:12 +01:00 |
|
Dane Springmeyer
|
b20481115f
|
marker width/height should be double
|
2012-07-12 18:39:12 -07:00 |
|
Dane Springmeyer
|
02644aeed1
|
add explicit bool operator to negate to silence msvc warnings - closes #1307
|
2012-07-12 16:38:13 -07:00 |
|
artemp
|
d828377c7c
|
+ fix operator= typo
|
2012-07-12 20:00:02 +01:00 |
|
artemp
|
461f5cfe08
|
+ use separate stroke-opacity and fill-opacity
|
2012-07-12 15:38:25 +01:00 |
|
artemp
|
d3bc55761b
|
+ define keys container in client code not in grid/grid_view,
e.g doesn't have to be std::map<...>
|
2012-07-12 10:57:57 +01:00 |
|
artemp
|
279bfe7f0f
|
+ remove unused mutating methods
+ cleanup&style
|
2012-07-12 10:21:57 +01:00 |
|
artemp
|
030639a7b8
|
+ remove meaningless -> std::set<std::string> property_names()
|
2012-07-12 10:18:35 +01:00 |
|
artemp
|
da5d4961f1
|
+ return from operator=
|
2012-07-12 09:54:03 +01:00 |
|
Dane Springmeyer
|
da775051ea
|
allow non const copy access to property_names on grid and grid_view objects
|
2012-07-11 18:58:25 -07:00 |
|
artemp
|
c7960a2093
|
+ support clipping on/off in text_symbolizer_helper,
shield_symbolizer_helper and process_markers_symbolizer
TODO: revisit implementation to avoid code duplication
|
2012-07-11 14:47:39 +01:00 |
|
artemp
|
8cf9a5a082
|
+ more const correctness
|
2012-07-11 10:32:08 +01:00 |
|
artemp
|
35ab93667f
|
+ enforce const
+ pass arguments by const ref
|
2012-07-11 10:13:38 +01:00 |
|
Dane Springmeyer
|
3e895ac6b7
|
implement built in support for ellipse and arrow markers, make markers_symbolizer default to POINT placement and ellipse drawing, add back compatibility for deprecated marker-type property - refs #1285 and #1304
|
2012-07-10 22:38:53 -07:00 |
|
Dane Springmeyer
|
cd66495ec5
|
support setting fill and stroke opacity on the fly in svg marker rendering
|
2012-07-10 22:36:03 -07:00 |
|
Dane Springmeyer
|
3efab11bdb
|
start carrying through the geometry clipping extent in the grid renderer
|
2012-07-10 18:39:06 -07:00 |
|
Dane Springmeyer
|
310ed4a05d
|
remove references to now unused mapnik::arrow
|
2012-07-10 18:11:43 -07:00 |
|
Dane Springmeyer
|
afa9dc3c7c
|
move svg marker modifiers to hpp file for re-use in other renderers
|
2012-07-10 18:09:19 -07:00 |
|
Dane Springmeyer
|
4f507e2fa3
|
expose the ability to parse an svg from an in-memory string
|
2012-07-10 08:59:35 -07:00 |
|
artemp
|
db2bd535de
|
+ impl operator<< for filters
+ boost::karma based filter generator
|
2012-07-10 12:51:08 +01:00 |
|
artemp
|
fe8daa4a2a
|
pass filter_tag by const ref
|
2012-07-10 12:50:27 +01:00 |
|
artemp
|
e18fe4eccd
|
+ fix unused parameter warning
|
2012-07-10 12:49:14 +01:00 |
|
artemp
|
c8b2031428
|
+ fix unused parameter warning
|
2012-07-10 12:48:32 +01:00 |
|
artemp
|
73e15f0c75
|
+ fix unused parameter warnings
|
2012-07-10 12:48:09 +01:00 |
|
Dane Springmeyer
|
79ef09d1a3
|
create grid feature context with correct sorting - closes #1306
|
2012-07-09 18:40:41 -07:00 |
|
Dane Springmeyer
|
cbf821c762
|
move key grid functions to cpp file
|
2012-07-09 17:32:36 -07:00 |
|
artemp
|
20d935ea1e
|
+ remove explicit keyword
+ make width and height 'optional' - default init (0)
+ change members order
|
2012-07-09 10:18:41 +01:00 |
|
Dane Springmeyer
|
3823890b40
|
rollback 34c3128b0c, move 'scaling' to proper enum, and move image_scaling functions to new cpp/hpp
|
2012-07-06 16:45:58 -07:00 |
|
artemp
|
a9cb16303f
|
+ fix member variables names
|
2012-07-06 13:55:46 +01:00 |
|
artemp
|
8598202f8f
|
Merge remote-tracking branch 'origin/master'
|
2012-07-06 13:51:49 +01:00 |
|
artemp
|
04589282bb
|
+ format
|
2012-07-06 13:50:44 +01:00 |
|
artemp
|
6e03fd7bb1
|
+ store last 'move_to' coordinates
+ ensure sub-paths use correct 'last_vertex'
when relative move_to commands is used
|
2012-07-06 13:41:54 +01:00 |
|
Dane Springmeyer
|
7499013843
|
deprecate 'mode' on raster_symbolizer and map it to new comp-op - closes #1257
|
2012-07-05 17:47:26 -07:00 |
|
Dane Springmeyer
|
2f45de8fea
|
serialize comp-op in save_map - refs #1292
|
2012-07-05 17:06:41 -07:00 |
|
Dane Springmeyer
|
9dd69d091b
|
merge with master
|
2012-07-05 15:40:16 -07:00 |
|
Dane Springmeyer
|
d8c719f05e
|
finish exposing scale_factor to cairo_renderer
|
2012-07-05 14:54:58 -07:00 |
|
artemp
|
847f284a97
|
+ make stroke and fill optional
+ return expression_ptr by const ref
+ change init order
|
2012-07-05 17:11:52 +01:00 |
|
Dane Springmeyer
|
c677b4f47c
|
ensure the bounds used for avoid-edges and minimum-padding is non-buffered - refs #1283
|
2012-07-04 18:34:04 -07:00 |
|
Hermann Kraus
|
6af5fd7151
|
Merge branch 'master' of github.com:mapnik/mapnik
|
2012-07-04 21:00:59 +02:00 |
|
Hermann Kraus
|
7a967d7047
|
Correctly perform get_text() on <xmltext> nodes.
|
2012-07-04 20:51:34 +02:00 |
|
Hermann Kraus
|
c709f17761
|
Add namespace.
|
2012-07-04 20:39:07 +02:00 |
|
artemp
|
9b14a7206a
|
remove arrow/ellipse ad-hoc markers - see #1285
|
2012-07-04 14:50:11 +01:00 |
|
artemp
|
0a146e0b5c
|
remove unused renderer_scanline_solid
|
2012-07-04 09:23:01 +01:00 |
|
artemp
|
4b9346ab5f
|
+ better name for boolean member to avoid clashing with object name.
|
2012-07-03 12:45:07 +01:00 |
|
artemp
|
a6784270bb
|
+ pass args by const ref
|
2012-07-03 11:16:10 +01:00 |
|
artemp
|
7d2c695849
|
+ remove unused font_manager_
|
2012-07-02 13:28:40 +01:00 |
|
Dane Springmeyer
|
7f531498c6
|
pass scale_factor to text_renderer in order to scale up halo_radius - refs #1273 and refs #695
|
2012-06-29 13:05:28 -07:00 |
|
artemp
|
8849ba7d4d
|
Merge remote-tracking branch 'origin/master'
|
2012-06-29 08:57:11 +01:00 |
|
Dane Springmeyer
|
67e9b0d616
|
move marker width/height to expressions - closes #1102 and replaces #1255
|
2012-06-28 19:54:25 -07:00 |
|
Artem Pavlenko
|
36d5a20a8a
|
Merge remote-tracking branch 'mirecta/line-offset'
|
2012-06-28 13:05:04 +01:00 |
|
Mickey Rose
|
9ccce2f1d9
|
offset_converter: add threshold to avoid cutting large closed rings off
|
2012-06-26 22:38:38 +02:00 |
|
Artem Pavlenko
|
cec9b5798e
|
Revert "cleaner approach to a compile time magic alpha number for grid buffers"
(doesn't link : clang version 3.2 (trunk 158601))
This reverts commit 98753db9fd.
|
2012-06-26 16:53:07 +01:00 |
|
Artem Pavlenko
|
f8a7d06034
|
Merge remote-tracking branch 'origin/master'
|
2012-06-26 15:02:28 +01:00 |
|
Artem Pavlenko
|
5bc9f73506
|
+ markers_symbolizer: support affine geometry transformations
+ fix markers bounding box calc
+ fix spacing logic to use transformed marker width
|
2012-06-26 15:00:42 +01:00 |
|
Dane Springmeyer
|
98753db9fd
|
cleaner approach to a compile time magic alpha number for grid buffers
|
2012-06-25 17:57:52 -07:00 |
|
Dane Springmeyer
|
b71553682b
|
grid_pixel does not need a 32bit base_shift since alpha is not used
|
2012-06-25 17:31:43 -07:00 |
|
Mickey Rose
|
61e3c4dde7
|
offset_converter: pre-compute offset vertices and detect self-intersection on-the-fly
|
2012-06-25 18:34:42 +02:00 |
|
Artem Pavlenko
|
20255966c3
|
+ text_symbolizer: add largest-bbox-only boolean property
default:true
|
2012-06-25 15:00:53 +01:00 |
|
Artem Pavlenko
|
048316232c
|
+ fix: remove clip_ member var
|
2012-06-25 14:57:45 +01:00 |
|
Dane Springmeyer
|
5b61c093e5
|
initialize grid buffers to std::numeric_limits<int>::min() and use that value to mean no-hit or non-interactive pixels - closes #1065
|
2012-06-23 22:41:07 -04:00 |
|
Dane Springmeyer
|
eb4740b50f
|
fix behavior of compositing via python api now that we have premultiplication issues sorted out in core - refs #1262 and #314 and #1211
|
2012-06-21 15:44:57 -04:00 |
|
Dane Springmeyer
|
9193ac4446
|
Merge branch 'master' of github.com:mapnik/mapnik
|
2012-06-19 17:37:45 -04:00 |
|
Dane Springmeyer
|
f60d85e2e7
|
fix handling of premultiplication in svg rendering - refs #1262
|
2012-06-19 17:37:24 -04:00 |
|
Tom MacWright
|
aa5a726b92
|
Rename color-spin composite operation to colorize alpha
to make it less confusing alongside actual color manipulation
modes.
|
2012-06-19 17:16:25 -04:00 |
|
Dane Springmeyer
|
48a543b5d5
|
implement style-level opacity - closes #314
|
2012-06-19 15:10:28 -04:00 |
|
Artem Pavlenko
|
c5864453a0
|
+ only premultiply src
|
2012-06-18 18:50:32 -04:00 |
|
Artem Pavlenko
|
38f35d6f97
|
+ add missing ','
|
2012-06-18 14:41:43 -04:00 |
|