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

5156 commits

This branch
This branch
All branches
Author SHA1 Message Date
Hermann Kraus
71247085d2 Correct size calculation. 2012-07-28 20:45:17 +02:00
Hermann Kraus
212760b507 Rename symbols to match coding standards. 2012-07-28 20:32:11 +02:00
Hermann Kraus
981c11c563 Implement find_point_placement(). 2012-07-28 20:31:02 +02:00
Hermann Kraus
a953d535ad Use pixel_position consistently everywhere. 2012-07-28 16:34:44 +02:00
Hermann Kraus
6b3810c9b0 Add init_alignment() function. 2012-07-28 02:04:01 +02:00
Hermann Kraus
716dd1c79e Move next_position() to placement finder. 2012-07-28 01:43:11 +02:00
Hermann Kraus
f6ad3243ef Improve line breaking. 
Change placement finder API.
 2012-07-26 23:44:04 +02:00
Hermann Kraus
c0180d59ed Change glyph_positions interface to be easier to use. 2012-07-22 21:47:07 +02:00
Hermann Kraus
9408f2e169 Add comments. 2012-07-22 21:42:32 +02:00
Hermann Kraus
045948beb7 Handle line spacing. 2012-07-22 21:41:40 +02:00
Hermann Kraus
0b16174ddb Remove unused code. 2012-07-22 02:11:15 +02:00
Hermann Kraus
b53849d441 Merge branch 'master' into harfbuzz 
Conflicts:
	include/mapnik/font_engine_freetype.hpp
	include/mapnik/symbolizer_helpers.hpp
	src/agg/process_shield_symbolizer.cpp
	src/agg/process_text_symbolizer.cpp
	src/cairo_renderer.cpp
	src/font_engine_freetype.cpp
	src/formatting/list.cpp
	src/grid/process_shield_symbolizer.cpp
	src/grid/process_text_symbolizer.cpp
	src/symbolizer_helpers.cpp
	tests/visual_tests/styles/harfbuzz.xml
 2012-07-21 20:19:22 +02:00
Hermann Kraus
b8a54e6a4f Add line breaking. 
Note: Text rendering is currently disabled.
 2012-07-21 04:17:58 +02:00
Dane Springmeyer
0e7414ea1d ogr plugin: no need to pass dataset pointer 2012-07-20 19:01:09 -07:00
Dane Springmeyer
669c4906d4 avoid c-linkage warning with datasources - closes #1323 2012-07-20 18:34:41 -07:00
Dane Springmeyer
e225eaae4b add c++ test for exceptions 2012-07-20 18:33:14 -07:00
Hermann Kraus
d2918590b5 Remove unused files. 2012-07-21 02:55:34 +02:00
Dane Springmeyer
cccb916924 cleanup wkb descriptions to be proper wkt 2012-07-20 15:25:14 -07:00
Dane Springmeyer
537ce09336 also test return value from add_wkb 2012-07-20 15:13:36 -07:00
Dane Springmeyer
e36081a5c0 change geometry_utils::from_wkb to return a bool that signifies if at least one wkb path was parsed - refs #1333 and #1305 2012-07-20 15:09:01 -07:00
Dane Springmeyer
b0cb5b04de more empty geometry wkb tests - refs #1305, #1333 2012-07-20 14:57:20 -07:00
Dane Springmeyer
65b03a3230 scons: try to unbreak boost_python lib check on linux 2012-07-20 13:56:21 -07:00
Dane Springmeyer
942fa1233f add wkb test that currently crashes - refs #1305, #1132 2012-07-20 12:29:18 -07:00
Dane Springmeyer
a968150f6b fix compile after geometry util namespacing 2012-07-20 11:18:33 -07:00
Hermann Kraus
fdc4df3fc5 Fix RTL handling in itemizer. 2012-07-20 18:44:20 +02:00
Hermann Kraus
a8cf13113a Update itemizer to allow operation on text ranges (for line breaking). 
Fix handling of reordered text runs (refs #519).
 2012-07-20 18:40:47 +02:00
Hermann Kraus
76369a77fb Remove debug output. 2012-07-20 18:39:52 +02:00
artemp
fd209b2958 + put labeling routines into its owm 'label' namespace 2012-07-20 17:32:38 +01:00
artemp
40d1e5c57e Merge branch 'master', remote-tracking branch 'origin' 2012-07-20 12:44:25 +01:00
Artem Pavlenko
ffbbdff764 Merge pull request #1331 from rjw57/rjw57-janitor 
python bindings: export Query.resolution property as a tuple
 2012-07-20 04:44:03 -07:00
artemp
516f7c75b1 + expose geometry type in expression grammar to allow following 
filter expressions : [mapnik::geometry_type] = Polygon (#546)
 2012-07-20 12:28:25 +01:00
Hermann Kraus
b65b21ce1d Correct calculation of line width. 2012-07-20 02:07:25 +02:00
Hermann Kraus
e48b2f6598 Use assertations to make code cleaner. 2012-07-20 01:51:05 +02:00
Rich Wareham
7b3baee3a1 python bindings: export Query.resolution property as a tuple 
Although the mapnik::query class is exposed to the Python bindings, the
resolution attribute is a raw boost::tuple. If you attempt to access
this tuple from Python, boost complains strongly.

This patch adds the required magic to marshal the raw boost::tuple which
is query::resolution_type into an honest-to-goodness Python tuple.
 2012-07-19 19:35:20 +01:00
artemp
e0c2304d42 + store size by value 2012-07-19 18:44:29 +01:00
artemp
4625e509b4 + rename vertex() back to get_vertex() to avoid g++ getting confused 2012-07-19 17:10:27 +01:00
artemp
aee38935ac Merge branch 'master', remote-tracking branch 'origin' 2012-07-19 17:00:20 +01:00
artemp
8e2774fe84 + remove debug output 2012-07-19 16:59:33 +01:00
Artem Pavlenko
70818a500c Merge pull request #1328 from rjw57/rjw57-janitor 
SConstruct: trivial typo fix 'henche' -> 'hence'
 2012-07-19 08:39:19 -07:00
artemp
ab0722efce + AGG: refactor process_markers_symbolizer to use vertex_converters 2012-07-19 16:37:54 +01:00
artemp
7b10400be9 + update rendering code to work with new labeling methods 
+ rename num_points() to size()
+ rename get_vertex() to vertex()
 2012-07-19 16:36:44 +01:00
artemp
9e1914a4df + remove label position alogos from geometry class 2012-07-19 16:36:06 +01:00
artemp
f6fa57da26 + add VertexSource based implementations of label position algos 2012-07-19 16:31:47 +01:00
artemp
710b7eb04b + instantiate all vertex_converters permutations 
+ pass parameter by const reference
 2012-07-19 16:26:10 +01:00
artemp
c0ecb7e980 + use member variable in ctor 2012-07-19 16:24:29 +01:00
artemp
994f9abb01 + apply _mapnik_ coding style 2012-07-19 16:23:39 +01:00
artemp
c8cfde58f7 + pass box2d<double> by const ref 
+ make member const& too
 2012-07-19 16:22:45 +01:00
Rich Wareham
ee7ebb61f2 SConstruct: trivial typo fix 'henche' -> 'hence' 2012-07-19 16:08:25 +01:00
Hermann Kraus
525dad7623 Add line breaking algorithm. 2012-07-19 02:30:27 +02:00
Dane Springmeyer
587f0131a2 add tests for grid rendering with point_symbolizer 2012-07-18 17:29:22 -07:00