Commit graph

2185 commits

Author SHA1 Message Date
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
Dane Springmeyer
3149c8db3d fixup a few includes around text formatting 2013-01-21 17:05:33 -08:00
Dane Springmeyer
ba6f3cf2ca include cleanup around symbolizer helpers 2013-01-21 14:32:28 -08:00
Dane Springmeyer
70008ca781 iwyu 2013-01-21 14:15:08 -08:00
Dane Springmeyer
9f28010f53 avoid taking const& to a copy (which is what is returned from geom.envelope() currently) 2013-01-21 11:14:32 -08:00
artemp
1ef9ec2b88 + use std::deque for caching features. 2013-01-18 12:27:29 +00:00
artemp
dc19a6ab27 + use std::deque instead of std::vector and avoid
expenssive re-alloc's
2013-01-18 11:45:20 +00:00
Dane Springmeyer
e16567fecb fixup std:: prefixing of cmath functions - closes #1694 2013-01-17 13:53:48 -08:00
Dane Springmeyer
769b15e42a use std::fabs for clarity - refs #1694 2013-01-17 13:13:33 -08:00
Dane Springmeyer
0ab900bc64 iwyu 2013-01-17 13:12:32 -08:00
Dane Springmeyer
d0e375b25c Merge branch 'master' of github.com:mapnik/mapnik 2013-01-17 13:02:03 -08:00
Dane Springmeyer
3ef93f8684 fix incorrect float rounding - closes #1693 - refs #1694 2013-01-17 13:00:54 -08:00
Dane Springmeyer
038159385b minor syntax cleanups to markers placement - no functional change 2013-01-17 12:45:10 -08:00
artemp
b438eec762 + implement from std::string extractor to minimize
usage of boost::lexical_cast
2013-01-17 14:21:11 +00:00
artemp
95f631f0ff + xml_attribute_cast
NOTE: will throw for types that don't have explicit specialization
      it's ok to use boost::format in err branch of code
