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

1195 commits

Author SHA1 Message Date
Hermann Kraus
9eccd58ed5 Merge branch 'textplacement-rename' into python-textplacement 
Conflicts:
	include/mapnik/text_processing.hpp
 2012-02-12 04:01:58 +01:00
Hermann Kraus
69f153bf8f Fix all includes. 2012-02-12 03:55:13 +01:00
Hermann Kraus
91ddbd4f73 Move other text placement files. 2012-02-12 03:16:33 +01:00
Hermann Kraus
34638b9e3c Split text_placements.hpp 2012-02-12 03:11:58 +01:00
Hermann Kraus
18004ca7fb Move processed_text. 2012-02-12 02:52:00 +01:00
Hermann Kraus
fbe929810b Fix most includes. 2012-02-12 02:47:26 +01:00
Hermann Kraus
6c29a12f24 Move text_symbolizer_properties. 2012-02-12 02:24:26 +01:00
Hermann Kraus
d7da55be15 Move char_properties. 2012-02-12 02:19:31 +01:00
Hermann Kraus
508ce0b65d Move formating::format_node. 2012-02-12 02:10:08 +01:00
Hermann Kraus
390b70eb44 Move formating::list_node. 2012-02-12 02:07:36 +01:00
Hermann Kraus
e37070f177 Move formating::text_node. 2012-02-12 02:05:27 +01:00
Hermann Kraus
e2c75c5eef Move formating::node. 2012-02-12 02:01:25 +01:00
Hermann Kraus
dc665bdea1 Merge branch 'master' into python-textplacement 2012-02-12 01:49:15 +01:00
Hermann Kraus
3b2767f167 Add additional constructor for common use case. 2012-02-12 01:48:25 +01:00
Hermann Kraus
67faac351b Merge branch 'master' into python-textplacement 2012-02-11 11:25:28 +01:00
Hermann Kraus
7ef1c3544e Bugfix: Collect expressions for formating::format_node. 2012-02-11 11:24:33 +01:00
Hermann Kraus
c94d32b41b Add bindings for formating::list_node. 2012-02-11 11:21:33 +01:00
Dane Springmeyer
4bf8a7f69e boost 1.42 compatibility 2012-02-10 10:31:11 -08:00
Artem Pavlenko
6a015dcd59 Merge remote-tracking branch 'origin/master' 2012-02-10 11:59:12 +00:00
Artem Pavlenko
602264d368 + implement 'in situ' boost::spirit::qi based geojson parser 2012-02-10 11:56:53 +00:00
Artem Pavlenko
f19bcafbf6 + make wkt_parser noncopyable 2012-02-10 10:53:04 +00:00
Artem Pavlenko
ff66cc1326 + check if index is valid in to_string() 
+ output feature id
 2012-02-10 10:52:06 +00:00
Hermann Kraus
1d50aa1b85 Make interface consistent with similar classes. 2012-02-08 01:16:37 +01:00
Artem Pavlenko
958097600c add wkt_parser class for grammar re-usage 
implement from_wkt in terms of wkt_parser
 2012-02-06 22:49:47 +00:00
Artem Pavlenko
8366da08ee fix compiler warnings about ref to temp obj (@springmeyer) 2012-02-06 09:42:53 +00:00
Hermann Kraus
b5627c0f5c Reduce warnings. 2012-02-05 18:10:29 +01:00
Hermann Kraus
a8e2fb1301 Enable depreaction warnings. 2012-02-05 16:31:29 +01:00
Hermann Kraus
e298d141da Improve expression handling. 2012-02-05 03:11:00 +01:00
Hermann Kraus
0a030d55e6 Remove left over declaration. 2012-02-03 23:33:34 +01:00
Hermann Kraus
9c92bf713d Easier syntax by hiding internal data type. 2012-02-03 00:34:14 +01: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
07d7d7d537 convert to using feature_ptr rather than const& for renderers 2012-02-01 16:37:05 -08:00
Dane Springmeyer
915addc51d update grid rendering interface to new feature impl 2012-02-01 10:43:23 -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
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
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
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
a3871e52b7 Rename set_values_from_xml to from_xml. 2012-01-28 17:13:41 +01:00
Hermann Kraus
ff07b4bce0 placement_element => text_path 2012-01-28 00:09:58 +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
Artem Pavlenko
be9b622d1d revert previous bogus change 2012-01-27 17:01:07 +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
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
Artem Pavlenko
c405d61e1c remove <config.hpp> 2012-01-25 20:23:14 +00:00
Artem Pavlenko
06e91a56c6 remove <config.hpp> 2012-01-25 20:21:06 +00:00
Hermann Kraus
37ba77550c More documentation. 2012-01-25 18:46:27 +01:00
Hermann Kraus
1106dcb445 Support for cairo + grid renderer. 2012-01-25 16:17:38 +01:00
Hermann Kraus
bdc20f766b Complete symbolizer_helpers.hpp for TextSymbolizer. 2012-01-25 15:44:19 +01:00
Artem Pavlenko
d146bcc380 Merge branch 'master' into feature_impl 2012-01-25 10:04:03 +00:00
Hermann Kraus
0c5fc9f246 Merge pull request #1050 from rfw/text-placements-python 
Add text placements to Python API.
 2012-01-24 18:11:13 -08:00
