Dane Springmeyer
89f64f6b97
avoid spirit usage in function_call.hpp - refs #2439
2014-09-29 13:12:46 -07:00
Dane Springmeyer
b7b39d4444
add missing file
2014-09-29 12:11:03 -07:00
Dane Springmeyer
688e97e148
move dasharray parser to cpp file - refs #2439
2014-09-29 12:07:15 -07:00
artemp
95d13e0b3d
Merge branch 'master' into vertex-converter
2014-09-29 12:34:54 +01:00
artemp
4f67ec0fc7
update cairo and grid renderers to use new vertex_converters
2014-09-29 12:25:34 +01:00
Dane Springmeyer
4541a2207b
simplify code in create_face
2014-09-28 23:54:24 -07:00
Dane Springmeyer
11d8f40342
add code comments to create_face
2014-09-28 23:32:29 -07:00
Dane Springmeyer
0a1906f7a6
cleanup
2014-09-28 23:32:02 -07:00
Dane Springmeyer
5f0b5ddafd
ignore font cache in map assignment and comparison
2014-09-28 23:31:48 -07:00
Dane Springmeyer
7b97e3ace8
unique_ptr for font_face_set
2014-09-28 22:35:08 -07:00
Dane Springmeyer
e21e8b6696
c++ style
2014-09-28 22:20:59 -07:00
Dane Springmeyer
d1adabf7d5
3.x port of localized font caching and then some
2014-09-26 19:54:07 -07:00
artemp
130e621ace
use c++11 in vertex_converters (work-in-progress)
2014-09-26 12:41:03 +01:00
Dane Springmeyer
385a77fc47
pass map to renderer common (viable after 60a55cb48, needed for upcoming font changes)
2014-09-25 22:37:43 -07:00
Dane Springmeyer
60a55cb48b
noncopyable renderer_common (needed for upcoming font work)
2014-09-24 22:46:19 -07:00
Dane Springmeyer
a26a82dc12
allow font re-registration - closes #1895
2014-09-24 18:22:45 -07:00
Dane Springmeyer
eb8686388f
add to string impl for length func - closes #2437
2014-09-24 17:37:16 -07:00
Dane Springmeyer
aa239a65ed
remove unneeded include
2014-09-24 12:23:54 -07:00
artemp
4be6ca37e9
c++11 - use auto
2014-09-23 18:49:31 +01:00
Jiri Drbalek
31607cb3f4
add text attribute horizontal-alignment="adjust"
2014-09-23 08:49:27 +00:00
Dane Springmeyer
d59529d22f
map ExpressionFormat -> Format for 2.3.x back compat - refs #2429
2014-09-22 23:34:36 -07:00
Dane Springmeyer
69dd74e079
rename wrap-char -> wrap-character to match Mapnik 2.3.x - refs #2333
2014-09-19 16:53:03 -07:00
Dane Springmeyer
0c901f790e
respect halo-transform in grid_renderer
2014-09-19 15:37:13 -07:00
Dane Springmeyer
9e78712dc4
Merge pull request #2377 from mapycz/3.x-fix-text-on-line-glyph-distance
...
text rendering with line placement on corners in 3.x
2014-09-19 15:12:32 -07:00
Dane Springmeyer
98adcc2d58
fix compile with clang++ after #2416
2014-09-19 14:51:27 -07:00
Dane Springmeyer
753cd5d6a0
Merge pull request #2416 from mapycz/add-font-features
...
add font-feature-settings
2014-09-19 14:30:17 -07:00
Jiri Drbalek
57be44d815
text ligatures off when character-spacing > 0
2014-09-17 19:22:14 +00:00
Jiri Drbalek
2dcfa9e4b7
add font-feature-settings
2014-09-17 19:22:07 +00:00
Jiri Drbalek
e6a32f22cf
fix image painted
2014-09-16 18:54:52 +02:00
Dane Springmeyer
0cb63c51e8
finish removing ancient reduced size grid rendering pathway - amends f3a824c2cc
2014-09-12 00:56:51 -07:00
Dane Springmeyer
91ee910ad2
remove debugging line
2014-09-11 15:46:49 -07:00
Dane Springmeyer
519149087e
add support to tiff reader for reporting alpha
2014-09-11 15:44:48 -07:00
artemp
af33a87cfd
disable AA when warping images #1913
2014-09-11 16:49:00 +01:00
artemp
e545b68699
revert accidental removal of 'wrap-before' expression
2014-09-11 10:14:36 +01:00
artemp
246336d2b1
Merge branch 'min-dist-compatibility' of git://github.com/MapQuest/mapnik into MapQuest-min-dist-compatibility
2014-09-10 16:20:36 +01:00
artemp
f8dc7b023a
text - add ``repeat-wrap-char`` parameter default:false ( #2333 )
2014-09-10 16:08:41 +01:00
Jordan Hollinger
9b5a9dfe3e
Change text-margin option to margin.
2014-09-10 07:45:41 -04:00
artemp
90f6258b41
expressions : add ``lenght()`` unary function
2014-09-10 12:09:33 +01:00
artemp
b441586acf
text-symbolizer: revive 'wrap-char' property which uses special (naive) line_breaker - ref #2333
2014-09-09 17:30:01 +01:00
artemp
635c3728f2
wrap BreakIterator into std::unique_ptr to avoid leaking memory
...
(per ICU docs: "The caller owns the returned object and is responsible for deleting it.")
2014-09-08 12:01:22 +01:00
Dane Springmeyer
479b9e13d0
Merge pull request #2383 from MapQuest/min-dist-compatibility
...
3.x -> 2.3.x compatibility for minimum-distance
2014-09-06 22:50:13 -07:00
Dane Springmeyer
ecc8696664
simplify load_map code
2014-09-06 22:15:26 -07:00
Dane Springmeyer
54b2880e53
markers: support offset, geometry-transform, and simplify - closes #2108
2014-09-06 21:27:15 -07:00
Dane Springmeyer
e26570dfdb
completely ignore layers with status=off - closes #153
2014-09-06 10:08:40 -07:00
artemp
2727eddf90
implement 'avoid-adges' for markers placements (point placement)
...
(TODO: support all placement types)
2014-09-05 16:19:55 +01:00
artemp
3cb047fc5c
avoid callling TIFFs global structures ref #2391
2014-09-05 12:30:33 +01:00
Jiri Drbalek
b7e7e29781
fix text rendering with line placement on corners
2014-09-05 10:46:46 +00:00
Jiri Drbalek
1af6f5db10
format
2014-09-05 10:46:46 +00:00
Dane Springmeyer
035a947892
no need for harfbuzz-icu
2014-09-04 23:16:25 -07:00
Dane Springmeyer
492e084714
add copy ctor to rule: avoids last copy of syms in load_map - closes #1293
2014-09-04 22:03:54 -07:00
Dane Springmeyer
7ee9f3268a
Merge branch 'master' of github.com:mapnik/mapnik into 3x-msvs
2014-09-04 13:06:02 -07:00
Dane Springmeyer
f73eef6f7a
rollback png8 default in 2.3.x - closes #2110
2014-09-04 12:08:47 -07:00
Dane Springmeyer
038cc41cd4
we are targeting 2014 so rollback 2013 CTP workarounds
2014-09-04 18:26:17 +00:00
Dane Springmeyer
7d5d02e031
Merge branch 'master' of github.com:mapnik/mapnik into 3x-msvs
2014-09-04 09:22:53 -07:00
Jiri Drbalek
67d8f41a1b
fix angle calculation
...
Conflicts:
src/text/vertex_cache.cpp
2014-09-03 11:53:23 -07:00
Dane Springmeyer
beaf7a56cc
fix linking problems from python
2014-08-31 07:44:41 +00:00
Dane Springmeyer
bfc772f697
attempt to build the python bindings (TODO: symbol errors wrt to swap)
2014-08-31 07:01:06 +00:00
Dane Springmeyer
603ea3811f
Merge branch 'master' of github.com:mapnik/mapnik into 3x-msvs
2014-08-30 20:05:33 -07:00
Dane Springmeyer
a8017ddae6
fix std:: prefixing for cmath
2014-08-30 15:13:34 -07:00
Dane Springmeyer
3f6a5ae246
re-enable harfbuzz shaper
2014-08-29 00:05:34 -07:00
Dane Springmeyer
b93d0e97e0
remove one more unused function::name that does not compile with msvs 2013 - refs #2396
2014-08-28 18:57:59 -07:00
Dane Springmeyer
37f4c574f3
remove unused function::name that does not compile with msvs 2013 - refs #2396
2014-08-28 18:49:56 -07:00
Dane Springmeyer
3c66054524
Merge branch 'master' of github.com:mapnik/mapnik into 3x-msvs
2014-08-28 17:23:59 -07:00
artemp
1ac0ebdd83
rename coord_transform to transform_path_adapter and move implementation into separate header
2014-08-28 10:59:08 +01:00
artemp
ecfaec1027
rename ctrans.hpp to view_transform.hpp
2014-08-28 10:29:04 +01:00
artemp
de22d5900c
rename CoordTransform to view_transform to better reflect its purpose and be consistent
2014-08-28 10:17:15 +01:00
Dane Springmeyer
91da442cdd
fix issue 9 for 2013 CTP from #2396
2014-08-26 20:39:08 -07:00
Dane Springmeyer
ee1c2aec47
use icu shaper to avoid needing to build harfbuzz right now - refs #2396
2014-08-26 19:24:06 -07:00
Dane Springmeyer
5789777199
fix issue 7 from #2396
2014-08-26 19:23:24 -07:00
Dane Springmeyer
c1140fb2ea
fix issue 4 of #2396
2014-08-26 19:01:45 -07:00
Dane Springmeyer
147375e197
workaround issue 3 from #2396
2014-08-26 13:23:48 -07:00
Dane Springmeyer
8d448dad5c
fix issue 2 from #2396
2014-08-26 12:43:31 -07:00
artemp
bfa13152e3
implement unary functions as functors
2014-08-26 11:41:26 +01:00
artemp
4fcbeaf706
avoid creating expression_string(str) visitor objects recursively
2014-08-26 11:00:42 +01:00
artemp
0cfbd3c5e8
expression_string : implement function call support
2014-08-26 10:51:55 +01:00
Dane Springmeyer
8e996e10ab
add support for windows unicode paths in rapidxml loader
...
Conflicts:
src/rapidxml_loader.cpp
2014-08-25 15:43:43 -07:00
artemp
3bd323ca85
expressions - add 'abs' function
2014-08-25 15:13:52 +01:00
artemp
2a254a4017
expressions - refactor function calls into separate compilation unit
2014-08-25 15:06:53 +01:00
artemp
4adb0abb64
expressions - implement unary and binary function expression nodes
...
(sample functions: exp, pow, sin, cos, min, max, tan, atan)
2014-08-25 14:17:18 +01:00
Jiri Drbalek
e1aededb09
refactor marker placements
2014-08-24 18:10:41 +00:00
Jordan Hollinger
688dfcabc9
Disallow use of minimum-distance with either repeat-distance or text-margin.
2014-08-22 08:52:45 -04:00
artemp
eb7716aeed
expressions - initial function_call framework implementation (TODO)
2014-08-22 12:30:25 +01:00
Jordan Hollinger
a28d3dd99c
Handle text-margin, repeat-distance, and backward compatible minimum-distance in placement_finder. Update visual tests.
2014-08-21 20:49:00 -04:00
Jordan Hollinger
c8c792277d
Add attribute text-margin in place of minimum-distance.
2014-08-20 19:43:36 -04:00
Dane Springmeyer
bb897e0144
use fast path for bbox reprojection (skipping extra point-sampling)
2014-08-20 14:47:27 -07:00
Dane Springmeyer
22117c6c64
code comments to clarify when/why base_path is needed at parse time when loading from a string
2014-08-20 13:53:25 -07:00
Dane Springmeyer
b9060c038c
rapidxml: avoid overhead of stringstream - amends 95d5b73
2014-08-20 13:46:00 -07:00
Dane Springmeyer
65bd9e6926
adapt to ptree change in boost 1.56 - closes #2365
...
Conflicts:
src/save_map.cpp
2014-08-19 09:08:33 -07:00
Dane Springmeyer
41064ed49d
pixel snapping for shields (and points) - closes #1866/refs #1316/amends 2fcd53134
2014-08-18 19:45:21 -07:00
Dane Springmeyer
e94b58f678
load_map: always parse transform so that xml warning keep working
2014-08-18 19:40:34 -07:00
Dane Springmeyer
d6c59d96ec
fix simply option + tests for #1484 and #1992
2014-08-18 19:23:50 -07:00
Dane Springmeyer
5d424e9389
remove unneeded code
2014-08-18 19:19:38 -07:00
artemp
801848ac97
Merge branch 'jh-min-repeat-distance' of git://github.com/MapQuest/mapnik into MapQuest-jh-min-repeat-distance
...
Conflicts:
include/mapnik/renderer_common/process_group_symbolizer.hpp
src/text/text_properties.cpp
2014-08-18 14:05:14 +01:00
Dane Springmeyer
751e039347
add RESPECT mode to make 'fixing' of bbox aspect a no-op on map
2014-08-14 20:27:27 -07:00
Dane Springmeyer
6ec3905fc5
fix redefinition warnings + dodge a compile error due to clashing toupper in python + clib by using iosfwd - closes #2355
2014-08-12 23:52:31 -07:00
Dane Springmeyer
7da05accc0
Merge branch 'master' of github.com:mapnik/mapnik into custom-variant-2
2014-08-12 23:19:26 -07:00
Dane Springmeyer
9b789a398b
remove bilinear8 from master/3.x - closes #2076
2014-08-12 13:43:37 -07:00
artemp
95cea92a4a
convert all boost::variant to util::variant
...
apart from topojson (TODO)
2014-08-12 13:40:45 +01:00
artemp
e5c316ae0b
Merge branch 'master' into custom-variant-2
2014-08-12 10:41:58 +01:00
artemp
3f8c459195
make mapnik::symbolizer a mapnik::util::variant<Symbolizers...>
2014-08-12 10:40:38 +01:00
Dane Springmeyer
fe31aed576
fix #2274 in master/3.x
2014-08-11 19:50:50 -07:00
Jordan Hollinger
c63e3a55f1
Merge branch 'master' of github.com:mapnik/mapnik into jh-min-repeat-distance
2014-08-11 17:43:51 -04:00
artemp
eabba25948
fix cairo_renderer usage in demo/viewer + revert aac69d0b34
2014-08-11 15:43:38 +01:00
artemp
9a1639a1d6
AGG/Cairo - fix pattern opacity
2014-08-11 15:42:45 +01:00
artemp
201641a206
AGG/Cairo - fix pattern opacity
2014-08-11 15:36:48 +01:00
Jordan Hollinger
726274c2c9
Merge branch 'master' of github.com:mapnik/mapnik into jh-min-repeat-distance
2014-08-11 09:48:04 -04:00
artemp
27ee642bbe
fix cairo_renderer usage in demo/viewer + revert aac69d0b34
2014-08-11 13:40:12 +01:00
artemp
9bfb41a39f
convert symbolizer properties to use util::variant
2014-08-11 13:24:53 +01:00
artemp
e315922b70
Merge branch 'master' into custom-variant-2
...
Conflicts:
include/mapnik/value.hpp
2014-08-11 11:53:59 +01:00
Dane Springmeyer
48078da22d
debug font crash - refs #2341
2014-08-10 20:35:23 -07:00
Dane Springmeyer
c285cfa188
refactor cairo_renderer
...
- splits process functions into new cpp files to reduce peak compile memory usage
- drops cairo_renderer_base to match agg_renderer design
- only cairo_ptr is accepted so cairo_surface_ptr must be converted into a context first
- fixes -fvisibility=hidden
2014-08-10 13:53:45 -07:00
Dane Springmeyer
9c7f8284bd
iwyu
2014-08-10 13:52:45 -07:00
Dane Springmeyer
678907e027
silence webp -Wunused-function warning
2014-08-09 13:57:01 -07:00
Dane Springmeyer
52b1da225b
less verbose ifdefs
2014-08-09 13:44:42 -07:00
Dane Springmeyer
4cb7b56f66
remove uneeded logging
2014-08-08 15:01:48 -07:00
Dane Springmeyer
578da31702
use extern template to fix osx -flto bug - closes #2339
2014-08-08 14:16:49 -07:00
Dane Springmeyer
1727fae6e7
remove boost concept_check usage - refs #2346
2014-08-08 13:15:57 -07:00
Dane Springmeyer
471eaed9df
initialize is_geographic
2014-08-08 12:00:20 -07:00
Dane Springmeyer
8f183ac63a
Merge pull request #2345 from mapnik/emplace
...
use emplace/emplace_back over insert/push_back - refs #2336
2014-08-08 11:30:14 -07:00
artemp
1f403a078e
transform : is_null_node visitor
2014-08-08 16:43:15 +01:00
Jiri Drbalek
fa0b97fff7
add markers placement methods vertex-first and vertex-last
2014-08-08 06:34:33 +00:00
Dane Springmeyer
6ae59b80af
iwyu
2014-08-06 12:27:10 -07:00
artemp
0490b7887c
text_symbolizer - ``geometry-transform`` support
2014-08-06 14:54:38 +01:00
artemp
9835057b0f
Use vertex_converters in text placement
2014-08-06 13:10:24 +01:00
Dane Springmeyer
ce8aee1994
be explicit about copy needed to safely pass glyph_info into text_line - closes #2337
2014-08-05 17:03:30 -07:00
Dane Springmeyer
d27b45553a
use emplace/emplace_back over insert/push_back - refs #2336
2014-08-05 15:19:37 -07:00
Dane Springmeyer
7a013e8151
switch glyph_info cache to an unordered_map (but no perf diff on osx)
2014-08-05 14:31:29 -07:00
Dane Springmeyer
76bd45fa30
fix order of smooth/offset - same bug as #2202 but for patterns
2014-08-05 13:54:10 -07:00
Dane Springmeyer
2a7fc29e42
add support for opacity with svgs in pattern symbolizers - refs #1010
2014-08-05 13:48:40 -07:00
Dane Springmeyer
2c9e089317
move harfbuzz_shaper inc + other iwyu fixups
2014-08-05 11:10:49 -07:00
artemp
c3a83e6f74
re-arrange headers
2014-08-05 18:58:22 +01:00
artemp
2b90b382e7
move render_pattern into sepratre compilation module
2014-08-05 17:40:15 +01:00
artemp
a8991cd600
refactor clipping_extent into separate header for sharing
2014-08-05 17:22:13 +01:00
artemp
dd05521289
Revert "avoid overflowing"
...
This reverts commit ebd183d58e
2014-08-05 13:13:52 +01:00
artemp
ebd183d58e
avoid overflowing
2014-08-05 11:57:57 +01:00
artemp
59b666cb77
Cairo : use vertex_converter in line_pattern_symbolizer ( #1386 )
...
fix pattern alignment
2014-08-05 11:48:42 +01:00
Dane Springmeyer
99a46f6910
re-enable glyph_info caching - refs #2326 , #2265 , #2334
2014-08-04 19:50:16 -07:00
Dane Springmeyer
fb12fc8b68
default to global alignment for polygon patterns - refs #2325
2014-08-04 16:20:12 -07:00
Dane Springmeyer
03429f9bcb
use std::unordered_map in non-perf critical code
2014-08-04 13:59:02 -07:00
Dane Springmeyer
75248e3376
remove obsolete wrap-character option for text symbolizer - closes #2333
2014-08-04 12:52:46 -07:00
Dane Springmeyer
5af394e496
scons: ensure cairo_renderer.cpp is built farther in the stack away from expression_grammar.cpp
2014-08-04 10:24:11 -07:00
artemp
c1c5421fb6
add divide, linear-dodge and linear-burn blending modes (needs testing)
2014-08-04 12:33:37 +01:00
Dane Springmeyer
9f05389754
fix handling of all sym enums as expressions - fixes tests from #2328
2014-08-03 21:28:36 -07:00
jhollinger2
0aad860a75
Add repeat-distance to text symbolizer properties.
...
Update collision detector to handle minimum-distance and repeat-distance seperately.
Update placement_finder to use repeat-distance.
Update group symbolizer to handle minimum-distance and repeat-distance.
2014-08-03 16:10:21 -04:00
artemp
96cc6b5417
fix typo
2014-08-01 20:15:59 +01:00
artemp
21d28c419c
Cairo : add SVG support for in line patterns
2014-08-01 14:37:39 +01:00
artemp
d44177b870
set image-transform for line pattern symbolizer
2014-08-01 13:40:08 +01:00
artemp
f2db42d5e4
support image-transform for vector patterns
2014-08-01 13:39:29 +01:00
artemp
a9f0408e4f
polygon_pattern_symbolizer: use set_symbolizer_property + add image-transform
2014-08-01 10:05:30 +01:00
artemp
90099bc171
Cairo : add SVG pattern support in polygon_pattern_symbolizer
2014-07-31 15:43:59 +01:00
