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

65 commits

Author SHA1 Message Date
Dane Springmeyer
3378166b64 iwyu 2013-01-03 18:58:44 -08:00
artemp
967d6110bf + singleton: return ref from instance() method 2012-09-07 16:23:03 +01:00
Colin Rundel
dc3763885c More parser clean up - color parser 
Dropped color_factory class in favor of single color_parser function. Moved implementation to new color_factory.cpp since it is odd to have two headers (color.hpp, color_factory.hpp) and only one source file.
 2012-08-29 16:41:48 -04:00
Dane Springmeyer
ac418a7d4e remote the last references 2012-08-27 16:43:40 -07:00
Dane Springmeyer
6c254999ae rundemo.cpp - no need to link to boost_program_options - closes #1406 2012-08-17 09:32:55 -07:00
Dane Springmeyer
b4f3d6da11 include what you use 2012-07-24 18:35:41 -07:00
Artem Pavlenko
aad7c5e384 + implement compositing for text 
+ refactor image_32
 2012-05-09 12:39:23 +01:00
Dane Springmeyer
3e3bdf6607 compile rundemo even during install 2012-04-04 15:18:28 -07:00
Dane Springmeyer
b5af9e3639 use default env compiler 2012-04-04 15:17:52 -07:00
Dane Springmeyer
d6c4e7f7fc fix encoding of rundemo.cpp (windows1 -> utf8) and correctly declare the encoding of the boundaries shapefile (fixing white background to be green) 2012-04-04 15:17:37 -07:00
Hermann Kraus
52702d3a20 Rename filter_factory to expression. 2012-02-12 13:06:39 +01:00
Dane Springmeyer
7b1643f0e3 whitespace fixes 2012-02-01 17:38:18 -08:00
Artem Pavlenko
40da9e5618 add 'tiff' output to python/c++ demos 2011-11-29 11:13:27 +00:00
Artem Pavlenko
14700dba16 switch back from mapnik2 to mapnik 
add mapnik2 module which redirects to mapnik and issues DeprecationWarning
 2011-11-23 11:33:58 +00:00
Artem Pavlenko
2e3fd34f13 correct string encoding 2011-11-16 12:07:09 +00:00
Dane Springmeyer
39d199aa49 code formatting 2011-11-13 19:54:32 -08:00
kunitoki
f1fb0c1939 - fix copyright to 2011 (script to do this will follow) 2011-10-23 15:04:25 +02:00
Dane Springmeyer
22c39d91ba scons: rename all SConscript files to more friendly name of 'build' with a python extension for quick syntax detection in editors 2011-08-30 05:32:01 +00:00
Dane Springmeyer
ba03f91d26 scons: maintain cairo/cairomm cflags in 'mapnik config --cflags' output 2011-08-30 05:17:50 +00:00
Dane Springmeyer
2c75feed65 scons: fix bug that propagated libmapnik CXXFLAGS too liberally (in this case to plugins) 2011-08-29 23:01:33 +00:00
Dane Springmeyer
59460b07f9 fix demo make file 2011-08-29 22:42:29 +00:00
Dane Springmeyer
6cb31bd109 scons: better propagation of libmapnik build flags to command line utilities and mapnik-config - also remove conditional flags on specific cairo rendering .cpp files as this was not working right - closes #837 2011-08-29 21:12:22 +00:00
Dane Springmeyer
389c922d9e upgrade expression syntax 2011-08-22 20:26:45 +00:00
Dane Springmeyer
3e67c1d694 scons: centralize install path info 2011-08-12 21:31:28 +00:00
Dane Springmeyer
c4deda8fce scons: copy env setting 2011-08-12 20:01:39 +00:00
Dane Springmeyer
af62ad9c27 scons: collect and propogate the libs used to link libmapnik 2011-08-11 21:11:11 +00:00
Artem Pavlenko
98b7f62155 + remove template from mapnik::rule 
+ rename globaly rule_type -> rule
 ( ticket #552 )
 2011-01-13 21:35:01 +00:00
Dane Springmeyer
8474b45ce5 honor custom ldflags when building the rundemo app 2010-11-14 08:38:38 +00:00
Dane Springmeyer
9674171eb4 fixes for building on solaris and opensolaris, in addition to automatic running of ldconfig (will benefit builds on linux and fail silently otherwise) 2010-08-26 01:21:47 +00:00
Dane Springmeyer
d549cfe30a scons: only apply HAS_CAIRO & HAS_PYCAIRO flags to cairo related files 2010-07-14 22:47:34 +00:00
Dane Springmeyer
4d477a47cd scons: conditionally add CXXFLAGS for headers needing Cairo support 2010-07-14 04:40:33 +00:00
Artem Pavlenko
9b3809443c + fix naming style in mapnik::Map 2010-06-25 15:23:35 +00:00
Dane Springmeyer
25c936c1e6 more demo/utilities working with mapnik2 2010-05-07 19:46:05 +00:00
Dane Springmeyer
a2151c8e13 fix up rundemo, allowing compilation on osx and using expression in text_symbolizer 2010-02-23 03:41:39 +00:00
Artem Pavlenko
47dc1e197b + merge mapnik2 to trunk 2009-12-16 20:02:06 +00:00
Dane Springmeyer
b104253d9c Add ability to link to custom icu lib name, and remove the unneeded linking to icudata on osx, while offering compiler flags required for compiling against libicucore provided by Apple 2009-11-24 20:32:41 +00:00
Dane Springmeyer
e97df7a721 fix up compilation of rundemo based on cairo availability - closes #285 2009-07-01 02:24:13 +00:00
Dane Springmeyer
7418806450 scons: explicitly link against libmapnik for command line programs to be built 2009-03-03 19:44:36 +00:00
Dane Springmeyer
a79714f6e2 Add a SCons build script for the c++ rundemo sample program, and touchup code and readme, closes #197 2009-03-03 19:28:26 +00:00
Artem Pavlenko
a3c5308b06 + mapnik-rundemo-with-cairo.patch (jonb) 2009-01-15 22:53:29 +00:00
Artem Pavlenko
a3f1e664be + updated 2009-01-14 12:43:26 +00:00
Artem Pavlenko
9a75034a88 + applied python_point_datasource.patch from lwu 2009-01-13 00:56:09 +00:00
Artem Pavlenko
3f9127b5d0 reverting back to 700 2008-06-29 10:58:29 +00:00
Artem Pavlenko
3275cf9ce6 applied font fallbacj patch from Beau Gunderson 2008-06-29 10:40:08 +00:00
Artem Pavlenko
7fec4b71fe updated to be compatble with latest trunk 2008-01-27 15:48:42 +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
David
4091f526d5 - fixed conflict 
- removed instance() call: the fontengine is not a singleton any more
 2008-01-07 06:32:15 +00:00
Artem Pavlenko
747ef8cccf added a bit of colour to SCons 2008-01-03 11:41:39 +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