artemp
2c3173c1aa
support halo-comp-op property ( #2267 )
2014-06-17 15:11:34 +01:00
artemp
a010195b36
modify add_layer to work with both move and copy semantics
2014-05-28 09:54:56 +01:00
Dane Springmeyer
48c027857c
return const& string from xml_node::get_text()
2014-05-27 13:35:52 -07:00
artemp
4474fc52e2
bug fix : call fontsets_.insert(fontset) before std::move(fontset)
2014-05-27 15:34:12 +01:00
Dane Springmeyer
7364a30e67
improve handling of colors as expressions
2014-05-08 00:45:18 -07:00
Dane Springmeyer
d7bb97a22e
simplify code
2014-05-05 18:16:42 -07:00
Dane Springmeyer
b462913fa1
load_map: use const_iterator
2014-05-05 16:06:01 -07:00
Dane Springmeyer
74c7e67d60
Various c++11 improvements
...
- std::make_unique
- avoiding uneccessary std::move calls which make actually prevent rvo (http://stackoverflow.com/questions/4986673/c11-rvalues-and-move-semantics-confusion )
- more c++11 for loops
2014-05-05 16:02:42 -07:00
Dane Springmeyer
8c1e69fdb8
static grammars
...
- construct on first use
- allows for faster map loading and unloading of xml loading tree
- modified expression and transform grammars to not take args/not crash
- simplifies interfaces, allows fast parsing from python without passing grammar instance
2014-04-30 00:11:27 -07:00
Dane Springmeyer
ef837eb92f
c++11 optimizations for faster map loading
2014-04-28 17:10:00 -07:00
Dane Springmeyer
10ce32696a
add support for halo-rasterizer for shields - closes #2226
...
Conflicts:
src/load_map.cpp
tests/visual_tests/images/shield-on-line-spacing-eq-width-600-400-1.0-agg-reference.png
tests/visual_tests/images/shield-on-line-spacing-eq-width-600-400-2.0-agg-reference.png
2014-04-25 16:07:03 -07:00
Dane Springmeyer
67357568a5
move line rendering tests to visual tests
2014-04-24 21:00:00 -07:00
Dane Springmeyer
e94876ebe4
Merge pull request #2160 from MapQuest/expr-v2-group-symbolizer
...
Group Symbolizer
2014-04-03 11:52:21 -07:00
Dane Springmeyer
66654683a2
work in progress: fix some expressions tests disable others
2014-03-10 13:30:49 -07:00
Dane Springmeyer
6433d9482e
Merge branch 'master' of github.com:mapnik/mapnik into expr-v2
...
Conflicts:
include/mapnik/symbolizer.hpp
src/agg/agg_renderer.cpp
src/agg/process_line_pattern_symbolizer.cpp
src/agg/process_line_symbolizer.cpp
src/agg/process_polygon_pattern_symbolizer.cpp
src/agg/process_polygon_symbolizer.cpp
src/cairo_renderer.cpp
src/feature_type_style.cpp
src/grid/process_line_pattern_symbolizer.cpp
src/grid/process_line_symbolizer.cpp
src/grid/process_markers_symbolizer.cpp
src/grid/process_polygon_pattern_symbolizer.cpp
src/grid/process_polygon_symbolizer.cpp
2014-03-10 00:05:56 -07:00
Dane Springmeyer
277ae93d2c
make inflated image for blurring opt-in via 'image-filters-inflate' option - refs #2165
...
Conflicts:
src/agg/agg_renderer.cpp
2014-02-27 11:17:09 -08:00
Jordan Hollinger
fbc2a0d1e3
Framework for group symbolizer.
...
This includes XML parsing of group symbolizer and related objects and
process_group_symbolizer method in the AGG renderer. This also includes
code to collect group symbolizer indexed columns, create sub features,
and match them to group rules.
2014-02-18 11:07:52 -05:00
Dane Springmeyer
a98de6a348
Merge branch 'master' of github.com:mapnik/mapnik into expr-v2
...
Conflicts:
include/mapnik/expression_grammar_impl.hpp
src/expression.cpp
2014-01-27 13:56:36 -08:00
Dane Springmeyer
87e0ae8124
adapt build to use BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
2014-01-26 14:00:58 -08:00
Dane Springmeyer
8181aa9dec
addLayer -> add_layer (change also coming in expr-v2 branch)
2014-01-26 13:41:30 -08:00
artemp
3628b5f237
halo-transform initial impl
2014-01-17 11:47:18 +00:00
artemp
5393a0a9fe
c++11 : use ``constexpr name2int` switch instead of if/else
2013-12-09 16:15:24 -05:00
artemp
8e6e6d8c1e
c++11 style for loop
2013-12-09 15:09:37 -05:00
Dane Springmeyer
eca1c6e46b
Merge branch 'master' of github.com:mapnik/mapnik into expr-v2
...
Conflicts:
src/load_map.cpp
2013-12-09 11:40:55 -08:00
artemp
12bbf55c81
two step parameter parsing and various syntactic sugar tweaks
2013-12-04 16:11:11 +00:00
artemp
37fea12091
load_map : allow optional expressions in symbolizer properties (work-in-progress)
2013-12-04 11:47:36 +00:00
Dane Springmeyer
d13c889d30
fix #2090
2013-12-02 21:51:54 -08:00
Dane Springmeyer
e9ca9c8790
symbolizer-expressions replayed against latest master
2013-11-27 22:50:15 -08:00
Dane Springmeyer
64d5153aea
Improved support for international text
...
- Implementation by @herm for GSOC 2012 (http://mapnik.org/news/2012/10/06/gsoc2012-status9/ )
- C++11 port, improvements, optimizations by @artemp
- Testing and integration with master by @springmeyer
- Thank you to all the support from @behdad along the way
- Thanks for help testing @toton6868, @stephankn, @nirvn, @mfrasca, @simonsonc and many others
Refs: #2073,#2070,#2038,#2037,#1953,#1820,#1819,#1714,#1634,#1547,#1532,#1319,#1208,#1154,#1146
2013-11-22 00:06:32 -08:00
Dane Springmeyer
2cc3d82a87
iwyu
2013-11-08 19:13:51 -08:00
Dane Springmeyer
c7a6265869
organize text code in subdirectory
2013-11-07 20:09:22 -08:00
artemp
b315eb2167
+ use std::shared_ptr and std::make_shared
2013-09-20 14:01:27 +01:00
Dane Springmeyer
c5dd5487a5
Merge pull request #1966 from mapnik/background-image-comp-op
...
Map background-image-comp-op and background-image-opacity
2013-09-05 12:25:47 -07:00
Petr Dlouhý
69185339a5
offset enabled for LinePatternSymbolizer
2013-08-22 10:35:44 +02:00
Dane Springmeyer
fad9af5263
add support for applying custom comp_op and opacity when blending map background image into background color at render time - refs mapnik/mapnik-support#8
2013-07-25 01:00:38 -04:00
Dane Springmeyer
5c13504cc0
remove unreachable break
2013-07-22 14:17:59 -04:00
Dane Springmeyer
b1a50d1000
iwyu
2013-06-18 14:26:58 -07:00
Dane Springmeyer
0365d3e081
start centralizing filesystem operations in mapnik::util::fs - refs #1177
2013-06-02 19:28:24 -07:00
Dane Springmeyer
1036eb1c99
support base_path adjustment when reading from xml file as well as from a string
2013-06-02 16:24:21 -07:00
Dane Springmeyer
e51c59aacc
fix #1886 - TODO - refactor base_path logic since it is confusingly written
2013-06-02 16:06:32 -07:00
Dane Springmeyer
b0f15bf5de
avoid muffling proj_init at render time and instead catch at load_map - closes #646
2013-05-29 15:16:44 -07:00
Dane Springmeyer
8634a04938
add support for drawing all geometry verticies with debug symbolizer mode=vertex and expose in python - closes #1848
2013-05-21 19:21:35 -07:00
Dane Springmeyer
55ec6a7942
cleanups around exception handling
2013-03-22 17:58:33 -07:00
Dane Springmeyer
71a04cd09d
pass optional by const ref
2013-03-12 16:56:31 -07:00
Dane Springmeyer
e66d007627
add halo-rasterizer option for text symbolizer
...
- closes #1298
- allows for much faster halo drawing and simliar quality for
radius values in the 1-2 px range
- also moves grid_renderer away from using freetype stroker completely
since halo quality is not critical for this renderer
2013-03-08 20:32:39 -08:00
XinGang Li
df7db521bb
Add parse_image_filters function to avoid python bindings access the internal structs.
2013-02-22 23:58:30 +08:00
Dane Springmeyer
19e52c0136
rename simplify-tolerance -> simplify to match clip/smooth params
2013-02-05 15:48:16 -08:00
Dane Springmeyer
41772edbd7
support reading raster-colorizer properties off of raster symbolizer as well as in standalone child element
2013-02-01 16:32:48 -05:00
Dane Springmeyer
e16567fecb
fixup std:: prefixing of cmath functions - closes #1694
2013-01-17 13:53:48 -08:00
Dane Springmeyer
7087fb9698
amend c61335c277, unbreak datasource templates, and add a test to ensure it does not regress again
2013-01-04 14:36:24 -08:00
Dane Springmeyer
c61335c277
fix -Wshadow warnings
2013-01-03 19:14:19 -08: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
Dane Springmeyer
bb27156df0
use internal noncopyable class to speed up compile times slightly
2012-12-16 18:19:52 -08: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
Dane Springmeyer
772c7f52fc
knock out some msvc compiler warnings
2012-12-12 15:59:27 -08:00
Dane Springmeyer
7c58bf9fcb
replace boost::trim with faster custom trim - closes #1633
2012-12-07 14:06:13 -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
artemp
855aea95e0
+ mapnik::value and mapnik::parameters - initial support for 64-bit integers
2012-12-03 13:12:09 +00: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
b46c5ddeb1
fix error language when a file cannot be found
2012-10-16 17:45:33 -07:00
Dane Springmeyer
0cafbc9460
warn if a Datasource template is not found
2012-10-10 14:33:56 -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
acaee09598
fix debug output symbolizer name
2012-10-01 15:35:35 -07:00
artemp
d7abfc267b
Merge branch 'master' into conv_simplify
2012-09-27 08:54:32 +01:00
Dane Springmeyer
b9b97ba652
after #1483 fontset is boost optional so check appropriately in load_map (solves assert)
2012-09-26 12:56:57 -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
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
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
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
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
6806ca1509
load in load_map if image/svg files are not available when not using stock markers or dynamic expressions - closes #1439
2012-08-23 14:31:50 -07:00
Dane Springmeyer
1ca4bcf78d
further improve the reporting of unprocessed nodes and attributes - refs #1441
2012-08-23 14:11:25 -07:00
Dane Springmeyer
03860b1728
improve error messages for exceptions thrown in symbolizers during load_map - closes #1441
2012-08-23 14:04:03 -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
e8101a070a
partially repair backward compatibility in python for 'marker-type' - refs #1427 and #1285
2012-08-21 16:36:15 -07:00
Dane Springmeyer
7b7e556850
formatting
2012-08-20 16:27:38 -07:00
Dane Springmeyer
ad2250a4b5
back compatibility for raster-mode values using _ and shield-no-text
2012-08-16 19:20:29 -07:00
Dane Springmeyer
d95f81a588
c++ style
2012-08-16 17:58:08 -07:00
Dane Springmeyer
e0608a4aa4
only throw for unknown attributes if in strict mode
2012-08-16 16:10:23 -07:00
Konstantin Käfer
b243f03c90
use a set to make visvalingam a lot faster
2012-08-16 22:26:58 +02:00
Konstantin Käfer
22150f908f
add facilities to choose the simplification algorithm
2012-08-16 16:53:38 +02:00
artemp
aecf0531f5
+ remove metawriters for the upcoming 2.1 release
2012-08-15 09:47:03 +01:00
Konstantin Käfer
dcd7a07c8e
simplify-tolerance property boilerplate
2012-08-14 17:04:57 +02:00
Dane Springmeyer
9f450bd986
avoid silencing invalid transform throw and use LOG_ERROR for invalid maximum-extent - closes #1363
2012-08-13 15:35:22 -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
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
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
3821afd74d
inherit default placement types from class instance
2012-07-31 18:06:52 -07:00
Hermann Kraus
f3326115ac
Add debug symbolizer.
2012-08-01 01:16:48 +02: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
Dane Springmeyer
e213f49d7c
re-implement conditional stroke application in markers_symbolizer initially added in 9d756165e0, amended in 9f064960e3, and wrongly disabled in bd74d18f6d
2012-07-27 19:21:46 -07:00
Dane Springmeyer
bd74d18f6d
no need anymore to have parse_stroke return a bool
2012-07-25 18:26:34 -07:00
Dane Springmeyer
9f064960e3
load_map: a stroke-width=0 is valid for markers now (for restyling svg)
2012-07-25 18:19:41 -07:00
Dane Springmeyer
6396b443ef
default to MARKER_POINT_PLACEMENT for markers
2012-07-24 19:48:22 -07:00
