Commit graph

6800 commits

Author SHA1 Message Date
Hermann Kraus
099ec85da6 Implement add_expression and helper classes.
Update test.
2012-02-05 04:09:09 +01:00
Hermann Kraus
32320dd857 Merge branch 'master' into python-textplacement 2012-02-05 03:11:15 +01:00
Hermann Kraus
e298d141da Improve expression handling. 2012-02-05 03:11:00 +01:00
Hermann Kraus
4230c72fd6 Test case for python bindings. 2012-02-05 01:48:25 +01:00
Hermann Kraus
263f5708f3 More processed_text bindings. 2012-02-05 01:47:49 +01:00
Hermann Kraus
ded95dd1e4 Temporary fix for #1063. 2012-02-05 01:27:50 +01:00
Hermann Kraus
197af707b1 Remove debuging output. 2012-02-05 00:52:09 +01:00
Hermann Kraus
2f144d6ccb Python bindings for formating::text_node. 2012-02-04 04:32:32 +01:00
Hermann Kraus
f4346d4751 Merge branch 'master' into python-textplacement 2012-02-03 23:35:08 +01:00
Hermann Kraus
0a030d55e6 Remove left over declaration. 2012-02-03 23:33:34 +01:00
Hermann Kraus
593c8a4838 Correctly register objects. 2012-02-03 23:24:32 +01:00
Hermann Kraus
a140c9ef40 Add python bindings for text_placements and text_placement_info. 2012-02-03 13:54:49 +01:00
Hermann Kraus
99a58ff2ba Add Python wrapper for formating::node. 2012-02-03 02:01:01 +01:00
Hermann Kraus
f64190e47f Make TextSymbolizer default constructable and add "placements" property. 2012-02-03 02:00:21 +01:00
Hermann Kraus
9c92bf713d Easier syntax by hiding internal data type. 2012-02-03 00:34:14 +01:00
Dane Springmeyer
1e2897b28d update rasterlite to new feature_impl 2012-02-02 09:00:02 -08:00
Dane Springmeyer
0e701dd899 initialize context in init list 2012-02-02 08:58:20 -08:00
Dane Springmeyer
17d13cff67 whitespace fixes - closes #911 2012-02-01 17:53:35 -08:00
Dane Springmeyer
1cafc03a46 whitespace fixes 2012-02-01 17:49:28 -08:00
Dane Springmeyer
21d05444f7 manual whitespace fix 2012-02-01 17:48:56 -08:00
Dane Springmeyer
7b1643f0e3 whitespace fixes 2012-02-01 17:38:18 -08:00
Dane Springmeyer
3fa794c6ac whitespace fixes 2012-02-01 17:37:58 -08:00
Dane Springmeyer
77c58e487d whitespace fixes 2012-02-01 17:37:35 -08:00
Dane Springmeyer
f310148337 whitespace fixes (using format_source_files.sh) 2012-02-01 17:30:26 -08:00
Dane Springmeyer
b3819633bd fix point WKT format 2012-02-01 17:03:31 -08:00
Dane Springmeyer
57cf7d54cf Merge branch 'feature_ptr' 2012-02-01 16:56:07 -08:00
Dane Springmeyer
6b584e826a clean up more mapnik2 references 2012-02-01 16:44:50 -08:00
Dane Springmeyer
07d7d7d537 convert to using feature_ptr rather than const& for renderers 2012-02-01 16:37:05 -08:00
Dane Springmeyer
60f1dadcd8 add code comment 2012-02-01 16:17:59 -08:00
Dane Springmeyer
cf8e036574 warn if non bitmap (svg) files are used for pattern symbolizers as this is not currently supported - refs #1010 and #1045 2012-02-01 12:27:57 -08:00
Dane Springmeyer
915addc51d update grid rendering interface to new feature impl 2012-02-01 10:43:23 -08:00
Hermann Kraus
30bef5c955 Fast math.
@de94a3e: Yes, we need them. :-)
2012-02-01 12:49:16 +01:00
Artem Pavlenko
e4f7f1074a + validate input tuple length
+ fix index in extract<double>
2012-01-31 20:46:36 +00:00
Artem Pavlenko
54ad01d670 Merge remote-tracking branch 'origin/master' 2012-01-31 18:03:08 +00:00
Artem Pavlenko
de94a3e82f comment out unused variables 2012-01-31 18:01:19 +00:00
Hermann Kraus
d2e26b5495 Python bindings for char_properties. 2012-01-31 18:28:02 +01:00
Hermann Kraus
ac672230fa Merge branch 'master' of github.com:mapnik/mapnik 2012-01-31 17:54:15 +01:00
Artem Pavlenko
8db933a6ae Merge remote-tracking branch 'origin/master' 2012-01-31 16:52:01 +00:00
Artem Pavlenko
796bd5d8c2 remove duplicate enumeration registration 2012-01-31 16:51:14 +00:00
Hermann Kraus
a1d2211060 Update dependency graph. 2012-01-31 17:39:28 +01:00
Dane Springmeyer
e4a11c0d07 use correct context type 2012-01-31 08:35:40 -08:00
Hermann Kraus
cc886d1688 Merge branch 'feature-text-merge' 2012-01-31 16:52:28 +01:00
Hermann Kraus
06ce3f7eec Merge remote-tracking branch 'herm/textplacement-merge' 2012-01-31 16:37:37 +01:00
Hermann Kraus
72f061b75a Revert 0c5fc9f246.
For new text placment branch a different solution is needed.
2012-01-31 16:36:40 +01:00
Hermann Kraus
1a16e9c5ab Remove class text_processor. 2012-01-31 16:24:58 +01:00
Artem Pavlenko
a395f974f3 small fix 2012-01-31 12:00:36 +00:00
Artem Pavlenko
e00e8f98aa if geometries are polygons, default to 'largest_box' only
for label placement.
TODO: expose settings in XML
2012-01-31 11:52:43 +00:00
Artem Pavlenko
b90de4874c Merge branch 'textplacement-merge' into feature-text-merge
Conflicts:
	docs/textrendering.gv
	include/mapnik/building_symbolizer.hpp
	include/mapnik/placement_finder.hpp
	include/mapnik/symbolizer_helpers.hpp
	include/mapnik/text_placements.hpp
	include/mapnik/text_placements_list.hpp
	include/mapnik/text_placements_simple.hpp
	include/mapnik/text_processing.hpp
	plugins/input/shape/shape_utils.hpp
	src/agg/process_shield_symbolizer.cpp
	src/agg/process_text_symbolizer.cpp
	src/cairo_renderer.cpp
	src/grid/process_shield_symbolizer.cpp
	src/grid/process_text_symbolizer.cpp
	src/load_map.cpp
	src/placement_finder.cpp
	src/shield_symbolizer.cpp
	src/text_placements.cpp
	src/text_processing.cpp
	src/text_symbolizer.cpp
	tests/visual_tests/clean.sh
	tests/visual_tests/test.py

Merge herm/textplacement-merge
2012-01-31 11:09:55 +00:00
Artem Pavlenko
7f91fb7b1e change read_xxx_xxx methods to not return
input value by ref.
2012-01-31 09:46:21 +00:00
Artem Pavlenko
cad0261e55 check if index is valid before pushing back value. 2012-01-31 09:45:06 +00:00