artemp
4be6ca37e9
c++11 - use auto
2014-09-23 18:49:31 +01:00
artemp
7a1cc786fc
position_grammar - re-order rules to allow expectation operators
2014-09-23 15:12:22 +01:00
artemp
2f319e92cc
use error_handler across json parsers
2014-09-23 14:58:10 +01:00
artemp
1382e57ebe
avoid allocating potentially large std::string in error_handler
2014-09-23 14:02:08 +01:00
artemp
f4694d03ff
json error handler : use MAPNIK_LOG_ERROR and better message
2014-09-23 13:22:53 +01:00
Jiri Drbalek
31607cb3f4
add text attribute horizontal-alignment="adjust"
2014-09-23 08:49:27 +00:00
artemp
43c04a72bf
add set_property_from_xml_impl specialization from std::string
...
( parse as an expression first )
2014-09-22 12:04:05 +01:00
artemp
5db32ab2e2
properties_util : template apply static method on value type
2014-09-22 11:23:57 +01:00
artemp
5df668d126
refactor error handler to work with mapnik/debug macros
2014-09-22 10:10:08 +01: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
7576c8e384
fix return of painted in grid_renderer
2014-09-19 14:34:08 -07:00
Dane Springmeyer
68d90adda6
enable painted for svg_renderer
...
Conflicts:
include/mapnik/svg/output/svg_renderer.hpp
2014-09-19 14:34:07 -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
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
artemp
4c296e65e7
use expectation operators parsing attributes #2390
2014-09-12 17:19:11 +01:00
Dane Springmeyer
0cb63c51e8
finish removing ancient reduced size grid rendering pathway - amends f3a824c2cc
2014-09-12 00:56:51 -07: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
b441586acf
text-symbolizer: revive 'wrap-char' property which uses special (naive) line_breaker - ref #2333
2014-09-09 17:30:01 +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
4ac190e8ef
fix handling of marker width/height
2014-09-06 22:44:57 -07:00
Dane Springmeyer
cc07ac2b00
simplify marker width/height handling
2014-09-06 22:13:30 -07:00
Dane Springmeyer
54b2880e53
markers: support offset, geometry-transform, and simplify - closes #2108
2014-09-06 21:27:15 -07:00
Dane Springmeyer
dc8a46017f
fix recursion on windows - closes #2414
2014-09-06 21:07:48 +00:00
Dane Springmeyer
9d363ce7e7
change runtime warning to compile time warning
2014-09-06 12:57:53 -07:00
Dane Springmeyer
1482835c08
fix visibility of image compositing/scaling with -flto - closes #2413
2014-09-06 10:52:00 -07:00
Dane Springmeyer
e26570dfdb
completely ignore layers with status=off - closes #153
2014-09-06 10:08:40 -07:00
artemp
fef3d22154
support avoid-edges in all markers placements
2014-09-05 16:33:20 +01: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
aea77a7155
use generic_json types in topojson grammar
...
refactor value_converters into separate header
usd value_converters in geojson parser
2014-09-05 12:13:58 +01:00
Jiri Drbalek
b7e7e29781
fix text rendering with line placement on corners
2014-09-05 10:46:46 +00:00
Jiri Drbalek
69708dc640
add length method
2014-09-05 10:46:46 +00: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
25a41ae31b
restore value hash + add test harness
2014-09-04 19:38:53 -07:00
Dane Springmeyer
3c1ad84f95
remove mapnik-config.bat
2014-09-04 16:40:37 -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
Dane Springmeyer
c30f1715e6
Revert "workaround msvs variant init bug"
...
This reverts commit be44b647fa
2014-09-04 09:22:43 -07:00
Dane Springmeyer
98c881432a
Revert "attempt to workaround other mapnik_value_type->variant bugs"
...
This reverts commit 7dc1aed9ee
2014-09-04 09:21:14 -07:00
artemp
72e2f4446f
re-implement mapnik::value deriving from value_base and update across core
...
fix mapnik::value conversions in topojson plugin
2014-09-04 17:10:13 +01:00
artemp
0985cc907d
remove copy converting ctor and fix converting move constuctor to use 'universal reference' and perfect forwarding
...
( re : http://isocpp.org/blog/2012/11/universal-references-in-c11-scott-meyers )
2014-09-04 14:54:42 +01:00
Jiri Drbalek
67d8f41a1b
fix angle calculation
...
Conflicts:
src/text/vertex_cache.cpp
2014-09-03 11:53:23 -07:00
Dane Springmeyer
7dc1aed9ee
attempt to workaround other mapnik_value_type->variant bugs
2014-08-31 17:18:15 -07:00
Dane Springmeyer
be44b647fa
workaround msvs variant init bug
2014-08-31 12:44:12 -07:00
Dane Springmeyer
beaf7a56cc
fix linking problems from python
2014-08-31 07:44:41 +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
8cd198625e
remove unused code
2014-08-30 14:30:51 -07:00
Dane Springmeyer
d577ef8719
Merge branch 'master' of https://github.com/mapnik/mapnik into 3x-msvs
2014-08-29 18:56:43 -07:00
Dane Springmeyer
c7f58ee64c
clean up harfbuzz->icu interface
2014-08-29 17:41:29 -07:00
Dane Springmeyer
15356f6320
handle wchar_t UChar typedef on windows
2014-08-29 16:46:23 -07:00
Dane Springmeyer
12a45744fb
Merge pull request #2403 from mapycz/3.x-fix-vertext_last-warning
...
fix compiler warning
2014-08-29 11:52:09 -07:00
Jiri Drbalek
21dcb2e2c4
fix compiler warning
2014-08-29 18:18:25 +00:00
Dane Springmeyer
8d7bf7a8da
fix imagedata visability on windows
2014-08-29 11:01:04 -07:00
artemp
a5925c1f15
remove redundant private copy assignment op
2014-08-29 18:06:08 +01:00
Dane Springmeyer
3f6a5ae246
re-enable harfbuzz shaper
2014-08-29 00:05:34 -07:00
Dane Springmeyer
6f3b8f969d
params: make msvs happy
2014-08-28 19:06:17 -07:00
Dane Springmeyer
324fb11f66
include <cstdint> - fixes msvs compile - refs #2396
2014-08-28 18:51:27 -07:00
Dane Springmeyer
7ff712af52
remove unused code
2014-08-28 17:24:17 -07:00
Dane Springmeyer
3c66054524
Merge branch 'master' of github.com:mapnik/mapnik into 3x-msvs
2014-08-28 17:23:59 -07:00
Dane Springmeyer
23189d7059
remove invalid MAPNIK_DECL usage - amends d61efc0b5a (may break lto, but fixes windows)
2014-08-28 17:23:32 -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
artemp
cc76ac4c6a
c++ style - avoid implicit bool conversions in comparison + make note re:scale_denom *= p.scale_factor();
2014-08-28 09:57:24 +01:00
artemp
4628dc3ff3
c++11 style
2014-08-28 09:55:16 +01:00
Dane Springmeyer
0635052349
fix CTP 2013 issue 8 from #2396
2014-08-26 20:01:59 -07:00
Dane Springmeyer
a8e8632572
don't trust __cplusplus - addresses issue 5 from #2396
2014-08-26 19:24:53 -07:00
Dane Springmeyer
f364069e25
fix issue 6 from #2396
2014-08-26 19:11:44 -07:00
Dane Springmeyer
b6bfab99b8
remove unneeded header
2014-08-26 16:09:04 -07:00
Dane Springmeyer
884db7de8c
fix issue 1 from #2396
2014-08-26 12:43:11 -07:00
artemp
0cfbd3c5e8
expression_string : implement function call support
2014-08-26 10:51:55 +01:00
Dane Springmeyer
3e1ab9beab
fix gdal compile with msvs 2013 - closes #2257
2014-08-25 17:50:45 -07:00
Dane Springmeyer
70f71790fe
simplify expression handling in marker_helpers
2014-08-25 14:51:22 -07:00
Dane Springmeyer
feffa8f53c
respect int return type for WebPValidateConfig
2014-08-25 14:38:03 -07: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
Dane Springmeyer
48c23f27dc
remove duplicate calculation of image_ratio
2014-08-24 19:21:54 -07:00
Dane Springmeyer
0b8439c8d2
fix inialization order
2014-08-24 16:37:39 -07:00
Jiri Drbalek
e1aededb09
refactor marker placements
2014-08-24 18:10:41 +00:00
Jordan Hollinger
88782a85c8
Minor improvement to repeat handling in collision detector.
2014-08-22 13:38:01 -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
artemp
8db68fc5e3
hextree - avoid quantizing images with less than 3 pixels (hextree implementation requirement)
2014-08-21 12:43:43 +01:00
Jordan Hollinger
c8c792277d
Add attribute text-margin in place of minimum-distance.
2014-08-20 19:43:36 -04:00
artemp
3c99514c85
GeoJSON : re-implement grammar to allow any order for "type", "coordinates" and "geometries" elements
...
Also, ammend positions parser to handle multi-dimensional coordinates e.g [x,y,z,....,N] (we only extract x and y)
2014-08-20 15:45:16 +01:00
Dane Springmeyer
7d23d49ecb
fix #2368
2014-08-19 14:47:03 -07:00
artemp
59b089f65d
remove unused (after grammar refactor) support_multi_pass.hpp include
2014-08-19 16:04:31 +01:00
Dane Springmeyer
0e87d913ed
fix return type
2014-08-18 19:19:48 -07:00
Dane Springmeyer
83b7ccb3ae
optimize set_symbolizer_property_impl
2014-08-18 15:37:46 -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
Jiri Drbalek
f3fba6e299
fix compile with gcc
2014-08-17 13:15:56 +00:00
artemp
67379d1bba
fix icu_shaper
2014-08-15 14:11:44 +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
8cfb49de81
fix quoting in svg output grammars - regressed in 350c2c29bd
2014-08-14 12:28:28 -07:00
Dane Springmeyer
595b81107c
variant : make operator<< stricter to avoid unexpected instantiations - refs 7602779836
2014-08-14 11:50:58 -07:00
Dane Springmeyer
8ef6558496
iwyu
2014-08-14 10:04:26 -07:00
artemp
52ba1383ec
move hash_value into value_adl_barrier namespace where it expected
2014-08-14 18:02:52 +01:00
artemp
454a69c582
mapnik::value - revive hash_value function implementation ( #2358 )
2014-08-14 10:00:23 +01:00
Dane Springmeyer
5b52fa94b1
fix compile on linux
2014-08-13 17:21:11 -07:00
Dane Springmeyer
5e314b04a7
iwyu
2014-08-13 09:05:02 -07:00
artemp
e8b7d50ebb
feature_generator_grammar - fix escaping
2014-08-13 13:06:38 +01:00
artemp
4ebd824368
make to_expression_string accept quotting char (default: '\'')
2014-08-13 13:05:22 +01:00
artemp
6972bc30d2
use mapnik_value_type promotion traits for better type mapping
...
in symbolizer and params + move mapnik_value_type traits to
value_types.hpp
2014-08-13 10:22:43 +01: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
5db9daaff1
fix compile error in svg_renderer_tests/path_element_test.cpp - refs #2355
2014-08-12 23:37:29 -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
8b6a0a32f6
improve interior position algorithm - patch from @mrwojo - closes #2137
2014-08-12 14:42:51 -07:00
Dane Springmeyer
9b789a398b
remove bilinear8 from master/3.x - closes #2076
2014-08-12 13:43:37 -07:00
artemp
6136a32092
Merge branch 'master' into custom-variant-2
2014-08-12 19:44:37 +01:00
Dane Springmeyer
04e4b47d91
stricter string2bool conversion - refs #2348
2014-08-12 11:33:20 -07:00
artemp
f57f3a7f83
ammend topojson_grammar and remove last boost::variant usage
2014-08-12 16:16:17 +01:00
artemp
7f8e18f89b
cleanup
2014-08-12 16:15:57 +01:00
artemp
95cea92a4a
convert all boost::variant to util::variant
...
apart from topojson (TODO)
2014-08-12 13:40:45 +01:00
artemp
8c7be886bd
fix typo - uncomment column_collector
2014-08-12 10:47:29 +01:00
artemp
3f8c459195
make mapnik::symbolizer a mapnik::util::variant<Symbolizers...>
2014-08-12 10:40:38 +01:00
Dane Springmeyer
80aeceafc7
remove duplicate typedef for dash_array
2014-08-11 22:22:12 -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
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
aac69d0b34
expose cairo_renderer<cairo_surface_ptr>
2014-08-11 13:24:11 +01:00
artemp
c197822116
add getter interface compatible with boost::variant
2014-08-11 13:23:01 +01:00
artemp
e315922b70
Merge branch 'master' into custom-variant-2
...
Conflicts:
include/mapnik/value.hpp
2014-08-11 11:53:59 +01:00
artemp
43b8069698
topojson - revert to using boost::variant for mapnik::topojson::geometry (TODO)
2014-08-11 11:51:19 +01: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
7cae3c34ca
iwyu in renderer_common
2014-08-10 13:04:20 -07:00
Dane Springmeyer
4c10d90145
declare segment y_order inline
2014-08-10 13:02:34 -07:00
Dane Springmeyer
378ab71a51
more -fvisibility=hidden fixes for osx
2014-08-09 14:23:23 -07:00
Dane Springmeyer
678907e027
silence webp -Wunused-function warning
2014-08-09 13:57:01 -07:00
Dane Springmeyer
8ff987af6d
iwyu
2014-08-09 13:46:13 -07:00
Dane Springmeyer
1c0b1884c3
use extern template to solve -fvisibility=hidden issues on osx
2014-08-09 13:44:42 -07:00
Dane Springmeyer
d61efc0b5a
-fvisibility=hidden fixes on osx with -flto
2014-08-09 13:44:42 -07:00
Dane Springmeyer
1c9afc9a86
boolean_type cleanup/code re-use
2014-08-09 13:44:41 -07:00
Dane Springmeyer
95430a3beb
remove uneeded debug statement
2014-08-08 15:41:18 -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
e33e0150ad
2x faster compile of value_types.hpp - start working on #2346
2014-08-08 12:34:41 -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
artemp
1a94ee1900
add link to custom generator TODO
2014-08-08 16:42:48 +01:00
artemp
93bad52e7e
use is_null_visitor
2014-08-08 16:42:14 +01:00
artemp
7b255f2b95
value traits to control to value conversions + fix is_null
2014-08-08 16:41:03 +01:00
artemp
784d24828f
replace boost::spirit::karma alternate operator (uses boost::variant) with direct util::variant to string conversion
2014-08-08 15:53:28 +01:00
artemp
6095df6702
Merge branch 'master' into custom-variant-2
...
Conflicts:
include/mapnik/value.hpp
2014-08-08 12:31:31 +01:00
artemp
eff7fb2f94
Merge branch '3.x-szn-markers-symbolizer-vertex-placements' of git://github.com/mapycz/mapnik into mapycz-3.x-szn-markers-symbolizer-vertex-placements
2014-08-08 12:15:53 +01:00
artemp
09e78e3ee9
remove unused includes
2014-08-08 12:14:11 +01:00
artemp
ade32abcd8
mapnik::util::variant in mapnik::value
2014-08-08 12:13:49 +01:00
Jiri Drbalek
705260aa06
prefer c++ style comments
2014-08-08 06:34:33 +00:00
Jiri Drbalek
9b0953a955
remove needless virtual inheritance
2014-08-08 06:34:33 +00:00
Jiri Drbalek
fa0b97fff7
add markers placement methods vertex-first and vertex-last
2014-08-08 06:34:33 +00:00
artemp
e7caf63de2
remove unused includes
2014-08-07 16:53:32 +01:00
Dane Springmeyer
38852f27bb
iwyu
2014-08-06 12:29:07 -07:00
Dane Springmeyer
aaaf82f28c
remove unused <<operator
2014-08-06 12:28:35 -07:00
Dane Springmeyer
6ae59b80af
iwyu
2014-08-06 12:27:10 -07:00
Dane Springmeyer
d4bb7ee279
remove unused <<operator
2014-08-06 12:26:01 -07:00
Dane Springmeyer
b8b76c1e1c
iwyu
2014-08-06 08:17:31 -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
artemp
ec97b8b744
c++ style
2014-08-06 12:32:50 +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
2a7fc29e42
add support for opacity with svgs in pattern symbolizers - refs #1010
2014-08-05 13:48:40 -07:00
Dane Springmeyer
e111f77310
pedantic fixes to line_pattern_rasterizer
2014-08-05 12:33:39 -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
Mike Morris
617524505b
fix header include comment
2014-08-05 13:15:55 -04: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
d01a5407ae
remove unused symbolizer hash
2014-08-05 13:05:32 +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
8232180614
c++11 style in harfbuzz_shaper.hpp
2014-08-04 23:42:42 -07:00
Dane Springmeyer
ab1e5def47
text_line: remove unneeded acces to glyph storage
2014-08-04 20:29:25 -07:00
Dane Springmeyer
99a46f6910
re-enable glyph_info caching - refs #2326 , #2265 , #2334
2014-08-04 19:50:16 -07:00
Dane Springmeyer
db96f3c933
drop unnessary use of boost in transform_processor.hpp
2014-08-04 15:09:37 -07:00
Dane Springmeyer
aa63d6c9a0
include cleanups where we used to use boost
2014-08-04 14:42:51 -07:00
Dane Springmeyer
d7c3d8f774
fix std::sort and std::lower_bound usage
2014-08-04 14:42:24 -07:00
Dane Springmeyer
5134fdc0d3
use std::sort over boost::sort
2014-08-04 14:13:33 -07:00
Dane Springmeyer
a73440496a
iwyu
2014-08-04 13:59:13 -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
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
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
18a7731d42
AGG line/polygon_pattern_symbolizer add support for SVG patterns
2014-07-31 15:25:22 +01:00
Dane Springmeyer
c6a291271f
fix conditional pixel snapping for marker rasters
2014-07-31 00:49:00 -07:00
Dane Springmeyer
3412c071ab
initialize default black square in marker cache - refs #952
2014-07-31 00:41:27 -07:00
Dane Springmeyer
6078f4cef1
more marker bbox fixes
2014-07-30 23:43:48 -07:00
Dane Springmeyer
d685307250
fix regression in raster marker collision box placement - refs #2295
2014-07-30 22:50:01 -07:00
Dane Springmeyer
6070c9caf0
fix compile
2014-07-30 16:25:21 -07:00
Dane Springmeyer
2a18280dc5
Add support for dynamic expressions for dasharrays - closes #2168
2014-07-30 16:02:23 -07:00
Dane Springmeyer
b7ecd00c31
complete support for face-name/fontset-name in <Format> node - closes #1900
2014-07-30 14:16:32 -07:00
Dane Springmeyer
350c2c29bd
drop karma confix + solve conflicting spirit headers - closes #2323
2014-07-30 13:06:08 -07:00
Dane Springmeyer
da457eba81
Merge branch 'master' of github.com:mapnik/mapnik
2014-07-30 08:42:03 -07:00
artemp
3f5344ca82
geojson - make feature_collection_grammar not dependend on mapnik::context
2014-07-30 11:01:54 +01:00
Dane Springmeyer
8646ccc83f
start passing fontsets down to format and layout - refs #1900
2014-07-29 18:29:20 -07:00
Dane Springmeyer
e7c6d84028
Avoid -Wdelete-non-virtual-dtor warning
2014-07-29 17:17:45 -07:00
Dane Springmeyer
acbebcdd79
Merge branch 'master' of github.com:mapnik/mapnik
2014-07-29 17:07:09 -07:00
Dane Springmeyer
673bd4fd8f
use detail namespace in json/geometry_generator_parser.hpp
2014-07-29 17:06:54 -07:00
Dane Springmeyer
ba999ff4be
Merge pull request #2295 from mapycz/3.x-szn-markers-symbolizer
...
refactor markers placements
2014-07-29 17:04:27 -07:00
Dane Springmeyer
1fa31d5d20
remove force-odd-labels - refs #2120
2014-07-29 14:37:29 -07:00
artemp
08c3dd1f88
convert remaining text properties to expressions
2014-07-29 14:43:26 +01:00
artemp
c565aa8722
move symbolizer property handling to symbolizer_utils
2014-07-29 13:31:07 +01:00
Jiri Drbalek
6730408039
fix include
2014-07-29 11:52:43 +00:00
Jiri Drbalek
6a17e17c04
fix markers transforms calc
2014-07-29 11:52:43 +00:00
Jiri Drbalek
2940de0b0b
refactor markers placements
2014-07-29 11:52:39 +00:00
artemp
97f87b1946
aggregate text symbolizer properties loading
2014-07-29 10:09:54 +01:00
Dane Springmeyer
e525ca28b5
Re-instate skipping of proj_transform failures - closes #2147
2014-07-28 20:46:30 -07:00
Dane Springmeyer
cdb075f75f
make clipping off by default - closes #2146
2014-07-28 20:31:10 -07:00
Dane Springmeyer
8feedd94cd
rename mapnik::boolean to mapnik::boolean_type - closes #1899
2014-07-28 19:46:49 -07:00
Dane Springmeyer
04115c5838
fix #2290
2014-07-28 19:06:56 -07:00
Dane Springmeyer
b0f722a30b
fix #2299
2014-07-28 17:09:51 -07:00
Dane Springmeyer
d55a0010dc
also move feature_collection_grammar to impl file
2014-07-28 16:51:24 -07:00
artemp
f338028802
fix init order
2014-07-28 17:50:44 +01:00
artemp
0cf6e47006
c++ char_properties -> evaluated_format_properties
2014-07-28 17:22:32 +01:00
artemp
fb3d9cd7b6
convert horizontal/vertical/justify_alignment properties to expressions
2014-07-28 15:09:29 +01:00
artemp
61c0344dd6
generic set_property_from_xml implementation
2014-07-28 15:08:28 +01:00
artemp
51cf60125e
rename source files to reflect class name e.g layout -> text_layout
2014-07-28 12:10:34 +01:00
Dane Springmeyer
0d95f038a7
shuffle the cost of spirit grammars
2014-07-25 16:15:18 -07:00
Dane Springmeyer
bbc57f442c
fix -Wsign-compare warnings in several grammars
2014-07-25 15:49:50 -07:00
Dane Springmeyer
d598a2bb55
iwyu
2014-07-25 15:35:27 -07:00
Dane Springmeyer
34bbf36e3a
Revert "return code 0 to gracefully exit if python bindings are not available"
...
This reverts commit 2f08dc29ef
2014-07-25 11:49:05 -07:00
artemp
70059cc346
remove redundant ExpressionFormat node
2014-07-25 14:26:13 +01:00
artemp
37245fdde1
text properties : add framework to handle expressions in enumerations
...
+ make text-transform an expression
2014-07-25 14:19:41 +01:00
Dane Springmeyer
2f08dc29ef
return code 0 to gracefully exit if python bindings are not available
2014-07-24 18:58:03 -07:00
Dane Springmeyer
99de69d96f
Merge branch 'master' of github.com:mapnik/mapnik into grammar-refactor
2014-07-24 14:55:30 -07:00
Dane Springmeyer
c5be70ff65
refactor spirit grammars
2014-07-24 14:31:59 -07:00
artemp
b53572ab9c
update text/formatting/format
2014-07-24 14:45:02 +01:00
artemp
9c39d4ebd2
collect expressions from format_properties
2014-07-24 12:00:46 +01:00
artemp
1927a00ee0
text-properties : make fill and halo-fill expressions
2014-07-24 11:37:16 +01:00
Dane Springmeyer
f8ccbf3ded
fix compile of graphics.hpp
2014-07-23 14:32:48 -07:00
Dane Springmeyer
3defa77d88
remove big endian support - closes #2313
2014-07-23 14:16:44 -07:00
Dane Springmeyer
133f399777
iwyu
2014-07-23 14:16:11 -07:00
Dane Springmeyer
8dcd85a708
iwyu
2014-07-23 14:02:36 -07:00
Dane Springmeyer
9959006e61
remove boost::lexical_cast
2014-07-23 10:54:02 -07:00
Dane Springmeyer
bf8572fac6
remove boost::lexical_cast
2014-07-23 10:53:47 -07:00
Dane Springmeyer
2d2eec48c4
iwyu
2014-07-23 10:34:45 -07:00
artemp
8502019310
more format_properties expessions
2014-07-23 18:09:18 +01:00
artemp
e67f046a0e
start re-factoring char_property (TODO: change name!)
2014-07-23 16:19:14 +01:00
Dane Springmeyer
265043e4d7
iwyu
2014-07-22 23:57:06 -07:00
Dane Springmeyer
148007cc48
iwyu + fwd declares
2014-07-22 23:36:54 -07:00
Dane Springmeyer
3de2457799
fwd declare layer
2014-07-22 23:11:12 -07:00
Dane Springmeyer
58163a583c
clean up tuple includes
2014-07-22 23:01:31 -07:00
