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

1137 commits

Author SHA1 Message Date
Hermann Kraus
31fd5647f2 Use font manager and char properties in text engine. 2012-01-22 20:51:09 +01:00
Hermann Kraus
fb0c9d6d9c Fix text_placements.cpp. 2012-01-22 20:04:13 +01:00
Hermann Kraus
b945dff774 Fix metawriters. 2012-01-22 19:57:32 +01:00
Hermann Kraus
02eca0825f Fix set_displacement(). 2012-01-22 19:17:59 +01:00
Hermann Kraus
581d35987e Disable ShieldSymbolizer in cairo_renderer.cpp (see fdd58903f9). 2012-01-22 18:47:23 +01:00
Hermann Kraus
9d2a6088b1 New placement finder. 2012-01-22 18:41:04 +01:00
Hermann Kraus
78c4464ad7 Remove next_position_only(). 2012-01-22 18:29:55 +01:00
Hermann Kraus
fdd58903f9 Disable rendering of TextSymbolizer and ShieldSymbolizer. 
This avoids breaking compiles with the next changes.
 2012-01-22 18:24:28 +01:00
Hermann Kraus
e66712d722 Update font engine. 2012-01-22 18:13:08 +01:00
Hermann Kraus
67eb73eab9 Return correct size information from font engine. 2012-01-22 17:53:45 +01:00
Hermann Kraus
2f02e2f4c5 Update text symbolizer to use new locations. 2012-01-22 17:27:52 +01:00
Hermann Kraus
4490e1afaf Add missing get_positions() function. 2012-01-22 16:25:19 +01:00
Hermann Kraus
af42e2decf Update save_map.cpp. 2012-01-22 16:06:28 +01:00
Hermann Kraus
6ce55a0e94 Update parse_shield_symbolizer(). 2012-01-22 04:21:01 +01:00
Hermann Kraus
8244cd0a05 Add code using new functions in parse_text_symbolizer(). 2012-01-22 03:56:00 +01:00
Hermann Kraus
06ec0c377b Remove code using old functions in parse_text_symbolizer(). 2012-01-22 03:53:05 +01:00
Hermann Kraus
a9ca2f0c40 Add list placement support to load_map. 2012-01-22 03:39:59 +01:00
Hermann Kraus
7fd9fb0c88 Small fixes. 2012-01-22 03:32:21 +01:00
Hermann Kraus
cae0c31ee8 Update text_placement_info_simple to use new functions and locations. 2012-01-22 03:23:27 +01:00
Hermann Kraus
7d01f509ab Add text_placement_info_list functions. 2012-01-22 03:11:55 +01:00
Hermann Kraus
2b26044adb Complete text_placement_info functions. 2012-01-22 03:04:37 +01:00
Hermann Kraus
c407d8340f Add default get_all_expressions function. 2012-01-22 03:01:34 +01:00
Hermann Kraus
6695fa0f5f Add functions to read and write text_symbolizer_properties and char_properties from/to XML. 2012-01-22 02:56:28 +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
6efb7a863d Add default constructor for shield symbolizer. 2012-01-20 00:56:20 +01:00
Artem Pavlenko
bae5bd292f move building_symbolizer into separate hpp/cpp 2012-01-19 18:26:15 -05:00
Hermann Kraus
e977df778a Remove unused "anchor" attribute from Text/ShieldSymbolizer. 2012-01-20 00:09:25 +01:00
Artem Pavlenko
096082ba9b Merge branch 'master' into feature_impl 2012-01-19 16:11:03 -05:00
Hermann Kraus
537231f60e Remove glyph symbolizer. 2012-01-19 20:34:09 +01:00
Artem Pavlenko
ed40291b88 + add missing *.cpp file 2012-01-19 12:54:56 -05:00
Artem Pavlenko
ccb75e0dfb + add missing *.cpp file 2012-01-19 12:54:56 -05:00
Artem Pavlenko
63563da28f + add missing .cpp file 2012-01-19 12:52:58 -05:00
Artem Pavlenko
ab314b44a4 + use mapnik::gamma_method_e for all symbolizers 
+ fixes #1042 : avoid pushin duplcaite name into boost.python registry
 2012-01-19 12:45:24 -05:00
Artem Pavlenko
0f002077e1 + use mapnik::gamma_method_e for all symbolizers 
+ fixes #1042 : avoid pushin duplcaite name into boost.python registry
 2012-01-19 12:45:24 -05:00
