Dane Springmeyer
f348d177ee
fix the include install directory nesting
2012-08-27 18:54:08 -07:00
Dane Springmeyer
a56c63bed1
start installing agg headers so that c++ programs using mapnik can use more of the mapnik api - closes #1383
2012-08-27 18:45:04 -07:00
Dane Springmeyer
83e2bc70ff
include what you use
2012-08-27 18:39:33 -07:00
Dane Springmeyer
c9bd0c8e51
Merge branch 'master' of github.com:mapnik/mapnik
2012-08-27 17:59:14 -07: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
Colin Rundel
12f2c247b3
Added set_name to font_set class
2012-08-27 16:09:29 -04:00
Dane Springmeyer
c7c8c468ab
apply patch from @rundel to make color grammar more modular (TODO - do this with all grammars) - closes #1440
2012-08-26 17:50:30 -07:00
Dane Springmeyer
fa0678cc5a
json generator: fix escape chars as per json spec, which is a subset of c/c++
2012-08-25 11:24:45 -07:00
Konstantin Käfer
fd3aa8a01a
Merge branch 'expose_feature_style_processor' into conv_simplify
2012-08-25 15:02:18 +02:00
Konstantin Käfer
7c9700237f
move feature_style_processor to an implementation header file
...
This allows other applications to create custom instances of the feature_style_processor with their own template arguments without forcing freuquent recompiles in mapnik itself
2012-08-25 13:35:41 +02:00
Panagiotis Skintzos
e34dc99f3a
Exposed the label collision detector outside of Cairo renderer and added Python bindings (issue #1107 )
2012-08-25 11:43:31 +02: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
13bcd3f17f
now working on mapnik v2.2.0-pre
2012-08-23 15:19:56 -07:00
Dane Springmeyer
a25aac80f7
setting up for mapnik v2.1.0 release
2012-08-23 14:50:36 -07:00
Dane Springmeyer
c0539406d8
fix includes post bf3efbeab8 - refs #1435
2012-08-23 11:34:13 -07:00
Dane Springmeyer
a3254965fe
double csv parsing speeds when handling wkt encoded geometries - refs #1436
2012-08-23 09:07:06 -07:00
Dane Springmeyer
bf3efbeab8
move image filter grammar to cpp and re-use in load map by attaching to xml_tree - closes #1435
2012-08-23 08:13:22 -07:00
Dane Springmeyer
ce03b3599b
expose svg output for geometries - refs #1437 (TODO: support svg_multi_generator)
2012-08-22 19:13:37 -07:00
Dane Springmeyer
fc63bd0d24
avoid compile error due to namespace clash with wkt generator - refs #1437
2012-08-22 19:11:01 -07:00
Dane Springmeyer
23808b0523
finish full back comptibility for raster-mode - refs #1206 and #1432
2012-08-22 18:09:01 -07:00
Dane Springmeyer
6edbec86d9
apply patch from @lightmare to better hanle 2 point geometries - refs #1425
2012-08-22 13:34:31 -07:00
Dane Springmeyer
a02801beb9
geometry.hpp does not need to use geom_util.hpp - this include cleanup exposed #1430
2012-08-22 13:27:44 -07:00
Dane Springmeyer
948531e9d0
fix namespacing for wkt generator code - refs #1330
2012-08-22 09:54:01 -07:00
Dane Springmeyer
e8101a070a
partially repair backward compatibility in python for 'marker-type' - refs #1427 and #1285
2012-08-21 16:36:15 -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
a75014c056
convert interior_position to return bool
2012-08-21 11:23:36 -07:00
Dane Springmeyer
b76c8e5c64
+reflect building symbolizer in python
2012-08-20 18:17:00 -07:00
Dane Springmeyer
55646ce236
fix group_by on layer to be std::string const& and reflect in python
2012-08-20 16:26:41 -07:00
Mickey Rose
5ca715c1e0
transform expressions: disallow space-separated compound arguments, refs #1389
2012-08-19 19:30:51 +02:00
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
