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

913 commits

Author SHA1 Message Date
Dane Springmeyer
9b3c42190d minor includes fixups 2011-11-09 16:41:07 -08:00
Dane Springmeyer
d965bcbeae sqlite: futher refactoring of sqlite plugin, allowing all tests to pass 2011-11-03 19:51:37 -04:00
Dane Springmeyer
2169bcb92f grid: initialize variables to avoid compiler warnings 2011-11-02 13:31:15 -04:00
Dane Springmeyer
4ffb26d78d formatting 2011-10-28 18:04:24 -07:00
Artem Pavlenko
14ab337363 don't skip white space in attributes names 2011-10-28 11:24:19 +01:00
Artem Pavlenko
d1401b9e07 return by value 2011-10-28 11:24:17 +01:00
Artem Pavlenko
694094d28b avoid creating default initialised values if key doesn't exist 2011-10-28 11:24:10 +01:00
Artem Pavlenko
87c1d126b8 add support for fractional text size 
( use FT_Set_Char_Size )
NOTE: ensure it works as expected, currently
I see different results from different fonts.
 2011-10-28 11:24:08 +01:00
unknown
a8348c5bf5 add missing overload 
# Please enter the commit message for your changes. Lines starting
 2011-10-28 10:52:29 +01:00
Dane Springmeyer
6761cb0436 Merge branch 'master' of github.com:mapnik/mapnik 2011-10-25 15:08:19 -07:00
kunitoki
592e97ffe7 - small cosmetics 2011-10-23 16:36:51 +02:00
kunitoki
d574d4da0c - another bunch of coding style fixes in includes 2011-10-23 16:09:47 +02:00
kunitoki
154fb73d84 - fix copyright repeats 2011-10-23 15:23:14 +02:00
kunitoki
596757a269 - fix copyright to 2011 (script to do this will follow) 2011-10-23 15:04:25 +02:00
Dane Springmeyer
95035b2519 touchup feature.to_string() operator to display id differently than attributes 2011-10-22 17:27:02 -07:00
Dane Springmeyer
c92e7ab497 add a new, experimental coord_transform impl to support offsetting line verticies - closes #180 - next task of exposing functionality refs #927 2011-10-21 17:39:20 -07:00
Dane Springmeyer
d1c8818029 remove area as it is unused (not needed by anything yet) - closes #846 2011-10-21 15:55:58 -07:00
Artem Pavlenko
c7e1174d6b Merge pull request #909 from MapQuest/expose-label-collision-detector 
Exposed the label collision detector
 2011-10-21 12:20:21 -07:00
Artem Pavlenko
b8ed785d7d use static_cast 2011-10-21 20:02:34 +01:00
Artem Pavlenko
ba0bdbd07e Merge pull request #922 from xificurk/ctrans-cleanup 
code cleanup
 2011-10-21 09:55:23 -07:00
Robert Coup
5df4d4fbb9 Merge branch 'master' into gsoc-crundel 2011-10-20 12:03:02 -07:00
Artem Pavlenko
c87c05911b revert back bool logic 
update urls -> https://github.com/mapnik/mapnik/issues/794
 2011-10-20 14:38:04 +01:00
Robert Coup
82ba2e2553 crundel: Add setter for rastercolorizer stops 2011-10-19 23:59:26 -07:00
Robert Coup
e8c281f593 crundel: add set_displacement(position) method to text_symbolizer 2011-10-19 23:58:56 -07:00
Robert Coup
fae9f98014 crundel: add deep-copy option for copying rules and feature_type_styles 2011-10-19 23:57:21 -07:00
Petr Morávek [Xificurk]
7f57119dbd code cleanup 2011-10-19 23:45:24 +02:00
Artem Pavlenko
298b7fa253 use make_shared 2011-10-19 17:34:09 +01:00
Artem Pavlenko
1e70af3c5a use M_PI from <mapnik/global.hpp> 2011-10-19 15:32:25 +01:00
Artem Pavlenko
9088d7bbc8 + various win32 fixes, mainly adding extra namespace qualifiers 
for vc++10, MAPNIK_DECL ...
 2011-10-19 15:29:24 +01:00