Artem Pavlenko
a6a540cb68 Merge branch 'master' into feature_impl 2012-01-18 09:40:55 -05:00
Artem Pavlenko
de402b2450 + update colorizer call 2012-01-18 09:39:06 -05:00
Artem Pavlenko
034b270eb4 Merge pull request #1023 from tarnowsc/master 
Making the gamma-method for polygon symbolizer
 2012-01-18 06:35:54 -08:00
Artem Pavlenko
8fd505790e Merge pull request #1023 from tarnowsc/master 
Making the gamma-method for polygon symbolizer
 2012-01-18 06:35:54 -08:00
Artem Pavlenko
f44c3e300d add feature_type_style.cpp 2012-01-18 09:17:39 -05:00
Artem Pavlenko
43fafa6ca0 + move feature_kv_iterotor into *.cpp to avoid cyclic deps 
+ expose kv iterator directly on feature_impl
 2012-01-18 09:15:52 -05:00
Dane Springmeyer
820b9a2b25 merge master with feature_impl 2012-01-17 17:47:27 -05:00
Artem Pavlenko
c594595603 update to work with new feature_impl 2012-01-17 14:19:38 -05:00
Artem Pavlenko
fbbd1d4dcf re-enable colorizer support 2012-01-17 14:16:03 -05:00
Artem Pavlenko
c8c7000551 + update to new feature_impl 2012-01-17 13:41:37 -05:00
Artem Pavlenko
1de253d3d2 update to use new feature_impl interface 2012-01-17 13:33:01 -05:00
Artem Pavlenko
b838d17680 remove extra empty lines 2012-01-17 13:32:26 -05:00
Dane Springmeyer
136239f88b remove mapnik::point_datasource from c++ and mapnik.PointDatasource from python bindings 2012-01-17 09:58:45 -05:00
Dane Springmeyer
63891cec15 finish refactor, moving to separate method off datasources to get_geometry_type and using enums all around 2012-01-17 01:09:46 -05:00
Dane Springmeyer
b0d0d06564 finish refactor, moving to separate method off datasources to get_geometry_type and using enums all around 2012-01-17 01:09:46 -05:00
Dane Springmeyer
66a0cfc81f refactor 2012-01-14 22:35:40 -08:00
Dane Springmeyer
834310f2d8 refactor 2012-01-14 22:35:40 -08:00
Cezary Tarnowski
93ff232ca2 #1023 making gamma power default, making gamma-method awailable for polygon pattern symolizer and stroke 2012-01-13 18:20:03 +01:00
Cezary Tarnowski
53fc770495 #1023 making gamma power default, making gamma-method awailable for polygon pattern symolizer and stroke 2012-01-13 18:20:03 +01:00
Artem Pavlenko
ede232d2c1 + apply mapnik coding convention 2012-01-13 16:30:03 +00:00
Cezary Tarnowski
e7a751987d Merge remote-tracking branch 'upstream/master' 2012-01-13 14:49:59 +01:00
Cezary Tarnowski
afa8ecefc4 Merge remote-tracking branch 'upstream/master' 2012-01-13 14:49:59 +01:00
Cezary Tarnowski
c007a608ff Adding gamma-method to polygon symbolizer 2012-01-12 16:58:10 +01:00
Cezary Tarnowski
c7cfdef8d4 Adding gamma-method to polygon symbolizer 2012-01-12 16:58:10 +01:00
Artem Pavlenko
0eb8e2d246 temp fix to compile FIXME 2012-01-12 10:04:49 +00:00
Artem Pavlenko
46619c17c2 feature impl update 2012-01-12 09:33:43 +00:00
Artem Pavlenko
ff386e686e Merge remote-tracking branch 'origin/master' 
Conflicts:
	src/feature_style_processor.cpp
 2012-01-10 21:38:43 +00:00
Artem Pavlenko
ec8661b5d4 Merge remote-tracking branch 'origin/master' 
Conflicts:
	src/feature_style_processor.cpp
 2012-01-10 21:38:43 +00:00
Artem Pavlenko
4bf5ff57b1 + fix typo 2012-01-10 21:32:51 +00:00
Artem Pavlenko
3011d53e34 + fix typo 2012-01-10 21:32:51 +00:00
Artem Pavlenko
3f0fdeadf0 Merge pull request #1014 from tmcw/unbuffered_extent 
Unbuffered extent
 2012-01-10 13:31:29 -08:00
Artem Pavlenko
8652bfdae8 Merge pull request #1014 from tmcw/unbuffered_extent 
Unbuffered extent
 2012-01-10 13:31:29 -08:00
