diff --git a/src/core/GIS/private/reosdigitalelevationmodel_p.cpp b/src/core/GIS/private/reosdigitalelevationmodel_p.cpp
index 65dc5ed4..d5def5c4 100644
--- a/src/core/GIS/private/reosdigitalelevationmodel_p.cpp
+++ b/src/core/GIS/private/reosdigitalelevationmodel_p.cpp
@@ -222,14 +222,15 @@ double ReosDigitalElevationModelRaster::averageElevationInPolygon( const QPolygo
     }
   }
 
-  QMap<QgsZonalStatistics::Statistic, QVariant> result = QgsZonalStatistics::calculateStatistics( mDataProvider.get(),
+
+  QMap<Qgis::ZonalStatistic, QVariant> result = QgsZonalStatistics::calculateStatistics( mDataProvider.get(),
       geometry,
       fabs( mExtent.xCellSize() ),
       fabs( mExtent.yCellSize() ),
       1,
-      QgsZonalStatistics::Mean );
+      Qgis::ZonalStatistic::Mean );
 
-  return result.value( QgsZonalStatistics::Mean ).toDouble();
+  return result.value( Qgis::ZonalStatistic::Mean ).toDouble();
 }
 
 
@@ -595,7 +596,7 @@ ReosRasterExtent ReosDigitalElevationModelRaster::rasterExtent( const QgsRectang
   double xPixelSize;
   double yPixelSize;
 
-  if ( mDataProvider->capabilities() & QgsRasterInterface::Size )
+  if ( mDataProvider->capabilities() & Qgis::RasterInterfaceCapability::Size )
   {
     int xCount = mDataProvider->xSize();
     int yCount = mDataProvider->ySize();
diff --git a/src/core/GIS/private/reosgriddedrainfallrenderer_p.cpp b/src/core/GIS/private/reosgriddedrainfallrenderer_p.cpp
index f23dc2f8..390b7368 100644
--- a/src/core/GIS/private/reosgriddedrainfallrenderer_p.cpp
+++ b/src/core/GIS/private/reosgriddedrainfallrenderer_p.cpp
@@ -51,7 +51,7 @@ ReosGriddedRainfallRendererFactory_p::ReosGriddedRainfallRendererFactory_p( Reos
     renderer->setClassificationMax( 20 );
   }
 
-  renderer->createShader( colorRamp.release(), QgsColorRampShader::Interpolated, QgsColorRampShader::EqualInterval, 10, false );
+  renderer->createShader( colorRamp.release(),  Qgis::ShaderInterpolationMethod::Linear, Qgis::ShaderClassificationMethod::EqualInterval, 10, false );
   mColorRampSettings->setShader( renderer->shader()->rasterShaderFunction() );
   mRasterLayer->setRenderer( renderer.release() );
 }
diff --git a/src/core/GIS/private/reosmesh_p.cpp b/src/core/GIS/private/reosmesh_p.cpp
index c159d253..347b934c 100644
--- a/src/core/GIS/private/reosmesh_p.cpp
+++ b/src/core/GIS/private/reosmesh_p.cpp
@@ -1369,7 +1369,7 @@ void ReosMeshFrame_p::generateMesh( const ReosMeshFrameData &data )
 
 QString ReosMeshFrame_p::crs() const
 {
-  return mMeshDataProvider->crs().toWkt( QgsCoordinateReferenceSystem::WKT_PREFERRED_SIMPLIFIED );
+  return mMeshDataProvider->crs().toWkt( Qgis::CrsWktVariant::Preferred );
 }
 
 QObject *ReosMeshFrame_p::data() const
@@ -1387,7 +1387,7 @@ ReosMapExtent ReosMeshFrame_p::extent() const
   if ( mMeshLayer )
   {
     ReosMapExtent ret( mMeshLayer->extent().toRectF() );
-    ret.setCrs( mMeshLayer->crs().toWkt( QgsCoordinateReferenceSystem::WKT_PREFERRED ) );
+    ret.setCrs( mMeshLayer->crs().toWkt( Qgis::CrsWktVariant::Preferred ) );
 
     return ret;
   }
diff --git a/src/core/GIS/private/reosmeshdataprovider_p.cpp b/src/core/GIS/private/reosmeshdataprovider_p.cpp
index de7682ce..2a2ef3d2 100644
--- a/src/core/GIS/private/reosmeshdataprovider_p.cpp
+++ b/src/core/GIS/private/reosmeshdataprovider_p.cpp
@@ -304,7 +304,7 @@ void ReosMeshDataProvider_p::generateMesh( const ReosMeshFrameData &data )
 void ReosMeshDataProvider_p::applyDemOnVertices( ReosDigitalElevationModel *dem )
 {
   double noDataValue = dem->noDataValue();
-  QString wktCrs = mCrs.toWkt( QgsCoordinateReferenceSystem::WKT2_2019_SIMPLIFIED );
+  QString wktCrs = mCrs.toWkt( Qgis::CrsWktVariant::Wkt2_2019 );
 
   for ( int i = 0; i < mMesh.vertexCount(); ++i )
   {
diff --git a/src/core/GIS/private/reospolygonstructure_p.cpp b/src/core/GIS/private/reospolygonstructure_p.cpp
index a0c701a9..a9f323d2 100644
--- a/src/core/GIS/private/reospolygonstructure_p.cpp
+++ b/src/core/GIS/private/reospolygonstructure_p.cpp
@@ -15,6 +15,7 @@
  ***************************************************************************/
 #include "reospolygonstructure_p.h"
 
+#include <qgis.h>
 #include <qgsvectorlayer.h>
 #include <qgscategorizedsymbolrenderer.h>
 #include <qgslinestring.h>
@@ -128,7 +129,7 @@ ReosEncodedElement ReosPolygonStructure_p::encode() const
 
 QString ReosPolygonStructure_p::crs() const
 {
-  return mVectorLayer->crs().toWkt( QgsCoordinateReferenceSystem::WKT_PREFERRED_SIMPLIFIED );
+  return mVectorLayer->crs().toWkt( Qgis::CrsWktVariant::PreferredSimplified );
 }
 
 ReosPolygonStructure_p::~ReosPolygonStructure_p()
diff --git a/src/core/GIS/private/reospolylinesstructure_p.cpp b/src/core/GIS/private/reospolylinesstructure_p.cpp
index 5b847c18..4e465fcf 100644
--- a/src/core/GIS/private/reospolylinesstructure_p.cpp
+++ b/src/core/GIS/private/reospolylinesstructure_p.cpp
@@ -120,7 +120,7 @@ QgsRectangle ReosGeometryStructure_p::layerZone( const ReosMapExtent &zone ) con
 
 QString ReosGeometryStructure_p::crs() const
 {
-  return mVectorLayer->crs().toWkt( QgsCoordinateReferenceSystem::WKT_PREFERRED );
+  return mVectorLayer->crs().toWkt( Qgis::CrsWktVariant::PreferredSimplified );
 }
 
 
@@ -1976,7 +1976,7 @@ double ReosPolylineStructureVectorLayer::tolerance( const QString &wktCrs ) cons
 
 QString ReosPolylineStructureVectorLayer::crs() const
 {
-  return mVectorLayer->crs().toWkt( QgsCoordinateReferenceSystem::WKT_PREFERRED_SIMPLIFIED );
+  return mVectorLayer->crs().toWkt( Qgis::CrsWktVariant::PreferredSimplified );
 }
 
 bool ReosPolylineStructureVectorLayer::isOnBoundary( const Segment &seg ) const
diff --git a/src/core/GIS/reosgisengine.cpp b/src/core/GIS/reosgisengine.cpp
index 87c80c2a..9672003b 100644
--- a/src/core/GIS/reosgisengine.cpp
+++ b/src/core/GIS/reosgisengine.cpp
@@ -309,17 +309,17 @@ QString ReosGisEngine::meshLayerFilters() const
 
 QString ReosGisEngine::crs() const
 {
-  return QgsProject::instance()->crs().toWkt( QgsCoordinateReferenceSystem::WKT_PREFERRED );
+  return QgsProject::instance()->crs().toWkt( Qgis::CrsWktVariant::Preferred );
 }
 
 QString ReosGisEngine::crsFromEPSG( int epsgCode )
 {
-  return QgsCoordinateReferenceSystem::fromEpsgId( epsgCode ).toWkt( QgsCoordinateReferenceSystem::WKT_PREFERRED );
+  return QgsCoordinateReferenceSystem::fromEpsgId( epsgCode ).toWkt( Qgis::CrsWktVariant::Preferred );
 }
 
 QString ReosGisEngine::crsFromProj( const QString &projtring )
 {
-  return QgsCoordinateReferenceSystem::fromProj( projtring ).toWkt( QgsCoordinateReferenceSystem::WKT_PREFERRED );;
+  return QgsCoordinateReferenceSystem::fromProj( projtring ).toWkt( Qgis::CrsWktVariant::Preferred );;
 }
 
 QString ReosGisEngine::crsWkt1( const QString &crs )
@@ -330,7 +330,7 @@ QString ReosGisEngine::crsWkt1( const QString &crs )
 
 QString ReosGisEngine::crsEsriWkt( const QString &crs )
 {
-  return QgsCoordinateReferenceSystem( crs ).toWkt( QgsCoordinateReferenceSystem::WKT1_ESRI );
+  return QgsCoordinateReferenceSystem( crs ).toWkt( Qgis::CrsWktVariant::Wkt1Esri );
 }
 
 void ReosGisEngine::setCrs( const QString &crsString )
@@ -620,7 +620,7 @@ ReosMapExtent ReosGisEngine::transformExtent( const ReosMapExtent &extent, const
 
 ReosMapExtent ReosGisEngine::transformToProjectExtent( const ReosMapExtent &extent ) const
 {
-  return transformExtent( extent, QgsProject::instance()->crs().toWkt( QgsCoordinateReferenceSystem::WKT_PREFERRED ) );
+  return transformExtent( extent, QgsProject::instance()->crs().toWkt( Qgis::CrsWktVariant::Preferred ) );
 }
 
 ReosMapExtent ReosGisEngine::transformFromProjectExtent( const ReosMapExtent &extent, const QString &wktCrs ) const
diff --git a/src/gui/GIS/3D/reos3dview.cpp b/src/gui/GIS/3D/reos3dview.cpp
index bfd49190..5a2c5730 100644
--- a/src/gui/GIS/3D/reos3dview.cpp
+++ b/src/gui/GIS/3D/reos3dview.cpp
@@ -22,7 +22,7 @@
 #include <QMenu>
 #include <QTimer>
 
-#include <3d/qgs3dmapcanvas.h>
+#include <qgs3dmapcanvas.h>
 #include <qgsmeshterraingenerator.h>
 #include <qgsmeshlayer.h>
 #include <qgs3dmapsettings.h>
@@ -53,8 +53,8 @@ Reos3dView::Reos3dView( ReosMesh *meshTerrain, const ReosGuiContext &context )
   setWindowFlag( Qt::Dialog );
   setWindowTitle( tr( "3D View" ) );
 
-  mCanvas = new Qgs3DMapCanvas( this );
-  mCanvas->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
+  mCanvas = new Qgs3DMapCanvas();
+//mCanvas->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
 
   QgsMeshLayer *meshLayer = nullptr;
   if ( meshTerrain )
@@ -77,11 +77,15 @@ Reos3dView::Reos3dView( ReosMesh *meshTerrain, const ReosGuiContext &context )
     context.map()->currentTime().addMSecs( context.map()->timeStep().valueMilliSecond() )
   } );
 
-  mCanvas->setMap( settings );
+  mCanvas->setMapSettings( settings );
   mCanvas->setViewFromTop( extent.center(), dist, 0 );
-  mCanvas->setOnScreenNavigationVisibility( false );
+  //mCanvas->setOnScreenNavigationVisibility( false );
 
-  ui->m3dViewLayout->addWidget( mCanvas );
+  mContainer = QWidget::createWindowContainer( mCanvas );
+  mContainer->setMinimumSize( QSize( 200, 200 ) );
+  mContainer->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
+
+  ui->m3dViewLayout->addWidget( mContainer );
 
   QToolBar *toolBar = new QToolBar( this );
   ui->mToolBarLayout->addWidget( toolBar );
@@ -192,8 +196,8 @@ Reos3dView::~Reos3dView()
   //  so the destruction will happen after terrain creation
   // before launching the defered deletation, we remove reference to the mesh layer
 
-  mCanvas->map()->setLayers( QList<QgsMapLayer *>() );
-  mCanvas->map()->setTerrainGenerator( new QgsFlatTerrainGenerator );
+  mCanvas->mapSettings()->setLayers( QList<QgsMapLayer *>() );
+  mCanvas->mapSettings()->setTerrainGenerator( new QgsFlatTerrainGenerator );
   mCanvas->setParent( nullptr );
   QTimer::singleShot( 0, mCanvas, &QObject::deleteLater );
 
@@ -202,11 +206,11 @@ Reos3dView::~Reos3dView()
 void Reos3dView::addMesh( ReosMesh *mesh )
 {
   mMeshes.append( mesh );
-  QList<QgsMapLayer *> layers = mCanvas->map()->layers();
+  QList<QgsMapLayer *> layers = mCanvas->mapSettings()->layers();
 
   layers.append( qobject_cast<QgsMapLayer *>( mesh->data() ) );
 
-  mCanvas->map()->setLayers( layers );
+  mCanvas->mapSettings()->setLayers( layers );
 }
 
 void Reos3dView::onExaggerationChange( double value )
@@ -231,7 +235,7 @@ void Reos3dView::onLightChange()
   std::unique_ptr<QgsDirectionalLightSettings> lightSettings = std::make_unique<QgsDirectionalLightSettings>();
   lightSettings->setDirection( mLightWidget->direction() );
   lightSettings->setIntensity( mLightWidget->lightIntensity() );
-  mCanvas->map()->setLightSources( {lightSettings.release()} );
+  mCanvas->mapSettings()->setLightSources( {lightSettings.release()} );
 
   emit mapSettingsChanged();
 }
@@ -281,7 +285,7 @@ void Reos3dView::onTerrainSettingsChanged()
   std::unique_ptr<QgsMeshTerrainGenerator> newTerrain = std::make_unique<QgsMeshTerrainGenerator>();
   newTerrain->setSymbol( terrainSymbol.release() );
   newTerrain->setLayer( meshLayer );
-  mCanvas->map()->setTerrainGenerator( newTerrain.release() );
+  mCanvas->mapSettings()->setTerrainGenerator( newTerrain.release() );
 
   emit terrainSettingsChanged();
 }
