Commit graph

5156 commits

Author SHA1 Message Date
Dane Springmeyer
6915d3fea5 Merge pull request #1291 from mapnik/non-buffered-avoid-edged-check
Non buffered placement dimensions for consistent avoid edged checking (#1283 and #1287)
2012-07-05 15:41:36 -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
Dane Springmeyer
44769def3c Merge branch 'master' of github.com:mapnik/mapnik 2012-07-05 11:55:05 -07:00
Dane Springmeyer
906de8e317 simplify boost_python library configure checks 2012-07-05 11:54:43 -07:00
Dane Springmeyer
f7383b81fb properly pass the scale_factor to the cairo_renderer_base 2012-07-05 11:12:46 -07:00
artemp
e4044048db Merge remote-tracking branch 'origin/master' 2012-07-05 17:20:03 +01:00
artemp
59c1f9ac21 + inherit stroke, stroke-width and fill if provided in markers_symbolizer 2012-07-05 17:17:35 +01:00
artemp
9d756165e0 + update to work with optional stroke (markers) 2012-07-05 17:16:11 +01:00
artemp
ebf1ef6bcf + update python bindings for markers_symbolizer 2012-07-05 17:13:21 +01: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
Hermann Kraus
c805cbcfe1 Add test for ShieldSymbolizer with text placements. 2012-07-05 10:37:39 +02: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
82d7a63ef6 Replace remaining parse_expression() calls.
Closes #1168.
2012-07-04 20:59:36 +02:00
Hermann Kraus
dd9276b1ef Reuse expression grammar for TextSymbolizer.
Refs #1168.
2012-07-04 20:55:03 +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
6bc3f06afd + remove arrow/ellipse 2012-07-04 14:22:44 +01:00
artemp
ab4e717813 + fix stock markers transformations
FIXME : use markers cache to load and store stock markers
2012-07-04 11:56:52 +01:00
artemp
8ab8f7c420 + add missing miterlimit (grid,cairo) 2012-07-04 10:07:37 +01:00
artemp
fc1469add0 Merge branch 'master', remote-tracking branch 'origin' 2012-07-04 09:24:52 +01:00
artemp
0a146e0b5c remove unused renderer_scanline_solid 2012-07-04 09:23:01 +01:00
Dane Springmeyer
7d9b4ce0da settle upon 'geometry-transform' naming - refs #1276 2012-07-03 18:34:11 -07:00
Dane Springmeyer
e4ff79d8d8 re-implement f866ab1f80 and da53af5c98 (re-closing #1277) since somehow these commits dissapeared from master 2012-07-03 18:04:35 -07:00
Hermann Kraus
eb682c1f4f Fix visual_tests/test.py. 2012-07-03 23:39:34 +02:00
Dane Springmeyer
e93c5604a6 use detector extent for shields that is also sensitive to buffer_size - refs #1283 2012-07-03 13:32:27 -07:00
artemp
290bf735da + use BOOST_FOREACH 2012-07-03 13:38:07 +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
700b5978d8 + check bounding box intersections if use_spatial_index=false (#971) 2012-07-02 18:15:18 +01:00
artemp
4b4cfdd462 + link to boost_system if boost_version >= 1.50 2012-07-02 18:10:48 +01:00
artemp
e69c44e3d3 + use ST_xxx 2012-07-02 17:59:47 +01:00
artemp
134dc5bbf1 Merge branch 'master' into transform-rename
Conflicts:
	src/load_map.cpp
2012-07-02 15:37:13 +01:00
artemp
7d2c695849 + remove unused font_manager_ 2012-07-02 13:28:40 +01:00
Hermann Kraus
959ff260dd Fix RTL bug. 2012-07-02 02:06:07 +02:00
Hermann Kraus
228263727f Fix offsets. 2012-07-02 01:59:29 +02:00
Hermann Kraus
6e4915ef83 Use shared pointers for text_layout. 2012-07-02 01:06:30 +02:00
Hermann Kraus
aecd6820c2 Use char_properties_ptr everywhere. 2012-07-02 00:10:55 +02:00
Hermann Kraus
47dea8ed52 Use char_properties_ptr in more files. 2012-07-01 23:14:35 +02:00
Hermann Kraus
993395c510 Add test case with mixed text. 2012-07-01 23:13:54 +02:00
Hermann Kraus
7d241c5353 Use shared pointer to track char_properties.
Store positions instead of strings in text_item.
2012-07-01 22:35:20 +02:00
Hermann Kraus
e537b0e8dd Remove old code. 2012-07-01 02:47:39 +02:00
Hermann Kraus
ead99b1411 Calculate glyph dimensions. 2012-06-30 21:40:41 +02:00
Hermann Kraus
bf66b71f3e Add copyright message. 2012-06-30 19:50:05 +02:00
Hermann Kraus
91d80dc7c1 Use UTF16 directly to avoid reencoding and allow easy mapping of chars to glyphs. 2012-06-30 18:32:59 +02:00
Hermann Kraus
89b727d2fc Correctly set script and direction. 2012-06-30 18:03:31 +02:00
Hermann Kraus
2e50936b13 Use mapnik's face_manager instead of loading the font on our own. 2012-06-30 17:09:46 +02:00
Hermann Kraus
63e8b6d6db Some changes to make testing easier. 2012-06-30 10:04:18 +02:00