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 |
|
Dane Springmeyer
|
757816a1b8
|
respect scale_factor in affine transform used for collision detector in point_symbolizer - refs #1274
|
2012-06-29 17:25:34 -07:00 |
|
Dane Springmeyer
|
9888ff0d50
|
remove geometry type tests for postgis that are not longer valid with postgis 2.0
|
2012-06-29 16:52:54 -07:00 |
|
Dane Springmeyer
|
8412fdbbe6
|
Merge branch 'master' of github.com:mapnik/mapnik
|
2012-06-29 16:36:55 -07:00 |
|
Dane Springmeyer
|
da53af5c98
|
avoid passing empty file attributes into the renderer - closes #1277
|
2012-06-29 16:36:43 -07:00 |
|
Hermann Kraus
|
512a9af53f
|
Fix font scaling.
Refs #1273.
|
2012-06-30 01:28:56 +02:00 |
|
Dane Springmeyer
|
f866ab1f80
|
no need to catch image_reader_exception any more during load map because all errors are now at runtime due to path expressions
|
2012-06-29 16:21:52 -07:00 |
|
Dane Springmeyer
|
5c9186017b
|
rename 'image-transform' to just 'transform' (for backward compatibility) and call transforms applied to geometries 'view-transform'
|
2012-06-29 15:59:56 -07:00 |
|
Dane Springmeyer
|
531a25bbb7
|
keep running even if visual tests experience failures
|
2012-06-29 13:07:41 -07: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 |
|
Dane Springmeyer
|
ef893b5b5f
|
comment on why we use center for justify_alignment
|
2012-06-29 11:43:37 -07:00 |
|
artemp
|
caa50402dc
|
+ apply scale_factor to raster markers (bilinear)
|
2012-06-29 12:31:41 +01:00 |
|
artemp
|
34c3128b0c
|
+ use Map::scale_factor_
|
2012-06-29 12:30:36 +01:00 |
|
artemp
|
bf60dd9299
|
+ don't call 'set_character_sizes' - alredy set in processed_text.cpp:L77
|
2012-06-29 10:36:10 +01:00 |
|
artemp
|
8849ba7d4d
|
Merge remote-tracking branch 'origin/master'
|
2012-06-29 08:57:11 +01:00 |
|