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

3344 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Dane Springmeyer
b925c79e4d test wkb collection output to match wkt output 2012-01-05 17:30:21 -08:00
Dane Springmeyer
66dcf9f316 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
5b36ac6f47 fix compile with older boost - fixes #1007 2012-01-05 16:45:12 -08:00
Artem Pavlenko
02eb5b8f12 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
db9021b929 + 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
884e83cda8 delete trailing white space 2012-01-05 11:40:27 +00:00
Artem Pavlenko
cb8ee2e239 don't use boost foreach on geometry_container - type deduction 
issues ??
 2012-01-05 11:38:43 +00:00
Artem Pavlenko
1b5e281647 implement wkb converter for multi geometries 2012-01-05 10:57:22 +00:00
Artem Pavlenko
544d834cee Merge pull request #999 from tarnowsc/master 
Bugfix for building symbolizer
 2012-01-02 04:37:36 -08:00
Cezary Tarnowski
68febbdbfb 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
656749de14 Fix unsigned underflow. 2011-12-23 15:01:28 +01:00
Dane Springmeyer
d0e3f683ed 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
eaf8d50422 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
654f579ac9 make failing ogr/shape comparison a todo 2011-12-22 14:37:32 -08:00
Dane Springmeyer
712553acea add fontset binding 2011-12-22 12:48:41 -08:00
Dane Springmeyer
e72330e38c fixup fontset tests 2011-12-22 12:48:11 -08:00
Dane Springmeyer
323c36db61 Merge branch 'geometry_cleanup' 2011-12-22 12:42:05 -08:00
Dane Springmeyer
477ac9c4f9 test cleanups 2011-12-22 12:41:51 -08:00
Dane Springmeyer
cf4315945f fix import 2011-12-22 12:20:03 -08:00
Dane Springmeyer
77cb946f8d tests: maintain python 2.5 support 2011-12-22 12:19:40 -08:00
Dane Springmeyer
6d30e8f126 more tests for geometry wkt and wkb io 2011-12-21 15:27:53 -08:00
Dane Springmeyer
fadb593878 Merge branch 'master' of https://github.com/mapnik/mapnik 2011-12-21 12:58:32 -08:00