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

279 commits

Author SHA1 Message Date
artemp
4a07a62bfd + use proper mapnik installation path aka prefix 
```./rundemo /usr/local```
 2013-01-10 20:48:56 +00:00
Dane Springmeyer
bb43f2cec1 refactor params interface to move lexical cast out of header 2013-01-09 19:12:20 -08:00
Dane Springmeyer
f135bd325e fix compile of rundemo - now using new cairo internal interface that drops cairomm depedency 2013-01-09 12:48:05 -08:00
artemp
f25d4d9279 + implement cairo_context wrapper and remove unnecessary dependencies 
( cairomm, libsigc++)
 2013-01-09 17:00:30 +00:00
Dane Springmeyer
3378166b64 iwyu 2013-01-03 18:58:44 -08:00
artemp
f7ad2f18fa + commenting out grid rendering - not sure how to display 'long long' values. 2013-01-02 15:39:36 +00:00
Dane Springmeyer
bb27156df0 use internal noncopyable class to speed up compile times slightly 2012-12-16 18:19:52 -08:00
Dane Springmeyer
ccda92fed1 Revert "finish moving symbolizers out of rule" 
This reverts commit 20a317860d.
 2012-10-10 10:51:06 -07:00
Dane Springmeyer
20a317860d finish moving symbolizers out of rule 2012-10-10 10:02:45 -07:00
Hermann Kraus
99265b22ac Add simple render script. 2012-09-10 02:42:59 +02:00
artemp
967d6110bf + singleton: return ref from instance() method 2012-09-07 16:23:03 +01:00
Dane Springmeyer
28063e28aa update the demo/tests - refs #1460 2012-09-03 15:33:14 -07: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
d9fa1cb0c2 remove old $ cruft 2012-08-24 13:49:28 -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
artemp
1b92d81459 + add missing header 2012-08-16 10:41:48 +01:00
Dane Springmeyer
e95886f327 catch exceptions upon startup 2012-07-31 10:45:38 -07:00
Dane Springmeyer
b4f3d6da11 include what you use 2012-07-24 18:35:41 -07:00
artemp
7b10400be9 + update rendering code to work with new labeling methods 
+ rename num_points() to size()
+ rename get_vertex() to vertex()
 2012-07-19 16:36:44 +01:00
artemp
6cde3e6864 + add scale_factor_ UI (QDoubleSpinBox) 2012-07-10 16:58:43 +01:00
Dane Springmeyer
b365923772 use clang++ and mapnik-config by default to build viewer 2012-07-06 12:58:42 -07:00
Dane Springmeyer
d8c719f05e finish exposing scale_factor to cairo_renderer 2012-07-05 14:54:58 -07:00
Artem Pavlenko
6a4c207254 + make it compile against latyest master (FIXME) 2012-06-07 11:46:50 +01:00
Carl Simonson
c696c85dd4 viewer: add mouse wheel zooming 
This change makes the viewer zoom in and out when using the scroll wheel.
The zoom tracks the position of the mouse pointer when zooming in so that
the map will be centered under the mouse after a zoom.
 2012-05-31 19:27:19 -05:00
Carl Simonson
963cd83f98 viewer: show more exception messages 
When trying to render the map widget in the viewer, we catch exceptions
and print out the message to stderr. The only exceptions that are printed
are mapnik::config_error messages. mapnik can throw more errors, so this
change makes it catch all std::exceptions.
 2012-05-31 18:11:10 -05:00
Artem Pavlenko
500f57cf60 + make vertex() and rewind() methods const 
+ remove unused coord_transforms
+ rename coord_transform2 to coord_transform
 2012-05-31 12:13:09 +01:00
Artem Pavlenko
1077b79a63 Revert "initialise blur radius's to 1 for real this time" 
This reverts commit f76c6ee25f.
 2012-05-24 11:37:24 +01:00
Artem Pavlenko
f76c6ee25f initialise blur radius's to 1 for real this time 2012-05-23 20:38:42 +01:00
Artem Pavlenko
aad7c5e384 + implement compositing for text 
+ refactor image_32
 2012-05-09 12:39:23 +01:00
Artem Pavlenko
b5721181cd + experimental grid vis (TODO: assigned pallete colours) 
useful to testing grid output
 2012-05-03 17:18:02 +01:00
Artem Pavlenko
0bec7f56d3 + support multiple renderers 
+ add QComboBox to switch between renderers
 2012-05-03 15:21:17 +01:00
Artem Pavlenko
a72ee4ba66 Merge branch 'master' into compositing 
Conflicts:
	include/mapnik/image_compositing.hpp
	include/mapnik/util/conversions.hpp
	include/mapnik/value.hpp
	src/agg/agg_renderer.cpp
	src/agg/process_line_symbolizer.cpp
	src/agg/process_polygon_symbolizer.cpp
	src/png_reader.cpp
	src/svg_parser.cpp
	utils/svg2png/svg2png.cpp
 2012-05-01 12:35:49 +01:00
