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

2534 commits

Author SHA1 Message Date
artemp
0e5013fb03 + add feature_parser implementation 2013-05-14 14:55:08 +01:00
artemp
5d0c36fb65 Geometry/Feature parsers -truncate 'where' message in on_error handler (currently 16 chars max) 2013-05-14 14:51:28 +01:00
artemp
1e1e2d1e79 + prefer ``const& `` style (mapnik c++ style) 2013-05-14 12:31:05 +01:00
artemp
abc5d39dbd + comment out as msvc++ doesn't support 'noexcept' 2013-05-14 12:06:55 +01:00
artemp
677a0a68c6 TIFF I/O 
+ use c++ casts
+ better naming
 2013-05-13 10:25:09 +01:00
artemp
b816a47de2 + fix writing to std::stringstream 
* if seeking pass the end  - grow buffer (stringstream!)
* seekp beyond current buffer size doesn't set failbit (clang/libcxx)
 2013-05-10 14:17:31 -07:00
artemp
e9733d8a9b + fix writing to std::stringstream 
* if seeking pass the end  - grow buffer (stringstream!)
* seekp beyond current buffer size doesn't set failbit (clang/libcxx)
 2013-05-10 16:50:28 +01:00
artemp
3223836874 + potential boost::variant optimization 2013-05-10 16:45:54 +01:00
Dane Springmeyer
d36a7323ac support -fvisibility=hidden in core library - refs #1826 2013-05-09 18:22:40 -07:00
Dane Springmeyer
7c4adea08e support visibility attribute with gcc/clang - refs #1826 2013-05-09 17:07:58 -07:00
Dane Springmeyer
5bb1c067af fix build on windows by ensuring singleton base is exported (avoids inconsistent dll linkage error) 2013-05-09 17:06:41 -07:00
Dane Springmeyer
a7a106109d make mapped_memory_cache a class not struct for consistency with other singletons 2013-05-09 17:05:39 -07:00
Dane Springmeyer
e6bfd12b95 make public the singleton template to ensure it can be shared across shared library boundaries if the library is built with -fvisibility=hidden - refs #1826 2013-05-09 15:26:50 -07:00
Dane Springmeyer
36bdde82e7 no need to use MAPNIK_DECL with typedefs 2013-05-09 15:25:14 -07:00
artemp
dd0c4701c5 + hold actual values in expressions tree (experimental) 
(result gets converted to mapnik::value)
 2013-05-09 15:31:31 +01:00
artemp
6bfb92811e + make default ctor nothrow 2013-05-09 13:46:09 +01:00
artemp
39f21c16b9 mapnik::value 
to_expression_string - add missing specialization
for mapnik::value_integer and remove usage of std::stringstream
 2013-05-08 10:31:14 -07:00
artemp
656c9e724f + re-arrange expression 2013-05-08 17:21:34 +01:00
artemp
75aa6e94d8 + expression_optimizer (experimental) 
at the moment very basic ops are supported e.g

```
expr = 1+1+1 ---> expr = 3
expr = 1+1+[ATTR] ---> 2+[ATTR]

expr = [ATTR] + 1 + 1  ---> ([ATTR] + 1) + 1  ### stays unchaged
expr = [ATTR] + 1/3.14159 + 1 ---> ([ATTR] + 0.31831) + 1
```
 2013-05-08 16:54:25 +01:00
artemp
4138a70a52 mapnik::value 
to_expression_string - add missing specialization
for mapnik::value_integer and remove usage of std::stringstream
 2013-05-08 16:51:28 +01:00
artemp
b086e2d20c + small optimization - pass and return const ref 2013-05-07 16:12:57 +01:00
artemp
4915bf138e mapnik::value + add move ctor 
mapnik::feature + pass attributes by r-value.
 2013-05-07 12:04:06 +01:00
Dane Springmeyer
944eb5e2f7 rename variable for clarity 2013-05-06 12:38:41 -07:00
artemp
42d8dfa322 + add move ctor and 'canonical' assignment operator 2013-05-06 15:54:17 +01:00
artem@windows
b29fe11e35 + fix font_set::size return type 2013-05-03 16:43:25 -07:00
artemp
6490245218 + remove more cruft 2013-05-03 14:21:34 +01:00
artemp
1847ce581d box2d 
+ re-implement from_string avoiding tokenizer (~10x faster)
 2013-05-03 11:41:43 +01:00
artem@windows
29f9273d3e + msvc : fix warnings (TODO: work-in-progress) 2013-05-02 14:07:06 -07:00
artem@windows
f611892915 remove redundant header 2013-05-02 12:02:13 -07:00
artemp
43968b6c50 + c++ style : formatting 2013-04-30 18:47:17 +01:00
artem@windows
9a64415a03 use std::size_t to avoid conversion warnings 2013-04-30 10:06:47 -07:00
artem@windows
16c0b578bc c++11 
+ use std::size_t
+ re-implement envelope() method in terms of c++11
 2013-04-30 09:51:08 -07:00
artemp
95e3c87f05 + revert to using boost::math::trunc 
+ and mapnik::noncopyable

vc++ (*) doesn't support std::trunc and deleting methods in class/struct definition

* - vc++ 2012 November CTP
 2013-04-30 09:32:22 +01:00
artem@windows
abd42357d6 + add <cmath> header to keep cl.exe happy 2013-04-30 08:55:51 +01:00
Toby Collett
ac09541243 Use shared pointer reference count to track pools 
By using the shared pointer reference count to track the connections
in the connection pool we no longer have to explicitly return them
to the pool.

This resolves an issue where cursor feature sets were returning their
connections before they were done with them, causing a potential race
with another connection user.
 2013-04-29 20:33:57 +00:00
artem@windows
faa8394ef6 + add <cmath> header to keep cl.exe happy 2013-04-29 04:21:28 -07:00
artemp
58927b404c c++11 
+ replace BOOST_FOREACH with for( : )
+ remove boost/foreach.hpp
+ fix benchmarks (17,18)
 2013-04-24 16:40:35 +01:00
artemp
49fe99ac4f + make rule_cache movable 
+ use rule_cache move semantics in feature processor
 2013-04-24 10:08:10 +01:00
artemp
80c5452130 + fix phoenix functions to compile on ubuntu 12.04/c++11 
+ cleanups
 2013-04-23 14:00:08 +01:00