diff --git a/src/gui/GIS/3D/reos3dview.h b/src/gui/GIS/3D/reos3dview.h
index 602eb907..a8dd91b8 100644
--- a/src/gui/GIS/3D/reos3dview.h
+++ b/src/gui/GIS/3D/reos3dview.h
@@ -63,6 +63,7 @@ class Reos3dView : public ReosActionWidget
   private:
     Ui::Reos3dView *ui;
     QPointer<ReosMesh> mMeshTerrain;
+    QWidget *mContainer = nullptr;
     Qgs3DMapCanvas *mCanvas = nullptr;
     QAction *mActionZoomExtent = nullptr;
     ReosLightWidget *mLightWidget = nullptr;
diff --git a/src/gui/GIS/private/reosmappolygon_p.cpp b/src/gui/GIS/private/reosmappolygon_p.cpp
index 2b7da8d0..bb54c2a9 100644
--- a/src/gui/GIS/private/reosmappolygon_p.cpp
+++ b/src/gui/GIS/private/reosmappolygon_p.cpp
@@ -112,7 +112,7 @@ void ReosMapPolygonBase_p::setMarkerDistance( double d )
   }
 
   mMarkerposition = ReosGisEngine::setPointOnPolyline( d, mapPoly,
-                    mMapCanvas->mapSettings().destinationCrs().toWkt( QgsCoordinateReferenceSystem::WKT_PREFERRED_SIMPLIFIED ), mSegmentMarker );
+                    mMapCanvas->mapSettings().destinationCrs().toWkt( Qgis::CrsWktVariant::Preferred ), mSegmentMarker );
   updatePosition();
 }
 
