Commit graph

3246 commits

Author SHA1 Message Date
Dane Springmeyer
e7f1c58dee include/
add utility for converting paths to string geometry type name - refs #701
2012-01-11 20:02:38 -08:00
Dane Springmeyer
ca68a77a46 add geometry_type to mapnik::layer_descriptor - empty unless set by datasources - refs #701 2012-01-11 20:02:30 -08:00
Dane Springmeyer
d865555af2 formatting 2012-01-11 15:58:59 -08: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
3011d53e34 + fix typo 2012-01-10 21:32:51 +00:00
Artem Pavlenko
8652bfdae8 Merge pull request #1014 from tmcw/unbuffered_extent
Unbuffered extent
2012-01-10 13:31:29 -08:00
Dane Springmeyer
c734c516ae fix compile with RENDERING_STATS 2012-01-10 13:27:41 -08: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
1640252b69 Merge branch 'master' into unbuffered_extent 2012-01-09 13:13:09 -05:00
Dane Springmeyer
8d11b0f16e 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
f8b9cb4db4 use declared iterator 2012-01-09 08:38:46 -08:00
Artem Pavlenko
ba03c5a28f Merge branch 'master' of https://github.com/tarnowsc/mapnik 2012-01-09 13:10:55 +00:00
Artem Pavlenko
1ad6e107d3 + store face index for faster access
+ avoid memory leaks
2012-01-09 13:09:19 +00:00
Cezary Tarnowski
4084d58309 bugfix - a proper bugfix for rewinding geometry in building symbolizer 2012-01-09 13:41:38 +01:00
Artem Pavlenko
b90467cbc5 fix typo 2012-01-09 12:20:25 +00:00
Artem Pavlenko
838f6872d4 Merge branch 'master' of https://github.com/tarnowsc/mapnik 2012-01-09 12:20:07 +00:00
Cezary Tarnowski
7b72898832 bugfix - a proper bugfix for rewinding geometry in building symbolizer 2012-01-09 13:17:03 +01:00
Artem Pavlenko
d307eff124 + initialize FT_Face to null
+ add missing bracket
2012-01-09 12:15:14 +00:00
cpsandbox
ccb4340164 Update src/font_engine_freetype.cpp 2012-01-08 23:06:27 -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
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
Dane Springmeyer
5b167b4fa2 scons: pass boost version through env 2012-01-08 17:13:19 -08:00
Dane Springmeyer
894494a07d 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
156026c581 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
69f4cece93 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
34e0cd7044 clarify recommended boost versions - closes #1001 2012-01-08 15:55:47 -08:00
Dane Springmeyer
954cb664ba fix compile with older boost 2012-01-06 16:22:39 -08:00
Dane Springmeyer
f83b0edbe5 make failing osm plugin test a todo 2012-01-05 18:49:41 -08:00
Dane Springmeyer
b7c69a8462 test cleanup 2012-01-05 18:48:20 -08:00
Dane Springmeyer
fa93ad7de5 more wkb/wkt tests 2012-01-05 18:26:01 -08:00
Dane Springmeyer
70bb3805e2 test wkb collection output to match wkt output 2012-01-05 17:30:21 -08:00
Dane Springmeyer
47e5aff668 enable tests comparing wkt/wkb output between shapefiles read with shape.input and ogr.input now that shape reading is fixed up 2012-01-05 16:46:19 -08:00
Dane Springmeyer
94ae30d7a2 fix compile with older boost - fixes #1007 2012-01-05 16:45:12 -08:00
Artem Pavlenko
faaa4f6e3f shape: check if multiple parts are interior rings or separate
polygons. Currently only test if first coordinate inside exterior
ring and assume first ring is exterior.

If this approach is not robust enough we can calculate ring orientations
instead. Shape file convention is: CW - exterior, CCW - interior.

very simple
2012-01-05 16:24:38 +00:00
Artem Pavlenko
71c275b86b + add to_wkb method for mapnik.Path object
+ reflect byte order enum in Python : mapnik.wkbByteOrder.XDR|NDR
+ refactor boost_version to avoid duplicatiuon
2012-01-05 11:56:38 +00:00
Artem Pavlenko
9e6e7d0211 delete trailing white space 2012-01-05 11:40:27 +00:00
Artem Pavlenko
0aa44b84f9 don't use boost foreach on geometry_container - type deduction
issues ??
2012-01-05 11:38:43 +00:00
Artem Pavlenko
e33326a561 implement wkb converter for multi geometries 2012-01-05 10:57:22 +00:00
Artem Pavlenko
883615d454 Merge pull request #999 from tarnowsc/master
Bugfix for building symbolizer
2012-01-02 04:37:36 -08:00
Cezary Tarnowski
46a15d50bf bugfix - if geometry is used twice from cache it will be missing walls in building symbolizer 2011-12-30 12:35:28 +01:00
Hermann Kraus
133bd16211 Fix unsigned underflow. 2011-12-23 15:01:28 +01:00
Dane Springmeyer
681930372f Revert "text rendering: only create objects once rather than per geometry part/placement attempt - refs #162"
This reverts commit eaf8d50422.
2011-12-22 15:01:41 -08:00
Dane Springmeyer
f47365a927 text rendering: only create objects once rather than per geometry part/placement attempt - refs #162 2011-12-22 14:48:40 -08:00
Dane Springmeyer
68e5811491 make failing ogr/shape comparison a todo 2011-12-22 14:37:32 -08:00
Dane Springmeyer
5af7afd2c8 add fontset binding 2011-12-22 12:48:41 -08:00
Dane Springmeyer
84b7d198d4 fixup fontset tests 2011-12-22 12:48:11 -08:00
Dane Springmeyer
b820cf7807 Merge branch 'geometry_cleanup' 2011-12-22 12:42:05 -08:00
Dane Springmeyer
2701f93a04 test cleanups 2011-12-22 12:41:51 -08:00
Dane Springmeyer
62983ef214 fix import 2011-12-22 12:20:03 -08:00
Dane Springmeyer
bed779b465 tests: maintain python 2.5 support 2011-12-22 12:19:40 -08:00