artemp
e38ce37ed3 * use move semantics 
* use light weight wkb_stream wrapper to avoid locale/formatting locking
 2013-04-22 15:24:47 +01:00
artemp
3f6abd3362 + backport image_reader from buffer/string from image-readers-c++11 branch 2013-04-22 11:35:09 +01:00
artemp
800ee1f0dd + c++ style 2013-04-22 09:56:48 +01:00
artemp
d215c09762 + json-generator : don't output coordinates from SEG_CLOSE command 2013-04-19 14:21:12 +01:00
artemp
ae9b518618 + fix coords precision 2013-04-19 14:13:18 +01:00
artemp
b1ea547fa9 + fix grammar to work with phoenix v3 and c++11 2013-04-19 12:10:34 +01:00
artemp
3a2b1dc027 + move preprocessor directive to the top 2013-04-19 12:00:25 +01:00
artemp
8bb6bb1d68 + fix grammar to work with phoenix v3/c++11 2013-04-19 11:59:16 +01:00
artemp
c73e48fa58 + use std::unique_ptr instead of std::auto_ptr (deprecated!) 2013-04-19 09:50:50 +01:00
artemp
a41c83fbce + png_io: disble miniz for now 2013-04-19 09:41:42 +01:00
Dane Springmeyer
60c6592c4e fix spelling of unknown 2013-04-17 14:23:04 -07:00
artemp
da6c630db9 + add webp writing support 2013-04-17 14:50:35 +01:00
artemp
868d60d765 + add getBytes() method ( needed by webp i/o) 2013-04-17 14:46:11 +01:00
artemp
cc5788e9c4 Merge branch 'master' into image-readers-c++11 2013-04-17 10:17:03 +01:00
Dane Springmeyer
294b10229e disable the hsla image-filter - not yet ready for primetime 2013-04-16 19:09:40 -07:00
artemp
9020e6f439 type_from_filename : add webp support 2013-04-16 10:56:10 +01:00
artemp
28ea89fe1c + remove const& qualifier 2013-04-12 16:03:08 +01:00
artemp
438bfad732 + factory : variadic templates based implementation ( requires c++11) 
+ image_reader : stream based reading interface (boost::iostreams)
+ register additional png and jpeg readers with following sigs :

  ```
  std::auto_ptr<mapnik::image_reader> reader(mapnik::get_image_reader(buffer,size));
  // buffer - char const*
  // size - size_t
  ```
+ initial type_from_bytes implementation (TODO: add more types)
+ python : mapnik.Image.fromstring(str) mapnik.Image.frombuffer(buf)
 2013-04-12 12:46:40 +01:00
Dane Springmeyer
5de4636be8 use mapnik::noncopyable 2013-04-10 18:15:09 -07:00
Dane Springmeyer
79a216f349 remove ltdl to reduce dependencies and because calling dlopen/LoadLibrary is easy 2013-04-09 19:37:02 -07:00
artemp
a25f1ccb56 + make image_reader non-copyable 2013-04-09 11:38:50 +01:00
artemp
a4770ac10b + cache fonts in memory 2013-04-02 13:27:05 +01:00
Daniel C. Casimiro
2080d0a986 Add a fix for compiling mapnik against boost 1.53.0. 
Qualify the call to phoenix::construct so that the compiler on RHEL6
(gcc (GCC) 4.4.6 20120305 (Red Hat 4.4.6-4)) doesn't complain. The
compiler complains that "boost::phoenix::tag::construct" is not a function.
 2013-04-01 06:08:53 -04:00
Hermann Kraus
5f137bcc28 Handle large errors in marker placement. 
Closes #1485.
 2013-04-01 05:27:13 +02:00
artemp
682635e975 + mapnik::projection add operator<< 2013-03-27 10:38:20 +00:00
Hermann Kraus
b1bc5a51b3 Apply scale factor to offsets. 2013-03-24 15:21:59 +01:00
Dane Springmeyer
f6870a6b70 correct the ltdl forward declare type 2013-03-22 19:47:57 -07:00
Dane Springmeyer
aaecd92fb6 Merge branch 'master' of github.com:mapnik/mapnik 2013-03-22 17:58:49 -07:00
Dane Springmeyer
55ec6a7942 cleanups around exception handling 2013-03-22 17:58:33 -07:00
Dane Springmeyer
f9514e5d2c formatting 2013-03-22 17:44:27 -07:00
Dane Springmeyer
3256037eb6 forward declare the lt_dlhandle type to avoid needing header in datasource_cache.hpp 2013-03-22 17:37:56 -07:00
artemp
fe092ac7a2 + implement offset 
```
offset = "<number> | <percentage>"
```
 2013-03-21 12:10:08 +00:00
artemp
542805e4d6 + support multiple color stops in colorize-alpha 
( TODO: add support for:  <color-stop>     = <color> [ <percentage> | <length> ]? )
 2013-03-20 17:21:09 +00:00
artemp
4b713f6ed0 + impl colorize-alpha image filter 
NOTE:currently linear interpolation between two colours only
  TODO:support multiple colour stops : https://developer.mozilla.org/en-US/docs/CSS/linear-gradient
 2013-03-20 15:17:41 +00:00
