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

2055 commits

Author SHA1 Message Date
artemp
5e224bd705 + better error reporting 2013-03-14 09:52:23 +00:00
artemp
73261346cf + remove unused local vars 2013-03-14 09:35:41 +00:00
Dane Springmeyer
6cbceafc45 avoid direct freetype usage in core/public hpp file so that mapnik C++ depedencies do no need to known the freetype include paths 2013-03-12 18:12:54 -07:00
Dane Springmeyer
c7821889c9 refactor svg parsing so that libxml is not needed in the hpp file 2013-03-12 18:09:59 -07:00
Dane Springmeyer
20fcdc8034 iwyu 2013-03-12 16:56:47 -07:00
Dane Springmeyer
86ad6c0dab snap to pixels for markers because calculating placement 2013-03-12 12:14:01 -07:00
Dane Springmeyer
29ce3b1c75 fix handling of svg opacity, which should be applied to fill/stroke opacity at render time - closes #1744 2013-03-11 14:56:00 -07:00
Dane Springmeyer
3b834b4e6f formatting 2013-03-11 13:46:32 -07:00
artemp
4bdc5cdc10 + boost.geometry based polygon clipper 
(NOTE: subject polygons must be 'valid' as in OGC world)
 2013-03-11 09:44:20 +00:00
Dane Springmeyer
e66d007627 add halo-rasterizer option for text symbolizer 
- closes #1298
  - allows for much faster halo drawing and simliar quality for
    radius values in the 1-2 px range
  - also moves grid_renderer away from using freetype stroker completely
    since halo quality is not critical for this renderer
 2013-03-08 20:32:39 -08:00
Dane Springmeyer
76042a1700 parse and setup ability to known original, declared svg width/height - refs #1122 2013-03-08 17:40:19 -08:00
Dane Springmeyer
2fcd531345 pixel snap raster markers and svg files loaded from the file system - partially addresses #1316 2013-03-08 16:24:41 -08:00
Dane Springmeyer
c36795e0a9 respect both sx and sy in setting up affine transform for raster scaling since they may be different - closes #1748 2013-03-06 17:41:20 -08:00
artemp
f2b795af0b + skip SEG_CLOSE commands as they not used to transfer x/y 2013-03-06 21:31:12 +00:00
artemp
6ffe78c300 + expose set_minx/miny/maxx/maxy - makes it easier 
to adapt for boost::geometry
 2013-03-06 21:31:12 +00:00
Dane Springmeyer
c68ac84a3b fix typo 2013-03-06 11:43:51 -08:00
Dane Springmeyer
536cbd55d0 handle SEG_CLOSE and fix #1600 2013-03-06 11:35:12 -08:00
Dane Springmeyer
555fcf375e iwyu 2013-03-05 05:34:38 -08:00
artemp
fe174aee2e + remove unused vars 2013-03-01 14:42:23 -05:00
artemp
e9f03a565f + explicit polygon path closing 2013-03-01 11:08:58 -05:00
Dane Springmeyer
c184579c43 finish hsla transformation image-filter 2013-02-28 12:19:40 -05:00
artemp
9be2a525d2 + image-filters: parse hsla string directly 2013-02-27 15:35:56 -05:00
artemp
cbc809ddf5 + image-filters: add colorize-alpha filter 2013-02-27 14:44:22 -05:00
Dane Springmeyer
b1233d533f Merge pull request #1742 from mapnik/hsla-filter 
Hsla filter
 2013-02-27 09:27:37 -08:00
Dane Springmeyer
88360c365f fix serialization of agg-stack-blur and hsla filters 2013-02-27 11:33:53 -05:00
artemp
8dabe098ce + image-filters: add support for an optional function like syntax 2013-02-27 11:07:43 -05:00
Dane Springmeyer
9a49d0c82f Merge branch 'master' of github.com:mapnik/mapnik 2013-02-27 09:40:25 -05:00
Dane Springmeyer
04199e2a94 touchups to hsla work 2013-02-27 09:38:54 -05:00
artemp
8f12da81d1 + image-filters: make grammar more flexible to accomodate 
different ctors signitures
+ add 'hsla' filter placeholder (TODO: add impl)
+ remove inused <iostream> include
 2013-02-27 08:29:56 -05:00