@@ -125,7 +125,7 @@ void ReosMapPolygonBase_p::setMarkerAtMid()
 {
   const QPolygonF &mapPoly = geometry();
   mMarkerposition = ReosGisEngine::setPointOnPolyline( ReosGeometryUtils::length( mapPoly ) / 2, mapPoly,
-                    mMapCanvas->mapSettings().destinationCrs().toWkt( QgsCoordinateReferenceSystem::WKT_PREFERRED_SIMPLIFIED ), mSegmentMarker );
+                    mMapCanvas->mapSettings().destinationCrs().toWkt( Qgis::CrsWktVariant::Preferred ), mSegmentMarker );
   updatePosition();
 }
 
@@ -709,5 +709,5 @@ ReosMapItem_p::ReosMapItem_p( QgsMapCanvas *canvas )
 
 QString ReosMapItem_p::crs() const
 {
-  return mMapCanvas->mapSettings().destinationCrs().toWkt( QgsCoordinateReferenceSystem::WKT_PREFERRED_SIMPLIFIED );
+  return mMapCanvas->mapSettings().destinationCrs().toWkt( Qgis::CrsWktVariant::Preferred );
 }
diff --git a/src/gui/GIS/private/reosmaptool_p.cpp b/src/gui/GIS/private/reosmaptool_p.cpp
index 06a02e13..4a4a530a 100644
--- a/src/gui/GIS/private/reosmaptool_p.cpp
+++ b/src/gui/GIS/private/reosmaptool_p.cpp
@@ -66,7 +66,7 @@ static QList<QgsMapToolIdentify::IdentifyResult> searchFeatureOnMap( QgsMapMouse
 
         QgsFeatureIterator fit = vectorLayer->getFeatures( QgsFeatureRequest()
                                  .setFilterRect( rect )
-                                 .setFlags( QgsFeatureRequest::ExactIntersect ) );
+                                 .setFlags( Qgis::FeatureRequestFlag::ExactIntersect ) );
         QgsFeature f;
         while ( fit.nextFeature( f ) )
         {
@@ -105,7 +105,7 @@ bool ReosMapTool_p::hasFeatureOnMap( const QPointF &mapPoint ) const
 
       QgsFeatureIterator fit = vectorLayer->getFeatures( QgsFeatureRequest()
                                .setFilterRect( rect )
-                               .setFlags( QgsFeatureRequest::ExactIntersect ) );
+                               .setFlags( Qgis::FeatureRequestFlag::ExactIntersect ) );
       QgsFeature feat;
       if ( fit.nextFeature( feat ) )
         return true;