Dane Springmeyer
e47f3e635c remove explicit keyword on boolean to make llvm-gcc happy on os x 2013-03-19 14:10:01 -07:00
Dane Springmeyer
3b807db7e1 avoid gcc unsigned/signed comparison warning 2013-03-18 16:54:26 -07:00
Dane Springmeyer
f759964dbf c++ style 2013-03-15 16:52:02 -07:00
Dane Springmeyer
7d868558d7 fix a variety of msvc compiler warnings about signed/unsigned implicit conversion 2013-03-15 13:37:48 -07:00
Dane Springmeyer
94c5645e8b add new gamma members to agg_renderer 2013-03-14 17:15:35 -07:00
Dane Springmeyer
06803de192 iwyu 2013-03-14 15:13:02 -07:00
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
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
Dane Springmeyer
70ef017f8c move karma out of header to radically speed up compile times of files including image_filter_types.hpp 2013-01-04 00:07:57 -08:00
Dane Springmeyer
8356e4aede iwyu 2013-01-03 23:58:12 -08:00
Dane Springmeyer
cee5872b78 use new path_expression.hpp header to simplify includes 2013-01-03 20:08:14 -08:00
Dane Springmeyer
8bd685de8c fixup includes for memory_featureset.hpp 2013-01-03 20:06:34 -08:00
Dane Springmeyer
618e43af06 create path_expression.hpp and leverage to simplify and speed up compiles 2013-01-03 20:00:23 -08:00
Dane Springmeyer
bf649176ae finish move to cpp for rule class and fixup includes 2013-01-03 19:57:09 -08:00
Dane Springmeyer
100f07c5da no need to turn off stderr in enumeration since they are fatal and therefore no need for debug.hpp 2013-01-03 19:51:00 -08:00
Dane Springmeyer
e682705a86 use the std library tolower over boost::algorithm::to_lower for both better runtime and compile speed - closes #1677 2013-01-03 19:27:53 -08:00
Dane Springmeyer
c860c9165e various fixes to includes to include what is used 2013-01-03 18:06:07 -08:00
Dane Springmeyer
fa7201e01c fix -Wshadow warning 2013-01-03 18:05:40 -08:00
Dane Springmeyer
6434466ee3 fix -Wshadow warning 2013-01-03 18:03:08 -08:00
Dane Springmeyer
4843003cd2 remove uneeded semicolon 2013-01-03 18:01:09 -08:00
Dane Springmeyer
000b714eae fix more clang++ -Wshadow warnings 2013-01-03 12:37:45 -08:00
Dane Springmeyer
271e8468fd fix compile of svg output renderer 2013-01-03 12:01:14 -08:00
artemp
8da2158781 + allow configure BIGINT support (default: yes) 2013-01-03 16:23:36 +00:00
artemp
6558c5c315 + use uint8_t in get/set methods 
+ update to_string/to_hexstring
 2013-01-03 13:51:16 +00:00
artemp
7d3dca725e Revert "avoid implicit conversions between int types in mapnik::color (fixes clang++ warnings)" 
(NOTE: color compoments need to be uint8_t not uchar)

This reverts commit c51793c7e4.
 2013-01-03 12:00:06 +00:00
Dane Springmeyer
0516c6e120 line at end of file 2013-01-02 16:22:19 -08:00
Dane Springmeyer
376e90f371 remove unneeded semicolon 2013-01-02 16:22:03 -08:00
Dane Springmeyer
a651bc9940 fixup various docstrings 2013-01-02 13:56:44 -08:00
Dane Springmeyer
982a829ce2 Avoid variable shadowing 2013-01-02 13:56:24 -08:00
Dane Springmeyer
b964151200 remove unneeded use of const keyword 2013-01-02 13:56:01 -08:00
Dane Springmeyer
faec481836 use size_type correctly 2013-01-02 13:54:06 -08:00
Dane Springmeyer
bc4b5739a0 fixup docstrings 2013-01-02 13:53:10 -08:00
Dane Springmeyer
10275274d2 remove unneeded semicolon 2013-01-02 13:51:39 -08:00
Dane Springmeyer
d09c33d524 avoid variable shadowing between members and constructor args 2013-01-02 13:51:15 -08:00
Dane Springmeyer
b1eaf2f869 Avoid clang++ implicit conversion warnings (-Wconversion) 2013-01-02 13:50:05 -08:00
Dane Springmeyer
c51793c7e4 avoid implicit conversions between int types in mapnik::color (fixes clang++ warnings) 2013-01-02 13:46:41 -08:00
Dane Springmeyer
a90b31b7a7 return the correct type in attribute.get_type 2013-01-02 13:45:06 -08:00
Dane Springmeyer
2b48a97458 remove unnessary semicolon 2013-01-02 13:42:56 -08:00
Dane Springmeyer
6b7c162970 iwyu 2012-12-26 16:52:47 -08:00
Dane Springmeyer
88e970841b remove unneeded get_optional method on feature impl 2012-12-26 16:52:06 -08:00
Dane Springmeyer
00e6316ef8 Merge branch 'master' of github.com:mapnik/mapnik into bigint-feature-id 2012-12-20 17:38:01 -08:00
Dane Springmeyer
6901a4ac8c Merge branch 'master' of github.com:mapnik/mapnik 2012-12-20 14:25:24 -08:00
Dane Springmeyer
5479dfbe0e change mapnik::value::to_bool to return false if a string is empty - closes #1665 2012-12-20 14:24:56 -08:00
Dane Springmeyer
650ff20e1f ignore alpha in grid_pixfmt::blend_hiline, since we can, it will avoid compiler warnings in blend_pix, and will offer secondary protection from the bug fixed in b775636 - refs #1662 2012-12-20 14:09:01 -08:00
Dane Springmeyer
b775636858 fix grid renderer when using 64bit feature ids by avoiding overflow in the 32bit enum (which should never be used since alpha always should be == to base_mask) - refs #1662 2012-12-20 14:07:42 -08:00
artemp
6512d2873a + swap patch from @joto : http://www.remote.org/jochen/tmp/swap.patch 2012-12-20 16:36:16 +00:00
Dane Springmeyer
ed409f5f2c complete 64 bit default for grid_renderer 2012-12-19 20:08:12 -08:00
Dane Springmeyer
2a83483491 Merge branch 'master' of github.com:mapnik/mapnik into bigint-feature-id 2012-12-19 20:07:16 -08:00
Dane Springmeyer
66a5c26fdc leverage mapnik::value_integer for feature.id() and grid rendering buffer - refs #1662 2012-12-19 19:24:52 -08:00
Dane Springmeyer
326b980172 cleanup usage of grid pixel types 2012-12-19 19:19:30 -08:00
Dane Springmeyer
1a771f07c6 Add a 64 bit enabled grid type 2012-12-19 19:16:49 -08:00
Dane Springmeyer
8e9ff61190 centralize header with grid_renderer base type 2012-12-19 19:15:07 -08:00
Dane Springmeyer
c8e5094858 remove hardcoding of color_type in grid_marker_helper 2012-12-19 18:25:17 -08:00
Dane Springmeyer
3df8574c84 remove hardcoding of expected pixel types in agg svg renderer 2012-12-19 18:04:49 -08:00
artemp
b75b54a787 + fix bigint support 
+ fixup cpp tests
 2012-12-18 20:34:27 +00:00
