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

368 commits

Author SHA1 Message Date
Hermann Kraus
df7c2b5c0e Merge commit '57aa6dd05230876bf7c022d3554436e4d35de77f' into harfbuzz 
Conflicts:
	tests/visual_tests/test.py
 2013-03-16 12:46:01 +01:00
Dane Springmeyer
cea31234fa allow building svg_renderer again - refs #1438 2012-11-01 10:07:29 -07:00
Hermann Kraus
406904a1f6 Merge branch 'master' into harfbuzz 
Conflicts:
	bindings/python/mapnik/__init__.py
	include/mapnik/font_engine_freetype.hpp
	src/load_map.cpp
 2012-09-15 01:39:33 +02:00
Dane Springmeyer
4d5ab83fb3 add harfbuzz custom paths to environment 2012-09-14 08:55:01 -07:00
Dane Springmeyer
2ded86629f scons: do not invoke any install or uninstall targets if using SYSTEM_FONTS - closes #1481 2012-09-13 13:40:15 -07:00
Hermann Kraus
85e075b8ea Merge branch 'master' into harfbuzz 
Conflicts:
	bindings/python/mapnik_text_placement.cpp
	include/mapnik/font_engine_freetype.hpp
	include/mapnik/map.hpp
	include/mapnik/metawriter.hpp
	include/mapnik/metawriter_inmem.hpp
	include/mapnik/metawriter_json.hpp
	include/mapnik/placement_finder.hpp
	include/mapnik/symbolizer.hpp
	include/mapnik/symbolizer_helpers.hpp
	include/mapnik/text_properties.hpp
	src/agg/process_shield_symbolizer.cpp
	src/build.py
	src/cairo_renderer.cpp
	src/feature_style_processor.cpp
	src/grid/process_shield_symbolizer.cpp
	src/metawriter.cpp
	src/metawriter_inmem.cpp
	src/placement_finder.cpp
	src/processed_text.cpp
	src/symbolizer_helpers.cpp
	tests/visual_tests/images/lines-shield-200-reference.png
	tests/visual_tests/images/lines-shield-400-reference.png
	tests/visual_tests/images/lines-shield-600-reference.png
	tests/visual_tests/images/lines-shield-800-reference.png
	tests/visual_tests/styles/formatting.xml
	tests/visual_tests/test.py
 2012-09-07 19:07:31 +02:00
Dane Springmeyer
f73168a4cc scons: remove helloworld plugin if out of date and make warning yellow not red 2012-09-03 11:29:14 -07:00
Dane Springmeyer
5120d0398d add build file for headers and svg/output code directories to hold the svg_renderer used for output - refs #1438 2012-08-27 17:58:49 -07:00
Dane Springmeyer
13bcd3f17f now working on mapnik v2.2.0-pre 2012-08-23 15:19:56 -07:00
Dane Springmeyer
a25aac80f7 setting up for mapnik v2.1.0 release 2012-08-23 14:50:36 -07:00
Dane Springmeyer
05fdb5424b more fully disable the svg_renderer backend - refs #1438 2012-08-23 10:10:18 -07:00
Dane Springmeyer
1e0a4ace86 scons: add option to configure custom paths to ltdl - refs #1376 2012-08-22 14:59:51 -07:00
Dane Springmeyer
333ab9a37e only build pgsql2sqlite if boost_program_options is available 2012-08-17 09:37:08 -07:00
Dane Springmeyer
9ef6c0dce1 scons: ensure you can build pgsql2sqlite even if the sqlite datasource plugin is not requested 2012-08-16 16:21:10 -07:00
Dane Springmeyer
a986aedd05 remove 'info' and 'fatal' severities for logging to simplify framework - closes #1400 2012-08-16 15:52:32 -07:00
Dane Springmeyer
619af3e3c7 scons: remove boost_python library check - there is not way to include multiple headers and therefore no way to safely include both boost_python and -lpython libs - refs #1394 2012-08-16 14:29:42 -07:00
Dane Springmeyer
57246bb569 scons: better handling of implicit dependencies - also add distclean target - refs #1395, #1324, and #1310 2012-08-16 14:12:49 -07:00
Dane Springmeyer
a3e27ed726 Merge branch 'master' of github.com:mapnik/mapnik 2012-08-16 12:29:27 -07:00
Dane Springmeyer
d850ee8b76 correct various old trac links to point to github - closes #1396 2012-08-16 12:27:58 -07:00
Dane Springmeyer
53685f3f99 scons: create working uninstall target for fonts 2012-08-16 10:05:34 -07:00
Dane Springmeyer
697a750f6a make LIBDIR_SCHEMA configurable - closes #1377 2012-08-15 18:32:28 -07:00
Dane Springmeyer
e4a4fe41c2 do not use /usr/local as default proj search path - instead match all other defaults as /usr/ - closes #1288 2012-08-15 14:16:49 -07:00
Hermann Kraus
1dba0581c2 Merge branch 'master' into harfbuzz 
Conflicts:
	src/cairo_renderer.cpp
 2012-08-12 12:32:35 +02:00
Artem Pavlenko
189322ef9f Merge pull request #1337 from rjw57/rjw57-python-plugin 
Request for comments: python: a new plugin to use arbitrary Python as a data source
 2012-08-06 05:09:29 -07:00
Rich Wareham
156a7590f4 python: a new plugin to use arbitrary Python as a data source 
This plugin allows you to write data sources in the Python programming language.
This is useful if you want to rapidly prototype a plugin, perform some custom
manipulation on data or if you want to bind mapnik to a datasource which is most
conveniently accessed through Python.