Dane Springmeyer
f5d5502bc4 start implementing hsla image-filter 2013-02-26 19:21:05 -05:00
Dane Springmeyer
70940088d7 formatting 2013-02-26 16:52:51 -05:00
Dane Springmeyer
270a6eff33 allow passing scale_denom to renderer's apply method to allow overriding zoom level - closes #1582 2013-02-26 16:49:39 -05:00
Dane Springmeyer
4d82a97814 implement support in cairo and grid renderer for mapnik::request - refs #1737 2013-02-26 15:05:44 -05:00
Dane Springmeyer
7b950117e2 Merge branch 'master' of github.com:mapnik/mapnik into map-request 2013-02-26 12:57:11 -05:00
artemp
97f5d7c437 Merge remote-tracking branch 'origin/master' 2013-02-26 12:45:56 -05:00
artemp
218aca2159 + remove redundant const qualifier 2013-02-26 12:43:29 -05:00
Dane Springmeyer
054cb13231 Merge branch 'master' of github.com:mapnik/mapnik 2013-02-26 12:07:53 -05:00
Dane Springmeyer
d861636fbc move const char string2value interface to use iterators 2013-02-26 12:07:36 -05:00
artemp
be61bf6fef + pass by reference when possible (c++) 2013-02-26 11:58:07 -05:00
artemp
3b5707848e + use icu::UnicodeString::remove 
+ formatting - c++ style comments
 2013-02-26 11:46:22 -05:00
artemp
1ea60c472c + pass pixel_position by const ref 
+ use BOOST_FOREACH for brevety
 2013-02-26 11:45:24 -05:00
artemp
c3fab9e665 + formatting/cleanup 2013-02-26 11:44:23 -05:00
artemp
a1ea1701dd + use c++ style comments 2013-02-26 11:02:48 -05:00
artemp
bda0375f97 + formatting 2013-02-26 10:58:46 -05:00
Dane Springmeyer
712ff50abe make a few utility functions inline and static 2013-02-26 10:52:41 -05:00
Dane Springmeyer
864fdc5234 Merge branch 'master' of github.com:mapnik/mapnik into map-request 2013-02-25 19:33:54 -05:00
Dane Springmeyer
478a7acb2b c++ style 2013-02-25 19:33:35 -05:00
Dane Springmeyer
00a2f54346 further refine the mapnik::request object which can be passed to custom agg_renderer 2013-02-25 19:33:08 -05:00
Dane Springmeyer
6a00f92517 Merge branch 'master' of github.com:mapnik/mapnik into map-request 2013-02-25 16:49:45 -05:00
Artem Pavlenko
8905b1ddec Merge pull request #1733 from kkaefer/value_hash 
Fix mapnik::value for boost 1.49 and other icu versions
 2013-02-24 16:13:14 -08:00
Konstantin Käfer
8abc44e639 fix mapnik::value for boost 1.49 and other icu versions 2013-02-24 19:02:42 +01:00
Dane Springmeyer
86d8bf6b98 Merge pull request #1729 from kkaefer/value_hash 
Support boost::hash() for mapnik::value
 2013-02-23 11:16:49 -08:00
XinGang Li
a10855da75 fix _MSC_VER typo. 2013-02-23 22:38:16 +08:00
Konstantin Käfer
67c537b43b support boost::hash() for mapnik::value 2013-02-23 13:04:47 +01:00
Dane Springmeyer
16817fe6ea Merge branch 'master' of github.com:mapnik/mapnik into map-request 2013-02-22 13:50:06 -08:00
Dane Springmeyer
edbe5aca32 Merge branch 'master' of github.com:mapnik/mapnik 2013-02-22 13:00:10 -08:00
Dane Springmeyer
249c77d7b8 expose nonconst access to datasource parameters 2013-02-22 12:40:40 -08:00
XinGang Li
fa52c389b8 Only explictly defining the enumeration template class for msvc. 2013-02-23 00:51:37 +08:00
XinGang Li
b1b90f527a Fixed the enumeration link error with msvc when build python bindings. 2013-02-22 23:59:12 +08:00
XinGang Li
7f1e416313 Export the to_wkt functions to avoid python bindings access the internal structs. 2013-02-22 23:58:41 +08:00
XinGang Li
df7db521bb Add parse_image_filters function to avoid python bindings access the internal structs. 2013-02-22 23:58:30 +08:00
XinGang Li
e5d1418417 Add missing class declaration for python bindings. 2013-02-22 23:57:27 +08:00
Dane Springmeyer
7c4186b09f Merge branch 'master' of github.com:mapnik/mapnik into map-request 2013-02-21 14:40:07 -08:00
Dane Springmeyer
a645eb9a21 Revert "+ use boost::move to emulate 'move' semantics" 
This reverts commit fe9ff21ba9.
 2013-02-21 12:50:53 -08:00
Dane Springmeyer
dcbd92cc58 sync with master 2013-02-21 11:40:19 -08:00
artemp
fe9ff21ba9 + use boost::move to emulate 'move' semantics 
for mapnik::rule_cache objects and avoid
  dynamically allocating them.
 2013-02-21 12:50:23 +00:00
Artem Pavlenko
df0f4a22b8 Merge pull request #1723 from mapnik/fix-rule-cache 
Fix rule cache (TODO: use move semantics for rule_cache)
 2013-02-21 04:48:34 -08:00