artemp
f5dd9e53c4 + calc int_parser/generator type from mapnik::value_integer 2012-12-18 18:05:45 +00:00
artemp
e331566ac7 + wrap return value into mapnik::value_integer 2012-12-18 15:18:40 +00:00
artemp
a38b252ccd Merge branch 'master' into bigint 
Conflicts:
	plugins/input/geojson/geojson_datasource.cpp
	plugins/input/postgis/postgis_featureset.cpp
 2012-12-18 13:57:39 +00:00
artemp
e82e5e2fb3 + default to 6 digit precision in wkt generator for now 2012-12-18 12:12:43 +00:00
artemp
274fbf8f7a + ensure 'close path' handled correcly 
(currenlty SEG_CLOSE command must have valid x,y)
+ implement real_policies in wkt and geojson generators
 2012-12-18 11:44:35 +00:00
Artem Pavlenko
e7891a99ce Merge pull request #1653 from strk/master-float-scientific 
Implement scientific notation for double-to-string
 2012-12-18 02:48:29 -08:00
Dane Springmeyer
c7ed1f93d7 update svg_renderer 2012-12-17 19:13:00 -08:00
Dane Springmeyer
8d2b00ea75 fix member name 2012-12-17 13:12:31 -08:00
Dane Springmeyer
43244efb7d Merge branch 'master' of github.com:mapnik/mapnik into no-bind 2012-12-17 13:03:11 -08:00
Dane Springmeyer
14f80192df add internal noncopyable header 2012-12-17 10:32:00 -08:00
Sandro Santilli
e8b7b82bbb Implement scientific notation for double-to-string 
Also fixes tests for 1e5 expecting fixed precision rather than
scientific notation (stringstream gives scientific notation indeed)

The only still failing test now is the one having less than 16
significant digits of precision, due to the boost bug:
https://svn.boost.org/trac/boost/ticket/7785
 2012-12-17 19:29:44 +01:00
Dane Springmeyer
c5410fac7e remove bind option for datasources - refs #962 2012-12-17 10:03:07 -08:00
Dane Springmeyer
bb27156df0 use internal noncopyable class to speed up compile times slightly 2012-12-16 18:19:52 -08:00
artemp
93ad451cd1 + use mapnik::value_xxx 2012-12-14 10:25:20 +00:00
artemp
c4bae9d30a Merge branch 'master' into bigint 
Conflicts:
	bindings/python/mapnik_feature.cpp
	plugins/input/shape/dbfile.cpp
 2012-12-14 10:01:21 +00:00
artemp
bc9be37f89 Merge remote-tracking branch 'origin/master' 2012-12-13 09:35:56 +00:00
artemp
7ded35ef94 + support attribute collection policy accross renderer backends 2012-12-13 09:35:03 +00:00
artemp
dd327140f4 + add attribute collection policy 2012-12-13 09:33:55 +00:00
Dane Springmeyer
772c7f52fc knock out some msvc compiler warnings 2012-12-12 15:59:27 -08:00
Dane Springmeyer
3fd7909ba0 fix compile on windows with msvc 2010 - closes #1646 2012-12-12 15:09:07 -08:00
Artem Pavlenko
e60a3f7703 Merge pull request #1632 from strk/master-float-labels 
Fix float data conversion to string
 2012-12-12 06:21:17 -08:00
Dane Springmeyer
22b159d93d enable [attr!=null] filtering - which finishes #794 and closes #1642 - refs #796 2012-12-11 19:37:46 -08:00
Dane Springmeyer
a4f3be02b5 print null for features with value_null type in debugging output 2012-12-11 18:06:53 -08:00
Dane Springmeyer
e928c483bf properly support tolerance in shape filter_at_point - refs #1640 2012-12-11 14:46:52 -08:00
Dane Springmeyer
6b84269343 add pad method on box2d to help tighten otherwise verbose code 2012-12-11 13:56:25 -08:00
artemp
562fada9d0 + return default (value_null) if attribute is not present 2012-12-11 15:44:19 +00:00
Dane Springmeyer
574fec8403 fix includes in new trim header to allow linux compile 2012-12-07 16:30:36 -08:00
Dane Springmeyer
7c58bf9fcb replace boost::trim with faster custom trim - closes #1633 2012-12-07 14:06:13 -08:00
Dane Springmeyer
c0021d0760 remove unused iostream includes and unnecessary usage of ostringstream - refs #1055 2012-12-06 23:06:12 -08:00
Dane Springmeyer
f3c23c28c3 remove uneeded debugging prints 2012-12-06 21:20:42 -08:00
Dane Springmeyer
390706b8c7 remove all remaining stringstream usage in load_map to avoid perf hit from locale lock - refs #1055 2012-12-06 20:15:27 -08:00
Dane Springmeyer
80630e905b formatting 2012-12-06 18:46:23 -08:00
Sandro Santilli
b51b357123 Fix float data conversion to string 
Fixes precision digits, closing #430
Also avoids forcing a trailing '.0', closing #1627
 2012-12-06 12:07:48 +01:00
artemp
cd435172d4 + fix expression grammar to work with mapnik::value_integer 2012-12-06 09:51:38 +00:00
artemp
511399f3c1 + correct types 2012-12-06 09:50:36 +00:00
artemp
8fa88a71b6 Merge branch 'master' into bigint 2012-12-03 13:14:31 +00:00
artemp
855aea95e0 + mapnik::value and mapnik::parameters - initial support for 64-bit integers 2012-12-03 13:12:09 +00:00
Dane Springmeyer
7d408d523c close #1548 with explict handling of point geometries and amend 629d768eae for cairo/grid renderers to ensure proper placement on lines (refs #1604,#1350,#1607) 2012-12-02 19:53:44 -08:00
Dane Springmeyer
be05aa5b60 add palette.to_string() method and add python tests of fixed palette functionality 2012-11-30 12:31:58 -08:00
Sandro Santilli
54d75d946b Fix "whole" multi centroid computation 
Includes testcase.
Closes #1606
 2012-11-29 17:55:13 +01:00