2013-01-16 12:40:25 +00:00
Dane Springmeyer
18e23be9c0 merge work from mappy/abonnasseau allowing buffer-size to be overiddend by layer - closes #1566 2013-01-15 18:53:34 -08:00
Dane Springmeyer
2d340a296f clean up spirit headers to avoid usage of non-standard/non-futureproof spirit/home path - refs #1658 2013-01-15 14:32:29 -08:00
Dane Springmeyer
4bfc9f7cca Merge branch 'master' of github.com:mapnik/mapnik 2013-01-15 11:01:17 -08:00
artemp
00d71dd40d Merge remote-tracking branch 'origin/master' 2013-01-15 14:15:40 +00:00
artemp
982aed825f + implement string2bool converters 2013-01-15 14:12:43 +00:00
artemp
f1d142a3c1 + cleanup 2013-01-15 14:06:15 +00:00
artemp
e4bc9cab8d + cleanup 2013-01-15 14:05:40 +00:00
Dane Springmeyer
0ce8518a8d iwyu 2013-01-14 19:46:01 -08:00
Dane Springmeyer
ae18d0f4f7 iwyu 2013-01-14 19:45:14 -08:00
Dane Springmeyer
2aeb0da813 iwyu - fixes msvc compile 2013-01-14 10:23:14 -08:00
Dane Springmeyer
9480ffb2b3 avoid fwd declare of variant in params.hpp to avoid an excessive amount of cpp files needing variant.hpp directly 2013-01-13 22:00:03 -08:00
Dane Springmeyer
6859bea499 iwyu 2013-01-13 21:48:56 -08:00
Dane Springmeyer
2209b1e542 iwyu 2013-01-12 21:10:10 -08:00
Dane Springmeyer
88e8a67ded remove unused variable 2013-01-12 21:10:01 -08:00
Dane Springmeyer
bbcd53c6f4 refactor headers involving variant attempting to move as much variant usage out of hpp files to speed up compiles 2013-01-12 21:00:45 -08:00
Dane Springmeyer
1f9d863a11 remove seemingly unused function in enumeration header which breaks with msvc - closes #1686 2013-01-10 21:02:12 -08:00
Dane Springmeyer
5440594e0c fix grid rendering in 32 bit (non bigint) mode 2013-01-10 20:57:37 -08:00
Dane Springmeyer
40c51089af we only need two integer signatures for to_string if BIGINT is defined 2013-01-10 20:57:02 -08:00
Dane Springmeyer
f6805944fb iwyu 2013-01-10 19:52:01 -08:00
Dane Springmeyer
6b2b66b894 fix handling/install of sparsehash headers 2013-01-10 09:39:43 -08:00
Dane Springmeyer
c39ec51793 fix compile with g++ on linux 2013-01-09 19:20:05 -08:00
Dane Springmeyer
bb43f2cec1 refactor params interface to move lexical cast out of header 2013-01-09 19:12:20 -08:00
Dane Springmeyer
eecab1b22b move jpeg callback functions to jpeg_detail namespace to avoid conflict with mapnik::boolean 2013-01-09 18:59:29 -08:00
Dane Springmeyer
7aab2bca4f iwyu 2013-01-09 16:45:37 -08:00
Dane Springmeyer
7d62c3e8ba add missing function declaration in image_util.hpp (was orphaned in cpp file) 2013-01-09 12:47:17 -08:00
Dane Springmeyer
4468aaa082 remove commented, old cairo RefPtr line 2013-01-09 11:12:20 -08:00
artemp
f25d4d9279 + implement cairo_context wrapper and remove unnecessary dependencies
( cairomm, libsigc++)
2013-01-09 17:00:30 +00:00
Dane Springmeyer
0121f53f56 refactor and speed up hextree image encoding by using dense_has_map - refs #1629 2013-01-08 19:07:11 -08:00
Dane Springmeyer
339e23d63e speed up compile of image_util.hpp 2013-01-08 18:40:22 -08:00
Dane Springmeyer
f315a87874 further cleanup of expression related headers 2013-01-08 15:12:39 -08:00
Dane Springmeyer
135c0ab162 fix compile with g++/linux 2013-01-08 15:05:05 -08:00
Dane Springmeyer
9ec6df4898 Add new header 2013-01-08 14:18:01 -08:00
Dane Springmeyer
b5c06965ac refactor expression and value type usage to speed up compile time 2013-01-08 14:17:31 -08:00
Dane Springmeyer
501fd64194 remove boost::property_map, which is unneeded in new context interface 2013-01-07 12:33:20 -08:00
Dane Springmeyer
ca41be2372 fixup forward declares - amends 2d7c7fed9b 2013-01-06 11:56:35 -08:00
Dane Springmeyer
c3e941f0b8 iwyu 2013-01-04 14:39:00 -08:00
Dane Springmeyer
cc431505e0 fix #1487 (marker placement when spacing < width) and add tests 2013-01-04 13:42:13 -08:00
Dane Springmeyer
3304841009 move type conversions code fully to cpp file to reduce compile times across code base 2013-01-04 09:27:39 -08:00
Dane Springmeyer
a01a998aff reduce unneeded usage of boost in sql_utils.hpp 2013-01-04 09:26:22 -08:00
Dane Springmeyer
59dace25db move base value type definitions to separate header to enable basic types to be includes without full overhead of value conversions 2013-01-04 09:25:56 -08:00
Dane Springmeyer
648105c2c4 move params impl to cpp to avoid overhead of lexical cast header compile which would otherwise be included implicitly in every datasource plugin 2013-01-04 09:24:35 -08:00
Dane Springmeyer
39f0d52090 iwyu 2013-01-04 09:18:40 -08:00
Dane Springmeyer
2d7c7fed9b use more forward declares in renderer headers to speed up compiles of process cpp files 2013-01-04 09:17:58 -08:00
Dane Springmeyer
c705fbff80 iwyu 2013-01-04 09:16:11 -08:00
Dane Springmeyer
815b79a80a add specialized quote trimming functions (will be used in sql_utils.hpp) 2013-01-04 09:15:45 -08:00
Dane Springmeyer
85dc3413e5 only include debug.hpp if needed 2013-01-04 09:14:57 -08:00
Dane Springmeyer
e7b2c58500 fixup includes in map.hpp 2013-01-04 09:13:45 -08:00
Dane Springmeyer
dc8a5cc23a iwyu 2013-01-04 00:21:22 -08:00
Dane Springmeyer
48603669f6 remove unneeded includes 2013-01-04 00:20:21 -08:00
Dane Springmeyer
900b6172bf iwyu 2013-01-04 00:20:08 -08:00
Dane Springmeyer
eb15d0bd8a iwyu 2013-01-04 00:18:53 -08:00
Dane Springmeyer
fd6381dc69 move feature_ptr typedef to feature.hpp to enable access without complexity of datasource header 2013-01-04 00:18:08 -08:00
Dane Springmeyer
c7ae161659 iwyu 2013-01-04 00:13:40 -08:00
Dane Springmeyer
9c3dba905b iwyu 2013-01-04 00:12:46 -08:00
Dane Springmeyer
09c8b876fd remove unused include 2013-01-04 00:12:25 -08:00