Commit graph

2676 commits

Author SHA1 Message Date
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.

Conflicts:
	tests/run_tests.py
	tests/visual_tests/test.py
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