Fix logger param in Analyser_Merge / Analyser_Merge_Mapillary

analysers/Analyser_Merge.py

@@ -279,7 +279,7 @@
 """
 
 class Source:
-    def __init__(self, attribution = None, millesime = None, encoding = "utf-8", file = None, fileUrl = None, fileUrlCache = 30, zip = None, gzip = False, filter = None, logger = None):
+    def __init__(self, attribution = None, millesime = None, encoding = "utf-8", file = None, fileUrl = None, fileUrlCache = 30, zip = None, gzip = False, filter = None):
         """
         Describe the source file.
         @param encoding: file charset encoding
@@ -289,7 +289,6 @@ def __init__(self, attribution = None, millesime = None, encoding = "utf-8", fil
         @param zip: extract file from zip
         @param gzip: uncompress as gzip
         @param filter: lambda expression applied on text file before loading
-        @param logger: a logger
         """
         self.attribution = attribution
         self.millesime = millesime
@@ -300,7 +299,6 @@ def __init__(self, attribution = None, millesime = None, encoding = "utf-8", fil
         self.zip = zip
         self.gzip = gzip
         self.filter = filter
-        self.logger = logger
 
         if self.file:
             if not os.path.isabs(self.file):

analysers/Analyser_Merge_Mapillary.py

@@ -34,10 +34,11 @@
 
 
 class Source_Mapillary(Source):
-    def __init__(self, country, polygon_id, mapping, layer, **args):
+    def __init__(self, country, polygon_id, mapping, layer, logger, **args):
       self.polygon_id = polygon_id
       self.mapping = mapping
       self.layer = layer
+      self.logger = logger
       Source.__init__(self, **args)
       self.fileUrl = u'mapillary-feature-{0}-{1}.csv'.format(country, SourceVersion.version(self.mapping))
       self.fileUrlCache = 120