@@ -665,7 +665,7 @@ void ReosMapTool_p::keyPressEvent( QKeyEvent *e )
 
 QString ReosMapTool_p::mapCrs() const
 {
-  return canvas()->mapSettings().destinationCrs().toWkt( QgsCoordinateReferenceSystem::WKT_PREFERRED );
+  return canvas()->mapSettings().destinationCrs().toWkt( Qgis::CrsWktVariant::PreferredSimplified );
 }
 
 
diff --git a/src/gui/GIS/reoscoordinatesystemwidget.cpp b/src/gui/GIS/reoscoordinatesystemwidget.cpp
index 86c244a8..42ca426a 100644
--- a/src/gui/GIS/reoscoordinatesystemwidget.cpp
+++ b/src/gui/GIS/reoscoordinatesystemwidget.cpp
@@ -33,7 +33,7 @@ ReosCoordinateSystemWidget::ReosCoordinateSystemWidget( QWidget *parent )
 
 QString ReosCoordinateSystemWidget::crs() const
 {
-  return mQgsWidget->crs().toWkt( QgsCoordinateReferenceSystem::WKT_PREFERRED );
+  return mQgsWidget->crs().toWkt( Qgis::CrsWktVariant::Preferred );
 }
 
 void ReosCoordinateSystemWidget::setCrs( const QString &crs )
