Changeset 1688

Timestamp:

03/12/10 09:49:50 (5 months ago)

Author:

alberto

Message:

xml de/serialization support for RasterColorizer

Location:

trunk

Files:

• src/save_map.cpp (modified) (3 diffs)
• tests/python_tests/raster_colorizer_test.py (modified) (1 diff)
• tests/python_tests/raster_symbolizer_test.py (modified) (1 diff)

trunk/src/save_map.cpp

@@ -27 +27 @@
 #include <mapnik/ptree_helpers.hpp>
 #include <mapnik/expression_string.hpp>
+#include <mapnik/raster_colorizer.hpp>
 
 // boost
@@ -44 +45 @@
     using boost::optional;
 
+    void serialize_raster_colorizer(ptree & sym_node,
+                                    raster_colorizer_ptr const& colorizer,
+                                    bool explicit_defaults)
+    {
+        ptree & col_node = sym_node.push_back(
+                ptree::value_type("RasterColorizer", ptree() ))->second;
+
+        unsigned i;
+        color_bands const &cb = colorizer->get_color_bands();
+        for (i=0; i<cb.size(); i++) {
+           if (!cb[i].is_interpolated()) {
+               ptree & band_node = col_node.push_back(
+                    ptree::value_type("ColorBand", ptree())
+                  )->second;
+               set_attr(band_node, "value", cb[i].get_value());    
+               set_attr(band_node, "midpoints", cb[i].get_midpoints());    
+               optional<color> c = cb[i].get_color();
+               if (c) set_attr(band_node, "color", * c);    
+           }
+        }
+
+    }
+
     class serialize_symbolizer : public boost::static_visitor<>
     {
@@ -164 +188 @@
                     set_css( sym_node, "opacity", sym.get_opacity() );
                 }
+                if (sym.get_colorizer()) {
+                   serialize_raster_colorizer(sym_node, sym.get_colorizer(),
+                                              explicit_defaults_);
+                }
+                    
             }
 

trunk/tests/python_tests/raster_colorizer_test.py

@@ -1 @@
-
 import mapnik2
 from nose.tools import *
 
-class test_raster_colorizer():
+def test_get_color():
     colorizer = mapnik2.RasterColorizer()
     # Setup the color bands. band[N].color will apply to all

trunk/tests/python_tests/raster_symbolizer_test.py

@@ -89 +89 @@
     features = _map.query_point(0,126850,4596050).features
     assert len(features) == 0
+
+def test_load_save_map():
+    map = mapnik2.Map(256,256)
+    in_map = "../data/good_maps/raster_symbolizer.xml"
+    mapnik2.load_map(map, in_map)
+
+    out_map = mapnik2.save_map_to_string(map)
+    assert 'RasterSymbolizer' in out_map
+    assert 'RasterColorizer' in out_map
+    assert 'ColorBand' in out_map