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

2864 commits

Author SHA1 Message Date
artemp
5df668d126 refactor error handler to work with mapnik/debug macros 2014-09-22 10:10:08 +01:00
Dane Springmeyer
9e78712dc4 Merge pull request #2377 from mapycz/3.x-fix-text-on-line-glyph-distance 
text rendering with line placement on corners in 3.x
 2014-09-19 15:12:32 -07:00
Dane Springmeyer
98adcc2d58 fix compile with clang++ after #2416 2014-09-19 14:51:27 -07:00
Dane Springmeyer
7576c8e384 fix return of painted in grid_renderer 2014-09-19 14:34:08 -07:00
Dane Springmeyer
68d90adda6 enable painted for svg_renderer 
Conflicts:
	include/mapnik/svg/output/svg_renderer.hpp
 2014-09-19 14:34:07 -07:00
Dane Springmeyer
753cd5d6a0 Merge pull request #2416 from mapycz/add-font-features 
add font-feature-settings
 2014-09-19 14:30:17 -07:00
Jiri Drbalek
2dcfa9e4b7 add font-feature-settings 2014-09-17 19:22:07 +00:00
Jiri Drbalek
e6a32f22cf fix image painted 2014-09-16 18:54:52 +02:00
artemp
4c296e65e7 use expectation operators parsing attributes #2390 2014-09-12 17:19:11 +01:00
Dane Springmeyer
0cb63c51e8 finish removing ancient reduced size grid rendering pathway - amends f3a824c2cc 2014-09-12 00:56:51 -07:00
artemp
246336d2b1 Merge branch 'min-dist-compatibility' of git://github.com/MapQuest/mapnik into MapQuest-min-dist-compatibility 2014-09-10 16:20:36 +01:00
artemp
f8dc7b023a text - add ``repeat-wrap-char`` parameter default:false (#2333) 2014-09-10 16:08:41 +01:00
Jordan Hollinger
9b5a9dfe3e Change text-margin option to margin. 2014-09-10 07:45:41 -04:00
artemp
b441586acf text-symbolizer: revive 'wrap-char' property which uses special (naive) line_breaker - ref #2333 2014-09-09 17:30:01 +01:00
Dane Springmeyer
479b9e13d0 Merge pull request #2383 from MapQuest/min-dist-compatibility 
3.x -> 2.3.x compatibility for minimum-distance
 2014-09-06 22:50:13 -07:00
Dane Springmeyer
4ac190e8ef fix handling of marker width/height 2014-09-06 22:44:57 -07:00
Dane Springmeyer
cc07ac2b00 simplify marker width/height handling 2014-09-06 22:13:30 -07:00
Dane Springmeyer
54b2880e53 markers: support offset, geometry-transform, and simplify - closes #2108 2014-09-06 21:27:15 -07:00
Dane Springmeyer
dc8a46017f fix recursion on windows - closes #2414 2014-09-06 21:07:48 +00:00
Dane Springmeyer
9d363ce7e7 change runtime warning to compile time warning 2014-09-06 12:57:53 -07:00
Dane Springmeyer
1482835c08 fix visibility of image compositing/scaling with -flto - closes #2413 2014-09-06 10:52:00 -07:00
Dane Springmeyer
e26570dfdb completely ignore layers with status=off - closes #153 2014-09-06 10:08:40 -07:00
artemp
fef3d22154 support avoid-edges in all markers placements 2014-09-05 16:33:20 +01:00
artemp
2727eddf90 implement 'avoid-adges' for markers placements (point placement) 
(TODO: support all placement types)
 2014-09-05 16:19:55 +01:00
artemp
aea77a7155 use generic_json types in topojson grammar 
refactor value_converters into separate header
usd value_converters in geojson parser
 2014-09-05 12:13:58 +01:00
Jiri Drbalek
b7e7e29781 fix text rendering with line placement on corners 2014-09-05 10:46:46 +00:00
Jiri Drbalek
69708dc640 add length method 2014-09-05 10:46:46 +00:00
Dane Springmeyer
492e084714 add copy ctor to rule: avoids last copy of syms in load_map - closes #1293 2014-09-04 22:03:54 -07:00
Dane Springmeyer
25a41ae31b restore value hash + add test harness 2014-09-04 19:38:53 -07:00
Dane Springmeyer
3c1ad84f95 remove mapnik-config.bat 2014-09-04 16:40:37 -07:00
Dane Springmeyer
038cc41cd4 we are targeting 2014 so rollback 2013 CTP workarounds 2014-09-04 18:26:17 +00:00
Dane Springmeyer
7d5d02e031 Merge branch 'master' of github.com:mapnik/mapnik into 3x-msvs 2014-09-04 09:22:53 -07:00
Dane Springmeyer
c30f1715e6 Revert "workaround msvs variant init bug" 
This reverts commit be44b647fa.
 2014-09-04 09:22:43 -07:00
Dane Springmeyer
98c881432a Revert "attempt to workaround other mapnik_value_type->variant bugs" 
This reverts commit 7dc1aed9ee.
 2014-09-04 09:21:14 -07:00
artemp
72e2f4446f re-implement mapnik::value deriving from value_base and update across core 
fix mapnik::value conversions in topojson plugin
 2014-09-04 17:10:13 +01:00
artemp
0985cc907d remove copy converting ctor and fix converting move constuctor to use 'universal reference' and perfect forwarding 
( re : http://isocpp.org/blog/2012/11/universal-references-in-c11-scott-meyers)
 2014-09-04 14:54:42 +01:00
Jiri Drbalek
67d8f41a1b fix angle calculation 
Conflicts:
	src/text/vertex_cache.cpp
 2014-09-03 11:53:23 -07:00
Dane Springmeyer
7dc1aed9ee attempt to workaround other mapnik_value_type->variant bugs 2014-08-31 17:18:15 -07:00
Dane Springmeyer
be44b647fa workaround msvs variant init bug 2014-08-31 12:44:12 -07:00
Dane Springmeyer
beaf7a56cc fix linking problems from python 2014-08-31 07:44:41 +00:00
Dane Springmeyer
603ea3811f Merge branch 'master' of github.com:mapnik/mapnik into 3x-msvs 2014-08-30 20:05:33 -07:00
Dane Springmeyer
8cd198625e remove unused code 2014-08-30 14:30:51 -07:00
Dane Springmeyer
d577ef8719 Merge branch 'master' of https://github.com/mapnik/mapnik into 3x-msvs 2014-08-29 18:56:43 -07:00
Dane Springmeyer
c7f58ee64c clean up harfbuzz->icu interface 2014-08-29 17:41:29 -07:00
Dane Springmeyer
15356f6320 handle wchar_t UChar typedef on windows 2014-08-29 16:46:23 -07:00
Dane Springmeyer
12a45744fb Merge pull request #2403 from mapycz/3.x-fix-vertext_last-warning 
fix compiler warning
 2014-08-29 11:52:09 -07:00
Jiri Drbalek
21dcb2e2c4 fix compiler warning 2014-08-29 18:18:25 +00:00
Dane Springmeyer
8d7bf7a8da fix imagedata visability on windows 2014-08-29 11:01:04 -07:00
artemp
a5925c1f15 remove redundant private copy assignment op 2014-08-29 18:06:08 +01:00
Dane Springmeyer
3f6a5ae246 re-enable harfbuzz shaper 2014-08-29 00:05:34 -07:00