Artem Pavlenko
49cb8c7368 qualify attribute -> mapnik::attribute (vc10) 2011-10-19 15:19:55 +01:00
Artem Pavlenko
d40f5d7d59 add round() and M_PI support for windows builds 2011-10-19 15:17:48 +01:00
Artem Pavlenko
9a37fee17d remove operator-= from box2d 2011-10-19 15:14:01 +01:00
kunitoki
b23697e1b3 - cosmetics changes to sqlite datasource plugin 
- added initial wkbAuto to auto determine WKB type in sqlite
 2011-10-18 22:19:03 +02:00
Dane Springmeyer
b7a4906978 Merge pull request #908 from MapQuest/shield-placement-bug 
Fixed bug in shield line placement
 2011-10-17 14:08:50 -07:00
Konstantin Käfer
763ece8db6 group-by attribute for Layer 2011-10-13 01:30:18 +02:00
Dane Springmeyer
3c14ada217 enable contruction of a memory_featureset from a std::vector<feature_ptr> 2011-10-11 17:29:42 -07:00
Matt Amos
b5c4bb77de Exposed the label collision detector outside the agg_render object 
and via Python, allowing detectors to be re-used across renderings.
 2011-10-12 01:05:35 +01:00
Matt Amos
3f47de0e81 Fixed bug in shield line placement when dx/dy are used to shift 
the label relative to the placement point.
 2011-10-12 01:02:28 +01:00
Dane Springmeyer
f8e2a3ed1b fix compile on ppc (big endian) systems 2011-10-10 14:03:43 -07:00
Artem Pavlenko
c97399b0f6 + move <unicode> includes to .cpp 
+ disble 'ubidi_getBaseDirection' check for ICU < 4.6
 2011-09-26 08:58:33 +00:00
Artem Pavlenko
3d6ea00c66 + linewrap-patch-r3362.patch from dimka (#189) 2011-09-25 19:43:02 +00:00
Dane Springmeyer
00e8f06f13 ensure the experimental svg_renderer compiles 2011-09-16 16:18:10 +00:00
Alberto Valverde
4444907855 ported warer warping functionallity to cairo renderer. Closes #887 2011-09-16 14:34:14 +00:00
Alberto Valverde
e41abb0e12 add a label attribute to colorizer_stop 2011-09-16 13:32:16 +00:00
Alberto Valverde
97431c8de4 made mesh_size configurable 2011-09-16 12:21:21 +00:00
Alberto Valverde
6ffbd07174 use AGG for interpolation when warping rasters 2011-09-13 15:41:39 +00:00
Artem Pavlenko
d5e57afac0 + move compositing into core lib 2011-09-13 15:31:07 +00:00
Artem Pavlenko
fad2d7739b + change wkb interface to work directly on ptr_vector<geometry_type> 
+ expose ptr_vector<geometry_type> in feature
 2011-09-13 11:54:04 +00:00
Dane Springmeyer
67df69834f allow reprojection of batches of points - patch cherry picked from albertov's work on optimizing raster reprojection performance (upcoming) - closes #877 2011-09-12 18:30:34 +00:00
Dane Springmeyer
ac3e43e5a4 support faster wgs84->merc transforms, a very common reprojection scenario in web mapping - added benefit of this approach is easy clipping for robust handling of out of bounds mercator coords - closes #839 2011-09-12 02:10:58 +00:00
Dane Springmeyer
0ec7ef6d46 renderers can now report to image if any features have been rendered via im.painted(), and im.background now uses boost optional to allow easy detection of whether a background has been set - closes #875 2011-09-11 06:24:26 +00:00
Dane Springmeyer
67d7a3a6f0 add alternative line rasterizer that can be enabled to draw faster lines at the expense of dropping short geometries - for thin lines has nicer look but should not be used with think lines - refs #873 2011-09-09 23:45:49 +00:00
Artem Pavlenko
a59c961c1f + add missing save_to_file overloads 
+ remove dummy rgba_palette args
 2011-09-09 12:40:30 +00:00
Artem Pavlenko
aba5f21936 + applied patch from itayperl (bidi-mirroring-SVN-r3110.patch) 2011-09-08 15:08:17 +00:00
Artem Pavlenko
53b50c871c + modify WKT parser to work with ptr_vector<geometry_type> 
+ fix memory leaks in wkt_grammar
+ add support for GEOMETRYCOLLECTION
 2011-09-08 11:52:51 +00:00
Artem Pavlenko
e5de1ac285 + looks like it has been pasted twice, 
removing duplicates.
 2011-09-08 07:57:37 +00:00
Dane Springmeyer
d9e09e1221 add fastmath.hpp 2011-09-08 03:50:22 +00:00
Artem Pavlenko
02c143895d + refactor palette stuff a bit 
TODO: We need to change save_to_file|string interface
  to avoid passing dummy rgba_palette objects.
 2011-09-07 15:01:25 +00:00
Dane Springmeyer
25196e3a8e revise png palette api by removing default arguments to ensure no temporary references 2011-09-07 00:45:18 +00:00
Dane Springmeyer
aa5cfad4b7 add minimum-path-length to text_symbolizer - closes #865 2011-09-04 17:33:48 +00:00
Artem Pavlenko
2c5f723344 + oops, corrected:) 2011-09-01 19:21:03 +00:00
Artem Pavlenko
9a9e5fb2e3 Iterate unusedPool until we get 'valid' connection or 
create a new one if usedPool.size() < maxSize_.
 2011-09-01 19:20:26 +00:00
