Commit graph

687 commits

Author SHA1 Message Date
Artem Pavlenko
78a0e6725b prepend DESTDIR to plugins path
replace multiple directory separators
2008-01-24 14:44:04 +00:00
Artem Pavlenko
66bc84ff7e check for empty strings in params 2008-01-24 12:07:53 +00:00
Dave
5bbe90b85f Remove find_placements, build_path_follow, build_path_horizontal.
Add new find_point_placements to cover the gap left.
Change shield symbolizer to use find_point_placements.
Results are the same as before, but with much less duplicate code.
2008-01-24 01:16:14 +00:00
Dave
f11a62b849 throw an exception rather than exit the program when an unknown font is specified.
It would be better if this was done when contructing the text_symbolizer, but this will do.
2008-01-23 21:56:04 +00:00
Dave
a73687aeee Woops, remove debug output. 2008-01-23 21:39:49 +00:00
Dave
1d556b54fd Make line placement retry if it places >= 50% of the characters upside down. 2008-01-23 21:38:48 +00:00
Artem Pavlenko
3d9024ddc4 make iconv check optional 2008-01-23 21:06:28 +00:00
Dave
1428d282b9 Update displacement test data to have some tests for text orientation also. 2008-01-23 20:54:28 +00:00
Dave
671c215ae6 Make specifying an invalid font a fatal error. ticket #31 2008-01-23 20:31:50 +00:00
Artem Pavlenko
b04e6197aa some cleanups and fixes 2008-01-23 15:24:59 +00:00
Artem Pavlenko
f802250e0f refactored image i/o , see ticket #15 for more details. 2008-01-23 11:34:59 +00:00
Dave
918bd1ef6b Improved character placement code.
Slightly changes the result of max_char_angle_delta as now character angles aren't strict against the line angles.
Example screenshots on mailing list! :)
2008-01-23 04:18:17 +00:00
Artem Pavlenko
df643baa54 added missing PGSQL 2008-01-21 20:56:31 +00:00
Artem Pavlenko
2b60d6d425 applied patch to build on OSX Leopard and Sun's C++ compiler on Solaris from Justin Bronn 2008-01-21 20:15:07 +00:00
Artem Pavlenko
418e3fc43a added missing extent() method 2008-01-21 20:07:32 +00:00
Artem Pavlenko
96daa6e996 applied patch from gravitystorm (see ticket:64) 2008-01-21 19:59:06 +00:00
Artem Pavlenko
2fe6e6a0cb link to iconv on Darwin 2008-01-21 16:40:50 +00:00
Artem Pavlenko
a61553edb8 removed redundant bounding box from label_placement 2008-01-21 16:18:46 +00:00
Dave
d29c825299 Add a test for Character placement within a string.
Currently the characters on bends end up on ugly angles.
2008-01-21 03:47:52 +00:00
Dave
d3ec70aff9 Return pre-r557 rendering of line aligned labels. (Not the code, the algorithm ideas)
Spacing and no spacing line rendering are done by the same function.
Code is cleaner, performance should be equal or improved.
Text displacement is "Different", better in some cases and worse in others, I can revert it if wanted.
Old non spacing code is not yet removed as it is used by ShieldSymbolizer which I haven't investigated yet.
Individual character placement still has issues, that is my next task to fix!
2008-01-21 03:08:18 +00:00
Dave
f663d69cb6 Update overlap with more tests. 2008-01-18 04:01:17 +00:00
Dave
02fe8ba276 Add test for text displacement. 2008-01-18 02:07:12 +00:00
Dave
76e18f8a4a Remove functions that don't exist from placement headers. 2008-01-16 21:42:08 +00:00
Dave
a092425940 Add newly made data and test for testing label overlap handling. Rename old test to textspacing. 2008-01-16 02:00:48 +00:00
Dave
e96e7b18fa Fix find_placements_with_spacing in relation to http://trac.mapnik.org/ticket/62
force_odd_labels also works again.
2008-01-16 01:13:27 +00:00
Dave
a401a26ccb Additional comments for the placement finder. 2008-01-15 22:32:14 +00:00
Dave
3592872d4b Add a new test demo for regression testing label placement.
If someone creates tests for other areas of mapnik they can be added in too.
2008-01-15 20:57:59 +00:00
Dave
017a966ea1 Fix blending onto transparent background. Detailed on mailing list. 2008-01-14 20:43:55 +00:00
Artem Pavlenko
30968b337e only print to clog when MAPNIK_DEBUG is defined 2008-01-11 10:09:54 +00:00
Artem Pavlenko
7b73a701b2 1. define BOOST_SPIRIT_THREADSAFE (should be defined in config.hpp??)
to be compatible with the core library.
2. use mapnik install_dir as input argument. 
3. Generate three images as in rundemo.py
2008-01-09 11:48:39 +00:00
David
4e14658fe4 - added exception handling 2008-01-08 21:09:16 +00:00
Artem Pavlenko
0f49956a56 reflect 'allow_overlap' property in Python bindings
(patch from rcoup)
2008-01-07 10:23:02 +00:00
Artem Pavlenko
4529e83562 fixed parameters order in image reader 2008-01-07 10:20:05 +00:00
David
0dbaeafbe9 - found and fixed another wild pointer 2008-01-07 07:32:55 +00:00
David
4091f526d5 - fixed conflict
- removed instance() call: the fontengine is not a singleton any more
2008-01-07 06:32:15 +00:00
David
bec8f8951f fixed pointer to temporary bug 2008-01-03 15:48:10 +00:00
Artem Pavlenko
16f481fc27 applied mapniksoname.patch from Martjin 2008-01-03 12:16:27 +00:00
Artem Pavlenko
747ef8cccf added a bit of colour to SCons 2008-01-03 11:41:39 +00:00
Artem Pavlenko
0390f129a1 refactored transcoder stuff 2008-01-03 11:41:00 +00:00
Artem Pavlenko
3a9a77d95f render map once and output three images 2008-01-03 11:39:10 +00:00
Artem Pavlenko
0c7b9e3736 setup install_name (soname on Darwin) for libmapnik 2007-12-31 12:34:31 +00:00
Artem Pavlenko
52bed0b89a applied patch from Jochen (throw an exception if unknown type) 2007-12-19 16:34:36 +00:00
Artem Pavlenko
37f49e29cc Applied patches from Martijn van Oosterhout:
1. The first allows the user to add a <FileSource
name="foo">/home/bar/baz/</FileSource> to the beginning of the file
and then in any of the symbolisers you can say:

<FooSymboliser base="foo" name="bridge">
It it will refer to the file /home/bar/baz/bridge.

2. The second allows you to create Datasource templates at the top
level, which can be used later in the actual layers like so:
<Map>
  <Datasource name="db">
   <Paramaeter name="host">/tmp</Parameter>
  </Datasource>
  <Layer name="lay">
    <Datasource base="db">
      <Parameter name="table">points</Parameter>
    </Datasource>
  </Layer>
</Map>

And the host parameter will be used in the layer.

3. The third adds the "base" parameter to the raster and shape input
plugins. All it does is specify a path to prefix to the filename prior
to using it. Together with the above feature it allows things like:
<Map>
  <Datasource name="shapes">
   <Paramaeter name="base">/home/foo/shapes</Parameter>
  </Datasource>
  <Layer name="lay">
    <Datasource base="shapes">
      <Parameter name="file">places</Parameter>
    </Datasource>
  </Layer>
</Map>

And it will use the shapefile /home/foo/shapes/places
2007-12-17 14:21:04 +00:00
Artem Pavlenko
002f37bdc9 corrected parameters order 2007-12-17 12:46:11 +00:00
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