artemp
09d11122d5
Merge branch 'master' into conv_simplify
2012-09-18 10:36:14 +01:00
Dane Springmeyer
91a932d7e9
declare windows symbols for wkt and json parsing - closes #1491
2012-09-17 15:28:05 -07:00
artemp
01ae1a179d
Merge branch 'master' into conv_simplify
2012-09-17 11:35:15 +01:00
Dane Springmeyer
ad8e4e4cc7
Merge pull request #1366 from mapnik/debugsymbolizer
...
Debug Symbolizer
2012-09-14 16:43:38 -07:00
Dane Springmeyer
56585d11d9
when using style level compositing or image filters still trigger style processing callbacks even if we return without querying the data if there are active rules - closes #1477
2012-09-14 16:13:37 -07:00
Dane Springmeyer
1b3dcda87d
add method off style to check for active rules
2012-09-14 16:11:37 -07:00
Dane Springmeyer
8cfb40ae2f
refactor fontsets making them optional on the symbolizer and removing the dangerous default contructor - closes #1483 (TODO - consider modifying insert_fontset to only take single arg of fontset instance)
2012-09-14 14:17:45 -07:00
artemp
d42c88ab4a
+ check sleve_cont has at least two vertices
2012-09-14 13:12:53 +01:00
artemp
820a0e92ab
+ discard 'almost' adjacent vertices
...
+ enforce 'min_size' in output path
2012-09-13 15:41:51 +01:00
artemp
06bae0a76c
+ zhao-saalfield intial impl (TODO: optimize)
2012-09-12 15:20:33 +01: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
artemp
11e6ba0c09
+ make client methods non-static in classes derived from
...
mapnik::singleton<> (TODO: apply to all)
+ ensure client methods are accessed through instance() method
2012-09-07 14:56:30 +01:00
artemp
8fa0742a53
+ make client methods non-static in classes derived from
...
mapnik::singleton<> (TODO: apply to all)
+ ensure client methods are accessed through instance() method
2012-09-07 14:51:25 +01:00
artemp
5f8bb423e8
Merge branch 'conv_simplify' of git://github.com/kkaefer/mapnik into kkaefer-conv_simplify
2012-09-06 13:12:39 +01:00
artemp
a513d3f97d
+ code: avoid exposing unsafe static methods in datasource_cache ( #1451 )
...
+ python: remove redundent 'instance' method (mapnik.DatasourceCache)
+ python: reflect plugin_directories method
+ tests: update python usage
TODO: consider using similar approach in FontEngine etc..
TODO: consider returning reference from singleton::instance() to
safeguard from accidental deleting a 'singleton' pointer
2012-09-05 12:53:37 +01:00
Hermann Kraus
786f798cab
Use double instead of unsigned while parsing XML.
...
Closes #1469 .
2012-09-05 02:15:58 +02:00
Dane Springmeyer
f29726edf1
no need for a default message for datasource_exception
2012-09-03 11:41:51 -07:00
Dane Springmeyer
551f1e0c66
c++ style
2012-09-03 10:52:36 -07:00
Dane Springmeyer
a12b8f1d2f
c++ style
2012-09-03 10:27:48 -07:00
Dane Springmeyer
56ae40d059
c++ style
2012-09-03 10:02:39 -07:00
Dane Springmeyer
90391f3bee
remove unused typedef
2012-08-29 18:39:16 -07:00
Colin Rundel
bd5df80f75
Minimal roll back const changes
...
Changes to expression_ptr and path_expression_ptr are causing runtime issues with the python bindings
2012-08-29 16:41:48 -04:00
Colin Rundel
dc3763885c
More parser clean up - color parser
...
Dropped color_factory class in favor of single color_parser function. Moved implementation to new color_factory.cpp since it is odd to have two headers (color.hpp, color_factory.hpp) and only one source file.
2012-08-29 16:41:48 -04:00
Colin Rundel
10001f1d4b
Expression parsing simplification
...
Similar idea to path expression parsing cleanup
2012-08-29 16:41:44 -04:00
Colin Rundel
1d0c817170
Make path_expression_ptr have const contents, cleanup
2012-08-29 16:41:43 -04:00
Colin Rundel
0e5f71408e
Simplified path_parse implementation
...
path_parse and path_parse_from_string were redundant, replaced with overloaded path_parse function to achieve the same functionality.
Additional consistency cleanup in load_map.cpp.
2012-08-29 16:41:43 -04:00
Dane Springmeyer
de5970f45e
shuffle the mapnik::hue_to_rgb method - no need for it to be in the cpp file
2012-08-28 20:08:43 -07: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
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
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