Commit graph

3893 commits

Author SHA1 Message Date
Artem Pavlenko
2058f966b2 applied patch from Jochen :
1. The README talks about "scons.py", but it is just called "scons".

2. In demo/c++ there is a Makefile, but the readme.txt gives a command
   line to compile. Both don't work for me. One error can at least be
   fixed by adding -I../../agg/include to the command line.

3. When compiling Mapnik an error is thrown because of a redefined type.
   This was on an Intel 64Bit machine. Fixed by "typedef char byte" to
   "typedef uint8_t byte" in include/mapnik/global.hpp. I am not sure
   whether thats the right fix, though, I just guessed. :-)

4. include/mapnik/image_data.hpp needs
   #include <mapnik/octree.hpp>
   to compile
2007-12-16 12:33:28 +00:00
Artem Pavlenko
58f4431df1 support for palette based PNGs, user 'png256' as a format parameter (see updated rundemo.py) 2007-12-10 19:59:17 +00:00
Artem Pavlenko
4586586448 added convinence overloads for 'save_to_file' and 'render_to_file'
Example:
	>>> from mapnik import *
	>>> im = Image(200,200)
	>> save_to_file('test.png',im) # Guess image type from file extension
	>> save_to_file('test.png,'jpeg',im) # Explicitly save as JPEG
2007-12-06 12:14:29 +00:00
Artem Pavlenko
04686f7b28 removed GIGABASE stuff as it's unused at the moment 2007-12-06 12:11:17 +00:00
Artem Pavlenko
27f88c9ec0 small fix 2007-12-06 10:59:28 +00:00
Artem Pavlenko
d515b51973 added ImageData<uint8_t> typedef 2007-12-06 10:58:15 +00:00
Artem Pavlenko
171675dfcf 1. added external "C" around <iconv.h>
2. direct conversion from client_encoding to UCS-4{LE,BE}
2007-11-16 13:19:09 +00:00
Artem Pavlenko
17e2b12390 1. things to keep win32 built happier
2. print color table in gdal.input if present (-DMAPNIK_DEBUG)
2007-11-08 21:15:45 +00:00
Artem Pavlenko
c5bca5ab96 removed unused variables to calm msvc toolset 2007-11-08 21:11:12 +00:00
Artem Pavlenko
0e9c542d11 1.Added 'face_names' method which returns list of face names:
>>> from mapnik import *
>>> for name in FontEngine.instance().face_names():
... 	print name
...
DejaVu Sans Bold
DejaVu Sans Bold Oblique

....

2. std::vector<std::string> is reflected as mapnik_.Names object

TODO: test if there are more then one face in the file
2007-11-08 11:06:05 +00:00
Artem Pavlenko
c0d411d14e small cleanup 2007-11-07 14:07:12 +00:00
Artem Pavlenko
6eadaafd49 use 'avoid_edges' parameter for point placement 2007-11-06 09:07:18 +00:00
Artem Pavlenko
01de9d9e8c 1. revived 'avoid_edges' option
2. fixed 'placement_finder' extent in agg_renderer.cpp
3. added 'avoid_edges' to map loader
2007-11-05 10:32:01 +00:00
Artem Pavlenko
a29f2b83c7 fixed enum wrappers issue (patch from John Leslie) 2007-11-05 09:28:26 +00:00
Artem Pavlenko
ce6985aaad use 'contains' instead of 'intersects' test to provide 'avoid_edges' functionality.
(Should 'avoid_edges' be always enabled ???)
2007-11-05 09:15:53 +00:00
Artem Pavlenko
8d51cb421b 1. re-factored placement_finder to be more efficient. 'find_*' methods are templated on PathType.
2. PostGIS plug-in - optional 'multiple_geometries' parameter to control how Multi* geometries built. 
3. MarkersSymbolizer (work in progress) to render vector shapes (markers) alonh a path with collision detection.
2007-11-02 12:50:15 +00:00
Andreas Volz
305b76012e - boost serialization support
- improved some boost detection stuff
2007-10-26 20:56:11 +00:00
Artem Pavlenko
b79b3a89ec Added 'intersect' method returning intersection envelope. 2007-10-21 09:51:03 +00:00
Artem Pavlenko
4018c728de corrected int2net macro to use int16_t , thanks to John Leslie. 2007-10-21 09:49:45 +00:00
David
2cf8278f1d Generic python binding for mapnik::enumeration 2007-10-19 22:17:16 +00:00
Artem Pavlenko
b40706c295 1. templated save_as_png and save_as_jpeg
2. use std::iostream for I/O in save_to_file

TODO: allow writing an output image to memory buffer (i.e Python StringIO)
2007-10-17 14:47:56 +00:00
David
1c5bbea587 workaround for enumeration python binding issue::
allow implicit conversion from long
2007-10-14 13:39:11 +00:00
Artem Pavlenko
f736196cb4 1. image_data.hpp - fixed mismatched new/new[] in ctor in ImageData
2. image_data.hpp - initialize image data (ImageData) 
3. unicode.hpp - added missing <iostream> when in debug -DMAPNIK_DEBUG
2007-10-11 21:18:04 +00:00
David
44a83c0eac - use AGG row_ptr_cache the portable way 2007-10-08 20:07:53 +00:00
David
515ab55a53 - fixed agg-2.5 build 2007-10-08 19:37:05 +00:00
David
3c97052c5e - more include order reversion 2007-10-08 18:10:31 +00:00
David
bc54b150ea - reversed header include order 2007-10-08 17:42:41 +00:00
Artem Pavlenko
6d83b199a4 comment out boost_system 2007-10-05 11:29:55 +00:00
Artem Pavlenko
d1a345a3d2 1.don't share FT_Library object between threads (TODO : implement freetype_engine pool)
2. merged changes with latest load_map
2007-10-05 11:27:00 +00:00
Andreas Volz
9507f1bbf2 build libxml2 loader 2007-10-03 10:41:08 +00:00
Andreas Volz
f0cca52c3b optional build with libxml2 2007-10-02 21:43:13 +00:00
David
bc11d0a5e5 - added some tests
- added missing disclaimers
2007-09-25 21:06:52 +00:00
David
b2df387a9d - merged strict-xml-branch r530:532 to trunk:
- libxml2 support
    - strict error handling while parsing XML map files
    - implemented save_map()
    - removed some duplicate defaults
    - all symbolizers with icons share a common base class now
2007-09-25 18:47:12 +00:00
Andreas Volz
49e6d1d7bf - added option to build included libagg as static library 2007-09-23 22:20:21 +00:00
Andreas Volz
c8e4029971 add exec bit 2007-09-21 19:54:17 +00:00
Artem Pavlenko
066c8dfa1a Fixed envelope() method to return borrowed connection
NOTE : Always wrap connection into PoolGuard !!!
 
PoolGuard<shared_ptr<Connection>,shared_ptr<Pool<Connection,ConnectionCreator> > > guard(conn,pool);
2007-09-18 14:00:27 +00:00
Artem Pavlenko
13d741f400 added size method : returns (unused,used) size pair
useful for debugging
2007-09-18 13:58:01 +00:00
Artem Pavlenko
bb9f426dd9 don't check for boost_system by default 2007-09-18 10:54:44 +00:00
Andreas Volz
670862879b build plugins without .so extension 2007-09-17 20:16:43 +00:00
Artem Pavlenko
8e071f84c7 1. Changed internal geometry representation (explicit support for multi geometries)
(FIXME : label_spacing is still, too slow!!) 
2. Re-use some agg objects.
3. placement_finder cleanups! 
4. Added support for 'building_symbolizer' - extruded polygons
2007-09-16 11:23:51 +00:00
Andreas Volz
d38dedad68 + added GNU autotools build environment
+ raster and gdal input isn't tested. Not working currently...
+ *-input.so plugins created. Change loader in source or link plugin to correct place
+ use pkg-config uninstalled feature
  -> define project root to PKG_CONFIG_PATH to use mapnik without installation
+ added various library checks
+ don't install fonts
+ don't use included AGG
  -> check for a installed libagg
+ Added Makefile for c++ demo
+ don't build any python wrapper stuff
  -> this follows if all other building works
+ added Anjuta file
  -> not needed to build anything, but helps much if you use Anjuta
2007-09-14 23:07:16 +00:00
Artem Pavlenko
b835bac9ba user for loops instead of while, some cleanups 2007-09-11 11:26:10 +00:00
Artem Pavlenko
9b2b2a5691 clip query bbox to layer's extent 2007-09-11 11:06:20 +00:00
Artem Pavlenko
92b22558fd use 'limit 0' when gathering metadata, also we don't need getFieldSize at all 2007-09-07 15:50:40 +00:00
Artem Pavlenko
ef6f1060d3 link to fribidi on Darwin 2007-09-07 15:46:51 +00:00
svn
b98faab018 respect 'THREADING' flag 2007-09-01 09:50:06 +00:00
svn
63ca9a0b41 use non const char* on Linux 2007-09-01 09:48:01 +00:00
Artem Pavlenko
2ad4634034 added encoding='latin1' parameter to display text correctly 2007-08-29 15:23:39 +00:00
Artem Pavlenko
edb4150b33 restored iconv support 2007-08-29 15:21:32 +00:00
Artem Pavlenko
388eb1761f we don't need those 2007-08-29 15:19:33 +00:00