sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
5865 commits 112 branches 95 tags 181 MiB
Commit graph

5865 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Artem Pavlenko
f53122ea04 add setter for geometry type 
add default ctor (eGeomType->Unknown)
 2012-01-30 20:46:39 +00:00
Artem Pavlenko
39bafa0cf1 add push_new member function which allows modifying 
current features context (useful when datasource schema
is unknown, so we update context as we go along).
 2012-01-30 14:05:41 +00:00
Hermann Kraus
e4340c0f89 Python bindings for text_symbolizer_properties. 2012-01-30 03:32:25 +01:00
Hermann Kraus
89ce699616 Update text rendering dependency graph. 2012-01-29 23:17:38 +01:00
Hermann Kraus
49225d7468 Handle additional boxes from ShieldSymbolizer. 2012-01-29 20:28:32 +01:00
Hermann Kraus
16e5fefb4d Remove text_placement_info::initialize() to avoid incorrect usage of this object. 2012-01-29 20:04:31 +01:00
Hermann Kraus
49a3b3c52c Make code easier to read by using std::pair instead of boost::tuple for position. 2012-01-29 17:33:43 +01:00
Hermann Kraus
822786e41c Remove no-text attribute. One can simply leave the text empty if one wants this. 2012-01-29 13:10:14 +01:00
Hermann Kraus
e564b00370 New test. 2012-01-29 05:11:59 +01:00
Hermann Kraus
4a3a3fd82c ShieldSymbolizer for Cairo. 2012-01-29 05:03:38 +01:00
Hermann Kraus
3e59503e25 ShieldSymbolizer for Grid renderer. 2012-01-29 04:57:56 +01:00
Hermann Kraus
09459683e9 Update symbolizer helpers for ShieldSymbolizer. 
Correctly handle point placement for TextSymbolizer. (Tries each possible placement for each point).
 2012-01-29 04:49:02 +01:00
Hermann Kraus
2d50c840fe Update tests. 2012-01-28 19:37:13 +01:00
Hermann Kraus
a3871e52b7 Rename set_values_from_xml to from_xml. 2012-01-28 17:13:41 +01:00
Hermann Kraus
a606f3cd9a Correctly initialize directory for run_tests.py 2012-01-28 17:12:52 +01:00
Hermann Kraus
ff07b4bce0 placement_element => text_path 2012-01-28 00:09:58 +01:00
Hermann Kraus
604b8db016 Update tests. 2012-01-27 23:15:12 +01:00
Hermann Kraus
d6b8209a9d Rewrote text processing to use a tree structure. 
Reduces the number of classes and simplifies extension.
 2012-01-27 23:15:12 +01:00
Hermann Kraus
92ca0b74ed Update clean.sh. 2012-01-27 23:15:12 +01:00
Artem Pavlenko
be9b622d1d revert previous bogus change 2012-01-27 17:01:07 +00:00
Artem Pavlenko
84b948687d Merge branch 'master' into feature-text-merge 2012-01-27 13:27:27 +00:00
Artem Pavlenko
fc7e07137d removing as it doesn't belong in here. 2012-01-27 13:23:15 +00:00
Artem Pavlenko
09687ce331 Merge branch 'master' into feature-text-merge 2012-01-27 12:51:13 +00:00
Artem Pavlenko
f646aa2228 add support for escaped characters/hex notataion i.e \x20 
allow both single and double quoted strings
 2012-01-27 12:43:43 +00:00
Artem Pavlenko
77772e8470 add basic polygon sorting 2012-01-27 09:47:04 +00:00
Hermann Kraus
dbc1280731 Process more than one geometry. 
Start work on ShieldSymbolizer.
 2012-01-26 20:05:38 +01:00
Hermann Kraus
1bd3e3678c Really use filtered geometries. 2012-01-26 18:13:40 +01:00
Artem Pavlenko
ff44b53583 use geometries_to_process 2012-01-26 16:25:26 +00:00
Artem Pavlenko
5ebdd84940 format 2012-01-26 16:24:48 +00:00
Artem Pavlenko
5c6fdc780f return member variable by const reference 2012-01-26 13:07:28 +00:00
Artem Pavlenko
36a23367a6 + fix compilation issues 2012-01-26 13:05:41 +00:00
Artem Pavlenko
d1f16bb227 merge textplacement-merge into feature_impl 2012-01-26 13:04:08 +00:00
Hermann Kraus
51d8718701 Move tests to new location. 2012-01-25 23:31:07 +01:00
Hermann Kraus
cd5c1c6ab4 Add reference image for formating test. 2012-01-25 23:26:39 +01:00
Artem Pavlenko
ba674c89e9 Merge branch 'feature_impl' of github.com:mapnik/mapnik into feature_impl 2012-01-25 20:25:45 +00:00