The plugin may be used from the existing mapnik Python bindings or it can embed
the Python interpreter directly allowing it to be used from C++, XML or even
JavaScript.

Mapnik already has excellent Python bindings but they only directly support
calling *into* mapnik *from* Python. This forces mapnik and its input plugins to
be the lowest layer of the stack. The role of this plugin is to allow mapnik to
call *into* Python itself. This allows mapnik to sit as rendering middleware
between a custom Python frontend and a custom Python datasource. This increases
the utility of mapnik as a component in a larger system.

There already exists MemoryDatasource which can be used to dynamically create
geometry in Python. It suffers from the problem that it does not allow
generating only the geometry which is seen by a particular query. Similarly the
entire geometry must exist in memory before rendering can progress. By using a
custom iterator object or by using generator expressions this plugin allows
geometry to be created on demand and to be destroyed after use. This can have a
great impact on memory efficiency. Since geometry is generated on-demand as
rendering progresses there can be arbitrarily complex 'cleverness' optimising
the geometry generated for a particular query. Obvious examples of this would
be generating only geometry within the query bounding box and generating
geometry with an appropriate level of detail for the output resolution.
 2012-07-31 17:05:27 +01:00
Hermann Kraus
4e3e5cb0b0 Merge branch 'master' into harfbuzz 
Conflicts:
	bindings/python/mapnik_shield_symbolizer.cpp
	include/mapnik/agg_renderer.hpp
	include/mapnik/cairo_renderer.hpp
	src/build.py
 2012-07-28 20:59:42 +02:00
Dane Springmeyer
4340e9a605 scons: fixup LIBDIR value settings - closes #1349 2012-07-27 10:56:24 -07:00
Dane Springmeyer
450bf40d4d suppress strict-aliasing warnings with older gcc and newer boost - refs #1330 2012-07-23 11:41:08 -07:00
Hermann Kraus
b53849d441 Merge branch 'master' into harfbuzz 
Conflicts:
	include/mapnik/font_engine_freetype.hpp
	include/mapnik/symbolizer_helpers.hpp
	src/agg/process_shield_symbolizer.cpp
	src/agg/process_text_symbolizer.cpp
	src/cairo_renderer.cpp
	src/font_engine_freetype.cpp
	src/formatting/list.cpp
	src/grid/process_shield_symbolizer.cpp
	src/grid/process_text_symbolizer.cpp
	src/symbolizer_helpers.cpp
	tests/visual_tests/styles/harfbuzz.xml
 2012-07-21 20:19:22 +02:00
Dane Springmeyer
65b03a3230 scons: try to unbreak boost_python lib check on linux 2012-07-20 13:56:21 -07:00
Rich Wareham
ee7ebb61f2 SConstruct: trivial typo fix 'henche' -> 'hence' 2012-07-19 16:08:25 +01:00
Dane Springmeyer
b74738dd91 scons: make a failure to link boost_python non-fatal 2012-07-06 18:31:36 -07:00
Dane Springmeyer
17d3414b7a speed up scons by > 2x 2012-07-06 18:08:19 -07:00
Dane Springmeyer
3ddd38116c Merge branch 'master' of github.com:mapnik/mapnik 2012-07-06 11:54:04 -07:00
Dane Springmeyer
6e5a68f372 stop defaulting to lib64 on 64 bit unix systems - closes #1297 2012-07-06 11:35:29 -07:00
Dane Springmeyer
18d2c041b5 respect BOOST_APPEND for boost_python configure check 2012-07-06 07:48:23 -07:00
Dane Springmeyer
906de8e317 simplify boost_python library configure checks 2012-07-05 11:54:43 -07:00
Hermann Kraus
7c7dd0fa80 Add files from https://github.com/herm/harfbuzz-test. 2012-06-28 23:01:23 +02:00
Dane Springmeyer
c113fa8adb scons: no need to link python and be more concise about restoring env backup 2012-06-15 14:05:59 -04:00
Dane Springmeyer
5df056ae4c scons: expose CUSTOM_CFLAGS to enable custom CFLAGS to be used during the configure stage 2012-06-13 17:17:58 -04:00
Dane Springmeyer
fa46f97b73 Merge branch 'master' of github.com:mapnik/mapnik 2012-06-13 17:10:27 -04:00
Dane Springmeyer
30559a0610 scons: also set LINKFLAGS/LDFLAGS up front to ensure they are used in configure checks 2012-06-13 17:10:15 -04:00
Artem Pavlenko
e89eb99e28 + geojson input plugin (thanks, @tmcw!) 2012-06-13 13:30:58 +01:00
Dane Springmeyer
b7052029d8 start requiring >= boost 1.47 to enable things like the carto parser to be integrated soon 2012-05-24 17:07:56 -07:00
Dane Springmeyer
09426bf324 remove option to link againt external AGG - our local copy has critical fixes and is required 2012-05-24 17:05:51 -07:00
kunitoki
0e5dcbd810 - fixed unwanted behaviour with default log severity in SConstruct #937 2012-05-24 00:02:43 +02:00
Dane Springmeyer
0ccabf2650 whitespace 2012-04-26 19:57:03 -04:00
Dane Springmeyer
b34e0c02a6 the osm plugin is required now for visual tests to enable it by default 2012-04-19 11:27:33 -07:00
Dane Springmeyer
c33fdfd848 disable logging on by default until #1175 is resolved (refs #1175) 2012-04-11 18:08:11 -07:00
Dane Springmeyer
4d4316f7bc enable logging by default to maintain relatively similiar warning behavior as to pre-logging framework (TODO: perf testing) 2012-04-11 11:32:04 -07:00