[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [marble/KDE/4.8] /: Another Python bindings update.
From: Simon Edwards <simon () simonzone ! com>
Date: 2012-01-12 20:01:42
Message-ID: 20120112200142.E456EA60A6 () git ! kde ! org
[Download RAW message or body]
Git commit a1834ca45ee6936fc95e3bbea3090b0ae1026350 by Simon Edwards.
Committed on 12/01/2012 at 20:56.
Pushed by sedwards into branch 'KDE/4.8'.
Another Python bindings update.
M +58 -55 docs/bindings/python/html/allclasses.html
M +36 -1 docs/bindings/python/html/marble/Marble.AbstractDataPluginModel.html
M +1 -1 docs/bindings/python/html/marble/Marble.AbstractMarbleGraphicsLayout.html
M +2 -114 docs/bindings/python/html/marble/Marble.AbstractProjection.html
A +468 -0 docs/bindings/python/html/marble/Marble.AlternativeRoutesModel.html
M +1 -1 docs/bindings/python/html/marble/Marble.ClipPainter.html
M +0 -29 docs/bindings/python/html/marble/Marble.CurrentLocationWidget.html
M +1 -1 docs/bindings/python/html/marble/Marble.FrameGraphicsItem.html
M +1 -1 docs/bindings/python/html/marble/Marble.GeoDataAbstractView.html
M +1 -1 docs/bindings/python/html/marble/Marble.GeoDataColorStyle.html
M +1 -1 docs/bindings/python/html/marble/Marble.GeoDataContainer.html
M +58 -10 docs/bindings/python/html/marble/Marble.GeoDataCoordinates.html
M +1 -1 docs/bindings/python/html/marble/Marble.GeoDataFeature.html
M +1 -1 docs/bindings/python/html/marble/Marble.GeoDataGeometry.html
M +1 -1 docs/bindings/python/html/marble/Marble.GeoDataLatLonBox.html
M +1 -1 docs/bindings/python/html/marble/Marble.GeoDataLineString.html
M +24 -0 docs/bindings/python/html/marble/Marble.GeoDataMultiGeometry.html
M +1 -1 docs/bindings/python/html/marble/Marble.GeoDataObject.html
M +1 -1 docs/bindings/python/html/marble/Marble.GeoDataPolygon.html
M +1 -1 docs/bindings/python/html/marble/Marble.GeoDataStyleSelector.html
M +1 -1 docs/bindings/python/html/marble/Marble.GeoDocument.html
M +1 -1 docs/bindings/python/html/marble/Marble.GeoNode.html
M +32 -7 docs/bindings/python/html/marble/Marble.LegendWidget.html
C +70 -91 docs/bindings/python/html/marble/Marble.Maneuver.html [from: \
docs/bindings/python/html/marble/Marble.GeoDataGeometry.html - 058% similarity] M +8 -58 \
docs/bindings/python/html/marble/Marble.MapThemeManager.html M +28 -77 \
docs/bindings/python/html/marble/Marble.MapViewWidget.html M +13 -0 \
docs/bindings/python/html/marble/Marble.MapWizard.html M +27 -0 \
docs/bindings/python/html/marble/Marble.MarbleAbstractRunner.html M +34 -47 \
docs/bindings/python/html/marble/Marble.MarbleControlBox.html M +1 -1 \
docs/bindings/python/html/marble/Marble.MarbleGraphicsItem.html M +19 -1 \
docs/bindings/python/html/marble/Marble.MarbleMap.html M +43 -1 \
docs/bindings/python/html/marble/Marble.MarbleModel.html M +26 -0 \
docs/bindings/python/html/marble/Marble.MarbleRunnerManager.html M +64 -0 \
docs/bindings/python/html/marble/Marble.MarbleWidget.html M +1 -1 \
docs/bindings/python/html/marble/Marble.PluginInterface.html M +14 -14 \
docs/bindings/python/html/marble/Marble.QtMarbleConfigDialog.html M +20 -2 \
docs/bindings/python/html/marble/Marble.RenderPlugin.html M +1 -1 \
docs/bindings/python/html/marble/Marble.RenderPluginInterface.html C +77 -146 \
docs/bindings/python/html/marble/Marble.Route.html [from: \
docs/bindings/python/html/marble/Marble.GeoDataMultiGeometry.html - 051% similarity] C +229 -164 \
docs/bindings/python/html/marble/Marble.RouteRequest.html [from: \
docs/bindings/python/html/marble/Marble.GeoDataLineString.html - 056% similarity] C +111 -74 \
docs/bindings/python/html/marble/Marble.RouteSegment.html [from: \
docs/bindings/python/html/marble/Marble.GeoDataGeometry.html - 055% similarity] C +182 -124 \
docs/bindings/python/html/marble/Marble.RoutingModel.html [from: \
docs/bindings/python/html/marble/Marble.GeoDataPolygon.html - 050% similarity] C +57 -66 \
docs/bindings/python/html/marble/Marble.RoutingProfile.html [from: \
docs/bindings/python/html/marble/Marble.MapThemeManager.html - 062% similarity] M +1 -1 \
docs/bindings/python/html/marble/Marble.ScreenGraphicsItem.html M +580 -4 \
docs/bindings/python/html/marble/Marble.ViewportParams.html M +47 -72 \
docs/bindings/python/html/marble/Marble.html M +1 -1 \
docs/bindings/python/html/marble/Serializable.html M +39 -37 \
docs/bindings/python/html/marble/global.html M +39 -37 docs/bindings/python/html/marble/index.html
M +9 -0 src/bindings/python/sip/AbstractDataPluginItem.sip
M +0 -4 src/bindings/python/sip/AbstractProjection.sip
A +51 -0 src/bindings/python/sip/AlternativeRoutesModel.sip
M +0 -1 src/bindings/python/sip/CurrentLocationWidget.sip
M +3 -1 src/bindings/python/sip/ElevationModel.sip
M +1 -0 src/bindings/python/sip/GeoDataContainer.sip
M +3 -1 src/bindings/python/sip/LegendWidget.sip
A +57 -0 src/bindings/python/sip/Maneuver.sip
M +3 -5 src/bindings/python/sip/MapThemeManager.sip
M +6 -8 src/bindings/python/sip/MapViewWidget.sip
M +1 -0 src/bindings/python/sip/MapWizard.sip
M +2 -1 src/bindings/python/sip/MarbleAbstractRunner.sip
M +1 -2 src/bindings/python/sip/MarbleControlBox.sip
M +2 -0 src/bindings/python/sip/MarbleMap.sip
M +4 -3 src/bindings/python/sip/MarbleModel.sip
M +4 -3 src/bindings/python/sip/MarbleRunnerManager.sip
M +8 -5 src/bindings/python/sip/MarbleWidget.sip
M +1 -1 src/bindings/python/sip/NavigationWidget.sip
M +1 -1 src/bindings/python/sip/QtMarbleConfigDialog.sip
M +1 -0 src/bindings/python/sip/RenderPlugin.sip
A +45 -0 src/bindings/python/sip/Route.sip
A +55 -0 src/bindings/python/sip/RouteRequest.sip
A +44 -0 src/bindings/python/sip/RouteSegment.sip
A +53 -0 src/bindings/python/sip/RoutingModel.sip
C +16 -9 src/bindings/python/sip/RoutingProfile.sip [from: \
src/bindings/python/sip/ElevationModel.sip - 054% similarity] M +12 -0 \
src/bindings/python/sip/ViewportParams.sip M +0 -11 src/bindings/python/sip/global.sip
M +7 -1 src/bindings/python/sip/marblemod.sip
http://commits.kde.org/marble/a1834ca45ee6936fc95e3bbea3090b0ae1026350
diff --git a/docs/bindings/python/html/allclasses.html b/docs/bindings/python/html/allclasses.html
index 69589e4..bbfb697 100644
--- a/docs/bindings/python/html/allclasses.html
+++ b/docs/bindings/python/html/allclasses.html
@@ -54,61 +54,64 @@
<p>
<h2>All Classes</h2>
<table width="95%" align="center" border="0" cellpadding="0" cellspacing="0">
-<tbody><tr><td><a name="letter_A"> A </a></td><td><a \
href="marble/Marble.GeoNode.html">GeoNode (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.AbstractDataPlugin.html">AbstractDataPlugin (marble.Marble)</a></td><td><a \
href="marble/Marble.GeoPainter.html">GeoPainter (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.AbstractDataPluginItem.html">AbstractDataPluginItem (marble.Marble)</a></td><td><a \
href="marble/Marble.GeoSceneLayer.html">GeoSceneLayer (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.AbstractDataPluginModel.html">AbstractDataPluginModel (marble.Marble)</a></td><td><a \
name="letter_L"> L </a></td></tr>
-<tr><td><a href="marble/Marble.AbstractFloatItem.html">AbstractFloatItem (marble.Marble)</a></td><td><a \
href="marble/Marble.LabelGraphicsItem.html">LabelGraphicsItem (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.AbstractMarbleGraphicsLayout.html">AbstractMarbleGraphicsLayout (marble.Marble)</a></td><td><a \
href="marble/Marble.LatLonBoxWidget.html">LatLonBoxWidget (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.AbstractProjection.html">AbstractProjection (marble.Marble)</a></td><td><a \
href="marble/Marble.LatLonEdit.html">LatLonEdit (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.AbstractWorkerThread.html">AbstractWorkerThread (marble.Marble)</a></td><td><a \
href="marble/Marble.LayerInterface.html">LayerInterface (marble.Marble)</a></td></tr>
-<tr><td><a name="letter_B"> B </a></td><td><a \
href="marble/Marble.LegendWidget.html">LegendWidget (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.BookmarkManager.html">BookmarkManager (marble.Marble)</a></td><td><a \
name="letter_M"> M </a></td></tr>
-<tr><td><a name="letter_C"> C </a></td><td><a \
href="marble/Marble.MapThemeManager.html">MapThemeManager (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.ClipPainter.html">ClipPainter (marble.Marble)</a></td><td><a \
href="marble/Marble.MapViewWidget.html">MapViewWidget (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.CurrentLocationWidget.html">CurrentLocationWidget (marble.Marble)</a></td><td><a \
href="marble/Marble.MapWizard.html">MapWizard (marble.Marble)</a></td></tr>
-<tr><td><a name="letter_D"> D </a></td><td><a \
href="marble/Marble.MarbleAboutDialog.html">MarbleAboutDialog (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.DownloadRegionDialog.html">DownloadRegionDialog (marble.Marble)</a></td><td><a \
href="marble/Marble.MarbleAbstractRunner.html">MarbleAbstractRunner (marble.Marble)</a></td></tr>
-<tr><td><a name="letter_E"> E </a></td><td><a \
href="marble/Marble.MarbleControlBox.html">MarbleControlBox (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.ElevationModel.html">ElevationModel (marble.Marble)</a></td><td><a \
href="marble/Marble.MarbleDirs.html">MarbleDirs (marble.Marble)</a></td></tr>
-<tr><td><a name="letter_F"> F </a></td><td><a \
href="marble/Marble.MarbleGlobal.html">MarbleGlobal (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.FileViewWidget.html">FileViewWidget (marble.Marble)</a></td><td><a \
href="marble/Marble.MarbleGraphicsGridLayout.html">MarbleGraphicsGridLayout (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.FrameGraphicsItem.html">FrameGraphicsItem (marble.Marble)</a></td><td><a \
href="marble/Marble.MarbleGraphicsItem.html">MarbleGraphicsItem (marble.Marble)</a></td></tr>
-<tr><td><a name="letter_G"> G </a></td><td><a \
href="marble/Marble.MarbleMap.html">MarbleMap (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataAbstractView.html">GeoDataAbstractView (marble.Marble)</a></td><td><a \
href="marble/Marble.MarbleModel.html">MarbleModel (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataAccuracy.html">GeoDataAccuracy (marble.Marble)</a></td><td><a \
href="marble/Marble.MarbleNavigator.html">MarbleNavigator (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataColorStyle.html">GeoDataColorStyle (marble.Marble)</a></td><td><a \
href="marble/Marble.MarbleRunnerManager.html">MarbleRunnerManager (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataContainer.html">GeoDataContainer (marble.Marble)</a></td><td><a \
href="marble/Marble.MarbleWidget.html">MarbleWidget (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataCoordinates.html">GeoDataCoordinates (marble.Marble)</a></td><td><a \
name="letter_N"> N </a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataDocument.html">GeoDataDocument (marble.Marble)</a></td><td><a \
href="marble/Marble.NavigationWidget.html">NavigationWidget (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataFeature.html">GeoDataFeature (marble.Marble)</a></td><td><a \
name="letter_P"> P </a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataFolder.html">GeoDataFolder (marble.Marble)</a></td><td><a \
href="marble/Marble.Planet.html">Planet (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataGeometry.html">GeoDataGeometry (marble.Marble)</a></td><td><a \
href="marble/Marble.PluginAboutDialog.html">PluginAboutDialog (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataHotSpot.html">GeoDataHotSpot (marble.Marble)</a></td><td><a \
href="marble/Marble.PluginInterface.html">PluginInterface (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataIconStyle.html">GeoDataIconStyle (marble.Marble)</a></td><td><a \
href="marble/Marble.PositionTracking.html">PositionTracking (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataInnerBoundary.html">GeoDataInnerBoundary (marble.Marble)</a></td><td><a \
name="letter_Q"> Q </a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataLabelStyle.html">GeoDataLabelStyle (marble.Marble)</a></td><td><a \
href="marble/Marble.QtMarbleConfigDialog.html">QtMarbleConfigDialog (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataLatLonAltBox.html">GeoDataLatLonAltBox (marble.Marble)</a></td><td><a \
href="marble/Marble.Quaternion.html">Quaternion (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataLatLonBox.html">GeoDataLatLonBox (marble.Marble)</a></td><td><a \
href="marble/Marble.Quaternion.html">Quaternion (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataLinearRing.html">GeoDataLinearRing (marble.Marble)</a></td><td><a \
name="letter_R"> R </a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataLineString.html">GeoDataLineString (marble.Marble)</a></td><td><a \
href="marble/Marble.RenderPlugin.html">RenderPlugin (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataLineStyle.html">GeoDataLineStyle (marble.Marble)</a></td><td><a \
href="marble/Marble.RenderPluginInterface.html">RenderPluginInterface (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataLod.html">GeoDataLod (marble.Marble)</a></td><td><a \
href="marble/Marble.RunnerPlugin.html">RunnerPlugin (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataLookAt.html">GeoDataLookAt (marble.Marble)</a></td><td><a \
name="letter_S"> S </a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataMultiGeometry.html">GeoDataMultiGeometry (marble.Marble)</a></td><td><a \
href="marble/Marble.ScreenGraphicsItem.html">ScreenGraphicsItem (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataObject.html">GeoDataObject (marble.Marble)</a></td><td><a \
href="marble/Serializable.html">Serializable (marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataOuterBoundary.html">GeoDataOuterBoundary (marble.Marble)</a></td><td><a \
href="marble/Marble.SunLocator.html">SunLocator (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataPlacemark.html">GeoDataPlacemark (marble.Marble)</a></td><td><a \
name="letter_T"> T </a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataPoint.html">GeoDataPoint (marble.Marble)</a></td><td><a \
href="marble/Marble.TileCoordsPyramid.html">TileCoordsPyramid (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataPolygon.html">GeoDataPolygon (marble.Marble)</a></td><td><a \
href="marble/Marble.TileCreator.html">TileCreator (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataPolyStyle.html">GeoDataPolyStyle (marble.Marble)</a></td><td><a \
href="marble/Marble.TileCreatorSource.html">TileCreatorSource (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataRegion.html">GeoDataRegion (marble.Marble)</a></td><td><a \
href="marble/Marble.TileLevelRangeWidget.html">TileLevelRangeWidget (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataStyle.html">GeoDataStyle (marble.Marble)</a></td><td><a \
href="marble/Marble.TinyWebBrowser.html">TinyWebBrowser (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataStyleMap.html">GeoDataStyleMap (marble.Marble)</a></td><td><a \
name="letter_V"> V </a></td></tr>
-<tr><td><a href="marble/Marble.GeoDataStyleSelector.html">GeoDataStyleSelector (marble.Marble)</a></td><td><a \
href="marble/Marble.ViewportParams.html">ViewportParams (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoDocument.html">GeoDocument (marble.Marble)</a></td><td><a \
name="letter_W"> W </a></td></tr>
-<tr><td><a href="marble/Marble.GeoGraphicsItem.html">GeoGraphicsItem (marble.Marble)</a></td><td><a \
href="marble/Marble.WidgetGraphicsItem.html">WidgetGraphicsItem (marble.Marble)</a></td></tr>
-<tr><td><a href="marble/Marble.GeoGraphicsScene.html">GeoGraphicsScene (marble.Marble)</a></td><td></td></tr>
+<tbody><tr><td><a name="letter_A"> A </a></td><td><a \
href="marble/Marble.GeoSceneLayer.html">GeoSceneLayer (marble.Marble)</a></td></tr> +<tr><td><a \
href="marble/Marble.AbstractDataPlugin.html">AbstractDataPlugin (marble.Marble)</a></td><td><a \
name="letter_L"> L </a></td></tr> +<tr><td><a \
href="marble/Marble.AbstractDataPluginItem.html">AbstractDataPluginItem (marble.Marble)</a></td><td><a \
href="marble/Marble.LabelGraphicsItem.html">LabelGraphicsItem (marble.Marble)</a></td></tr> \
+<tr><td><a href="marble/Marble.AbstractDataPluginModel.html">AbstractDataPluginModel (marble.Marble)</a></td><td><a \
href="marble/Marble.LatLonBoxWidget.html">LatLonBoxWidget (marble.Marble)</a></td></tr> +<tr><td><a \
href="marble/Marble.AbstractFloatItem.html">AbstractFloatItem (marble.Marble)</a></td><td><a \
href="marble/Marble.LatLonEdit.html">LatLonEdit (marble.Marble)</a></td></tr> +<tr><td><a \
href="marble/Marble.AbstractMarbleGraphicsLayout.html">AbstractMarbleGraphicsLayout (marble.Marble)</a></td><td><a \
href="marble/Marble.LayerInterface.html">LayerInterface (marble.Marble)</a></td></tr> +<tr><td><a \
href="marble/Marble.AbstractProjection.html">AbstractProjection (marble.Marble)</a></td><td><a \
href="marble/Marble.LegendWidget.html">LegendWidget (marble.Marble)</a></td></tr> +<tr><td><a \
href="marble/Marble.AbstractWorkerThread.html">AbstractWorkerThread (marble.Marble)</a></td><td><a \
name="letter_M"> M </a></td></tr> +<tr><td><a \
href="marble/Marble.AlternativeRoutesModel.html">AlternativeRoutesModel (marble.Marble)</a></td><td><a \
href="marble/Marble.Maneuver.html">Maneuver (marble.Marble)</a></td></tr> +<tr><td><a \
name="letter_B"> B </a></td><td><a \
href="marble/Marble.MapThemeManager.html">MapThemeManager (marble.Marble)</a></td></tr> +<tr><td><a \
href="marble/Marble.BookmarkManager.html">BookmarkManager (marble.Marble)</a></td><td><a \
href="marble/Marble.MapViewWidget.html">MapViewWidget (marble.Marble)</a></td></tr> +<tr><td><a \
name="letter_C"> C </a></td><td><a \
href="marble/Marble.MapWizard.html">MapWizard (marble.Marble)</a></td></tr> +<tr><td><a \
href="marble/Marble.ClipPainter.html">ClipPainter (marble.Marble)</a></td><td><a \
href="marble/Marble.MarbleAboutDialog.html">MarbleAboutDialog (marble.Marble)</a></td></tr> \
+<tr><td><a href="marble/Marble.CurrentLocationWidget.html">CurrentLocationWidget (marble.Marble)</a></td><td><a \
href="marble/Marble.MarbleAbstractRunner.html">MarbleAbstractRunner (marble.Marble)</a></td></tr> \
+<tr><td><a name="letter_D"> D </a></td><td><a \
href="marble/Marble.MarbleControlBox.html">MarbleControlBox (marble.Marble)</a></td></tr> \
+<tr><td><a href="marble/Marble.DownloadRegionDialog.html">DownloadRegionDialog (marble.Marble)</a></td><td><a \
href="marble/Marble.MarbleDirs.html">MarbleDirs (marble.Marble)</a></td></tr> +<tr><td><a \
name="letter_E"> E </a></td><td><a \
href="marble/Marble.MarbleGlobal.html">MarbleGlobal (marble.Marble)</a></td></tr> +<tr><td><a \
href="marble/Marble.ElevationModel.html">ElevationModel (marble.Marble)</a></td><td><a \
href="marble/Marble.MarbleGraphicsGridLayout.html">MarbleGraphicsGridLayout (marble.Marble)</a></td></tr>
+<tr><td><a name="letter_F"> F </a></td><td><a \
href="marble/Marble.MarbleGraphicsItem.html">MarbleGraphicsItem (marble.Marble)</a></td></tr> \
+<tr><td><a href="marble/Marble.FileViewWidget.html">FileViewWidget (marble.Marble)</a></td><td><a \
href="marble/Marble.MarbleMap.html">MarbleMap (marble.Marble)</a></td></tr> +<tr><td><a \
href="marble/Marble.FrameGraphicsItem.html">FrameGraphicsItem (marble.Marble)</a></td><td><a \
href="marble/Marble.MarbleModel.html">MarbleModel (marble.Marble)</a></td></tr> +<tr><td><a \
name="letter_G"> G </a></td><td><a \
href="marble/Marble.MarbleNavigator.html">MarbleNavigator (marble.Marble)</a></td></tr> +<tr><td><a \
href="marble/Marble.GeoDataAbstractView.html">GeoDataAbstractView (marble.Marble)</a></td><td><a \
href="marble/Marble.MarbleRunnerManager.html">MarbleRunnerManager (marble.Marble)</a></td></tr> \
+<tr><td><a href="marble/Marble.GeoDataAccuracy.html">GeoDataAccuracy (marble.Marble)</a></td><td><a \
href="marble/Marble.MarbleWidget.html">MarbleWidget (marble.Marble)</a></td></tr> +<tr><td><a \
href="marble/Marble.GeoDataColorStyle.html">GeoDataColorStyle (marble.Marble)</a></td><td><a \
name="letter_N"> N </a></td></tr> +<tr><td><a \
href="marble/Marble.GeoDataContainer.html">GeoDataContainer (marble.Marble)</a></td><td><a \
href="marble/Marble.NavigationWidget.html">NavigationWidget (marble.Marble)</a></td></tr> \
+<tr><td><a href="marble/Marble.GeoDataCoordinates.html">GeoDataCoordinates (marble.Marble)</a></td><td><a \
name="letter_P"> P </a></td></tr> +<tr><td><a \
href="marble/Marble.GeoDataDocument.html">GeoDataDocument (marble.Marble)</a></td><td><a \
href="marble/Marble.Planet.html">Planet (marble.Marble)</a></td></tr> +<tr><td><a \
href="marble/Marble.GeoDataFeature.html">GeoDataFeature (marble.Marble)</a></td><td><a \
href="marble/Marble.PluginAboutDialog.html">PluginAboutDialog (marble.Marble)</a></td></tr> \
+<tr><td><a href="marble/Marble.GeoDataFolder.html">GeoDataFolder (marble.Marble)</a></td><td><a \
href="marble/Marble.PluginInterface.html">PluginInterface (marble.Marble)</a></td></tr> +<tr><td><a \
href="marble/Marble.GeoDataGeometry.html">GeoDataGeometry (marble.Marble)</a></td><td><a \
href="marble/Marble.PositionTracking.html">PositionTracking (marble.Marble)</a></td></tr> \
+<tr><td><a href="marble/Marble.GeoDataHotSpot.html">GeoDataHotSpot (marble.Marble)</a></td><td><a \
name="letter_Q"> Q </a></td></tr> +<tr><td><a \
href="marble/Marble.GeoDataIconStyle.html">GeoDataIconStyle (marble.Marble)</a></td><td><a \
href="marble/Marble.QtMarbleConfigDialog.html">QtMarbleConfigDialog (marble.Marble)</a></td></tr> \
+<tr><td><a href="marble/Marble.GeoDataInnerBoundary.html">GeoDataInnerBoundary (marble.Marble)</a></td><td><a \
href="marble/Marble.Quaternion.html">Quaternion (marble.Marble)</a></td></tr> +<tr><td><a \
href="marble/Marble.GeoDataLabelStyle.html">GeoDataLabelStyle (marble.Marble)</a></td><td><a \
href="marble/Marble.Quaternion.html">Quaternion (marble.Marble)</a></td></tr> +<tr><td><a \
href="marble/Marble.GeoDataLatLonAltBox.html">GeoDataLatLonAltBox (marble.Marble)</a></td><td><a \
name="letter_R"> R </a></td></tr> +<tr><td><a \
href="marble/Marble.GeoDataLatLonBox.html">GeoDataLatLonBox (marble.Marble)</a></td><td><a \
href="marble/Marble.RenderPlugin.html">RenderPlugin (marble.Marble)</a></td></tr> +<tr><td><a \
href="marble/Marble.GeoDataLinearRing.html">GeoDataLinearRing (marble.Marble)</a></td><td><a \
href="marble/Marble.RenderPluginInterface.html">RenderPluginInterface (marble.Marble)</a></td></tr> \
+<tr><td><a href="marble/Marble.GeoDataLineString.html">GeoDataLineString (marble.Marble)</a></td><td><a \
href="marble/Marble.Route.html">Route (marble.Marble)</a></td></tr> +<tr><td><a \
href="marble/Marble.GeoDataLineStyle.html">GeoDataLineStyle (marble.Marble)</a></td><td><a \
href="marble/Marble.RouteRequest.html">RouteRequest (marble.Marble)</a></td></tr> +<tr><td><a \
href="marble/Marble.GeoDataLod.html">GeoDataLod (marble.Marble)</a></td><td><a \
href="marble/Marble.RouteSegment.html">RouteSegment (marble.Marble)</a></td></tr> +<tr><td><a \
href="marble/Marble.GeoDataLookAt.html">GeoDataLookAt (marble.Marble)</a></td><td><a \
href="marble/Marble.RoutingModel.html">RoutingModel (marble.Marble)</a></td></tr> +<tr><td><a \
href="marble/Marble.GeoDataMultiGeometry.html">GeoDataMultiGeometry (marble.Marble)</a></td><td><a \
href="marble/Marble.RoutingProfile.html">RoutingProfile (marble.Marble)</a></td></tr> +<tr><td><a \
href="marble/Marble.GeoDataObject.html">GeoDataObject (marble.Marble)</a></td><td><a \
href="marble/Marble.RunnerPlugin.html">RunnerPlugin (marble.Marble)</a></td></tr> +<tr><td><a \
href="marble/Marble.GeoDataOuterBoundary.html">GeoDataOuterBoundary (marble.Marble)</a></td><td><a \
name="letter_S"> S </a></td></tr> +<tr><td><a \
href="marble/Marble.GeoDataPlacemark.html">GeoDataPlacemark (marble.Marble)</a></td><td><a \
href="marble/Marble.ScreenGraphicsItem.html">ScreenGraphicsItem (marble.Marble)</a></td></tr> \
+<tr><td><a href="marble/Marble.GeoDataPoint.html">GeoDataPoint (marble.Marble)</a></td><td><a \
href="marble/Serializable.html">Serializable (marble)</a></td></tr> +<tr><td><a \
href="marble/Marble.GeoDataPolygon.html">GeoDataPolygon (marble.Marble)</a></td><td><a \
href="marble/Marble.SunLocator.html">SunLocator (marble.Marble)</a></td></tr> +<tr><td><a \
href="marble/Marble.GeoDataPolyStyle.html">GeoDataPolyStyle (marble.Marble)</a></td><td><a \
name="letter_T"> T </a></td></tr> +<tr><td><a \
href="marble/Marble.GeoDataRegion.html">GeoDataRegion (marble.Marble)</a></td><td><a \
href="marble/Marble.TileCoordsPyramid.html">TileCoordsPyramid (marble.Marble)</a></td></tr> \
+<tr><td><a href="marble/Marble.GeoDataStyle.html">GeoDataStyle (marble.Marble)</a></td><td><a \
href="marble/Marble.TileCreator.html">TileCreator (marble.Marble)</a></td></tr> +<tr><td><a \
href="marble/Marble.GeoDataStyleMap.html">GeoDataStyleMap (marble.Marble)</a></td><td><a \
href="marble/Marble.TileCreatorSource.html">TileCreatorSource (marble.Marble)</a></td></tr> \
+<tr><td><a href="marble/Marble.GeoDataStyleSelector.html">GeoDataStyleSelector (marble.Marble)</a></td><td><a \
href="marble/Marble.TileLevelRangeWidget.html">TileLevelRangeWidget (marble.Marble)</a></td></tr> \
+<tr><td><a href="marble/Marble.GeoDocument.html">GeoDocument (marble.Marble)</a></td><td><a \
href="marble/Marble.TinyWebBrowser.html">TinyWebBrowser (marble.Marble)</a></td></tr> +<tr><td><a \
href="marble/Marble.GeoGraphicsItem.html">GeoGraphicsItem (marble.Marble)</a></td><td><a \
name="letter_V"> V </a></td></tr> +<tr><td><a \
href="marble/Marble.GeoGraphicsScene.html">GeoGraphicsScene (marble.Marble)</a></td><td><a \
href="marble/Marble.ViewportParams.html">ViewportParams (marble.Marble)</a></td></tr> +<tr><td><a \
href="marble/Marble.GeoNode.html">GeoNode (marble.Marble)</a></td><td><a \
name="letter_W"> W </a></td></tr> +<tr><td><a \
href="marble/Marble.GeoPainter.html">GeoPainter (marble.Marble)</a></td><td><a \
href="marble/Marble.WidgetGraphicsItem.html">WidgetGraphicsItem (marble.Marble)</a></td></tr> \
</table>
</div>
diff --git a/docs/bindings/python/html/marble/Marble.AbstractDataPluginModel.html \
b/docs/bindings/python/html/marble/Marble.AbstractDataPluginModel.html index 82b6bf6..7089ef0 100644
--- a/docs/bindings/python/html/marble/Marble.AbstractDataPluginModel.html
+++ b/docs/bindings/python/html/marble/Marble.AbstractDataPluginModel.html
@@ -68,6 +68,7 @@ a subclass.
<table border="0" cellpadding="0" cellspacing="0"><tr><td colspan="2"><br><h2>Signals</h2></td></tr>
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#itemsUpdated">itemsUpdated</a> ()</td></tr> <tr><td \
colspan="2"><br><h2>Methods</h2></td></tr> +<tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#AbstractDataPluginModel">__init__</a> (self, QString name, PluginManager pluginManager, QObject \
parent=0)</td></tr> <tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#addItemToList">addItemToList</a> (self, <a \
href="../marble/Marble.AbstractDataPluginItem.html">Marble.AbstractDataPluginItem</a> item)</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#downloadDescriptionFile">downloadDescriptionFile</a> (self, QUrl \
url)</td></tr> <tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#downloadItemData">downloadItemData</a> (self, \
QUrl url, QString type, <a \
href="../marble/Marble.AbstractDataPluginItem.html">Marble.AbstractDataPluginItem</a> item)</td></tr> @@ \
-97,7 +98,41 @@ a subclass. </tr>
</table>
</div>
-<div class="memdoc"><dl compact><dt><b>Signal syntax:</b></dt><dd><code>QObject.connect(source, \
SIGNAL("itemsUpdated()"), target_slot)</code></dd></dl></div></div><hr><h2>Method Documentation</h2><a \
class="anchor" name="addItemToList"></a> +<div class="memdoc"><dl compact><dt><b>Signal \
syntax:</b></dt><dd><code>QObject.connect(source, SIGNAL("itemsUpdated()"), \
target_slot)</code></dd></dl></div></div><hr><h2>Method Documentation</h2><a class="anchor" \
name="AbstractDataPluginModel"></a> +<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname">__init__</td>
+<td>(</td>
+<td class="paramtype"> <em>self</em>, </td>
+<td class="paramname"></td>
+</tr><tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">QString </td>
+<td class="paramname"><em>name</em>, </td>
+</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">PluginManager </td>
+<td class="paramname"><em>pluginManager</em>, </td>
+</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">QObject </td>
+<td class="paramname"><em>parent=0</em></td>
+</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
+<div class="memdoc"></div></div><a class="anchor" name="addItemToList"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
diff --git a/docs/bindings/python/html/marble/Marble.AbstractMarbleGraphicsLayout.html \
b/docs/bindings/python/html/marble/Marble.AbstractMarbleGraphicsLayout.html index 5cd8492..2efde4e 100644
--- a/docs/bindings/python/html/marble/Marble.AbstractMarbleGraphicsLayout.html
+++ b/docs/bindings/python/html/marble/Marble.AbstractMarbleGraphicsLayout.html
@@ -49,7 +49,7 @@
<code>from PyKDE4.marble import *</code>
<p>
-Subclasses: <a href="../marble/Marble.MarbleGraphicsGridLayout.html">Marble.MarbleGraphicsGridLayout</a><br \
/> +
Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
diff --git a/docs/bindings/python/html/marble/Marble.AbstractProjection.html \
b/docs/bindings/python/html/marble/Marble.AbstractProjection.html index 3ddad3d..f3e1d11 100644
--- a/docs/bindings/python/html/marble/Marble.AbstractProjection.html
+++ b/docs/bindings/python/html/marble/Marble.AbstractProjection.html
@@ -64,7 +64,6 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<tr><td class="memItemLeft" nowrap align="right" valign="top">bool </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#exceedsLatitudeRange">exceedsLatitudeRange</a> (self, <a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> coords)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top">bool </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#exceedsLatitudeRange">exceedsLatitudeRange</a> (self, <a \
href="../marble/Marble.GeoDataLineString.html">Marble.GeoDataLineString</a> lineString)</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top">bool </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#geoCoordinates">geoCoordinates</a> (self, int x, int y, <a \
href="../marble/Marble.ViewportParams.html">Marble.ViewportParams</a> viewport, float lon, float lat, <a \
href="../marble/Marble.GeoDataCoordinates.html#Unit">Marble.GeoDataCoordinates.Unit</a> \
unit=Marble.GeoDataCoordinates.Degree)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#horizonToPolygon">horizonToPolygon</a> (self, <a \
href="../marble/Marble.ViewportParams.html">Marble.ViewportParams</a> viewport, <a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> disappearCoords, <a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> reappearCoords, QPolygonF \
a3)</td></tr> <tr><td class="memItemLeft" nowrap align="right" valign="top">bool </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#isOrientedNormal">isOrientedNormal</a> \
(self)</td></tr> <tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataLatLonAltBox.html">Marble.GeoDataLatLonAltBox</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#latLonAltBox">latLonAltBox</a> (self, QRect \
screenRect, <a href="../marble/Marble.ViewportParams.html">Marble.ViewportParams</a> viewport)</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top">bool </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#mapCoversViewport">mapCoversViewport</a> (self, <a \
href="../marble/Marble.ViewportParams.html">Marble.ViewportParams</a> viewport)</td></tr> @@ -85,7 +84,6 \
@@ Namespace: <a href="../marble/Marble.html">Marble</a><br /> <tr><td class="memItemLeft" nowrap \
align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#setMinLat">setMinLat</a> (self, float minLat)</td></tr> <tr><td class="memItemLeft" nowrap \
align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#setRepeatX">setRepeatX</a> (self, bool repeatX)</td></tr> <tr><td class="memItemLeft" nowrap \
align="right" valign="top"><a \
href="../marble/Marble.AbstractProjection.html#SurfaceType">Marble.AbstractProjection.SurfaceType</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#surfaceType">surfaceType</a> \
(self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#tessellateLineSegment">tessellateLineSegment</a> (self, <a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> aCoords, float ax, float \
ay, <a href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> bCoords, float bx, \
float by, QPolygonF polygon, <a href="../marble/Marble.ViewportParams.html">Marble.ViewportParams</a> \
viewport, <a href="../marble/Marble.html">Marble.TessellationFlags</a> f=0)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top">bool </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#traversableDateLine">traversableDateLine</a> (self)</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top">bool </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#traversablePoles">traversablePoles</a> (self)</td></tr> </table>
@@ -215,47 +213,7 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
</td></tr> </table></dl>
<p> <dl class="return" compact><dt><b>Returns:</b></dt><dd> true if the pixel (x, y) is within the globe
</dd></dl> false if the pixel (x, y) is outside the globe, i.e. in space.
-</p></div></div><a class="anchor" name="horizonToPolygon"></a>
-<div class="memitem">
-<div class="memproto">
-<table class="memname"><tr>
-<td class="memname"> horizonToPolygon</td>
-<td>(</td>
-<td class="paramtype"> <em>self</em>, </td>
-<td class="paramname"></td>
-</tr><tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype"><a \
href="../marble/Marble.ViewportParams.html">Marble.ViewportParams</a> </td>
-<td class="paramname"><em>viewport</em>, </td>
-</tr>
-<tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> </td>
-<td class="paramname"><em>disappearCoords</em>, </td>
-</tr>
-<tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> </td>
-<td class="paramname"><em>reappearCoords</em>, </td>
-</tr>
-<tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype">QPolygonF </td>
-<td class="paramname"><em>a3</em></td>
-</tr>
-<tr>
-<td></td>
-<td>)</td>
-<td></td>
-<td></td>
-<td width="100%"> </td>
-</tr></table>
-</div>
-<div class="memdoc"></div></div><a class="anchor" name="isOrientedNormal"></a>
+</p></div></div><a class="anchor" name="isOrientedNormal"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
@@ -719,77 +677,7 @@ use <dl class="see" compact><dt><b>See also:</b></dt><dd> screenCoordinates(qrea
</tr>
</table>
</div>
-<div class="memdoc"><dl compact><dt><b>Abstract method:</b></dt><dd>This method is abstract and can be \
overridden but not called directly.</dd></dl></div></div><a class="anchor" \
name="tessellateLineSegment"></a>
-<div class="memitem">
-<div class="memproto">
-<table class="memname"><tr>
-<td class="memname"> tessellateLineSegment</td>
-<td>(</td>
-<td class="paramtype"> <em>self</em>, </td>
-<td class="paramname"></td>
-</tr><tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> </td>
-<td class="paramname"><em>aCoords</em>, </td>
-</tr>
-<tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype">float </td>
-<td class="paramname"><em>ax</em>, </td>
-</tr>
-<tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype">float </td>
-<td class="paramname"><em>ay</em>, </td>
-</tr>
-<tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> </td>
-<td class="paramname"><em>bCoords</em>, </td>
-</tr>
-<tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype">float </td>
-<td class="paramname"><em>bx</em>, </td>
-</tr>
-<tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype">float </td>
-<td class="paramname"><em>by</em>, </td>
-</tr>
-<tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype">QPolygonF </td>
-<td class="paramname"><em>polygon</em>, </td>
-</tr>
-<tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype"><a \
href="../marble/Marble.ViewportParams.html">Marble.ViewportParams</a> </td>
-<td class="paramname"><em>viewport</em>, </td>
-</tr>
-<tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype"><a href="../marble/Marble.html">Marble.TessellationFlags</a> </td>
-<td class="paramname"><em>f=0</em></td>
-</tr>
-<tr>
-<td></td>
-<td>)</td>
-<td></td>
-<td></td>
-<td width="100%"> </td>
-</tr></table>
-</div>
-<div class="memdoc"></div></div><a class="anchor" name="traversableDateLine"></a>
+<div class="memdoc"><dl compact><dt><b>Abstract method:</b></dt><dd>This method is abstract and can be \
overridden but not called directly.</dd></dl></div></div><a class="anchor" \
name="traversableDateLine"></a> <div class="memitem">
<div class="memproto">
<table class="memname"><tr>
diff --git a/docs/bindings/python/html/marble/Marble.AlternativeRoutesModel.html \
b/docs/bindings/python/html/marble/Marble.AlternativeRoutesModel.html new file mode 100644
index 0000000..a056e9d
--- /dev/null
+++ b/docs/bindings/python/html/marble/Marble.AlternativeRoutesModel.html
@@ -0,0 +1,468 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" \
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" \
lang="en" xml:lang="en"> +
+<head>
+ <title>Marble.AlternativeRoutesModel</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <link rel="stylesheet" type="text/css" href="../common/doxygen.css" />
+ <link rel="stylesheet" media="screen" type="text/css" title="KDE Colors" href="../common/kde.css" />
+</head>
+<body>
+<div id="container">
+<div id="header">
+ <div id="header_top">
+ <div>
+ <div>
+ <img alt ="" src="../common/top-kde.jpg"/>
+ KDE 4.7 PyKDE API Reference
+ </div>
+ </div>
+ </div>
+ <div id="header_bottom">
+ <div id="location">
+ <ul>
+ <li>KDE's Python API</li>
+ </ul>
+ </div>
+
+ <div id="menu">
+ <ul>
+ <li><a href="../modules.html">Overview</a></li>
+<li><a href="http://techbase.kde.org/Development/Languages/Python">PyKDE Home</a></li>
+<li><a href="http://kde.org/family/">Sitemap</a></li>
+<li><a href="http://kde.org/contact/">Contact Us</a></li>
+</ul>
+ </div>
+ </div>
+</div>
+
+<div id="body_wrapper">
+<div id="body">
+<div id="right">
+<div class="content">
+<div id="main">
+<div class="clearer"> </div>
+
+<h1>AlternativeRoutesModel Class Reference</h1>
+<code>from PyKDE4.marble import *</code>
+<p>
+Inherits: QAbstractListModel → QAbstractItemModel → QObject<br />
+
+Namespace: <a href="../marble/Marble.html">Marble</a><br />
+<h2>Detailed Description</h2>
+
+
+<table border="0" cellpadding="0" cellspacing="0"><tr><td \
colspan="2"><br><h2>Enumerations</h2></td></tr> +<tr><td class="memItemLeft" nowrap align="right" \
valign="top"><a class="el" href="#WritePolicy">WritePolicy</a> </td><td class="memItemRight" \
valign="bottom">{ Instant, Lazy }</td></tr> +<tr><td colspan="2"><br><h2>Signals</h2></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#currentRouteChanged">currentRouteChanged</a> (<a \
href="../marble/Marble.GeoDataDocument.html">Marble.GeoDataDocument</a> newRoute)</td></tr> +<tr><td \
colspan="2"><br><h2>Methods</h2></td></tr> +<tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#AlternativeRoutesModel">__init__</a> (self, QObject parent=0)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#addRoute">addRoute</a> (self, <a \
href="../marble/Marble.GeoDataDocument.html">Marble.GeoDataDocument</a> document, <a \
href="../marble/Marble.AlternativeRoutesModel.html#WritePolicy">Marble.AlternativeRoutesModel.WritePolicy</a> \
policy=Marble.AlternativeRoutesModel.Lazy)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" href="#clear">clear</a> \
(self)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataDocument.html">Marble.GeoDataDocument</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#currentRoute">currentRoute</a> (self)</td></tr> \
+<tr><td class="memItemLeft" nowrap align="right" valign="top">QVariant </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#data">data</a> (self, QModelIndex index, int \
role=Qt.DisplayRole)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" \
valign="top">QVariant </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#headerData">headerData</a> (self, int section, <a \
href="http://www.riverbankcomputing.co.uk/static/Docs/PyQt4/html/qt.html">Qt::Orientation</a> \
orientation, int role=Qt.DisplayRole)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#newRequest">newRequest</a> (self, <a \
href="../marble/Marble.RouteRequest.html">Marble.RouteRequest</a> request)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataDocument.html">Marble.GeoDataDocument</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#route">route</a> (self, int index)</td></tr> \
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#rowCount">rowCount</a> (self, QModelIndex \
parent=QModelIndex())</td></tr> +<tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#setCurrentRoute">setCurrentRoute</a> (self, int index)</td></tr> +<tr><td \
colspan="2"><br><h2>Static Methods</h2></td></tr> +<tr><td class="memItemLeft" nowrap align="right" \
valign="top">QVector<qreal> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#deviation">deviation</a> (<a \
href="../marble/Marble.GeoDataDocument.html">Marble.GeoDataDocument</a> routeA, <a \
href="../marble/Marble.GeoDataDocument.html">Marble.GeoDataDocument</a> routeB)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top">float </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#distance">distance</a> (<a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> satellite, <a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> lineA, <a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> lineB)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataLineString.html">Marble.GeoDataLineString</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#waypoints">waypoints</a> (<a \
href="../marble/Marble.GeoDataDocument.html">Marble.GeoDataDocument</a> document)</td></tr> +</table>
+<hr><h2>Signal Documentation</h2><a class="anchor" name="currentRouteChanged"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"> currentRouteChanged</td>
+<td>(</td>
+<td class="paramtype"><a \
href="../marble/Marble.GeoDataDocument.html">Marble.GeoDataDocument</a> </td> +<td \
class="paramname"><em>newRoute</em></td> +</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
+<div class="memdoc"><dl compact><dt><b>Signal syntax:</b></dt><dd><code>QObject.connect(source, \
SIGNAL("currentRouteChanged(Marble::GeoDataDocument*)"), \
target_slot)</code></dd></dl></div></div><hr><h2>Method Documentation</h2><a class="anchor" \
name="AlternativeRoutesModel"></a> +<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname">__init__</td>
+<td>(</td>
+<td class="paramtype"> <em>self</em>, </td>
+<td class="paramname"></td>
+</tr><tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">QObject </td>
+<td class="paramname"><em>parent=0</em></td>
+</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
+<div class="memdoc"><p>Constructor
+</p></div></div><a class="anchor" name="addRoute"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"> addRoute</td>
+<td>(</td>
+<td class="paramtype"> <em>self</em>, </td>
+<td class="paramname"></td>
+</tr><tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype"><a \
href="../marble/Marble.GeoDataDocument.html">Marble.GeoDataDocument</a> </td> +<td \
class="paramname"><em>document</em>, </td> +</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype"><a \
href="../marble/Marble.AlternativeRoutesModel.html#WritePolicy">Marble.AlternativeRoutesModel.WritePolicy</a> </td>
+<td class="paramname"><em>policy=Marble.AlternativeRoutesModel.Lazy</em></td>
+</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
+<div class="memdoc"><p>Old data in the model is discarded, the parsed content of the provided document
+is used as the new model data and a model reset is done
+</p><dl compact><dt><b>Parameters:</b></dt><dd>
+<table border="0" cellspacing="2" cellpadding="0">
+<tr><td></td><td valign="top"><em>document</em> </td><td> The route to add
+
+<tr><td></td><td valign="top"><em>policy</em> </td><td> In lazy mode (default), a short amount of \
time is waited for +other addRoute() calls before adding the route to the model. Otherwise, the
+model is changed immediately.
+</td></tr>
+</table></dl>
+<p>
+</p></div></div><a class="anchor" name="clear"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"> clear</td>
+<td>(</td>
+<td class="paramtype"> </td>
+<td class="paramname"><em>self</em> )</td>
+<td width="100%"> </td>
+</tr>
+</table>
+</div>
+<div class="memdoc"><p>Remove all alternative routes from the model
+</p></div></div><a class="anchor" name="currentRoute"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"><a href="../marble/Marble.GeoDataDocument.html">Marble.GeoDataDocument</a> \
currentRoute</td> +<td>(</td>
+<td class="paramtype"> </td>
+<td class="paramname"><em>self</em> )</td>
+<td width="100%"> </td>
+</tr>
+</table>
+</div>
+<div class="memdoc"></div></div><a class="anchor" name="data"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname">QVariant data</td>
+<td>(</td>
+<td class="paramtype"> <em>self</em>, </td>
+<td class="paramname"></td>
+</tr><tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">QModelIndex </td>
+<td class="paramname"><em>index</em>, </td>
+</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">int </td>
+<td class="paramname"><em>role=Qt.DisplayRole</em></td>
+</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
+<div class="memdoc"><p>Overload of QAbstractListModel
+</p></div></div><a class="anchor" name="headerData"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname">QVariant headerData</td>
+<td>(</td>
+<td class="paramtype"> <em>self</em>, </td>
+<td class="paramname"></td>
+</tr><tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">int </td>
+<td class="paramname"><em>section</em>, </td>
+</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype"><a \
href="http://www.riverbankcomputing.co.uk/static/Docs/PyQt4/html/qt.html">Qt::Orientation</a> </td> \
+<td class="paramname"><em>orientation</em>, </td> +</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">int </td>
+<td class="paramname"><em>role=Qt.DisplayRole</em></td>
+</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
+<div class="memdoc"><p>Overload of QAbstractListModel
+</p></div></div><a class="anchor" name="newRequest"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"> newRequest</td>
+<td>(</td>
+<td class="paramtype"> <em>self</em>, </td>
+<td class="paramname"></td>
+</tr><tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype"><a href="../marble/Marble.RouteRequest.html">Marble.RouteRequest</a> </td>
+<td class="paramname"><em>request</em></td>
+</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
+<div class="memdoc"><p>Invalidate the current alternative routes and prepare for new ones to arrive
+</p></div></div><a class="anchor" name="route"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"><a href="../marble/Marble.GeoDataDocument.html">Marble.GeoDataDocument</a> \
route</td> +<td>(</td>
+<td class="paramtype"> <em>self</em>, </td>
+<td class="paramname"></td>
+</tr><tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">int </td>
+<td class="paramname"><em>index</em></td>
+</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
+<div class="memdoc"></div></div><a class="anchor" name="rowCount"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname">int rowCount</td>
+<td>(</td>
+<td class="paramtype"> <em>self</em>, </td>
+<td class="paramname"></td>
+</tr><tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">QModelIndex </td>
+<td class="paramname"><em>parent=QModelIndex()</em></td>
+</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
+<div class="memdoc"><p>Overload of QAbstractListModel
+</p></div></div><a class="anchor" name="setCurrentRoute"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"> setCurrentRoute</td>
+<td>(</td>
+<td class="paramtype"> <em>self</em>, </td>
+<td class="paramname"></td>
+</tr><tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">int </td>
+<td class="paramname"><em>index</em></td>
+</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
+<div class="memdoc"></div></div><hr><h2>Static Method Documentation</h2><a class="anchor" \
name="deviation"></a> +<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname">QVector<qreal> deviation</td>
+<td>(</td>
+<td class="paramtype"><a \
href="../marble/Marble.GeoDataDocument.html">Marble.GeoDataDocument</a> </td> +<td \
class="paramname"><em>routeA</em>, </td> +</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype"><a \
href="../marble/Marble.GeoDataDocument.html">Marble.GeoDataDocument</a> </td> +<td \
class="paramname"><em>routeB</em></td> +</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
+<div class="memdoc"><p>Returns the minimal distance of each waypoint of routeA to routeB
+</p></div></div><a class="anchor" name="distance"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname">float distance</td>
+<td>(</td>
+<td class="paramtype"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> </td> +<td \
class="paramname"><em>satellite</em>, </td> +</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> </td> +<td \
class="paramname"><em>lineA</em>, </td> +</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> </td> +<td \
class="paramname"><em>lineB</em></td> +</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
+<div class="memdoc"><p>Returns the distance between the given point and the given great circle path
+</p></div></div><a class="anchor" name="waypoints"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"><a href="../marble/Marble.GeoDataLineString.html">Marble.GeoDataLineString</a> \
waypoints</td> +<td>(</td>
+<td class="paramtype"><a \
href="../marble/Marble.GeoDataDocument.html">Marble.GeoDataDocument</a> </td> +<td \
class="paramname"><em>document</em></td> +</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
+<div class="memdoc"><p>Returns the waypoints contained in the route as a linestring
+</p></div></div><hr><h2>Enumeration Documentation</h2><a class="anchor" name="WritePolicy"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname">
+<tr><td class="memname">WritePolicy</td>
+</tr>
+</table>
+</div>
+<div class="memdoc"><dl compact><dt><b>Enumerator: </b></dt><dd>
+<table border="0" cellspacing="2" cellpadding="0"><tr><td \
valign="top"><em>Instant</em> </td><td><tr><td valign="top"><em>Lazy</em> </td><td></table> \
+</dl> +</div></div><p>
+</div>
+</div>
+</div>
+
+<div id="left">
+
+<div class="menu_box">
+<div class="nav_list">
+<ul>
+<li><a href="../allclasses.html">Full Index</a></li>
+</ul>
+</div>
+
+<a name="cp-menu" /><div class="menutitle"><div>
+ <h2 id="cp-menu-project">Modules</h2>
+</div></div>
+<div class="nav_list">
+<ul><li><a href="../akonadi/index.html">akonadi</a></li>
+<li><a href="../dnssd/index.html">dnssd</a></li>
+<li><a href="../kdecore/index.html">kdecore</a></li>
+<li><a href="../kdeui/index.html">kdeui</a></li>
+<li><a href="../khtml/index.html">khtml</a></li>
+<li><a href="../kio/index.html">kio</a></li>
+<li><a href="../knewstuff/index.html">knewstuff</a></li>
+<li><a href="../kparts/index.html">kparts</a></li>
+<li><a href="../kutils/index.html">kutils</a></li>
+<li><a href="../nepomuk/index.html">nepomuk</a></li>
+<li><a href="../phonon/index.html">phonon</a></li>
+<li><a href="../plasma/index.html">plasma</a></li>
+<li><a href="../polkitqt/index.html">polkitqt</a></li>
+<li><a href="../solid/index.html">solid</a></li>
+<li><a href="../soprano/index.html">soprano</a></li>
+</ul></div></div>
+
+</div>
+
+</div>
+ <div class="clearer"/>
+</div>
+
+<div id="end_body"></div>
+</div>
+<div id="footer"><div id="footer_text">
+This documentation is maintained by <a \
href="mailto:simon@simonzone.com">Simon Edwards</a>.<br /> + \
KDE<sup>®</sup> and <a href="../images/kde_gear_black.png">the K Desktop \
Environment<sup>®</sup> logo</a> are registered trademarks of <a href="http://ev.kde.org/" \
title="Homepage of the KDE non-profit Organization">KDE e.V.</a> | + <a \
href="http://www.kde.org/contact/impressum.php">Legal</a> + </div></div>
+</body>
+</html>
diff --git a/docs/bindings/python/html/marble/Marble.ClipPainter.html \
b/docs/bindings/python/html/marble/Marble.ClipPainter.html index 6ff9fc5..dc281f3 100644
--- a/docs/bindings/python/html/marble/Marble.ClipPainter.html
+++ b/docs/bindings/python/html/marble/Marble.ClipPainter.html
@@ -49,7 +49,7 @@
<code>from PyKDE4.marble import *</code>
<p>
Inherits: QPainter<br />
-Subclasses: <a href="../marble/Marble.GeoPainter.html">Marble.GeoPainter</a><br />
+
Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
<dl class="abstract" compact><dt><b>Abstract class:</b></dt>
diff --git a/docs/bindings/python/html/marble/Marble.CurrentLocationWidget.html \
b/docs/bindings/python/html/marble/Marble.CurrentLocationWidget.html index c96ab9a..8d7710b 100644
--- a/docs/bindings/python/html/marble/Marble.CurrentLocationWidget.html
+++ b/docs/bindings/python/html/marble/Marble.CurrentLocationWidget.html
@@ -59,7 +59,6 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<tr><td class="memItemLeft" nowrap align="right" valign="top">bool </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#autoZoom">autoZoom</a> (self)</td></tr> <tr><td class="memItemLeft" \
nowrap align="right" valign="top">QString </td><td class="memItemRight" valign="bottom"><a \
class="el" href="#lastOpenPath">lastOpenPath</a> (self)</td></tr> <tr><td class="memItemLeft" nowrap \
align="right" valign="top">QString </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#lastSavePath">lastSavePath</a> (self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#receiveGpsCoordinates">receiveGpsCoordinates</a> (self, <a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> in, float speed)</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#setAutoZoom">setAutoZoom</a> (self, bool activate)</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#setLastOpenPath">setLastOpenPath</a> (self, QString path)</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#setLastSavePath">setLastSavePath</a> (self, QString path)</td></tr> \
@@ -132,34 +131,6 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br /> </tr>
</table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="receiveGpsCoordinates"></a>
-<div class="memitem">
-<div class="memproto">
-<table class="memname"><tr>
-<td class="memname"> receiveGpsCoordinates</td>
-<td>(</td>
-<td class="paramtype"> <em>self</em>, </td>
-<td class="paramname"></td>
-</tr><tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> </td>
-<td class="paramname"><em>in</em>, </td>
-</tr>
-<tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype">float </td>
-<td class="paramname"><em>speed</em></td>
-</tr>
-<tr>
-<td></td>
-<td>)</td>
-<td></td>
-<td></td>
-<td width="100%"> </td>
-</tr></table>
-</div>
<div class="memdoc"></div></div><a class="anchor" name="setAutoZoom"></a>
<div class="memitem">
<div class="memproto">
diff --git a/docs/bindings/python/html/marble/Marble.FrameGraphicsItem.html \
b/docs/bindings/python/html/marble/Marble.FrameGraphicsItem.html index ce9dff0..1ba9422 100644
--- a/docs/bindings/python/html/marble/Marble.FrameGraphicsItem.html
+++ b/docs/bindings/python/html/marble/Marble.FrameGraphicsItem.html
@@ -49,7 +49,7 @@
<code>from PyKDE4.marble import *</code>
<p>
Inherits: <a href="../marble/Marble.ScreenGraphicsItem.html">Marble.ScreenGraphicsItem</a> → <a \
href="../marble/Marble.MarbleGraphicsItem.html">Marble.MarbleGraphicsItem</a><br />
-Subclasses: <a href="../marble/Marble.LabelGraphicsItem.html">Marble.LabelGraphicsItem</a><br />
+
Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
diff --git a/docs/bindings/python/html/marble/Marble.GeoDataAbstractView.html \
b/docs/bindings/python/html/marble/Marble.GeoDataAbstractView.html index 6dc3aee..eeb9932 100644
--- a/docs/bindings/python/html/marble/Marble.GeoDataAbstractView.html
+++ b/docs/bindings/python/html/marble/Marble.GeoDataAbstractView.html
@@ -49,7 +49,7 @@
<code>from PyKDE4.marble import *</code>
<p>
Inherits: <a href="../marble/Marble.GeoDataObject.html">Marble.GeoDataObject</a> → <a \
href="../marble/Marble.GeoNode.html">Marble.GeoNode</a><br />
-Subclasses: <a href="../marble/Marble.GeoDataLookAt.html">Marble.GeoDataLookAt</a><br />
+
Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
diff --git a/docs/bindings/python/html/marble/Marble.GeoDataColorStyle.html \
b/docs/bindings/python/html/marble/Marble.GeoDataColorStyle.html index fcb4084..1dc8d37 100644
--- a/docs/bindings/python/html/marble/Marble.GeoDataColorStyle.html
+++ b/docs/bindings/python/html/marble/Marble.GeoDataColorStyle.html
@@ -49,7 +49,7 @@
<code>from PyKDE4.marble import *</code>
<p>
Inherits: <a href="../marble/Marble.GeoDataObject.html">Marble.GeoDataObject</a> → <a \
href="../marble/Marble.GeoNode.html">Marble.GeoNode</a><br />
-Subclasses: <a href="../marble/Marble.GeoDataIconStyle.html">Marble.GeoDataIconStyle</a>, <a \
href="../marble/Marble.GeoDataLabelStyle.html">Marble.GeoDataLabelStyle</a>, <a \
href="../marble/Marble.GeoDataLineStyle.html">Marble.GeoDataLineStyle</a>, <a \
href="../marble/Marble.GeoDataPolyStyle.html">Marble.GeoDataPolyStyle</a><br /> +
Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
diff --git a/docs/bindings/python/html/marble/Marble.GeoDataContainer.html \
b/docs/bindings/python/html/marble/Marble.GeoDataContainer.html index f693879..8a2c03d 100644
--- a/docs/bindings/python/html/marble/Marble.GeoDataContainer.html
+++ b/docs/bindings/python/html/marble/Marble.GeoDataContainer.html
@@ -49,7 +49,7 @@
<code>from PyKDE4.marble import *</code>
<p>
Inherits: <a href="../marble/Marble.GeoDataFeature.html">Marble.GeoDataFeature</a> → <a \
href="../marble/Marble.GeoDataObject.html">Marble.GeoDataObject</a> → <a \
href="../marble/Marble.GeoNode.html">Marble.GeoNode</a><br />
-Subclasses: <a href="../marble/Marble.GeoDataDocument.html">Marble.GeoDataDocument</a>, <a \
href="../marble/Marble.GeoDataFolder.html">Marble.GeoDataFolder</a><br /> +
Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
diff --git a/docs/bindings/python/html/marble/Marble.GeoDataCoordinates.html \
b/docs/bindings/python/html/marble/Marble.GeoDataCoordinates.html index 3960edd..d1b207a 100644
--- a/docs/bindings/python/html/marble/Marble.GeoDataCoordinates.html
+++ b/docs/bindings/python/html/marble/Marble.GeoDataCoordinates.html
@@ -49,7 +49,7 @@
<code>from PyKDE4.marble import *</code>
<p>
-Subclasses: <a href="../marble/Marble.GeoDataPoint.html">Marble.GeoDataPoint</a><br />
+
Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
@@ -76,6 +76,7 @@ GeoDataPoint and is simply derived from GeoDataCoordinates.
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#detach">detach</a> (self)</td></tr> <tr><td class="memItemLeft" \
nowrap align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#detail">detail</a> (self)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#geoCoordinates">geoCoordinates</a> (self, float lon, float lat, <a \
href="../marble/Marble.GeoDataCoordinates.html#Unit">Marble.GeoDataCoordinates.Unit</a> \
unit=Marble.GeoDataCoordinates.Radian)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#geoCoordinates">geoCoordinates</a> (self, float lon, float lat, float alt, <a \
href="../marble/Marble.GeoDataCoordinates.html#Unit">Marble.GeoDataCoordinates.Unit</a> \
unit=GeoDataCoordinates.Radian)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top">bool </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#isPole">isPole</a> (self, <a href="../marble/Marble.html#Pole">Marble.Pole</a> \
a0=Marble.AnyPole)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top">QString </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#latToString">latToString</a> (self)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#latitude">latitude</a> (self, <a \
href="../marble/Marble.GeoDataCoordinates.html#Unit">Marble.GeoDataCoordinates.Unit</a> \
unit=Marble.GeoDataCoordinates.Radian)</td></tr> @@ -286,6 +287,61 @@ with one call - use the unit \
parameter to switch between Radian and DMS </td></tr>
</table></dl>
<p>
+</p></div></div><a class="anchor" name="geoCoordinates"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"> geoCoordinates</td>
+<td>(</td>
+<td class="paramtype"> <em>self</em>, </td>
+<td class="paramname"></td>
+</tr><tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">float </td>
+<td class="paramname"><em>lon</em>, </td>
+</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">float </td>
+<td class="paramname"><em>lat</em>, </td>
+</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">float </td>
+<td class="paramname"><em>alt</em>, </td>
+</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype"><a \
href="../marble/Marble.GeoDataCoordinates.html#Unit">Marble.GeoDataCoordinates.Unit</a> </td> +<td \
class="paramname"><em>unit=GeoDataCoordinates.Radian</em></td> +</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
+<div class="memdoc"><p>use this function to get the longitude, latitude and altitude
+with one call - use the unit parameter to switch between Radian and DMS
+</p><dl compact><dt><b>Parameters:</b></dt><dd>
+<table border="0" cellspacing="2" cellpadding="0">
+<tr><td></td><td valign="top"><em>lon</em> </td><td> longitude
+
+<tr><td></td><td valign="top"><em>lat</em> </td><td> latitude
+
+<tr><td></td><td valign="top"><em>alt</em> </td><td> altitude in meters
+
+<tr><td></td><td valign="top"><em>unit</em> </td><td> units that lon and lat get measured in
+(default for Radian: north pole at pi/2, southpole at -pi/2)
+</td></tr>
+</table></dl>
+<p>
</p></div></div><a class="anchor" name="isPole"></a>
<div class="memitem">
<div class="memproto">
@@ -308,17 +364,9 @@ with one call - use the unit parameter to switch between Radian and DMS
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"><p>return whether our coordinates are located at one of the poles
+<div class="memdoc"><p>return whether our coordinates represent a pole
This method can be used to check whether the coordinate equals one of
the poles.
-NOTE: As the poles might not be visible in the projection at all
-you should check whether
-</p>
-<p>
-bool AbstractProjection.exceedsLatitudeRange() const
-</p>
-<p>
-isn't what you're looking for ...
</p></div></div><a class="anchor" name="latToString"></a>
<div class="memitem">
<div class="memproto">
diff --git a/docs/bindings/python/html/marble/Marble.GeoDataFeature.html \
b/docs/bindings/python/html/marble/Marble.GeoDataFeature.html index cc12cdc..2bec3a9 100644
--- a/docs/bindings/python/html/marble/Marble.GeoDataFeature.html
+++ b/docs/bindings/python/html/marble/Marble.GeoDataFeature.html
@@ -49,7 +49,7 @@
<code>from PyKDE4.marble import *</code>
<p>
Inherits: <a href="../marble/Marble.GeoDataObject.html">Marble.GeoDataObject</a> → <a \
href="../marble/Marble.GeoNode.html">Marble.GeoNode</a><br />
-Subclasses: <a href="../marble/Marble.GeoDataContainer.html">Marble.GeoDataContainer</a>, <a \
href="../marble/Marble.GeoDataPlacemark.html">Marble.GeoDataPlacemark</a><br /> +
Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
diff --git a/docs/bindings/python/html/marble/Marble.GeoDataGeometry.html \
b/docs/bindings/python/html/marble/Marble.GeoDataGeometry.html index 84cda88..a82d013 100644
--- a/docs/bindings/python/html/marble/Marble.GeoDataGeometry.html
+++ b/docs/bindings/python/html/marble/Marble.GeoDataGeometry.html
@@ -49,7 +49,7 @@
<code>from PyKDE4.marble import *</code>
<p>
Inherits: <a href="../marble/Marble.GeoDataObject.html">Marble.GeoDataObject</a> → <a \
href="../marble/Marble.GeoNode.html">Marble.GeoNode</a><br />
-Subclasses: <a href="../marble/Marble.GeoDataLineString.html">Marble.GeoDataLineString</a>, <a \
href="../marble/Marble.GeoDataMultiGeometry.html">Marble.GeoDataMultiGeometry</a>, <a \
href="../marble/Marble.GeoDataPoint.html">Marble.GeoDataPoint</a>, <a \
href="../marble/Marble.GeoDataPolygon.html">Marble.GeoDataPolygon</a><br /> +
Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
diff --git a/docs/bindings/python/html/marble/Marble.GeoDataLatLonBox.html \
b/docs/bindings/python/html/marble/Marble.GeoDataLatLonBox.html index 7648c58..960a378 100644
--- a/docs/bindings/python/html/marble/Marble.GeoDataLatLonBox.html
+++ b/docs/bindings/python/html/marble/Marble.GeoDataLatLonBox.html
@@ -49,7 +49,7 @@
<code>from PyKDE4.marble import *</code>
<p>
Inherits: <a href="../marble/Marble.GeoDataObject.html">Marble.GeoDataObject</a> → <a \
href="../marble/Marble.GeoNode.html">Marble.GeoNode</a><br />
-Subclasses: <a href="../marble/Marble.GeoDataLatLonAltBox.html">Marble.GeoDataLatLonAltBox</a><br />
+
Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
diff --git a/docs/bindings/python/html/marble/Marble.GeoDataLineString.html \
b/docs/bindings/python/html/marble/Marble.GeoDataLineString.html index a8d2f0b..785ba38 100644
--- a/docs/bindings/python/html/marble/Marble.GeoDataLineString.html
+++ b/docs/bindings/python/html/marble/Marble.GeoDataLineString.html
@@ -49,7 +49,7 @@
<code>from PyKDE4.marble import *</code>
<p>
Inherits: <a href="../marble/Marble.GeoDataGeometry.html">Marble.GeoDataGeometry</a> → <a \
href="../marble/Marble.GeoDataObject.html">Marble.GeoDataObject</a> → <a \
href="../marble/Marble.GeoNode.html">Marble.GeoNode</a><br />
-Subclasses: <a href="../marble/Marble.GeoDataLinearRing.html">Marble.GeoDataLinearRing</a><br />
+
Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
diff --git a/docs/bindings/python/html/marble/Marble.GeoDataMultiGeometry.html \
b/docs/bindings/python/html/marble/Marble.GeoDataMultiGeometry.html index 97f7697..7c39c14 100644
--- a/docs/bindings/python/html/marble/Marble.GeoDataMultiGeometry.html
+++ b/docs/bindings/python/html/marble/Marble.GeoDataMultiGeometry.html
@@ -66,6 +66,7 @@ of different objects to form one Placemark.
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#append">append</a> (self, <a \
href="../marble/Marble.GeoDataGeometry.html">Marble.GeoDataGeometry</a> other)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataGeometry.html">Marble.GeoDataGeometry</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#at">at</a> (self, int pos)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataGeometry.html">Marble.GeoDataGeometry</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#child">child</a> (self, int a0)</td></tr> \
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataGeometry.html">Marble.GeoDataGeometry</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#child">child</a> (self, int a0)</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top">int </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#childPosition">childPosition</a> (self, <a \
href="../marble/Marble.GeoDataGeometry.html">Marble.GeoDataGeometry</a> child)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#clear">clear</a> (self)</td></tr> <tr><td class="memItemLeft" \
nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataGeometry.html">Marble.GeoDataGeometry</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#first">first</a> (self)</td></tr> @@ -179,6 \
+180,29 @@ of different objects to form one Placemark. </tr></table>
</div>
<div class="memdoc"><p>returns the requested child item
+</p></div></div><a class="anchor" name="child"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"><a href="../marble/Marble.GeoDataGeometry.html">Marble.GeoDataGeometry</a> \
child</td> +<td>(</td>
+<td class="paramtype"> <em>self</em>, </td>
+<td class="paramname"></td>
+</tr><tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">int </td>
+<td class="paramname"><em>a0</em></td>
+</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
+<div class="memdoc"><p>returns the requested child item
</p></div></div><a class="anchor" name="childPosition"></a>
<div class="memitem">
<div class="memproto">
diff --git a/docs/bindings/python/html/marble/Marble.GeoDataObject.html \
b/docs/bindings/python/html/marble/Marble.GeoDataObject.html index c63f61f..105a3fa 100644
--- a/docs/bindings/python/html/marble/Marble.GeoDataObject.html
+++ b/docs/bindings/python/html/marble/Marble.GeoDataObject.html
@@ -49,7 +49,7 @@
<code>from PyKDE4.marble import *</code>
<p>
Inherits: <a href="../marble/Marble.GeoNode.html">Marble.GeoNode</a>,<a \
href="../marble/Serializable.html">Serializable</a><br />
-Subclasses: <a href="../marble/Marble.GeoDataAbstractView.html">Marble.GeoDataAbstractView</a>, <a \
href="../marble/Marble.GeoDataColorStyle.html">Marble.GeoDataColorStyle</a>, <a \
href="../marble/Marble.GeoDataFeature.html">Marble.GeoDataFeature</a>, <a \
href="../marble/Marble.GeoDataGeometry.html">Marble.GeoDataGeometry</a>, <a \
href="../marble/Marble.GeoDataHotSpot.html">Marble.GeoDataHotSpot</a>, <a \
href="../marble/Marble.GeoDataLatLonBox.html">Marble.GeoDataLatLonBox</a>, <a \
href="../marble/Marble.GeoDataLod.html">Marble.GeoDataLod</a>, <a \
href="../marble/Marble.GeoDataRegion.html">Marble.GeoDataRegion</a>, <a \
href="../marble/Marble.GeoDataStyleSelector.html">Marble.GeoDataStyleSelector</a><br /> +
Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
diff --git a/docs/bindings/python/html/marble/Marble.GeoDataPolygon.html \
b/docs/bindings/python/html/marble/Marble.GeoDataPolygon.html index 3c908a3..0237533 100644
--- a/docs/bindings/python/html/marble/Marble.GeoDataPolygon.html
+++ b/docs/bindings/python/html/marble/Marble.GeoDataPolygon.html
@@ -49,7 +49,7 @@
<code>from PyKDE4.marble import *</code>
<p>
Inherits: <a href="../marble/Marble.GeoDataGeometry.html">Marble.GeoDataGeometry</a> → <a \
href="../marble/Marble.GeoDataObject.html">Marble.GeoDataObject</a> → <a \
href="../marble/Marble.GeoNode.html">Marble.GeoNode</a><br />
-Subclasses: <a href="../marble/Marble.GeoDataInnerBoundary.html">Marble.GeoDataInnerBoundary</a>, <a \
href="../marble/Marble.GeoDataOuterBoundary.html">Marble.GeoDataOuterBoundary</a><br /> +
Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
diff --git a/docs/bindings/python/html/marble/Marble.GeoDataStyleSelector.html \
b/docs/bindings/python/html/marble/Marble.GeoDataStyleSelector.html index c5c2f58..b7040f0 100644
--- a/docs/bindings/python/html/marble/Marble.GeoDataStyleSelector.html
+++ b/docs/bindings/python/html/marble/Marble.GeoDataStyleSelector.html
@@ -49,7 +49,7 @@
<code>from PyKDE4.marble import *</code>
<p>
Inherits: <a href="../marble/Marble.GeoDataObject.html">Marble.GeoDataObject</a> → <a \
href="../marble/Marble.GeoNode.html">Marble.GeoNode</a><br />
-Subclasses: <a href="../marble/Marble.GeoDataStyle.html">Marble.GeoDataStyle</a>, <a \
href="../marble/Marble.GeoDataStyleMap.html">Marble.GeoDataStyleMap</a><br /> +
Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
diff --git a/docs/bindings/python/html/marble/Marble.GeoDocument.html \
b/docs/bindings/python/html/marble/Marble.GeoDocument.html index 5375ff1..96b92cc 100644
--- a/docs/bindings/python/html/marble/Marble.GeoDocument.html
+++ b/docs/bindings/python/html/marble/Marble.GeoDocument.html
@@ -49,7 +49,7 @@
<code>from PyKDE4.marble import *</code>
<p>
-Subclasses: <a href="../marble/Marble.GeoDataDocument.html">Marble.GeoDataDocument</a><br />
+
Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
diff --git a/docs/bindings/python/html/marble/Marble.GeoNode.html \
b/docs/bindings/python/html/marble/Marble.GeoNode.html index b4dbc37..e269b26 100644
--- a/docs/bindings/python/html/marble/Marble.GeoNode.html
+++ b/docs/bindings/python/html/marble/Marble.GeoNode.html
@@ -49,7 +49,7 @@
<code>from PyKDE4.marble import *</code>
<p>
-Subclasses: <a href="../marble/Marble.GeoDataObject.html">Marble.GeoDataObject</a><br />
+
Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
diff --git a/docs/bindings/python/html/marble/Marble.LegendWidget.html \
b/docs/bindings/python/html/marble/Marble.LegendWidget.html index ffdc23a..0a54b51 100644
--- a/docs/bindings/python/html/marble/Marble.LegendWidget.html
+++ b/docs/bindings/python/html/marble/Marble.LegendWidget.html
@@ -54,11 +54,36 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
-<table border="0" cellpadding="0" cellspacing="0"><tr><td colspan="2"><br><h2>Methods</h2></td></tr>
+<table border="0" cellpadding="0" cellspacing="0"><tr><td colspan="2"><br><h2>Signals</h2></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#propertyValueChanged">propertyValueChanged</a> (QString \
propertyName, bool value)</td></tr> +<tr><td colspan="2"><br><h2>Methods</h2></td></tr>
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#LegendWidget">__init__</a> (self, QWidget parent=0, <a \
href="http://www.riverbankcomputing.co.uk/static/Docs/PyQt4/html/qt.html">Qt::WindowFlags</a> \
f=0)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#setMarbleWidget">setMarbleWidget</a> (self, <a \
href="../marble/Marble.MarbleWidget.html">Marble.MarbleWidget</a> widget)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#setMarbleModel">setMarbleModel</a> (self, <a \
href="../marble/Marble.MarbleModel.html">Marble.MarbleModel</a> model)</td></tr> </table>
-<hr><h2>Method Documentation</h2><a class="anchor" name="LegendWidget"></a>
+<hr><h2>Signal Documentation</h2><a class="anchor" name="propertyValueChanged"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"> propertyValueChanged</td>
+<td>(</td>
+<td class="paramtype">QString </td>
+<td class="paramname"><em>propertyName</em>, </td>
+</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">bool </td>
+<td class="paramname"><em>value</em></td>
+</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
+<div class="memdoc"><dl compact><dt><b>Signal syntax:</b></dt><dd><code>QObject.connect(source, \
SIGNAL("propertyValueChanged(const QString&, bool)"), \
target_slot)</code></dd></dl></div></div><hr><h2>Method Documentation</h2><a class="anchor" \
name="LegendWidget"></a> <div class="memitem">
<div class="memproto">
<table class="memname"><tr>
@@ -86,19 +111,19 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="setMarbleWidget"></a>
+<div class="memdoc"></div></div><a class="anchor" name="setMarbleModel"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"> setMarbleWidget</td>
+<td class="memname"> setMarbleModel</td>
<td>(</td>
<td class="paramtype"> <em>self</em>, </td>
<td class="paramname"></td>
</tr><tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype"><a href="../marble/Marble.MarbleWidget.html">Marble.MarbleWidget</a> </td>
-<td class="paramname"><em>widget</em></td>
+<td class="paramtype"><a href="../marble/Marble.MarbleModel.html">Marble.MarbleModel</a> </td>
+<td class="paramname"><em>model</em></td>
</tr>
<tr>
<td></td>
diff --git a/docs/bindings/python/html/marble/Marble.GeoDataGeometry.html \
b/docs/bindings/python/html/marble/Marble.Maneuver.html similarity index 58%
copy from docs/bindings/python/html/marble/Marble.GeoDataGeometry.html
copy to docs/bindings/python/html/marble/Marble.Maneuver.html
index 84cda88..17f0312 100644
--- a/docs/bindings/python/html/marble/Marble.GeoDataGeometry.html
+++ b/docs/bindings/python/html/marble/Marble.Maneuver.html
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head>
- <title>Marble.GeoDataGeometry</title>
+ <title>Marble.Maneuver</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta http-equiv="Content-Style-Type" content="text/css" />
<link rel="stylesheet" type="text/css" href="../common/doxygen.css" />
@@ -45,41 +45,31 @@
<div id="main">
<div class="clearer"> </div>
-<h1>GeoDataGeometry Class Reference</h1>
+<h1>Maneuver Class Reference</h1>
<code>from PyKDE4.marble import *</code>
<p>
-Inherits: <a href="../marble/Marble.GeoDataObject.html">Marble.GeoDataObject</a> → <a \
href="../marble/Marble.GeoNode.html">Marble.GeoNode</a><br />
-Subclasses: <a href="../marble/Marble.GeoDataLineString.html">Marble.GeoDataLineString</a>, <a \
href="../marble/Marble.GeoDataMultiGeometry.html">Marble.GeoDataMultiGeometry</a>, <a \
href="../marble/Marble.GeoDataPoint.html">Marble.GeoDataPoint</a>, <a \
href="../marble/Marble.GeoDataPolygon.html">Marble.GeoDataPolygon</a><br /> +
+
Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
-<p>A base class for all geodata features
-</p>
-<p>
-GeoDataGeometry is the base class for most geodata classes that
-deal with geometric data (points, linestrings, polygons, etc.)
-</p>
-<p>
-<dl class="see" compact><dt><b>See also:</b></dt><dd> GeoDataLineString
-</dd></dl> <dl class="see" compact><dt><b>See also:</b></dt><dd> GeoDataLinearRing
-</dd></dl> <dl class="see" compact><dt><b>See also:</b></dt><dd> GeoDataPolygon
-</dd></dl>
-</p>
-<table border="0" cellpadding="0" cellspacing="0"><tr><td colspan="2"><br><h2>Methods</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#GeoDataGeometry">__init__</a> (self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#GeoDataGeometry">__init__</a> (self, <a \
href="../marble/Marble.GeoDataGeometry.html">Marble.GeoDataGeometry</a> other)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.html#AltitudeMode">Marble.AltitudeMode</a> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#altitudeMode">altitudeMode</a> (self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#detach">detach</a> (self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">bool </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#extrude">extrude</a> (self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/global.html#EnumGeometryId">EnumGeometryId</a> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#geometryId">geometryId</a> (self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataLatLonAltBox.html">Marble.GeoDataLatLonAltBox</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#latLonAltBox">latLonAltBox</a> \
(self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">QString </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#nodeType">nodeType</a> (self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#pack">pack</a> (self, QDataStream stream)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#setAltitudeMode">setAltitudeMode</a> (self, <a \
href="../marble/Marble.html#AltitudeMode">Marble.AltitudeMode</a> altitudeMode)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#setExtrude">setExtrude</a> (self, bool \
extrude)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#unpack">unpack</a> (self, QDataStream stream)</td></tr> +
+<table border="0" cellpadding="0" cellspacing="0"><tr><td \
colspan="2"><br><h2>Enumerations</h2></td></tr> +<tr><td class="memItemLeft" nowrap align="right" \
valign="top"><a class="el" href="#Direction">Direction</a> </td><td class="memItemRight" \
valign="bottom">{ Unknown, Straight, SlightRight, Right, SharpRight, TurnAround, SharpLeft, Left, \
SlightLeft, RoundaboutFirstExit, RoundaboutSecondExit, RoundaboutThirdExit, \
RoundaboutExit }</td></tr> +<tr><td colspan="2"><br><h2>Methods</h2></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#Maneuver">__init__</a> (self)</td></tr> +<tr><td class="memItemLeft" \
nowrap align="right" valign="top"><a \
href="../marble/Marble.Maneuver.html#Direction">Marble.Maneuver.Direction</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#direction">direction</a> (self)</td></tr> \
+<tr><td class="memItemLeft" nowrap align="right" valign="top">QString </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#directionPixmap">directionPixmap</a> (self)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top">bool </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#hasWaypoint">hasWaypoint</a> (self)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top">QString </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#instructionText">instructionText</a> (self)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#position">position</a> (self)</td></tr> \
+<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#setDirection">setDirection</a> (self, <a \
href="../marble/Marble.Maneuver.html#Direction">Marble.Maneuver.Direction</a> direction)</td></tr> \
+<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#setInstructionText">setInstructionText</a> (self, QString \
text)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#setPosition">setPosition</a> (self, <a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> position)</td></tr> \
+<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#setWaypoint">setWaypoint</a> (self, <a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> waypoint)</td></tr> \
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#waypoint">waypoint</a> (self)</td></tr> \
</table>
-<hr><h2>Method Documentation</h2><a class="anchor" name="GeoDataGeometry"></a>
+<hr><h2>Method Documentation</h2><a class="anchor" name="Maneuver"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
@@ -91,33 +81,11 @@ deal with geometric data (points, linestrings, polygons, etc.)
</tr>
</table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="GeoDataGeometry"></a>
+<div class="memdoc"></div></div><a class="anchor" name="direction"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname">__init__</td>
-<td>(</td>
-<td class="paramtype"> <em>self</em>, </td>
-<td class="paramname"></td>
-</tr><tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype"><a \
href="../marble/Marble.GeoDataGeometry.html">Marble.GeoDataGeometry</a> </td>
-<td class="paramname"><em>other</em></td>
-</tr>
-<tr>
-<td></td>
-<td>)</td>
-<td></td>
-<td></td>
-<td width="100%"> </td>
-</tr></table>
-</div>
-<div class="memdoc"></div></div><a class="anchor" name="altitudeMode"></a>
-<div class="memitem">
-<div class="memproto">
-<table class="memname"><tr>
-<td class="memname"><a href="../marble/Marble.html#AltitudeMode">Marble.AltitudeMode</a> \
altitudeMode</td> +<td class="memname"><a \
href="../marble/Marble.Maneuver.html#Direction">Marble.Maneuver.Direction</a> direction</td> <td>(</td>
<td class="paramtype"> </td>
<td class="paramname"><em>self</em> )</td>
@@ -125,11 +93,11 @@ deal with geometric data (points, linestrings, polygons, etc.)
</tr>
</table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="detach"></a>
+<div class="memdoc"></div></div><a class="anchor" name="directionPixmap"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"> detach</td>
+<td class="memname">QString directionPixmap</td>
<td>(</td>
<td class="paramtype"> </td>
<td class="paramname"><em>self</em> )</td>
@@ -137,11 +105,11 @@ deal with geometric data (points, linestrings, polygons, etc.)
</tr>
</table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="extrude"></a>
+<div class="memdoc"></div></div><a class="anchor" name="hasWaypoint"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname">bool extrude</td>
+<td class="memname">bool hasWaypoint</td>
<td>(</td>
<td class="paramtype"> </td>
<td class="paramname"><em>self</em> )</td>
@@ -149,11 +117,11 @@ deal with geometric data (points, linestrings, polygons, etc.)
</tr>
</table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="geometryId"></a>
+<div class="memdoc"></div></div><a class="anchor" name="instructionText"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"><a href="../marble/global.html#EnumGeometryId">EnumGeometryId</a> geometryId</td>
+<td class="memname">QString instructionText</td>
<td>(</td>
<td class="paramtype"> </td>
<td class="paramname"><em>self</em> )</td>
@@ -161,11 +129,11 @@ deal with geometric data (points, linestrings, polygons, etc.)
</tr>
</table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="latLonAltBox"></a>
+<div class="memdoc"></div></div><a class="anchor" name="position"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"><a href="../marble/Marble.GeoDataLatLonAltBox.html">Marble.GeoDataLatLonAltBox</a> \
latLonAltBox</td> +<td class="memname"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> position</td> <td>(</td>
<td class="paramtype"> </td>
<td class="paramname"><em>self</em> )</td>
@@ -173,31 +141,19 @@ deal with geometric data (points, linestrings, polygons, etc.)
</tr>
</table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="nodeType"></a>
+<div class="memdoc"></div></div><a class="anchor" name="setDirection"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname">QString nodeType</td>
-<td>(</td>
-<td class="paramtype"> </td>
-<td class="paramname"><em>self</em> )</td>
-<td width="100%"> </td>
-</tr>
-</table>
-</div>
-<div class="memdoc"></div></div><a class="anchor" name="pack"></a>
-<div class="memitem">
-<div class="memproto">
-<table class="memname"><tr>
-<td class="memname"> pack</td>
+<td class="memname"> setDirection</td>
<td>(</td>
<td class="paramtype"> <em>self</em>, </td>
<td class="paramname"></td>
</tr><tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype">QDataStream </td>
-<td class="paramname"><em>stream</em></td>
+<td class="paramtype"><a \
href="../marble/Marble.Maneuver.html#Direction">Marble.Maneuver.Direction</a> </td> +<td \
class="paramname"><em>direction</em></td> </tr>
<tr>
<td></td>
@@ -207,19 +163,19 @@ deal with geometric data (points, linestrings, polygons, etc.)
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="setAltitudeMode"></a>
+<div class="memdoc"></div></div><a class="anchor" name="setInstructionText"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"> setAltitudeMode</td>
+<td class="memname"> setInstructionText</td>
<td>(</td>
<td class="paramtype"> <em>self</em>, </td>
<td class="paramname"></td>
</tr><tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype"><a href="../marble/Marble.html#AltitudeMode">Marble.AltitudeMode</a> </td>
-<td class="paramname"><em>altitudeMode</em></td>
+<td class="paramtype">QString </td>
+<td class="paramname"><em>text</em></td>
</tr>
<tr>
<td></td>
@@ -229,19 +185,19 @@ deal with geometric data (points, linestrings, polygons, etc.)
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="setExtrude"></a>
+<div class="memdoc"></div></div><a class="anchor" name="setPosition"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"> setExtrude</td>
+<td class="memname"> setPosition</td>
<td>(</td>
<td class="paramtype"> <em>self</em>, </td>
<td class="paramname"></td>
</tr><tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype">bool </td>
-<td class="paramname"><em>extrude</em></td>
+<td class="paramtype"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> </td> +<td \
class="paramname"><em>position</em></td> </tr>
<tr>
<td></td>
@@ -251,19 +207,19 @@ deal with geometric data (points, linestrings, polygons, etc.)
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="unpack"></a>
+<div class="memdoc"></div></div><a class="anchor" name="setWaypoint"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"> unpack</td>
+<td class="memname"> setWaypoint</td>
<td>(</td>
<td class="paramtype"> <em>self</em>, </td>
<td class="paramname"></td>
</tr><tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype">QDataStream </td>
-<td class="paramname"><em>stream</em></td>
+<td class="paramtype"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> </td> +<td \
class="paramname"><em>waypoint</em></td> </tr>
<tr>
<td></td>
@@ -273,7 +229,30 @@ deal with geometric data (points, linestrings, polygons, etc.)
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"></div></div>
+<div class="memdoc"></div></div><a class="anchor" name="waypoint"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"><a href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> \
waypoint</td> +<td>(</td>
+<td class="paramtype"> </td>
+<td class="paramname"><em>self</em> )</td>
+<td width="100%"> </td>
+</tr>
+</table>
+</div>
+<div class="memdoc"></div></div><hr><h2>Enumeration Documentation</h2><a class="anchor" \
name="Direction"></a> +<div class="memitem">
+<div class="memproto">
+<table class="memname">
+<tr><td class="memname">Direction</td>
+</tr>
+</table>
+</div>
+<div class="memdoc"><dl compact><dt><b>Enumerator: </b></dt><dd>
+<table border="0" cellspacing="2" cellpadding="0"><tr><td \
valign="top"><em>Unknown</em> = 0</td><td><tr><td \
valign="top"><em>Straight</em> </td><td><tr><td \
valign="top"><em>SlightRight</em> </td><td><tr><td valign="top"><em>Right</em> </td><td><tr><td \
valign="top"><em>SharpRight</em> </td><td><tr><td \
valign="top"><em>TurnAround</em> </td><td><tr><td \
valign="top"><em>SharpLeft</em> </td><td><tr><td valign="top"><em>Left</em> </td><td><tr><td \
valign="top"><em>SlightLeft</em> </td><td><tr><td \
valign="top"><em>RoundaboutFirstExit</em> </td><td><tr><td \
valign="top"><em>RoundaboutSecondExit</em> </td><td><tr><td \
valign="top"><em>RoundaboutThirdExit</em> </td><td><tr><td \
valign="top"><em>RoundaboutExit</em> </td><td></table> +</dl>
+</div></div><p>
</div>
</div>
</div>
diff --git a/docs/bindings/python/html/marble/Marble.MapThemeManager.html \
b/docs/bindings/python/html/marble/Marble.MapThemeManager.html index a04ffbe..34ddbb7 100644
--- a/docs/bindings/python/html/marble/Marble.MapThemeManager.html
+++ b/docs/bindings/python/html/marble/Marble.MapThemeManager.html
@@ -78,10 +78,8 @@ object.
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#themesChanged">themesChanged</a> ()</td></tr> <tr><td \
colspan="2"><br><h2>Methods</h2></td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#MapThemeManager">__init__</a> (self, QObject parent=0)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#directoryChanged">directoryChanged</a> (self, QString \
path)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#fileChanged">fileChanged</a> (self, QString path)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top">QStringList </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#mapThemeIds">mapThemeIds</a> (self)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top">QStandardItemModel </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#mapThemeModel">mapThemeModel</a> \
(self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#updateMapThemeModel">updateMapThemeModel</a> (self)</td></tr> \
</table> <hr><h2>Signal Documentation</h2><a class="anchor" name="themesChanged"></a>
<div class="memitem">
@@ -118,51 +116,20 @@ object.
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="directoryChanged"></a>
+<div class="memdoc"></div></div><a class="anchor" name="mapThemeIds"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"> directoryChanged</td>
+<td class="memname">QStringList mapThemeIds</td>
<td>(</td>
-<td class="paramtype"> <em>self</em>, </td>
-<td class="paramname"></td>
-</tr><tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype">QString </td>
-<td class="paramname"><em>path</em></td>
-</tr>
-<tr>
-<td></td>
-<td>)</td>
-<td></td>
-<td></td>
+<td class="paramtype"> </td>
+<td class="paramname"><em>self</em> )</td>
<td width="100%"> </td>
-</tr></table>
-</div>
-<div class="memdoc"></div></div><a class="anchor" name="fileChanged"></a>
-<div class="memitem">
-<div class="memproto">
-<table class="memname"><tr>
-<td class="memname"> fileChanged</td>
-<td>(</td>
-<td class="paramtype"> <em>self</em>, </td>
-<td class="paramname"></td>
-</tr><tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype">QString </td>
-<td class="paramname"><em>path</em></td>
</tr>
-<tr>
-<td></td>
-<td>)</td>
-<td></td>
-<td></td>
-<td width="100%"> </td>
-</tr></table>
+</table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="mapThemeModel"></a>
+<div class="memdoc"><p>Returns a list of all locally available map theme IDs
+</p></div></div><a class="anchor" name="mapThemeModel"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
@@ -179,23 +146,6 @@ object.
<p>
This method provides a QStandardItemModel of all themes
that are available via MarbleDirs.
-</p></div></div><a class="anchor" name="updateMapThemeModel"></a>
-<div class="memitem">
-<div class="memproto">
-<table class="memname"><tr>
-<td class="memname"> updateMapThemeModel</td>
-<td>(</td>
-<td class="paramtype"> </td>
-<td class="paramname"><em>self</em> )</td>
-<td width="100%"> </td>
-</tr>
-</table>
-</div>
-<div class="memdoc"><p>Updates the map theme model on request.
-</p>
-<p>
-This method should usually get invoked on startup or
-by a QFileSystemWatcher instance.
</p></div></div>
</div>
</div>
diff --git a/docs/bindings/python/html/marble/Marble.MapViewWidget.html \
b/docs/bindings/python/html/marble/Marble.MapViewWidget.html index 19c24a2..c95531f 100644
--- a/docs/bindings/python/html/marble/Marble.MapViewWidget.html
+++ b/docs/bindings/python/html/marble/Marble.MapViewWidget.html
@@ -55,26 +55,23 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<table border="0" cellpadding="0" cellspacing="0"><tr><td colspan="2"><br><h2>Signals</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#projectionSelected">projectionSelected</a> (<a \
href="../marble/Marble.html#Projection">Marble.Projection</a> a0)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#selectMapTheme">selectMapTheme</a> (QString a0)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#mapThemeIdChanged">mapThemeIdChanged</a> (QString a0)</td></tr> \
+<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#projectionChanged">projectionChanged</a> (<a \
href="../marble/Marble.html#Projection">Marble.Projection</a> a0)</td></tr> <tr><td class="memItemLeft" \
nowrap align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#showMapWizard">showMapWizard</a> ()</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#showUploadDialog">showUploadDialog</a> ()</td></tr> <tr><td \
colspan="2"><br><h2>Methods</h2></td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#MapViewWidget">__init__</a> (self, QWidget parent=0, <a \
href="http://www.riverbankcomputing.co.uk/static/Docs/PyQt4/html/qt.html">Qt::WindowFlags</a> \
f=0)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#selectCurrentMapTheme">selectCurrentMapTheme</a> (self, QString \
a0)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#selectProjection">selectProjection</a> (self, <a \
href="../marble/Marble.html#Projection">Marble.Projection</a> projection)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#selectTheme">selectTheme</a> (self, QString a0)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#setMapThemeId">setMapThemeId</a> (self, QString a0)</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#setMarbleWidget">setMarbleWidget</a> (self, <a \
href="../marble/Marble.MarbleWidget.html">Marble.MarbleWidget</a> widget)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#updateCelestialModel">updateCelestialModel</a> \
(self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#updateMapThemeView">updateMapThemeView</a> (self)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#setProjection">setProjection</a> (self, <a \
href="../marble/Marble.html#Projection">Marble.Projection</a> projection)</td></tr> </table>
-<hr><h2>Signal Documentation</h2><a class="anchor" name="projectionSelected"></a>
+<hr><h2>Signal Documentation</h2><a class="anchor" name="mapThemeIdChanged"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"> projectionSelected</td>
+<td class="memname"> mapThemeIdChanged</td>
<td>(</td>
-<td class="paramtype"><a href="../marble/Marble.html#Projection">Marble.Projection</a> </td>
+<td class="paramtype">QString </td>
<td class="paramname"><em>a0</em></td>
</tr>
<tr>
@@ -85,13 +82,13 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"><dl compact><dt><b>Signal syntax:</b></dt><dd><code>QObject.connect(source, \
SIGNAL("projectionSelected(Marble::Projection)"), target_slot)</code></dd></dl></div></div><a \
class="anchor" name="selectMapTheme"></a> +<div class="memdoc"><dl compact><dt><b>Signal \
syntax:</b></dt><dd><code>QObject.connect(source, SIGNAL("mapThemeIdChanged(const QString&)"), \
target_slot)</code></dd></dl></div></div><a class="anchor" name="projectionChanged"></a> <div \
class="memitem"> <div class="memproto">
<table class="memname"><tr>
-<td class="memname"> selectMapTheme</td>
+<td class="memname"> projectionChanged</td>
<td>(</td>
-<td class="paramtype">QString </td>
+<td class="paramtype"><a href="../marble/Marble.html#Projection">Marble.Projection</a> </td>
<td class="paramname"><em>a0</em></td>
</tr>
<tr>
@@ -102,7 +99,7 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"><dl compact><dt><b>Signal syntax:</b></dt><dd><code>QObject.connect(source, \
SIGNAL("selectMapTheme(const QString&)"), target_slot)</code></dd></dl></div></div><a class="anchor" \
name="showMapWizard"></a> +<div class="memdoc"><dl compact><dt><b>Signal \
syntax:</b></dt><dd><code>QObject.connect(source, SIGNAL("projectionChanged(Marble::Projection)"), \
target_slot)</code></dd></dl></div></div><a class="anchor" name="showMapWizard"></a> <div \
class="memitem"> <div class="memproto">
<table class="memname"><tr>
@@ -154,55 +151,11 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="selectCurrentMapTheme"></a>
-<div class="memitem">
-<div class="memproto">
-<table class="memname"><tr>
-<td class="memname"> selectCurrentMapTheme</td>
-<td>(</td>
-<td class="paramtype"> <em>self</em>, </td>
-<td class="paramname"></td>
-</tr><tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype">QString </td>
-<td class="paramname"><em>a0</em></td>
-</tr>
-<tr>
-<td></td>
-<td>)</td>
-<td></td>
-<td></td>
-<td width="100%"> </td>
-</tr></table>
-</div>
-<div class="memdoc"></div></div><a class="anchor" name="selectProjection"></a>
-<div class="memitem">
-<div class="memproto">
-<table class="memname"><tr>
-<td class="memname"> selectProjection</td>
-<td>(</td>
-<td class="paramtype"> <em>self</em>, </td>
-<td class="paramname"></td>
-</tr><tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype"><a href="../marble/Marble.html#Projection">Marble.Projection</a> </td>
-<td class="paramname"><em>projection</em></td>
-</tr>
-<tr>
-<td></td>
-<td>)</td>
-<td></td>
-<td></td>
-<td width="100%"> </td>
-</tr></table>
-</div>
-<div class="memdoc"></div></div><a class="anchor" name="selectTheme"></a>
+<div class="memdoc"></div></div><a class="anchor" name="setMapThemeId"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"> selectTheme</td>
+<td class="memname"> setMapThemeId</td>
<td>(</td>
<td class="paramtype"> <em>self</em>, </td>
<td class="paramname"></td>
@@ -249,29 +202,27 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
</td></tr>
</table></dl>
<p>
-</p></div></div><a class="anchor" name="updateCelestialModel"></a>
+</p></div></div><a class="anchor" name="setProjection"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"> updateCelestialModel</td>
+<td class="memname"> setProjection</td>
<td>(</td>
-<td class="paramtype"> </td>
-<td class="paramname"><em>self</em> )</td>
-<td width="100%"> </td>
+<td class="paramtype"> <em>self</em>, </td>
+<td class="paramname"></td>
+</tr><tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype"><a href="../marble/Marble.html#Projection">Marble.Projection</a> </td>
+<td class="paramname"><em>projection</em></td>
</tr>
-</table>
-</div>
-<div class="memdoc"></div></div><a class="anchor" name="updateMapThemeView"></a>
-<div class="memitem">
-<div class="memproto">
-<table class="memname"><tr>
-<td class="memname"> updateMapThemeView</td>
-<td>(</td>
-<td class="paramtype"> </td>
-<td class="paramname"><em>self</em> )</td>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
<td width="100%"> </td>
-</tr>
-</table>
+</tr></table>
</div>
<div class="memdoc"></div></div>
</div>
diff --git a/docs/bindings/python/html/marble/Marble.MapWizard.html \
b/docs/bindings/python/html/marble/Marble.MapWizard.html index f6f1fc5..906ba2d 100644
--- a/docs/bindings/python/html/marble/Marble.MapWizard.html
+++ b/docs/bindings/python/html/marble/Marble.MapWizard.html
@@ -69,6 +69,7 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#querySourceImage">querySourceImage</a> (self)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#setStaticUrlServers">setStaticUrlServers</a> (self, QStringList \
uris)</td></tr> <tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#setWmsServers">setWmsServers</a> (self, \
QStringList uris)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#showPreview">showPreview</a> (self)</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top">QStringList </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#staticUrlServers">staticUrlServers</a> \
(self)</td></tr> <tr><td class="memItemLeft" nowrap align="right" valign="top">bool </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#validateCurrentPage">validateCurrentPage</a> \
(self)</td></tr> <tr><td class="memItemLeft" nowrap align="right" valign="top">QStringList </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#wmsServers">wmsServers</a> (self)</td></tr> @@ \
-304,6 +305,18 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br /> <td width="100%"> </td>
</tr></table>
</div>
+<div class="memdoc"></div></div><a class="anchor" name="showPreview"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"> showPreview</td>
+<td>(</td>
+<td class="paramtype"> </td>
+<td class="paramname"><em>self</em> )</td>
+<td width="100%"> </td>
+</tr>
+</table>
+</div>
<div class="memdoc"></div></div><a class="anchor" name="staticUrlServers"></a>
<div class="memitem">
<div class="memproto">
diff --git a/docs/bindings/python/html/marble/Marble.MarbleAbstractRunner.html \
b/docs/bindings/python/html/marble/Marble.MarbleAbstractRunner.html index 23459f4..1f9f97e 100644
--- a/docs/bindings/python/html/marble/Marble.MarbleAbstractRunner.html
+++ b/docs/bindings/python/html/marble/Marble.MarbleAbstractRunner.html
@@ -64,6 +64,7 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataFeature.html#GeoDataVisualCategory">Marble.GeoDataFeature.GeoDataVisualCategory</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#category">category</a> (self)</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.MarbleModel.html">Marble.MarbleModel</a> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#model">model</a> (self)</td></tr> <tr><td class="memItemLeft" \
nowrap align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#parseFile">parseFile</a> (self, QString fileName, <a \
href="../marble/Marble.html#DocumentRole">Marble.DocumentRole</a> role)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#retrieveRoute">retrieveRoute</a> (self, <a \
href="../marble/Marble.RouteRequest.html">Marble.RouteRequest</a> request)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#reverseGeocoding">reverseGeocoding</a> (self, <a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> coordinates)</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#search">search</a> (self, QString searchTerm)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#setModel">setModel</a> (self, <a \
href="../marble/Marble.MarbleModel.html">Marble.MarbleModel</a> model)</td></tr> @@ -226,6 +227,32 @@ \
thread object into its own thread. are expected to return the result via the parsingFinished signal.
If implemented in a plugin, make sure to include Parsing in the
plugin capabilities, otherwise MarbleRunnerManager will ignore the plugin
+</p></div></div><a class="anchor" name="retrieveRoute"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"> retrieveRoute</td>
+<td>(</td>
+<td class="paramtype"> <em>self</em>, </td>
+<td class="paramname"></td>
+</tr><tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype"><a href="../marble/Marble.RouteRequest.html">Marble.RouteRequest</a> </td>
+<td class="paramname"><em>request</em></td>
+</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
+<div class="memdoc"><p>Start a route download or calculation. Called by MarbleRunnerManager, runners
+are expected to return the result via the routeCalculated signal.
+If implemented in a plugin, make sure to include Routing in the
+plugin capabilities, otherwise MarbleRunnerManager will ignore the plugin
</p></div></div><a class="anchor" name="reverseGeocoding"></a>
<div class="memitem">
<div class="memproto">
diff --git a/docs/bindings/python/html/marble/Marble.MarbleControlBox.html \
b/docs/bindings/python/html/marble/Marble.MarbleControlBox.html index 18212b9..30c9bdc 100644
--- a/docs/bindings/python/html/marble/Marble.MarbleControlBox.html
+++ b/docs/bindings/python/html/marble/Marble.MarbleControlBox.html
@@ -91,17 +91,16 @@ Night view, and a Satellite view.
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#showUploadDialog">showUploadDialog</a> ()</td></tr> <tr><td \
colspan="2"><br><h2>Methods</h2></td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#MarbleControlBox">__init__</a> (self, QWidget parent=0)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#addMarbleWidget">addMarbleWidget</a> (self, <a \
href="../marble/Marble.MarbleWidget.html">Marble.MarbleWidget</a> widget)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.CurrentLocationWidget.html">Marble.CurrentLocationWidget</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#currentLocationWidget">currentLocationWidget</a> (self)</td></tr> <tr><td class="memItemLeft" \
nowrap align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#selectTheme">selectTheme</a> (self, QString a0)</td></tr> <tr><td class="memItemLeft" nowrap \
align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#setCurrentLocationTabShown">setCurrentLocationTabShown</a> (self, bool show)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#setFileViewTabShown">setFileViewTabShown</a> (self, bool \
show)</td></tr> <tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#setLegendTabShown">setLegendTabShown</a> (self, \
bool show)</td></tr> <tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#setMapViewTabShown">setMapViewTabShown</a> \
(self, bool show)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#setMarbleWidget">setMarbleWidget</a> (self, <a \
href="../marble/Marble.MarbleWidget.html">Marble.MarbleWidget</a> widget)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#setNavigationTabShown">setNavigationTabShown</a> (self, bool \
show)</td></tr> <tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#setRoutingTabShown">setRoutingTabShown</a> \
(self, bool show)</td></tr> <tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#setWorkOffline">setWorkOffline</a> (self, bool \
offline)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#updateMapThemeView">updateMapThemeView</a> (self)</td></tr> \
</table> <hr><h2>Signal Documentation</h2><a class="anchor" name="showMapWizard"></a>
<div class="memitem">
@@ -156,38 +155,6 @@ Night view, and a Satellite view.
</td></tr>
</table></dl>
<p>
-</p></div></div><a class="anchor" name="addMarbleWidget"></a>
-<div class="memitem">
-<div class="memproto">
-<table class="memname"><tr>
-<td class="memname"> addMarbleWidget</td>
-<td>(</td>
-<td class="paramtype"> <em>self</em>, </td>
-<td class="paramname"></td>
-</tr><tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype"><a href="../marble/Marble.MarbleWidget.html">Marble.MarbleWidget</a> </td>
-<td class="paramname"><em>widget</em></td>
-</tr>
-<tr>
-<td></td>
-<td>)</td>
-<td></td>
-<td></td>
-<td width="100%"> </td>
-</tr></table>
-</div>
-<div class="memdoc"><p>Add a MarbleWidget to be controlled by this widget.
-</p><dl compact><dt><b>Parameters:</b></dt><dd>
-<table border="0" cellspacing="2" cellpadding="0">
-<tr><td></td><td valign="top"><em>widget</em> </td><td> the MarbleWidget to be added.
-</td></tr>
-</table></dl>
-<p> Add a MarbleWidget so that it will be controlled by this
-widget. This call create all the connections of signals and
-slots that are necessary to have full control of the
-MarbleWidget, and thereby frees the programmer from doing it.
</p></div></div><a class="anchor" name="currentLocationWidget"></a>
<div class="memitem">
<div class="memproto">
@@ -339,6 +306,38 @@ MarbleWidget, and thereby frees the programmer from doing it.
</td></tr>
</table></dl>
<p>
+</p></div></div><a class="anchor" name="setMarbleWidget"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"> setMarbleWidget</td>
+<td>(</td>
+<td class="paramtype"> <em>self</em>, </td>
+<td class="paramname"></td>
+</tr><tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype"><a href="../marble/Marble.MarbleWidget.html">Marble.MarbleWidget</a> </td>
+<td class="paramname"><em>widget</em></td>
+</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
+<div class="memdoc"><p>Set the MarbleWidget to be controlled by this widget.
+</p><dl compact><dt><b>Parameters:</b></dt><dd>
+<table border="0" cellspacing="2" cellpadding="0">
+<tr><td></td><td valign="top"><em>widget</em> </td><td> the MarbleWidget to be controlled.
+</td></tr>
+</table></dl>
+<p> Sets a MarbleWidget so that it will be controlled by this
+widget. This call create all the connections of signals and
+slots that are necessary to have full control of the
+MarbleWidget, and thereby frees the programmer from doing it.
</p></div></div><a class="anchor" name="setNavigationTabShown"></a>
<div class="memitem">
<div class="memproto">
@@ -420,19 +419,7 @@ MarbleWidget, and thereby frees the programmer from doing it.
</tr></table>
</div>
<div class="memdoc"><p>Toggle offline mode of download manager and runners.
-</p></div></div><a class="anchor" name="updateMapThemeView"></a>
-<div class="memitem">
-<div class="memproto">
-<table class="memname"><tr>
-<td class="memname"> updateMapThemeView</td>
-<td>(</td>
-<td class="paramtype"> </td>
-<td class="paramname"><em>self</em> )</td>
-<td width="100%"> </td>
-</tr>
-</table>
-</div>
-<div class="memdoc"></div></div>
+</p></div></div>
</div>
</div>
</div>
diff --git a/docs/bindings/python/html/marble/Marble.MarbleGraphicsItem.html \
b/docs/bindings/python/html/marble/Marble.MarbleGraphicsItem.html index 0f9b1c7..4ce78e6 100644
--- a/docs/bindings/python/html/marble/Marble.MarbleGraphicsItem.html
+++ b/docs/bindings/python/html/marble/Marble.MarbleGraphicsItem.html
@@ -49,7 +49,7 @@
<code>from PyKDE4.marble import *</code>
<p>
-Subclasses: <a href="../marble/Marble.GeoGraphicsItem.html">Marble.GeoGraphicsItem</a>, <a \
href="../marble/Marble.ScreenGraphicsItem.html">Marble.ScreenGraphicsItem</a><br /> +
Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
<dl class="abstract" compact><dt><b>Abstract class:</b></dt>
diff --git a/docs/bindings/python/html/marble/Marble.MarbleMap.html \
b/docs/bindings/python/html/marble/Marble.MarbleMap.html index 4cf33f6..9c08202 100644
--- a/docs/bindings/python/html/marble/Marble.MarbleMap.html
+++ b/docs/bindings/python/html/marble/Marble.MarbleMap.html
@@ -94,6 +94,7 @@ cities, mountain tops or the poles.
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#mouseMoveGeoPosition">mouseMoveGeoPosition</a> (QString \
a0)</td></tr> <tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#pluginSettingsChanged">pluginSettingsChanged</a> ()</td></tr> <tr><td class="memItemLeft" nowrap \
align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#projectionChanged">projectionChanged</a> (<a \
href="../marble/Marble.html#Projection">Marble.Projection</a> a0)</td></tr> +<tr><td class="memItemLeft" \
nowrap align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#radiusChanged">radiusChanged</a> (int radius)</td></tr> <tr><td class="memItemLeft" nowrap \
align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#renderPluginInitialized">renderPluginInitialized</a> (<a \
href="../marble/Marble.RenderPlugin.html">Marble.RenderPlugin</a> renderPlugin)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#repaintNeeded">repaintNeeded</a> (QRegion \
dirtyRegion=QRegion())</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#themeChanged">themeChanged</a> (QString theme)</td></tr> @@ -292,7 +293,24 @@ cities, mountain \
tops or the poles. <td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"><dl compact><dt><b>Signal syntax:</b></dt><dd><code>QObject.connect(source, \
SIGNAL("projectionChanged(Marble::Projection)"), target_slot)</code></dd></dl></div></div><a \
class="anchor" name="renderPluginInitialized"></a> +<div class="memdoc"><dl compact><dt><b>Signal \
syntax:</b></dt><dd><code>QObject.connect(source, SIGNAL("projectionChanged(Marble::Projection)"), \
target_slot)</code></dd></dl></div></div><a class="anchor" name="radiusChanged"></a> +<div \
class="memitem"> +<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"> radiusChanged</td>
+<td>(</td>
+<td class="paramtype">int </td>
+<td class="paramname"><em>radius</em></td>
+</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
+<div class="memdoc"><dl compact><dt><b>Signal syntax:</b></dt><dd><code>QObject.connect(source, \
SIGNAL("radiusChanged(int)"), target_slot)</code></dd></dl></div></div><a class="anchor" \
name="renderPluginInitialized"></a> <div class="memitem">
<div class="memproto">
<table class="memname"><tr>
diff --git a/docs/bindings/python/html/marble/Marble.MarbleModel.html \
b/docs/bindings/python/html/marble/Marble.MarbleModel.html index f53095b..4845689 100644
--- a/docs/bindings/python/html/marble/Marble.MarbleModel.html
+++ b/docs/bindings/python/html/marble/Marble.MarbleModel.html
@@ -122,6 +122,7 @@ square or round.
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#setHome">setHome</a> (self, float lon, float lat, int \
zoom=1050)</td></tr> <tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#setHome">setHome</a> (self, <a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> homePoint, int \
zoom=1050)</td></tr> <tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#setLegend">setLegend</a> (self, QTextDocument \
document)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#setMapThemeId">setMapThemeId</a> (self, QString \
mapThemeId)</td></tr> <tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" \
href="#setPersistentTileCacheLimit">setPersistentTileCacheLimit</a> (self, long kiloBytes)</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#setTrackedPlacemark">setTrackedPlacemark</a> (self, <a \
href="../marble/Marble.GeoDataPlacemark.html">Marble.GeoDataPlacemark</a> placemark)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#setWorkOffline">setWorkOffline</a> (self, bool \
workOffline)</td></tr> @@ -855,7 +856,48 @@ maptheme = "earth/bluemarble/bluemarble.dgml"
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="setPersistentTileCacheLimit"></a>
+<div class="memdoc"></div></div><a class="anchor" name="setMapThemeId"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"> setMapThemeId</td>
+<td>(</td>
+<td class="paramtype"> <em>self</em>, </td>
+<td class="paramname"></td>
+</tr><tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">QString </td>
+<td class="paramname"><em>mapThemeId</em></td>
+</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
+<div class="memdoc"><p>Set a new map theme to use.
+</p><dl compact><dt><b>Parameters:</b></dt><dd>
+<table border="0" cellspacing="2" cellpadding="0">
+<tr><td></td><td valign="top"><em>mapThemeId</em> </td><td> the identifier of the new map theme
+</td></tr>
+</table></dl>
+<p> This function sets the map theme, i.e. combination of tile set
+and color scheme to use. If the map theme is not previously
+used, some basic tiles are created and a progress dialog is
+shown.
+</p>
+<p>
+The ID of the new maptheme. To ensure that a unique
+identifier is being used the theme does NOT get represented by its
+name but the by relative location of the file that specifies the theme:
+</p>
+<p>
+Example:
+maptheme = "earth/bluemarble/bluemarble.dgml"
+</p></div></div><a class="anchor" name="setPersistentTileCacheLimit"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
diff --git a/docs/bindings/python/html/marble/Marble.MarbleRunnerManager.html \
b/docs/bindings/python/html/marble/Marble.MarbleRunnerManager.html index 2209ac8..5c098bc 100644
--- a/docs/bindings/python/html/marble/Marble.MarbleRunnerManager.html
+++ b/docs/bindings/python/html/marble/Marble.MarbleRunnerManager.html
@@ -63,6 +63,7 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<tr><td colspan="2"><br><h2>Methods</h2></td></tr>
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#findPlacemarks">findPlacemarks</a> (self, QString \
searchTerm)</td></tr> <tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#parseFile">parseFile</a> (self, QString \
fileName, <a href="../marble/Marble.html#DocumentRole">Marble.DocumentRole</a> role)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#retrieveRoute">retrieveRoute</a> (self, <a \
href="../marble/Marble.RouteRequest.html">Marble.RouteRequest</a> request)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#reverseGeocoding">reverseGeocoding</a> (self, <a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> coordinates)</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#setModel">setModel</a> (self, <a \
href="../marble/Marble.MarbleModel.html">Marble.MarbleModel</a> model)</td></tr> </table>
@@ -232,6 +233,31 @@ using the <dl class="see" compact><dt><b>See also:</b></dt><dd> searchResultChan
<div class="memdoc"><p>Parse the file using the runners for various formats
The result is returned through the <dl class="see" compact><dt><b>See also:</b></dt><dd> parsingFinished \
signal </dd></dl>
+</p></div></div><a class="anchor" name="retrieveRoute"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"> retrieveRoute</td>
+<td>(</td>
+<td class="paramtype"> <em>self</em>, </td>
+<td class="paramname"></td>
+</tr><tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype"><a href="../marble/Marble.RouteRequest.html">Marble.RouteRequest</a> </td>
+<td class="paramname"><em>request</em></td>
+</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
+<div class="memdoc"><p>Download routes traversing the stopover points in the given route request
+Each route found is returned through the <dl class="see" compact><dt><b>See also:</b></dt><dd> \
routeRetrieved signal +</dd></dl>
</p></div></div><a class="anchor" name="reverseGeocoding"></a>
<div class="memitem">
<div class="memproto">
diff --git a/docs/bindings/python/html/marble/Marble.MarbleWidget.html \
b/docs/bindings/python/html/marble/Marble.MarbleWidget.html index 333af98..b2ae7a4 100644
--- a/docs/bindings/python/html/marble/Marble.MarbleWidget.html
+++ b/docs/bindings/python/html/marble/Marble.MarbleWidget.html
@@ -147,6 +147,7 @@ cross.
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.AbstractFloatItem.html">Marble.AbstractFloatItem</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#floatItem">floatItem</a> (self, QString \
nameId)</td></tr> <tr><td class="memItemLeft" nowrap align="right" valign="top">[<a \
href="../marble/Marble.AbstractFloatItem.html">Marble.AbstractFloatItem</a>] </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#floatItems">floatItems</a> (self)</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#flyTo">flyTo</a> (self, <a \
href="../marble/Marble.GeoDataLookAt.html">Marble.GeoDataLookAt</a> lookAt, <a \
href="../marble/Marble.html#FlyToMode">Marble.FlyToMode</a> mode=Marble.Automatic)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#focusPoint">focusPoint</a> (self)</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top">bool </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#geoCoordinates">geoCoordinates</a> (self, int x, int y, float lon, \
float lat, <a href="../marble/Marble.GeoDataCoordinates.html#Unit">Marble.GeoDataCoordinates.Unit</a> \
a4=Marble.GeoDataCoordinates.Degree)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" href="#goHome">goHome</a> \
(self, <a href="../marble/Marble.html#FlyToMode">Marble.FlyToMode</a> mode=Marble.Automatic)</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#leaveEvent">leaveEvent</a> (self, QEvent event)</td></tr> @@ -172,6 \
+173,7 @@ cross. <tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#reloadMap">reloadMap</a> (self)</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#removeLayer">removeLayer</a> (self, <a \
href="../marble/Marble.LayerInterface.html">Marble.LayerInterface</a> layer)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top">[<a \
href="../marble/Marble.RenderPlugin.html">Marble.RenderPlugin</a>] </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#renderPlugins">renderPlugins</a> (self)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#resetFocusPoint">resetFocusPoint</a> (self)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#resizeEvent">resizeEvent</a> (self, QResizeEvent a0)</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#rotateBy">rotateBy</a> (self, float deltaLon, float deltaLat, <a \
href="../marble/Marble.html#FlyToMode">Marble.FlyToMode</a> mode=Marble.Instant)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top">bool </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#screenCoordinates">screenCoordinates</a> (self, float lon, float \
lat, float x, float y)</td></tr> @@ -181,6 +183,7 @@ cross.
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#setDefaultAngleUnit">setDefaultAngleUnit</a> (self, <a \
href="../marble/Marble.html#AngleUnit">Marble.AngleUnit</a> angleUnit)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#setDefaultFont">setDefaultFont</a> (self, QFont font)</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#setDistance">setDistance</a> (self, float distance)</td></tr> \
+<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#setFocusPoint">setFocusPoint</a> (self, <a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> focusPoint)</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#setInputEnabled">setInputEnabled</a> (self, bool a0)</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#setMapQualityForViewContext">setMapQualityForViewContext</a> (self, \
<a href="../marble/Marble.html#MapQuality">Marble.MapQuality</a> quality, <a \
href="../marble/Marble.html#ViewContext">Marble.ViewContext</a> viewContext)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#setMapThemeId">setMapThemeId</a> (self, QString maptheme)</td></tr> \
@@ -1089,6 +1092,23 @@ like a jump of the camera. </td></tr>
</table></dl>
<p>
+</p></div></div><a class="anchor" name="focusPoint"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"><a href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> \
focusPoint</td> +<td>(</td>
+<td class="paramtype"> </td>
+<td class="paramname"><em>self</em> )</td>
+<td width="100%"> </td>
+</tr>
+</table>
+</div>
+<div class="memdoc"><p><dl class="return" compact><dt><b>Returns:</b></dt><dd> The current point of \
focus, e.g. the point that is not moved +when changing the zoom level. If not set, it defaults to the
+center point.
+</dd></dl> <dl class="see" compact><dt><b>See also:</b></dt><dd> centerLongitude centerLatitude \
setFocusPoint resetFocusPoint +</dd></dl>
</p></div></div><a class="anchor" name="geoCoordinates"></a>
<div class="memitem">
<div class="memproto">
@@ -1609,6 +1629,21 @@ use MarblePart which is handling this automatically.
<div class="memdoc"><p>Returns a list of all RenderPlugins on the widget, this includes float items
<dl class="return" compact><dt><b>Returns:</b></dt><dd> the list of RenderPlugins
</dd></dl>
+</p></div></div><a class="anchor" name="resetFocusPoint"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"> resetFocusPoint</td>
+<td>(</td>
+<td class="paramtype"> </td>
+<td class="paramname"><em>self</em> )</td>
+<td width="100%"> </td>
+</tr>
+</table>
+</div>
+<div class="memdoc"><p>Invalidate any focus point set with setFocusPoint.
+<dl class="see" compact><dt><b>See also:</b></dt><dd> focusPoint setFocusPoint
+</dd></dl>
</p></div></div><a class="anchor" name="resizeEvent"></a>
<div class="memitem">
<div class="memproto">
@@ -1902,6 +1937,35 @@ the previous position and the two offsets.
</td></tr>
</table></dl>
<p>
+</p></div></div><a class="anchor" name="setFocusPoint"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"> setFocusPoint</td>
+<td>(</td>
+<td class="paramtype"> <em>self</em>, </td>
+<td class="paramname"></td>
+</tr><tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> </td> +<td \
class="paramname"><em>focusPoint</em></td> +</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
+<div class="memdoc"><p>Change the point of focus, overridding any previously set focus point.
+</p><dl compact><dt><b>Parameters:</b></dt><dd>
+<table border="0" cellspacing="2" cellpadding="0">
+<tr><td></td><td valign="top"><em>focusPoint</em> </td><td> New focus point
+</td></tr> </table></dl>
+<p> <dl class="see" compact><dt><b>See also:</b></dt><dd> focusPoint resetFocusPoint
+</dd></dl>
</p></div></div><a class="anchor" name="setInputEnabled"></a>
<div class="memitem">
<div class="memproto">
diff --git a/docs/bindings/python/html/marble/Marble.PluginInterface.html \
b/docs/bindings/python/html/marble/Marble.PluginInterface.html index 94757cf..5e7b698 100644
--- a/docs/bindings/python/html/marble/Marble.PluginInterface.html
+++ b/docs/bindings/python/html/marble/Marble.PluginInterface.html
@@ -49,7 +49,7 @@
<code>from PyKDE4.marble import *</code>
<p>
-Subclasses: <a href="../marble/Marble.RenderPluginInterface.html">Marble.RenderPluginInterface</a>, <a \
href="../marble/Marble.RunnerPlugin.html">Marble.RunnerPlugin</a><br /> +
Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
<dl class="abstract" compact><dt><b>Abstract class:</b></dt>
diff --git a/docs/bindings/python/html/marble/Marble.QtMarbleConfigDialog.html \
b/docs/bindings/python/html/marble/Marble.QtMarbleConfigDialog.html index 44b978a..d10afc0 100644
--- a/docs/bindings/python/html/marble/Marble.QtMarbleConfigDialog.html
+++ b/docs/bindings/python/html/marble/Marble.QtMarbleConfigDialog.html
@@ -66,7 +66,6 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.html#MapQuality">Marble.MapQuality</a> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#animationQuality">animationQuality</a> (self)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top">int </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#chosenTimezone">chosenTimezone</a> (self)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top">bool </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#customTimezone">customTimezone</a> (self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.html#DistanceUnit">Marble.DistanceUnit</a> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#distanceUnit">distanceUnit</a> (self)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top">int </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#dragLocation">dragLocation</a> (self)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top">QString </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#externalMapEditor">externalMapEditor</a> (self)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.html#GraphicsSystem">Marble.GraphicsSystem</a> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#graphicsSystem">graphicsSystem</a> (self)</td></tr> @@ -74,6 +73,7 \
@@ Namespace: <a href="../marble/Marble.html">Marble</a><br /> <tr><td class="memItemLeft" nowrap \
align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#labelLocalization">labelLocalization</a> (self)</td></tr> <tr><td class="memItemLeft" nowrap \
align="right" valign="top">bool </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#lastSessionTime">lastSessionTime</a> (self)</td></tr> <tr><td class="memItemLeft" nowrap \
align="right" valign="top">QFont </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#mapFont">mapFont</a> (self)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" \
valign="top">QLocale::MeasurementSystem </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#measurementSystem">measurementSystem</a> (self)</td></tr> <tr><td class="memItemLeft" nowrap \
align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#onStartup">onStartup</a> (self)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#persistentTileCacheLimit">persistentTileCacheLimit</a> (self)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top">bool </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#proxyAuth">proxyAuth</a> (self)</td></tr> @@ -232,19 +232,7 @@ \
Either by the user or by loading them initially from disk. </table>
</div>
<div class="memdoc"><p>Read the value of 'Time/customTimezone' key from settings
-</p></div></div><a class="anchor" name="distanceUnit"></a>
-<div class="memitem">
-<div class="memproto">
-<table class="memname"><tr>
-<td class="memname"><a href="../marble/Marble.html#DistanceUnit">Marble.DistanceUnit</a> \
distanceUnit</td>
-<td>(</td>
-<td class="paramtype"> </td>
-<td class="paramname"><em>self</em> )</td>
-<td width="100%"> </td>
-</tr>
-</table>
-</div>
-<div class="memdoc"></div></div><a class="anchor" name="dragLocation"></a>
+</p></div></div><a class="anchor" name="dragLocation"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
@@ -329,6 +317,18 @@ Either by the user or by loading them initially from disk.
</tr>
</table>
</div>
+<div class="memdoc"></div></div><a class="anchor" name="measurementSystem"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname">QLocale::MeasurementSystem measurementSystem</td>
+<td>(</td>
+<td class="paramtype"> </td>
+<td class="paramname"><em>self</em> )</td>
+<td width="100%"> </td>
+</tr>
+</table>
+</div>
<div class="memdoc"></div></div><a class="anchor" name="onStartup"></a>
<div class="memitem">
<div class="memproto">
diff --git a/docs/bindings/python/html/marble/Marble.RenderPlugin.html \
b/docs/bindings/python/html/marble/Marble.RenderPlugin.html index 6eefade..2c4db50 100644
--- a/docs/bindings/python/html/marble/Marble.RenderPlugin.html
+++ b/docs/bindings/python/html/marble/Marble.RenderPlugin.html
@@ -49,7 +49,7 @@
<code>from PyKDE4.marble import *</code>
<p>
Inherits: QObject,<a href="../marble/Marble.RenderPluginInterface.html">Marble.RenderPluginInterface</a> \
→ <a href="../marble/Marble.PluginInterface.html">Marble.PluginInterface</a><br />
-Subclasses: <a href="../marble/Marble.AbstractDataPlugin.html">Marble.AbstractDataPlugin</a>, <a \
href="../marble/Marble.AbstractFloatItem.html">Marble.AbstractFloatItem</a><br /> +
Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
<dl class="abstract" compact><dt><b>Abstract class:</b></dt>
@@ -61,6 +61,7 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" \
href="#RenderType">RenderType</a> </td><td class="memItemRight" valign="bottom">{ Unknown, \
Online }</td></tr> <tr><td colspan="2"><br><h2>Signals</h2></td></tr>
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#actionGroupsChanged">actionGroupsChanged</a> ()</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#enabledChanged">enabledChanged</a> (bool enable)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#repaintNeeded">repaintNeeded</a> (QRegion \
dirtyRegion=QRegion())</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#settingsChanged">settingsChanged</a> (QString nameId)</td></tr> <tr><td class="memItemLeft" \
nowrap align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#visibilityChanged">visibilityChanged</a> (QString nameId, bool visible)</td></tr> @@ -100,7 \
+101,24 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br /> </div>
<div class="memdoc"><p>This signal is emitted if the actions that the plugin supports change in
any way
-</p><dl compact><dt><b>Signal syntax:</b></dt><dd><code>QObject.connect(source, \
SIGNAL("actionGroupsChanged()"), target_slot)</code></dd></dl></div></div><a class="anchor" \
name="repaintNeeded"></a> +</p><dl compact><dt><b>Signal \
syntax:</b></dt><dd><code>QObject.connect(source, SIGNAL("actionGroupsChanged()"), \
target_slot)</code></dd></dl></div></div><a class="anchor" name="enabledChanged"></a> +<div \
class="memitem"> +<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"> enabledChanged</td>
+<td>(</td>
+<td class="paramtype">bool </td>
+<td class="paramname"><em>enable</em></td>
+</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
+<div class="memdoc"><dl compact><dt><b>Signal syntax:</b></dt><dd><code>QObject.connect(source, \
SIGNAL("enabledChanged(bool)"), target_slot)</code></dd></dl></div></div><a class="anchor" \
name="repaintNeeded"></a> <div class="memitem">
<div class="memproto">
<table class="memname"><tr>
diff --git a/docs/bindings/python/html/marble/Marble.RenderPluginInterface.html \
b/docs/bindings/python/html/marble/Marble.RenderPluginInterface.html index fbadea2..86a4a5c 100644
--- a/docs/bindings/python/html/marble/Marble.RenderPluginInterface.html
+++ b/docs/bindings/python/html/marble/Marble.RenderPluginInterface.html
@@ -49,7 +49,7 @@
<code>from PyKDE4.marble import *</code>
<p>
Inherits: <a href="../marble/Marble.PluginInterface.html">Marble.PluginInterface</a><br />
-Subclasses: <a href="../marble/Marble.RenderPlugin.html">Marble.RenderPlugin</a><br />
+
Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
<dl class="abstract" compact><dt><b>Abstract class:</b></dt>
diff --git a/docs/bindings/python/html/marble/Marble.GeoDataMultiGeometry.html \
b/docs/bindings/python/html/marble/Marble.Route.html similarity index 51%
copy from docs/bindings/python/html/marble/Marble.GeoDataMultiGeometry.html
copy to docs/bindings/python/html/marble/Marble.Route.html
index 97f7697..e06a511 100644
--- a/docs/bindings/python/html/marble/Marble.GeoDataMultiGeometry.html
+++ b/docs/bindings/python/html/marble/Marble.Route.html
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head>
- <title>Marble.GeoDataMultiGeometry</title>
+ <title>Marble.Route</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta http-equiv="Content-Style-Type" content="text/css" />
<link rel="stylesheet" type="text/css" href="../common/doxygen.css" />
@@ -45,39 +45,33 @@
<div id="main">
<div class="clearer"> </div>
-<h1>GeoDataMultiGeometry Class Reference</h1>
+<h1>Route Class Reference</h1>
<code>from PyKDE4.marble import *</code>
<p>
-Inherits: <a href="../marble/Marble.GeoDataGeometry.html">Marble.GeoDataGeometry</a> → <a \
href="../marble/Marble.GeoDataObject.html">Marble.GeoDataObject</a> → <a \
href="../marble/Marble.GeoNode.html">Marble.GeoNode</a><br /> +
Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
-<p>A class that can contain other GeoDataGeometry objects
-</p>
-<p>
-GeoDataMultiGeometry is a collection of other GeoDataGeometry objects.
-As one can add GeoDataMultiGeometry to itself, you can make up a collection
-of different objects to form one Placemark.
-</p>
+
<table border="0" cellpadding="0" cellspacing="0"><tr><td colspan="2"><br><h2>Methods</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#GeoDataMultiGeometry">__init__</a> (self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#GeoDataMultiGeometry">__init__</a> (self, <a \
href="../marble/Marble.GeoDataGeometry.html">Marble.GeoDataGeometry</a> other)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#append">append</a> (self, <a \
href="../marble/Marble.GeoDataGeometry.html">Marble.GeoDataGeometry</a> other)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataGeometry.html">Marble.GeoDataGeometry</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#at">at</a> (self, int \
pos)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataGeometry.html">Marble.GeoDataGeometry</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#child">child</a> (self, int \
a0)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#childPosition">childPosition</a> (self, <a \
href="../marble/Marble.GeoDataGeometry.html">Marble.GeoDataGeometry</a> child)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#clear">clear</a> (self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataGeometry.html">Marble.GeoDataGeometry</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#first">first</a> \
(self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataGeometry.html">Marble.GeoDataGeometry</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#last">last</a> (self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataLatLonAltBox.html">Marble.GeoDataLatLonAltBox</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#latLonAltBox">latLonAltBox</a> \
(self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataMultiGeometry.html">Marble.GeoDataMultiGeometry</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#operator <<">operator <<</a> (self, <a \
href="../marble/Marble.GeoDataGeometry.html">Marble.GeoDataGeometry</a> value)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataGeometry.html">Marble.GeoDataGeometry</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#operator []">operator []</a> (self, int \
pos)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#pack">pack</a> (self, QDataStream stream)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#Route">__init__</a> (self)</td></tr> +<tr><td class="memItemLeft" \
nowrap align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#addRouteSegment">addRouteSegment</a> (self, <a \
href="../marble/Marble.RouteSegment.html">Marble.RouteSegment</a> segment)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.RouteSegment.html">Marble.RouteSegment</a> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#at">at</a> (self, int index)</td></tr> +<tr><td class="memItemLeft" \
nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataLatLonBox.html">Marble.GeoDataLatLonBox</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#bounds">bounds</a> (self)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.RouteSegment.html">Marble.RouteSegment</a> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#currentSegment">currentSegment</a> (self)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#currentWaypoint">currentWaypoint</a> \
(self)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" valign="top">float </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#distance">distance</a> (self)</td></tr> \
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataLineString.html">Marble.GeoDataLineString</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#path">path</a> (self)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#position">position</a> (self)</td></tr> \
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#positionOnRoute">positionOnRoute</a> \
(self)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#setPosition">setPosition</a> (self, <a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> position)</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top">int </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#size">size</a> (self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#unpack">unpack</a> (self, QDataStream stream)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top">int </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#travelTime">travelTime</a> (self)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataLineString.html">Marble.GeoDataLineString</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#turnPoints">turnPoints</a> (self)</td></tr> \
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataLineString.html">Marble.GeoDataLineString</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#waypoints">waypoints</a> (self)</td></tr> \
</table>
-<hr><h2>Method Documentation</h2><a class="anchor" name="GeoDataMultiGeometry"></a>
+<hr><h2>Method Documentation</h2><a class="anchor" name="Route"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
@@ -89,19 +83,19 @@ of different objects to form one Placemark.
</tr>
</table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="GeoDataMultiGeometry"></a>
+<div class="memdoc"></div></div><a class="anchor" name="addRouteSegment"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname">__init__</td>
+<td class="memname"> addRouteSegment</td>
<td>(</td>
<td class="paramtype"> <em>self</em>, </td>
<td class="paramname"></td>
</tr><tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype"><a \
href="../marble/Marble.GeoDataGeometry.html">Marble.GeoDataGeometry</a> </td>
-<td class="paramname"><em>other</em></td>
+<td class="paramtype"><a href="../marble/Marble.RouteSegment.html">Marble.RouteSegment</a> </td>
+<td class="paramname"><em>segment</em></td>
</tr>
<tr>
<td></td>
@@ -111,19 +105,19 @@ of different objects to form one Placemark.
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="append"></a>
+<div class="memdoc"></div></div><a class="anchor" name="at"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"> append</td>
+<td class="memname"><a href="../marble/Marble.RouteSegment.html">Marble.RouteSegment</a> at</td>
<td>(</td>
<td class="paramtype"> <em>self</em>, </td>
<td class="paramname"></td>
</tr><tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype"><a \
href="../marble/Marble.GeoDataGeometry.html">Marble.GeoDataGeometry</a> </td>
-<td class="paramname"><em>other</em></td>
+<td class="paramtype">int </td>
+<td class="paramname"><em>index</em></td>
</tr>
<tr>
<td></td>
@@ -133,80 +127,47 @@ of different objects to form one Placemark.
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"><p>add an element
-</p></div></div><a class="anchor" name="at"></a>
+<div class="memdoc"></div></div><a class="anchor" name="bounds"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"><a href="../marble/Marble.GeoDataGeometry.html">Marble.GeoDataGeometry</a> at</td>
+<td class="memname"><a href="../marble/Marble.GeoDataLatLonBox.html">Marble.GeoDataLatLonBox</a> \
bounds</td> <td>(</td>
-<td class="paramtype"> <em>self</em>, </td>
-<td class="paramname"></td>
-</tr><tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype">int </td>
-<td class="paramname"><em>pos</em></td>
-</tr>
-<tr>
-<td></td>
-<td>)</td>
-<td></td>
-<td></td>
+<td class="paramtype"> </td>
+<td class="paramname"><em>self</em> )</td>
<td width="100%"> </td>
-</tr></table>
+</tr>
+</table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="child"></a>
+<div class="memdoc"></div></div><a class="anchor" name="currentSegment"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"><a href="../marble/Marble.GeoDataGeometry.html">Marble.GeoDataGeometry</a> \
child</td> +<td class="memname"><a href="../marble/Marble.RouteSegment.html">Marble.RouteSegment</a> \
currentSegment</td> <td>(</td>
-<td class="paramtype"> <em>self</em>, </td>
-<td class="paramname"></td>
-</tr><tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype">int </td>
-<td class="paramname"><em>a0</em></td>
-</tr>
-<tr>
-<td></td>
-<td>)</td>
-<td></td>
-<td></td>
+<td class="paramtype"> </td>
+<td class="paramname"><em>self</em> )</td>
<td width="100%"> </td>
-</tr></table>
+</tr>
+</table>
</div>
-<div class="memdoc"><p>returns the requested child item
-</p></div></div><a class="anchor" name="childPosition"></a>
+<div class="memdoc"></div></div><a class="anchor" name="currentWaypoint"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname">int childPosition</td>
+<td class="memname"><a href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> \
currentWaypoint</td> <td>(</td>
-<td class="paramtype"> <em>self</em>, </td>
-<td class="paramname"></td>
-</tr><tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype"><a \
href="../marble/Marble.GeoDataGeometry.html">Marble.GeoDataGeometry</a> </td>
-<td class="paramname"><em>child</em></td>
-</tr>
-<tr>
-<td></td>
-<td>)</td>
-<td></td>
-<td></td>
+<td class="paramtype"> </td>
+<td class="paramname"><em>self</em> )</td>
<td width="100%"> </td>
-</tr></table>
+</tr>
+</table>
</div>
-<div class="memdoc"><p>returns the position of an item in the list
-</p></div></div><a class="anchor" name="clear"></a>
+<div class="memdoc"></div></div><a class="anchor" name="distance"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"> clear</td>
+<td class="memname">float distance</td>
<td>(</td>
<td class="paramtype"> </td>
<td class="paramname"><em>self</em> )</td>
@@ -214,11 +175,11 @@ of different objects to form one Placemark.
</tr>
</table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="first"></a>
+<div class="memdoc"></div></div><a class="anchor" name="path"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"><a href="../marble/Marble.GeoDataGeometry.html">Marble.GeoDataGeometry</a> \
first</td> +<td class="memname"><a \
href="../marble/Marble.GeoDataLineString.html">Marble.GeoDataLineString</a> path</td> <td>(</td>
<td class="paramtype"> </td>
<td class="paramname"><em>self</em> )</td>
@@ -226,11 +187,11 @@ of different objects to form one Placemark.
</tr>
</table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="last"></a>
+<div class="memdoc"></div></div><a class="anchor" name="position"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"><a href="../marble/Marble.GeoDataGeometry.html">Marble.GeoDataGeometry</a> last</td>
+<td class="memname"><a href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> \
position</td> <td>(</td>
<td class="paramtype"> </td>
<td class="paramname"><em>self</em> )</td>
@@ -238,11 +199,11 @@ of different objects to form one Placemark.
</tr>
</table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="latLonAltBox"></a>
+<div class="memdoc"></div></div><a class="anchor" name="positionOnRoute"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"><a href="../marble/Marble.GeoDataLatLonAltBox.html">Marble.GeoDataLatLonAltBox</a> \
latLonAltBox</td> +<td class="memname"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> positionOnRoute</td> \
<td>(</td> <td class="paramtype"> </td>
<td class="paramname"><em>self</em> )</td>
@@ -250,19 +211,19 @@ of different objects to form one Placemark.
</tr>
</table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="operator <<"></a>
+<div class="memdoc"></div></div><a class="anchor" name="setPosition"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"><a href="../marble/Marble.GeoDataMultiGeometry.html">Marble.GeoDataMultiGeometry</a> \
operator <<</td> +<td class="memname"> setPosition</td>
<td>(</td>
<td class="paramtype"> <em>self</em>, </td>
<td class="paramname"></td>
</tr><tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype"><a \
href="../marble/Marble.GeoDataGeometry.html">Marble.GeoDataGeometry</a> </td>
-<td class="paramname"><em>value</em></td>
+<td class="paramtype"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> </td> +<td \
class="paramname"><em>position</em></td> </tr>
<tr>
<td></td>
@@ -272,55 +233,35 @@ of different objects to form one Placemark.
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="operator []"></a>
+<div class="memdoc"></div></div><a class="anchor" name="size"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"><a href="../marble/Marble.GeoDataGeometry.html">Marble.GeoDataGeometry</a> operator \
[]</td> +<td class="memname">int size</td>
<td>(</td>
-<td class="paramtype"> <em>self</em>, </td>
-<td class="paramname"></td>
-</tr><tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype">int </td>
-<td class="paramname"><em>pos</em></td>
-</tr>
-<tr>
-<td></td>
-<td>)</td>
-<td></td>
-<td></td>
+<td class="paramtype"> </td>
+<td class="paramname"><em>self</em> )</td>
<td width="100%"> </td>
-</tr></table>
+</tr>
+</table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="pack"></a>
+<div class="memdoc"></div></div><a class="anchor" name="travelTime"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"> pack</td>
+<td class="memname">int travelTime</td>
<td>(</td>
-<td class="paramtype"> <em>self</em>, </td>
-<td class="paramname"></td>
-</tr><tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype">QDataStream </td>
-<td class="paramname"><em>stream</em></td>
-</tr>
-<tr>
-<td></td>
-<td>)</td>
-<td></td>
-<td></td>
+<td class="paramtype"> </td>
+<td class="paramname"><em>self</em> )</td>
<td width="100%"> </td>
-</tr></table>
+</tr>
+</table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="size"></a>
+<div class="memdoc"></div></div><a class="anchor" name="turnPoints"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname">int size</td>
+<td class="memname"><a href="../marble/Marble.GeoDataLineString.html">Marble.GeoDataLineString</a> \
turnPoints</td> <td>(</td>
<td class="paramtype"> </td>
<td class="paramname"><em>self</em> )</td>
@@ -328,27 +269,17 @@ of different objects to form one Placemark.
</tr>
</table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="unpack"></a>
+<div class="memdoc"></div></div><a class="anchor" name="waypoints"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"> unpack</td>
+<td class="memname"><a href="../marble/Marble.GeoDataLineString.html">Marble.GeoDataLineString</a> \
waypoints</td> <td>(</td>
-<td class="paramtype"> <em>self</em>, </td>
-<td class="paramname"></td>
-</tr><tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype">QDataStream </td>
-<td class="paramname"><em>stream</em></td>
-</tr>
-<tr>
-<td></td>
-<td>)</td>
-<td></td>
-<td></td>
+<td class="paramtype"> </td>
+<td class="paramname"><em>self</em> )</td>
<td width="100%"> </td>
-</tr></table>
+</tr>
+</table>
</div>
<div class="memdoc"></div></div>
</div>
diff --git a/docs/bindings/python/html/marble/Marble.GeoDataLineString.html \
b/docs/bindings/python/html/marble/Marble.RouteRequest.html similarity index 56%
copy from docs/bindings/python/html/marble/Marble.GeoDataLineString.html
copy to docs/bindings/python/html/marble/Marble.RouteRequest.html
index a8d2f0b..0fcb428 100644
--- a/docs/bindings/python/html/marble/Marble.GeoDataLineString.html
+++ b/docs/bindings/python/html/marble/Marble.RouteRequest.html
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head>
- <title>Marble.GeoDataLineString</title>
+ <title>Marble.RouteRequest</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta http-equiv="Content-Style-Type" content="text/css" />
<link rel="stylesheet" type="text/css" href="../common/doxygen.css" />
@@ -45,53 +45,94 @@
<div id="main">
<div class="clearer"> </div>
-<h1>GeoDataLineString Class Reference</h1>
+<h1>RouteRequest Class Reference</h1>
<code>from PyKDE4.marble import *</code>
<p>
-Inherits: <a href="../marble/Marble.GeoDataGeometry.html">Marble.GeoDataGeometry</a> → <a \
href="../marble/Marble.GeoDataObject.html">Marble.GeoDataObject</a> → <a \
href="../marble/Marble.GeoNode.html">Marble.GeoNode</a><br />
-Subclasses: <a href="../marble/Marble.GeoDataLinearRing.html">Marble.GeoDataLinearRing</a><br />
+Inherits: QObject<br />
+
Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
-
-<table border="0" cellpadding="0" cellspacing="0"><tr><td colspan="2"><br><h2>Methods</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#GeoDataLineString">__init__</a> (self, <a \
href="../marble/Marble.html">Marble.TessellationFlags</a> \
f=Marble.NoTessellation)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#GeoDataLineString">__init__</a> (self, <a \
href="../marble/Marble.GeoDataGeometry.html">Marble.GeoDataGeometry</a> other)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#append">append</a> (self, <a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> \
position)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#at">at</a> (self, int pos)</td></tr> +<p>Points \
to be included in a route. An ordered list of +GeoDataCoordinates with change notification and Pixmap \
access, similar +to QAbstractItemModel.
+</p>
+<table border="0" cellpadding="0" cellspacing="0"><tr><td colspan="2"><br><h2>Signals</h2></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#positionAdded">positionAdded</a> (int index)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#positionChanged">positionChanged</a> (int index, <a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> position)</td></tr> \
+<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#positionRemoved">positionRemoved</a> (int index)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#routingProfileChanged">routingProfileChanged</a> ()</td></tr> \
+<tr><td colspan="2"><br><h2>Methods</h2></td></tr> +<tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#RouteRequest">__init__</a> (self, QObject parent=0)</td></tr> +<tr><td class="memItemLeft" nowrap \
align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#addVia">addVia</a> (self, <a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> position)</td></tr> \
+<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#append">append</a> (self, <a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> coordinates)</td></tr> \
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#at">at</a> (self, int index)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#clear">clear</a> (self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#first">first</a> \
(self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">bool </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#isClosed">isClosed</a> (self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">bool </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#isEmpty">isEmpty</a> (self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#last">last</a> (self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataLatLonAltBox.html">Marble.GeoDataLatLonAltBox</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#latLonAltBox">latLonAltBox</a> \
(self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">float </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#length">length</a> (self, float planetRadius, int \
offset=0)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataLineString.html">Marble.GeoDataLineString</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#operator <<">operator <<</a> (self, <a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> \
position)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#operator []">operator []</a> (self, int \
pos)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#pack">pack</a> (self, QDataStream stream)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#remove">remove</a> (self, int i)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#setTessellate">setTessellate</a> (self, bool \
tessellate)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#setTessellationFlags">setTessellationFlags</a> (self, <a \
href="../marble/Marble.html">Marble.TessellationFlags</a> f)</td></tr> +<tr><td class="memItemLeft" \
nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#destination">destination</a> (self)</td></tr> \
+<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#insert">insert</a> (self, int index, <a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> coordinates)</td></tr> \
+<tr><td class="memItemLeft" nowrap align="right" valign="top">QString </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#name">name</a> (self, int index)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top">QPixmap </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#pixmap">pixmap</a> (self, int index)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#remove">remove</a> (self, int index)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#reverse">reverse</a> (self)</td></tr> +<tr><td class="memItemLeft" \
nowrap align="right" valign="top"><a \
href="../marble/Marble.RoutingProfile.html">Marble.RoutingProfile</a> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#routingProfile">routingProfile</a> (self)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#setName">setName</a> (self, int index, QString name)</td></tr> \
+<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#setPosition">setPosition</a> (self, int index, <a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> position)</td></tr> \
+<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#setRoutingProfile">setRoutingProfile</a> (self, <a \
href="../marble/Marble.RoutingProfile.html">Marble.RoutingProfile</a> profile)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#setVisited">setVisited</a> (self, int index, bool visited)</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top">int </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#size">size</a> (self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">bool </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#tessellate">tessellate</a> (self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.html">Marble.TessellationFlags</a> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#tessellationFlags">tessellationFlags</a> \
(self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataLineString.html">Marble.GeoDataLineString</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#toNormalized">toNormalized</a> \
(self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataLineString.html">Marble.GeoDataLineString</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#toPoleCorrected">toPoleCorrected</a> \
(self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#unpack">unpack</a> (self, QDataStream stream)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#source">source</a> (self)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top">bool </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#visited">visited</a> (self, int index)</td></tr> </table>
-<hr><h2>Method Documentation</h2><a class="anchor" name="GeoDataLineString"></a>
+<hr><h2>Signal Documentation</h2><a class="anchor" name="positionAdded"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname">__init__</td>
+<td class="memname"> positionAdded</td>
<td>(</td>
-<td class="paramtype"> <em>self</em>, </td>
-<td class="paramname"></td>
-</tr><tr>
+<td class="paramtype">int </td>
+<td class="paramname"><em>index</em></td>
+</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
+<div class="memdoc"><p>An element was added at the given position
+</p><dl compact><dt><b>Signal syntax:</b></dt><dd><code>QObject.connect(source, \
SIGNAL("positionAdded(int)"), target_slot)</code></dd></dl></div></div><a class="anchor" \
name="positionChanged"></a> +<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"> positionChanged</td>
+<td>(</td>
+<td class="paramtype">int </td>
+<td class="paramname"><em>index</em>, </td>
+</tr>
+<tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype"><a href="../marble/Marble.html">Marble.TessellationFlags</a> </td>
-<td class="paramname"><em>f=Marble.NoTessellation</em></td>
+<td class="paramtype"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> </td> +<td \
class="paramname"><em>position</em></td> +</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
+<div class="memdoc"><p>The value of the n-th element was changed
+</p><dl compact><dt><b>Signal syntax:</b></dt><dd><code>QObject.connect(source, \
SIGNAL("positionChanged(int, const Marble::GeoDataCoordinates&)"), \
target_slot)</code></dd></dl></div></div><a class="anchor" name="positionRemoved"></a> +<div \
class="memitem"> +<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"> positionRemoved</td>
+<td>(</td>
+<td class="paramtype">int </td>
+<td class="paramname"><em>index</em></td>
</tr>
<tr>
<td></td>
@@ -101,7 +142,21 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="GeoDataLineString"></a>
+<div class="memdoc"><p>The element at the given position was removed
+</p><dl compact><dt><b>Signal syntax:</b></dt><dd><code>QObject.connect(source, \
SIGNAL("positionRemoved(int)"), target_slot)</code></dd></dl></div></div><a class="anchor" \
name="routingProfileChanged"></a> +<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"> routingProfileChanged</td>
+<td>(</td>
+<td class="paramtype"> </td>
+<td class="paramname">)</td>
+<td width="100%"> </td>
+</tr>
+</table>
+</div>
+<div class="memdoc"><p>The routing profile was changed
+</p><dl compact><dt><b>Signal syntax:</b></dt><dd><code>QObject.connect(source, \
SIGNAL("routingProfileChanged()"), target_slot)</code></dd></dl></div></div><hr><h2>Method \
Documentation</h2><a class="anchor" name="RouteRequest"></a> <div class="memitem">
<div class="memproto">
<table class="memname"><tr>
@@ -112,8 +167,8 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
</tr><tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype"><a \
href="../marble/Marble.GeoDataGeometry.html">Marble.GeoDataGeometry</a> </td>
-<td class="paramname"><em>other</em></td>
+<td class="paramtype">QObject </td>
+<td class="paramname"><em>parent=0</em></td>
</tr>
<tr>
<td></td>
@@ -123,11 +178,12 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="append"></a>
+<div class="memdoc"><p>Constructor
+</p></div></div><a class="anchor" name="addVia"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"> append</td>
+<td class="memname"> addVia</td>
<td>(</td>
<td class="paramtype"> <em>self</em>, </td>
<td class="paramname"></td>
@@ -145,19 +201,28 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="at"></a>
+<div class="memdoc"><p>Insert a via point. Order will be chosen such that the via point is not before
+the start or after the destination. Furthermore the distance between neighboring
+route points is minimized
+</p>
+<p>
+@note: This does not trigger an update of the route. It becomes "dirty"
+</p>
+<p>
+@todo: Minimizing the distance might not always be what the user wants
+</p></div></div><a class="anchor" name="append"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"><a href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> \
at</td> +<td class="memname"> append</td>
<td>(</td>
<td class="paramtype"> <em>self</em>, </td>
<td class="paramname"></td>
</tr><tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype">int </td>
-<td class="paramname"><em>pos</em></td>
+<td class="paramtype"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> </td> +<td \
class="paramname"><em>coordinates</em></td> </tr>
<tr>
<td></td>
@@ -167,59 +232,35 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="clear"></a>
-<div class="memitem">
-<div class="memproto">
-<table class="memname"><tr>
-<td class="memname"> clear</td>
-<td>(</td>
-<td class="paramtype"> </td>
-<td class="paramname"><em>self</em> )</td>
-<td width="100%"> </td>
-</tr>
-</table>
-</div>
-<div class="memdoc"></div></div><a class="anchor" name="first"></a>
+<div class="memdoc"><p>Add the given element to the end
+</p></div></div><a class="anchor" name="at"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"><a href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> \
first</td>
-<td>(</td>
-<td class="paramtype"> </td>
-<td class="paramname"><em>self</em> )</td>
-<td width="100%"> </td>
-</tr>
-</table>
-</div>
-<div class="memdoc"></div></div><a class="anchor" name="isClosed"></a>
-<div class="memitem">
-<div class="memproto">
-<table class="memname"><tr>
-<td class="memname">bool isClosed</td>
+<td class="memname"><a href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> \
at</td> <td>(</td>
-<td class="paramtype"> </td>
-<td class="paramname"><em>self</em> )</td>
-<td width="100%"> </td>
+<td class="paramtype"> <em>self</em>, </td>
+<td class="paramname"></td>
+</tr><tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">int </td>
+<td class="paramname"><em>index</em></td>
</tr>
-</table>
-</div>
-<div class="memdoc"></div></div><a class="anchor" name="isEmpty"></a>
-<div class="memitem">
-<div class="memproto">
-<table class="memname"><tr>
-<td class="memname">bool isEmpty</td>
-<td>(</td>
-<td class="paramtype"> </td>
-<td class="paramname"><em>self</em> )</td>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
<td width="100%"> </td>
-</tr>
-</table>
+</tr></table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="last"></a>
+<div class="memdoc"><p>Accessor for the n-th position
+</p></div></div><a class="anchor" name="clear"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"><a href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> \
last</td> +<td class="memname"> clear</td>
<td>(</td>
<td class="paramtype"> </td>
<td class="paramname"><em>self</em> )</td>
@@ -227,11 +268,12 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
</tr>
</table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="latLonAltBox"></a>
+<div class="memdoc"><p>Remove all elements
+</p></div></div><a class="anchor" name="destination"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"><a href="../marble/Marble.GeoDataLatLonAltBox.html">Marble.GeoDataLatLonAltBox</a> \
latLonAltBox</td> +<td class="memname"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> destination</td> \
<td>(</td> <td class="paramtype"> </td>
<td class="paramname"><em>self</em> )</td>
@@ -239,25 +281,26 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
</tr>
</table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="length"></a>
+<div class="memdoc"><p>The last point, or a default constructed if empty
+</p></div></div><a class="anchor" name="insert"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname">float length</td>
+<td class="memname"> insert</td>
<td>(</td>
<td class="paramtype"> <em>self</em>, </td>
<td class="paramname"></td>
</tr><tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype">float </td>
-<td class="paramname"><em>planetRadius</em>, </td>
+<td class="paramtype">int </td>
+<td class="paramname"><em>index</em>, </td>
</tr>
<tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype">int </td>
-<td class="paramname"><em>offset=0</em></td>
+<td class="paramtype"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> </td> +<td \
class="paramname"><em>coordinates</em></td> </tr>
<tr>
<td></td>
@@ -267,31 +310,20 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"><p>Returns the length of LineString across a sphere starting from a coordinate in \
LineString
-This method can be used as an approximation for distances along LineStrings.
-The unit used for the resulting length matches the unit of the planet
-radius.
-</p><dl compact><dt><b>Parameters:</b></dt><dd>
-<table border="0" cellspacing="2" cellpadding="0">
-<tr><td></td><td valign="top"><em>planetRadius</em> </td><td> radius of the sphere
-
-<tr><td></td><td valign="top"><em>offset</em> </td><td> position of coordinate within LineString
-</td></tr>
-</table></dl>
-<p>
-</p></div></div><a class="anchor" name="operator <<"></a>
+<div class="memdoc"><p>Add the given element at the given position
+</p></div></div><a class="anchor" name="name"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"><a href="../marble/Marble.GeoDataLineString.html">Marble.GeoDataLineString</a> \
operator <<</td> +<td class="memname">QString name</td>
<td>(</td>
<td class="paramtype"> <em>self</em>, </td>
<td class="paramname"></td>
</tr><tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> </td>
-<td class="paramname"><em>position</em></td>
+<td class="paramtype">int </td>
+<td class="paramname"><em>index</em></td>
</tr>
<tr>
<td></td>
@@ -301,11 +333,11 @@ radius.
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="operator []"></a>
+<div class="memdoc"></div></div><a class="anchor" name="pixmap"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"><a href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> \
operator []</td> +<td class="memname">QPixmap pixmap</td>
<td>(</td>
<td class="paramtype"> <em>self</em>, </td>
<td class="paramname"></td>
@@ -313,7 +345,7 @@ radius.
<td class="memname"></td>
<td></td>
<td class="paramtype">int </td>
-<td class="paramname"><em>pos</em></td>
+<td class="paramname"><em>index</em></td>
</tr>
<tr>
<td></td>
@@ -323,19 +355,20 @@ radius.
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="pack"></a>
+<div class="memdoc"><p>Returns a pixmap which indicates the position of the element
+</p></div></div><a class="anchor" name="remove"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"> pack</td>
+<td class="memname"> remove</td>
<td>(</td>
<td class="paramtype"> <em>self</em>, </td>
<td class="paramname"></td>
</tr><tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype">QDataStream </td>
-<td class="paramname"><em>stream</em></td>
+<td class="paramtype">int </td>
+<td class="paramname"><em>index</em></td>
</tr>
<tr>
<td></td>
@@ -345,11 +378,36 @@ radius.
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="remove"></a>
+<div class="memdoc"><p>Remove the element at the given position
+</p></div></div><a class="anchor" name="reverse"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"> remove</td>
+<td class="memname"> reverse</td>
+<td>(</td>
+<td class="paramtype"> </td>
+<td class="paramname"><em>self</em> )</td>
+<td width="100%"> </td>
+</tr>
+</table>
+</div>
+<div class="memdoc"></div></div><a class="anchor" name="routingProfile"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"><a href="../marble/Marble.RoutingProfile.html">Marble.RoutingProfile</a> \
routingProfile</td> +<td>(</td>
+<td class="paramtype"> </td>
+<td class="paramname"><em>self</em> )</td>
+<td width="100%"> </td>
+</tr>
+</table>
+</div>
+<div class="memdoc"></div></div><a class="anchor" name="setName"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"> setName</td>
<td>(</td>
<td class="paramtype"> <em>self</em>, </td>
<td class="paramname"></td>
@@ -357,7 +415,13 @@ radius.
<td class="memname"></td>
<td></td>
<td class="paramtype">int </td>
-<td class="paramname"><em>i</em></td>
+<td class="paramname"><em>index</em>, </td>
+</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">QString </td>
+<td class="paramname"><em>name</em></td>
</tr>
<tr>
<td></td>
@@ -367,19 +431,25 @@ radius.
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="setTessellate"></a>
+<div class="memdoc"></div></div><a class="anchor" name="setPosition"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"> setTessellate</td>
+<td class="memname"> setPosition</td>
<td>(</td>
<td class="paramtype"> <em>self</em>, </td>
<td class="paramname"></td>
</tr><tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype">bool </td>
-<td class="paramname"><em>tessellate</em></td>
+<td class="paramtype">int </td>
+<td class="paramname"><em>index</em>, </td>
+</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> </td> +<td \
class="paramname"><em>position</em></td> </tr>
<tr>
<td></td>
@@ -389,19 +459,20 @@ radius.
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="setTessellationFlags"></a>
+<div class="memdoc"><p>Change the value of the element at the given position
+</p></div></div><a class="anchor" name="setRoutingProfile"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"> setTessellationFlags</td>
+<td class="memname"> setRoutingProfile</td>
<td>(</td>
<td class="paramtype"> <em>self</em>, </td>
<td class="paramname"></td>
</tr><tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype"><a href="../marble/Marble.html">Marble.TessellationFlags</a> </td>
-<td class="paramname"><em>f</em></td>
+<td class="paramtype"><a \
href="../marble/Marble.RoutingProfile.html">Marble.RoutingProfile</a> </td> +<td \
class="paramname"><em>profile</em></td> </tr>
<tr>
<td></td>
@@ -411,47 +482,39 @@ radius.
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="size"></a>
+<div class="memdoc"></div></div><a class="anchor" name="setVisited"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname">int size</td>
+<td class="memname"> setVisited</td>
<td>(</td>
-<td class="paramtype"> </td>
-<td class="paramname"><em>self</em> )</td>
-<td width="100%"> </td>
+<td class="paramtype"> <em>self</em>, </td>
+<td class="paramname"></td>
+</tr><tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">int </td>
+<td class="paramname"><em>index</em>, </td>
</tr>
-</table>
-</div>
-<div class="memdoc"></div></div><a class="anchor" name="tessellate"></a>
-<div class="memitem">
-<div class="memproto">
-<table class="memname"><tr>
-<td class="memname">bool tessellate</td>
-<td>(</td>
-<td class="paramtype"> </td>
-<td class="paramname"><em>self</em> )</td>
-<td width="100%"> </td>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">bool </td>
+<td class="paramname"><em>visited</em></td>
</tr>
-</table>
-</div>
-<div class="memdoc"></div></div><a class="anchor" name="tessellationFlags"></a>
-<div class="memitem">
-<div class="memproto">
-<table class="memname"><tr>
-<td class="memname"><a href="../marble/Marble.html">Marble.TessellationFlags</a> tessellationFlags</td>
-<td>(</td>
-<td class="paramtype"> </td>
-<td class="paramname"><em>self</em> )</td>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
<td width="100%"> </td>
-</tr>
-</table>
+</tr></table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="toNormalized"></a>
+<div class="memdoc"></div></div><a class="anchor" name="size"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"><a href="../marble/Marble.GeoDataLineString.html">Marble.GeoDataLineString</a> \
toNormalized</td> +<td class="memname">int size</td>
<td>(</td>
<td class="paramtype"> </td>
<td class="paramname"><em>self</em> )</td>
@@ -459,11 +522,12 @@ radius.
</tr>
</table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="toPoleCorrected"></a>
+<div class="memdoc"><p>Number of points in the route
+</p></div></div><a class="anchor" name="source"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"><a href="../marble/Marble.GeoDataLineString.html">Marble.GeoDataLineString</a> \
toPoleCorrected</td> +<td class="memname"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> source</td> <td>(</td>
<td class="paramtype"> </td>
<td class="paramname"><em>self</em> )</td>
@@ -471,19 +535,20 @@ radius.
</tr>
</table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="unpack"></a>
+<div class="memdoc"><p>The first point, or a default constructed if empty
+</p></div></div><a class="anchor" name="visited"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"> unpack</td>
+<td class="memname">bool visited</td>
<td>(</td>
<td class="paramtype"> <em>self</em>, </td>
<td class="paramname"></td>
</tr><tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype">QDataStream </td>
-<td class="paramname"><em>stream</em></td>
+<td class="paramtype">int </td>
+<td class="paramname"><em>index</em></td>
</tr>
<tr>
<td></td>
diff --git a/docs/bindings/python/html/marble/Marble.GeoDataGeometry.html \
b/docs/bindings/python/html/marble/Marble.RouteSegment.html similarity index 55%
copy from docs/bindings/python/html/marble/Marble.GeoDataGeometry.html
copy to docs/bindings/python/html/marble/Marble.RouteSegment.html
index 84cda88..27555de 100644
--- a/docs/bindings/python/html/marble/Marble.GeoDataGeometry.html
+++ b/docs/bindings/python/html/marble/Marble.RouteSegment.html
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head>
- <title>Marble.GeoDataGeometry</title>
+ <title>Marble.RouteSegment</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta http-equiv="Content-Style-Type" content="text/css" />
<link rel="stylesheet" type="text/css" href="../common/doxygen.css" />
@@ -45,41 +45,32 @@
<div id="main">
<div class="clearer"> </div>
-<h1>GeoDataGeometry Class Reference</h1>
+<h1>RouteSegment Class Reference</h1>
<code>from PyKDE4.marble import *</code>
<p>
-Inherits: <a href="../marble/Marble.GeoDataObject.html">Marble.GeoDataObject</a> → <a \
href="../marble/Marble.GeoNode.html">Marble.GeoNode</a><br />
-Subclasses: <a href="../marble/Marble.GeoDataLineString.html">Marble.GeoDataLineString</a>, <a \
href="../marble/Marble.GeoDataMultiGeometry.html">Marble.GeoDataMultiGeometry</a>, <a \
href="../marble/Marble.GeoDataPoint.html">Marble.GeoDataPoint</a>, <a \
href="../marble/Marble.GeoDataPolygon.html">Marble.GeoDataPolygon</a><br /> +
+
Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
-<p>A base class for all geodata features
-</p>
-<p>
-GeoDataGeometry is the base class for most geodata classes that
-deal with geometric data (points, linestrings, polygons, etc.)
-</p>
-<p>
-<dl class="see" compact><dt><b>See also:</b></dt><dd> GeoDataLineString
-</dd></dl> <dl class="see" compact><dt><b>See also:</b></dt><dd> GeoDataLinearRing
-</dd></dl> <dl class="see" compact><dt><b>See also:</b></dt><dd> GeoDataPolygon
-</dd></dl>
-</p>
+
<table border="0" cellpadding="0" cellspacing="0"><tr><td colspan="2"><br><h2>Methods</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#GeoDataGeometry">__init__</a> (self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#GeoDataGeometry">__init__</a> (self, <a \
href="../marble/Marble.GeoDataGeometry.html">Marble.GeoDataGeometry</a> other)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.html#AltitudeMode">Marble.AltitudeMode</a> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#altitudeMode">altitudeMode</a> (self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#detach">detach</a> (self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">bool </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#extrude">extrude</a> (self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/global.html#EnumGeometryId">EnumGeometryId</a> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#geometryId">geometryId</a> (self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataLatLonAltBox.html">Marble.GeoDataLatLonAltBox</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#latLonAltBox">latLonAltBox</a> \
(self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">QString </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#nodeType">nodeType</a> (self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#pack">pack</a> (self, QDataStream stream)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#setAltitudeMode">setAltitudeMode</a> (self, <a \
href="../marble/Marble.html#AltitudeMode">Marble.AltitudeMode</a> altitudeMode)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#setExtrude">setExtrude</a> (self, bool \
extrude)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#unpack">unpack</a> (self, QDataStream stream)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#RouteSegment">__init__</a> (self)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataLatLonBox.html">Marble.GeoDataLatLonBox</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#bounds">bounds</a> (self)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top">float </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#distance">distance</a> (self)</td></tr> +<tr><td class="memItemLeft" \
nowrap align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#distanceTo">distanceTo</a> (self, <a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> point, <a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> closest, <a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> interpolated)</td></tr> \
+<tr><td class="memItemLeft" nowrap align="right" valign="top">bool </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#isValid">isValid</a> (self)</td></tr> +<tr><td class="memItemLeft" \
nowrap align="right" valign="top"><a \
href="../marble/Marble.Maneuver.html">Marble.Maneuver</a> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#maneuver">maneuver</a> (self)</td></tr> +<tr><td class="memItemLeft" \
nowrap align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#minimalDistanceTo">minimalDistanceTo</a> (self, <a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> point)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.RouteSegment.html">Marble.RouteSegment</a> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#nextRouteSegment">nextRouteSegment</a> (self)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataLineString.html">Marble.GeoDataLineString</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#path">path</a> (self)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#setManeuver">setManeuver</a> (self, <a \
href="../marble/Marble.Maneuver.html">Marble.Maneuver</a> maneuver)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#setNextRouteSegment">setNextRouteSegment</a> (self, <a \
href="../marble/Marble.RouteSegment.html">Marble.RouteSegment</a> segment)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#setPath">setPath</a> (self, <a \
href="../marble/Marble.GeoDataLineString.html">Marble.GeoDataLineString</a> path)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#setTravelTime">setTravelTime</a> (self, int seconds)</td></tr> \
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#travelTime">travelTime</a> (self)</td></tr> </table>
-<hr><h2>Method Documentation</h2><a class="anchor" name="GeoDataGeometry"></a>
+<hr><h2>Method Documentation</h2><a class="anchor" name="RouteSegment"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
@@ -91,19 +82,55 @@ deal with geometric data (points, linestrings, polygons, etc.)
</tr>
</table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="GeoDataGeometry"></a>
+<div class="memdoc"></div></div><a class="anchor" name="bounds"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname">__init__</td>
+<td class="memname"><a href="../marble/Marble.GeoDataLatLonBox.html">Marble.GeoDataLatLonBox</a> \
bounds</td> +<td>(</td>
+<td class="paramtype"> </td>
+<td class="paramname"><em>self</em> )</td>
+<td width="100%"> </td>
+</tr>
+</table>
+</div>
+<div class="memdoc"></div></div><a class="anchor" name="distance"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname">float distance</td>
+<td>(</td>
+<td class="paramtype"> </td>
+<td class="paramname"><em>self</em> )</td>
+<td width="100%"> </td>
+</tr>
+</table>
+</div>
+<div class="memdoc"></div></div><a class="anchor" name="distanceTo"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname">float distanceTo</td>
<td>(</td>
<td class="paramtype"> <em>self</em>, </td>
<td class="paramname"></td>
</tr><tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype"><a \
href="../marble/Marble.GeoDataGeometry.html">Marble.GeoDataGeometry</a> </td>
-<td class="paramname"><em>other</em></td>
+<td class="paramtype"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> </td> +<td \
class="paramname"><em>point</em>, </td> +</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> </td> +<td \
class="paramname"><em>closest</em>, </td> +</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> </td> +<td \
class="paramname"><em>interpolated</em></td> </tr>
<tr>
<td></td>
@@ -113,11 +140,11 @@ deal with geometric data (points, linestrings, polygons, etc.)
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="altitudeMode"></a>
+<div class="memdoc"></div></div><a class="anchor" name="isValid"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"><a href="../marble/Marble.html#AltitudeMode">Marble.AltitudeMode</a> \
altitudeMode</td> +<td class="memname">bool isValid</td>
<td>(</td>
<td class="paramtype"> </td>
<td class="paramname"><em>self</em> )</td>
@@ -125,11 +152,11 @@ deal with geometric data (points, linestrings, polygons, etc.)
</tr>
</table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="detach"></a>
+<div class="memdoc"></div></div><a class="anchor" name="maneuver"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"> detach</td>
+<td class="memname"><a href="../marble/Marble.Maneuver.html">Marble.Maneuver</a> maneuver</td>
<td>(</td>
<td class="paramtype"> </td>
<td class="paramname"><em>self</em> )</td>
@@ -137,35 +164,33 @@ deal with geometric data (points, linestrings, polygons, etc.)
</tr>
</table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="extrude"></a>
+<div class="memdoc"></div></div><a class="anchor" name="minimalDistanceTo"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname">bool extrude</td>
+<td class="memname">float minimalDistanceTo</td>
<td>(</td>
-<td class="paramtype"> </td>
-<td class="paramname"><em>self</em> )</td>
-<td width="100%"> </td>
+<td class="paramtype"> <em>self</em>, </td>
+<td class="paramname"></td>
+</tr><tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> </td> +<td \
class="paramname"><em>point</em></td> </tr>
-</table>
-</div>
-<div class="memdoc"></div></div><a class="anchor" name="geometryId"></a>
-<div class="memitem">
-<div class="memproto">
-<table class="memname"><tr>
-<td class="memname"><a href="../marble/global.html#EnumGeometryId">EnumGeometryId</a> geometryId</td>
-<td>(</td>
-<td class="paramtype"> </td>
-<td class="paramname"><em>self</em> )</td>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
<td width="100%"> </td>
-</tr>
-</table>
+</tr></table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="latLonAltBox"></a>
+<div class="memdoc"></div></div><a class="anchor" name="nextRouteSegment"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"><a href="../marble/Marble.GeoDataLatLonAltBox.html">Marble.GeoDataLatLonAltBox</a> \
latLonAltBox</td> +<td class="memname"><a \
href="../marble/Marble.RouteSegment.html">Marble.RouteSegment</a> nextRouteSegment</td> <td>(</td>
<td class="paramtype"> </td>
<td class="paramname"><em>self</em> )</td>
@@ -173,11 +198,11 @@ deal with geometric data (points, linestrings, polygons, etc.)
</tr>
</table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="nodeType"></a>
+<div class="memdoc"></div></div><a class="anchor" name="path"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname">QString nodeType</td>
+<td class="memname"><a href="../marble/Marble.GeoDataLineString.html">Marble.GeoDataLineString</a> \
path</td> <td>(</td>
<td class="paramtype"> </td>
<td class="paramname"><em>self</em> )</td>
@@ -185,19 +210,19 @@ deal with geometric data (points, linestrings, polygons, etc.)
</tr>
</table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="pack"></a>
+<div class="memdoc"></div></div><a class="anchor" name="setManeuver"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"> pack</td>
+<td class="memname"> setManeuver</td>
<td>(</td>
<td class="paramtype"> <em>self</em>, </td>
<td class="paramname"></td>
</tr><tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype">QDataStream </td>
-<td class="paramname"><em>stream</em></td>
+<td class="paramtype"><a href="../marble/Marble.Maneuver.html">Marble.Maneuver</a> </td>
+<td class="paramname"><em>maneuver</em></td>
</tr>
<tr>
<td></td>
@@ -207,19 +232,19 @@ deal with geometric data (points, linestrings, polygons, etc.)
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="setAltitudeMode"></a>
+<div class="memdoc"></div></div><a class="anchor" name="setNextRouteSegment"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"> setAltitudeMode</td>
+<td class="memname"> setNextRouteSegment</td>
<td>(</td>
<td class="paramtype"> <em>self</em>, </td>
<td class="paramname"></td>
</tr><tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype"><a href="../marble/Marble.html#AltitudeMode">Marble.AltitudeMode</a> </td>
-<td class="paramname"><em>altitudeMode</em></td>
+<td class="paramtype"><a href="../marble/Marble.RouteSegment.html">Marble.RouteSegment</a> </td>
+<td class="paramname"><em>segment</em></td>
</tr>
<tr>
<td></td>
@@ -229,19 +254,19 @@ deal with geometric data (points, linestrings, polygons, etc.)
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="setExtrude"></a>
+<div class="memdoc"></div></div><a class="anchor" name="setPath"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"> setExtrude</td>
+<td class="memname"> setPath</td>
<td>(</td>
<td class="paramtype"> <em>self</em>, </td>
<td class="paramname"></td>
</tr><tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype">bool </td>
-<td class="paramname"><em>extrude</em></td>
+<td class="paramtype"><a \
href="../marble/Marble.GeoDataLineString.html">Marble.GeoDataLineString</a> </td> +<td \
class="paramname"><em>path</em></td> </tr>
<tr>
<td></td>
@@ -251,19 +276,19 @@ deal with geometric data (points, linestrings, polygons, etc.)
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="unpack"></a>
+<div class="memdoc"></div></div><a class="anchor" name="setTravelTime"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"> unpack</td>
+<td class="memname"> setTravelTime</td>
<td>(</td>
<td class="paramtype"> <em>self</em>, </td>
<td class="paramname"></td>
</tr><tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype">QDataStream </td>
-<td class="paramname"><em>stream</em></td>
+<td class="paramtype">int </td>
+<td class="paramname"><em>seconds</em></td>
</tr>
<tr>
<td></td>
@@ -273,6 +298,18 @@ deal with geometric data (points, linestrings, polygons, etc.)
<td width="100%"> </td>
</tr></table>
</div>
+<div class="memdoc"></div></div><a class="anchor" name="travelTime"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname">int travelTime</td>
+<td>(</td>
+<td class="paramtype"> </td>
+<td class="paramname"><em>self</em> )</td>
+<td width="100%"> </td>
+</tr>
+</table>
+</div>
<div class="memdoc"></div></div>
</div>
</div>
diff --git a/docs/bindings/python/html/marble/Marble.GeoDataPolygon.html \
b/docs/bindings/python/html/marble/Marble.RoutingModel.html similarity index 50%
copy from docs/bindings/python/html/marble/Marble.GeoDataPolygon.html
copy to docs/bindings/python/html/marble/Marble.RoutingModel.html
index 3c908a3..48574d4 100644
--- a/docs/bindings/python/html/marble/Marble.GeoDataPolygon.html
+++ b/docs/bindings/python/html/marble/Marble.RoutingModel.html
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head>
- <title>Marble.GeoDataPolygon</title>
+ <title>Marble.RoutingModel</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta http-equiv="Content-Style-Type" content="text/css" />
<link rel="stylesheet" type="text/css" href="../common/doxygen.css" />
@@ -45,67 +45,55 @@
<div id="main">
<div class="clearer"> </div>
-<h1>GeoDataPolygon Class Reference</h1>
+<h1>RoutingModel Class Reference</h1>
<code>from PyKDE4.marble import *</code>
<p>
-Inherits: <a href="../marble/Marble.GeoDataGeometry.html">Marble.GeoDataGeometry</a> → <a \
href="../marble/Marble.GeoDataObject.html">Marble.GeoDataObject</a> → <a \
href="../marble/Marble.GeoNode.html">Marble.GeoNode</a><br />
-Subclasses: <a href="../marble/Marble.GeoDataInnerBoundary.html">Marble.GeoDataInnerBoundary</a>, <a \
href="../marble/Marble.GeoDataOuterBoundary.html">Marble.GeoDataOuterBoundary</a><br /> +Inherits: \
QAbstractListModel → QAbstractItemModel → QObject<br /> +
Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
-<table border="0" cellpadding="0" cellspacing="0"><tr><td colspan="2"><br><h2>Methods</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#GeoDataPolygon">__init__</a> (self, <a \
href="../marble/Marble.html">Marble.TessellationFlags</a> \
f=Marble.NoTessellation)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#GeoDataPolygon">__init__</a> (self, <a \
href="../marble/Marble.GeoDataGeometry.html">Marble.GeoDataGeometry</a> other)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#appendInnerBoundary">appendInnerBoundary</a> (self, <a \
href="../marble/Marble.GeoDataLinearRing.html">Marble.GeoDataLinearRing</a> \
boundary)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">bool </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#contains">contains</a> (self, <a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> \
coordinates)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" \
valign="top">QVector<Marble::GeoDataLinearRing> </td><td class="memItemRight" valign="bottom"><a \
class="el" href="#innerBoundaries">innerBoundaries</a> (self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">bool </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#isClosed">isClosed</a> (self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataLatLonAltBox.html">Marble.GeoDataLatLonAltBox</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#latLonAltBox">latLonAltBox</a> \
(self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.GeoDataLinearRing.html">Marble.GeoDataLinearRing</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#outerBoundary">outerBoundary</a> \
(self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#pack">pack</a> (self, QDataStream stream)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#setOuterBoundary">setOuterBoundary</a> (self, <a \
href="../marble/Marble.GeoDataLinearRing.html">Marble.GeoDataLinearRing</a> \
boundary)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#setTessellate">setTessellate</a> (self, bool \
tessellate)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#setTessellationFlags">setTessellationFlags</a> (self, <a \
href="../marble/Marble.html">Marble.TessellationFlags</a> f)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">bool </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#tessellate">tessellate</a> (self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.html">Marble.TessellationFlags</a> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#tessellationFlags">tessellationFlags</a> \
(self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#unpack">unpack</a> (self, QDataStream stream)</td></tr> +<table \
border="0" cellpadding="0" cellspacing="0"><tr><td colspan="2"><br><h2>Enumerations</h2></td></tr> \
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" \
href="#RoutingModelRoles">RoutingModelRoles</a> </td><td class="memItemRight" \
valign="bottom">{ CoordinateRole, TurnTypeIconRole, LongitudeRole, LatitudeRole }</td></tr> \
+<tr><td colspan="2"><br><h2>Signals</h2></td></tr> +<tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#currentRouteChanged">currentRouteChanged</a> ()</td></tr> +<tr><td class="memItemLeft" nowrap \
align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#deviatedFromRoute">deviatedFromRoute</a> (bool deviated)</td></tr> +<tr><td class="memItemLeft" \
nowrap align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#positionChanged">positionChanged</a> ()</td></tr> +<tr><td \
colspan="2"><br><h2>Methods</h2></td></tr> +<tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#RoutingModel">__init__</a> (self, <a \
href="../marble/Marble.RouteRequest.html">Marble.RouteRequest</a> request, <a \
href="../marble/Marble.MarbleModel.html">Marble.MarbleModel</a> model, QObject parent=0)</td></tr> \
+<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#clear">clear</a> (self)</td></tr> +<tr><td class="memItemLeft" \
nowrap align="right" valign="top">QVariant </td><td class="memItemRight" valign="bottom"><a \
class="el" href="#data">data</a> (self, QModelIndex index, int role=Qt.DisplayRole)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top">bool </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#deviatedFromRoute">deviatedFromRoute</a> (self)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#exportGpx">exportGpx</a> (self, QIODevice device)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top">QVariant </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#headerData">headerData</a> (self, int section, <a \
href="http://www.riverbankcomputing.co.uk/static/Docs/PyQt4/html/qt.html">Qt::Orientation</a> \
orientation, int role=Qt.DisplayRole)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" \
valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#rightNeighbor">rightNeighbor</a> (self, <a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> position, RouteRequestconst \
route)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.Route.html">Marble.Route</a> </td><td class="memItemRight" valign="bottom"><a \
class="el" href="#route">route</a> (self)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" \
valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#rowCount">rowCount</a> (self, QModelIndex parent=QModelIndex())</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top">bool </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#setCurrentRoute">setCurrentRoute</a> (self, <a \
href="../marble/Marble.GeoDataDocument.html">Marble.GeoDataDocument</a> document)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#updatePosition">updatePosition</a> (self, <a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> a0, float a1)</td></tr> \
</table>
-<hr><h2>Method Documentation</h2><a class="anchor" name="GeoDataPolygon"></a>
+<hr><h2>Signal Documentation</h2><a class="anchor" name="currentRouteChanged"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname">__init__</td>
+<td class="memname"> currentRouteChanged</td>
<td>(</td>
-<td class="paramtype"> <em>self</em>, </td>
-<td class="paramname"></td>
-</tr><tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype"><a href="../marble/Marble.html">Marble.TessellationFlags</a> </td>
-<td class="paramname"><em>f=Marble.NoTessellation</em></td>
-</tr>
-<tr>
-<td></td>
-<td>)</td>
-<td></td>
-<td></td>
+<td class="paramtype"> </td>
+<td class="paramname">)</td>
<td width="100%"> </td>
-</tr></table>
+</tr>
+</table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="GeoDataPolygon"></a>
+<div class="memdoc"><p>A different route was loaded
+</p><dl compact><dt><b>Signal syntax:</b></dt><dd><code>QObject.connect(source, \
SIGNAL("currentRouteChanged()"), target_slot)</code></dd></dl></div></div><a class="anchor" \
name="deviatedFromRoute"></a> <div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname">__init__</td>
+<td class="memname"> deviatedFromRoute</td>
<td>(</td>
-<td class="paramtype"> <em>self</em>, </td>
-<td class="paramname"></td>
-</tr><tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype"><a \
href="../marble/Marble.GeoDataGeometry.html">Marble.GeoDataGeometry</a> </td>
-<td class="paramname"><em>other</em></td>
+<td class="paramtype">bool </td>
+<td class="paramname"><em>deviated</em></td>
</tr>
<tr>
<td></td>
@@ -115,41 +103,45 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="appendInnerBoundary"></a>
+<div class="memdoc"><p>returns whether the gps location is on route
+</p><dl compact><dt><b>Signal syntax:</b></dt><dd><code>QObject.connect(source, \
SIGNAL("deviatedFromRoute(bool)"), target_slot)</code></dd></dl></div></div><a class="anchor" \
name="positionChanged"></a> <div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"> appendInnerBoundary</td>
+<td class="memname"> positionChanged</td>
<td>(</td>
-<td class="paramtype"> <em>self</em>, </td>
-<td class="paramname"></td>
-</tr><tr>
-<td class="memname"></td>
-<td></td>
-<td class="paramtype"><a \
href="../marble/Marble.GeoDataLinearRing.html">Marble.GeoDataLinearRing</a> </td>
-<td class="paramname"><em>boundary</em></td>
-</tr>
-<tr>
-<td></td>
-<td>)</td>
-<td></td>
-<td></td>
+<td class="paramtype"> </td>
+<td class="paramname">)</td>
<td width="100%"> </td>
-</tr></table>
+</tr>
+</table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="contains"></a>
+<div class="memdoc"><p>emits a signal regarding information about total time( seconds ) and distance( \
metres ) remaining to reach destination +</p><dl compact><dt><b>Signal \
syntax:</b></dt><dd><code>QObject.connect(source, SIGNAL("positionChanged()"), \
target_slot)</code></dd></dl></div></div><hr><h2>Method Documentation</h2><a class="anchor" \
name="RoutingModel"></a> <div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname">bool contains</td>
+<td class="memname">__init__</td>
<td>(</td>
<td class="paramtype"> <em>self</em>, </td>
<td class="paramname"></td>
</tr><tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> </td>
-<td class="paramname"><em>coordinates</em></td>
+<td class="paramtype"><a href="../marble/Marble.RouteRequest.html">Marble.RouteRequest</a> </td>
+<td class="paramname"><em>request</em>, </td>
+</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype"><a href="../marble/Marble.MarbleModel.html">Marble.MarbleModel</a> </td>
+<td class="paramname"><em>model</em>, </td>
+</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">QObject </td>
+<td class="paramname"><em>parent=0</em></td>
</tr>
<tr>
<td></td>
@@ -159,11 +151,12 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="innerBoundaries"></a>
+<div class="memdoc"><p>Constructor
+</p></div></div><a class="anchor" name="clear"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname">QVector<Marble::GeoDataLinearRing> innerBoundaries</td>
+<td class="memname"> clear</td>
<td>(</td>
<td class="paramtype"> </td>
<td class="paramname"><em>self</em> )</td>
@@ -171,35 +164,41 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
</tr>
</table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="isClosed"></a>
+<div class="memdoc"><p>Clear any data held in the model
+</p></div></div><a class="anchor" name="data"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname">bool isClosed</td>
+<td class="memname">QVariant data</td>
<td>(</td>
-<td class="paramtype"> </td>
-<td class="paramname"><em>self</em> )</td>
-<td width="100%"> </td>
+<td class="paramtype"> <em>self</em>, </td>
+<td class="paramname"></td>
+</tr><tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">QModelIndex </td>
+<td class="paramname"><em>index</em>, </td>
</tr>
-</table>
-</div>
-<div class="memdoc"></div></div><a class="anchor" name="latLonAltBox"></a>
-<div class="memitem">
-<div class="memproto">
-<table class="memname"><tr>
-<td class="memname"><a href="../marble/Marble.GeoDataLatLonAltBox.html">Marble.GeoDataLatLonAltBox</a> \
latLonAltBox</td>
-<td>(</td>
-<td class="paramtype"> </td>
-<td class="paramname"><em>self</em> )</td>
-<td width="100%"> </td>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">int </td>
+<td class="paramname"><em>role=Qt.DisplayRole</em></td>
</tr>
-</table>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="outerBoundary"></a>
+<div class="memdoc"><p>Overload of QAbstractListModel
+</p></div></div><a class="anchor" name="deviatedFromRoute"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"><a href="../marble/Marble.GeoDataLinearRing.html">Marble.GeoDataLinearRing</a> \
outerBoundary</td> +<td class="memname">bool deviatedFromRoute</td>
<td>(</td>
<td class="paramtype"> </td>
<td class="paramname"><em>self</em> )</td>
@@ -207,19 +206,20 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
</tr>
</table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="pack"></a>
+<div class="memdoc"><p>returns whether the gps location is on route
+</p></div></div><a class="anchor" name="exportGpx"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"> pack</td>
+<td class="memname"> exportGpx</td>
<td>(</td>
<td class="paramtype"> <em>self</em>, </td>
<td class="paramname"></td>
</tr><tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype">QDataStream </td>
-<td class="paramname"><em>stream</em></td>
+<td class="paramtype">QIODevice </td>
+<td class="paramname"><em>device</em></td>
</tr>
<tr>
<td></td>
@@ -229,19 +229,32 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="setOuterBoundary"></a>
+<div class="memdoc"><p>Export waypoints and instructions in gpx format
+</p></div></div><a class="anchor" name="headerData"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"> setOuterBoundary</td>
+<td class="memname">QVariant headerData</td>
<td>(</td>
<td class="paramtype"> <em>self</em>, </td>
<td class="paramname"></td>
</tr><tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype"><a \
href="../marble/Marble.GeoDataLinearRing.html">Marble.GeoDataLinearRing</a> </td>
-<td class="paramname"><em>boundary</em></td>
+<td class="paramtype">int </td>
+<td class="paramname"><em>section</em>, </td>
+</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype"><a \
href="http://www.riverbankcomputing.co.uk/static/Docs/PyQt4/html/qt.html">Qt::Orientation</a> </td> \
+<td class="paramname"><em>orientation</em>, </td> +</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">int </td>
+<td class="paramname"><em>role=Qt.DisplayRole</em></td>
</tr>
<tr>
<td></td>
@@ -251,19 +264,26 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="setTessellate"></a>
+<div class="memdoc"><p>Overload of QAbstractListModel
+</p></div></div><a class="anchor" name="rightNeighbor"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"> setTessellate</td>
+<td class="memname">int rightNeighbor</td>
<td>(</td>
<td class="paramtype"> <em>self</em>, </td>
<td class="paramname"></td>
</tr><tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype">bool </td>
-<td class="paramname"><em>tessellate</em></td>
+<td class="paramtype"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> </td> +<td \
class="paramname"><em>position</em>, </td> +</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">RouteRequestconst </td>
+<td class="paramname"><em>route</em></td>
</tr>
<tr>
<td></td>
@@ -273,19 +293,39 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="setTessellationFlags"></a>
+<div class="memdoc"><p>Maps points from the provided route request to waypoints in the model
+according to their global minimal distance. Returns the right neighbor
+(next route request item along the waypoints) of the provided position.
+Provided route must not be null.
+<dl class="return" compact><dt><b>Returns:</b></dt><dd> -1 If the provided route is empty, the index of \
the right +neighbor along the waypoints otherwise (result is a valid RouteRequest
+index in that case)
+</dd></dl>
+</p></div></div><a class="anchor" name="route"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"> setTessellationFlags</td>
+<td class="memname"><a href="../marble/Marble.Route.html">Marble.Route</a> route</td>
+<td>(</td>
+<td class="paramtype"> </td>
+<td class="paramname"><em>self</em> )</td>
+<td width="100%"> </td>
+</tr>
+</table>
+</div>
+<div class="memdoc"></div></div><a class="anchor" name="rowCount"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname">int rowCount</td>
<td>(</td>
<td class="paramtype"> <em>self</em>, </td>
<td class="paramname"></td>
</tr><tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype"><a href="../marble/Marble.html">Marble.TessellationFlags</a> </td>
-<td class="paramname"><em>f</em></td>
+<td class="paramtype">QModelIndex </td>
+<td class="paramname"><em>parent=QModelIndex()</em></td>
</tr>
<tr>
<td></td>
@@ -295,43 +335,50 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="tessellate"></a>
+<div class="memdoc"><p>Overload of QAbstractListModel
+</p></div></div><a class="anchor" name="setCurrentRoute"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname">bool tessellate</td>
+<td class="memname">bool setCurrentRoute</td>
<td>(</td>
-<td class="paramtype"> </td>
-<td class="paramname"><em>self</em> )</td>
-<td width="100%"> </td>
+<td class="paramtype"> <em>self</em>, </td>
+<td class="paramname"></td>
+</tr><tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype"><a \
href="../marble/Marble.GeoDataDocument.html">Marble.GeoDataDocument</a> </td> +<td \
class="paramname"><em>document</em></td> </tr>
-</table>
-</div>
-<div class="memdoc"></div></div><a class="anchor" name="tessellationFlags"></a>
-<div class="memitem">
-<div class="memproto">
-<table class="memname"><tr>
-<td class="memname"><a href="../marble/Marble.html">Marble.TessellationFlags</a> tessellationFlags</td>
-<td>(</td>
-<td class="paramtype"> </td>
-<td class="paramname"><em>self</em> )</td>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
<td width="100%"> </td>
-</tr>
-</table>
+</tr></table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="unpack"></a>
+<div class="memdoc"><p>Old data in the model is discarded, the parsed content of the provided document
+is used as the new model data and a model reset is done
+</p></div></div><a class="anchor" name="updatePosition"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"> unpack</td>
+<td class="memname"> updatePosition</td>
<td>(</td>
<td class="paramtype"> <em>self</em>, </td>
<td class="paramname"></td>
</tr><tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype">QDataStream </td>
-<td class="paramname"><em>stream</em></td>
+<td class="paramtype"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> </td> +<td \
class="paramname"><em>a0</em>, </td> +</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">float </td>
+<td class="paramname"><em>a1</em></td>
</tr>
<tr>
<td></td>
@@ -341,7 +388,18 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"></div></div>
+<div class="memdoc"></div></div><hr><h2>Enumeration Documentation</h2><a class="anchor" \
name="RoutingModelRoles"></a> +<div class="memitem">
+<div class="memproto">
+<table class="memname">
+<tr><td class="memname">RoutingModelRoles</td>
+</tr>
+</table>
+</div>
+<div class="memdoc"><dl compact><dt><b>Enumerator: </b></dt><dd>
+<table border="0" cellspacing="2" cellpadding="0"><tr><td \
valign="top"><em>CoordinateRole</em> = Qt::UserRole+3</td><td><tr><td \
valign="top"><em>TurnTypeIconRole</em> </td><td><tr><td \
valign="top"><em>LongitudeRole</em> </td><td><tr><td \
valign="top"><em>LatitudeRole</em> </td><td></table> +</dl>
+</div></div><p>
</div>
</div>
</div>
diff --git a/docs/bindings/python/html/marble/Marble.MapThemeManager.html \
b/docs/bindings/python/html/marble/Marble.RoutingProfile.html similarity index 62%
copy from docs/bindings/python/html/marble/Marble.MapThemeManager.html
copy to docs/bindings/python/html/marble/Marble.RoutingProfile.html
index a04ffbe..df1a0d8 100644
--- a/docs/bindings/python/html/marble/Marble.MapThemeManager.html
+++ b/docs/bindings/python/html/marble/Marble.RoutingProfile.html
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head>
- <title>Marble.MapThemeManager</title>
+ <title>Marble.RoutingProfile</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta http-equiv="Content-Style-Type" content="text/css" />
<link rel="stylesheet" type="text/css" href="../common/doxygen.css" />
@@ -45,70 +45,72 @@
<div id="main">
<div class="clearer"> </div>
-<h1>MapThemeManager Class Reference</h1>
+<h1>RoutingProfile Class Reference</h1>
<code>from PyKDE4.marble import *</code>
<p>
-Inherits: QObject<br />
+
Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
-<p>The class that handles map themes that are locally available .
-</p>
-<p>
-This class which is able to check for maps that are locally available.
-After parsing the data it only stores the name, description and path
-into a QStandardItemModel.
-</p>
-<p>
-The MapThemeManager is not owned by the MarbleWidget/Map itself.
-Instead it is owned by the widget or application that contains
-MarbleWidget/Map ( usually: the ControlView convenience class )
-</p>
-<p>
-For convenience MarbleThemeManager provides a static helper class
-that loads the properties of a map theme into a GeoSceneDocument
-object.
-</p>
-<p>
-<dl class="see" compact><dt><b>See also:</b></dt><dd> GeoSceneDocument
-</dd></dl>
-</p>
-<table border="0" cellpadding="0" cellspacing="0"><tr><td colspan="2"><br><h2>Signals</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#themesChanged">themesChanged</a> ()</td></tr> +
+<table border="0" cellpadding="0" cellspacing="0"><tr><td \
colspan="2"><br><h2>Enumerations</h2></td></tr> +<tr><td class="memItemLeft" nowrap align="right" \
valign="top"><a class="el" href="#TransportType">TransportType</a> </td><td class="memItemRight" \
valign="bottom">{ Motorcar, Bicycle, Pedestrian }</td></tr> <tr><td \
colspan="2"><br><h2>Methods</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#MapThemeManager">__init__</a> (self, QObject \
parent=0)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#directoryChanged">directoryChanged</a> (self, QString \
path)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#fileChanged">fileChanged</a> (self, QString \
path)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">QStandardItemModel </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#mapThemeModel">mapThemeModel</a> \
(self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#updateMapThemeModel">updateMapThemeModel</a> (self)</td></tr> \
+<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#RoutingProfile">__init__</a> (self, QString \
name=QString())</td></tr> +<tr><td class="memItemLeft" nowrap align="right" \
valign="top">QString </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#name">name</a> (self)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" \
valign="top">bool </td><td class="memItemRight" valign="bottom"><a class="el" href="#operator \
==">operator ==</a> (self, <a href="../marble/Marble.RoutingProfile.html">Marble.RoutingProfile</a> \
other)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#setName">setName</a> (self, QString \
name)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#setTransportType">setTransportType</a> (self, \
<a href="../marble/Marble.RoutingProfile.html#TransportType">Marble.RoutingProfile.TransportType</a> \
transportType)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.RoutingProfile.html#TransportType">Marble.RoutingProfile.TransportType</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#transportType">transportType</a> \
(self)</td></tr> </table>
-<hr><h2>Signal Documentation</h2><a class="anchor" name="themesChanged"></a>
+<hr><h2>Method Documentation</h2><a class="anchor" name="RoutingProfile"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname">__init__</td>
+<td>(</td>
+<td class="paramtype"> <em>self</em>, </td>
+<td class="paramname"></td>
+</tr><tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">QString </td>
+<td class="paramname"><em>name=QString()</em></td>
+</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
+<div class="memdoc"></div></div><a class="anchor" name="name"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"> themesChanged</td>
+<td class="memname">QString name</td>
<td>(</td>
<td class="paramtype"> </td>
-<td class="paramname">)</td>
+<td class="paramname"><em>self</em> )</td>
<td width="100%"> </td>
</tr>
</table>
</div>
-<div class="memdoc"><p>This signal will be emitted, when the themes change.
-</p><dl compact><dt><b>Signal syntax:</b></dt><dd><code>QObject.connect(source, \
SIGNAL("themesChanged()"), target_slot)</code></dd></dl></div></div><hr><h2>Method Documentation</h2><a \
class="anchor" name="MapThemeManager"></a> +<div class="memdoc"></div></div><a class="anchor" \
name="operator =="></a> <div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname">__init__</td>
+<td class="memname">bool operator ==</td>
<td>(</td>
<td class="paramtype"> <em>self</em>, </td>
<td class="paramname"></td>
</tr><tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype">QObject </td>
-<td class="paramname"><em>parent=0</em></td>
+<td class="paramtype"><a \
href="../marble/Marble.RoutingProfile.html">Marble.RoutingProfile</a> </td> +<td \
class="paramname"><em>other</em></td> </tr>
<tr>
<td></td>
@@ -118,11 +120,11 @@ object.
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="directoryChanged"></a>
+<div class="memdoc"></div></div><a class="anchor" name="setName"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"> directoryChanged</td>
+<td class="memname"> setName</td>
<td>(</td>
<td class="paramtype"> <em>self</em>, </td>
<td class="paramname"></td>
@@ -130,7 +132,7 @@ object.
<td class="memname"></td>
<td></td>
<td class="paramtype">QString </td>
-<td class="paramname"><em>path</em></td>
+<td class="paramname"><em>name</em></td>
</tr>
<tr>
<td></td>
@@ -140,19 +142,19 @@ object.
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="fileChanged"></a>
+<div class="memdoc"></div></div><a class="anchor" name="setTransportType"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname"> fileChanged</td>
+<td class="memname"> setTransportType</td>
<td>(</td>
<td class="paramtype"> <em>self</em>, </td>
<td class="paramname"></td>
</tr><tr>
<td class="memname"></td>
<td></td>
-<td class="paramtype">QString </td>
-<td class="paramname"><em>path</em></td>
+<td class="paramtype"><a \
href="../marble/Marble.RoutingProfile.html#TransportType">Marble.RoutingProfile.TransportType</a> </td>
+<td class="paramname"><em>transportType</em></td>
</tr>
<tr>
<td></td>
@@ -162,11 +164,11 @@ object.
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="mapThemeModel"></a>
+<div class="memdoc"></div></div><a class="anchor" name="transportType"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
-<td class="memname">QStandardItemModel mapThemeModel</td>
+<td class="memname"><a \
href="../marble/Marble.RoutingProfile.html#TransportType">Marble.RoutingProfile.TransportType</a> \
transportType</td> <td>(</td>
<td class="paramtype"> </td>
<td class="paramname"><em>self</em> )</td>
@@ -174,29 +176,18 @@ object.
</tr>
</table>
</div>
-<div class="memdoc"><p>Provides a model of the locally existing themes.
-</p>
-<p>
-This method provides a QStandardItemModel of all themes
-that are available via MarbleDirs.
-</p></div></div><a class="anchor" name="updateMapThemeModel"></a>
+<div class="memdoc"></div></div><hr><h2>Enumeration Documentation</h2><a class="anchor" \
name="TransportType"></a> <div class="memitem">
<div class="memproto">
-<table class="memname"><tr>
-<td class="memname"> updateMapThemeModel</td>
-<td>(</td>
-<td class="paramtype"> </td>
-<td class="paramname"><em>self</em> )</td>
-<td width="100%"> </td>
+<table class="memname">
+<tr><td class="memname">TransportType</td>
</tr>
</table>
</div>
-<div class="memdoc"><p>Updates the map theme model on request.
-</p>
-<p>
-This method should usually get invoked on startup or
-by a QFileSystemWatcher instance.
-</p></div></div>
+<div class="memdoc"><dl compact><dt><b>Enumerator: </b></dt><dd>
+<table border="0" cellspacing="2" cellpadding="0"><tr><td \
valign="top"><em>Motorcar</em> </td><td><tr><td valign="top"><em>Bicycle</em> </td><td><tr><td \
valign="top"><em>Pedestrian</em> </td><td></table> +</dl>
+</div></div><p>
</div>
</div>
</div>
diff --git a/docs/bindings/python/html/marble/Marble.ScreenGraphicsItem.html \
b/docs/bindings/python/html/marble/Marble.ScreenGraphicsItem.html index 1cb0995..eace9c2 100644
--- a/docs/bindings/python/html/marble/Marble.ScreenGraphicsItem.html
+++ b/docs/bindings/python/html/marble/Marble.ScreenGraphicsItem.html
@@ -49,7 +49,7 @@
<code>from PyKDE4.marble import *</code>
<p>
Inherits: <a href="../marble/Marble.MarbleGraphicsItem.html">Marble.MarbleGraphicsItem</a><br />
-Subclasses: <a href="../marble/Marble.FrameGraphicsItem.html">Marble.FrameGraphicsItem</a>, <a \
href="../marble/Marble.WidgetGraphicsItem.html">Marble.WidgetGraphicsItem</a><br /> +
Namespace: <a href="../marble/Marble.html">Marble</a><br />
<h2>Detailed Description</h2>
diff --git a/docs/bindings/python/html/marble/Marble.ViewportParams.html \
b/docs/bindings/python/html/marble/Marble.ViewportParams.html index d8e6a2c..4be89c2 100644
--- a/docs/bindings/python/html/marble/Marble.ViewportParams.html
+++ b/docs/bindings/python/html/marble/Marble.ViewportParams.html
@@ -59,13 +59,18 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#ViewportParams">__init__</a> (self)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#ViewportParams">__init__</a> (self, <a \
href="../marble/Marble.ViewportParams.html">Marble.ViewportParams</a> a0)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top">float </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#angularResolution">angularResolution</a> (self)</td></tr> +<tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#centerCoordinates">centerCoordinates</a> (self, float centerLon, \
float centerLat)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#centerLatitude">centerLatitude</a> (self)</td></tr> <tr><td class="memItemLeft" nowrap \
align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#centerLongitude">centerLongitude</a> (self)</td></tr> <tr><td class="memItemLeft" nowrap \
align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#centerOn">centerOn</a> (self, float lon, float lat)</td></tr> <tr><td class="memItemLeft" nowrap \
align="right" valign="top"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#focusPoint">focusPoint</a> (self)</td></tr> \
+<tr><td class="memItemLeft" nowrap align="right" valign="top">bool </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#geoCoordinates">geoCoordinates</a> (self, int x, int y, float lon, \
float lat, <a href="../marble/Marble.GeoDataCoordinates.html#Unit">Marble.GeoDataCoordinates.Unit</a> \
unit=Marble.GeoDataCoordinates.Degree)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top">bool </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#globeCoversViewport">globeCoversViewport</a> (self)</td></tr> <tr><td class="memItemLeft" nowrap \
align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#height">height</a> (self)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" \
valign="top"><a href="../marble/Marble.GeoDataLatLonAltBox.html">Marble.GeoDataLatLonAltBox</a> </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#latLonAltBox">latLonAltBox</a> (self, QRect \
screenRect)</td></tr> <tr><td class="memItemLeft" nowrap align="right" valign="top">bool </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#mapCoversViewport">mapCoversViewport</a> \
(self)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" valign="top">QRegion </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#mapRegion">mapRegion</a> (self)</td></tr> \
+<tr><td class="memItemLeft" nowrap align="right" valign="top">QPainterPath </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#mapShape">mapShape</a> (self)</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
href="../marble/Marble.Quaternion.html">Marble.Quaternion</a> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#planetAxis">planetAxis</a> (self)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top">int </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#polarity">polarity</a> (self)</td></tr> <tr><td class="memItemLeft" \
nowrap align="right" valign="top"><a \
href="../marble/Marble.html#Projection">Marble.Projection</a> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#projection">projection</a> (self)</td></tr> @@ -74,6 +79,13 @@ \
Namespace: <a href="../marble/Marble.html">Marble</a><br /> <tr><td class="memItemLeft" nowrap \
align="right" valign="top">bool </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#resolves">resolves</a> (self, <a \
href="../marble/Marble.GeoDataLatLonBox.html">Marble.GeoDataLatLonBox</a> latLonBox)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top">bool </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#resolves">resolves</a> (self, <a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> coord1, <a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> coord2)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top">bool </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#resolves">resolves</a> (self, <a \
href="../marble/Marble.GeoDataLatLonAltBox.html">Marble.GeoDataLatLonAltBox</a> latLonAltBox)</td></tr> \
+<tr><td class="memItemLeft" nowrap align="right" valign="top">bool </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#screenCoordinates">screenCoordinates</a> (self, float lon, float \
lat, float x, float y)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" \
valign="top">bool </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#screenCoordinates">screenCoordinates</a> (self, <a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> geopoint, float x, float y, \
bool globeHidesPoint)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" \
valign="top">bool </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#screenCoordinates">screenCoordinates</a> (self, <a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> geopoint, QPointF \
screenpoint)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" valign="top">bool </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#screenCoordinates">screenCoordinates</a> (self, \
<a href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> geopoint, float x, float \
y)</td></tr> +<tr><td class="memItemLeft" nowrap align="right" valign="top">bool </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#screenCoordinates">screenCoordinates</a> (self, \
<a href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> coordinates, float x, \
float y, int pointRepeatNum, bool globeHidesPoint)</td></tr> +<tr><td class="memItemLeft" nowrap \
align="right" valign="top">bool </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#screenCoordinates">screenCoordinates</a> (self, <a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> coordinates, float x, float \
y, int pointRepeatNum, QSizeF size, bool globeHidesPoint)</td></tr> +<tr><td class="memItemLeft" nowrap \
align="right" valign="top">bool </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#screenCoordinates">screenCoordinates</a> (self, <a \
href="../marble/Marble.GeoDataLineString.html">Marble.GeoDataLineString</a> lineString, \
QVector<QPolygonF> polygons)</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#setFocusPoint">setFocusPoint</a> (self, <a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> focusPoint)</td></tr> \
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#setHeight">setHeight</a> (self, int newHeight)</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" \
valign="bottom"><a class="el" href="#setProjection">setProjection</a> (self, <a \
href="../marble/Marble.html#Projection">Marble.Projection</a> newProjection)</td></tr> @@ -130,6 +142,34 \
@@ Namespace: <a href="../marble/Marble.html">Marble</a><br /> </tr>
</table>
</div>
+<div class="memdoc"></div></div><a class="anchor" name="centerCoordinates"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"> centerCoordinates</td>
+<td>(</td>
+<td class="paramtype"> <em>self</em>, </td>
+<td class="paramname"></td>
+</tr><tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">float </td>
+<td class="paramname"><em>centerLon</em>, </td>
+</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">float </td>
+<td class="paramname"><em>centerLat</em></td>
+</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
<div class="memdoc"></div></div><a class="anchor" name="centerLatitude"></a>
<div class="memitem">
<div class="memproto">
@@ -197,8 +237,69 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<div class="memdoc"><p><dl class="return" compact><dt><b>Returns:</b></dt><dd> The current point of \
focus, e.g. the point that is not moved when changing the zoom level. If not set, it defaults to the
center point.
-</dd></dl> <dl class="see" compact><dt><b>See also:</b></dt><dd> centerCoordinates setFocusPoint \
resetFocusPoint focusPointIsCenter +</dd></dl> <dl class="see" compact><dt><b>See also:</b></dt><dd> \
centerCoordinates setFocusPoint resetFocusPoint </dd></dl>
+</p></div></div><a class="anchor" name="geoCoordinates"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname">bool geoCoordinates</td>
+<td>(</td>
+<td class="paramtype"> <em>self</em>, </td>
+<td class="paramname"></td>
+</tr><tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">int </td>
+<td class="paramname"><em>x</em>, </td>
+</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">int </td>
+<td class="paramname"><em>y</em>, </td>
+</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">float </td>
+<td class="paramname"><em>lon</em>, </td>
+</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">float </td>
+<td class="paramname"><em>lat</em>, </td>
+</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype"><a \
href="../marble/Marble.GeoDataCoordinates.html#Unit">Marble.GeoDataCoordinates.Unit</a> </td> +<td \
class="paramname"><em>unit=Marble.GeoDataCoordinates.Degree</em></td> +</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
+<div class="memdoc"><p>Get the earth coordinates corresponding to a pixel in the map.
+</p><dl compact><dt><b>Parameters:</b></dt><dd>
+<table border="0" cellspacing="2" cellpadding="0">
+<tr><td></td><td valign="top"><em>x</em> </td><td> the x coordinate of the pixel
+
+<tr><td></td><td valign="top"><em>y</em> </td><td> the y coordinate of the pixel
+
+<tr><td></td><td valign="top"><em>lon</em> </td><td> the longitude angle is returned through this \
parameter +
+<tr><td></td><td valign="top"><em>lat</em> </td><td> the latitude angle is returned through this \
parameter +
+<tr><td></td><td valign="top"><em>unit</em> </td><td> the unit of the angles for lon and lat.
+</td></tr> </table></dl>
+<p> <dl class="return" compact><dt><b>Returns:</b></dt><dd> true if the pixel (x, y) is within the globe
+</dd></dl> false if the pixel (x, y) is outside the globe, i.e. in space.
</p></div></div><a class="anchor" name="globeCoversViewport"></a>
<div class="memitem">
<div class="memproto">
@@ -223,6 +324,28 @@ center point.
</tr>
</table>
</div>
+<div class="memdoc"></div></div><a class="anchor" name="latLonAltBox"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname"><a href="../marble/Marble.GeoDataLatLonAltBox.html">Marble.GeoDataLatLonAltBox</a> \
latLonAltBox</td> +<td>(</td>
+<td class="paramtype"> <em>self</em>, </td>
+<td class="paramname"></td>
+</tr><tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">QRect </td>
+<td class="paramname"><em>screenRect</em></td>
+</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
<div class="memdoc"></div></div><a class="anchor" name="mapCoversViewport"></a>
<div class="memitem">
<div class="memproto">
@@ -235,6 +358,30 @@ center point.
</tr>
</table>
</div>
+<div class="memdoc"></div></div><a class="anchor" name="mapRegion"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname">QRegion mapRegion</td>
+<td>(</td>
+<td class="paramtype"> </td>
+<td class="paramname"><em>self</em> )</td>
+<td width="100%"> </td>
+</tr>
+</table>
+</div>
+<div class="memdoc"></div></div><a class="anchor" name="mapShape"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname">QPainterPath mapShape</td>
+<td>(</td>
+<td class="paramtype"> </td>
+<td class="paramname"><em>self</em> )</td>
+<td width="100%"> </td>
+</tr>
+</table>
+</div>
<div class="memdoc"></div></div><a class="anchor" name="planetAxis"></a>
<div class="memitem">
<div class="memproto">
@@ -296,7 +443,7 @@ center point.
</table>
</div>
<div class="memdoc"><p>Invalidate any focus point set with setFocusPoint.
-<dl class="see" compact><dt><b>See also:</b></dt><dd> focusPoint setFocusPoint focusPointIsCenter
+<dl class="see" compact><dt><b>See also:</b></dt><dd> focusPoint setFocusPoint
</dd></dl>
</p></div></div><a class="anchor" name="resolves"></a>
<div class="memitem">
@@ -370,7 +517,436 @@ center point.
<td width="100%"> </td>
</tr></table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="setFocusPoint"></a>
+<div class="memdoc"></div></div><a class="anchor" name="screenCoordinates"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname">bool screenCoordinates</td>
+<td>(</td>
+<td class="paramtype"> <em>self</em>, </td>
+<td class="paramname"></td>
+</tr><tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">float </td>
+<td class="paramname"><em>lon</em>, </td>
+</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">float </td>
+<td class="paramname"><em>lat</em>, </td>
+</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">float </td>
+<td class="paramname"><em>x</em>, </td>
+</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">float </td>
+<td class="paramname"><em>y</em></td>
+</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
+<div class="memdoc"><p>Get the coordinates of screen points for geographical coordinates in the map.
+</p>
+<p>
+</p><dl compact><dt><b>Parameters:</b></dt><dd>
+<table border="0" cellspacing="2" cellpadding="0">
+<tr><td></td><td valign="top"><em>coordinates</em> </td><td> the point on earth, including \
altitude, that we want the coordinates for. +
+<tr><td></td><td valign="top"><em>x</em> </td><td> the x coordinates of the pixels are returned \
through this parameter +
+<tr><td></td><td valign="top"><em>y</em> </td><td> the y coordinate of the pixel is returned \
through this parameter +
+<tr><td></td><td valign="top"><em>pointRepeatNum</em> </td><td> the amount of times that a single \
geographical +point gets represented on the map
+
+<tr><td></td><td valign="top"><em>globeHidesPoint</em> </td><td> whether the point gets hidden on \
the far side of the earth +</td></tr>
+</table></dl>
+<p> <dl class="return" compact><dt><b>Returns:</b></dt><dd> true if the geographical coordinates are \
visible on the screen +</dd></dl> false if the geographical coordinates are not visible on the screen
+</p>
+<p>
+<dl class="see" compact><dt><b>See also:</b></dt><dd> ViewportParams
+</dd></dl>
+</p></div></div><a class="anchor" name="screenCoordinates"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname">bool screenCoordinates</td>
+<td>(</td>
+<td class="paramtype"> <em>self</em>, </td>
+<td class="paramname"></td>
+</tr><tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> </td> +<td \
class="paramname"><em>geopoint</em>, </td> +</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">float </td>
+<td class="paramname"><em>x</em>, </td>
+</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">float </td>
+<td class="paramname"><em>y</em>, </td>
+</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">bool </td>
+<td class="paramname"><em>globeHidesPoint</em></td>
+</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
+<div class="memdoc"><p>Get the coordinates of screen points for geographical coordinates in the map.
+</p>
+<p>
+</p><dl compact><dt><b>Parameters:</b></dt><dd>
+<table border="0" cellspacing="2" cellpadding="0">
+<tr><td></td><td valign="top"><em>coordinates</em> </td><td> the point on earth, including \
altitude, that we want the coordinates for. +
+<tr><td></td><td valign="top"><em>x</em> </td><td> the x coordinates of the pixels are returned \
through this parameter +
+<tr><td></td><td valign="top"><em>y</em> </td><td> the y coordinate of the pixel is returned \
through this parameter +
+<tr><td></td><td valign="top"><em>pointRepeatNum</em> </td><td> the amount of times that a single \
geographical +point gets represented on the map
+
+<tr><td></td><td valign="top"><em>globeHidesPoint</em> </td><td> whether the point gets hidden on \
the far side of the earth +</td></tr>
+</table></dl>
+<p> <dl class="return" compact><dt><b>Returns:</b></dt><dd> true if the geographical coordinates are \
visible on the screen +</dd></dl> false if the geographical coordinates are not visible on the screen
+</p>
+<p>
+<dl class="see" compact><dt><b>See also:</b></dt><dd> ViewportParams
+</dd></dl>
+</p></div></div><a class="anchor" name="screenCoordinates"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname">bool screenCoordinates</td>
+<td>(</td>
+<td class="paramtype"> <em>self</em>, </td>
+<td class="paramname"></td>
+</tr><tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> </td> +<td \
class="paramname"><em>geopoint</em>, </td> +</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">QPointF </td>
+<td class="paramname"><em>screenpoint</em></td>
+</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
+<div class="memdoc"><p>Get the coordinates of screen points for geographical coordinates in the map.
+</p>
+<p>
+</p><dl compact><dt><b>Parameters:</b></dt><dd>
+<table border="0" cellspacing="2" cellpadding="0">
+<tr><td></td><td valign="top"><em>coordinates</em> </td><td> the point on earth, including \
altitude, that we want the coordinates for. +
+<tr><td></td><td valign="top"><em>x</em> </td><td> the x coordinates of the pixels are returned \
through this parameter +
+<tr><td></td><td valign="top"><em>y</em> </td><td> the y coordinate of the pixel is returned \
through this parameter +
+<tr><td></td><td valign="top"><em>pointRepeatNum</em> </td><td> the amount of times that a single \
geographical +point gets represented on the map
+
+<tr><td></td><td valign="top"><em>globeHidesPoint</em> </td><td> whether the point gets hidden on \
the far side of the earth +</td></tr>
+</table></dl>
+<p> <dl class="return" compact><dt><b>Returns:</b></dt><dd> true if the geographical coordinates are \
visible on the screen +</dd></dl> false if the geographical coordinates are not visible on the screen
+</p>
+<p>
+<dl class="see" compact><dt><b>See also:</b></dt><dd> ViewportParams
+</dd></dl>
+</p></div></div><a class="anchor" name="screenCoordinates"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname">bool screenCoordinates</td>
+<td>(</td>
+<td class="paramtype"> <em>self</em>, </td>
+<td class="paramname"></td>
+</tr><tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> </td> +<td \
class="paramname"><em>geopoint</em>, </td> +</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">float </td>
+<td class="paramname"><em>x</em>, </td>
+</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">float </td>
+<td class="paramname"><em>y</em></td>
+</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
+<div class="memdoc"><p>Get the coordinates of screen points for geographical coordinates in the map.
+</p>
+<p>
+</p><dl compact><dt><b>Parameters:</b></dt><dd>
+<table border="0" cellspacing="2" cellpadding="0">
+<tr><td></td><td valign="top"><em>coordinates</em> </td><td> the point on earth, including \
altitude, that we want the coordinates for. +
+<tr><td></td><td valign="top"><em>x</em> </td><td> the x coordinates of the pixels are returned \
through this parameter +
+<tr><td></td><td valign="top"><em>y</em> </td><td> the y coordinate of the pixel is returned \
through this parameter +
+<tr><td></td><td valign="top"><em>pointRepeatNum</em> </td><td> the amount of times that a single \
geographical +point gets represented on the map
+
+<tr><td></td><td valign="top"><em>globeHidesPoint</em> </td><td> whether the point gets hidden on \
the far side of the earth +</td></tr>
+</table></dl>
+<p> <dl class="return" compact><dt><b>Returns:</b></dt><dd> true if the geographical coordinates are \
visible on the screen +</dd></dl> false if the geographical coordinates are not visible on the screen
+</p>
+<p>
+<dl class="see" compact><dt><b>See also:</b></dt><dd> ViewportParams
+</dd></dl>
+</p></div></div><a class="anchor" name="screenCoordinates"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname">bool screenCoordinates</td>
+<td>(</td>
+<td class="paramtype"> <em>self</em>, </td>
+<td class="paramname"></td>
+</tr><tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> </td> +<td \
class="paramname"><em>coordinates</em>, </td> +</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">float </td>
+<td class="paramname"><em>x</em>, </td>
+</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">float </td>
+<td class="paramname"><em>y</em>, </td>
+</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">int </td>
+<td class="paramname"><em>pointRepeatNum</em>, </td>
+</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">bool </td>
+<td class="paramname"><em>globeHidesPoint</em></td>
+</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
+<div class="memdoc"><p>Get the coordinates of screen points for geographical coordinates in the map.
+</p>
+<p>
+</p><dl compact><dt><b>Parameters:</b></dt><dd>
+<table border="0" cellspacing="2" cellpadding="0">
+<tr><td></td><td valign="top"><em>coordinates</em> </td><td> the point on earth, including \
altitude, that we want the coordinates for. +
+<tr><td></td><td valign="top"><em>x</em> </td><td> the x coordinates of the pixels are returned \
through this parameter +
+<tr><td></td><td valign="top"><em>y</em> </td><td> the y coordinate of the pixel is returned \
through this parameter +
+<tr><td></td><td valign="top"><em>pointRepeatNum</em> </td><td> the amount of times that a single \
geographical +point gets represented on the map
+
+<tr><td></td><td valign="top"><em>globeHidesPoint</em> </td><td> whether the point gets hidden on \
the far side of the earth +</td></tr>
+</table></dl>
+<p> <dl class="return" compact><dt><b>Returns:</b></dt><dd> true if the geographical coordinates are \
visible on the screen +</dd></dl> false if the geographical coordinates are not visible on the screen
+</p>
+<p>
+<dl class="see" compact><dt><b>See also:</b></dt><dd> ViewportParams
+</dd></dl>
+</p></div></div><a class="anchor" name="screenCoordinates"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname">bool screenCoordinates</td>
+<td>(</td>
+<td class="paramtype"> <em>self</em>, </td>
+<td class="paramname"></td>
+</tr><tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype"><a \
href="../marble/Marble.GeoDataCoordinates.html">Marble.GeoDataCoordinates</a> </td> +<td \
class="paramname"><em>coordinates</em>, </td> +</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">float </td>
+<td class="paramname"><em>x</em>, </td>
+</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">float </td>
+<td class="paramname"><em>y</em>, </td>
+</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">int </td>
+<td class="paramname"><em>pointRepeatNum</em>, </td>
+</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">QSizeF </td>
+<td class="paramname"><em>size</em>, </td>
+</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">bool </td>
+<td class="paramname"><em>globeHidesPoint</em></td>
+</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
+<div class="memdoc"><p>Get the coordinates of screen points for geographical coordinates in the map.
+</p>
+<p>
+</p><dl compact><dt><b>Parameters:</b></dt><dd>
+<table border="0" cellspacing="2" cellpadding="0">
+<tr><td></td><td valign="top"><em>coordinates</em> </td><td> the point on earth, including \
altitude, that we want the coordinates for. +
+<tr><td></td><td valign="top"><em>x</em> </td><td> the x coordinates of the pixels are returned \
through this parameter +
+<tr><td></td><td valign="top"><em>y</em> </td><td> the y coordinate of the pixel is returned \
through this parameter +
+<tr><td></td><td valign="top"><em>pointRepeatNum</em> </td><td> the amount of times that a single \
geographical +point gets represented on the map
+
+<tr><td></td><td valign="top"><em>globeHidesPoint</em> </td><td> whether the point gets hidden on \
the far side of the earth +</td></tr>
+</table></dl>
+<p> <dl class="return" compact><dt><b>Returns:</b></dt><dd> true if the geographical coordinates are \
visible on the screen +</dd></dl> false if the geographical coordinates are not visible on the screen
+</p>
+<p>
+<dl class="see" compact><dt><b>See also:</b></dt><dd> ViewportParams
+</dd></dl>
+</p></div></div><a class="anchor" name="screenCoordinates"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="memname"><tr>
+<td class="memname">bool screenCoordinates</td>
+<td>(</td>
+<td class="paramtype"> <em>self</em>, </td>
+<td class="paramname"></td>
+</tr><tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype"><a \
href="../marble/Marble.GeoDataLineString.html">Marble.GeoDataLineString</a> </td> +<td \
class="paramname"><em>lineString</em>, </td> +</tr>
+<tr>
+<td class="memname"></td>
+<td></td>
+<td class="paramtype">QVector<QPolygonF> </td>
+<td class="paramname"><em>polygons</em></td>
+</tr>
+<tr>
+<td></td>
+<td>)</td>
+<td></td>
+<td></td>
+<td width="100%"> </td>
+</tr></table>
+</div>
+<div class="memdoc"><p>Get the coordinates of screen points for geographical coordinates in the map.
+</p>
+<p>
+</p><dl compact><dt><b>Parameters:</b></dt><dd>
+<table border="0" cellspacing="2" cellpadding="0">
+<tr><td></td><td valign="top"><em>coordinates</em> </td><td> the point on earth, including \
altitude, that we want the coordinates for. +
+<tr><td></td><td valign="top"><em>x</em> </td><td> the x coordinates of the pixels are returned \
through this parameter +
+<tr><td></td><td valign="top"><em>y</em> </td><td> the y coordinate of the pixel is returned \
through this parameter +
+<tr><td></td><td valign="top"><em>pointRepeatNum</em> </td><td> the amount of times that a single \
geographical +point gets represented on the map
+
+<tr><td></td><td valign="top"><em>globeHidesPoint</em> </td><td> whether the point gets hidden on \
the far side of the earth +</td></tr>
+</table></dl>
+<p> <dl class="return" compact><dt><b>Returns:</b></dt><dd> true if the geographical coordinates are \
visible on the screen +</dd></dl> false if the geographical coordinates are not visible on the screen
+</p>
+<p>
+<dl class="see" compact><dt><b>See also:</b></dt><dd> ViewportParams
+</dd></dl>
+</p></div></div><a class="anchor" name="setFocusPoint"></a>
<div class="memitem">
<div class="memproto">
<table class="memname"><tr>
@@ -397,7 +973,7 @@ center point.
<table border="0" cellspacing="2" cellpadding="0">
<tr><td></td><td valign="top"><em>focusPoint</em> </td><td> New focus point
</td></tr> </table></dl>
-<p> <dl class="see" compact><dt><b>See also:</b></dt><dd> focusPoint resetFocusPoint focusPointIsCenter
+<p> <dl class="see" compact><dt><b>See also:</b></dt><dd> focusPoint resetFocusPoint
</dd></dl>
</p></div></div><a class="anchor" name="setHeight"></a>
<div class="memitem">
diff --git a/docs/bindings/python/html/marble/Marble.html b/docs/bindings/python/html/marble/Marble.html
index 75e8e03..cd569ff 100644
--- a/docs/bindings/python/html/marble/Marble.html
+++ b/docs/bindings/python/html/marble/Marble.html
@@ -49,59 +49,59 @@
<code>from PyKDE4.marble.Marble import *</code>
<p>
<h2>Detailed Description</h2>
-<p>
-This file contains the headers for ViewportParams.
-</p>
-<p>
-
-<dl class="author" compact><dt><b>Author:</b></dt><dd> Inge Wallin <inge@lysator.liu.se> \
</dd></dl> +<p>A QAbstractItemModel that contains a list of routing instructions.
+Each item represents a routing step in the way from source to
+destination. Steps near the source come first, steps near the target
+last.
</p>
<h2>Class Index</h2>
<table width="95%" align="center" border="0" cellpadding="0" cellspacing="0">
-<tbody><tr><td><a name="letter_A"> A </a></td><td><a class="el" \
href="Marble.GeoDataLinearRing.html">GeoDataLinearRing</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleGlobal.html">MarbleGlobal</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.AbstractDataPlugin.html">AbstractDataPlugin</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataLineString.html">GeoDataLineString</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleGraphicsGridLayout.html">MarbleGraphicsGridLayout</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.AbstractDataPluginItem.html">AbstractDataPluginItem</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataLineStyle.html">GeoDataLineStyle</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleGraphicsItem.html">MarbleGraphicsItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.AbstractDataPluginModel.html">AbstractDataPluginModel</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataLod.html">GeoDataLod</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleMap.html">MarbleMap</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.AbstractFloatItem.html">AbstractFloatItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataLookAt.html">GeoDataLookAt</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleModel.html">MarbleModel</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" \
href="Marble.AbstractMarbleGraphicsLayout.html">AbstractMarbleGraphicsLayout</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataMultiGeometry.html">GeoDataMultiGeometry</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleNavigator.html">MarbleNavigator</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.AbstractProjection.html">AbstractProjection</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataObject.html">GeoDataObject</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleRunnerManager.html">MarbleRunnerManager</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.AbstractWorkerThread.html">AbstractWorkerThread</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataOuterBoundary.html">GeoDataOuterBoundary</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleWidget.html">MarbleWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a name="letter_B"> B </a></td><td><a class="el" \
href="Marble.GeoDataPlacemark.html">GeoDataPlacemark</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_N"> N </a></td></tr>
-<tr><td><a class="el" href="Marble.BookmarkManager.html">BookmarkManager</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataPoint.html">GeoDataPoint</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.NavigationWidget.html">NavigationWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a name="letter_C"> C </a></td><td><a class="el" \
href="Marble.GeoDataPolygon.html">GeoDataPolygon</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_P"> P </a></td></tr>
-<tr><td><a class="el" href="Marble.ClipPainter.html">ClipPainter</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataPolyStyle.html">GeoDataPolyStyle</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.Planet.html">Planet</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.CurrentLocationWidget.html">CurrentLocationWidget</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataRegion.html">GeoDataRegion</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.PluginAboutDialog.html">PluginAboutDialog</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a name="letter_D"> D </a></td><td><a class="el" \
href="Marble.GeoDataStyle.html">GeoDataStyle</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.PluginInterface.html">PluginInterface</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.DownloadRegionDialog.html">DownloadRegionDialog</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataStyleMap.html">GeoDataStyleMap</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.PositionTracking.html">PositionTracking</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a name="letter_E"> E </a></td><td><a class="el" \
href="Marble.GeoDataStyleSelector.html">GeoDataStyleSelector</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_Q"> Q </a></td></tr>
-<tr><td><a class="el" href="Marble.ElevationModel.html">ElevationModel</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDocument.html">GeoDocument</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.QtMarbleConfigDialog.html">QtMarbleConfigDialog</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a name="letter_F"> F </a></td><td><a class="el" \
href="Marble.GeoGraphicsItem.html">GeoGraphicsItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.Quaternion.html">Quaternion</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.FileViewWidget.html">FileViewWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoGraphicsScene.html">GeoGraphicsScene</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.Quaternion.html">Quaternion</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.FrameGraphicsItem.html">FrameGraphicsItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoNode.html">GeoNode</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_R"> R </a></td></tr>
-<tr><td><a name="letter_G"> G </a></td><td><a class="el" \
href="Marble.GeoPainter.html">GeoPainter</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.RenderPlugin.html">RenderPlugin</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.GeoDataAbstractView.html">GeoDataAbstractView</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoSceneLayer.html">GeoSceneLayer</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.RenderPluginInterface.html">RenderPluginInterface</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.GeoDataAccuracy.html">GeoDataAccuracy</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_L"> L </a></td><td><a class="el" \
href="Marble.RunnerPlugin.html">RunnerPlugin</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.GeoDataColorStyle.html">GeoDataColorStyle</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.LabelGraphicsItem.html">LabelGraphicsItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_S"> S </a></td></tr>
-<tr><td><a class="el" href="Marble.GeoDataContainer.html">GeoDataContainer</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.LatLonBoxWidget.html">LatLonBoxWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.ScreenGraphicsItem.html">ScreenGraphicsItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.GeoDataCoordinates.html">GeoDataCoordinates</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.LatLonEdit.html">LatLonEdit</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.SunLocator.html">SunLocator</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.GeoDataDocument.html">GeoDataDocument</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.LayerInterface.html">LayerInterface</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_T"> T </a></td></tr>
-<tr><td><a class="el" href="Marble.GeoDataFeature.html">GeoDataFeature</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.LegendWidget.html">LegendWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.TileCoordsPyramid.html">TileCoordsPyramid</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.GeoDataFolder.html">GeoDataFolder</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_M"> M </a></td><td><a class="el" \
href="Marble.TileCreator.html">TileCreator</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.GeoDataGeometry.html">GeoDataGeometry</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MapThemeManager.html">MapThemeManager</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.TileCreatorSource.html">TileCreatorSource</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.GeoDataHotSpot.html">GeoDataHotSpot</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MapViewWidget.html">MapViewWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.TileLevelRangeWidget.html">TileLevelRangeWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.GeoDataIconStyle.html">GeoDataIconStyle</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MapWizard.html">MapWizard</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.TinyWebBrowser.html">TinyWebBrowser</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.GeoDataInnerBoundary.html">GeoDataInnerBoundary</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleAboutDialog.html">MarbleAboutDialog</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_V"> V </a></td></tr>
-<tr><td><a class="el" href="Marble.GeoDataLabelStyle.html">GeoDataLabelStyle</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleAbstractRunner.html">MarbleAbstractRunner</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.ViewportParams.html">ViewportParams</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.GeoDataLatLonAltBox.html">GeoDataLatLonAltBox</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleControlBox.html">MarbleControlBox</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_W"> W </a></td></tr>
-<tr><td><a class="el" href="Marble.GeoDataLatLonBox.html">GeoDataLatLonBox</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleDirs.html">MarbleDirs</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.WidgetGraphicsItem.html">WidgetGraphicsItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tbody><tr><td><a \
name="letter_A"> A </a></td><td><a class="el" \
href="Marble.GeoDataLineStyle.html">GeoDataLineStyle</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleModel.html">MarbleModel</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.AbstractDataPlugin.html">AbstractDataPlugin</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataLod.html">GeoDataLod</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleNavigator.html">MarbleNavigator</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.AbstractDataPluginItem.html">AbstractDataPluginItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataLookAt.html">GeoDataLookAt</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleRunnerManager.html">MarbleRunnerManager</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.AbstractDataPluginModel.html">AbstractDataPluginModel</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataMultiGeometry.html">GeoDataMultiGeometry</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleWidget.html">MarbleWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.AbstractFloatItem.html">AbstractFloatItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataObject.html">GeoDataObject</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_N"> N </a></td></tr> +<tr><td><a class="el" \
href="Marble.AbstractMarbleGraphicsLayout.html">AbstractMarbleGraphicsLayout</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataOuterBoundary.html">GeoDataOuterBoundary</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.NavigationWidget.html">NavigationWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.AbstractProjection.html">AbstractProjection</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataPlacemark.html">GeoDataPlacemark</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_P"> P </a></td></tr> +<tr><td><a class="el" \
href="Marble.AbstractWorkerThread.html">AbstractWorkerThread</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataPoint.html">GeoDataPoint</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.Planet.html">Planet</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.AlternativeRoutesModel.html">AlternativeRoutesModel</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataPolygon.html">GeoDataPolygon</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.PluginAboutDialog.html">PluginAboutDialog</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a \
name="letter_B"> B </a></td><td><a class="el" \
href="Marble.GeoDataPolyStyle.html">GeoDataPolyStyle</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.PluginInterface.html">PluginInterface</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.BookmarkManager.html">BookmarkManager</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataRegion.html">GeoDataRegion</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.PositionTracking.html">PositionTracking</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a \
name="letter_C"> C </a></td><td><a class="el" \
href="Marble.GeoDataStyle.html">GeoDataStyle</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_Q"> Q </a></td></tr> +<tr><td><a class="el" \
href="Marble.ClipPainter.html">ClipPainter</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataStyleMap.html">GeoDataStyleMap</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.QtMarbleConfigDialog.html">QtMarbleConfigDialog</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.CurrentLocationWidget.html">CurrentLocationWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataStyleSelector.html">GeoDataStyleSelector</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.Quaternion.html">Quaternion</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a \
name="letter_D"> D </a></td><td><a class="el" \
href="Marble.GeoDocument.html">GeoDocument</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.Quaternion.html">Quaternion</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.DownloadRegionDialog.html">DownloadRegionDialog</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoGraphicsItem.html">GeoGraphicsItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_R"> R </a></td></tr> +<tr><td><a \
name="letter_E"> E </a></td><td><a class="el" \
href="Marble.GeoGraphicsScene.html">GeoGraphicsScene</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.RenderPlugin.html">RenderPlugin</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.ElevationModel.html">ElevationModel</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoNode.html">GeoNode</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.RenderPluginInterface.html">RenderPluginInterface</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a \
name="letter_F"> F </a></td><td><a class="el" \
href="Marble.GeoPainter.html">GeoPainter</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.Route.html">Route</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.FileViewWidget.html">FileViewWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoSceneLayer.html">GeoSceneLayer</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.RouteRequest.html">RouteRequest</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.FrameGraphicsItem.html">FrameGraphicsItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_L"> L </a></td><td><a class="el" \
href="Marble.RouteSegment.html">RouteSegment</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a \
name="letter_G"> G </a></td><td><a class="el" \
href="Marble.LabelGraphicsItem.html">LabelGraphicsItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.RoutingModel.html">RoutingModel</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.GeoDataAbstractView.html">GeoDataAbstractView</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.LatLonBoxWidget.html">LatLonBoxWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.RoutingProfile.html">RoutingProfile</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.GeoDataAccuracy.html">GeoDataAccuracy</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.LatLonEdit.html">LatLonEdit</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.RunnerPlugin.html">RunnerPlugin</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.GeoDataColorStyle.html">GeoDataColorStyle</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.LayerInterface.html">LayerInterface</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_S"> S </a></td></tr> +<tr><td><a class="el" \
href="Marble.GeoDataContainer.html">GeoDataContainer</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.LegendWidget.html">LegendWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.ScreenGraphicsItem.html">ScreenGraphicsItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.GeoDataCoordinates.html">GeoDataCoordinates</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_M"> M </a></td><td><a class="el" \
href="Marble.SunLocator.html">SunLocator</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.GeoDataDocument.html">GeoDataDocument</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.Maneuver.html">Maneuver</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_T"> T </a></td></tr> +<tr><td><a class="el" \
href="Marble.GeoDataFeature.html">GeoDataFeature</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MapThemeManager.html">MapThemeManager</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.TileCoordsPyramid.html">TileCoordsPyramid</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.GeoDataFolder.html">GeoDataFolder</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MapViewWidget.html">MapViewWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.TileCreator.html">TileCreator</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.GeoDataGeometry.html">GeoDataGeometry</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MapWizard.html">MapWizard</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.TileCreatorSource.html">TileCreatorSource</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.GeoDataHotSpot.html">GeoDataHotSpot</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleAboutDialog.html">MarbleAboutDialog</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.TileLevelRangeWidget.html">TileLevelRangeWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.GeoDataIconStyle.html">GeoDataIconStyle</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleAbstractRunner.html">MarbleAbstractRunner</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.TinyWebBrowser.html">TinyWebBrowser</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.GeoDataInnerBoundary.html">GeoDataInnerBoundary</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleControlBox.html">MarbleControlBox</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_V"> V </a></td></tr> +<tr><td><a class="el" \
href="Marble.GeoDataLabelStyle.html">GeoDataLabelStyle</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleDirs.html">MarbleDirs</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.ViewportParams.html">ViewportParams</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.GeoDataLatLonAltBox.html">GeoDataLatLonAltBox</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
+<tr><td><a class="el" href="Marble.GeoDataLatLonBox.html">GeoDataLatLonBox</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleGraphicsGridLayout.html">MarbleGraphicsGridLayout</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.WidgetGraphicsItem.html">WidgetGraphicsItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.GeoDataLinearRing.html">GeoDataLinearRing</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleGraphicsItem.html">MarbleGraphicsItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td></td></tr> +<tr><td><a class="el" \
href="Marble.GeoDataLineString.html">GeoDataLineString</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleMap.html">MarbleMap</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td></td></tr> </table>
<table border="0" cellpadding="0" cellspacing="0"><tr><td \
colspan="2"><br><h2>Enumerations</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" \
href="#obj224846316"><anonymous></a> </td><td class="memItemRight" valign="bottom">{ Q_X, \
Q_Y, Q_Z, Q_W }</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" \
href="#obj224863084"><anonymous></a> </td><td class="memItemRight" valign="bottom">{ Q_X, \
Q_Y, Q_Z, Q_W }</td></tr> +<tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
class="el" href="#obj256204748"><anonymous></a> </td><td class="memItemRight" \
valign="bottom">{ Q_X, Q_Y, Q_Z, Q_W }</td></tr> +<tr><td class="memItemLeft" nowrap \
align="right" valign="top"><a class="el" href="#obj256242028"><anonymous></a> </td><td \
class="memItemRight" valign="bottom">{ Q_X, Q_Y, Q_Z, Q_W }</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"><a class="el" \
href="#AltitudeMode">AltitudeMode</a> </td><td class="memItemRight" \
valign="bottom">{ ClampToGround, RelativeToGround, Absolute }</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"><a class="el" \
href="#AngleUnit">AngleUnit</a> </td><td class="memItemRight" valign="bottom">{ DMSDegree, \
DecimalDegree, UTM }</td></tr> <tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
class="el" href="#Dimension">Dimension</a> </td><td class="memItemRight" \
valign="bottom">{ Latitude, Longitude }</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" \
href="#DistanceUnit">DistanceUnit</a> </td><td class="memItemRight" \
valign="bottom">{ NoDistanceUnit, Meter, MilesFeet }</td></tr> <tr><td class="memItemLeft" \
nowrap align="right" valign="top"><a class="el" href="#DocumentRole">DocumentRole</a> </td><td \
class="memItemRight" valign="bottom">{ UnknownDocument, MapDocument, UserDocument, TrackingDocument, \
BookmarkDocument, SearchResultDocument }</td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"><a class="el" href="#DownloadUsage">DownloadUsage</a> </td><td class="memItemRight" \
valign="bottom">{ DownloadBulk, DownloadBrowse }</td></tr> <tr><td class="memItemLeft" nowrap \
align="right" valign="top"><a class="el" href="#DragLocation">DragLocation</a> </td><td \
class="memItemRight" valign="bottom">{ KeepAxisVertically, FollowMousePointer }</td></tr> @@ \
-110,7 +110,6 @@ This file contains the headers for ViewportParams. <tr><td class="memItemLeft" nowrap \
align="right" valign="top"><a class="el" href="#LabelLocalization">LabelLocalization</a> </td><td \
class="memItemRight" valign="bottom">{ CustomAndNative, Custom, Native }</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"><a class="el" \
href="#LabelPositionFlag">LabelPositionFlag</a> </td><td class="memItemRight" \
valign="bottom">{ NoLabel, LineStart, LineCenter, LineEnd, IgnoreXMargin, \
IgnoreYMargin }</td></tr> <tr><td class="memItemLeft" nowrap align="right" valign="top"><a \
class="el" href="#MapQuality">MapQuality</a> </td><td class="memItemRight" \
valign="bottom">{ OutlineQuality, LowQuality, NormalQuality, HighQuality, \
PrintQuality }</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" \
href="#MeasureSystem">MeasureSystem</a> </td><td class="memItemRight" valign="bottom">{ Metric, \
Imperial }</td></tr> <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" \
href="#OnStartup">OnStartup</a> </td><td class="memItemRight" \
valign="bottom">{ ShowHomeLocation, LastLocationVisited }</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="#Pole">Pole</a> </td><td \
class="memItemRight" valign="bottom">{ AnyPole, NorthPole, SouthPole }</td></tr> <tr><td \
class="memItemLeft" nowrap align="right" valign="top"><a class="el" \
href="#Projection">Projection</a> </td><td class="memItemRight" valign="bottom">{ Spherical, \
Equirectangular, Mercator }</td></tr> @@ -121,7 +120,7 @@ This file contains the headers for \
ViewportParams. <tr><td class="memItemLeft" nowrap align="right" valign="top">bool </td><td \
class="memItemRight" valign="bottom"><a class="el" href="#operator ==">operator ==</a> (<a \
href="../marble/Marble.GeoDataLatLonAltBox.html">Marble.GeoDataLatLonAltBox</a> lhs, <a \
href="../marble/Marble.GeoDataLatLonAltBox.html">Marble.GeoDataLatLonAltBox</a> rhs)</td></tr> <tr><td \
colspan="2"><br><h2>Attributes</h2></td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#varlatLonAltBoxSamplingRate">latLonAltBoxSamplingRate</a></td></tr><tr><td class="memItemLeft" \
nowrap align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" \
href="#vartessellationPrecision">tessellationPrecision</a></td></tr></table>
-<hr><h2>Enumeration Documentation</h2><a class="anchor" name="obj224846316"></a>
+<hr><h2>Enumeration Documentation</h2><a class="anchor" name="obj256204748"></a>
<div class="memitem">
<div class="memproto">
<table class="memname">
@@ -132,7 +131,7 @@ This file contains the headers for ViewportParams.
<div class="memdoc"><dl compact><dt><b>Enumerator: </b></dt><dd>
<table border="0" cellspacing="2" cellpadding="0"><tr><td \
valign="top"><em>Q_X</em> </td><td><tr><td valign="top"><em>Q_Y</em> </td><td><tr><td \
valign="top"><em>Q_Z</em> </td><td><tr><td valign="top"><em>Q_W</em> </td><td></table> </dl>
-</div></div><p><a class="anchor" name="obj224863084"></a>
+</div></div><p><a class="anchor" name="obj256242028"></a>
<div class="memitem">
<div class="memproto">
<table class="memname">
@@ -178,18 +177,6 @@ This file contains the headers for ViewportParams.
</p><dl compact><dt><b>Enumerator: </b></dt><dd>
<table border="0" cellspacing="2" cellpadding="0"><tr><td \
valign="top"><em>Latitude</em> </td><td><tr><td \
valign="top"><em>Longitude</em> </td><td></table> </dl>
-</div></div><p><a class="anchor" name="DistanceUnit"></a>
-<div class="memitem">
-<div class="memproto">
-<table class="memname">
-<tr><td class="memname">DistanceUnit</td>
-</tr>
-</table>
-</div>
-<div class="memdoc"><p>This enum is used to choose the unit chosen to measure distances.
-</p><dl compact><dt><b>Enumerator: </b></dt><dd>
-<table border="0" cellspacing="2" cellpadding="0"><tr><td \
valign="top"><em>NoDistanceUnit</em> = -1</td><td><tr><td \
valign="top"><em>Meter</em> </td><td><tr><td \
valign="top"><em>MilesFeet</em> </td><td></table>
-</dl>
</div></div><p><a class="anchor" name="DocumentRole"></a>
<div class="memitem">
<div class="memproto">
@@ -286,18 +273,6 @@ and target camera positions)
</p><dl compact><dt><b>Enumerator: </b></dt><dd>
<table border="0" cellspacing="2" cellpadding="0"><tr><td \
valign="top"><em>OutlineQuality</em> </td><td><tr><td \
valign="top"><em>LowQuality</em> </td><td><tr><td \
valign="top"><em>NormalQuality</em> </td><td><tr><td \
valign="top"><em>HighQuality</em> </td><td><tr><td \
valign="top"><em>PrintQuality</em> </td><td></table> </dl>
-</div></div><p><a class="anchor" name="MeasureSystem"></a>
-<div class="memitem">
-<div class="memproto">
-<table class="memname">
-<tr><td class="memname">MeasureSystem</td>
-</tr>
-</table>
-</div>
-<div class="memdoc"><p>This enum is used to choose the default for many units in marble.
-</p><dl compact><dt><b>Enumerator: </b></dt><dd>
-<table border="0" cellspacing="2" cellpadding="0"><tr><td \
valign="top"><em>Metric</em> </td><td><tr><td \
valign="top"><em>Imperial</em> </td><td></table>
-</dl>
</div></div><p><a class="anchor" name="OnStartup"></a>
<div class="memitem">
<div class="memproto">
diff --git a/docs/bindings/python/html/marble/Serializable.html \
b/docs/bindings/python/html/marble/Serializable.html index ebf8814..1fa1fc7 100644
--- a/docs/bindings/python/html/marble/Serializable.html
+++ b/docs/bindings/python/html/marble/Serializable.html
@@ -49,7 +49,7 @@
<code>from PyKDE4.marble import *</code>
<p>
-Subclasses: <a href="../marble/Marble.GeoDataObject.html">Marble.GeoDataObject</a><br />
+
<h2>Detailed Description</h2>
diff --git a/docs/bindings/python/html/marble/global.html b/docs/bindings/python/html/marble/global.html
index 0c407e2..07f2ddf 100644
--- a/docs/bindings/python/html/marble/global.html
+++ b/docs/bindings/python/html/marble/global.html
@@ -52,43 +52,45 @@
<h2>Class Index</h2>
<table width="95%" align="center" border="0" cellpadding="0" cellspacing="0">
-<tbody><tr><td><a name="letter_A"> A </a></td><td><a class="el" \
href="Marble.GeoDataLineString.html">GeoDataLineString</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleGraphicsItem.html">MarbleGraphicsItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.AbstractDataPlugin.html">AbstractDataPlugin</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataLineStyle.html">GeoDataLineStyle</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleMap.html">MarbleMap</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.AbstractDataPluginItem.html">AbstractDataPluginItem</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataLod.html">GeoDataLod</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleModel.html">MarbleModel</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.AbstractDataPluginModel.html">AbstractDataPluginModel</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataLookAt.html">GeoDataLookAt</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleNavigator.html">MarbleNavigator</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.AbstractFloatItem.html">AbstractFloatItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataMultiGeometry.html">GeoDataMultiGeometry</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleRunnerManager.html">MarbleRunnerManager</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" \
href="Marble.AbstractMarbleGraphicsLayout.html">AbstractMarbleGraphicsLayout</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataObject.html">GeoDataObject</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleWidget.html">MarbleWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.AbstractProjection.html">AbstractProjection</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataOuterBoundary.html">GeoDataOuterBoundary</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_N"> N </a></td></tr>
-<tr><td><a class="el" href="Marble.AbstractWorkerThread.html">AbstractWorkerThread</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataPlacemark.html">GeoDataPlacemark</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.NavigationWidget.html">NavigationWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a name="letter_B"> B </a></td><td><a class="el" \
href="Marble.GeoDataPoint.html">GeoDataPoint</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_P"> P </a></td></tr>
-<tr><td><a class="el" href="Marble.BookmarkManager.html">BookmarkManager</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataPolygon.html">GeoDataPolygon</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.Planet.html">Planet</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a name="letter_C"> C </a></td><td><a class="el" \
href="Marble.GeoDataPolyStyle.html">GeoDataPolyStyle</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.PluginAboutDialog.html">PluginAboutDialog</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.ClipPainter.html">ClipPainter</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataRegion.html">GeoDataRegion</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.PluginInterface.html">PluginInterface</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.CurrentLocationWidget.html">CurrentLocationWidget</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataStyle.html">GeoDataStyle</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.PositionTracking.html">PositionTracking</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a name="letter_D"> D </a></td><td><a class="el" \
href="Marble.GeoDataStyleMap.html">GeoDataStyleMap</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_Q"> Q </a></td></tr>
-<tr><td><a class="el" href="Marble.DownloadRegionDialog.html">DownloadRegionDialog</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataStyleSelector.html">GeoDataStyleSelector</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.QtMarbleConfigDialog.html">QtMarbleConfigDialog</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a name="letter_E"> E </a></td><td><a class="el" \
href="Marble.GeoDocument.html">GeoDocument</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.Quaternion.html">Quaternion</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.ElevationModel.html">ElevationModel</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoGraphicsItem.html">GeoGraphicsItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.Quaternion.html">Quaternion</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a name="letter_F"> F </a></td><td><a class="el" \
href="Marble.GeoGraphicsScene.html">GeoGraphicsScene</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_R"> R </a></td></tr>
-<tr><td><a class="el" href="Marble.FileViewWidget.html">FileViewWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoNode.html">GeoNode</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.RenderPlugin.html">RenderPlugin</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.FrameGraphicsItem.html">FrameGraphicsItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoPainter.html">GeoPainter</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.RenderPluginInterface.html">RenderPluginInterface</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a name="letter_G"> G </a></td><td><a class="el" \
href="Marble.GeoSceneLayer.html">GeoSceneLayer</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.RunnerPlugin.html">RunnerPlugin</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.GeoDataAbstractView.html">GeoDataAbstractView</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_L"> L </a></td><td><a \
name="letter_S"> S </a></td></tr>
-<tr><td><a class="el" href="Marble.GeoDataAccuracy.html">GeoDataAccuracy</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.LabelGraphicsItem.html">LabelGraphicsItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.ScreenGraphicsItem.html">ScreenGraphicsItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.GeoDataColorStyle.html">GeoDataColorStyle</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.LatLonBoxWidget.html">LatLonBoxWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Serializable.html">Serializable</a> </td></tr>
-<tr><td><a class="el" href="Marble.GeoDataContainer.html">GeoDataContainer</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.LatLonEdit.html">LatLonEdit</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.SunLocator.html">SunLocator</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.GeoDataCoordinates.html">GeoDataCoordinates</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.LayerInterface.html">LayerInterface</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_T"> T </a></td></tr>
-<tr><td><a class="el" href="Marble.GeoDataDocument.html">GeoDataDocument</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.LegendWidget.html">LegendWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.TileCoordsPyramid.html">TileCoordsPyramid</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.GeoDataFeature.html">GeoDataFeature</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_M"> M </a></td><td><a class="el" \
href="Marble.TileCreator.html">TileCreator</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.GeoDataFolder.html">GeoDataFolder</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MapThemeManager.html">MapThemeManager</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.TileCreatorSource.html">TileCreatorSource</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.GeoDataGeometry.html">GeoDataGeometry</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MapViewWidget.html">MapViewWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.TileLevelRangeWidget.html">TileLevelRangeWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.GeoDataHotSpot.html">GeoDataHotSpot</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MapWizard.html">MapWizard</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.TinyWebBrowser.html">TinyWebBrowser</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.GeoDataIconStyle.html">GeoDataIconStyle</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleAboutDialog.html">MarbleAboutDialog</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_V"> V </a></td></tr>
-<tr><td><a class="el" href="Marble.GeoDataInnerBoundary.html">GeoDataInnerBoundary</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleAbstractRunner.html">MarbleAbstractRunner</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.ViewportParams.html">ViewportParams</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.GeoDataLabelStyle.html">GeoDataLabelStyle</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleControlBox.html">MarbleControlBox</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_W"> W </a></td></tr>
-<tr><td><a class="el" href="Marble.GeoDataLatLonAltBox.html">GeoDataLatLonAltBox</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleDirs.html">MarbleDirs</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.WidgetGraphicsItem.html">WidgetGraphicsItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.GeoDataLatLonBox.html">GeoDataLatLonBox</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleGlobal.html">MarbleGlobal</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td></td></tr>
-<tr><td><a class="el" href="Marble.GeoDataLinearRing.html">GeoDataLinearRing</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleGraphicsGridLayout.html">MarbleGraphicsGridLayout</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td></td></tr> +<tbody><tr><td><a \
name="letter_A"> A </a></td><td><a class="el" \
href="Marble.GeoDataLineStyle.html">GeoDataLineStyle</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleModel.html">MarbleModel</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.AbstractDataPlugin.html">AbstractDataPlugin</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataLod.html">GeoDataLod</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleNavigator.html">MarbleNavigator</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.AbstractDataPluginItem.html">AbstractDataPluginItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataLookAt.html">GeoDataLookAt</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleRunnerManager.html">MarbleRunnerManager</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.AbstractDataPluginModel.html">AbstractDataPluginModel</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataMultiGeometry.html">GeoDataMultiGeometry</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleWidget.html">MarbleWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.AbstractFloatItem.html">AbstractFloatItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataObject.html">GeoDataObject</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_N"> N </a></td></tr> +<tr><td><a class="el" \
href="Marble.AbstractMarbleGraphicsLayout.html">AbstractMarbleGraphicsLayout</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataOuterBoundary.html">GeoDataOuterBoundary</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.NavigationWidget.html">NavigationWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.AbstractProjection.html">AbstractProjection</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataPlacemark.html">GeoDataPlacemark</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_P"> P </a></td></tr> +<tr><td><a class="el" \
href="Marble.AbstractWorkerThread.html">AbstractWorkerThread</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataPoint.html">GeoDataPoint</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.Planet.html">Planet</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.AlternativeRoutesModel.html">AlternativeRoutesModel</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataPolygon.html">GeoDataPolygon</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.PluginAboutDialog.html">PluginAboutDialog</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a \
name="letter_B"> B </a></td><td><a class="el" \
href="Marble.GeoDataPolyStyle.html">GeoDataPolyStyle</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.PluginInterface.html">PluginInterface</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.BookmarkManager.html">BookmarkManager</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataRegion.html">GeoDataRegion</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.PositionTracking.html">PositionTracking</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a \
name="letter_C"> C </a></td><td><a class="el" \
href="Marble.GeoDataStyle.html">GeoDataStyle</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_Q"> Q </a></td></tr> +<tr><td><a class="el" \
href="Marble.ClipPainter.html">ClipPainter</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataStyleMap.html">GeoDataStyleMap</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.QtMarbleConfigDialog.html">QtMarbleConfigDialog</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.CurrentLocationWidget.html">CurrentLocationWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataStyleSelector.html">GeoDataStyleSelector</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.Quaternion.html">Quaternion</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a \
name="letter_D"> D </a></td><td><a class="el" \
href="Marble.GeoDocument.html">GeoDocument</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.Quaternion.html">Quaternion</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.DownloadRegionDialog.html">DownloadRegionDialog</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoGraphicsItem.html">GeoGraphicsItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_R"> R </a></td></tr> +<tr><td><a \
name="letter_E"> E </a></td><td><a class="el" \
href="Marble.GeoGraphicsScene.html">GeoGraphicsScene</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.RenderPlugin.html">RenderPlugin</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.ElevationModel.html">ElevationModel</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoNode.html">GeoNode</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.RenderPluginInterface.html">RenderPluginInterface</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a \
name="letter_F"> F </a></td><td><a class="el" \
href="Marble.GeoPainter.html">GeoPainter</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.Route.html">Route</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.FileViewWidget.html">FileViewWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoSceneLayer.html">GeoSceneLayer</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.RouteRequest.html">RouteRequest</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.FrameGraphicsItem.html">FrameGraphicsItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_L"> L </a></td><td><a class="el" \
href="Marble.RouteSegment.html">RouteSegment</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a \
name="letter_G"> G </a></td><td><a class="el" \
href="Marble.LabelGraphicsItem.html">LabelGraphicsItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.RoutingModel.html">RoutingModel</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.GeoDataAbstractView.html">GeoDataAbstractView</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.LatLonBoxWidget.html">LatLonBoxWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.RoutingProfile.html">RoutingProfile</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.GeoDataAccuracy.html">GeoDataAccuracy</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.LatLonEdit.html">LatLonEdit</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.RunnerPlugin.html">RunnerPlugin</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.GeoDataColorStyle.html">GeoDataColorStyle</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.LayerInterface.html">LayerInterface</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_S"> S </a></td></tr> +<tr><td><a class="el" \
href="Marble.GeoDataContainer.html">GeoDataContainer</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.LegendWidget.html">LegendWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.ScreenGraphicsItem.html">ScreenGraphicsItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.GeoDataCoordinates.html">GeoDataCoordinates</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_M"> M </a></td><td><a class="el" \
href="Serializable.html">Serializable</a> </td></tr> +<tr><td><a class="el" \
href="Marble.GeoDataDocument.html">GeoDataDocument</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.Maneuver.html">Maneuver</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.SunLocator.html">SunLocator</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.GeoDataFeature.html">GeoDataFeature</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MapThemeManager.html">MapThemeManager</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_T"> T </a></td></tr> +<tr><td><a class="el" \
href="Marble.GeoDataFolder.html">GeoDataFolder</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MapViewWidget.html">MapViewWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.TileCoordsPyramid.html">TileCoordsPyramid</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.GeoDataGeometry.html">GeoDataGeometry</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MapWizard.html">MapWizard</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.TileCreator.html">TileCreator</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.GeoDataHotSpot.html">GeoDataHotSpot</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleAboutDialog.html">MarbleAboutDialog</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.TileCreatorSource.html">TileCreatorSource</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.GeoDataIconStyle.html">GeoDataIconStyle</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleAbstractRunner.html">MarbleAbstractRunner</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.TileLevelRangeWidget.html">TileLevelRangeWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.GeoDataInnerBoundary.html">GeoDataInnerBoundary</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleControlBox.html">MarbleControlBox</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.TinyWebBrowser.html">TinyWebBrowser</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.GeoDataLabelStyle.html">GeoDataLabelStyle</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleDirs.html">MarbleDirs</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_V"> V </a></td></tr> +<tr><td><a class="el" \
href="Marble.GeoDataLatLonAltBox.html">GeoDataLatLonAltBox</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleGlobal.html">MarbleGlobal</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.ViewportParams.html">ViewportParams</a> (<a class="el" \
+<tr><td><a class="el" href="Marble.GeoDataLinearRing.html">GeoDataLinearRing</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleGraphicsItem.html">MarbleGraphicsItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.WidgetGraphicsItem.html">WidgetGraphicsItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.GeoDataLineString.html">GeoDataLineString</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleMap.html">MarbleMap</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td></td></tr> </table>
<table border="0" cellpadding="0" cellspacing="0"><tr><td \
colspan="2"><br><h2>Enumerations</h2></td></tr> <tr><td class="memItemLeft" nowrap align="right" \
valign="top"><a class="el" href="#EnumFeatureId">EnumFeatureId</a> </td><td class="memItemRight" \
valign="bottom">{ InvalidFeatureId, GeoDataDocumentId, GeoDataFolderId, GeoDataPlacemarkId, \
GeoDataNetworkLinkId, GeoDataScreenOverlayId, GeoDataGroundOverlayId }</td></tr>
diff --git a/docs/bindings/python/html/marble/index.html b/docs/bindings/python/html/marble/index.html
index 3c97cc0..669b092 100644
--- a/docs/bindings/python/html/marble/index.html
+++ b/docs/bindings/python/html/marble/index.html
@@ -114,43 +114,45 @@ theming, searching and other advanced controls are not needed.
</table>
<h2>Class Index</h2>
<table width="95%" align="center" border="0" cellpadding="0" cellspacing="0">
-<tbody><tr><td><a name="letter_A"> A </a></td><td><a class="el" \
href="Marble.GeoDataLineString.html">GeoDataLineString</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleGraphicsItem.html">MarbleGraphicsItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.AbstractDataPlugin.html">AbstractDataPlugin</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataLineStyle.html">GeoDataLineStyle</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleMap.html">MarbleMap</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.AbstractDataPluginItem.html">AbstractDataPluginItem</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataLod.html">GeoDataLod</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleModel.html">MarbleModel</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.AbstractDataPluginModel.html">AbstractDataPluginModel</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataLookAt.html">GeoDataLookAt</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleNavigator.html">MarbleNavigator</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.AbstractFloatItem.html">AbstractFloatItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataMultiGeometry.html">GeoDataMultiGeometry</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleRunnerManager.html">MarbleRunnerManager</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" \
href="Marble.AbstractMarbleGraphicsLayout.html">AbstractMarbleGraphicsLayout</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataObject.html">GeoDataObject</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleWidget.html">MarbleWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.AbstractProjection.html">AbstractProjection</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataOuterBoundary.html">GeoDataOuterBoundary</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_N"> N </a></td></tr>
-<tr><td><a class="el" href="Marble.AbstractWorkerThread.html">AbstractWorkerThread</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataPlacemark.html">GeoDataPlacemark</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.NavigationWidget.html">NavigationWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a name="letter_B"> B </a></td><td><a class="el" \
href="Marble.GeoDataPoint.html">GeoDataPoint</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_P"> P </a></td></tr>
-<tr><td><a class="el" href="Marble.BookmarkManager.html">BookmarkManager</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataPolygon.html">GeoDataPolygon</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.Planet.html">Planet</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a name="letter_C"> C </a></td><td><a class="el" \
href="Marble.GeoDataPolyStyle.html">GeoDataPolyStyle</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.PluginAboutDialog.html">PluginAboutDialog</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.ClipPainter.html">ClipPainter</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataRegion.html">GeoDataRegion</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.PluginInterface.html">PluginInterface</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.CurrentLocationWidget.html">CurrentLocationWidget</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataStyle.html">GeoDataStyle</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.PositionTracking.html">PositionTracking</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a name="letter_D"> D </a></td><td><a class="el" \
href="Marble.GeoDataStyleMap.html">GeoDataStyleMap</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_Q"> Q </a></td></tr>
-<tr><td><a class="el" href="Marble.DownloadRegionDialog.html">DownloadRegionDialog</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataStyleSelector.html">GeoDataStyleSelector</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.QtMarbleConfigDialog.html">QtMarbleConfigDialog</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a name="letter_E"> E </a></td><td><a class="el" \
href="Marble.GeoDocument.html">GeoDocument</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.Quaternion.html">Quaternion</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.ElevationModel.html">ElevationModel</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoGraphicsItem.html">GeoGraphicsItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.Quaternion.html">Quaternion</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a name="letter_F"> F </a></td><td><a class="el" \
href="Marble.GeoGraphicsScene.html">GeoGraphicsScene</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_R"> R </a></td></tr>
-<tr><td><a class="el" href="Marble.FileViewWidget.html">FileViewWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoNode.html">GeoNode</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.RenderPlugin.html">RenderPlugin</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.FrameGraphicsItem.html">FrameGraphicsItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoPainter.html">GeoPainter</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.RenderPluginInterface.html">RenderPluginInterface</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a name="letter_G"> G </a></td><td><a class="el" \
href="Marble.GeoSceneLayer.html">GeoSceneLayer</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.RunnerPlugin.html">RunnerPlugin</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.GeoDataAbstractView.html">GeoDataAbstractView</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_L"> L </a></td><td><a \
name="letter_S"> S </a></td></tr>
-<tr><td><a class="el" href="Marble.GeoDataAccuracy.html">GeoDataAccuracy</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.LabelGraphicsItem.html">LabelGraphicsItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.ScreenGraphicsItem.html">ScreenGraphicsItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.GeoDataColorStyle.html">GeoDataColorStyle</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.LatLonBoxWidget.html">LatLonBoxWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Serializable.html">Serializable</a> </td></tr>
-<tr><td><a class="el" href="Marble.GeoDataContainer.html">GeoDataContainer</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.LatLonEdit.html">LatLonEdit</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.SunLocator.html">SunLocator</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.GeoDataCoordinates.html">GeoDataCoordinates</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.LayerInterface.html">LayerInterface</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_T"> T </a></td></tr>
-<tr><td><a class="el" href="Marble.GeoDataDocument.html">GeoDataDocument</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.LegendWidget.html">LegendWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.TileCoordsPyramid.html">TileCoordsPyramid</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.GeoDataFeature.html">GeoDataFeature</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_M"> M </a></td><td><a class="el" \
href="Marble.TileCreator.html">TileCreator</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.GeoDataFolder.html">GeoDataFolder</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MapThemeManager.html">MapThemeManager</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.TileCreatorSource.html">TileCreatorSource</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.GeoDataGeometry.html">GeoDataGeometry</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MapViewWidget.html">MapViewWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.TileLevelRangeWidget.html">TileLevelRangeWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.GeoDataHotSpot.html">GeoDataHotSpot</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MapWizard.html">MapWizard</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.TinyWebBrowser.html">TinyWebBrowser</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.GeoDataIconStyle.html">GeoDataIconStyle</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleAboutDialog.html">MarbleAboutDialog</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_V"> V </a></td></tr>
-<tr><td><a class="el" href="Marble.GeoDataInnerBoundary.html">GeoDataInnerBoundary</a> (<a \
class="el" href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleAbstractRunner.html">MarbleAbstractRunner</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.ViewportParams.html">ViewportParams</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.GeoDataLabelStyle.html">GeoDataLabelStyle</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleControlBox.html">MarbleControlBox</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_W"> W </a></td></tr>
-<tr><td><a class="el" href="Marble.GeoDataLatLonAltBox.html">GeoDataLatLonAltBox</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleDirs.html">MarbleDirs</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.WidgetGraphicsItem.html">WidgetGraphicsItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr>
-<tr><td><a class="el" href="Marble.GeoDataLatLonBox.html">GeoDataLatLonBox</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleGlobal.html">MarbleGlobal</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td></td></tr>
-<tr><td><a class="el" href="Marble.GeoDataLinearRing.html">GeoDataLinearRing</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleGraphicsGridLayout.html">MarbleGraphicsGridLayout</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td></td></tr> +<tbody><tr><td><a \
name="letter_A"> A </a></td><td><a class="el" \
href="Marble.GeoDataLineStyle.html">GeoDataLineStyle</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleModel.html">MarbleModel</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.AbstractDataPlugin.html">AbstractDataPlugin</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataLod.html">GeoDataLod</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleNavigator.html">MarbleNavigator</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.AbstractDataPluginItem.html">AbstractDataPluginItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataLookAt.html">GeoDataLookAt</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleRunnerManager.html">MarbleRunnerManager</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.AbstractDataPluginModel.html">AbstractDataPluginModel</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataMultiGeometry.html">GeoDataMultiGeometry</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleWidget.html">MarbleWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.AbstractFloatItem.html">AbstractFloatItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataObject.html">GeoDataObject</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_N"> N </a></td></tr> +<tr><td><a class="el" \
href="Marble.AbstractMarbleGraphicsLayout.html">AbstractMarbleGraphicsLayout</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataOuterBoundary.html">GeoDataOuterBoundary</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.NavigationWidget.html">NavigationWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.AbstractProjection.html">AbstractProjection</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataPlacemark.html">GeoDataPlacemark</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_P"> P </a></td></tr> +<tr><td><a class="el" \
href="Marble.AbstractWorkerThread.html">AbstractWorkerThread</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataPoint.html">GeoDataPoint</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.Planet.html">Planet</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.AlternativeRoutesModel.html">AlternativeRoutesModel</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataPolygon.html">GeoDataPolygon</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.PluginAboutDialog.html">PluginAboutDialog</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a \
name="letter_B"> B </a></td><td><a class="el" \
href="Marble.GeoDataPolyStyle.html">GeoDataPolyStyle</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.PluginInterface.html">PluginInterface</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.BookmarkManager.html">BookmarkManager</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataRegion.html">GeoDataRegion</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.PositionTracking.html">PositionTracking</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a \
name="letter_C"> C </a></td><td><a class="el" \
href="Marble.GeoDataStyle.html">GeoDataStyle</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_Q"> Q </a></td></tr> +<tr><td><a class="el" \
href="Marble.ClipPainter.html">ClipPainter</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataStyleMap.html">GeoDataStyleMap</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.QtMarbleConfigDialog.html">QtMarbleConfigDialog</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.CurrentLocationWidget.html">CurrentLocationWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoDataStyleSelector.html">GeoDataStyleSelector</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.Quaternion.html">Quaternion</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a \
name="letter_D"> D </a></td><td><a class="el" \
href="Marble.GeoDocument.html">GeoDocument</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.Quaternion.html">Quaternion</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.DownloadRegionDialog.html">DownloadRegionDialog</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoGraphicsItem.html">GeoGraphicsItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_R"> R </a></td></tr> +<tr><td><a \
name="letter_E"> E </a></td><td><a class="el" \
href="Marble.GeoGraphicsScene.html">GeoGraphicsScene</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.RenderPlugin.html">RenderPlugin</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.ElevationModel.html">ElevationModel</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoNode.html">GeoNode</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.RenderPluginInterface.html">RenderPluginInterface</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a \
name="letter_F"> F </a></td><td><a class="el" \
href="Marble.GeoPainter.html">GeoPainter</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.Route.html">Route</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.FileViewWidget.html">FileViewWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.GeoSceneLayer.html">GeoSceneLayer</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.RouteRequest.html">RouteRequest</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.FrameGraphicsItem.html">FrameGraphicsItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_L"> L </a></td><td><a class="el" \
href="Marble.RouteSegment.html">RouteSegment</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a \
name="letter_G"> G </a></td><td><a class="el" \
href="Marble.LabelGraphicsItem.html">LabelGraphicsItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.RoutingModel.html">RoutingModel</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.GeoDataAbstractView.html">GeoDataAbstractView</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.LatLonBoxWidget.html">LatLonBoxWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.RoutingProfile.html">RoutingProfile</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.GeoDataAccuracy.html">GeoDataAccuracy</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.LatLonEdit.html">LatLonEdit</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.RunnerPlugin.html">RunnerPlugin</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.GeoDataColorStyle.html">GeoDataColorStyle</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.LayerInterface.html">LayerInterface</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_S"> S </a></td></tr> +<tr><td><a class="el" \
href="Marble.GeoDataContainer.html">GeoDataContainer</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.LegendWidget.html">LegendWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.ScreenGraphicsItem.html">ScreenGraphicsItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.GeoDataCoordinates.html">GeoDataCoordinates</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_M"> M </a></td><td><a class="el" \
href="Serializable.html">Serializable</a> </td></tr> +<tr><td><a class="el" \
href="Marble.GeoDataDocument.html">GeoDataDocument</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.Maneuver.html">Maneuver</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.SunLocator.html">SunLocator</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.GeoDataFeature.html">GeoDataFeature</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MapThemeManager.html">MapThemeManager</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_T"> T </a></td></tr> +<tr><td><a class="el" \
href="Marble.GeoDataFolder.html">GeoDataFolder</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MapViewWidget.html">MapViewWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.TileCoordsPyramid.html">TileCoordsPyramid</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.GeoDataGeometry.html">GeoDataGeometry</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MapWizard.html">MapWizard</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.TileCreator.html">TileCreator</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.GeoDataHotSpot.html">GeoDataHotSpot</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleAboutDialog.html">MarbleAboutDialog</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.TileCreatorSource.html">TileCreatorSource</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.GeoDataIconStyle.html">GeoDataIconStyle</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleAbstractRunner.html">MarbleAbstractRunner</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.TileLevelRangeWidget.html">TileLevelRangeWidget</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.GeoDataInnerBoundary.html">GeoDataInnerBoundary</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleControlBox.html">MarbleControlBox</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.TinyWebBrowser.html">TinyWebBrowser</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.GeoDataLabelStyle.html">GeoDataLabelStyle</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleDirs.html">MarbleDirs</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a \
name="letter_V"> V </a></td></tr> +<tr><td><a class="el" \
href="Marble.GeoDataLatLonAltBox.html">GeoDataLatLonAltBox</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleGlobal.html">MarbleGlobal</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.ViewportParams.html">ViewportParams</a> (<a class="el" \
+<tr><td><a class="el" href="Marble.GeoDataLinearRing.html">GeoDataLinearRing</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleGraphicsItem.html">MarbleGraphicsItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.WidgetGraphicsItem.html">WidgetGraphicsItem</a> (<a class="el" \
href="Marble.html">Marble</a>) </td></tr> +<tr><td><a class="el" \
href="Marble.GeoDataLineString.html">GeoDataLineString</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td><a class="el" \
href="Marble.MarbleMap.html">MarbleMap</a> (<a class="el" \
href="Marble.html">Marble</a>) </td><td></td></tr> </table>
</div>
diff --git a/src/bindings/python/sip/AbstractDataPluginItem.sip \
b/src/bindings/python/sip/AbstractDataPluginItem.sip index 15db8ad..cc21c9a 100644
--- a/src/bindings/python/sip/AbstractDataPluginItem.sip
+++ b/src/bindings/python/sip/AbstractDataPluginItem.sip
@@ -26,6 +26,7 @@
#include <AbstractDataPluginModel.h>
#include <AbstractFloatItem.h>
#include <AbstractWorkerThread.h>
+#include <routing/AlternativeRoutesModel.h>
#include <BookmarkManager.h>
#include <CurrentLocationWidget.h>
#include <DownloadRegionDialog.h>
@@ -51,6 +52,8 @@
#include <PositionTracking.h>
#include <QtMarbleConfigDialog.h>
#include <RenderPlugin.h>
+#include <routing/RouteRequest.h>
+#include <routing/RoutingModel.h>
#include <RunnerPlugin.h>
#include <SunLocator.h>
#include <TileCreator.h>
@@ -119,10 +122,16 @@ public:
else if (dynamic_cast<Marble::AbstractFloatItem*>(sipCpp))
sipType = sipType_Marble_AbstractFloatItem;
}
+ else if (dynamic_cast<Marble::RouteRequest*>(sipCpp))
+ sipType = sipType_Marble_RouteRequest;
else if (dynamic_cast<Marble::RunnerPlugin*>(sipCpp))
sipType = sipType_Marble_RunnerPlugin;
else if (dynamic_cast<Marble::SunLocator*>(sipCpp))
sipType = sipType_Marble_SunLocator;
+ else if (dynamic_cast<Marble::AlternativeRoutesModel*>(sipCpp))
+ sipType = sipType_Marble_AlternativeRoutesModel;
+ else if (dynamic_cast<Marble::RoutingModel*>(sipCpp))
+ sipType = sipType_Marble_RoutingModel;
else if (dynamic_cast<Marble::AbstractWorkerThread*>(sipCpp))
sipType = sipType_Marble_AbstractWorkerThread;
else if (dynamic_cast<Marble::TileCreator*>(sipCpp))
diff --git a/src/bindings/python/sip/AbstractProjection.sip \
b/src/bindings/python/sip/AbstractProjection.sip index 8b3c821..8833887 100644
--- a/src/bindings/python/sip/AbstractProjection.sip
+++ b/src/bindings/python/sip/AbstractProjection.sip
@@ -75,9 +75,5 @@ public:
virtual Marble::GeoDataLatLonAltBox latLonAltBox (const QRect& screenRect, const \
Marble::ViewportParams* viewport) const; //ig bool screenCoordinates (qreal lon, \
qreal lat, const Marble::ViewportParams* viewport, int& x, int& y) const; //ig bool \
screenCoordinates (const Marble::GeoDataCoordinates& geopoint, const Marble::ViewportParams* viewport, \
int& x, int& y, bool& globeHidesPoint) const;
-protected:
-//ig bool lineStringToPolygon (const Marble::GeoDataLineString& lineString, const \
Marble::ViewportParams* viewport, QVector<QPolygonF*>& polygons) const;
- virtual void horizonToPolygon (const Marble::ViewportParams* viewport, const \
Marble::GeoDataCoordinates& disappearCoords, const Marble::GeoDataCoordinates& reappearCoords, \
QPolygonF*) const;
- void tessellateLineSegment (const Marble::GeoDataCoordinates& aCoords, qreal ax, \
qreal ay, const Marble::GeoDataCoordinates& bCoords, qreal bx, qreal by, QPolygonF* polygon, const \
Marble::ViewportParams* viewport, Marble::TessellationFlags f = 0) const; };
};
diff --git a/src/bindings/python/sip/AlternativeRoutesModel.sip \
b/src/bindings/python/sip/AlternativeRoutesModel.sip new file mode 100644
index 0000000..6b0df79
--- /dev/null
+++ b/src/bindings/python/sip/AlternativeRoutesModel.sip
@@ -0,0 +1,51 @@
+// Copyright 2011 Simon Edwards <simon@simonzone.com>
+
+// Generated by twine2
+
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU Library General Public License as
+// published by the Free Software Foundation; either version 2, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details
+
+// You should have received a copy of the GNU Library General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc.,
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+namespace Marble
+{
+class AlternativeRoutesModel : QAbstractListModel
+{
+%TypeHeaderCode
+#include <routing/AlternativeRoutesModel.h>
+%End
+
+public:
+ enum WritePolicy
+ {
+ Instant,
+ Lazy
+ };
+ explicit AlternativeRoutesModel (QObject* parent /TransferThis/ = 0);
+ ~AlternativeRoutesModel ();
+ int rowCount (const QModelIndex& parent = QModelIndex()) const;
+ QVariant headerData (int section, Qt::Orientation orientation, int role = \
Qt::DisplayRole) const; + QVariant data (const QModelIndex& index, int role = \
Qt::DisplayRole) const; + Marble::GeoDataDocument* route (int index);
+ void newRequest (Marble::RouteRequest* request);
+ void addRoute (Marble::GeoDataDocument* document, \
Marble::AlternativeRoutesModel::WritePolicy policy = Marble::AlternativeRoutesModel::Lazy); + void \
setCurrentRoute (int index); + void clear ();
+ Marble::GeoDataDocument* currentRoute ();
+ static Marble::GeoDataLineString* waypoints (const Marble::GeoDataDocument* document);
+ static qreal distance (const Marble::GeoDataCoordinates& satellite, const \
Marble::GeoDataCoordinates& lineA, const Marble::GeoDataCoordinates& lineB); + static QVector<qreal> \
deviation (const Marble::GeoDataDocument* routeA, const Marble::GeoDataDocument* routeB); +signals:
+ void currentRouteChanged (Marble::GeoDataDocument* newRoute);
+};
+};
diff --git a/src/bindings/python/sip/CurrentLocationWidget.sip \
b/src/bindings/python/sip/CurrentLocationWidget.sip index fd8336a..5314717 100644
--- a/src/bindings/python/sip/CurrentLocationWidget.sip
+++ b/src/bindings/python/sip/CurrentLocationWidget.sip
@@ -29,7 +29,6 @@ public:
CurrentLocationWidget (QWidget* parent /TransferThis/ = 0, Qt::WindowFlags f \
= 0); ~CurrentLocationWidget ();
void setMarbleWidget (Marble::MarbleWidget* widget);
- void receiveGpsCoordinates (const Marble::GeoDataCoordinates& in, qreal speed);
void setRecenterMode (int recenterMode);
void setAutoZoom (bool activate);
//ig Marble::AdjustNavigation::CenterMode recenterMode () const;
diff --git a/src/bindings/python/sip/ElevationModel.sip b/src/bindings/python/sip/ElevationModel.sip
index 632ae70..82df6e4 100644
--- a/src/bindings/python/sip/ElevationModel.sip
+++ b/src/bindings/python/sip/ElevationModel.sip
@@ -27,11 +27,13 @@ class ElevationModel : QObject
public:
//force
- ElevationModel (Marble::MarbleModel * model);
+ ElevationModel (Marble::MarbleModel* model);
//end
qreal height (qreal lon, qreal lat) const;
QList<Marble::GeoDataCoordinates> heightProfile (qreal fromLon, qreal fromLat, qreal toLon, qreal \
toLat) const; signals:
void updateAvailable ();
+public:
+//ig ElevationModel (MarbleModel*const model);
};
};
diff --git a/src/bindings/python/sip/GeoDataContainer.sip b/src/bindings/python/sip/GeoDataContainer.sip
index 7bf59a6..a2d2107 100644
--- a/src/bindings/python/sip/GeoDataContainer.sip
+++ b/src/bindings/python/sip/GeoDataContainer.sip
@@ -57,6 +57,7 @@ public:
void append (Marble::GeoDataFeature* other);
void remove (int index);
Marble::GeoDataLatLonAltBox latLonAltBox () const;
+//ig const Marble::GeoDataFeature* child (int) const;
};
// GeoDataContainer
diff --git a/src/bindings/python/sip/LegendWidget.sip b/src/bindings/python/sip/LegendWidget.sip
index ea94d77..890387e 100644
--- a/src/bindings/python/sip/LegendWidget.sip
+++ b/src/bindings/python/sip/LegendWidget.sip
@@ -28,6 +28,8 @@ class LegendWidget : QWidget
public:
LegendWidget (QWidget* parent /TransferThis/ = 0, Qt::WindowFlags f = 0);
~LegendWidget ();
- void setMarbleWidget (Marble::MarbleWidget* widget);
+ void setMarbleModel (Marble::MarbleModel* model);
+signals:
+ void propertyValueChanged (const QString& propertyName, bool value);
};
};
diff --git a/src/bindings/python/sip/Maneuver.sip b/src/bindings/python/sip/Maneuver.sip
new file mode 100644
index 0000000..b5bfc5b
--- /dev/null
+++ b/src/bindings/python/sip/Maneuver.sip
@@ -0,0 +1,57 @@
+// Copyright 2011 Simon Edwards <simon@simonzone.com>
+
+// Generated by twine2
+
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU Library General Public License as
+// published by the Free Software Foundation; either version 2, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details
+
+// You should have received a copy of the GNU Library General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc.,
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+namespace Marble
+{
+class Maneuver
+{
+%TypeHeaderCode
+#include <routing/Maneuver.h>
+%End
+
+public:
+ enum Direction
+ {
+ Unknown,
+ Straight,
+ SlightRight,
+ Right,
+ SharpRight,
+ TurnAround,
+ SharpLeft,
+ Left,
+ SlightLeft,
+ RoundaboutFirstExit,
+ RoundaboutSecondExit,
+ RoundaboutThirdExit,
+ RoundaboutExit
+ };
+ Maneuver ();
+ Marble::Maneuver::Direction direction () const;
+ void setDirection (Marble::Maneuver::Direction direction);
+ Marble::GeoDataCoordinates position () const;
+ void setPosition (const Marble::GeoDataCoordinates& position);
+ Marble::GeoDataCoordinates waypoint () const;
+ bool hasWaypoint () const;
+ void setWaypoint (const Marble::GeoDataCoordinates& waypoint);
+ QString instructionText () const;
+ void setInstructionText (const QString& text);
+ QString directionPixmap () const;
+};
+};
diff --git a/src/bindings/python/sip/MapThemeManager.sip b/src/bindings/python/sip/MapThemeManager.sip
index 5f1e8e7..a9d0ae2 100644
--- a/src/bindings/python/sip/MapThemeManager.sip
+++ b/src/bindings/python/sip/MapThemeManager.sip
@@ -27,15 +27,13 @@ class MapThemeManager : QObject
public:
explicit MapThemeManager (QObject* parent /TransferThis/ = 0);
QStandardItemModel* mapThemeModel ();
- void updateMapThemeModel ();
- void directoryChanged (const QString& path);
- void fileChanged (const QString& path);
~MapThemeManager ();
-//ig static Marble::GeoSceneDocument* loadMapTheme (const QString& mapThemeStringID);
-//ig QList<const GeoSceneDocument*> mapThemes () const;
signals:
void themesChanged ();
+public:
+ QStringList mapThemeIds () const;
+//ig GeoSceneDocument* loadMapTheme (const QString& mapThemeStringID) const;
};
// MapThemeManager
diff --git a/src/bindings/python/sip/MapViewWidget.sip b/src/bindings/python/sip/MapViewWidget.sip
index 1efc8a9..9f96b3d 100644
--- a/src/bindings/python/sip/MapViewWidget.sip
+++ b/src/bindings/python/sip/MapViewWidget.sip
@@ -29,16 +29,14 @@ public:
MapViewWidget (QWidget* parent /TransferThis/ = 0, Qt::WindowFlags f = 0);
~MapViewWidget ();
void setMarbleWidget (Marble::MarbleWidget* widget);
- void updateCelestialModel ();
- void selectTheme (const QString&);
- void selectProjection (Marble::Projection projection);
- void selectCurrentMapTheme (const QString&);
- void updateMapThemeView ();
-//ig void projectionSelected (int projectionIndex);
signals:
- void selectMapTheme (const QString&);
- void projectionSelected (Marble::Projection);
void showMapWizard ();
void showUploadDialog ();
+public:
+ void setMapThemeId (const QString&);
+ void setProjection (Marble::Projection projection);
+signals:
+ void mapThemeIdChanged (const QString&);
+ void projectionChanged (Marble::Projection);
};
};
diff --git a/src/bindings/python/sip/MapWizard.sip b/src/bindings/python/sip/MapWizard.sip
index a91fb35..f87ac86 100644
--- a/src/bindings/python/sip/MapWizard.sip
+++ b/src/bindings/python/sip/MapWizard.sip
@@ -46,5 +46,6 @@ public:
void autoFillDetails ();
void downloadLevelZero ();
void createLevelZero (QNetworkReply* reply = 0);
+ void showPreview ();
};
};
diff --git a/src/bindings/python/sip/MarbleAbstractRunner.sip \
b/src/bindings/python/sip/MarbleAbstractRunner.sip index 62725b7..34ebf90 100644
--- a/src/bindings/python/sip/MarbleAbstractRunner.sip
+++ b/src/bindings/python/sip/MarbleAbstractRunner.sip
@@ -38,9 +38,10 @@ signals:
protected:
Marble::MarbleModel* model ();
public:
-//ig virtual void retrieveRoute (const RouteRequest* request);
virtual void parseFile (const QString& fileName, Marble::DocumentRole role);
signals:
void parsingFinished (Marble::GeoDataDocument* document, const QString& error = \
QString()); +public:
+ virtual void retrieveRoute (const Marble::RouteRequest* request);
};
};
diff --git a/src/bindings/python/sip/MarbleControlBox.sip b/src/bindings/python/sip/MarbleControlBox.sip
index 36858b6..b17e0a3 100644
--- a/src/bindings/python/sip/MarbleControlBox.sip
+++ b/src/bindings/python/sip/MarbleControlBox.sip
@@ -26,7 +26,6 @@ class MarbleControlBox : QWidget
public:
explicit MarbleControlBox (QWidget* parent /TransferThis/ = 0);
- void addMarbleWidget (Marble::MarbleWidget* widget);
void selectTheme (const QString&);
@@ -36,7 +35,6 @@ public:
void setMapViewTabShown (bool show);
void setCurrentLocationTabShown (bool show);
void setFileViewTabShown (bool show);
- void updateMapThemeView ();
~MarbleControlBox ();
@@ -47,6 +45,7 @@ signals:
void showUploadDialog ();
public:
Marble::CurrentLocationWidget* currentLocationWidget ();
+ void setMarbleWidget (Marble::MarbleWidget* widget);
};
// MarbleControlBox
diff --git a/src/bindings/python/sip/MarbleMap.sip b/src/bindings/python/sip/MarbleMap.sip
index 8df9031..985d6d7 100644
--- a/src/bindings/python/sip/MarbleMap.sip
+++ b/src/bindings/python/sip/MarbleMap.sip
@@ -147,6 +147,8 @@ public:
void setShowSunShading (bool visible);
void setShowCityLights (bool visible);
void setShowSunInZenith (bool visible);
+signals:
+ void radiusChanged (int radius);
};
// MarbleMap
diff --git a/src/bindings/python/sip/MarbleModel.sip b/src/bindings/python/sip/MarbleModel.sip
index 2290a4d..b27c855 100644
--- a/src/bindings/python/sip/MarbleModel.sip
+++ b/src/bindings/python/sip/MarbleModel.sip
@@ -33,7 +33,7 @@ public:
QString planetName () const;
Marble::SunLocator* sunLocator () const;
//ig quint64 volatileTileCacheLimit () const;
- const Marble::Planet* planet () const;
+ const Marble::Planet* planet () const;
void clearPersistentTileCache ();
signals:
@@ -64,7 +64,6 @@ public:
QTextDocument* legend ();
void setLegend (QTextDocument* document);
void setPersistentTileCacheLimit (quint64 kiloBytes);
-//ig void setMapTheme (GeoSceneDocument* mapTheme);
QString planetId () const;
explicit MarbleModel (QObject* parent /TransferThis/ = 0);
//ig GeoDataTreeModel* treeModel ();
@@ -82,13 +81,15 @@ public:
Marble::BookmarkManager* bookmarkManager ();
bool workOffline () const;
void setWorkOffline (bool workOffline);
-//ig Marble::ElevationModel* elevationModel ();
+//ig Marble::ElevationModel* elevationModel ();
const Marble::ElevationModel* elevationModel () const;
const Marble::GeoDataPlacemark* trackedPlacemark () const;
void setTrackedPlacemark (const Marble::GeoDataPlacemark* placemark);
signals:
void workOfflineChanged ();
void trackedPlacemarkChanged (const Marble::GeoDataPlacemark* placemark);
+public:
+ void setMapThemeId (const QString& mapThemeId);
};
// MarbleModel
diff --git a/src/bindings/python/sip/MarbleRunnerManager.sip \
b/src/bindings/python/sip/MarbleRunnerManager.sip index d7951f6..a2d09c1 100644
--- a/src/bindings/python/sip/MarbleRunnerManager.sip
+++ b/src/bindings/python/sip/MarbleRunnerManager.sip
@@ -36,12 +36,13 @@ signals:
void reverseGeocodingFinished (const Marble::GeoDataCoordinates& coordinates, \
const Marble::GeoDataPlacemark& placemark);
void routeRetrieved (Marble::GeoDataDocument* route);
public:
-//ig explicit MarbleRunnerManager (const PluginManager* pluginManager, QObject* \
parent /TransferThis/ = 0);
-//ig void retrieveRoute (const RouteRequest* request);
+//ig explicit MarbleRunnerManager (const PluginManager* pluginManager, QObject* parent \
/TransferThis/ = 0);
void parseFile (const QString& fileName, Marble::DocumentRole role);
-signals:
//FIXME add QVector<GeoDataPlacemark*> support
+signals:
//ig void searchResultChanged (QVector<Marble::GeoDataPlacemark*> result);
void parsingFinished (Marble::GeoDataDocument* document, const QString& error = \
QString()); +public:
+ void retrieveRoute (const Marble::RouteRequest* request);
};
};
diff --git a/src/bindings/python/sip/MarbleWidget.sip b/src/bindings/python/sip/MarbleWidget.sip
index d77758e..9f96274 100644
--- a/src/bindings/python/sip/MarbleWidget.sip
+++ b/src/bindings/python/sip/MarbleWidget.sip
@@ -35,10 +35,8 @@ public:
QString distanceString () const;
int minimumZoom () const;
int maximumZoom () const;
- bool geoCoordinates (int x, int y, qreal& lon /out/, qreal& lat /out/, \
Marble::GeoDataCoordinates::Unit = Marble::GeoDataCoordinates::Degree); qreal \
centerLongitude () const; qreal centerLatitude () const;
- qreal moveStep ();
QPixmap mapScreenShot ();
bool showOverviewMap () const;
bool showScaleBar () const;
@@ -62,7 +60,6 @@ public:
QList<Marble::AbstractFloatItem*> floatItems () const;
Marble::Projection projection () const;
QString mapThemeId () const;
- Marble::MapQuality mapQuality (Marble::ViewContext = Marble::Still);
Marble::ViewContext viewContext () const;
bool animationsEnabled () const;
Marble::AngleUnit defaultAngleUnit () const;
@@ -130,8 +127,6 @@ public:
virtual ~MarbleWidget ();
//ig MarbleWidgetInputHandler* inputHandler () const;
//ig void setInputHandler (MarbleWidgetInputHandler* handler);
- const QRegion mapRegion ();
- bool screenCoordinates (qreal lon, qreal lat, qreal& x, qreal& y);
void readPluginSettings (QSettings& settings);
void writePluginSettings (QSettings& settings) const;
//ig Marble::GeoSceneDocument* mapTheme () const;
@@ -183,6 +178,14 @@ public:
void setShowSunShading (bool visible);
void setShowCityLights (bool visible);
void setShowSunInZenith (bool visible);
+ QRegion mapRegion () const;
+ bool screenCoordinates (qreal lon, qreal lat, qreal& x, qreal& y) const;
+ bool geoCoordinates (int x, int y, qreal& lon, qreal& lat, \
Marble::GeoDataCoordinates::Unit = Marble::GeoDataCoordinates::Degree) const; + qreal \
moveStep () const; + Marble::GeoDataCoordinates focusPoint () const;
+ void setFocusPoint (const Marble::GeoDataCoordinates& focusPoint);
+ void resetFocusPoint ();
+ Marble::MapQuality mapQuality (Marble::ViewContext = Marble::Still) const;
};
// MarbleWidget
diff --git a/src/bindings/python/sip/NavigationWidget.sip b/src/bindings/python/sip/NavigationWidget.sip
index 1255338..4b036cb 100644
--- a/src/bindings/python/sip/NavigationWidget.sip
+++ b/src/bindings/python/sip/NavigationWidget.sip
@@ -43,8 +43,8 @@ public:
void changeZoom (int zoom);
protected:
void resizeEvent (QResizeEvent*);
-public:
//FIXME
+public:
//ig void setLocations (QVector<Marble::GeoDataPlacemark*> locations);
};
};
diff --git a/src/bindings/python/sip/QtMarbleConfigDialog.sip \
b/src/bindings/python/sip/QtMarbleConfigDialog.sip index 2efe1e7..804ad10 100644
--- a/src/bindings/python/sip/QtMarbleConfigDialog.sip
+++ b/src/bindings/python/sip/QtMarbleConfigDialog.sip
@@ -28,7 +28,6 @@ class QtMarbleConfigDialog : QDialog
public:
explicit QtMarbleConfigDialog (Marble::MarbleWidget* marbleWidget, QWidget* parent \
/TransferThis/ = 0); ~QtMarbleConfigDialog ();
- Marble::DistanceUnit distanceUnit () const;
Marble::AngleUnit angleUnit () const;
Marble::MapQuality stillQuality () const;
Marble::MapQuality animationQuality () const;
@@ -61,5 +60,6 @@ public:
bool customTimezone () const;
int chosenTimezone () const;
void initializeCustomTimezone ();
+ QLocale::MeasurementSystem measurementSystem () const;
};
};
diff --git a/src/bindings/python/sip/RenderPlugin.sip b/src/bindings/python/sip/RenderPlugin.sip
index b9b9f3e..f7eade7 100644
--- a/src/bindings/python/sip/RenderPlugin.sip
+++ b/src/bindings/python/sip/RenderPlugin.sip
@@ -73,6 +73,7 @@ public:
void restoreDefaultSettings ();
signals:
void repaintNeeded (QRegion dirtyRegion = QRegion());
+ void enabledChanged (bool enable);
};
// RenderPlugin
diff --git a/src/bindings/python/sip/Route.sip b/src/bindings/python/sip/Route.sip
new file mode 100644
index 0000000..b467222
--- /dev/null
+++ b/src/bindings/python/sip/Route.sip
@@ -0,0 +1,45 @@
+// Copyright 2011 Simon Edwards <simon@simonzone.com>
+
+// Generated by twine2
+
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU Library General Public License as
+// published by the Free Software Foundation; either version 2, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details
+
+// You should have received a copy of the GNU Library General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc.,
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+namespace Marble
+{
+class Route
+{
+%TypeHeaderCode
+#include <routing/Route.h>
+%End
+
+public:
+ Route ();
+ void addRouteSegment (const Marble::RouteSegment& segment);
+ Marble::GeoDataLatLonBox bounds () const;
+ qreal distance () const;
+ const Marble::RouteSegment& at (int index) const;
+ int size () const;
+ const Marble::GeoDataLineString& path () const;
+ int travelTime () const;
+ const Marble::GeoDataLineString& turnPoints () const;
+ const Marble::GeoDataLineString& waypoints () const;
+ void setPosition (const Marble::GeoDataCoordinates& position);
+ Marble::GeoDataCoordinates position () const;
+ const Marble::RouteSegment& currentSegment () const;
+ Marble::GeoDataCoordinates currentWaypoint () const;
+ Marble::GeoDataCoordinates positionOnRoute () const;
+};
+};
diff --git a/src/bindings/python/sip/RouteRequest.sip b/src/bindings/python/sip/RouteRequest.sip
new file mode 100644
index 0000000..cde86e0
--- /dev/null
+++ b/src/bindings/python/sip/RouteRequest.sip
@@ -0,0 +1,55 @@
+// Copyright 2011 Simon Edwards <simon@simonzone.com>
+
+// Generated by twine2
+
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU Library General Public License as
+// published by the Free Software Foundation; either version 2, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details
+
+// You should have received a copy of the GNU Library General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc.,
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+namespace Marble
+{
+class RouteRequest : QObject
+{
+%TypeHeaderCode
+#include <routing/RouteRequest.h>
+%End
+
+public:
+ explicit RouteRequest (QObject* parent /TransferThis/ = 0);
+ ~RouteRequest ();
+ Marble::GeoDataCoordinates source () const;
+ Marble::GeoDataCoordinates destination () const;
+ int size () const;
+ Marble::GeoDataCoordinates at (int index) const;
+ void append (const Marble::GeoDataCoordinates& coordinates);
+ void insert (int index, const Marble::GeoDataCoordinates& coordinates);
+ void setPosition (int index, const Marble::GeoDataCoordinates& position);
+ void remove (int index);
+ void clear ();
+ void addVia (const Marble::GeoDataCoordinates& position);
+ QPixmap pixmap (int index) const;
+ void setName (int index, const QString& name);
+ QString name (int index) const;
+ void setVisited (int index, bool visited);
+ bool visited (int index) const;
+ void reverse ();
+ void setRoutingProfile (const Marble::RoutingProfile& profile);
+ Marble::RoutingProfile routingProfile () const;
+signals:
+ void positionChanged (int index, const Marble::GeoDataCoordinates& position);
+ void positionAdded (int index);
+ void positionRemoved (int index);
+ void routingProfileChanged ();
+};
+};
diff --git a/src/bindings/python/sip/RouteSegment.sip b/src/bindings/python/sip/RouteSegment.sip
new file mode 100644
index 0000000..4455ec7
--- /dev/null
+++ b/src/bindings/python/sip/RouteSegment.sip
@@ -0,0 +1,44 @@
+// Copyright 2011 Simon Edwards <simon@simonzone.com>
+
+// Generated by twine2
+
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU Library General Public License as
+// published by the Free Software Foundation; either version 2, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details
+
+// You should have received a copy of the GNU Library General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc.,
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+namespace Marble
+{
+class RouteSegment
+{
+%TypeHeaderCode
+#include <routing/RouteSegment.h>
+%End
+
+public:
+ RouteSegment ();
+ bool isValid () const;
+ qreal distance () const;
+ const Marble::Maneuver& maneuver () const;
+ void setManeuver (const Marble::Maneuver& maneuver);
+ const Marble::GeoDataLineString& path () const;
+ void setPath (const Marble::GeoDataLineString& path);
+ int travelTime () const;
+ void setTravelTime (int seconds);
+ Marble::GeoDataLatLonBox bounds () const;
+ const Marble::RouteSegment& nextRouteSegment () const;
+ void setNextRouteSegment (const Marble::RouteSegment* segment);
+ qreal distanceTo (const Marble::GeoDataCoordinates& point, \
Marble::GeoDataCoordinates& closest, Marble::GeoDataCoordinates& interpolated) const; + qreal \
minimalDistanceTo (const Marble::GeoDataCoordinates& point) const; +};
+};
diff --git a/src/bindings/python/sip/RoutingModel.sip b/src/bindings/python/sip/RoutingModel.sip
new file mode 100644
index 0000000..97541bc
--- /dev/null
+++ b/src/bindings/python/sip/RoutingModel.sip
@@ -0,0 +1,53 @@
+// Copyright 2011 Simon Edwards <simon@simonzone.com>
+
+// Generated by twine2
+
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU Library General Public License as
+// published by the Free Software Foundation; either version 2, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details
+
+// You should have received a copy of the GNU Library General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc.,
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+namespace Marble
+{
+class RoutingModel : QAbstractListModel
+{
+%TypeHeaderCode
+#include <routing/RoutingModel.h>
+%End
+
+public:
+ enum RoutingModelRoles
+ {
+ CoordinateRole,
+ TurnTypeIconRole,
+ LongitudeRole,
+ LatitudeRole
+ };
+ explicit RoutingModel (Marble::RouteRequest* request, Marble::MarbleModel* model, \
QObject* parent /TransferThis/ = 0); + ~RoutingModel ();
+ int rowCount (const QModelIndex& parent = QModelIndex()) const;
+ QVariant headerData (int section, Qt::Orientation orientation, int role = \
Qt::DisplayRole) const; + QVariant data (const QModelIndex& index, int role = \
Qt::DisplayRole) const; + void exportGpx (QIODevice* device) const;
+ void clear ();
+ int rightNeighbor (const Marble::GeoDataCoordinates& position, const \
Marble::RouteRequest* route) const; + bool deviatedFromRoute () const;
+ const Marble::Route& route () const;
+ bool setCurrentRoute (Marble::GeoDataDocument* document);
+ void updatePosition (Marble::GeoDataCoordinates, qreal);
+signals:
+ void positionChanged ();
+ void deviatedFromRoute (bool deviated);
+ void currentRouteChanged ();
+};
+};
diff --git a/src/bindings/python/sip/ElevationModel.sip b/src/bindings/python/sip/RoutingProfile.sip
similarity index 54%
copy from src/bindings/python/sip/ElevationModel.sip
copy to src/bindings/python/sip/RoutingProfile.sip
index 632ae70..e579d99 100644
--- a/src/bindings/python/sip/ElevationModel.sip
+++ b/src/bindings/python/sip/RoutingProfile.sip
@@ -19,19 +19,26 @@
namespace Marble
{
-class ElevationModel : QObject
+class RoutingProfile
{
%TypeHeaderCode
-#include <ElevationModel.h>
+#include <routing/RoutingProfile.h>
%End
public:
-//force
- ElevationModel (Marble::MarbleModel * model);
-//end
- qreal height (qreal lon, qreal lat) const;
- QList<Marble::GeoDataCoordinates> heightProfile (qreal fromLon, qreal fromLat, qreal toLon, qreal \
toLat) const;
-signals:
- void updateAvailable ();
+ enum TransportType
+ {
+ Motorcar,
+ Bicycle,
+ Pedestrian
+ };
+ explicit RoutingProfile (const QString& name = QString());
+ QString name () const;
+ void setName (const QString& name);
+//ig const QHash<QString,QHash<QString,QVariant>>& pluginSettings () const;
+//ig QHash<QString,QHash<QString,QVariant>>& pluginSettings ();
+ void setTransportType (Marble::RoutingProfile::TransportType transportType);
+ Marble::RoutingProfile::TransportType transportType () const;
+ bool operator == (const Marble::RoutingProfile& other) const;
};
};
diff --git a/src/bindings/python/sip/ViewportParams.sip b/src/bindings/python/sip/ViewportParams.sip
index 25dc847..67c58e9 100644
--- a/src/bindings/python/sip/ViewportParams.sip
+++ b/src/bindings/python/sip/ViewportParams.sip
@@ -60,6 +60,18 @@ public:
void centerOn (qreal lon, qreal lat);
qreal centerLongitude () const;
qreal centerLatitude () const;
+ Marble::GeoDataLatLonAltBox latLonAltBox (const QRect& screenRect) const;
+ void centerCoordinates (qreal& centerLon, qreal& centerLat) const;
+ bool screenCoordinates (const qreal lon, const qreal lat, qreal& x, qreal& y) \
const; + bool screenCoordinates (const Marble::GeoDataCoordinates& geopoint, qreal& \
x, qreal& y, bool& globeHidesPoint) const; +// bool screenCoordinates (const \
Marble::GeoDataCoordinates& geopoint, qreal& x, qreal& y) const; + bool \
screenCoordinates (const Marble::GeoDataCoordinates& geopoint, QPointF& screenpoint) const; +// bool \
screenCoordinates (const Marble::GeoDataCoordinates& coordinates, qreal* x, qreal& y, int& \
pointRepeatNum, bool& globeHidesPoint) const; +// bool screenCoordinates (const \
Marble::GeoDataCoordinates& coordinates, qreal* x, qreal& y, int& pointRepeatNum, const QSizeF& size, \
bool& globeHidesPoint) const; +// bool screenCoordinates (const \
Marble::GeoDataLineString& lineString, QVector<QPolygonF*>& polygons) const; + bool \
geoCoordinates (const int x, const int y, qreal& lon, qreal& lat, Marble::GeoDataCoordinates::Unit unit = \
Marble::GeoDataCoordinates::Degree) const; + QPainterPath mapShape () const;
+ QRegion mapRegion () const;
};
// ViewportParams
diff --git a/src/bindings/python/sip/global.sip b/src/bindings/python/sip/global.sip
index d061014..bc73a81 100644
--- a/src/bindings/python/sip/global.sip
+++ b/src/bindings/python/sip/global.sip
@@ -44,12 +44,6 @@ enum Projection
};
-enum DistanceUnit
-{
- NoDistanceUnit,
- Meter,
- MilesFeet
-};
enum Dimension
@@ -172,11 +166,6 @@ public:
};
// MarbleGlobal
-enum MeasureSystem
-{
- Metric,
- Imperial
-};
enum ProxyType
{
HttpProxy,
diff --git a/src/bindings/python/sip/marblemod.sip b/src/bindings/python/sip/marblemod.sip
index 5ad5972..8cb2d9c 100644
--- a/src/bindings/python/sip/marblemod.sip
+++ b/src/bindings/python/sip/marblemod.sip
@@ -37,6 +37,7 @@
%Include AbstractMarbleGraphicsLayout.sip
%Include AbstractProjection.sip
%Include AbstractWorkerThread.sip
+%Include AlternativeRoutesModel.sip
%Include BookmarkManager.sip
%Include ClipPainter.sip
%Include CurrentLocationWidget.sip
@@ -82,6 +83,7 @@
%Include LatLonEdit.sip
%Include LayerInterface.sip
%Include LegendWidget.sip
+%Include Maneuver.sip
%Include MapThemeManager.sip
%Include MapViewWidget.sip
%Include MapWizard.sip
@@ -106,6 +108,11 @@
%Include Quaternion.sip
%Include RenderPlugin.sip
%Include RenderPluginInterface.sip
+%Include Route.sip
+%Include RouteRequest.sip
+%Include RouteSegment.sip
+%Include RoutingModel.sip
+%Include RoutingProfile.sip
%Include RunnerPlugin.sip
%Include ScreenGraphicsItem.sip
%Include Serializable.sip
@@ -114,7 +121,6 @@
%Include TileCreator.sip
%Include TileLevelRangeWidget.sip
%Include TinyWebBrowser.sip
-//%Include ViewParams.sip
%Include ViewportParams.sip
%Include WidgetGraphicsItem.sip
%Include global.sip
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic