[Marble-commits] KDE/kdeedu/marble/src/lib

[Torsten Rahn]

SVN commit 1049855 by rahn:

Author: Bernhard Beschow <bbeschow at cs.tu-berlin.de>

    implement custom storage layout

This patch e.g. allows to use custom tile url schemes.



 M  +11 -4     TileLoaderHelper.cpp  


--- trunk/KDE/kdeedu/marble/src/lib/TileLoaderHelper.cpp #1049854:1049855
@@ -93,8 +93,11 @@
             break;
 
         case GeoSceneTexture::Custom:
-            mDebug() << "Warning: unhandled enum value GeoSceneTexture::Custom"
-                     << "in TileLoaderHelper::downloadUrl()";
+            path += textureLayer->customStorageLayout();
+            path.replace( "{zoomLevel}", QString::number( zoomLevel ) );
+            path.replace( "{suffix}", suffix );
+            path.replace( "{x}", QString::number( x ) );
+            path.replace( "{y}", QString::number( y ) );
             break;
         }
         tileUrl.setPath( path );
@@ -127,8 +130,12 @@
             break;
 
         case GeoSceneTexture::Custom:
-            mDebug() << "Warning: unhandled enum value GeoSceneTexture::Custom"
-                     << "in TileLoaderHelper::relativeTileFileName()";
+            relFileName = QString( "%1/%2/%3/%4.%5" )
+                .arg( themeStr( textureLayer ) )
+                .arg( level )
+                .arg( x )
+                .arg( y )
+                .arg( suffix );
             break;
         }
     }