Dane Springmeyer
344f855bb6 fix compile with RENDERING_STATS 2012-01-10 13:27:41 -08:00
Dane Springmeyer
c734c516ae fix compile with RENDERING_STATS 2012-01-10 13:27:41 -08:00
Hermann Kraus
cbcb545b65 Fix the problem reported in #1003 (NE, NW, SE not working for text-placement=simple). 
Add test cases for this problem.

Conflicts:

	src/text_placements.cpp
	tests/data/placement/clean.sh
	tests/data/placement/test.py
 2012-01-09 23:30:22 +01:00
Hermann Kraus
f4f1e84420 Fix the problem reported in #1003 (NE, NW, SE not working for text-placement=simple). 
Add test cases for this problem.

Conflicts:

	src/text_placements.cpp
	tests/data/placement/clean.sh
	tests/data/placement/test.py
 2012-01-09 23:30:22 +01:00
Tom MacWright
54ecfdbe9f Merge branch 'master' into unbuffered_extent 2012-01-09 13:13:09 -05:00
Tom MacWright
1640252b69 Merge branch 'master' into unbuffered_extent 2012-01-09 13:13:09 -05:00
Artem Pavlenko
e8541e1685 Merge branch 'master' of https://github.com/tarnowsc/mapnik 2012-01-09 13:10:55 +00:00
Artem Pavlenko
ba03c5a28f Merge branch 'master' of https://github.com/tarnowsc/mapnik 2012-01-09 13:10:55 +00:00
Artem Pavlenko
e9cb534ee3 + store face index for faster access 
+ avoid memory leaks
 2012-01-09 13:09:19 +00:00
Artem Pavlenko
1ad6e107d3 + store face index for faster access 
+ avoid memory leaks
 2012-01-09 13:09:19 +00:00
Cezary Tarnowski
88af05fadc bugfix - a proper bugfix for rewinding geometry in building symbolizer 2012-01-09 13:41:38 +01:00
Cezary Tarnowski
4084d58309 bugfix - a proper bugfix for rewinding geometry in building symbolizer 2012-01-09 13:41:38 +01:00
Artem Pavlenko
2f8557ad12 fix typo 2012-01-09 12:20:25 +00:00
Artem Pavlenko
b90467cbc5 fix typo 2012-01-09 12:20:25 +00:00
Artem Pavlenko
30839b4d17 Merge branch 'master' of https://github.com/tarnowsc/mapnik 2012-01-09 12:20:07 +00:00
Artem Pavlenko
838f6872d4 Merge branch 'master' of https://github.com/tarnowsc/mapnik 2012-01-09 12:20:07 +00:00
Cezary Tarnowski
23631d31a8 bugfix - a proper bugfix for rewinding geometry in building symbolizer 2012-01-09 13:17:03 +01:00
Cezary Tarnowski
7b72898832 bugfix - a proper bugfix for rewinding geometry in building symbolizer 2012-01-09 13:17:03 +01:00
Artem Pavlenko
a95603713a + initialize FT_Face to null 
+ add missing bracket
 2012-01-09 12:15:14 +00:00
Artem Pavlenko
d307eff124 + initialize FT_Face to null 
+ add missing bracket
 2012-01-09 12:15:14 +00:00
cpsandbox
2379b561af Update src/font_engine_freetype.cpp 2012-01-08 23:06:27 -08:00
cpsandbox
ccb4340164 Update src/font_engine_freetype.cpp 2012-01-08 23:06:27 -08:00
cpsandbox
e75f00cdf4 adding support for multiple fonts in one font file, for instance .ttc 2012-01-08 21:55:18 -08:00
cpsandbox
621ebac674 adding support for multiple fonts in one font file, for instance .ttc 2012-01-08 21:55:18 -08:00
Dane Springmeyer
1b3d2324de scons: fully workaround potential compile error with gcc/boost 1.42/ubuntu relating to interprocess bug - refs #1001 and #950 2012-01-08 17:21:04 -08:00
Dane Springmeyer
e9bb5666e7 scons: fully workaround potential compile error with gcc/boost 1.42/ubuntu relating to interprocess bug - refs #1001 and #950 2012-01-08 17:21:04 -08:00
Artem Pavlenko
544d834cee Merge pull request #999 from tarnowsc/master 
Bugfix for building symbolizer
 2012-01-02 04:37:36 -08:00
Artem Pavlenko
883615d454 Merge pull request #999 from tarnowsc/master 
Bugfix for building symbolizer
 2012-01-02 04:37:36 -08:00