Commit graph

6167 commits

Author SHA1 Message Date
Dane Springmeyer
0bc5b08470 Merge pull request #1671 from mapnik/bigint-feature-id
Bigint feature ids and grid_rendering buffer - closes #1662
2012-12-21 19:56:49 -08:00
Dane Springmeyer
aee275a08c fix number handling in csv plugin and add tests for 64bit integer support in sqlite and postgis datasources - refs #1669 2012-12-21 19:53:33 -08:00
Dane Springmeyer
9b3d2b7d8e fix sqlite featureset results when non using an rtree index - closes #1667 2012-12-20 22:40:39 -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
900774f2a7 add a visual test for label line placement collision 2012-12-20 17:27:09 -08:00
Dane Springmeyer
22b41a7c6d also test alternative is falsey method 2012-12-20 14:28:37 -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
8e2a5e5046 Merge branch 'bigint-feature-id' of github.com:mapnik/mapnik into bigint-feature-id 2012-12-19 20:13:44 -08: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
6590225ce0 disable C++ tests for travis build to speed up overall compile 2012-12-19 20:12:13 -08: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
58b978f71d Merge branch 'master' of github.com:mapnik/mapnik 2012-12-19 20:07:01 -08:00
Dane Springmeyer
222bc91c91 Merge branch 'master' of github.com:mapnik/mapnik into bigint-feature-id 2012-12-19 20:06:03 -08:00
Dane Springmeyer
619cfbc1bc build less to reduce build time 2012-12-19 20:03:06 -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
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
e53914463a return the grid::value_type instead of hardcoding int 2012-12-19 18:06:51 -08:00
Dane Springmeyer
3df8574c84 remove hardcoding of expected pixel types in agg svg renderer 2012-12-19 18:04:49 -08:00
Dane Springmeyer
480989ee58 add mention of new 64 bit integer support for datasources and expressions 2012-12-19 10:48:19 -08:00
Dane Springmeyer
fa1acc5de7 fix compile of occi plugin by casting from int to mapnik::value_integer (appears occi does not support 64 bit ints) 2012-12-19 10:38:37 -08:00
Artem Pavlenko
da0c99b4be Merge pull request #1661 from mapnik/bigint
Compile tile support for 64-bit integers in mapnik::value
2012-12-19 01:59:36 -08:00
artemp
0eefd304bf cMerge branch 'master' into bigint
Conflicts:
	bindings/python/mapnik_feature.cpp
2012-12-19 09:39:51 +00:00
Dane Springmeyer
4c64fb4b0d fix #1659 but re-break bool->int auto-conversion, which is less of a problem 2012-12-18 20:22:02 -08:00
artemp
94bda55793 Merge branch 'master' into bigint 2012-12-18 21:50:30 +00:00
artemp
b75b54a787 + fix bigint support
+ fixup cpp tests
2012-12-18 20:34:27 +00:00
Dane Springmeyer
5758e6d9de Loosen simplification factor to 1/20 of pixel (master branch) - closes #1639 2012-12-18 11:57:45 -08:00
artemp
f5dd9e53c4 + calc int_parser/generator type from mapnik::value_integer 2012-12-18 18:05:45 +00:00
artemp
8f9ebe8452 + remove LL 2012-12-18 18:05:17 +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
ae69ee9a24 + update tests to respect new real formatting policies 2012-12-18 12:13:42 +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
83215ba726 Merge pull request #1654 from mapnik/no-bind
Remove bind option for datasources closes #962, reverts #622, refs #1655 and #1656
2012-12-17 13:11:33 -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
7b39333234 remove as much mutable as possible 2012-12-17 12:59:15 -08:00
Dane Springmeyer
cba1ec5b2f Merge pull request #1657 from mapnik/noncopyable
Use internal noncopyable header
2012-12-17 11:13:06 -08:00
Dane Springmeyer
bdfdca99e9 fix debug output 2012-12-17 10:51:10 -08:00