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
mapnik · May 1, 2012 · a72ee4b · a72ee4b
2 parents f57d2c2 + 635b245
commit a72ee4b
Show file tree

Hide file tree

Showing 302 changed files with 5,159 additions and 2,668 deletions.
diff --git a/.gitignore b/.gitignore
@@ -39,7 +39,8 @@ tests/data/sqlite/*index
 demo/c++/cairo-demo.pdf
 demo/c++/cairo-demo.png
 demo/c++/cairo-demo256.png
+demo/c++/demo.tif
 demo/c++/demo.jpg
 demo/c++/demo.png
 demo/c++/demo256.png
-
+tests/cpp_tests/*-bin
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -2,60 +2,60 @@
 
 Mapnik is written by Artem Pavlenko with contributions from:
 
-Andy Allen
-AJ Ashton
-Matt Amos
-Lucio Asnaghi
-Justin Bronn
-Christopher Brown
-Jon Burgess
-Toby Collet
-Robert Coup
-Berteun Damman
-Craig de Stigter 
-Jean-Francois Doyon
-David Eastcott
-Krzysztof Godlewski
-Beau Gunderson
-John Hague
-Dominic Hargreaves
-Aubrey Holland
-Tom Hughes
-Konstantin Käfer
-Mak Kolybabi
-Peter Körner
-Hermann Kraus
-Stella Laurenzo
-David Leaver
-Carlos López
-Dennis Luxen
-Tom MacWright
-Michal Migurski
-Andrii Mishkovskyi
-Ben Moores
-Dražen Odobašić
-Cameron Patrick
-Igor Podolskiy
-Reid Priedhorsky
-Brian Quinion
-Marcin Rudowski
-Christopher Schmidt
-Andreas Schneider
-Vincent Schut
-Ehud Shabtai
-David Siegel
-Steve Singer
-Paul Smith
-Vince Spader
-Philipp Spitzer
-Dane Springmeyer
-Dave Stubbs
-River Tarnell
-Oliver Tonnhofer
-Alberto Valverde
-Martijn van Oosterhout 
-Andreas Volz
-Lennard voor den Dag
-Shaun Walbridge
-Nick Whitelegg
-Leslie Wu
+* Andy Allen
+* AJ Ashton
+* Matt Amos
+* Lucio Asnaghi
+* Justin Bronn
+* Christopher Brown
+* Jon Burgess
+* Toby Collet
+* Robert Coup
+* Berteun Damman
+* Craig de Stigter 
+* Jean-Francois Doyon
+* David Eastcott
+* Krzysztof Godlewski
+* Beau Gunderson
+* John Hague
+* Dominic Hargreaves
+* Aubrey Holland
+* Tom Hughes
+* Konstantin Käfer
+* Mak Kolybabi
+* Peter Körner
+* Hermann Kraus
+* Stella Laurenzo
+* David Leaver
+* Carlos López
+* Dennis Luxen
+* Tom MacWright
+* Michal Migurski
+* Andrii Mishkovskyi
+* Ben Moores
+* Dražen Odobašić
+* Cameron Patrick
+* Igor Podolskiy
+* Reid Priedhorsky
+* Brian Quinion
+* Marcin Rudowski
+* Christopher Schmidt
+* Andreas Schneider
+* Vincent Schut
+* Ehud Shabtai
+* David Siegel
+* Steve Singer
+* Paul Smith
+* Vince Spader
+* Philipp Spitzer
+* Dane Springmeyer
+* Dave Stubbs
+* River Tarnell
+* Oliver Tonnhofer
+* Alberto Valverde
+* Martijn van Oosterhout 
+* Andreas Volz
+* Lennard voor den Dag
+* Shaun Walbridge
+* Nick Whitelegg
+* Leslie Wu
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,7 +9,27 @@ For a complete change history, see the SVN log.
 
 ## Mapnik 2.1.0
 
-- Fix Markers rendering so that ellipse height/width units are pixels (previously were unintentially radii)
+- PostGIS: Added 'simplify_geometries' option - will trigger ST_Simplify on geometries before returning to Mapnik (#1179)
+
+- Improved error feedback for invalid values passed to map.query_point
+
+- Fixed rendering of thin svg lines (#1129)
+
+- Improved logging/debugging system with release logs and file redirection (#937 and partially #986, #467)
+
+- GDAL: allow setting nodata value on the fly (will override value if nodata is set in data) (#1161)
+
+- GDAL: respect nodata for paletted/colormapped images (#1160)
+
+- PostGIS: Added a new option called 'autodetect_key_field' (by default false) that if true will
+  trigger autodetection of a given tables' primary key allowing for feature.id() to represent
+  globally unique ids. This option has no effect if the user has not manually supplied the 'key_field' option. (#804)
+
+- Cairo: Add full rendering support for markers to match AGG renderer functionality (#1071)
+
+- Fix Markers rendering so that ellipse height/width units are pixels (previously were unintentionally radii) (#1134)
+
+- Added 'ignore-placement` attribute to markers-symbolizer (#1135)
 
 - Removed PointDatasource - use more robust MemoryDatasource instead (#1032)
 
@@ -26,6 +46,41 @@ For a complete change history, see the SVN log.
 - Added support for justify-alignment=auto. This is the new default. (#1125)
 
 
+## Mapnik 2.0.1
+
+(Packaged from 5cd3cb2efdaf7e9990a57e8e00b652a81aaa39ae)
+
+- Support for PostGIS 2.0 (#956,#1083)
+
+- Switched back to "libmapnik" and "import mapnik" rather than "mapnik2" (mapnik2 will still work from python) (#941)
+
+- Restored Python 2.5 compatibility (#904)
+
+- Fixed `mapnik-config --version` (#903)
+
+- Cairo: Add full rendering support for markers to match AGG renderer functionality (#1071)
+
+- Fix Markers rendering so that ellipse height/width units are pixels (previously were unintentially radii) (#1134)
+
+- Added 'ignore-placement` attribute to markers-symbolizer (#1135)
+
+- Removed svn_revision info from mapnik-config and python bindings as git is now used
+
+- Removed OGCServer from core - now at https://github.com/mapnik/OGCServer (e7f6267)
+
+- Fixed SQLite open stability across platforms/versions (#854)
+
+- Workaround for boost interprocess compile error with recent gcc versions (#950,#1001,#1082)
+
+- Fix possible memory corruption when using hextree mode for png color reduction (#1087)
+
+- Fixed bug in shield line placement when dx/dy are used to shift the label relative to the placement point (Matt Amos) (#908)
+
+- Fix to avoid modifying a feature if an attribute is requested that does not exist (0f5ab18ed)
+
+- Fixed ability to save to jpeg format from python (7387afd9) (#896)
+
+
 ## Mapnik 2.0.0
 
 - Add minimum-path-length property to text_symbolizer to allow labels to be placed only on lines of a certain length (#865)

diff --git a/Makefile b/Makefile
@@ -18,9 +18,13 @@ uninstall:
 	python scons/scons.py uninstall
 
 test:
-	@python tests/visual_tests/test.py
-	@tests/cpp_tests/font_registration_test
-	@tests/cpp_tests/params_test
+	@echo "*** Running visual tests..."
+	@python tests/visual_tests/test.py -q
+	@echo "*** Running C++ tests..."
+	@for FILE in tests/cpp_tests/*-bin; do \
+		$${FILE}; \
+	done
+	@echo "*** Running python tests..."
 	@python tests/run_tests.py -q
 
 pep8:
@@ -30,6 +34,8 @@ pep8:
 	@pep8 -r --select=W391 -q --filename=*.py `pwd`/tests/ | xargs gsed -i -e :a -e '/^\n*$/{$d;N;ba' -e '}'
 
 grind:
-	@valgrind --leak-check=full tests/cpp_tests/font_registration_test
+	@for FILE in tests/cpp_tests/*-bin; do \
+		valgrind --leak-check=full --log-fd=1 $${FILE} | grep definitely; \
+	done
 
 .PHONY: clean reset uninstall test install
diff --git a/SConstruct b/SConstruct
@@ -15,8 +15,6 @@
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-#
-# $Id$
 
 
 import os
@@ -98,7 +96,7 @@ PLUGINS = { # plugins with external dependencies
             'rasterlite':  {'default':False,'path':'RASTERLITE','inc':['sqlite3.h','rasterlite.h'],'lib':'rasterlite','lang':'C'},
 
             # todo: osm plugin does also depend on libxml2 (but there is a separate check for that)
-            'osm':     {'default':False,'path':None,'inc':'curl/curl.h','lib':'curl','lang':'C'},
+            'osm':     {'default':True,'path':None,'inc':'curl/curl.h','lib':'curl','lang':'C'},
 
             # plugins without external dependencies requiring CheckLibWithHeader...
             'shape':   {'default':True,'path':None,'inc':None,'lib':None,'lang':'C++'},
@@ -244,7 +242,6 @@ else:
     LIBDIR_SCHEMA='lib'
 
 
-
 def pretty_dep(dep):
     pretty = pretty_dep_names.get(dep)
     if pretty:
@@ -325,7 +322,7 @@ opts.AddVariables(
     # Variables affecting rendering back-ends
 
     BoolVariable('RENDERING_STATS', 'Output rendering statistics during style processing', 'False'),
-    
+
     BoolVariable('INTERNAL_LIBAGG', 'Use provided libagg', 'True'),
 
     BoolVariable('SVG_RENDERER', 'build support for native svg renderer', 'False'),
@@ -345,7 +342,12 @@ opts.AddVariables(
     PathVariable('SQLITE_LIBS', 'Search path for SQLITE library files', '/usr/' + LIBDIR_SCHEMA, PathVariable.PathAccept),
     PathVariable('RASTERLITE_INCLUDES', 'Search path for RASTERLITE include files', '/usr/include/', PathVariable.PathAccept),
     PathVariable('RASTERLITE_LIBS', 'Search path for RASTERLITE library files', '/usr/' + LIBDIR_SCHEMA, PathVariable.PathAccept),
-
+
+    # Variables for logging and statistics
+    BoolVariable('ENABLE_LOG', 'Enable logging, which is enabled by default when building in *debug*', 'False'),
+    BoolVariable('ENABLE_STATS', 'Enable global statistics during map processing', 'False'),
+    ('DEFAULT_LOG_SEVERITY', 'The default severity of the logger (eg. "info", "debug", "warn", "error", "fatal", "none")', 'error'),
+
     # Other variables
     BoolVariable('SHAPE_MEMORY_MAPPED_FILE', 'Utilize memory-mapped files in Shapefile Plugin (higher memory usage, better performance)', 'True'),
     ('SYSTEM_FONTS','Provide location for python bindings to register fonts (if given aborts installation of bundled DejaVu fonts)',''),
@@ -359,7 +361,7 @@ opts.AddVariables(
     EnumVariable('THREADING','Set threading support','multi', ['multi','single']),
     EnumVariable('XMLPARSER','Set xml parser','libxml2', ['libxml2','ptree']),
     ('JOBS', 'Set the number of parallel compilations', "1", lambda key, value, env: int(value), int),
-    BoolVariable('DEMO', 'Compile demo c++ application', 'False'),
+    BoolVariable('DEMO', 'Compile demo c++ application', 'True'),
     BoolVariable('PGSQL2SQLITE', 'Compile and install a utility to convert postgres tables to sqlite', 'False'),
     BoolVariable('COLOR_PRINT', 'Print build status information in color', 'True'),
     BoolVariable('SAMPLE_INPUT_PLUGINS', 'Compile and install sample plugins', 'False'),
@@ -810,6 +812,9 @@ int main()
     return False
 
 def boost_regex_has_icu(context):
+    if env['RUNTIME_LINK'] == 'static':
+        context.env.Append(LIBS='icui18n')
+        context.env.Append(LIBS='icudata')
     ret = context.TryRun("""
 
 #include <boost/regex/icu.hpp>
@@ -1160,7 +1165,7 @@ if not preconfigured:
             env.Append(CXXFLAGS = '-DBOOST_REGEX_HAS_ICU')
         else:
             env['SKIPPED_DEPS'].append('boost_regex_icu')
-    
+
     env['REQUESTED_PLUGINS'] = [ driver.strip() for driver in Split(env['INPUT_PLUGINS'])]
 
     if len(env['REQUESTED_PLUGINS']):
@@ -1408,10 +1413,40 @@ if not preconfigured:
         # Common debugging flags.
         # http://lists.fedoraproject.org/pipermail/devel/2010-November/144952.html
         debug_flags  = '-g -fno-omit-frame-pointer -DDEBUG -DMAPNIK_DEBUG'
-
         ndebug_flags = '-DNDEBUG'
-
-
+
+        # Enable logging in debug mode (always) and release mode (when specified)
+        if env['DEFAULT_LOG_SEVERITY']:
+            severities = ['info', 'debug', 'warn', 'error', 'fatal', 'none']
+            if env['DEFAULT_LOG_SEVERITY'] not in severities:
+                color_print(1,"Cannot set default logger severity to '%s', available options are 'info', 'debug', 'warn', 'error', 'fatal', 'none'." % env['DEFAULT_LOG_SEVERITY'])
+                Exit(1)
+            else:
+                log_severity = severities.index(env['DEFAULT_LOG_SEVERITY'])
+        else:
+            if env['DEBUG']:
+                log_severity = 1 # debug
+            else:
+                log_severity = 3 # error
+
+        log_enabled = ' -DMAPNIK_LOG -DMAPNIK_DEFAULT_LOG_SEVERITY=%d' % log_severity
+
+        if env['DEBUG']:
+            debug_flags += log_enabled
+        else:
+            if env['ENABLE_LOG']:
+                ndebug_flags += log_enabled
+
+        # Enable statistics reporting
+        if env['ENABLE_STATS']:
+            debug_flags += ' -DMAPNIK_STATS'
+            ndebug_flags += ' -DMAPNIK_STATS'
+
+        # Add rdynamic to allow using statics between application and plugins
+        # http://stackoverflow.com/questions/8623657/multiple-instances-of-singleton-across-shared-libraries-on-linux
+        if env['PLATFORM'] != 'Darwin' and env['CXX'] == 'g++':
+            env.MergeFlags('-rdynamic')
+
         # Customizing the C++ compiler flags depending on: 
         #  (1) the C++ compiler used; and
         #  (2) whether debug binaries are requested.
@@ -1696,7 +1731,7 @@ if not HELP_REQUESTED:
 
         # devtools not ready for public 
         #SConscript('utils/ogrindex/build.py')
-        #SConscript('utils/svg2png/build.py')
+        SConscript('utils/svg2png/build.py')
         env['LIBS'].remove('boost_program_options%s' % env['BOOST_APPEND'])
     else :
         color_print(1,"WARNING: Cannot find boost_program_options. 'shapeindex' won't be available")

diff --git a/bindings/python/mapnik_color.cpp b/bindings/python/mapnik_color.cpp
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
-//$Id$
 
 // boost
 #include <boost/python.hpp>

diff --git a/bindings/python/mapnik_coord.cpp b/bindings/python/mapnik_coord.cpp
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
-//$Id$
 
 // boost
 #include <boost/python.hpp>

diff --git a/bindings/python/mapnik_datasource.cpp b/bindings/python/mapnik_datasource.cpp
@@ -19,10 +19,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
-//$Id$
+
 // boost
 #include <boost/python.hpp>
 #include <boost/python/detail/api_placeholder.hpp>
+
 // stl
 #include <sstream>
 #include <vector>

diff --git a/bindings/python/mapnik_datasource_cache.cpp b/bindings/python/mapnik_datasource_cache.cpp
@@ -20,8 +20,6 @@
  *
  *****************************************************************************/
 
-//$Id$
-
 #include <boost/python.hpp>
 #include <mapnik/datasource_cache.hpp>