Dane Springmeyer
363fc2ddd0 fix logic error 2012-11-28 21:18:17 -08:00
Dane Springmeyer
52c3f8ff6e disable bbox intersection testing when caching features on the fly during rendering - closes #1543 2012-11-28 20:56:08 -08:00
Dane Springmeyer
629d768eae use middle_point placement algorithm for marker POINT placement on lines - closes #1604 - refs #1350 and refs #1607 2012-11-28 19:23:56 -08:00
Dane Springmeyer
2ee6c9aca1 Merge branch 'master' of github.com:mapnik/mapnik 2012-11-28 17:48:14 -08:00
Dane Springmeyer
46f8ce3ce7 finish bringing back to life the SVG_RENDERER - now outputs geometries again - closes #1438 2012-11-28 17:45:05 -08:00
Dane Springmeyer
1f7459d29d install svg/output headers if SVG_RENDERER is requested 2012-11-28 17:21:38 -08:00
artemp
f56a365a03 + add comment 2012-11-28 19:15:48 +00:00
artemp
99141fa5e5 + support initialSize_ updates 
+ move maxSize_/initialSize_ logic into pool.hpp
 2012-11-28 17:38:18 +00:00
artemp
35fba36bcc + add getter/setter for maxSize 2012-11-28 17:04:12 +00:00
artemp
db3fd368ba + remove default args from Pool ctor 
+ use back() for brevity
 2012-11-27 12:45:07 +00:00
Dane Springmeyer
37804ed0a5 formatting 2012-11-26 16:15:28 -08:00
Dane Springmeyer
275231c410 initialize all values in markers_placement 2012-11-26 15:57:58 -08:00
Dane Springmeyer
f39c3ad857 add marker-multi-policy parameter to support user-configurable rendering behavior for multi-geometries when using either point or interior placement - closes #1573, refs #1555 2012-11-20 17:58:39 -08:00
Dane Springmeyer
eebc8cc73e add image/grid clear methods to make it easier to quickly re-use previously allocated objects for rendering - closes #1571 2012-11-11 21:35:50 -08:00
Alexandre Bonnasseau
267975c388 Coding style correction : tabs to spaces 2012-11-09 11:57:10 +01:00
Dane Springmeyer
663c5ef726 remove commented code 2012-11-08 19:12:58 -05:00
Dane Springmeyer
53c5933dbd amend 2d0bd726c3 - patch from @lightmare - refs #1557 2012-11-08 16:33:18 -05:00
Alexandre Bonnasseau
efff5f0ef0 Issue #1545 - override buffer-size parameter at layer level - revised 2012-11-08 15:51:22 +01:00
Dane Springmeyer
2d0bd726c3 remove uneeded loop in no alpha octree encoding - refs #1557 2012-11-06 12:38:58 -05:00
Dane Springmeyer
6b155dbc85 format as per mapnik c++ style 2012-11-06 11:53:23 -05:00
Dane Springmeyer
211b102ec5 support writing full color png with rgb only (no alpha) - closes #1559 2012-11-06 11:44:44 -05:00
Dane Springmeyer
2446e573c9 remove unused alpha handling code in octree originally added in 201461e8c9 but made redundant in b3711b07d1 2012-11-06 09:37:06 -05:00
Dane Springmeyer
cd3cc31752 support writing rgb (no a) images with miniz - refs #1554 2012-11-06 09:19:40 -05:00
Dane Springmeyer
5a99d7fbdb add miniz support - closes #1554 2012-11-04 07:10:05 -05:00
Dane Springmeyer
a1e00cc374 mapnik c++ style 2012-11-04 06:13:17 -05:00
Dane Springmeyer
d97d8c35a3 formatting 2012-11-01 14:52:02 -07:00
Dane Springmeyer
fb10c670bc renable value_type for coord_transform (needed for SVG_RENDERER) - patch from michael_us (mapniknet project) 2012-11-01 10:47:49 -07:00
Dane Springmeyer
2cf429db08 start disabling svg_renderer features to get closer to compiling - refs #1438 2012-11-01 10:05:50 -07:00
Dane Springmeyer
82b15bdd68 be more explicit about unsigned type for rgba_palette::quantize 2012-10-30 16:55:06 -07:00
Dane Springmeyer
9040d2ac9d fix feature-cache for rasters - TODO: no intersection check option for memory_featureset 2012-10-26 18:18:35 -07:00
Mickey Rose
c3702404cb image_filter: make 'gray' and 'invert' filters honor alpha 2012-10-20 00:08:23 +02:00
Mickey Rose
b335d5ea8e image_filter: extract apply_filter boilerplate, pass filter by reference 2012-10-19 22:05:40 +02:00
Dane Springmeyer
1c9aa5bc09 remove debugging print - refs #1477 2012-10-16 12:23:26 -07:00
Dane Springmeyer
c53b6075eb properly set MAPNIK_DECL for mapnik::rule - closes #1527 2012-10-10 12:35:02 -07:00
Dane Springmeyer
ccda92fed1 Revert "finish moving symbolizers out of rule" 
This reverts commit 20a317860d.
 2012-10-10 10:51:06 -07:00
Dane Springmeyer
1f11aeb95a Revert "move symbolizers typedef out of rule and be explicit about including config.hpp for MAPNIK_DECL - refs #1527" 
This reverts commit bf5ffd04f4.
 2012-10-10 10:50:56 -07:00
Dane Springmeyer
20a317860d finish moving symbolizers out of rule 2012-10-10 10:02:45 -07:00
Dane Springmeyer
bf5ffd04f4 move symbolizers typedef out of rule and be explicit about including config.hpp for MAPNIK_DECL - refs #1527 2012-10-10 09:32:29 -07:00
Dane Springmeyer
fb10f58357 shuffle color function 2012-10-04 17:59:34 -07:00
Dane Springmeyer
a6129e9a80 add premultiply/demultiply methods for mapnik::color - refs #1519 2012-10-04 13:53:58 -07:00
artemp
3072b3f581 Merge remote-tracking branch 'origin/master' 2012-10-04 12:17:07 +01:00
artemp
eaf6049909 + template on geometry/path concept 2012-10-04 12:15:51 +01:00
Dane Springmeyer
c27530ec7b remove inefficient and no longer used mapnik::raster constructor - refs #1516 2012-10-03 18:22:18 -07:00
Dane Springmeyer
f4ead94c37 make raster non-copyable 2012-10-03 15:40:43 -07:00
Dane Springmeyer
24adb81390 c++ style 2012-10-03 14:58:12 -07:00
Dane Springmeyer
05195ca68d Merge pull request #1444 from sigmapi/issue1107 
Fix for issue #1107
 2012-10-03 13:06:45 -07:00
