Dane Springmeyer
e7e60cb541
Revert "don't set -stdlib in CXXGLAGS"
...
This reverts commit 62c06eabcc
.
2013-12-13 06:23:03 -08:00
Dane Springmeyer
c02a1c5f04
avoid signed comparison warning in symbolizer test
2013-12-13 06:22:53 -08:00
Dane Springmeyer
104aadcfd6
Merge branch 'expr-v2' of github.com:mapnik/mapnik into expr-v2
2013-12-11 14:33:32 -08:00
artemp
5dae2999b1
symbolizers: set_property helper
2013-12-11 17:27:52 -05:00
artemp
f21152a6a9
register target type for symbolizer properties
2013-12-11 17:27:52 -05:00
artemp
d5a0537471
convert json value into symbolizer_base::value_type
2013-12-11 17:27:52 -05:00
artemp
7cf452da77
generic ``to_integral
`` helper function (convert strongly typed enumeration values to underlying type)
2013-12-11 17:27:52 -05:00
Dane Springmeyer
9550e98a62
Merge branch 'master' of github.com:mapnik/mapnik into expr-v2
2013-12-11 07:28:35 -08:00
Dane Springmeyer
b492437505
avoid dereferencing pointer more than once
2013-12-11 07:27:51 -08:00
Dane Springmeyer
6a0e593d87
fix svg_renderer
2013-12-11 07:26:32 -08:00
Dane Springmeyer
d3836bc71a
c++11
2013-12-11 07:25:23 -08:00
artemp
b7dda95d84
move symbolizer to json into core
...
symbolizer json grammar (needs more work)
2013-12-10 15:51:07 -05:00
artemp
329224d272
revive stroke linecap/linejoin
2013-12-09 18:46:02 -05: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
artemp
6126286555
add equality comparator `` .def(self == self) // __eq__
``
2013-12-09 14:52:47 -05:00
artemp
7bae4b806c
add __hash__ to all symbolizers
2013-12-09 14:52:47 -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
6a3f60954a
add extract method to access underlying type from mapnik.Symbolizer
2013-12-09 13:43:42 -05:00
artemp
11080bf903
NumericWrapper helper class to pass correct numeric type
...
value_bool, value_integer, value_double to symbolizer property
(there must be a better way ;)
2013-12-09 12:37:42 -05:00
Dane Springmeyer
3376a2e1a0
avoid duplicate call to start_layer_processing
...
Conflicts:
include/mapnik/feature_style_processor_impl.hpp
2013-12-07 15:11:26 -08:00
artemp
9392e0f21e
use mapnik::value_xxx types
2013-12-06 14:36:45 +00:00
artemp
fb63d51b37
add quoting for relevant types
2013-12-06 13:11:24 +00:00
artemp
12dbc035cc
enumeration_wrapper to python converter (work-in-progress)
2013-12-05 16:31:30 +00:00
artemp
8a0c3692f6
python bindings : output property value
2013-12-05 16:30:19 +00:00
artemp
7245a6f5bd
symbolizer property value to string
2013-12-05 16:28:44 +00:00
artemp
7169e14d90
use constexpr to allow combining type traits
2013-12-05 16:26:42 +00:00
artemp
ca7dfb3428
store meta by const ref
2013-12-05 16:25:56 +00:00
artemp
1d453426da
__str__ : initial naive stub implementation
2013-12-05 11:32:21 +00:00
artemp
0708e6a07b
python : revive mapnik.Symbolizers (required by mapnik.Rule.symbols)
2013-12-05 10:18:25 +00:00
artemp
12bbf55c81
two step parameter parsing and various syntactic sugar tweaks
2013-12-04 16:11:11 +00:00
artemp
9945822cc7
make apply() static and disable copy ctor/assignment
2013-12-04 15:14:53 +00:00
artemp
7eb84ad1ab
more meaningful error message
2013-12-04 15:09:45 +00:00
artemp
37fea12091
load_map : allow optional expressions in symbolizer properties (work-in-progress)
2013-12-04 11:47:36 +00:00
artemp
442ffbe911
expression grammar : allow '-' in @attribute
...
e.g ```@water-fill```
note: this might clash with subtraction ops (fixme)
2013-12-04 11:44:18 +00:00
artemp
1c490f5312
global attributes evaluator
2013-12-04 11:43:16 +00:00
Dane Springmeyer
ad431baef2
travis: reduce email noise post policy change: http://about.travis-ci.org/blog/2013-11-19-upcoming-email-notification-policy-change/
2013-12-03 09:01:16 -08:00
Dane Springmeyer
3212dbe44e
add testcase for #2090
2013-12-03 08:20:48 -08:00
artemp
f83b272a98
fix boost include path
2013-12-03 09:10:51 +00:00
artemp
72378c4c62
symbolizer hash initial impl
2013-12-03 09:10:15 +00:00
Dane Springmeyer
cb27237e71
visual tests: fix rendering of khmer, malayalam, and bengali tests
2013-12-02 22:47:04 -08:00
Dane Springmeyer
a46d409898
visual tests: re-enable and update malayalam, bengali, and khmer renderings
2013-12-02 22:35:11 -08:00
Dane Springmeyer
d13c889d30
fix #2090
2013-12-02 21:51:54 -08:00
Dane Springmeyer
c7879755f4
tests: re-enable strict map loading tests
2013-12-02 21:51:24 -08:00
artemp
3d7cd37760
symbolizer : operator== impl
2013-12-02 16:49:23 +00:00
Artem Pavlenko
a5b18964af
Merge pull request #2099 from MapQuest/mla-expr-v2-grid
...
Update grid renderer for `expr-v2` branch
2013-12-02 08:48:24 -08:00
Matt Amos
d64b86dcdf
Updated grid renderer for expr-v2
branch.
...
All the grid visual tests pass.
One small issue is that in the grid line pattern symbolizer it
constructs a 'fake' line symbolizer to re-use code (as the grid
renderer cares nothing for patterns), but doesn't pass the
offset parameter to it. The tests currently require this
behaviour, but they should probably be changed as it seems
incorrect.
2013-12-02 13:49:53 +00:00
artemp
c57d88edb1
c++11 : style
2013-12-02 12:10:47 +00:00
artemp
b22eaa28a7
format : fix copy note
2013-12-02 11:00:42 +00:00
artemp
6705f01a8f
expressions grammar : fix global attribute rule
2013-12-02 10:47:54 +00:00