Artem Pavlenko
ad16d5da33 work-around: QT moc compiler bug 2012-04-18 12:15:50 +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
Artem Pavlenko
d855568400 + use smooth=1.0 for water polygons 2012-03-14 17:06:23 +00:00
Artem Pavlenko
0c537ed9ee + add: #include mapnik/config_error.hpp 2012-03-14 14:55:14 +00:00
Artem Pavlenko
207ecfd597 remove camel-case names from layer.[h,c]pp 2012-03-12 15:39:59 +00: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
7f083bd974 output argb32 and rgb24 using pycairo 2012-01-18 10:39:10 -05:00
Artem Pavlenko
aa1976c824 update 'info' tool to work with new feature impl 2012-01-13 17:19:03 +00:00
Artem Pavlenko
0eb8e2d246 temp fix to compile FIXME 2012-01-12 10:04:49 +00:00
Artem Pavlenko
4d849e15d8 add 'tiff' output to python/c++ demos 2011-11-29 11:13:27 +00:00
Artem Pavlenko
b689670ffd 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
38c0f0ca1b correct string encoding 2011-11-16 12:07:09 +00:00
Dane Springmeyer
4654312d00 code formatting 2011-11-13 19:54:32 -08:00
kunitoki
2e23eee24c - small comment fix in viewer 2011-10-23 16:09:12 +02:00
kunitoki
596757a269 - fix copyright to 2011 (script to do this will follow) 2011-10-23 15:04:25 +02:00
Artem Pavlenko
7468c95084 + use 'class' 2011-09-08 08:21:48 +00:00
Artem Pavlenko
6325868003 + fix missing header 2011-09-08 08:21:41 +00: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
2317efe15f + call update and emit signal after proj calc 2011-08-11 11:04:11 +00:00
Dane Springmeyer
1070b293ad tabs -> spaces 2011-05-04 15:53:36 +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
0e491b2f8d fix permissions setting on demo viewer.ini 2010-12-12 18:21:45 +00:00
Dane Springmeyer
8474b45ce5 honor custom ldflags when building the rundemo app 2010-11-14 08:38:38 +00:00
Artem Pavlenko
ab101401cd + simplify geometry implementation 
+ removed multiple geometry typedefs
+ use geometry_type
+ revert to storing vertices in vector_vertex
  (previous implementation using std::vector was
   fragmenting heap causing performance issues with large geometries)
+ FIXME: hit_test is broken!
 2010-11-03 13:19:15 +00:00
Artem Pavlenko
0823b83900 + apply Nino Walker's patch text_minimum_padding.diff #547 
TODO:  consider simplifying text symbolizer options
 2010-11-03 13:18:56 +00:00
Artem Pavlenko
962f2b8c5e + use forward slashes in *.ini file 2010-09-10 13:15:15 +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
466e44e4ef reasonable defaults for viewer.pro 2010-08-18 20:47:12 +00:00
Dane Springmeyer
6cce96dd06 upgrade default projection of epsg:4326 to match exactly what proj4 stores in /usr/local/share/epsg for 4326 (aka WGS84) 2010-08-10 18:18:31 +00:00
Dane Springmeyer
d58ee9e0f9 use SCons to build up the mapnik viewer ini file 2010-07-22 22:14:19 +00:00
Dane Springmeyer
b4851dcb78 viewer: zoom to full extent of map when loading from xml 2010-07-15 23:08:22 +00:00
Dane Springmeyer
3bedc85774 make use of new freetype functions added in r2025 2010-07-15 23:08:02 +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
Artem Pavlenko
51c20a4a6a + store and access mapnik-plugins-dir and font-dirs 
using QSettings
+ add viewer.ini
 2010-06-18 10:53:57 +00:00
Artem Pavlenko
e415c6e08e + catch all exceptions in load_map_file 2010-06-18 10:53:49 +00:00
Artem Pavlenko
3e2a82ed16 + add resolution to mapwidget 
+ add resolution command option
 2010-06-17 08:26:08 +00:00