Dane Springmeyer
964cfdd423 newline 2011-09-01 05:19:13 +00:00
Dane Springmeyer
c61decc3e8 more includes for timer 2011-09-01 04:48:09 +00:00
Dane Springmeyer
f9358f005f ensure the timer compiles on osx with clang++ - patch from rcoup 2011-09-01 04:33:39 +00:00
Dane Springmeyer
5f548cbe26 new timer.hpp that includes both cpu and wall clock output - patch from rcoup - refs #780 2011-09-01 01:06:33 +00:00
Dane Springmeyer
b2dc2fa6d2 move feature_style_processor to cpp 2011-09-01 00:44:27 +00:00
Dane Springmeyer
106173914c avoid compiler warning 2011-09-01 00:42:23 +00:00
Dane Springmeyer
a013cd5032 add support for fixed color palettes when encoding to png 2011-08-31 02:28:14 +00:00
Dane Springmeyer
00d059b39c expose blend pixel methods for grid renderer 2011-08-30 22:26:59 +00:00
Dane Springmeyer
9e87c9f914 apply patch from Peter Körner adding AlsoFilter functionality - closes #820 2011-08-30 17:38:27 +00:00
Dane Springmeyer
caf541d87e add support for controlling zlib compression level and strategy when encoding to png - patch from kkaefer - closes #841 2011-08-26 05:58:21 +00:00
Dane Springmeyer
4a0ed78cb7 add ability to discard a timer without it later printing 2011-08-24 23:15:22 +00:00
Dane Springmeyer
ae41899152 simply and cleanup the wall clock timer 2011-08-24 22:02:07 +00:00
Dane Springmeyer
d3211372a4 sqlite: support both single and double quoted table names 2011-08-16 23:24:02 +00:00
Dane Springmeyer
d5035d0474 remove const from setter 2011-08-11 22:58:53 +00:00
Dane Springmeyer
81bf8b3d06 expose the name2file mapping of font family/style and font file publically so apps can ask mapnik where a given font face was found on the filesystem 2011-07-29 18:03:45 +00:00
Hermann Kraus
53e0b22c2b Added metawriter helper function. 2011-07-28 22:59:05 +00:00
Dane Springmeyer
da337036d4 avoid compiler warning re intialization order 2011-07-27 04:34:02 +00:00
Dane Springmeyer
f14fc9dcf7 improve code comments around transforms and intersection checks 2011-07-21 21:53:39 +00:00
Dane Springmeyer
c5c729b17c fix typo (map_ext.intersects(map_ext) -> map_ext.intersects(layer_ext)) and add small optimization so that if projections are equal we don't check intersection twice before returning no hit 2011-07-21 21:14:06 +00:00
Hermann Kraus
8bb6df1a07 Optionally output JSON data with pixel coordinates. 2011-07-16 12:24:52 +00:00
Dane Springmeyer
3d862034cd allow '[field] is null' syntax to work with the understanding this may have unintended consequences and we should likely ultimately replace with proper 'is' equality support for nulls - track issue at http://trac.mapnik.org/ticket/794 2011-07-12 01:48:36 +00:00
Dane Springmeyer
a726787a40 add mapnik::Boolean type so we can report attributes with boolean type - closes #795 2011-07-11 22:34:08 +00:00
Dane Springmeyer
4356144e4a shuffle attribute_descriptor class to its own header, previously extant but unused 2011-07-11 21:03:39 +00:00
Dane Springmeyer
aab601da64 comment unused struct that trips up clang++ 2011-07-09 01:05:52 +00:00
Dane Springmeyer
161d978fb4 support hsl colors for boost versions 1.42 - 1.45 2011-07-01 18:54:01 +00:00
Dane Springmeyer
eab80c5a91 fixup proj_init error message 2011-06-30 17:59:27 +00:00
Dane Springmeyer
476e04c4c7 add gamma to polygon-pattern-symbolizer, useful for avoiding AA affects at tile edges so that global patterns can have seamless alignment 2011-06-28 22:37:35 +00:00
Dane Springmeyer
4e229ac516 more sql utility functions for handling quoting 2011-06-13 21:43:37 +00:00
Artem Pavlenko
9bc45c9ca1 + addd boost::equality_comparable<box2d<T> 2011-06-07 21:16:03 +00:00
Artem Pavlenko
1d2abb8206 + add support for CSS3 HSL colors: http://www.w3.org/TR/css3-color/#hsl-color 2011-06-07 16:14:11 +00:00
Artem Pavlenko
4a72a7d680 + fix color(std::string const& ) ctor to initialize r,g,b,a. 
+ impl eq ops using boost::equality_comparable.
+ output alpha in to_hex_string if not 255.
 2011-06-07 16:14:02 +00:00