diff --git a/src/gui/GIS/reosgislayerswidget.cpp b/src/gui/GIS/reosgislayerswidget.cpp
index 05a134d7..ce641d0a 100644
--- a/src/gui/GIS/reosgislayerswidget.cpp
+++ b/src/gui/GIS/reosgislayerswidget.cpp
@@ -236,7 +236,7 @@ void ReosGisLayersWidget::onSetCrs()
   QString crs = mGisEngine->crs();
   dial.setCrs( QgsCoordinateReferenceSystem::fromWkt( crs ) );
   if ( dial.exec() )
-    mGisEngine->setCrs( dial.crs().toWkt( QgsCoordinateReferenceSystem::WKT_PREFERRED ) );
+    mGisEngine->setCrs( dial.crs().toWkt( Qgis::CrsWktVariant::Preferred ) );
 
 }
 
diff --git a/src/gui/GIS/reosmap.cpp b/src/gui/GIS/reosmap.cpp
index 329c81d6..39e924ce 100644
--- a/src/gui/GIS/reosmap.cpp
+++ b/src/gui/GIS/reosmap.cpp
@@ -593,7 +593,7 @@ ReosGisEngine *ReosMap::engine() const
 QString ReosMap::mapCrs() const
 {
   QgsMapCanvas *canvas = qobject_cast<QgsMapCanvas *>( mCanvas );
-  return canvas->mapSettings().destinationCrs().toWkt( QgsCoordinateReferenceSystem::WKT_PREFERRED );
+  return canvas->mapSettings().destinationCrs().toWkt( Qgis::CrsWktVariant::Preferred );
 }
 
 void ReosMap::setDefaultMapTool()