Fix rapprochement - work on OSM export interface

1 files changed, 15 insertions, 5 deletions

diff --git a/chimere/utils.py b/chimere/utils.py
index ed41a04..25b5900 100644
--- a/chimere/utils.py
+++ b/chimere/utils.py
@@ -67,7 +67,7 @@ class ImportManager:
     def get(self):
         pass
 
-    def put(self):
+    def put(self, extra_args={}):
         pass
 
     def create_or_update_item(self, cls, values, import_key, version=None,
@@ -721,7 +721,7 @@ class OSMManager(ImportManager):
             items.append(item)
         return (new_item, updated_item, msg)
 
-    def put(self):
+    def put(self, extra_args={}):
         # first of all: reimport in order to verify that no changes has been
         # made since the last import
         from models import Marker
@@ -735,9 +735,19 @@ class OSMManager(ImportManager):
             return 0, _(u"There are items from a former import not yet "
                         u"validated - validate them before exporting")
         # start import
-        api = OsmApi.OsmApi(api=settings.CHIMERE_OSM_API_URL,
-                     username=settings.CHIMERE_OSM_USER,
-                     password=settings.CHIMERE_OSM_PASSWORD)
+        api = settings.CHIMERE_OSM_API_URL
+        username = settings.CHIMERE_OSM_USER
+        password = settings.CHIMERE_OSM_PASSWORD
+        if extra_args:
+            try:
+                api = extra_args['api']
+                username = extra_args['username']
+                password = extra_args['password']
+            except KeyError:
+                return 0, _(u"Bad params - programming error")
+        api = OsmApi.OsmApi(api=api,
+                     username=username,
+                     password=password)
         api.ChangesetCreate({u"comment": u"Import from Chimère %s" % \
                                                             get_version()})
         hooks = RE_HOOK.findall(self.importer_instance.filtr)