Artem Pavlenko
bc3d784b85 + change ingterface to work with std::string 2011-06-07 16:13:54 +00:00
Dane Springmeyer
3d81a07f06 support for png 1.5.x, should work fine with 1.4.x - closes #772 2011-06-05 21:02:55 +00:00
Dane Springmeyer
ef6af65f17 remove debug output 2011-06-03 22:11:51 +00:00
Dane Springmeyer
e93bfa7a5a add a grid_view class to allow subsetting of grids for metatiling 2011-06-03 05:55:28 +00:00
Dane Springmeyer
001f38fc57 expose get/set of key and resolution on grid renamed from join_field/step 2011-06-03 01:55:26 +00:00
Dane Springmeyer
3654e92ee4 nearest neighbor resampling impl for grid array 2011-06-01 17:22:56 +00:00
Dane Springmeyer
2bec001a44 add missing change to header for r2942 2011-05-31 22:44:48 +00:00
Dane Springmeyer
fcdf033004 restore boost 1.41 -> 1.44 compatibility 2011-05-31 17:34:09 +00:00
Hermann Kraus
8474976353 Prepare for merging "text_placement_info" and "placement". 2011-05-30 01:16:21 +00:00
Hermann Kraus
de089f0d68 Add alignment to text_placement_info. 2011-05-29 22:33:41 +00:00
Dane Springmeyer
8322a96575 code cleanup 2011-05-27 21:00:19 +00:00
Artem Pavlenko
b6f02e6d4d + adapt mapnik::color as fusion sequence to avoid intermediate data structure 2011-05-26 10:07:37 +00:00
Dane Springmeyer
7a17c7e597 load_map_from_string has always accepted a base path argument to drive the interpretation of relative paths in the stylesheet when loaded in memory- this really should be a full map property so that it can be known on the map object after parsing and changed if the map is saved to a new location 2011-05-25 23:48:07 +00:00
Dane Springmeyer
e4329847d2 shape.input: re-assign feature id's once we know their correct value after reading geometry up to the dbf link - TODO - we should be able to look ahead to avoid this re-assign 2011-05-20 01:41:28 +00:00
Dane Springmeyer
ba15947a4f add Projection.expanded() function to ask proj4 what its internal, normalized definition looks like (useful only for debugging) 2011-05-17 19:05:15 +00:00
Dane Springmeyer
b578c02c54 make renderer type a template argument of agg svg renderer 2011-05-17 06:18:06 +00:00
Dane Springmeyer
b3c258c9a8 allow usage of boost::make_shared in gdal featureset construction by passing const reference - #760 2011-05-16 22:17:50 +00:00
Dane Springmeyer
aeb1b7f963 renable previous (non-agg) internal bilinear scaling method for testing #759a 2011-05-12 16:43:23 +00:00
Dane Springmeyer
90fbd6a204 use boost::make_shared to avoid explicit new and ensure fast and exception safe allocation 2011-05-10 21:09:54 +00:00
Dane Springmeyer
301824e60d remove unused header 2011-05-10 21:05:35 +00:00
Artem Pavlenko
3bef010056 + move feature_factory.hpp include to impl file 2011-05-09 13:52:06 +00:00
Artem Pavlenko
692af5cbc1 + use boost::make_shared to improve shared_ptr 
allocation locality
 2011-05-09 13:51:58 +00:00