Tony Young
d0d692cb82 Add text placements to Python API. 2012-01-25 12:57:26 +13:00
Hermann Kraus
469568862b Add documentation. 2012-01-24 23:42:54 +01:00
Hermann Kraus
3b887972b8 Start work on new symbolizer helpers. 2012-01-23 19:02:35 +01:00
Artem Pavlenko
663b4adfa2 feature_impl : add get paths by const reference method 
python : fix helper functions declarations
 2012-01-23 14:22:14 +00:00
Hermann Kraus
31fd5647f2 Use font manager and char properties in text engine. 2012-01-22 20:51:09 +01:00
Hermann Kraus
1527fed59c Remove unused includes. 2012-01-22 20:08:45 +01:00
Hermann Kraus
b945dff774 Fix metawriters. 2012-01-22 19:57:32 +01:00
Hermann Kraus
9d2a6088b1 New placement finder. 2012-01-22 18:41:04 +01:00
Hermann Kraus
a95524ae35 Remove old variables. 2012-01-22 18:36:17 +01:00
Hermann Kraus
3dab67732e Remove old variables. 2012-01-22 18:33:53 +01:00
Hermann Kraus
78c4464ad7 Remove next_position_only(). 2012-01-22 18:29:55 +01:00
Hermann Kraus
e0b5e15507 Remove old functions from text_placements. 2012-01-22 18:20:34 +01:00
Hermann Kraus
67eb73eab9 Return correct size information from font engine. 2012-01-22 17:53:45 +01:00
Hermann Kraus
2143267db3 Remove boost::make_shared(). 2012-01-22 17:06:14 +01:00
Hermann Kraus
4490e1afaf Add missing get_positions() function. 2012-01-22 16:25:19 +01:00
Hermann Kraus
7fd9fb0c88 Small fixes. 2012-01-22 03:32:21 +01:00
Hermann Kraus
7d03b46079 Update attribute_collector to use get_all_expressions(). 2012-01-22 03:25:19 +01:00
Hermann Kraus
7d01f509ab Add text_placement_info_list functions. 2012-01-22 03:11:55 +01:00
Hermann Kraus
cc048986d8 Text size as float. 2012-01-22 02:38:46 +01:00
Hermann Kraus
6506edebf2 Add deprecation warnings. 2012-01-22 02:33:00 +01:00
Hermann Kraus
5f62584385 Add header for list placement. (Unused so far.) 2012-01-22 02:23:39 +01:00
Hermann Kraus
f460f90ec6 Add new text_placement functions, but keep old stuff to ensure mapnik compiles. 2012-01-22 02:22:55 +01:00
Hermann Kraus
b7f8e356f4 Make text_path use char_info. 2012-01-22 01:43:13 +01:00
Hermann Kraus
5fd7035527 Move font engine functions from .hpp to .cpp. 2012-01-21 01:47:02 +01:00
Hermann Kraus
34405a5d9e Replace dimension_t by char_info. 2012-01-21 00:35:24 +01:00
Hermann Kraus
533b95f0e6 Enable XML parser to return multiple <xmltext> nodes. 2012-01-21 00:02:44 +01:00
Hermann Kraus
e177cd52a7 Rename opacity to image_opacity. 2012-01-20 22:45:47 +01:00
Hermann Kraus
21a58b7b7a Add missing includes. 2012-01-20 22:43:05 +01:00
Hermann Kraus
6a50f91a10 Add text_processing.hpp/cpp 2012-01-20 22:30:12 +01:00
Hermann Kraus
abae1a1fec Remove unused file. 2012-01-20 22:28:06 +01:00
Hermann Kraus
e553dbcd82 Add missing includes. 2012-01-20 22:23:14 +01:00
Hermann Kraus
b14e6c57db Remove unused include. 2012-01-20 22:22:42 +01:00