diff --git a/INSTALL.md b/INSTALL.md index f2787e671..6bcca64f8 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -1,6 +1,6 @@ # Mapnik Installation -Mapnik is cross platform and runs on Linux, Mac OSX, Solaris, *BSD, and Windows. +Mapnik runs on Linux, OS X, Windows, and BSD systems. To configure and build Mapnik do: @@ -15,7 +15,7 @@ To trigger parallel compilation you can pass a JOBS value to make: $ JOBS=4 make ``` -(Note that compiling Mapnik needs several GBytes of RAM. If you use parallel compiliation it needs more.) +(Note that compiling Mapnik needs several GBytes of RAM. If you use parallel compilation it needs more.) To use a Python interpreter that is not named `python` for your build, do something like the following instead: @@ -29,15 +29,15 @@ NOTE: the above will not work on windows, rather see https://github.com/mapnik/m Then to run the tests locally (without needing to install): - make test-local + make test Install like: - sudo make install + make install If you need to uninstall do: - sudo make uninstall + make uninstall For more details see the `Building` Section below. @@ -62,7 +62,6 @@ Mapnik Core depends on: - These libraries are used: - filesystem - system - - thread (for python bindings only) - regex (optionally built with icu regex support) - program_options (optionally for mapnik command line programs) * libicuuc >= 4.0 (ideally >= 4.2) - International Components for Unicode @@ -79,19 +78,10 @@ Mapnik Core optionally depends on: * libwebp - WEBP graphics (Default enabled, if found) * libproj - PROJ.4 projection library (Default enabled, if found) -Mapnik Python bindings depend on: - - * Python 2.5-2.7 or >= 3.2 - * Boost python - * simplejson module if using <= 2.5 - -Note: Python 3.x is supported, see: https://github.com/mapnik/mapnik/wiki/Python3k - Additional optional dependencies: * Cairo >= 1.6.0 - Graphics library for output formats like PDF, PS, and SVG - pkg-config - Required for building with cairo support - - pycairo - Python bindings for cairo * PostgreSQL (for PostGIS plugin support) - libpq - PostreSQL libraries - pg_config - PostgreSQL installation capabilities @@ -160,17 +150,7 @@ For more details on usage see: You can run the Mapnik tests locally (without installing) like: - make test-local # see the Makefile for how this works - -Or you can install and test like: - - make install && make test - -Many of the tests are written in python and you can run them individually like: - - make install - python tests/python_tests/shapefile_test.py - + make test ## Learning Mapnik diff --git a/src/datasource_cache_static.cpp b/src/datasource_cache_static.cpp index 578b2f990..15f76bf6d 100644 --- a/src/datasource_cache_static.cpp +++ b/src/datasource_cache_static.cpp @@ -64,9 +64,6 @@ #if defined(MAPNIK_STATIC_PLUGIN_POSTGIS) #include "input/postgis/postgis_datasource.hpp" #endif - #if defined(MAPNIK_STATIC_PLUGIN_PYTHON) - #include "input/python/python_datasource.hpp" - #endif #if defined(MAPNIK_STATIC_PLUGIN_RASTER) #include "input/raster/raster_datasource.hpp" #endif @@ -115,9 +112,6 @@ static datasource_map ds_map = boost::assign::map_list_of #if defined(MAPNIK_STATIC_PLUGIN_POSTGIS) (std::string("postgis"), &ds_generator) #endif - #if defined(MAPNIK_STATIC_PLUGIN_PYTHON) - (std::string("python"), &ds_generator) - #endif #if defined(MAPNIK_STATIC_PLUGIN_RASTER) (std::string("raster"), &ds_generator) #endif diff --git a/utils/stats/mapdef_stats.py b/utils/stats/mapdef_stats.py deleted file mode 100755 index 29c79f17a..000000000 --- a/utils/stats/mapdef_stats.py +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env python - -import sys -from mapnik import * -if __name__ == "__main__": - if len(sys.argv) != 2: - print "usage : ./mapdef_stats.py " - sys.exit(0) - - m = Map(100,100) - styles = [] - num_rules = 0 - num_sym = 0 - load_map(m,sys.argv[1]) - for l in m.layers: - print "Layer:%s" % l.name - for s in l.styles: - print " Style:%s" % s - styles.append(s) - style = m.find_style(s) - num_rules += len(style.rules) - for r in style.rules: - print " Filter: %s" % r.filter - num_sym += len(r.symbols) - - print "Total number of layers %s" % len(m.layers) - print "Total number of styles %s" % len(set(styles)) # unique styles - print "Total number of rules %s" % num_rules - print "Total number of symbolizers %s" % num_sym