Jiri Drbalek
c1ab5c8e6c
add support for natural logarithm function in expressions
2016-08-01 12:58:21 +00:00
Dane Springmeyer
148783da25
Revert "inherit ctor's from geometry_base"
...
- Fixes #3473 (windows compile)
- TODO: @artemp get to the bottom of how to inherit from base class
in a way that works with boost::variant and across platforms
This reverts commit bf99177da7
2016-07-29 04:51:18 -07:00
artemp
bf99177da7
inherit ctor's from geometry_base
2016-07-25 15:55:20 +02:00
Dane Springmeyer
bd920daa16
fix decltype forwarding
2016-07-25 14:51:45 +02:00
Dane Springmeyer
f734368a73
limit mpl list size as well as vector size
2016-07-25 14:51:45 +02:00
artemp
2864d90460
more explicit conversions to the target variant type
2016-07-25 13:45:35 +02:00
artemp
7fa35f481e
Support creating paletted images for any number of pixels e.g < 3 (ref #3466 )
2016-07-20 14:01:14 +02:00
artemp
6f8f286b8d
Revert "allow "null" values when genrating Feature GeoJSON"
...
This reverts commit 8ce58ea29c
2016-07-15 12:22:03 +01:00
artemp
54d51e2728
Revert "feature_kv_iterator - change logic in 'increment' to skip key/value's when value doesn't exist"
...
This reverts commit 3397b8f14f
2016-07-15 12:21:41 +01:00
artemp
8ce58ea29c
allow "null" values when genrating Feature GeoJSON
2016-07-14 10:09:34 +01:00
artemp
3397b8f14f
feature_kv_iterator - change logic in 'increment' to skip key/value's when value doesn't exist
2016-07-14 09:46:37 +01:00
artemp
c457d93804
use count(key)
2016-07-14 09:45:55 +01:00
artemp
75781a999c
add empty_featureset (returning feature_ptr()) implementation
2016-07-13 15:17:41 +01:00
artemp
45c5a3768f
extract_bounding_box_grammar - make features optional / ref #3463
2016-07-12 17:44:19 +01:00
artemp
3536ad0902
even more tidy - remove left over stderr
2016-06-22 17:35:09 +01:00
artemp
2e8c0d36c2
implement custom char_array_bufrer and remove boost::iostreams dependency
2016-06-22 17:21:25 +01:00
artemp
beb34f9c5e
topojson_grammar - rename properties to properties_ to avoid compilation error (gcc) ref #3446
2016-06-03 14:45:49 +02:00
artemp
01967cfaff
topojson grammar - re-factor to allow geometry elements to be in any order
2016-05-23 10:51:05 +02:00
Artem Pavlenko
aec5949d5a
Merge pull request #3416 from mapycz/scale-factor-improvements
...
Scale factor improvements
2016-05-18 15:05:04 +02:00
artemp
7b3f607a01
remove omit directive as it breaks type deduction and insists on boost::optional<boost::variant<int, mapnik::json::coordinates> attribute signature (boost 1.61.0)
2016-05-18 13:13:25 +02:00
artemp
c85c0fd025
prealloc memory with reserve
2016-05-18 11:18:26 +02:00
artemp
c10c271430
dereference once
2016-05-18 10:35:58 +02:00
artemp
7d72cc1930
more cleanups
2016-05-17 13:47:31 +02:00
artemp
c66fd480b5
simplify rules
2016-05-17 13:05:53 +02:00
artemp
4ca0c21d73
move phoenix functions into ctor
2016-05-17 13:00:03 +02:00
artemp
25217549f1
fix topojson parsing (work-in-progress)
2016-05-17 12:53:07 +02:00
artemp
6e326f035d
minor formatting
2016-05-17 12:44:46 +02:00
artemp
dc84943575
Fixed https://github.com/mapbox/windows-builds/issues/88
...
(inheriting constructors not working with msvc-14.0 2015)
2016-05-13 15:23:47 +02:00
artemp
4e6aeaedfc
handle empty arrays and objects ref #3426
2016-05-13 11:50:43 +02:00
artemp
38ec14c739
topojson - use json.value directly
2016-05-12 18:52:05 +02:00
artemp
5e33dc0551
feature_grammar - simplify further, remove redundant rule
2016-05-10 15:53:14 +02:00
artemp
3909fe5b7d
JSON - store 'object' properties in std::vector to preserve order
2016-05-10 15:52:02 +02:00
artemp
f0386e0469
issue pre-processor #warning if BOOST_MPL_LIMIT_VECTOR_SIZE is defined before config.hpp is included ref #3425
2016-05-10 15:15:03 +02:00
artemp
75189905d6
upgrade to latest variant.hpp
2016-05-09 11:42:46 +02:00
artemp
97b8a11a72
fix includes + use typedefs for json types
2016-05-06 10:57:35 +02:00
artemp
7544f57efe
Merge branch 'master' into json-properties
2016-05-06 10:27:18 +02:00
artemp
c2bf2be7ba
json - simplify generic_json rules: remove redundant rule
2016-05-06 10:24:25 +02:00
artemp
21487f36b9
json - refactor stringifier and attribute_value_visitor into separate *.hpp and share between geojson and topojson grammars
2016-05-06 10:15:44 +02:00
artemp
6bd708af86
fix generic_json usage across grammars
2016-05-06 09:55:54 +02:00
artemp
e528b433d4
geojson feature_grammar - parse objects and arrays into json_value before applying "stringifier" #3419 https://github.com/mapnik/node-mapnik/issues/642
2016-05-06 09:50:45 +02:00
artemp
7374f82414
generic_json - add support for JSON object and array type in json_value + update rules attributes
2016-05-06 09:47:40 +02:00
Dane Springmeyer
966a4ae366
avoid warnings with boost 1.60 [skip ci]
2016-05-05 19:09:05 -07:00
artemp
db912d9b67
disable white skipping in stringify_object/stringify_array (ref #3419 )
2016-05-05 10:33:36 +02:00
artemp
d9e75f4ddb
c++ prettify formatting
2016-05-05 10:31:58 +02:00
artemp
471d6dfe94
remove redundant recursive_wrapper (via @jfirebaugh : f00a7aebf1)
2016-05-03 18:13:41 +02:00
artemp
ff821c9239
geometry::envelope - deduct value_type of box2d<T> automatically + add missing typedefs
2016-05-03 18:02:42 +02:00
Jiri Drbalek
cfc6b37d71
fix passing scale factor to evaluate_transform()
2016-05-03 12:09:39 +00:00
artemp
31e8cfc659
improve hash calc ref #3406
2016-04-26 15:29:27 +02:00
artemp
4b3b62a40c
minor formatting
2016-04-25 20:43:40 +02:00
artemp
650e8eea8a
bump up version to 3.0.12 in preparation to release
2016-04-25 20:43:40 +02:00
artemp
988aa3ea43
add guard to get_object_severity ref #3322
2016-04-25 11:49:10 +02:00
artemp
ed87cd2883
c++ - make bbox standalone method
2016-04-22 12:54:57 +02:00
artemp
6105463602
split box2d<T> implementation into *.hpp, *._impl.hpp and *.cpp ref #3405
2016-04-20 10:51:33 +02:00
Dane Springmeyer
b0894bfda3
fix debug assert compile
2016-04-18 08:06:30 -07:00
artemp
66160e9754
mapnik::util::is_clockwise - translate coordinates relative to the origin (0,0) to avoid numeric precision issues while using double precision.
...
(ref #3402 )
2016-04-18 16:08:30 +02:00
Dane Springmeyer
15acb2b23f
Add missing files after revert
2016-04-11 17:58:58 -07:00
Dane Springmeyer
abe943c983
revert geometry changes for now - will develop them in branch to reduce downstream breakage
2016-04-11 14:00:27 -07:00
Dane Springmeyer
0025f70a6b
ensure geometry folder of headers is installed
2016-04-11 12:33:34 -07:00
artemp
19722595a9
move include/mapnik/geometry_fusion_adapted.hpp -> include/mapnik/geometry/fusion_adapted.hpp
2016-04-11 15:22:41 +02:00
artemp
caa03d78bd
move geometry_adapters.hpp to geometry/boost_geometry_adapters.hpp
2016-04-11 15:14:52 +02:00
artemp
fa717bc698
Remove bogus updates from 90f06093ae "geometry - move point/line_string/polygon into separate headers"
2016-04-11 12:35:19 +02:00
artemp
90f06093ae
geometry - move point/line_string/polygon into separate headers
2016-04-11 12:23:11 +02:00
artemp
c6425b8027
cleanup + make operator==, operator!= standalone
2016-04-08 10:43:06 +02:00
artemp
9705844399
fix operator==,operator!= impl
2016-04-08 10:08:16 +02:00
Dane Springmeyer
7ec640e989
register gdal once at plugin load - refs #3093 #3339 #3340
2016-04-05 16:43:07 -04:00
Dane Springmeyer
61cb4effb8
more explicit name for callback type from dlsym
2016-04-05 15:31:19 -04:00
Dane Springmeyer
f8a8ec616a
c++ style: use nullptr rather than NULL
2016-04-05 15:27:32 -04:00
artemp
aac523f80e
add no_skip directive in unquoted_ustring rule (ref: https://github.com/mapnik/mapnik/pull/3389#issuecomment-204344223 )
2016-04-01 12:54:40 +02:00
artemp
751b691ff6
move unquoted_string to the end, remove ustring from top rule
2016-04-01 11:14:47 +02:00
artemp
890a5cff17
add back support for bare (unquoted strings)
2016-04-01 10:52:13 +02:00
artemp
7931295d33
quad_tree - fix offsets
2016-03-31 12:40:34 +02:00
artemp
51c1ed16ef
c++ format
2016-03-31 11:22:40 +02:00
artemp
99bfd03b22
spatial_index - make generic
2016-03-31 11:21:57 +02:00
artemp
4faa9896bb
quad_tree - make more generic by templating on bounding box type
2016-03-31 11:20:41 +02:00
artemp
450533ebc6
move boost::phoenix usage into _impl.hpp
2016-03-24 17:11:06 +00:00
artemp
b73a42131a
box2<T> - add converting ctor
2016-03-24 17:08:44 +00:00
artemp
9bb20ce685
box2d<T> - expose value_type typedef + init(x, y) convinient method
2016-03-24 14:50:46 +00:00
artemp
0b18144859
GeoJSON - make extract_bounding_box grammar configurable
2016-03-23 11:28:51 +00:00
artemp
7b0740c3b7
remove unused symbolizer_grammar.hpp (ref #3343 )
2016-03-18 18:52:17 +01:00
Dane Springmeyer
342b78dc52
more trimming of unneeded phoenix includes - refs #3343
2016-03-18 09:51:17 -07:00
artemp
8f9134c72d
file_io - rename open to is_open to be consistent with STL i/o via @lightmare ( 0d032c2618 (commitcomment-16753722))
2016-03-18 10:02:19 +01:00
artemp
3d555982fd
file_io - make operator bool() explicit via @lightmare ( 0d032c2618 (commitcomment-16753722))
2016-03-18 09:51:57 +01:00
artemp
04890c4915
topojson - move feature_generator into topojson_utils.hpp
2016-03-17 14:36:53 +01:00
artemp
0c2558c154
topojson bounding_box - fix multi_point logic (remove bogus if (num_arcs_ > 0) condition)
2016-03-17 14:19:29 +01:00
artemp
0d032c2618
mapnik:util::file_io - add bool operator bool() for STL I/O compatibility
2016-03-17 11:56:23 +01:00
artemp
b164e010fd
topojson_grammar - don't allocate generic_json structure holding boost::spirit::qi rules on stack (ref #3361 )
2016-03-15 17:19:16 +01:00
Dane Springmeyer
559ef78aca
more agg ignores [skip ci]
2016-03-11 13:48:51 -08:00
Dane Springmeyer
d1b594e886
more agg ignores [skip ci]
2016-03-11 13:44:30 -08:00
artemp
1f61aa3981
TWKB - port CartoDB implementation to mapnik 3.x.x
...
ref https://github.com/CartoDB/mapnik/blob/2.3.x.cartodb/plugins/input/postgis/postgis_utils.cpp
ref https://github.com/CartoDB/mapnik/tree/2.3.x.cartodb/plugins/input/postgis#23xcartodb
2016-03-11 16:20:07 +01:00
Dane Springmeyer
1a10f271d8
ignore -Wfloat-equal from third party headers [skip ci]
2016-03-10 16:07:30 -08:00
Dane Springmeyer
a1ffbe1ec8
suppress warnings from image_io libs
2016-03-10 12:58:29 -08:00
Dane Springmeyer
8f4e211ebd
suppress more third party warnings
2016-03-10 12:46:00 -08:00
Dane Springmeyer
192f5c26c1
use c++ style casts
2016-03-10 12:45:47 -08:00
Dane Springmeyer
51cabe0d34
ignore -Wshadow from agg
2016-03-10 11:45:48 -08:00
Dane Springmeyer
c715b142ec
suppress more third party warnings
2016-03-10 11:44:44 -08:00
Dane Springmeyer
aa8c543744
use c++ style casts
2016-03-10 11:44:01 -08:00
Dane Springmeyer
3985014c04
Add agg warning suppression header
2016-03-09 17:42:24 -08:00
Dane Springmeyer
341db51aa7
finish wrapping boost includes to suppress warnings - add agg wrapper - refs #2907
2016-03-09 16:42:15 -08:00
Dane Springmeyer
7ae0e6d902
share stringify macro from common header
2016-03-09 16:16:14 -08:00
artemp
bde9e61e21
split csv_line_grammar into *.hpp *_impl.hpp ref #3343
2016-03-09 12:26:07 +01:00
artemp
1c29054dea
csv_grammar - use expectation directives throughout
2016-03-09 12:26:07 +01:00
artemp
e3bd74aa55
remove unused phoenix include
2016-03-09 12:26:07 +01:00
artemp
d030fdd667
bump version to 3.0.11
2016-03-07 19:17:36 +01:00
Artem Pavlenko
cd3e484c04
Merge pull request #3349 from mapycz/raster-resample-division-by-zero
...
Raster resample division by zero
2016-03-07 14:54:44 +01:00
Mickey Rose
e75feceaca
markers_placement_finder: dispatch by switch(placement_type)
2016-03-06 13:18:25 +01:00
Mickey Rose
f96631f8e4
un-template markers_basic_placement
...
- move Locator/Detector-dependent stuff back to markers_point_placement
- slightly reduces library size, by about 20% of what #3338 added
2016-03-05 19:33:22 +01:00
Jiri Drbalek
d4ac105eca
raster scaling: use mapnik::safe_cast, fixes clipping negative floats
2016-03-04 16:59:12 +00:00
Jiri Drbalek
f1f65664cd
raster scaling: a bit of optimization
2016-03-04 15:14:01 +00:00
Jiri Drbalek
1054e1bddb
raster scaling: check for division by zero
2016-03-04 15:13:55 +00:00
artemp
71af6a8fe3
css_color_grammar + image_filters_grammar - move phoenix into ctors
2016-03-04 15:53:15 +01:00
artemp
a5cfd27594
split svg_path_grammar,svg_points_grammar,svg_transform_grammar into *.hpp, *_impl.hpp + move boost::phoenix::function initialisation into ctor's
...
(ref #3343 )
2016-03-04 15:34:45 +01:00
Jiri Drbalek
4d402c5ef1
raster scaling: fix accessing out of bounds pixels
2016-03-04 13:55:01 +00:00
artemp
76bb2d9c01
make svg_transform_grammar stateless ref #3343
...
(https://github.com/mapnik/mapnik/pull/2231 )
2016-03-04 13:15:11 +01:00
artemp
4659f40401
make svg_path_grammar and svg_points_grammar stateless ref #3343
...
(https://github.com/mapnik/mapnik/pull/2231 )
2016-03-04 12:42:44 +01:00
artemp
12aec35e2f
GeoJSON feature_grammar - make ctor explicit
2016-03-04 11:35:38 +01:00
artemp
4f8bc40b83
update old boost::phoenix syntax
2016-03-04 10:25:03 +01:00
Dane Springmeyer
9adafd71df
avoid -Wshadow warning from boost [skip ci]
2016-03-03 07:36:33 -08:00
artemp
cbef855743
spirit grammars - move BOOST_FUSION_ADAPT_ADT into implementation files (*_impl.hpp) + reduce boost::phoenix includes to make headers lighter to include
2016-03-03 11:50:41 +01:00
Mickey Rose
489631ca34
remove reference on template parameter Detector
2016-03-03 00:17:41 +01:00
Dane Springmeyer
b5ac75cdf0
MAPNIK_DECL breaks on windows when compiled into static libmapnik-json.a
2016-03-02 13:56:01 -08:00
Dane Springmeyer
296f8d467d
avoid grammar_impl usage in headers - other minor refactoring around json spirit
2016-03-02 12:48:07 -08:00
Dane Springmeyer
4edb57bf11
Merge pull request #3315 from mapnik/faster-csv-compile
...
Speed up CSV plugin / mapnik-index compile
2016-03-02 12:22:16 -08:00
Dane Springmeyer
10a9dba143
trim includes in json/error_handler.hpp
2016-03-02 12:17:12 -08:00
Dane Springmeyer
d148a966c8
from_geojson/to_geojson are now used in unit tests, csv plugin, and node-mapnik so move these to cpp
2016-03-02 11:26:56 -08:00
Dane Springmeyer
72459b3140
Merge branch 'master' of github.com:mapnik/mapnik into faster-csv-compile
2016-03-02 11:10:23 -08:00
artemp
9138d64725
value.hpp - fix error C2375: redefinition; different linkage
2016-03-02 17:15:05 +01:00
artemp
a549803b5b
to_utf8 : fix visibility via MAPNIK_DECL
2016-03-02 17:02:25 +01:00
artemp
f11cc5920f
revive lost to_utf8 method but move it into '<mapnik/unicode.hpp>'
2016-03-02 16:47:55 +01:00
artemp
65da617ec0
re-use vector_converter + move apply_marker_multi into *.cpp
2016-03-02 16:20:10 +01:00
Mickey Rose
66e7ef58d7
refactor markers_placement_finder
...
- refs #3327
Replace member variant of placement-type implementations with plain
union. The active implementation is chosen at construction time like
before.
Make placement-type implementation classes virtual to allow invoking
the active union member through a base class pointer.
2016-03-02 00:53:45 +01:00
artemp
77eaaa1259
move vertex_adapters implementation into .cpp - mark extern
2016-03-01 21:55:47 +01:00
artemp
053faa8a27
remove unused vars/cleanup
2016-03-01 20:49:54 +01:00
artemp
bb78b178cd
reuse type
2016-03-01 20:37:23 +01:00
artemp
4c8928dd8c
Merge branch 'master' into value-cpp
2016-03-01 17:43:02 +01:00
artemp
d374829b30
refactor apply_markers_multi and help compiler a bit more (re-enable support for GEOMETRYCOLLECTION)
2016-03-01 17:29:03 +01:00
artemp
45b54c703c
apply_marker_multi - unroll template instantiation logic + drop 'GeometryCollection' support (experimental)
2016-03-01 17:28:09 +01:00
artemp
566c99807f
minor formatting
2016-03-01 17:27:59 +01:00
artemp
3ee109f46b
allow any trailing combinations of line-endings (unix, mac, dos) (ref #3320 )
2016-02-26 19:19:32 +01:00
Dane Springmeyer
5c0d496c82
setting up for mapnik v3.0.10 release [skip ci]
2016-02-25 16:37:35 -08:00
Dane Springmeyer
f2782d0b67
[csv] move spirit usage to cpp
2016-02-24 17:42:51 -08:00
artemp
eea68adb40
add required include
2016-02-24 12:10:25 +01:00
artemp
50db396760
move value implementation into *.cpp
2016-02-23 23:05:19 +01:00
artemp
0c9a615c24
restore back compatibility shim ref #1859 (TODO: must go away in 3.1.x!!)
2016-02-23 14:01:06 +01:00
Mickey Rose
ea54876d79
remove unused includes
2016-02-20 01:16:11 +01:00
artemp
96175554ae
Add explicit instantiation declaration of singleton<mapped_memory_cache, CreateStatic> to avoid multiple instantiations across translation units. (ref #3306 )
2016-02-19 11:00:58 +01:00
artemp
5183c1da44
spatial_index - rename check_header to check_spatial_index and make it free function ref #3300
2016-02-18 11:38:29 +01:00
Mickey Rose
6557394dc8
re-add mapnik::to_utf8 stub for backward compatibility
2016-02-17 16:56:21 +01:00
Mickey Rose
1499475d04
remove to_utf8, instead use UnicodeString::toUTF8String
2016-02-15 21:07:01 +01:00
Mickey Rose
5d1fd56cef
csv_grammar: make csv_white_space_skipper a primitive_parser
2016-02-15 15:17:26 +01:00
Mickey Rose
ccf579f450
csv_grammar: simplify csv_line_grammar
2016-02-15 15:15:51 +01:00