Dane Springmeyer
e11650fd84 c++ style 2012-10-03 13:06:30 -07:00
Dane Springmeyer
86e805b33e Merge pull request #1499 from manelclos/master 
Query tolerance for features_at_point
 2012-10-03 11:50:29 -07:00
Dane Springmeyer
2e737e07b2 alternative mapnik::raster constructor that allows less copying - refs #1508 2012-10-02 21:46:31 -07:00
Dane Springmeyer
798b101f0c finish #1512 and adjust tests to use new parameter 2012-10-01 17:09:28 -07:00
Dane Springmeyer
09726626cf add 'premultiplied' property on raster symbolizer to allow user to control (in rare cases) the premultiplied status of images in cases where tiffs mis-report it - closes #1512 2012-10-01 16:14:41 -07:00
Dane Springmeyer
ef28a1db80 cleanup includes in rule/feature_style_processor and move code to rule.cpp and raster_symbolizer.cpp 2012-10-01 15:01:12 -07:00
artemp
d1eefb63b1 Merge remote-tracking branch 'origin/master' 2012-10-01 16:59:01 +01:00
artemp
d24175e80e + style : assigment init for built-in types 2012-10-01 16:57:31 +01:00
artemp
f03e08bbba + make rewind() const 2012-10-01 15:45:30 +01:00
artemp
30f14e0878 Merge branch 'master' into conv_simplify 2012-10-01 10:21:56 +01:00
artemp
b9fed932b9 + template vertex_iterator on path_type 
+ rename vertex_iterator to path_iterator
 2012-10-01 10:20:10 +01:00
