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

[Dennis Nienhüser]

SVN commit 1153659 by nienhueser:

Move MarbleAbstractRunner* from src/lib/runners/ to src/lib. Create a RunnerPlugin class in src/lib, derived from PluginInterface, which adds a new MarbleAbstractRunner factory method. Add support for RunnerPlugins in PluginManager. Move all individual src/lib/runners/*Runner* classes to their own plugins in src/plugins/runner/$name. Change MarbleRunnerManager to use plugins only. Extend MarbleAbstractRunner interface to allow runners do reverse geocoding and routing. MarbleAbstractRunner does not derive from QThread anymore, threads are handled transparently by the MarbleRunnerManager. Use QThreadPool and QRunnable (new class RunnerTask) to execute runners in threads. Move route parsing from RoutingModel to plugins, RoutingModel only accepts GeoDataDocument* from now on. Transform OpenRouteService and Yours RoutingProvider classes into runner plugins. Remove AbstractRoutingProvider, not needed anymore. Add new gosmore runner plugin, it does offline routing by calling the gos
 more application and parsing its output. Does nothing if gosmore is not installed or ~/.local/share/marble/maps/earth/gosmore/gosmore.pak does not exist). Routing UI can handle several alternative routes coming in now.

 M  +5 -10     lib/CMakeLists.txt  
 A             lib/MarbleAbstractRunner.cpp   lib/runners/MarbleAbstractRunner.cpp#1152723 [License: LGPL]
 A             lib/MarbleAbstractRunner.h   [License: LGPL]
 M  +5 -6      lib/MarbleControlBox.cpp  
 M  +145 -80   lib/MarbleRunnerManager.cpp  
 M  +78 -19    lib/MarbleRunnerManager.h  
 M  +19 -1     lib/PluginManager.cpp  
 M  +7 -0      lib/PluginManager.h  
 A             lib/RunnerPlugin.cpp   [License: UNKNOWN]
 A             lib/RunnerPlugin.h   [License: LGPL]
 A             lib/RunnerTask.cpp   [License: UNKNOWN]
 A             lib/RunnerTask.h   [License: LGPL]
 D             lib/routing/AbstractRoutingProvider.cpp  
 D             lib/routing/AbstractRoutingProvider.h  
 D             lib/routing/OrsRoutingProvider.cpp  
 D             lib/routing/OrsRoutingProvider.h  
 M  +18 -47    lib/routing/RoutingInputWidget.cpp  
 M  +5 -6      lib/routing/RoutingInputWidget.h  
 M  +35 -58    lib/routing/RoutingManager.cpp  
 M  +4 -3      lib/routing/RoutingManager.h  
 M  +22 -159   lib/routing/RoutingModel.cpp  
 M  +5 -21     lib/routing/RoutingModel.h  
 M  +54 -20    lib/routing/RoutingWidget.cpp  
 M  +6 -0      lib/routing/RoutingWidget.h  
 M  +4 -7      lib/routing/RoutingWidget.ui  
 D             lib/routing/YoursRoutingProvider.cpp  
 D             lib/routing/YoursRoutingProvider.h  
 D             lib/runners/HostipRunner.cpp  
 D             lib/runners/HostipRunner.h  
 D             lib/runners/LatLonRunner.cpp  
 D             lib/runners/LatLonRunner.h  
 D             lib/runners/LocalDatabaseRunner.cpp  
 D             lib/runners/LocalDatabaseRunner.h  
 D             lib/runners/MarbleAbstractRunner.cpp  
 D             lib/runners/MarbleAbstractRunner.h  
 D             lib/runners/OnfRunner.cpp  
 D             lib/runners/OnfRunner.h  
 D             lib/runners/OsmNominatimRunner.cpp  
 D             lib/runners/OsmNominatimRunner.h  
 M  +1 -0      plugins/CMakeLists.txt  
 A             plugins/runner (directory)  
 A             plugins/runner/CMakeLists.txt  
 A             plugins/runner/gosmore (directory)  
 A             plugins/runner/gosmore/CMakeLists.txt  
 A             plugins/runner/gosmore/GosmorePlugin.cpp   [License: LGPL]
 A             plugins/runner/gosmore/GosmorePlugin.h   lib/routing/AbstractRoutingProvider.cpp#1152723 [License: LGPL]
 A             plugins/runner/gosmore/GosmoreRunner.cpp   [License: LGPL]
 A             plugins/runner/gosmore/GosmoreRunner.h   [License: LGPL]
 A             plugins/runner/hostip (directory)  
 A             plugins/runner/hostip/CMakeLists.txt  
 A             plugins/runner/hostip/HostipPlugin.cpp   [License: LGPL]
 A             plugins/runner/hostip/HostipPlugin.h   lib/routing/AbstractRoutingProvider.cpp#1152723 [License: LGPL]
 A             plugins/runner/hostip/HostipRunner.cpp   lib/runners/HostipRunner.cpp#1152723 [License: LGPL]
 A             plugins/runner/hostip/HostipRunner.h   lib/runners/HostipRunner.h#1152723 [License: LGPL]
 A             plugins/runner/latlon (directory)  
 A             plugins/runner/latlon/CMakeLists.txt  
 A             plugins/runner/latlon/LatLonPlugin.cpp   [License: LGPL]
 A             plugins/runner/latlon/LatLonPlugin.h   lib/routing/AbstractRoutingProvider.cpp#1152723 [License: LGPL]
 A             plugins/runner/latlon/LatLonRunner.cpp   lib/runners/LatLonRunner.cpp#1152723 [License: LGPL]
 A             plugins/runner/latlon/LatLonRunner.h   lib/runners/LatLonRunner.h#1152723 [License: LGPL]
 A             plugins/runner/localdatabase (directory)  
 A             plugins/runner/localdatabase/CMakeLists.txt  
 A             plugins/runner/localdatabase/LocalDatabasePlugin.cpp   [License: LGPL]
 A             plugins/runner/localdatabase/LocalDatabasePlugin.h   lib/routing/AbstractRoutingProvider.cpp#1152723 [License: LGPL]
 A             plugins/runner/localdatabase/LocalDatabaseRunner.cpp   lib/runners/LocalDatabaseRunner.cpp#1152723 [License: LGPL]
 A             plugins/runner/localdatabase/LocalDatabaseRunner.h   lib/runners/LocalDatabaseRunner.h#1152723 [License: LGPL]
 A             plugins/runner/namefinder (directory)  
 A             plugins/runner/namefinder/CMakeLists.txt  
 A             plugins/runner/namefinder/NameFinderPlugin.cpp   [License: LGPL]
 A             plugins/runner/namefinder/NameFinderPlugin.h   lib/routing/AbstractRoutingProvider.cpp#1152723 [License: LGPL]
 A             plugins/runner/namefinder/OnfRunner.cpp   lib/runners/OnfRunner.cpp#1152723 [License: LGPL]
 A             plugins/runner/namefinder/OnfRunner.h   lib/runners/OnfRunner.h#1152723 [License: LGPL]
 A             plugins/runner/nominatim (directory)  
 A             plugins/runner/nominatim/CMakeLists.txt  
 A             plugins/runner/nominatim/NominatimPlugin.cpp   [License: LGPL]
 A             plugins/runner/nominatim/NominatimPlugin.h   lib/routing/AbstractRoutingProvider.cpp#1152723 [License: LGPL]
 A             plugins/runner/nominatim/OsmNominatimRunner.cpp   lib/runners/OsmNominatimRunner.cpp#1152723 [License: LGPL]
 A             plugins/runner/nominatim/OsmNominatimRunner.h   lib/runners/OsmNominatimRunner.h#1152723 [License: LGPL]
 A             plugins/runner/openrouteservice (directory)  
 A             plugins/runner/openrouteservice/CMakeLists.txt  
 A             plugins/runner/openrouteservice/OpenRouteServicePlugin.cpp   [License: LGPL]
 A             plugins/runner/openrouteservice/OpenRouteServicePlugin.h   lib/routing/AbstractRoutingProvider.cpp#1152723 [License: LGPL]
 A             plugins/runner/openrouteservice/OpenRouteServiceRunner.cpp   [License: LGPL]
 A             plugins/runner/openrouteservice/OpenRouteServiceRunner.h   lib/routing/OrsRoutingProvider.h#1152723 [License: LGPL]
 A             plugins/runner/yours (directory)  
 A             plugins/runner/yours/CMakeLists.txt  
 A             plugins/runner/yours/YoursPlugin.cpp   [License: LGPL]
 A             plugins/runner/yours/YoursPlugin.h   lib/routing/AbstractRoutingProvider.cpp#1152723 [License: LGPL]
 A             plugins/runner/yours/YoursRunner.cpp   [License: LGPL]
 A             plugins/runner/yours/YoursRunner.h   lib/routing/YoursRoutingProvider.h#1152723 [License: LGPL]


http://websvn.kde.org/?view=rev&revision=1153659