Artem Pavlenko
1d0ccd689b + avoid rendering map twice when bbox is specified 2010-06-15 12:28:30 +00:00
Artem Pavlenko
bb6fafad42 + don't call zoom_all if bounding box is supplied 2010-06-15 12:27:34 +00:00
Artem Pavlenko
68ff49d429 + untabify 2010-06-15 12:27:26 +00:00
Artem Pavlenko
68a620576f + print bbox in Lat/Lon wgs84 to stdout 2010-06-03 12:34:37 +00:00
Artem Pavlenko
21caaea891 + fancy brush style 2010-06-01 13:30:53 +00:00
Dane Springmeyer
25c936c1e6 more demo/utilities working with mapnik2 2010-05-07 19:46:05 +00:00
Artem Pavlenko
304538bcf3 + show expr string in styles control 2010-03-24 18:01:37 +00:00
Artem Pavlenko
0ed2f6dc42 + update viewer to work with latest naming changes 2010-03-17 22:01:42 +00:00
Dane Springmeyer
d7256295ae port r1680/r1683/r1690 from 0.7.1-dev branch to trunk 2010-03-12 18:23:06 +00:00
Artem Pavlenko
8661d60f43 + move layer info logic into dialog ctor 2010-03-10 17:08:37 +00:00
Artem Pavlenko
556df8a751 + don't fail if load_map throws config error 2010-03-10 17:08:28 +00:00
Artem Pavlenko
1cd9c3257d + update paths to work with mapnik2 2010-03-10 10:44:15 +00:00
Artem Pavlenko
bbfdc4fab8 + use mapnik2 for python module name 
+ update rundemo.py
 2010-03-08 11:54:44 +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
Dane Springmeyer
67a8f33da9 fix minor issues caught in debian packaging relating to executable status and spelling 2010-02-21 17:28:01 +00:00
Artem Pavlenko
5bbc6468bc + add save_map impl 2010-02-10 15:16:44 +00:00
Artem Pavlenko
a42f3d7265 + tidy 
+ zoom_all on startup
 2010-01-20 15:25:41 +00:00
Dane Springmeyer
067fdb884d sync trunk with new cairo support added previously to 0.7 branch in r1531 2010-01-11 18:55:30 +00:00
Artem Pavlenko
8bc7117bf3 + catch mapnik_config exception 2009-12-21 13:45:07 +00:00
Artem Pavlenko
aa7fc86acd + fix compiler warnings (signed/unsigned comp) 2009-12-21 13:44:56 +00:00
Artem Pavlenko
06f0ed47e2 + don't default to lib64 schema 2009-12-21 13:44:48 +00:00
Artem Pavlenko
d88bb9270d + don't use lib64 on osx 2009-12-21 13:44:38 +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
f637ed6cf8 fix typo in rundemo.py found by szotsak - closes #419 2009-09-27 02:55:31 +00:00
Dane Springmeyer
16f4efc07b python: add better handling of cairo/pycairo support, refactor rundemo.py, add basic tests for cairo surfaces (closes #392) 2009-07-28 06:27:10 +00:00
Dane Springmeyer
e7dd9094a5 revert unintended file changes from r1275 2009-07-26 01:15:44 +00:00
Dane Springmeyer
45266074c8 scons: fix typo, and ensure all temp output is writeable 2009-07-26 01:08:51 +00:00
Dane Springmeyer
e97df7a721 fix up compilation of rundemo based on cairo availability - closes #285 2009-07-01 02:24:13 +00:00
Artem Pavlenko
424949d312 + load all fonts in specified dir 2009-06-30 16:23:50 +00:00
Dane Springmeyer
7617fc643f update the viewer to use the new DejaVu fonts in trunk and make the paths in 'main.cpp' easier to configure 2009-04-10 16:37:41 +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
Dane Springmeyer
e089c14ac5 remove spurious exec flag 2009-02-20 19:53:57 +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
a448b7b889 + update to current trunk 2009-01-14 12:41:37 +00:00
Artem Pavlenko
9a75034a88 + applied python_point_datasource.patch from lwu 2009-01-13 00:56:09 +00:00
Artem Pavlenko
b352e91432 + added python executable path 
+ set Python source code encoding to utf-8
+ use UTF-8 encoded filter expression : Filter("[NOM_FR] = 'Québec'")
+ better initial bounding box
 2008-11-16 21:36:23 +00:00
Artem Pavlenko
dce49f4a75 + hebrew rtl patch from JonB 2008-10-09 07:23:36 +00:00
Artem Pavlenko
5602ca227f + use 'avoid_edges' parameter 2008-09-21 19:52:12 +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
Tom Hughes
06006d2f24 Add cairo support to the python bindings - needs Pycairo installed. 2008-03-12 00:37:53 +00:00
Artem Pavlenko
a003fbbe6d dont need those 2008-02-29 16:28:03 +00:00
Artem Pavlenko
4a4af94e54 missing image 2008-02-07 11:10:28 +00:00
Artem Pavlenko
3f848ba14d don't need to include agg headers 2008-02-05 13:59:24 +00:00
Artem Pavlenko
8909bde84b new icons (TODO!) 2008-02-04 16:15:13 +00:00
Artem Pavlenko
7fec4b71fe updated to be compatble with latest trunk 2008-01-27 15:48:42 +00:00
Artem Pavlenko
651cdbe968 added support for saving images into Python String object 
(NOTE: some methods have different signitures now- API changed)
 2008-01-25 14:40:48 +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
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
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
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
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
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
3a9a77d95f render map once and output three images 2008-01-03 11:39:10 +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
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
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
2ad4634034 added encoding='latin1' parameter to display text correctly 2007-08-29 15:23:39 +00:00