artemp
6d037fa9ae + no need to fwd decl mapnik::Map 2013-02-21 09:07:38 +00:00
artemp
7f39420bc4 Merge branch 'master' into clipper 2013-02-21 08:55:13 +00:00
Dane Springmeyer
2648f8f49a first stab at moving mutable render request properties out of apply_to_layer 2013-02-20 19:52:54 -08:00
Dane Springmeyer
34708c4df0 throw if scale_factor == 0 instead of hanging and add rendering tests - closes #1100 2013-02-20 18:55:03 -08:00
Dane Springmeyer
2daee5ace8 Merge branch 'master' of github.com:mapnik/mapnik into fix-rule-cache 2013-02-20 18:03:05 -08:00
Dane Springmeyer
86a873857f simplify scale_denominator interface 2013-02-20 18:02:28 -08:00
Dane Springmeyer
12dfcef3a0 add support for background-image to cairo_renderer and refactor into setup function to match agg/grid renderers - closes #1724 2013-02-20 17:55:53 -08:00
Dane Springmeyer
bef8a4eef3 Merge branch 'master' of github.com:mapnik/mapnik into fix-rule-cache 2013-02-20 16:14:00 -08:00
Dane Springmeyer
7bab5b6c22 remove uneeded rule_cache property 2013-02-20 13:41:53 -08:00
Dane Springmeyer
966af84cbd move rule cache off style objects as styles should be immutable - amends 1c4b67ba98 - refs #916 2013-02-20 13:25:57 -08:00
Dane Springmeyer
a8599d7c61 remove uneeded default args to projection ctor (also fixes msvc linking) 2013-02-20 10:47:55 -08:00
Dane Springmeyer
b359a89616 make M_PI visible to msvc 2013-02-20 10:46:56 -08:00
artemp
617542c136 Merge remote-tracking branch 'origin/master' into clipper 2013-02-20 10:35:47 +00:00
Dane Springmeyer
1f7d6ff32b Merge branch 'master' of github.com:mapnik/mapnik 2013-02-19 11:36:36 -08:00
Dane Springmeyer
380f451d3a add the ability to set the cached envelope of a memory_datasource 2013-02-19 11:36:13 -08:00
artemp
90b0e65841 Merge branch 'master' into clipper 
Conflicts:
	include/mapnik/vertex_converters.hpp
 2013-02-19 09:08:17 +00:00
artemp
f3e5c57e4c + add polgon close converter 2013-02-18 17:01:38 +00:00
artemp
79ba830347 + test original (un-moded) clipper 2013-02-13 10:23:29 +00:00
artemp
56c0fb6982 + clipper based polygon clipper 
(FIXME: avoid leaking memory)
 2013-02-12 16:45:13 +00:00
Dane Springmeyer
b50330c40e make apply_to_layer public 2013-02-11 17:27:06 -08:00
artemp
ad39c9a16a + symbolizers: add hash impl 2013-02-05 16:53:20 +00:00
artemp
418af4c7a5 Merge remote-tracking branch 'origin/master' 2013-02-01 09:45:38 +00:00
Dane Springmeyer
4c66d6dda0 fix raster resampling bug - closes #1489 and fixes mapbox/tilemill#1888 2013-01-31 18:43:06 -05:00
artemp
6543ff10fd + add missing EOL 2013-01-31 13:50:45 +00:00
Dane Springmeyer
7ffde8d623 Merge branch 'master' of github.com:mapnik/mapnik into lazy-proj4 2013-01-29 02:19:00 -05:00
Dane Springmeyer
b1c1c86346 make PNG and TIFF support optional - closes #1704 2013-01-29 02:17:37 -05:00
Dane Springmeyer
515ff9ee63 clip before transformations to avoid nan and determine max latitude at compile time rather than hardcoding 85.0511 2013-01-28 15:09:24 -05:00
Dane Springmeyer
3969ac246d make proj4 able to be fully disabled at compile time - refs #1703 2013-01-28 13:45:41 -05:00
Dane Springmeyer
e7f648eceb enable lazy initialization of proj4 in rendering pipeline - refs #1703 2013-01-28 01:54:35 -05:00
Dane Springmeyer
f8b1520d1a refactor projection interface: 1. cleanup custom lonlat<->merc code. 2. centralize proj4 strings into constants, 3. tweak projection benchmarking to allocate objects in loop so we can test that specifically - refs #1703 2013-01-28 01:47:32 -05:00
Dane Springmeyer
e327880eb1 forward declare when possible 2013-01-27 23:53:37 -05:00
artemp
225362b3f6 + fix to compile in c++11/libc++ mode (clang++ 3.3) 2013-01-24 13:32:43 +00:00
Dane Springmeyer
c5837ea2b7 iwyu 2013-01-22 21:23:02 -08:00