Dane Springmeyer
|
dcbd92cc58
|
sync with master
|
2013-02-21 11:40:19 -08: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
|
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
|
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
|
966af84cbd
|
move rule cache off style objects as styles should be immutable - amends 1c4b67ba98 - refs #916
|
2013-02-20 13:25:57 -08:00 |
|
artemp
|
617542c136
|
Merge remote-tracking branch 'origin/master' into clipper
|
2013-02-20 10:35:47 +00: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
|
747305253c
|
+ link clipper obj's into core lib
|
2013-02-19 10:06:59 +00:00 |
|
artemp
|
50069cb094
|
+ avoid unnecessary const_cast<>
|
2013-02-12 19:54:36 +00:00 |
|
artemp
|
b247082b78
|
+ avoid unnecessary const_cast<>
|
2013-02-12 19:53:16 +00:00 |
|
Dane Springmeyer
|
9520f58c5a
|
throw if we cannot detect image extension instead of failing silently
|
2013-02-08 17:14:39 -08:00 |
|
Dane Springmeyer
|
19e52c0136
|
rename simplify-tolerance -> simplify to match clip/smooth params
|
2013-02-05 15:48:16 -08:00 |
|
Dane Springmeyer
|
41772edbd7
|
support reading raster-colorizer properties off of raster symbolizer as well as in standalone child element
|
2013-02-01 16:32:48 -05:00 |
|
Dane Springmeyer
|
4c66d6dda0
|
fix raster resampling bug - closes #1489 and fixes mapbox/tilemill#1888
|
2013-01-31 18:43:06 -05:00 |
|
Dane Springmeyer
|
1ccd250980
|
iwyu
|
2013-01-30 12:32:20 -05:00 |
|
Dane Springmeyer
|
92b0e43d87
|
remove mutex around pj_transform
|
2013-01-29 03:36:38 -05:00 |
|
Dane Springmeyer
|
751258749a
|
Merge branch 'master' of github.com:mapnik/mapnik
|
2013-01-29 03:31:16 -05:00 |
|
Dane Springmeyer
|
98e974e956
|
fix ifdef logic
|
2013-01-29 03:30:01 -05: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
|
cf11a27a22
|
remove hardcoded define to enable proj4
|
2013-01-29 02:03:04 -05:00 |
|
Dane Springmeyer
|
b1581a1942
|
fall through to using proj4 if we do not have a known transformation
|
2013-01-28 15:10:24 -05:00 |
|
Dane Springmeyer
|
cda43b42ae
|
throw if attempting to transform between projections that require proj4 support if proj4 is not compiled in
|
2013-01-28 14:03:07 -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
|
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
|
95b29f82b1
|
iwyu
|
2013-01-27 23:54:31 -05:00 |
|
Dane Springmeyer
|
e327880eb1
|
forward declare when possible
|
2013-01-27 23:53:37 -05:00 |
|
Dane Springmeyer
|
790be266f8
|
iwyu
|
2013-01-24 22:04:17 -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
|
84197b1b98
|
speed up snprintf double to string by removing unused code but default to using karma for now given it is more future proof - followup to #1697
|
2013-01-21 10:25:27 -08:00 |
|
Dane Springmeyer
|
ccd9acfecc
|
default to fast, simple, and correct (per ostringstream) to_string conversions fully removing boost::lexical_cast, disabling karma, and fixing up tests
|
2013-01-19 10:12:32 -08:00 |
|
Dane Springmeyer
|
e16567fecb
|
fixup std:: prefixing of cmath functions - closes #1694
|
2013-01-17 13:53:48 -08:00 |
|
artemp
|
eb8b2552ef
|
+ update xml_tree to use xml_attrinbute_cast and remove fast_cast
|
2013-01-16 12:42:20 +00:00 |
|
artemp
|
1b3ef49377
|
+ remove unnecessarily checks
|
2013-01-16 10:51:45 +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
|
24463d0f25
|
workaround boost::error_cant_deduce_type error when building against boost trunk (currently 1_53) - refs #1658
|
2013-01-15 17:12:53 -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
|
d718e95ed6
|
use std::strlen not strlen from c
|
2013-01-15 13:32:09 -08:00 |
|
artemp
|
b4723b6dd1
|
+ fix typo
|
2013-01-15 14:34:38 +00:00 |
|
artemp
|
96857ca291
|
+ wrap xml_attribute.value into std::string to avoid crashes
when linking to libc++ on os x (TODO)
|
2013-01-15 14:14:47 +00:00 |
|
artemp
|
e8cc64a9a7
|
+ fast_cast to mapnik::boolean specialization
|
2013-01-15 14:14:08 +00:00 |
|
artemp
|
982aed825f
|
+ implement string2bool converters
|
2013-01-15 14:12:43 +00:00 |
|
Dane Springmeyer
|
dca04fc9d4
|
iwyu
|
2013-01-13 22:02:18 -08:00 |
|
Dane Springmeyer
|
071c67d438
|
iwyu
|
2013-01-13 22:01:13 -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
|
40c51089af
|
we only need two integer signatures for to_string if BIGINT is defined
|
2013-01-10 20:57:02 -08:00 |
|
Dane Springmeyer
|
25bfc45bef
|
fixup includes in expression_string.cpp
|
2013-01-10 19:52:24 -08:00 |
|
Dane Springmeyer
|
2337a247d3
|
cairo: properly handle alpha when setting color - fixes failing visual test (marker_line_placement_on_points)
|
2013-01-10 17:44:34 -08:00 |
|
Dane Springmeyer
|
805664056a
|
append rather than prepend cairo paths to ensure that internal/local paths come first as per the last configure sort by priority
|
2013-01-10 17:08:58 -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
|
7aab2bca4f
|
iwyu
|
2013-01-09 16:45:37 -08:00 |
|
Dane Springmeyer
|
a0c758df9e
|
fix ambiguious remove_const (fixes msvc 2010 compile)
|
2013-01-09 16:45:17 -08:00 |
|
Dane Springmeyer
|
94ff584190
|
finish complete removal of any trace of cairomm/libsigc++ - amends f25d4d9279 and closes #1681
|
2013-01-09 12:49:39 -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
|
f315a87874
|
further cleanup of expression related headers
|
2013-01-08 15:12:39 -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
|
ca41be2372
|
fixup forward declares - amends 2d7c7fed9b
|
2013-01-06 11:56:35 -08:00 |
|
Dane Springmeyer
|
7e2f5caf0a
|
remove uneeded c_str() call
|
2013-01-06 11:34:36 -08:00 |
|
Dane Springmeyer
|
7087fb9698
|
amend c61335c277, unbreak datasource templates, and add a test to ensure it does not regress again
|
2013-01-04 14:36:24 -08:00 |
|
Dane Springmeyer
|
af3d4486cf
|
fix default log severity
|
2013-01-04 13:52:50 -08:00 |
|
Dane Springmeyer
|
866597c8c3
|
Fix -Wshadow warnings
|
2013-01-04 11:06:03 -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
|
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
|
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
|
17b0b1eeb1
|
iwyu
|
2013-01-03 23:56:47 -08:00 |
|
Dane Springmeyer
|
e9343ca32c
|
iwyu
|
2013-01-03 23:56:11 -08:00 |
|
Dane Springmeyer
|
a75cfa111b
|
iwyu
|
2013-01-03 23:55:09 -08:00 |
|
Dane Springmeyer
|
0812ac871d
|
iwyu
|
2013-01-03 23:54:04 -08:00 |
|
Dane Springmeyer
|
5c0e52b979
|
iwyu
|
2013-01-03 23:53:47 -08:00 |
|
Dane Springmeyer
|
54aa2c040d
|
iwyu
|
2013-01-03 23:52:58 -08:00 |
|
Dane Springmeyer
|
b6cd17847c
|
iwyu
|
2013-01-03 23:20:30 -08:00 |
|
Dane Springmeyer
|
32760318a4
|
iwyu
|
2013-01-03 23:19:54 -08:00 |
|
Dane Springmeyer
|
a87f7160dd
|
fixup includes for src/map.cpp
|
2013-01-03 20:07:44 -08:00 |
|
Dane Springmeyer
|
17d80780bd
|
fixup includes for save_map.cpp
|
2013-01-03 20:06:10 -08:00 |
|
Dane Springmeyer
|
84c3afbd53
|
report integer type sensitive to BIGINT define
|
2013-01-03 20:05:06 -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
|
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
|
c61335c277
|
fix -Wshadow warnings
|
2013-01-03 19:14:19 -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
|
ccf10961c7
|
fix -Wshadow warning
|
2013-01-03 18:04:01 -08:00 |
|
Dane Springmeyer
|
6434466ee3
|
fix -Wshadow warning
|
2013-01-03 18:03:08 -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
|
6558c5c315
|
+ use uint8_t in get/set methods
+ update to_string/to_hexstring
|
2013-01-03 13:51:16 +00:00 |
|
Dane Springmeyer
|
e094776fc5
|
Merge branch 'master' of github.com:mapnik/mapnik
|
2013-01-02 13:57:05 -08:00 |
|
Dane Springmeyer
|
a78f5c2f70
|
comment unused function in miniz sources to avoid compiler warning
|
2013-01-02 13:44:19 -08:00 |
|
artemp
|
600eb07883
|
+ convert colours to doubles in set_color
|
2013-01-02 19:36:22 +00:00 |
|
artemp
|
bc8ea1c5a7
|
+ sync set_color(...) methods
+ fix alpha/opacity calc when processing building_symbolizer
|
2013-01-02 16:52:06 +00:00 |
|
artemp
|
8b66128c89
|
+ take into account alpha when rendering building frame
(TODO: consider more options - roof fill,??)
|
2013-01-02 16:50:28 +00:00 |
|
Dane Springmeyer
|
88e970841b
|
remove unneeded get_optional method on feature impl
|
2012-12-26 16:52:06 -08:00 |
|
Dane Springmeyer
|
0d8f415070
|
avoid unnessary datasource queries if style contains only empty rule(s) - closes #1670 - refs mapbox/carto#219
|
2012-12-21 20:03:41 -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 |
|
artemp
|
6512d2873a
|
+ swap patch from @joto : http://www.remote.org/jochen/tmp/swap.patch
|
2012-12-20 16:36:16 +00:00 |
|
Dane Springmeyer
|
775215e874
|
Merge branch 'master' of github.com:mapnik/mapnik into bigint-feature-id
|
2012-12-19 20:13:19 -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
|
fa1ac1307f
|
use grid value_type instead of hardcoding int for feature id type
|
2012-12-19 19:17:42 -08:00 |
|
artemp
|
f5dd9e53c4
|
+ calc int_parser/generator type from mapnik::value_integer
|
2012-12-18 18:05:45 +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
|
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 |
|
Dane Springmeyer
|
c7ed1f93d7
|
update svg_renderer
|
2012-12-17 19:13:00 -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
|
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
|
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 |
|
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 |
|
Dane Springmeyer
|
6b84269343
|
add pad method on box2d to help tighten otherwise verbose code
|
2012-12-11 13:56:25 -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
|
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 |
|
artemp
|
cd435172d4
|
+ fix expression grammar to work with mapnik::value_integer
|
2012-12-06 09:51:38 +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
|
95ceee84fa
|
sync cairo shield rendering with agg - closes #1602 - amends bd9609c370
|
2012-12-02 22:46:58 -08: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
|
388ac9799d
|
add a local symlink on linux to libmapnik.so.MAJOR.MINOR to enable easy local testing (without install) - refs #1618
|
2012-12-02 19:15:22 -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 |
|
Dane Springmeyer
|
4436721371
|
fix potential compile due to error problematic defines that did not get properly cleaned up in a986aedd05 - refs #1400
|
2012-11-30 11:27:06 -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
|
53922be94e
|
fix method name - refs #1562
|
2012-11-28 20:54:39 -08:00 |
|
Dane Springmeyer
|
57aa6dd052
|
add serialization of line_symbolizer offset - closes #1562
|
2012-11-28 20:21:22 -08:00 |
|
Dane Springmeyer
|
5f900206d1
|
formatting
|
2012-11-28 19:33:09 -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
|
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
|
1ae4a03f68
|
avoid calls to fixAspectRatio() if current dimensions == dimension being set
|
2012-11-11 21:48:51 -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
|
d0f0f9690f
|
zero color images are not valid - catch this earlier on - closes #1568
|
2012-11-08 16:39:31 -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
|
211b102ec5
|
support writing full color png with rgb only (no alpha) - closes #1559
|
2012-11-06 11:44:44 -05:00 |
|
Dane Springmeyer
|
2874664d70
|
throw if tdefl_init fails
|
2012-11-06 11:33:11 -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
|
f9fa9c2461
|
Add support for missing user ability to set Z_FIXED zlib strategy
|
2012-11-04 06:58:25 -05:00 |
|
Dane Springmeyer
|
eda4436b51
|
ensure that the transparency level option is passed to the octree encoder - closes #1556
|
2012-11-04 06:16:18 -05:00 |
|
Dane Springmeyer
|
2b767d650c
|
fix string representation of expr when not built against a boost with icu support
|
2012-11-01 10:31:45 -07:00 |
|
Dane Springmeyer
|
cea31234fa
|
allow building svg_renderer again - refs #1438
|
2012-11-01 10:07:29 -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
|
0ccf9254ec
|
include what you use
|
2012-11-01 10:02:08 -07:00 |
|
Dane Springmeyer
|
82b15bdd68
|
be more explicit about unsigned type for rgba_palette::quantize
|
2012-10-30 16:55:06 -07:00 |
|