Merge branch 'master' of github.com:mapnik/mapnik

CHANGELOG.md

@@ -8,6 +8,8 @@ For a complete change history, see the git log.
 
 ## Future
 
+- Fixed regression in handling `F` type dbf fields, introduced in v2.2.0.
+
 - Added the ability to create a mapnik Feature from a geojson feature with `mapnik.Feature.from_geojson` in python.
 
 - Added to python bindings: `has_tiff`, `has_png`, `has_webp`, `has_proj4`, `has_svg_renderer`, and `has_grid_renderer`

SConstruct

@@ -297,7 +297,7 @@ opts.AddVariables(
     ('PYTHON_PREFIX','Custom install path "prefix" for python bindings (default of no prefix)',''),
     ('DESTDIR', 'The root directory to install into. Useful mainly for binary package building', '/'),
     ('PATH', 'A custom path (or multiple paths divided by ":") to append to the $PATH env to prioritize usage of command line programs (if multiple are present on the system)', ''),
-    ('PATH_REMOVE', 'A path prefix to exclude from all known command and compile paths', ''),
+    ('PATH_REMOVE', 'A path prefix to exclude from all known command and compile paths (create multiple excludes separated by :)', ''),
     ('PATH_REPLACE', 'Two path prefixes (divided with a :) to search/replace from all known command and compile paths', ''),
 
     # Boost variables
@@ -1815,14 +1815,14 @@ if not HELP_REQUESTED:
         env['ENV']['PATH'] = os.path.realpath(env['PATH']) + ':' + env['ENV']['PATH']
 
     if env['PATH_REMOVE']:
-        p = env['PATH_REMOVE']
-        if p in env['ENV']['PATH']:
-            env['ENV']['PATH'].replace(p,'')
-        rm_path(p,'LIBPATH',env)
-        rm_path(p,'CPPPATH',env)
-        rm_path(p,'CXXFLAGS',env)
-        rm_path(p,'CAIRO_LIBPATHS',env)
-        rm_path(p,'CAIRO_CPPPATHS',env)
+        for p in env['PATH_REMOVE'].split(':'):
+            if p in env['ENV']['PATH']:
+                env['ENV']['PATH'].replace(p,'')
+            rm_path(p,'LIBPATH',env)
+            rm_path(p,'CPPPATH',env)
+            rm_path(p,'CXXFLAGS',env)
+            rm_path(p,'CAIRO_LIBPATHS',env)
+            rm_path(p,'CAIRO_CPPPATHS',env)
 
     if env['PATH_REPLACE']:
         searches,replace = env['PATH_REPLACE'].split(':')

plugins/input/shape/dbfile.cpp

@@ -141,6 +141,7 @@ void dbf_file::add_attribute(int col, mapnik::transcoder const& tr, mapnik::feat
     {
         std::string const& name=fields_[col].name_;
 
+        // NOTE: ensure types handled here are matched in shape_datasource.cpp
         switch (fields_[col].type_)
         {
         case 'C':
@@ -166,8 +167,11 @@ void dbf_file::add_attribute(int col, mapnik::transcoder const& tr, mapnik::feat
             }
             break;
         }
-        case 'N':
+        case 'N': // numeric
+        case 'O': // double
+        case 'F': // float
         {
+
             if (record_[fields_[col].offset_] == '*')
             {
                 // NOTE: we intentionally do not store null here

plugins/input/shape/shape_datasource.cpp

@@ -105,15 +105,13 @@ shape_datasource::shape_datasource(const parameters &params)
             switch (fd.type_)
             {
             case 'C': // character
-            case 'D': // Date
-            case 'M': // Memo, a string
-            case '@': // timestamp
+            case 'D': // date
                 desc_.add_descriptor(attribute_descriptor(fld_name, String));
                 break;
             case 'L': // logical
                 desc_.add_descriptor(attribute_descriptor(fld_name, Boolean));
                 break;
-            case 'N':
+            case 'N': // numeric
             case 'O': // double
             case 'F': // float
             {
@@ -131,7 +129,11 @@ shape_datasource::shape_datasource(const parameters &params)
                 // I - long
                 // G - ole
                 // + - autoincrement
-                MAPNIK_LOG_WARN(shape) << "shape_datasource: Unknown type=" << fd.type_;
+                // @ - timestamp
+                // B - binary
+                // l - long
+                // M - memo
+                MAPNIK_LOG_ERROR(shape) << "shape_datasource: Unknown type=" << fd.type_;
                 break;
             }
         }

src/grid/grid_renderer.cpp

@@ -144,9 +144,7 @@ void grid_renderer<T>::render_marker(mapnik::feature_impl & feature, unsigned in
 {
     if (marker.is_vector())
     {
-        typedef coord_transform<CoordTransform,geometry_type> path_type;
         typedef typename grid_renderer_base_type::pixfmt_type pixfmt_type;
-        typedef typename grid_renderer_base_type::pixfmt_type::color_type color_type;
         typedef agg::renderer_scanline_bin_solid<grid_renderer_base_type> renderer_type;
         agg::scanline_bin sl;
 

src/grid/process_markers_symbolizer.cpp

@@ -83,7 +83,6 @@ void grid_renderer<T>::process(markers_symbolizer const& sym,
 {
     typedef grid_rendering_buffer buf_type;
     typedef typename grid_renderer_base_type::pixfmt_type pixfmt_type;
-    typedef typename grid_renderer_base_type::pixfmt_type::color_type color_type;
     typedef agg::renderer_scanline_bin_solid<grid_renderer_base_type> renderer_type;
     typedef label_collision_detector4 detector_type;
     typedef boost::mpl::vector<clip_line_tag,clip_poly_tag,transform_tag,smooth_tag> conv_types;