preserve old MemoryDatasource interface in Python

bindings/python/mapnik/__init__.py

@@ -627,6 +627,16 @@ def Python(**keywords):
     keywords['type'] = 'python'
     return CreateDatasource(keywords)
 
+def MemoryDatasource(**keywords):
+    """Create a Memory Datasource.
+
+    Optional keyword arguments:
+        (TODO)
+    """
+    params = Parameters()
+    params.append(Parameter('type','memory'))
+    return MemoryDatasourceBase(params)
+
 class PythonDatasource(object):
     """A base class for a Python data source.
 

bindings/python/mapnik/printing.py

@@ -17,7 +17,7 @@ see the documentation of mapnik.printing.PDFPrinter() for options
 """
 from __future__ import absolute_import
 
-from . import render, Map, Box2d, MemoryDatasource, Layer, Feature, Projection, ProjTransform, Coord, Style, Rule, Geometry2d
+from . import render, Map, Box2d, Layer, Feature, Projection, ProjTransform, Coord, Style, Rule, Geometry2d
 import math
 import os
 import tempfile
@@ -1025,4 +1025,3 @@ class PDFPrinter:
                         if y > h:
                             h = y
         return (w,h)
-

bindings/python/mapnik_datasource.cpp

@@ -41,6 +41,7 @@ using mapnik::datasource;
 using mapnik::memory_datasource;
 using mapnik::layer_descriptor;
 using mapnik::attribute_descriptor;
+using mapnik::parameters;
 
 namespace
 {
@@ -191,7 +192,7 @@ void export_datasource()
 
     class_<memory_datasource,
            bases<datasource>, std::shared_ptr<memory_datasource>,
-           boost::noncopyable>("MemoryDatasource", no_init)
+           boost::noncopyable>("MemoryDatasourceBase", init<parameters>())
         .def("add_feature",&memory_datasource::push,
              "Adds a Feature:\n"
              ">>> ms = MemoryDatasource()\n"

tests/cpp_tests/fontset_runtime_test.cpp

@@ -61,7 +61,7 @@ int main(int argc, char** argv)
         mapnik::layer lyr("layer");
         lyr.set_datasource(ds);
         lyr.add_style("style");
-        m.add_layer(std::move(lyr));
+        m.add_layer(lyr);
         mapnik::feature_type_style the_style;
         mapnik::rule r;
         mapnik::text_symbolizer text_sym;