Artem Pavlenko
82a71649b6 + remove extra namespace qualifiers 2011-05-09 09:11:57 +00:00
Artem Pavlenko
7b620a9f71 + cleanup/formatting 2011-05-09 09:11:49 +00:00
Dane Springmeyer
d05b0c539f apply major refactor of RasterColorizer by ben moores from https://github.com/BenMoores/mapnik-trunk/wiki/RasterColorizer - closes #523 2011-05-04 00:20:17 +00:00
Dane Springmeyer
2f77de0bf9 add a few more centroid algorithms for testing 2011-05-03 21:38:02 +00:00
Dane Springmeyer
adb44a6ec2 account for scaling and alpha of bitmap images in grid_renderer 2011-05-02 22:33:11 +00:00
Dane Springmeyer
e69f17eb35 add ability to pass a scaling ratio just to the affine scaling - needed by grid_renderer 2011-05-02 22:30:50 +00:00
Dane Springmeyer
b6c5c57713 label_position on lines should take the middle point to preserve previous behavior before move to path type geometries - patch from Ldp - closes #740 and #668 2011-04-30 00:43:57 +00:00
Dane Springmeyer
157d52e38f add option to collect the total extent of all placement bboxs to enable passing along to metawriters - modified patch from kevin.kreaiser - closes #755 2011-04-30 00:06:27 +00:00
Dane Springmeyer
ab94fd43d8 add test for grid generation, and make sure point_datasource feature id starts at 1 (as datasources should) 2011-04-29 19:25:00 +00:00
Dane Springmeyer
da4893d8fe declare dlf ctor explicit 2011-04-29 17:40:55 +00:00
Dane Springmeyer
b072de4769 create layer descriptor when memory_datasource is created - TODO - gather attribute descriptors as features are added 2011-04-28 17:36:36 +00:00
Hermann Kraus
6650f999b9 char is to short for unicode chars. Replace it with unsigned int. Should fix #746. 2011-04-27 20:28:53 +00:00
Dane Springmeyer
5eea164b5a add grid_renderer backend 2011-04-26 21:44:52 +00:00
Dane Springmeyer
9da2d701a5 further template the svg_renderer based on pixfmt 2011-04-26 17:38:18 +00:00
Dane Springmeyer
318465ef53 output feature id when printing feature to string 2011-04-19 22:41:16 +00:00
Dane Springmeyer
424eef4a2f refactor feature_style_processor a bit to allow passing reference of names as arg apply_to_layer. Will set up for more potential flexibility around passing pre-populated query names. 2011-04-19 04:23:11 +00:00
Dane Springmeyer
74bb2da73b avoid uninitialized variable warning 2011-04-18 18:48:57 +00:00
Dane Springmeyer
5c799b2174 skip rendering specific coordinates which cannot be back projected from the layer srs into the map srs, avoiding the previous outcome of full skipping of features (this is at the cost of potentially odd looking polygons, but should not impact performance) - closes #308 2011-04-15 22:13:23 +00:00
Dane Springmeyer
69eb5c4579 first forward map ext to layer srs, falling back to backward projecting layer to map (previous behavior). Also leverage new clip function of box2d<double> class - closes #402, #548, and #549 (and indirectly fixes #308 combined with #506) - see also http://trac.mapnik.org/wiki/BoundsClipping 2011-04-15 18:39:07 +00:00
Dane Springmeyer
92a36f21ff early return if layer has no styles 2011-04-15 07:19:44 +00:00
Dane Springmeyer
fd54be4cc5 if 'maximum-extent' is provided, clip map query extent to it allowing one simple and fast way of controlling out of bounds coordinates when projecting into/from layer projection - see also solution at #549 2011-04-15 07:13:08 +00:00
Dane Springmeyer
8998296f7b add 'maximum-extent' attribute to map and use this, if set, in place of calculated layer extents in zoom_all() 2011-04-14 02:20:33 +00:00
Dane Springmeyer
ff006dd3f0 allow copy of mapnik::projection when proj_transform is created - closes #658 - TODO - consider using shared_ptr 2011-04-13 21:30:39 +00:00
Dane Springmeyer
383d8a3f15 add proj_transform forward/backward box2d implementation 2011-04-13 19:40:44 +00:00
Dane Springmeyer
daf5cff723 add ability to set the bbox of a query object after initial contruction 2011-04-13 19:30:19 +00:00
Dane Springmeyer
903d1b49ef add a clip method to mapnik::box2d 2011-04-13 19:19:23 +00:00
Artem Pavlenko
0e0b7a578c + implement memory mapping using boost::interprocess 
+ cache mapped memory regions for re-use
 2011-04-06 13:02:31 +00:00
Dane Springmeyer
2d1e2ef998 add valid() method to box2d, and comment subtraction override as it does not have any function currently 2011-04-04 03:50:09 +00:00
Dane Springmeyer
7d6ed703f4 move numeric2string to sql_utils.hpp 2011-04-04 03:46:41 +00:00
Dane Springmeyer
49c011a48a avoid various compiler warnings 2011-04-03 04:30:32 +00:00
Dane Springmeyer
9b1a33be5c remove spurious semicolon 2011-04-02 03:08:16 +00:00
Dane Springmeyer
7095b1c907 initialize all metawriter members 2011-04-02 00:12:12 +00:00
Dane Springmeyer
de9a46cfeb remove tabs 2011-04-01 23:56:12 +00:00
Dane Springmeyer
84ea9e6101 avoid clang++ -pedantic compiler warnings 2011-04-01 06:24:57 +00:00
Dane Springmeyer
7181f631e8 avoid clang++ compiler warnings with -pedanic 2011-04-01 05:32:25 +00:00