Merge remote-tracking branch 'remotes/origin/BR_LAND_COVER_MAP' into BR_LCM_COMP

Conflicts:
	src/HYDROData/HYDROData_LandCoverMap.h

diff --cc src/HYDROData/HYDROData_LandCoverMap.cxx
Simple merge

diff --cc src/HYDROData/HYDROData_LandCoverMap.h
index caf89f64bea7d188981b981fd26f0a6405b8459a,15b697f4da1a79b8aec478bf5e2ded90b4960c7b..7df0dcba6b279b9d805acdb41ef1a77bd929dbe9
--- 1/src/HYDROData/HYDROData_LandCoverMap.h
--- 2/src/HYDROData/HYDROData_LandCoverMap.h
+++ b/src/HYDROData/HYDROData_LandCoverMap.h
@@@ -99,12 -105,9 +105,11 @@@ public
                                     const QStringList& theDBFValues,
                                     const QStringList& theStricklerTypes ) const;
  
-   bool ImportShp( const QString& theFileName, 
-                   const QList<int>& theIndices =  QList<int>());
- 
+   HYDRODATA_EXPORT bool ExportTelemac( const QString& theFileName,
+                                        double theDeflection,
+                                        const Handle_HYDROData_StricklerTable& theTable ) const;
 +  bool ExportShp( const QString& theFileName) const;
 +
-   HYDRODATA_EXPORT bool ExportTelemac( const QString& theFileName, double theDeflection ) const;
  
    HYDRODATA_EXPORT bool Add( const Handle( HYDROData_Object )&, const QString& theType );
    HYDRODATA_EXPORT bool Add( const Handle( HYDROData_PolylineXY )&, const QString& theType );

diff --cc src/HYDROPy/HYDROData_LandCoverMap.sip
index 5b351ccd80e8520a21c107237a047f6a60fa6c30,2fe2c10e30009d200c1cccde9a03ee73d6823c47..802811dd58461e24db36a8fcf465a87260b17ae8
--- 1/src/HYDROPy/HYDROData_LandCoverMap.sip
--- 2/src/HYDROPy/HYDROData_LandCoverMap.sip
+++ b/src/HYDROPy/HYDROData_LandCoverMap.sip
@@@ -61,12 -64,21 +64,25 @@@ public
      const QString& theFieldName, 
      const QStringList& theDBFValues,
      const QStringList& theStricklerTypes ) const;
 + 
 +  bool ImportShp( const QString& theFileName);
 +
 +  bool ExportShp( const QString& theFileName) const;
  
-   bool ExportTelemac( const QString& theFileName, double theDeflection ) const;
+   bool ExportTelemac( const QString& theFileName, double theDeflection,
+                                         HYDROData_StricklerTable theTable ) const
+   [bool( const QString&, double, const Handle_HYDROData_StricklerTable& )];
+   %MethodCode
+     Handle(HYDROData_StricklerTable) aRef =
+       Handle(HYDROData_StricklerTable)::DownCast( createHandle( a2 ) );
+     if ( !aRef.IsNull() )
+     {
+       Py_BEGIN_ALLOW_THREADS
+       sipRes = sipSelfWasArg ? sipCpp->HYDROData_LandCoverMap::ExportTelemac( *a0, a1, aRef ):
+                                sipCpp->ExportTelemac( *a0, a1, aRef );
+       Py_END_ALLOW_THREADS
+     }
+   %End
  
    bool Add( HYDROData_Object theObject, const QString& theType )
    [bool ( const Handle_HYDROData_Object&, const QString& )];