artemp
780ea26af3 Merge remote-tracking branch 'origin' into conv_simplify 2012-09-28 19:49:01 +01:00
artemp
3ffe8ec21c + add premultiplied_alpha flag to mapnik::raster 2012-09-28 16:43:05 +01:00
artemp
77e585895f + add premultiplied_alpha method to image_reader 
* tiff - TIFFTAG_EXTRASAMPLES
  * png  - non-premultiplied alpha (http://www.libpng.org/pub/png/spec/1.1/PNG-Rationale.html)
  * jpeg - no-alpha channel, ensure pre-multiplied model
 2012-09-28 16:37:21 +01:00
Manel Clos
8f7083d14d Add tolerance parameter to features_at_point 
Make map.query_point() always pass tolerance to datasources
 2012-09-28 15:12:10 +02:00
artemp
02e7aef9c9 + restore g++/darwin fix - #1507 2012-09-28 09:43:29 +01:00
artemp
bb27ab5d1b + formatting 2012-09-27 16:09:20 +01:00
artemp
2427daa403 + make WKT generator templated on geometry type - the goal is to be able 
to use generator for any type that implements 'vertex' concept
 2012-09-27 16:07:14 +01:00
artemp
42bcf4ea98 + make WKT generator templated on geometry type - the goal is to be able 
to use generator for any type that implements 'vertex' concept
 2012-09-27 16:04:29 +01:00
artemp
03315ff893 + formatting 2012-09-27 16:03:21 +01:00
artemp
8228d99186 + cleanups: use preincrement iterators in for loop etc .. 2012-09-27 16:02:14 +01:00
artemp
a537c58afa + work-in-progress.. 2012-09-26 14:26:12 +01:00
artemp
09d11122d5 Merge branch 'master' into conv_simplify 2012-09-18 10:36:14 +01:00
Dane Springmeyer
91a932d7e9 declare windows symbols for wkt and json parsing - closes #1491 2012-09-17 15:28:05 -07:00
artemp
01ae1a179d Merge branch 'master' into conv_simplify 2012-09-17 11:35:15 +01:00
Dane Springmeyer
ad8e4e4cc7 Merge pull request #1366 from mapnik/debugsymbolizer 
Debug Symbolizer
 2012-09-14 16:43:38 -07:00
Dane Springmeyer
56585d11d9 when using style level compositing or image filters still trigger style processing callbacks even if we return without querying the data if there are active rules - closes #1477 2012-09-14 16:13:37 -07:00
Dane Springmeyer
1b3dcda87d add method off style to check for active rules 2012-09-14 16:11:37 -07:00
Dane Springmeyer
8cfb40ae2f refactor fontsets making them optional on the symbolizer and removing the dangerous default contructor - closes #1483 (TODO - consider modifying insert_fontset to only take single arg of fontset instance) 2012-09-14 14:17:45 -07:00
artemp
d42c88ab4a + check sleve_cont has at least two vertices 2012-09-14 13:12:53 +01:00
artemp
820a0e92ab + discard 'almost' adjacent vertices 
+ enforce 'min_size' in output path
 2012-09-13 15:41:51 +01:00
artemp
06bae0a76c + zhao-saalfield intial impl (TODO: optimize) 2012-09-12 15:20:33 +01:00
artemp
29423cfc1c Merge branch 'master' into conv_simplify 
Conflicts:
	bindings/python/mapnik_markers_symbolizer.cpp
	plugins/input/ogr/ogr_index_featureset.cpp
	plugins/input/shape/dbfile.cpp
	plugins/input/shape/shapefile.hpp
	src/load_map.cpp
 2012-09-07 16:46:02 +01:00
artemp
967d6110bf + singleton: return ref from instance() method 2012-09-07 16:23:03 +01:00
artemp
11e6ba0c09 + make client methods non-static in classes derived from 
mapnik::singleton<> (TODO: apply to all)
+ ensure client methods are accessed through instance() method
 2012-09-07 14:56:30 +01:00
artemp
8fa0742a53 + make client methods non-static in classes derived from 
mapnik::singleton<> (TODO: apply to all)
+ ensure client methods are accessed through instance() method
 2012-09-07 14:51:25 +01:00
artemp
5f8bb423e8 Merge branch 'conv_simplify' of git://github.com/kkaefer/mapnik into kkaefer-conv_simplify 2012-09-06 13:12:39 +01:00
artemp
a513d3f97d + code: avoid exposing unsafe static methods in datasource_cache ( #1451) 
+ python: remove redundent 'instance' method (mapnik.DatasourceCache)
+ python: reflect plugin_directories method
+ tests: update python usage

TODO: consider using similar approach in FontEngine etc..
TODO: consider returning reference from singleton::instance() to
      safeguard from accidental deleting a 'singleton' pointer
 2012-09-05 12:53:37 +01:00
Hermann Kraus
786f798cab Use double instead of unsigned while parsing XML. 
Closes #1469.
 2012-09-05 02:15:58 +02:00
Dane Springmeyer
f29726edf1 no need for a default message for datasource_exception 2012-09-03 11:41:51 -07:00
Dane Springmeyer
551f1e0c66 c++ style 2012-09-03 10:52:36 -07:00
Dane Springmeyer
a12b8f1d2f c++ style 2012-09-03 10:27:48 -07:00
Dane Springmeyer
56ae40d059 c++ style 2012-09-03 10:02:39 -07:00
Dane Springmeyer
90391f3bee remove unused typedef 2012-08-29 18:39:16 -07:00
Colin Rundel
bd5df80f75 Minimal roll back const changes 
Changes to expression_ptr and path_expression_ptr are causing runtime issues with the python bindings
 2012-08-29 16:41:48 -04:00
Colin Rundel
dc3763885c More parser clean up - color parser 
Dropped color_factory class in favor of single color_parser function. Moved implementation to new color_factory.cpp since it is odd to have two headers (color.hpp, color_factory.hpp) and only one source file.
 2012-08-29 16:41:48 -04:00
Colin Rundel
10001f1d4b Expression parsing simplification 
Similar idea to path expression parsing cleanup
 2012-08-29 16:41:44 -04:00
Colin Rundel
1d0c817170 Make path_expression_ptr have const contents, cleanup 2012-08-29 16:41:43 -04:00
Colin Rundel
0e5f71408e Simplified path_parse implementation 
path_parse and path_parse_from_string were redundant, replaced with overloaded path_parse function to achieve the same functionality.

Additional consistency cleanup in load_map.cpp.
 2012-08-29 16:41:43 -04:00
Dane Springmeyer
de5970f45e shuffle the mapnik::hue_to_rgb method - no need for it to be in the cpp file 2012-08-28 20:08:43 -07:00
Konstantin Käfer
ae865a59fb Merge branch 'master' into conv_simplify 
Conflicts:
	include/mapnik/vertex_converters.hpp
 2012-08-28 20:37:27 +02:00
Dane Springmeyer
f348d177ee fix the include install directory nesting 2012-08-27 18:54:08 -07:00
Dane Springmeyer
a56c63bed1 start installing agg headers so that c++ programs using mapnik can use more of the mapnik api - closes #1383 2012-08-27 18:45:04 -07:00
Dane Springmeyer
83e2bc70ff include what you use 2012-08-27 18:39:33 -07:00
Dane Springmeyer
c9bd0c8e51 Merge branch 'master' of github.com:mapnik/mapnik 2012-08-27 17:59:14 -07:00
Dane Springmeyer
5120d0398d add build file for headers and svg/output code directories to hold the svg_renderer used for output - refs #1438 2012-08-27 17:58:49 -07:00
Colin Rundel
12f2c247b3 Added set_name to font_set class 2012-08-27 16:09:29 -04:00
Dane Springmeyer
c7c8c468ab apply patch from @rundel to make color grammar more modular (TODO - do this with all grammars) - closes #1440 2012-08-26 17:50:30 -07:00
Dane Springmeyer
fa0678cc5a json generator: fix escape chars as per json spec, which is a subset of c/c++ 2012-08-25 11:24:45 -07:00
Konstantin Käfer
fd3aa8a01a Merge branch 'expose_feature_style_processor' into conv_simplify 2012-08-25 15:02:18 +02:00
Konstantin Käfer
7c9700237f move feature_style_processor to an implementation header file 
This allows other applications to create custom instances of the feature_style_processor with their own template arguments without forcing freuquent recompiles in mapnik itself
 2012-08-25 13:35:41 +02:00
Panagiotis Skintzos
e34dc99f3a Exposed the label collision detector outside of Cairo renderer and added Python bindings (issue #1107) 2012-08-25 11:43:31 +02:00
Konstantin Käfer
13c46b6cc6 Merge branch 'master' into conv_simplify 
Conflicts:
	bindings/python/mapnik_line_symbolizer.cpp
	bindings/python/mapnik_polygon_symbolizer.cpp
 2012-08-24 23:29:43 +02:00
Konstantin Käfer
4e1423cefe Merge branch 'master' of git://github.com/mapnik/mapnik into conv_simplify 
Conflicts:
	src/cairo_renderer.cpp
 2012-08-24 23:24:31 +02:00
Dane Springmeyer
13bcd3f17f now working on mapnik v2.2.0-pre 2012-08-23 15:19:56 -07:00
Dane Springmeyer
a25aac80f7 setting up for mapnik v2.1.0 release 2012-08-23 14:50:36 -07:00
Dane Springmeyer
c0539406d8 fix includes post bf3efbeab8 - refs #1435 2012-08-23 11:34:13 -07:00
Dane Springmeyer
a3254965fe double csv parsing speeds when handling wkt encoded geometries - refs #1436 2012-08-23 09:07:06 -07:00
Dane Springmeyer
bf3efbeab8 move image filter grammar to cpp and re-use in load map by attaching to xml_tree - closes #1435 2012-08-23 08:13:22 -07:00
Dane Springmeyer
ce03b3599b expose svg output for geometries - refs #1437 (TODO: support svg_multi_generator) 2012-08-22 19:13:37 -07:00
Dane Springmeyer
fc63bd0d24 avoid compile error due to namespace clash with wkt generator - refs #1437 2012-08-22 19:11:01 -07:00
Dane Springmeyer
23808b0523 finish full back comptibility for raster-mode - refs #1206 and #1432 2012-08-22 18:09:01 -07:00
Dane Springmeyer
6edbec86d9 apply patch from @lightmare to better hanle 2 point geometries - refs #1425 2012-08-22 13:34:31 -07:00
Dane Springmeyer
a02801beb9 geometry.hpp does not need to use geom_util.hpp - this include cleanup exposed #1430 2012-08-22 13:27:44 -07:00
Dane Springmeyer
948531e9d0 fix namespacing for wkt generator code - refs #1330 2012-08-22 09:54:01 -07:00
Dane Springmeyer
e8101a070a partially repair backward compatibility in python for 'marker-type' - refs #1427 and #1285 2012-08-21 16:36:15 -07:00
Dane Springmeyer
0eff77c03e return without rendering if label placement algorithm returns false indicating a degenerate geometry - closes #1423 and refs #1424 2012-08-21 12:51:39 -07:00
Dane Springmeyer
a75014c056 convert interior_position to return bool 2012-08-21 11:23:36 -07:00
Dane Springmeyer
b76c8e5c64 +reflect building symbolizer in python 2012-08-20 18:17:00 -07:00
Dane Springmeyer
55646ce236 fix group_by on layer to be std::string const& and reflect in python 2012-08-20 16:26:41 -07:00
Mickey Rose
5ca715c1e0 transform expressions: disallow space-separated compound arguments, refs #1389 2012-08-19 19:30:51 +02:00
artemp
9810557cdc + geojson geometry parser implementation 2012-08-17 12:47:41 +01:00
artemp
21f86761a7 + json: split feature_grammar into geometry and feature grammars 2012-08-17 11:25:21 +01:00
Dane Springmeyer
372f384365 fix typo: missing comma in severity enum 2012-08-16 16:09:52 -07:00
Dane Springmeyer
a986aedd05 remove 'info' and 'fatal' severities for logging to simplify framework - closes #1400 2012-08-16 15:52:32 -07:00
Konstantin Käfer
b243f03c90 use a set to make visvalingam a lot faster 2012-08-16 22:26:58 +02:00
Dane Springmeyer
bfc92a469c fix and doc out behavior of register_fonts 2012-08-16 12:29:13 -07:00
Konstantin Käfer
22150f908f add facilities to choose the simplification algorithm 2012-08-16 16:53:38 +02:00
Konstantin Käfer
eace6eeb2b don't crash on empty geometries 2012-08-16 15:59:05 +02:00
Dane Springmeyer
c7c8d910c4 fix linking with svg2png on windows - closes #1375 2012-08-15 19:16:11 -07:00
Dane Springmeyer
de3afda3bc remove css_color_grammar_deprecated.hpp 2012-08-15 16:59:22 -07:00
Dane Springmeyer
4cf1484b53 disable colorize-alpha comp-op as per #1371 2012-08-15 14:46:58 -07:00
Dane Springmeyer
71e0edc7bf forward declare CoordTransform in map.hpp 2012-08-15 10:33:31 -07:00
Dane Springmeyer
2b108b7cdb fixup includes 2012-08-15 10:26:20 -07:00
artemp
a991c73a98 + geojson grammar : close linear_rings 2012-08-15 16:53:28 +01:00
artemp
c4765d72ce + close linear_rings in WKT parser 2012-08-15 16:42:46 +01:00
artemp
aecf0531f5 + remove metawriters for the upcoming 2.1 release 2012-08-15 09:47:03 +01:00
Dane Springmeyer
7a5f06656c allow setting marker width/height together with transform 2012-08-14 17:11:08 -07:00
artemp
34ce663460 + change agg-stack-filter grammar to expect fun(a,b) notation 2012-08-14 20:03:49 +01:00
artemp
8d14ac7e00 + use comma and space as delimiters 2012-08-14 19:57:28 +01:00
Konstantin Käfer
483ba77084 otf visvalingam/whyatt simplification 2012-08-14 20:40:37 +02:00
Konstantin Käfer
dcd7a07c8e simplify-tolerance property boilerplate 2012-08-14 17:04:57 +02:00
Dane Springmeyer
e2b3322934 use typedef for color_type 2012-08-13 11:26:34 -07:00
artemp
b05344863a + implement markers_dispatch to match AGG output 2012-08-09 17:46:55 +01:00
artemp
973bc00fd7 + correct types 2012-08-09 12:41:08 +01:00
artemp
67b93fac50 + geojson generator : allow empty properties 2012-08-08 16:00:01 +01:00
Dane Springmeyer
cf192ee771 further refactoring of marker_helpers to help set up for using from grid renderer 2012-08-06 11:39:09 -07:00
Dane Springmeyer
53c873ca49 make public the grid_renderer buffer type like AGG renderer 2012-08-06 11:37:27 -07:00
Dane Springmeyer
9284c6369d correct rendering behavior of marker-opacity, which should not, as per svg, override fill-opacity and stroke-opacity but should combine with it 2012-08-03 14:14:03 -07:00
artemp
9e95d88acd + make typedefs public 2012-08-03 15:39:20 +01:00
artemp
5f26d82ca2 + correct typedef logic (avoid redefining types) 2012-08-03 15:38:02 +01:00
Dane Springmeyer
8ea21d866d move more code to marker_helpers.hpp to set up for grid impl of new markers code - refs #1282 2012-08-02 22:52:21 -07:00
Dane Springmeyer
e62739d146 fix render_marker for grid renderer and other minor syncing - refs #1309 2012-08-02 13:10:05 -07:00
Dane Springmeyer
6f15731c37 use std::fixed when outputting bbox's to string 2012-08-01 16:40:06 -07:00
artemp
5541ea0271 + layer : minimum-extent and buffer-size 
+ agg::process_xxx : remove ad-hoc query_extent modifiers
+ ctrans : simplify vertex skipping
 2012-08-01 15:44:36 +01:00
artemp
2dcf940853 Merge remote-tracking branch 'origin/master' 2012-08-01 14:00:36 +01:00
artemp
fc6a22c014 + c++ style 2012-08-01 11:07:45 +01:00
Dane Springmeyer
16084ff335 support both interior placement and point for markers - helps prepare for #952 2012-07-31 18:13:50 -07:00
Dane Springmeyer
9d9c525de0 revert 1dfde78 and properly avoid clipping for point type geometries in markers_symbolizer while moving markers_placement to cpp file to avoid overhead of declaring all possible permutations of vertex convertors - closes #1341 2012-07-31 17:27:52 -07:00