Commit graph

6861 commits

Author SHA1 Message Date
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
Dane Springmeyer
4cb9aa44b5 update tests to python api for features 2012-01-24 15:16:40 -08:00
Hermann Kraus
469568862b Add documentation. 2012-01-24 23:42:54 +01:00
Artem Pavlenko
c88d7e723d + access feature_kv_iterator directly on mapnik::Feature::begin()/end()
+ avoid using 'feature' as variable name as mapnik::Feature will be renamed to mapnik::feature
+ revert 'describe' to 'attributes' (original name fits better in this context I think)
+ make attributes a Puython property
2012-01-24 14:48:30 +00:00
Artem Pavlenko
79d44e1bf8 Merge branch 'feature_impl' of github.com:mapnik/mapnik into feature_impl 2012-01-24 14:39:13 +00:00
Artem Pavlenko
75024c3fa1 Merge branch 'master' into feature_impl 2012-01-24 12:48:19 +00:00
Artem Pavlenko
19deb86591 append connection string to connection error message 2012-01-24 12:36:33 +00:00
Dane Springmeyer
e542e90fcf get most of the tests passing 2012-01-24 00:27:44 -08:00
Dane Springmeyer
803a705774 add a method to get simple dictionary of feature attributes, remove old/deprecated feature access 2012-01-24 00:27:27 -08:00
Dane Springmeyer
aa6da2dce9 collect context before featureset creation in sqlite 2012-01-23 23:51:31 -08:00
Dane Springmeyer
62cf7cb2fe no need for collecting size in postgis plugin 2012-01-23 23:50:50 -08:00
Dane Springmeyer
c576291346 push value into context for gdal plugin 2012-01-23 23:50:24 -08:00
Hermann Kraus
3b887972b8 Start work on new symbolizer helpers. 2012-01-23 19:02:35 +01:00
Artem Pavlenko
4b22636f3b initial implementation of multipolygon labeling strategy
based on ordering by bounding box.

TODO : sync with https://github.com/herm/mapnik/tree/textplacement
2012-01-23 16:00:55 +00: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
Artem Pavlenko
b89f5cbbbc update pdsql2sqlite to new feature_impl 2012-01-23 08:40:16 +00:00
Artem Pavlenko
4f48cce42e push column names into context_type 2012-01-23 08:39:22 +00:00
Hermann Kraus
2eb3662d87 Add all files to build.py. 2012-01-23 00:20:15 +01:00
Hermann Kraus
1549fd92c3 Float font sizes. 2012-01-22 21:19:35 +01: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
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
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
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
e0b5e15507 Remove old functions from text_placements. 2012-01-22 18:20:34 +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
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
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
7d03b46079 Update attribute_collector to use get_all_expressions(). 2012-01-22 03:25:19 +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