artemp
f5dd9e53c4
+ calc int_parser/generator type from mapnik::value_integer
2012-12-18 18:05:45 +00:00
artemp
e331566ac7
+ wrap return value into mapnik::value_integer
2012-12-18 15:18:40 +00:00
artemp
a38b252ccd
Merge branch 'master' into bigint
...
Conflicts:
plugins/input/geojson/geojson_datasource.cpp
plugins/input/postgis/postgis_featureset.cpp
2012-12-18 13:57:39 +00:00
artemp
e82e5e2fb3
+ default to 6 digit precision in wkt generator for now
2012-12-18 12:12:43 +00:00
artemp
274fbf8f7a
+ ensure 'close path' handled correcly
...
(currenlty SEG_CLOSE command must have valid x,y)
+ implement real_policies in wkt and geojson generators
2012-12-18 11:44:35 +00:00
Artem Pavlenko
e7891a99ce
Merge pull request #1653 from strk/master-float-scientific
...
Implement scientific notation for double-to-string
2012-12-18 02:48:29 -08:00
Dane Springmeyer
c7ed1f93d7
update svg_renderer
2012-12-17 19:13:00 -08:00
Dane Springmeyer
8d2b00ea75
fix member name
2012-12-17 13:12:31 -08:00
Dane Springmeyer
43244efb7d
Merge branch 'master' of github.com:mapnik/mapnik into no-bind
2012-12-17 13:03:11 -08:00
Dane Springmeyer
14f80192df
add internal noncopyable header
2012-12-17 10:32:00 -08:00
Sandro Santilli
e8b7b82bbb
Implement scientific notation for double-to-string
...
Also fixes tests for 1e5 expecting fixed precision rather than
scientific notation (stringstream gives scientific notation indeed)
The only still failing test now is the one having less than 16
significant digits of precision, due to the boost bug:
https://svn.boost.org/trac/boost/ticket/7785
2012-12-17 19:29:44 +01:00
Dane Springmeyer
c5410fac7e
remove bind option for datasources - refs #962
2012-12-17 10:03:07 -08:00
Dane Springmeyer
bb27156df0
use internal noncopyable class to speed up compile times slightly
2012-12-16 18:19:52 -08:00
artemp
93ad451cd1
+ use mapnik::value_xxx
2012-12-14 10:25:20 +00:00
artemp
c4bae9d30a
Merge branch 'master' into bigint
...
Conflicts:
bindings/python/mapnik_feature.cpp
plugins/input/shape/dbfile.cpp
2012-12-14 10:01:21 +00:00
artemp
bc9be37f89
Merge remote-tracking branch 'origin/master'
2012-12-13 09:35:56 +00:00
artemp
7ded35ef94
+ support attribute collection policy accross renderer backends
2012-12-13 09:35:03 +00:00
artemp
dd327140f4
+ add attribute collection policy
2012-12-13 09:33:55 +00:00
Dane Springmeyer
772c7f52fc
knock out some msvc compiler warnings
2012-12-12 15:59:27 -08:00
Dane Springmeyer
3fd7909ba0
fix compile on windows with msvc 2010 - closes #1646
2012-12-12 15:09:07 -08:00
Artem Pavlenko
e60a3f7703
Merge pull request #1632 from strk/master-float-labels
...
Fix float data conversion to string
2012-12-12 06:21:17 -08:00
Dane Springmeyer
22b159d93d
enable [attr!=null] filtering - which finishes #794 and closes #1642 - refs #796
2012-12-11 19:37:46 -08:00
Dane Springmeyer
a4f3be02b5
print null for features with value_null type in debugging output
2012-12-11 18:06:53 -08:00
Dane Springmeyer
e928c483bf
properly support tolerance in shape filter_at_point - refs #1640
2012-12-11 14:46:52 -08:00
Dane Springmeyer
6b84269343
add pad method on box2d to help tighten otherwise verbose code
2012-12-11 13:56:25 -08:00
artemp
562fada9d0
+ return default (value_null) if attribute is not present
2012-12-11 15:44:19 +00:00
Dane Springmeyer
574fec8403
fix includes in new trim header to allow linux compile
2012-12-07 16:30:36 -08:00
Dane Springmeyer
7c58bf9fcb
replace boost::trim with faster custom trim - closes #1633
2012-12-07 14:06:13 -08:00
Dane Springmeyer
c0021d0760
remove unused iostream includes and unnecessary usage of ostringstream - refs #1055
2012-12-06 23:06:12 -08:00
Dane Springmeyer
f3c23c28c3
remove uneeded debugging prints
2012-12-06 21:20:42 -08:00
Dane Springmeyer
390706b8c7
remove all remaining stringstream usage in load_map to avoid perf hit from locale lock - refs #1055
2012-12-06 20:15:27 -08:00
Dane Springmeyer
80630e905b
formatting
2012-12-06 18:46:23 -08:00
Sandro Santilli
b51b357123
Fix float data conversion to string
...
Fixes precision digits, closing #430
Also avoids forcing a trailing '.0', closing #1627
2012-12-06 12:07:48 +01:00
artemp
cd435172d4
+ fix expression grammar to work with mapnik::value_integer
2012-12-06 09:51:38 +00:00
artemp
511399f3c1
+ correct types
2012-12-06 09:50:36 +00:00
artemp
8fa88a71b6
Merge branch 'master' into bigint
2012-12-03 13:14:31 +00:00
artemp
855aea95e0
+ mapnik::value and mapnik::parameters - initial support for 64-bit integers
2012-12-03 13:12:09 +00:00
Dane Springmeyer
7d408d523c
close #1548 with explict handling of point geometries and amend 629d768eae
for cairo/grid renderers to ensure proper placement on lines (refs #1604,#1350,#1607)
2012-12-02 19:53:44 -08:00
Dane Springmeyer
be05aa5b60
add palette.to_string() method and add python tests of fixed palette functionality
2012-11-30 12:31:58 -08:00
Sandro Santilli
54d75d946b
Fix "whole" multi centroid computation
...
Includes testcase.
Closes #1606
2012-11-29 17:55:13 +01:00
Dane Springmeyer
363fc2ddd0
fix logic error
2012-11-28 21:18:17 -08:00
Dane Springmeyer
52c3f8ff6e
disable bbox intersection testing when caching features on the fly during rendering - closes #1543
2012-11-28 20:56:08 -08:00
Dane Springmeyer
629d768eae
use middle_point placement algorithm for marker POINT placement on lines - closes #1604 - refs #1350 and refs #1607
2012-11-28 19:23:56 -08:00
Dane Springmeyer
2ee6c9aca1
Merge branch 'master' of github.com:mapnik/mapnik
2012-11-28 17:48:14 -08:00
Dane Springmeyer
46f8ce3ce7
finish bringing back to life the SVG_RENDERER - now outputs geometries again - closes #1438
2012-11-28 17:45:05 -08:00
Dane Springmeyer
1f7459d29d
install svg/output headers if SVG_RENDERER is requested
2012-11-28 17:21:38 -08:00
artemp
f56a365a03
+ add comment
2012-11-28 19:15:48 +00:00
artemp
99141fa5e5
+ support initialSize_ updates
...
+ move maxSize_/initialSize_ logic into pool.hpp
2012-11-28 17:38:18 +00:00
artemp
35fba36bcc
+ add getter/setter for maxSize
2012-11-28 17:04:12 +00:00
artemp
db3fd368ba
+ remove default args from Pool ctor
...
+ use back() for brevity
2012-11-27 12:45:07 +00:00
Dane Springmeyer
37804ed0a5
formatting
2012-11-26 16:15:28 -08:00
Dane Springmeyer
275231c410
initialize all values in markers_placement
2012-11-26 15:57:58 -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
267975c388
Coding style correction : tabs to spaces
2012-11-09 11:57:10 +01:00
Dane Springmeyer
663c5ef726
remove commented code
2012-11-08 19:12:58 -05:00
Dane Springmeyer
53c5933dbd
amend 2d0bd726c3
- patch from @lightmare - refs #1557
2012-11-08 16:33:18 -05:00
Alexandre Bonnasseau
efff5f0ef0
Issue #1545 - override buffer-size parameter at layer level - revised
2012-11-08 15:51:22 +01:00
Dane Springmeyer
2d0bd726c3
remove uneeded loop in no alpha octree encoding - refs #1557
2012-11-06 12:38:58 -05:00
Dane Springmeyer
6b155dbc85
format as per mapnik c++ style
2012-11-06 11:53:23 -05:00
Dane Springmeyer
211b102ec5
support writing full color png with rgb only (no alpha) - closes #1559
2012-11-06 11:44:44 -05:00
Dane Springmeyer
2446e573c9
remove unused alpha handling code in octree originally added in 201461e8c9
but made redundant in b3711b07d1
2012-11-06 09:37:06 -05:00
Dane Springmeyer
cd3cc31752
support writing rgb (no a) images with miniz - refs #1554
2012-11-06 09:19:40 -05:00
Dane Springmeyer
5a99d7fbdb
add miniz support - closes #1554
2012-11-04 07:10:05 -05:00
Dane Springmeyer
a1e00cc374
mapnik c++ style
2012-11-04 06:13:17 -05:00
Dane Springmeyer
d97d8c35a3
formatting
2012-11-01 14:52:02 -07:00
Dane Springmeyer
fb10c670bc
renable value_type for coord_transform (needed for SVG_RENDERER) - patch from michael_us (mapniknet project)
2012-11-01 10:47:49 -07:00
Dane Springmeyer
2cf429db08
start disabling svg_renderer features to get closer to compiling - refs #1438
2012-11-01 10:05:50 -07:00
Dane Springmeyer
82b15bdd68
be more explicit about unsigned type for rgba_palette::quantize
2012-10-30 16:55:06 -07:00
Dane Springmeyer
9040d2ac9d
fix feature-cache for rasters - TODO: no intersection check option for memory_featureset
2012-10-26 18:18:35 -07:00
Mickey Rose
c3702404cb
image_filter: make 'gray' and 'invert' filters honor alpha
2012-10-20 00:08:23 +02:00
Mickey Rose
b335d5ea8e
image_filter: extract apply_filter boilerplate, pass filter by reference
2012-10-19 22:05:40 +02:00
Dane Springmeyer
1c9aa5bc09
remove debugging print - refs #1477
2012-10-16 12:23:26 -07:00
Dane Springmeyer
c53b6075eb
properly set MAPNIK_DECL for mapnik::rule - closes #1527
2012-10-10 12:35:02 -07:00
Dane Springmeyer
ccda92fed1
Revert "finish moving symbolizers out of rule"
...
This reverts commit 20a317860d
.
2012-10-10 10:51:06 -07:00
Dane Springmeyer
1f11aeb95a
Revert "move symbolizers typedef out of rule and be explicit about including config.hpp for MAPNIK_DECL - refs #1527 "
...
This reverts commit bf5ffd04f4
.
2012-10-10 10:50:56 -07:00
Dane Springmeyer
20a317860d
finish moving symbolizers out of rule
2012-10-10 10:02:45 -07:00
Dane Springmeyer
bf5ffd04f4
move symbolizers typedef out of rule and be explicit about including config.hpp for MAPNIK_DECL - refs #1527
2012-10-10 09:32:29 -07:00
Dane Springmeyer
fb10f58357
shuffle color function
2012-10-04 17:59:34 -07:00
Dane Springmeyer
a6129e9a80
add premultiply/demultiply methods for mapnik::color - refs #1519
2012-10-04 13:53:58 -07:00
artemp
3072b3f581
Merge remote-tracking branch 'origin/master'
2012-10-04 12:17:07 +01:00
artemp
eaf6049909
+ template on geometry/path concept
2012-10-04 12:15:51 +01:00
Dane Springmeyer
c27530ec7b
remove inefficient and no longer used mapnik::raster constructor - refs #1516
2012-10-03 18:22:18 -07:00
Dane Springmeyer
f4ead94c37
make raster non-copyable
2012-10-03 15:40:43 -07:00
Dane Springmeyer
24adb81390
c++ style
2012-10-03 14:58:12 -07:00
Dane Springmeyer
05195ca68d
Merge pull request #1444 from sigmapi/issue1107
...
Fix for issue #1107
2012-10-03 13:06:45 -07:00
Dane Springmeyer
e11650fd84
c++ style
2012-10-03 13:06:30 -07:00
Dane Springmeyer
86e805b33e
Merge pull request #1499 from manelclos/master
...
Query tolerance for features_at_point
2012-10-03 11:50:29 -07:00
Dane Springmeyer
2e737e07b2
alternative mapnik::raster constructor that allows less copying - refs #1508
2012-10-02 21:46:31 -07:00
Dane Springmeyer
798b101f0c
finish #1512 and adjust tests to use new parameter
2012-10-01 17:09:28 -07:00
Dane Springmeyer
09726626cf
add 'premultiplied' property on raster symbolizer to allow user to control (in rare cases) the premultiplied status of images in cases where tiffs mis-report it - closes #1512
2012-10-01 16:14:41 -07:00
Dane Springmeyer
ef28a1db80
cleanup includes in rule/feature_style_processor and move code to rule.cpp and raster_symbolizer.cpp
2012-10-01 15:01:12 -07:00
artemp
d1eefb63b1
Merge remote-tracking branch 'origin/master'
2012-10-01 16:59:01 +01:00
artemp
d24175e80e
+ style : assigment init for built-in types
2012-10-01 16:57:31 +01:00
artemp
f03e08bbba
+ make rewind() const
2012-10-01 15:45:30 +01:00
artemp
30f14e0878
Merge branch 'master' into conv_simplify
2012-10-01 10:21:56 +01:00
artemp
b9fed932b9
+ template vertex_iterator on path_type
...
+ rename vertex_iterator to path_iterator
2012-10-01 10:20:10 +01:00
artemp
780ea26af3
Merge remote-tracking branch 'origin' into conv_simplify
2012-09-28 19:49:01 +01:00
artemp
3ffe8ec21c
+ add premultiplied_alpha flag to mapnik::raster
2012-09-28 16:43:05 +01:00
artemp
77e585895f
+ add premultiplied_alpha method to image_reader
...
* tiff - TIFFTAG_EXTRASAMPLES
* png - non-premultiplied alpha (http://www.libpng.org/pub/png/spec/1.1/PNG-Rationale.html )
* jpeg - no-alpha channel, ensure pre-multiplied model
2012-09-28 16:37:21 +01:00
Manel Clos
8f7083d14d
Add tolerance parameter to features_at_point
...
Make map.query_point() always pass tolerance to datasources
2012-09-28 15:12:10 +02:00
artemp
02e7aef9c9
+ restore g++/darwin fix - #1507
2012-09-28 09:43:29 +01:00
artemp
bb27ab5d1b
+ formatting
2012-09-27 16:09:20 +01:00
artemp
2427daa403
+ make WKT generator templated on geometry type - the goal is to be able
...
to use generator for any type that implements 'vertex' concept
2012-09-27 16:07:14 +01:00
artemp
42bcf4ea98
+ make WKT generator templated on geometry type - the goal is to be able
...
to use generator for any type that implements 'vertex' concept
2012-09-27 16:04:29 +01:00
artemp
03315ff893
+ formatting
2012-09-27 16:03:21 +01:00
artemp
8228d99186
+ cleanups: use preincrement iterators in for loop etc ..
2012-09-27 16:02:14 +01:00
artemp
a537c58afa
+ work-in-progress..
2012-09-26 14:26:12 +01:00
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
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
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
Artem Pavlenko
9b61c0effe
Merge remote-tracking branch 'origin/master'
...
Conflicts:
deps/agg/include/agg_pixfmt_rgba.h
include/mapnik/image_compositing.hpp
src/cairo_renderer.cpp
src/image_compositing.cpp
2012-06-18 14:36:15 -04:00
Artem Pavlenko
c71944bf32
+ use HSV color space (as in GIMP)
...
+ rename 'luminosity' to 'value'
2012-06-18 14:30:01 -04:00
Tom MacWright
f6c10bbb7e
Add color_spin composite operation.
2012-06-18 11:10:04 -04:00
Artem Pavlenko
dc89f6fac4
Merge remote-tracking branch 'origin/master'
2012-06-17 15:21:27 -04:00
Artem Pavlenko
14d365d572
+ hue, saturation, color and luminosity blending modes (HSL based)
...
(http://en.wikipedia.org/wiki/Blend_modes#Hue.2C_saturation_and_luminosity )
2012-06-17 15:19:29 -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
Dane Springmeyer
7da01b9605
Merge branch 'master' of github.com:mapnik/mapnik
2012-06-15 05:18:26 -07:00
Dane Springmeyer
b12e73fbc7
Merge branch 'master' of github.com:mapnik/mapnik
2012-06-14 19:44:28 -04:00
Artem Pavlenko
689e8ec96d
+ make feature's optional: -(feature % lit(','))
2012-06-14 14:40:54 +01:00
Artem Pavlenko
34470af474
+ allow empty arrays in "coordinates" property
2012-06-14 14:40:14 +01:00
Dane Springmeyer
d33496baa7
split up code that handles datasource plugin registration
2012-06-13 19:25:59 -04:00
Artem Pavlenko
1f383abbad
+ fix conflict
2012-06-12 14:18:29 +01:00
Artem Pavlenko
1774456a2e
+ fix GeoJSON output in metawriter_json
...
(FIXME: output proper geometry types - don't shortcut to Multi***)
Conflicts:
include/mapnik/metawriter_json.hpp
2012-06-12 14:05:53 +01:00
Dane Springmeyer
eb8f27bee7
Merge branch 'master' of github.com:mapnik/mapnik
2012-06-07 13:17:44 -05:00
Mickey Rose
1e3c48afb1
split parse_transform.hpp, set dynamic transform expression from python
2012-06-07 17:06:45 +02:00
Dane Springmeyer
51d3310012
grid encoding: reuse key string
2012-06-07 07:27:42 -07:00
Artem Pavlenko
013f0aa62f
+ add templated ctor and avoid including agg_trans_affine.h
2012-06-07 11:51:23 +01: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
Dane Springmeyer
76211243a4
remove now unused blending modes as they have been replaced with AGG compositing modes - refs #1206
2012-06-06 16:16:30 -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
Mickey Rose
dad0bdacfc
add value_null operators, improve is_null, move mapnik::value definition into separate namespace
...
(cherry picked from commit 653bca6bea1abb2e45c66e76fd5e4fe7dc10a91a)
2012-06-06 17:34:17 +02:00
Mickey Rose
46c2d1c710
add operators for computing the envelope of a transformed box2d
...
(cherry picked from commit 9ad342cbed150948561c08e98957bc014dedc7f3)
2012-06-06 17:34:02 +02:00
Dane Springmeyer
291bc9b8ba
explicitly include projection header
2012-06-04 17:16:44 -07:00
Dane Springmeyer
11e81fdb03
finish exposing markers symbolizer in python - closes #612
2012-06-04 13:42:51 -07:00
Artem Pavlenko
404ddf329d
Revert "+ avoid copying"
...
This reverts commit de71db7d38
.
Conflicts:
include/mapnik/vertex_converters.hpp
2012-05-31 15:55:20 +01:00
Artem Pavlenko
bf7500a8b0
Merge pull request #1234 from mirecta/unary_expr
...
unary minus operator on mapnik::value and in expression_grammar
2012-05-31 05:51:07 -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
6190cf22f1
+ pass Args by const-ref
2012-05-31 10:40:23 +01:00
Artem Pavlenko
7eb8d175da
+ cleanup
2012-05-31 09:37:00 +01:00
Artem Pavlenko
de71db7d38
+ avoid copying
2012-05-31 09:33:55 +01:00
Dane Springmeyer
9a18cb2cf6
amend 733c2df0a8
- graphics.hpp is needed on windows
2012-05-29 17:10:41 -07:00
Dane Springmeyer
5feb9750e5
amend eaa53b0
and #1232 to compile with clang++ by avoiding first pass instanciation of intentionally invalid templates - refs #985
2012-05-29 15:28:35 -07:00
Mickey Rose
a6b4bb88ce
unary minus operator on mapnik::value and in expression_grammar
2012-05-29 23:45:13 +02:00
Dane Springmeyer
eaa53b0904
Merge pull request #1232 from mirecta/issue-985
...
fix/prevent to_expression_string misuse #985
2012-05-29 14:41:23 -07:00
Dane Springmeyer
109081bef3
Revert "fix transform (patch from #1204 )"
...
This reverts commit b42e4988ec
.
2012-05-29 14:06:47 -07:00
Dane Springmeyer
e8e8ba1f96
Revert "followup to b42e4988e
, fix svg transforms for svg render as well as render_id - refs #1204 "
...
This reverts commit ac9dc4762a
.
2012-05-29 14:06:23 -07:00
Mickey Rose
09b05b48b0
fix/prevent to_expression_string misuse #985
2012-05-29 22:53:39 +02:00
Mickey Rose
44538e29d4
agg::conv_transform: changed transformer to non-const reference (replaces ba270e0
)
2012-05-29 18:32:04 +02:00
Artem Pavlenko
f3c774baa4
+ add grain-extract blending mode (gimp)
2012-05-29 15:09:33 +01:00
Artem Pavlenko
e7ae5121a2
+ correct image_width padding calc - via @lightmare
2012-05-29 12:38:10 +01:00
Artem Pavlenko
6bea57d690
+ implement grain-merge blending mode (GIMP)
2012-05-25 10:35:43 +01:00
Dane Springmeyer
28b9729ae7
Revert "restore pristine agg2.4 agg:span_image_resample_rgba_affine - refs #1227 "
...
This reverts commit 225678eccb
.
2012-05-24 14:11:42 -07:00
Dane Springmeyer
225678eccb
restore pristine agg2.4 agg:span_image_resample_rgba_affine - refs #1227
2012-05-24 14:10:52 -07:00
Artem Pavlenko
181c470bd6
+ correct calculations
2012-05-24 12:51:12 +01:00
Artem Pavlenko
bd25a9af92
+ handle boundary pixels in x/y gradients
2012-05-24 12:44:07 +01:00
Artem Pavlenko
0542994c4d
+ implement y-gradient in terms of x-gradient
2012-05-24 12:11:55 +01:00
Artem Pavlenko
1077b79a63
Revert "initialise blur radius's to 1 for real this time"
...
This reverts commit f76c6ee25f
.
2012-05-24 11:37:24 +01:00
Artem Pavlenko
f76c6ee25f
initialise blur radius's to 1 for real this time
2012-05-23 20:38:42 +01:00
Artem Pavlenko
4fc4535c95
+ initialise blur radius's to 1 in default ctor
2012-05-23 20:29:07 +01:00
Artem Pavlenko
fb34c7ef5a
+ handle boundary cases in 3x3 convolution
2012-05-23 20:26:24 +01:00
Artem Pavlenko
6471cfc597
+ unnamed args in image-filters #1222
2012-05-23 20:23:10 +01:00
Artem Pavlenko
42dc568034
+ don't rely on C99 support, use <boost/cstdint.hpp> instead
2012-05-17 08:49:18 +01:00
Dane Springmeyer
fb0ef869d6
Merge branch 'master' of github.com:mapnik/mapnik
2012-05-15 10:35:56 -07:00
Dane Springmeyer
8f79641383
only use skipping if >= boost 1.47 - corrects #1209 (refs #1210 )
2012-05-15 10:35:04 -07:00
Artem Pavlenko
1b210ba456
+ use compositing renderer for markers,points and shields
2012-05-15 16:13:08 +01:00
Artem Pavlenko
55d5d8596d
+ pass by const-ref
...
+ remove explicit keyword from default ctor
2012-05-15 14:40:24 +01:00
Dane Springmeyer
3d89e4001a
expose no-args agg_stack_blur constructor
2012-05-14 19:00:29 -07:00
Artem Pavlenko
9599711e0e
Merge remote-tracking branch 'origin/master'
2012-05-14 17:33:45 +01:00
Artem Pavlenko
983db006e9
+ custom span_image_filter
2012-05-14 17:30:50 +01:00
Artem Pavlenko
733c2df0a8
remove unused header
2012-05-14 17:14:05 +01:00
Dane Springmeyer
c1495c0c74
restore the fast line rasterizer (rasterizer_outline_aa) and improve its rendering quality and consistency with standard method - refs #873
2012-05-11 17:40:21 -07:00
Dane Springmeyer
54f54ed775
rename composite args
2012-05-11 15:31:35 -07:00
Dane Springmeyer
8ae867f6de
default values for composite args to maintain api compatibility
2012-05-11 15:19:05 -07:00
Dane Springmeyer
c9bedf8bd4
restore compile with boost < 1.47 - disables stacked image filters for now
2012-05-11 14:08:46 -07:00
Dane Springmeyer
ac9dc4762a
followup to b42e4988e
, fix svg transforms for svg render as well as render_id - refs #1204
2012-05-11 07:16:42 -07:00
Artem Pavlenko
b42e4988ec
fix transform (patch from #1204 )
2012-05-11 12:46:46 +01:00
Artem Pavlenko
7380a6a001
+ fix raster_symbolizer: add x/y dst args to composite
2012-05-11 10:55:58 +01:00
Artem Pavlenko
8085110e8f
+ add opacity parameter
2012-05-10 18:14:53 +01:00
Artem Pavlenko
8cd898ce35
+ make comp_op non-optional ( default: src-over)
...
+ move ctors implementations into *.cpp
2012-05-10 12:05:40 +01:00
Dane Springmeyer
ab73f13525
rename the image transform for clarity
2012-05-09 18:15:34 -07:00
Artem Pavlenko
aad7c5e384
+ implement compositing for text
...
+ refactor image_32
2012-05-09 12:39:23 +01:00
Artem Pavlenko
a2115c718b
+ fix ctor's
2012-05-07 16:37:12 +01:00
Artem Pavlenko
7e49a6f44e
+ move 'smooth' property to symbolizer_base level
...
+ remove 'SYMBOLIZER_FAST' completely
2012-05-07 16:08:16 +01:00
Artem Pavlenko
3a8d3c5042
+ better formatting
2012-05-07 16:06:33 +01:00
Artem Pavlenko
9ba04738d6
+ don't expose agg headers
2012-05-04 10:23:49 +01:00
Artem Pavlenko
b0f87ee9b2
+ remove unused enum value
2012-05-04 10:22:50 +01:00
Artem Pavlenko
164ba630d9
+ add requirement for renderers-> provide processor_impl_type
...
to allow process_xxx functions declaration in base class
+ re-enanble cairo renderer
2012-05-03 12:19:26 +01:00
Artem Pavlenko
3d12c63740
+ use scale_factor fix
2012-05-03 12:18:54 +01:00
Artem Pavlenko
e23fdb276f
+ pass scale_factor to vertex_converter
2012-05-02 17:22:54 +01:00
Artem Pavlenko
44c5efbf75
+ add miterlimit parameter
2012-05-02 17:04:24 +01:00
Artem Pavlenko
2f0fa10db5
cleanup
2012-05-02 16:32:09 +01:00
Artem Pavlenko
a475b6e0bc
+ add offset_converter
2012-05-02 15:13:46 +01:00
Artem Pavlenko
77dfac5622
+ re-introduce transform on symbolizer_with_image
2012-05-01 16:47:33 +01:00
Artem Pavlenko
2e9a7d9cc8
+ explicit keyword only makes sense for 1 arg ctor's
2012-05-01 14:24:53 +01:00
Artem Pavlenko
a72ee4ba66
Merge branch 'master' into compositing
...
Conflicts:
include/mapnik/image_compositing.hpp
include/mapnik/util/conversions.hpp
include/mapnik/value.hpp
src/agg/agg_renderer.cpp
src/agg/process_line_symbolizer.cpp
src/agg/process_polygon_symbolizer.cpp
src/png_reader.cpp
src/svg_parser.cpp
utils/svg2png/svg2png.cpp
2012-05-01 12:35:49 +01:00
Artem Pavlenko
f57d2c28f0
+ 'direct' image filter support: apply filter on main rendering buffer
...
(TODO: better user-friendly names)
+ allow empty string e.g image-filters="" (why not?)
2012-04-25 10:54:54 +01:00
Artem Pavlenko
c26ad5706e
+ move 'clip' property to symbolizer_base
...
+ support 'clip' accross relevant symbolizer (agg)
2012-04-24 11:10:54 +01:00
Artem Pavlenko
a4cdc7a1c0
+ make comp_op boost::optional<>
...
+ use plain pixf when style_level_compositing=true
2012-04-23 15:41:18 +01:00
Artem Pavlenko
03d42e59a5
+ allow specifying premultiply flag for src and dst images
...
+ fix logic in agg_renderer (TODO)
2012-04-20 14:53:11 +01:00
Dane Springmeyer
16a16b1818
only print failed face_set_ptr loading for fontsets if MAPNIK_LOG is defined - refs #1175
2012-04-19 11:27:04 -07:00
Dane Springmeyer
703d4ab7f2
for >= boost 1.45 (compile does not work with 1.42) move to karma for to_string conversions to avoid lexical cast - refs #1055
2012-04-19 10:29:37 -07:00
Artem Pavlenko
720035102b
remove lexical_cast usage
2012-04-19 13:36:21 +01:00
Artem Pavlenko
145f83b806
boost::spirit::karma based to_string impl
2012-04-19 13:35:41 +01:00
Artem Pavlenko
7ae0383a4b
disable unused vars warnings
...
cleanup
2012-04-18 17:00:49 +01:00
Artem Pavlenko
d0f0d0b35d
Merge branch 'compositing' of github.com:mapnik/mapnik into compositing
2012-04-18 16:48:25 +01:00
Artem Pavlenko
bb86fd285e
consistent naming
...
unsigned int parser with max 3 digits
2012-04-18 16:46:38 +01:00
Dane Springmeyer
dab6936f05
embose -> emboss
2012-04-18 07:37:46 -07:00
Dane Springmeyer
2f65a7612d
allow cairo compile
2012-04-18 07:09:12 -07:00
Artem Pavlenko
668d6f2325
image-filters: initial implementation
2012-04-18 12:14:23 +01:00
Artem Pavlenko
e54aaba09b
impl affine tranform converter
2012-04-18 09:44:26 +01:00
Artem Pavlenko
831538b522
move svg transform to symbolizer_base
2012-04-18 09:42:19 +01:00
Artem Pavlenko
9af11c5ef2
only allocate internal buffer if required
2012-04-18 09:37:02 +01:00
Dane Springmeyer
f3bc7f011f
fix linking errors experienced by node-mapnik on windows
2012-04-17 18:58:24 -07:00
Dane Springmeyer
b0d857a66a
do not list mapping in feature init list - creates -Worder warning
2012-04-16 22:33:16 -07:00
Dane Springmeyer
f77d9b6df1
formatting
2012-04-16 22:24:34 -07:00
Dane Springmeyer
8fd0a40749
finish work on populating initialization lists - closes #1114
2012-04-16 21:57:24 -07:00
Dane Springmeyer
77ac2992ab
remove uneeded semicolon
2012-04-16 21:19:58 -07:00
Dane Springmeyer
a4b3daf181
close #1176 again
2012-04-12 17:25:57 -07:00
Dane Springmeyer
422fe6e6be
fix compile with boost 1.44 or 1.45 - closes #1176
2012-04-12 16:18:33 -07:00
kunitoki
d717c715fc
- always log errors and fatals, regardless of MAPNIK_LOG definition
2012-04-12 23:45:03 +02:00
Dane Springmeyer
00ab1b672d
svg icon rendering: fix for thin lines displaying slightly too thick compared to other renderers (safari/chrome) - closes #1129 - refs #975
2012-04-11 10:27:37 -07:00
Artem Pavlenko
57d6d62440
+ support 'display' property, if set to 'none' don't parse children #1137
...
+ fix memory leak : xmlTextReaderGetAttribute -> string must be deallocated by the caller
+ call xmlTextReaderMoveToElement after xmlTextReaderMoveToFirstAttribute loop to restore
reader position.
Conflicts:
src/svg_parser.cpp
2012-04-11 14:36:39 +01:00
Artem Pavlenko
bba21e3d9c
+ support 'display' property, if set to 'none' don't parse children #1137
...
+ fix memory leak : xmlTextReaderGetAttribute -> string must be deallocated by the caller
+ call xmlTextReaderMoveToElement after xmlTextReaderMoveToFirstAttribute loop to restore
reader position.
2012-04-11 14:00:34 +01:00
Artem Pavlenko
45b0dd6482
+ support smooth conv in polygon_pattern_symbolizer
2012-04-10 15:46:38 +01:00
kunitoki
81c9dd7b6b
- added the ability to set the default global severity from scons configure
...
- initial check in of setting global severity from getenv (todo)
2012-04-10 16:19:51 +02:00
kunitoki
1a203d3f85
- cleaned up logger interface to better integrate with python bindings
...
- polished and finished python bindings for logger interaction
2012-04-10 10:14:28 +02:00
kunitoki
67ba40080c
- fixing remaining cerr traces
2012-04-10 00:58:18 +02:00
kunitoki
fb94e4a2ec
- replace all instances of std::cerr with MAPNIK_LOG_*
2012-04-10 00:51:04 +02:00
kunitoki
a902a08aab
- added logging to file
...
- started working on the logger bindings
- cleanups some error reporting with cerr/clog in the library
2012-04-10 00:25:31 +02:00
kunitoki
b60c508c1c
- finish thrashing all the useless ifdef MAPNIK_LOG
2012-04-09 21:41:56 +02:00
Artem Pavlenko
f727cb81b8
+ format
2012-04-09 12:24:52 +01:00
Artem Pavlenko
f7c406bf80
remove empty lines
2012-04-09 12:24:04 +01:00
kunitoki
74342e3083
- no need to #ifdef all the time: the compiler should optimize out the log calls when no MAPNIK_LOG is defined
...
- initially got rid of those ifdefs in plugins only
2012-04-09 12:05:49 +02:00
kunitoki
2df8e99af2
Merge branch 'master' of github.com:mapnik/mapnik
2012-04-09 03:03:31 +02:00
kunitoki
8c58a9aa73
- improved again the logging facilities
...
- aligned the plugins to using the new methods with severity
- implemented per object severity, with fallback to global (with global functions to set them programmatically)
- initial check in of logger python bindings (todo)
2012-04-09 03:00:51 +02:00
Dane Springmeyer
55ea1e4621
get stats output working on windows
2012-04-08 10:52:48 -07:00
kunitoki
50de846082
- fixed a compilation error when no logging is defined
2012-04-08 04:09:48 +02:00
kunitoki
4ef7343416
- added severity to logger (global variable for now)
...
- added a logger class for each severity level
2012-04-08 03:59:47 +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
19f5f77417
reuse path_expression_grammar - finishes and closes #1028
2012-04-06 16:50:11 -07:00
Dane Springmeyer
215f7a911c
remove lexical cast from value_type conversions - refs #1055
2012-04-06 14:20:32 -07:00
Dane Springmeyer
ab776edbf5
reduce string copying slightly in populate_tree - refs #1055
2012-04-06 12:58:08 -07:00
Dane Springmeyer
cb048b92d4
formatting
2012-04-06 12:29:51 -07:00
Dane Springmeyer
36516c00e2
Merge branch 'master' of https://github.com/mapnik/mapnik
2012-04-05 16:59:52 -07:00
Dane Springmeyer
7b84a2ce94
fix linking of postgis.input by using MAPNIK_DECL and ensuring the header is included in src/conversions.cpp - closes #1127
2012-04-05 16:59:36 -07:00
Dane Springmeyer
f90a07eb94
add explicit include for MAPNIK_DECL
2012-04-05 14:41:52 -07:00
Artem Pavlenko
738ff501fe
remove CompositingSymbolizer
2012-04-05 17:04:11 +01:00
Artem Pavlenko
34c984b2b8
+ support compositing across all symbolizers
...
(currently polygon and line symbolizers)
2012-04-05 15:59:11 +01:00
Dane Springmeyer
d29ae14104
make it possible to set the map.maximum_extent back to None/uninitialized from python
2012-04-04 12:07:15 -07:00
Artem Pavlenko
46b3594000
+ fix compilation with i686-apple-darwin11-llvm-g++-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2336.1.00)
2012-04-03 22:19:36 +01:00
Artem Pavlenko
e7f0e8aac0
+ support configurable vertex converter
2012-04-03 19:49:57 +01:00
Artem Pavlenko
030650f949
+ impl converter_traits for 'transform_tag'
...
+ support proj_transform and CoordTransform as args
2012-04-03 16:29:27 +01:00
Artem Pavlenko
347fce4db2
+ add 'clip' property
2012-04-03 16:28:49 +01:00
Artem Pavlenko
55ed40cbc2
attach proj_trans and tr at later stage (to work with vertex_converters interface).
2012-04-03 16:26:18 +01:00
Artem Pavlenko
cbcb8d6aad
+ use fusion::vector to pass arguments
2012-04-03 13:40:51 +01:00
Artem Pavlenko
81566a8f80
+ use pre-multiplied pixel format in agg_renderer
...
(de-multiply in end_map_processing())
+ support for compositing at style level
+ image blur (TODO)
2012-04-03 13:10:30 +01:00
Artem Pavlenko
2e7ed0f589
+ format/correct doc string
2012-04-03 13:08:10 +01:00
Artem Pavlenko
1bc2af9104
+ expose pixel_format_type
2012-04-03 13:03:59 +01:00
Artem Pavlenko
84cb7b4c54
vertex converter dispatch - intial impl
2012-04-03 13:01:06 +01:00
Dane Springmeyer
d9cb76f7a1
postgis: support mixed case table names - closes #1159
2012-04-02 19:21:14 -07:00
kunitoki
d516cf9f46
- cosmetics
2012-03-28 21:59:40 +02:00
Artem Pavlenko
8038561984
+ move renderer to agg_helpers
2012-03-28 12:02:03 +01:00
Dane Springmeyer
2edaefd0d6
cairo: match AGG functionality, adding support for dynamic ellipse drawing and loading from svg icons - closes #1071 (refs #952 - this is stopgap until we refactor and merge with point_symbolizer)
2012-03-27 19:21:11 -04:00
Artem Pavlenko
9840c7df4c
Merge branch 'master' into compositing
...
Conflicts:
include/mapnik/util/dasharray_parser.hpp
src/agg/process_line_symbolizer.cpp
src/image_compositing.cpp
2012-03-26 09:05:02 +01:00
Dane Springmeyer
18774354a6
support case insensitive booleans - closes #1141
2012-03-23 20:08:47 -07:00
Dane Springmeyer
149fca1626
I need a beer - followup to e4ae1f660d
2012-03-23 19:19:50 -07:00
Dane Springmeyer
e4ae1f660d
boost 1.42 compatibility - fixes #1145
2012-03-23 19:09:38 -07:00
Dane Springmeyer
ea5a46f230
remove the storage and serialization of 'font-directory' and 'minimum-version' since there is no strong need to have them accessible after initial parsing
2012-03-23 18:14:14 -07:00
Dane Springmeyer
2ff8c3344e
avoid copy
2012-03-23 11:22:00 -07:00
Artem Pavlenko
76054df89d
+ add 'wsp' delimiter support
...
+ re-arrange grammar a bit
2012-03-23 13:19:02 +00:00
Artem Pavlenko
38fafc14bc
+ impl dasharray parser (supports 'none')
...
+ skip 0,0 dashes in load_map
2012-03-23 13:18:49 +00:00
Artem Pavlenko
d76136ba40
use mapnik::util namespace for conversions
2012-03-23 13:18:33 +00:00
Artem Pavlenko
97a9abc8f3
+ add 'wsp' delimiter support
...
+ re-arrange grammar a bit
2012-03-23 12:56:26 +00:00
Artem Pavlenko
b4e96c35b5
+ impl dasharray parser (supports 'none')
...
+ skip 0,0 dashes in load_map
2012-03-23 11:58:07 +00:00
Artem Pavlenko
242385f16d
use mapnik::util namespace for conversions
2012-03-23 11:08:39 +00:00
Artem Pavlenko
97eb078adb
+ re-use renderer (TODO)
2012-03-23 09:34:26 +00:00
Dane Springmeyer
d23a4b63b9
expose both a clipped and unclipped labeling path type
2012-03-22 16:36:25 -07:00
Dane Springmeyer
2e2bce3126
formatting
2012-03-22 16:31:57 -07:00
Artem Pavlenko
bc2589960b
+ add missing files
2012-03-21 17:34:41 +00:00
Artem Pavlenko
95cfb061af
+ experimental compositing symbolizer (fill only)
2012-03-21 15:47:33 +00:00
Artem Pavlenko
aefa23fb5b
+ boost::bimap based enum<->string lookup table
...
+ fix pixel_format bgra -> rgba
2012-03-21 15:45:23 +00:00
Dane Springmeyer
4843572e1b
move image_compositing to cpp file
2012-03-19 15:42:30 -07:00
Artem Pavlenko
b2ca10f3a0
+ always premultiply destination buffer for correct ops
...
(ensure no color component exceeds alpha channel)
2012-03-19 21:19:52 +00:00
Artem Pavlenko
9e3e5bb74a
Merge remote-tracking branch 'origin/master'
2012-03-19 19:45:32 +00:00
Hermann Kraus
9b62a19cf4
Implement justify-alignment=auto.
...
Closes #1125 .
2012-03-19 17:12:53 +01:00
Artem Pavlenko
e06c456789
even better, use BOOST_FOREACH
2012-03-19 10:46:44 +00:00
Artem Pavlenko
aef214292e
don't rely on compiler for-loop optimisation
2012-03-19 10:11:55 +00:00
ldp
1542e3e513
add ignore-placement to MarkersSymbolizer
2012-03-18 22:35:02 +01:00
Dane Springmeyer
cdc6376719
be explicit about zero-division protection
2012-03-16 14:49:56 -07:00
Artem Pavlenko
70512dc03b
+ add optional smothing to line_symbolizer
...
( TODO: conv_dash )
2012-03-15 10:26:53 +00:00
Dane Springmeyer
2abe02bd96
make available MAPNIK_VERSION_STRING in c++ header (not just in python) and add MAPNIK_VERSION_IS_RELEASE define that indicates if the code is released
2012-03-14 18:30:32 -07:00