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
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
Dane Springmeyer
ac418a7d4e
remote the last references
2012-08-27 16:43:40 -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
Konstantin Käfer
49a07c64f5
copy algorithm value when copying symbolizer
2012-08-25 15:33:24 +02: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
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
6806ca1509
load in load_map if image/svg files are not available when not using stock markers or dynamic expressions - closes #1439
2012-08-23 14:31:50 -07:00
Dane Springmeyer
1ca4bcf78d
further improve the reporting of unprocessed nodes and attributes - refs #1441
2012-08-23 14:11:25 -07:00
Dane Springmeyer
03860b1728
improve error messages for exceptions thrown in symbolizers during load_map - closes #1441
2012-08-23 14:04:03 -07:00
Dane Springmeyer
05fdb5424b
more fully disable the svg_renderer backend - refs #1438
2012-08-23 10:10:18 -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
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
eecffc264b
better fontset and font failure messages - refs #1101
2012-08-22 17:01:24 -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
50e603c896
use correct total_distance variable - closes #1430
2012-08-22 13:25:40 -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
d1d782254b
xml: support 'label-spacing' as alias to 'spacing' - refs #1427
2012-08-21 14:50:24 -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
b76c8e5c64
+reflect building symbolizer in python
2012-08-20 18:17:00 -07:00
Dane Springmeyer
7b7e556850
formatting
2012-08-20 16:27:38 -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
ad2250a4b5
back compatibility for raster-mode values using _ and shield-no-text
2012-08-16 19:20:29 -07:00
Dane Springmeyer
d95f81a588
c++ style
2012-08-16 17:58:08 -07:00
Dane Springmeyer
e0608a4aa4
only throw for unknown attributes if in strict mode
2012-08-16 16:10:23 -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
a3e27ed726
Merge branch 'master' of github.com:mapnik/mapnik
2012-08-16 12:29:27 -07:00
Dane Springmeyer
bfc92a469c
fix and doc out behavior of register_fonts
2012-08-16 12:29:13 -07:00
Dane Springmeyer
9964eefb55
remove now unused variable
2012-08-16 12:28:36 -07:00
Dane Springmeyer
d850ee8b76
correct various old trac links to point to github - closes #1396
2012-08-16 12:27:58 -07:00
Konstantin Käfer
22150f908f
add facilities to choose the simplification algorithm
2012-08-16 16:53:38 +02:00
artemp
572f3d3f49
+ avoid applying scale_factor twice
2012-08-16 10:42:12 +01:00
artemp
7702a904f3
+ cairo : fix point_symbolizer transform calc
2012-08-16 10:37:51 +01:00
Dane Springmeyer
2af768a69b
restore compile with <= boost 1.47
2012-08-15 18:15:01 -07:00
Dane Springmeyer
d87d9fd16d
Merge branch 'master' of github.com:mapnik/mapnik
2012-08-15 16:59:30 -07:00
Dane Springmeyer
de3afda3bc
remove css_color_grammar_deprecated.hpp
2012-08-15 16:59:22 -07:00
Dane Springmeyer
5c0e1de35b
repair boost 1.46 compile in json/feature_grammar.cpp - closes #1342
2012-08-15 16:49:13 -07:00
Dane Springmeyer
4390f14e9e
repair boost 1.42 compile with transform_expression_grammar.cpp
2012-08-15 16:45:18 -07:00
