Commit graph

3316 commits

Author SHA1 Message Date
Dane Springmeyer
2c4a86d4cb Merge branch 'master' of github.com:mapnik/mapnik into geometry_type_descriptor 2012-01-12 18:48:53 -08:00
Dane Springmeyer
46d53cb40d plugins/
pass by value
2012-01-12 14:05:03 -08:00
Artem Pavlenko
3bbc58bdc6 fix include 2012-01-12 17:31:32 +00:00
Artem Pavlenko
eb3f5896df feature_impl: key/value forward iterator 2012-01-12 17:29:42 +00:00
Artem Pavlenko
ac8655aead remove unused data members 2012-01-12 12:28:53 +00:00
Artem Pavlenko
b1782c0bd7 add shape_utils 2012-01-12 12:20:39 +00:00
Artem Pavlenko
d8f931c1c7 factor out common code to reduce duplication (shape_utils) 2012-01-12 12:18:50 +00:00
Artem Pavlenko
463fefff43 format 2012-01-12 10:18:15 +00:00
Artem Pavlenko
71d509a495 use boost::noncopyable 2012-01-12 10:11:01 +00:00
Artem Pavlenko
bbfe036c54 fix init order 2012-01-12 10:10:40 +00:00
Artem Pavlenko
506e1a7378 temp fix to compile FIXME 2012-01-12 10:04:49 +00:00
Artem Pavlenko
0dc71c9eda upgrade shape.input to new feature impl 2012-01-12 10:04:08 +00:00
Artem Pavlenko
62fcb51e2f keep old names 2012-01-12 09:43:54 +00:00
Artem Pavlenko
97874b3db9 more friendly interface 2012-01-12 09:40:58 +00:00
Artem Pavlenko
cb070f7b1d + return bvalue by const ref
+ feature impl update
2012-01-12 09:35:57 +00:00
Artem Pavlenko
657cfa20d3 feature impl update 2012-01-12 09:33:43 +00:00
Artem Pavlenko
a846bc0160 update feature factory to work with new features 2012-01-12 09:32:21 +00:00
Artem Pavlenko
500bac1cf8 new leaner feature impl (shared context) 2012-01-12 09:31:11 +00:00
Dane Springmeyer
acc0d6e302 cleanup python datasource api simplifying access to descriptors 2012-01-11 20:03:47 -08:00
Dane Springmeyer
975afebd87 ensure all plugins report best guess at top level geometry_type using new descriptor attribute 2012-01-11 20:03:23 -08:00
Dane Springmeyer
967652efb6 include/
add utility for converting paths to string geometry type name - refs #701
2012-01-11 20:02:38 -08:00
Dane Springmeyer
33bd76f24f add geometry_type to mapnik::layer_descriptor - empty unless set by datasources - refs #701 2012-01-11 20:02:30 -08:00
Dane Springmeyer
aad26ace9f formatting 2012-01-11 15:58:59 -08: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
4bf5ff57b1 + 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
Dane Springmeyer
344f855bb6 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
Tom MacWright
54ecfdbe9f Merge branch 'master' into unbuffered_extent 2012-01-09 13:13:09 -05:00
Dane Springmeyer
1fa26fa067 close #970 by removing non-north-up restriction which appears not to be working properly 2012-01-09 08:39:22 -08:00
Dane Springmeyer
90cf1a226a use declared iterator 2012-01-09 08:38:46 -08:00
Artem Pavlenko
e8541e1685 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
Cezary Tarnowski
88af05fadc 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
30839b4d17 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
Artem Pavlenko
a95603713a + 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
e75f00cdf4 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
9b859bbc81 scons: pass boost version through env 2012-01-08 17:13:19 -08:00
Dane Springmeyer
520f36938f recommend 1.46 since that dodges the ubuntu issue with interprocess - refs #950 and #1001 2012-01-08 16:08:08 -08:00
Dane Springmeyer
ca1b5ea7ac Revert "recommend 1.46 since that dodges the ubuntu issue with interprocess - refs #950 and #1001"
This reverts commit 60059970fa.
2012-01-08 16:07:17 -08:00
Dane Springmeyer
60059970fa recommend 1.46 since that dodges the ubuntu issue with interprocess - refs #950 and #1001 2012-01-08 16:03:04 -08:00
Dane Springmeyer
b01e6efccc clarify recommended boost versions - closes #1001 2012-01-08 15:55:47 -08:00
Dane Springmeyer
baa0fa37b4 fix compile with older boost 2012-01-06 16:22:39 -08:00
Dane Springmeyer
e649bb42cf make failing osm plugin test a todo 2012-01-05 18:49:41 -08:00
Dane Springmeyer
80d18dedc3 test cleanup 2012-01-05 18:48:20 -08:00
Dane Springmeyer
8ce9da421f more wkb/wkt tests 2012-01-05 18:26:01 -08:00