marble:akssps011s-marble.git
7 years ago- Adding easier access to float items
Torsten Rahn [Sat, 14 Aug 2010 12:43:40 +0000 (12:43 +0000)]
- Adding easier access to float items

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1163577 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agogeodata: various parsing and styling fixes
Thibaut Gridel [Fri, 13 Aug 2010 17:33:28 +0000 (17:33 +0000)]
geodata: various parsing and styling fixes

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1163316 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agomute too verbose debug
Thibaut Gridel [Fri, 13 Aug 2010 17:33:22 +0000 (17:33 +0000)]
mute too verbose debug

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1163315 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoMarbleControlBox: center on selected placemark
Thibaut Gridel [Fri, 13 Aug 2010 17:33:16 +0000 (17:33 +0000)]
MarbleControlBox: center on selected placemark

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1163314 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoGeometryLayer: a permanent layer which replaces Georender plugin
Thibaut Gridel [Thu, 12 Aug 2010 22:36:24 +0000 (22:36 +0000)]
GeometryLayer: a permanent layer which replaces Georender plugin

The GeometryLayer is added as a permanent layer in MarbleModel, because we
need to rely on this layer without a plugin.
There are many fixes compared to the GeoRender code:
 - it is not a Model/View class anymore as that brought a lot of unused
   boilerplate and we don't react to model signals anyway
 - no more hacks to try and determine styling on the fly, this is
   delegated after file loading in PlacemarkManager
 - internal data in private class

GeoDataFeature::style now points at the current style identified in the
document. The setStyle doesn't do it (yet).

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1162872 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoCompile.
Dennis Nienhüser [Thu, 12 Aug 2010 19:28:38 +0000 (19:28 +0000)]
Compile.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1162824 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoExport class (public plugin interface)
Dennis Nienhüser [Wed, 11 Aug 2010 21:51:31 +0000 (21:51 +0000)]
Export class (public plugin interface)

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1162401 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoCorrected indentation problem.
Bastian Holst [Wed, 11 Aug 2010 16:14:21 +0000 (16:14 +0000)]
Corrected indentation problem.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1162191 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoPatch by Harshit Jain:
Bastian Holst [Wed, 11 Aug 2010 16:05:13 +0000 (16:05 +0000)]
Patch by Harshit Jain:
1) The older 'Sun Control' dialog box is broken into new 'Sun Control'
dialog box and 'Time Control' dialog box.
2) The 'Configure Marble Desktop Globe' has 'Date and Time' tab which
has configuration features for time.
3) The current time is shown in status bar.
4) The icon of the Sun is shown on the Earth for zenith feature in 'Sun
Control' dialog box.
5) Toolbar action button are added for shadow, night map and zenith
features (although the shadow toolbar buttons is disabled in
this patch because of lack of an appropriate icon).
6) The name of ExtDateTime class is changed to MarbleClock. The license
of David Roberts (author of ExtDateTime class) has also been updated for
this class with this permissions.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1162190 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years ago- Don't suggest an "http://" Url for proxy.
Torsten Rahn [Wed, 11 Aug 2010 06:14:41 +0000 (06:14 +0000)]
- Don't suggest an "http://" Url for proxy.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1161900 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoadded myself to the authors list
Wes Hardaker [Tue, 10 Aug 2010 20:57:44 +0000 (20:57 +0000)]
added myself to the authors list

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1161800 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoNominatim key is city, not town. Add whitespace after comma when joining address...
Dennis Nienhüser [Tue, 10 Aug 2010 18:39:30 +0000 (18:39 +0000)]
Nominatim key is city, not town. Add whitespace after comma when joining address parts.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1161747 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoExtract country info as well in reverse geocoding.
Dennis Nienhüser [Tue, 10 Aug 2010 18:39:29 +0000 (18:39 +0000)]
Extract country info as well in reverse geocoding.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1161746 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoBookmark Name suggestion added on the basis of distance and reverseGeocoding the...
Gaurav Gupta [Tue, 10 Aug 2010 16:09:53 +0000 (16:09 +0000)]
Bookmark Name suggestion added on the basis of distance and reverseGeocoding the coordinates

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1161691 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoSplitting the seperate tabs out of the MarbleControlBox class:
Bastian Holst [Mon, 9 Aug 2010 12:53:03 +0000 (12:53 +0000)]
Splitting the seperate tabs out of the MarbleControlBox class:
Current position

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1160997 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoSplitting the seperate tabs out of the MarbleControlBox class:
Bastian Holst [Mon, 9 Aug 2010 10:31:53 +0000 (10:31 +0000)]
Splitting the seperate tabs out of the MarbleControlBox class:
Legend tab

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1160951 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoAdd traveling salesman router plugin. Disabled in CMakeLists.txt for now as it shows...
Dennis Nienhüser [Sun, 8 Aug 2010 14:00:30 +0000 (14:00 +0000)]
Add traveling salesman router plugin. Disabled in CMakeLists.txt for now as it shows no advantage over any other.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1160597 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agofix 'work offline' status indicator setting not being restored after startup
Dennis Nienhüser [Sun, 8 Aug 2010 12:22:59 +0000 (12:22 +0000)]
fix 'work offline' status indicator setting not being restored after startup

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1160571 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoFix the position of the bookmark menu entry for the KDE version
Dennis Nienhüser [Sun, 8 Aug 2010 10:43:39 +0000 (10:43 +0000)]
Fix the position of the bookmark menu entry for the KDE version

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1160563 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years ago- Added Keyboard accelerators
Torsten Rahn [Sun, 8 Aug 2010 10:43:14 +0000 (10:43 +0000)]
- Added Keyboard accelerators

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1160562 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoAdded layout and a few fixes to the bookmark dialogs.
Torsten Rahn [Sun, 8 Aug 2010 10:32:23 +0000 (10:32 +0000)]
Added layout and a few fixes to the bookmark dialogs.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1160561 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years ago- Fixing the position of the Bookmark menu entry for the Qt version.
Torsten Rahn [Sun, 8 Aug 2010 09:56:46 +0000 (09:56 +0000)]
- Fixing the position of the Bookmark menu entry for the Qt version.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1160556 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoNormalize Qt includes. Please use <module/class> instead of just <class>.
Dennis Nienhüser [Sun, 8 Aug 2010 09:39:42 +0000 (09:39 +0000)]
Normalize Qt includes. Please use <module/class> instead of just <class>.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1160555 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoset LC_ALL to C in the gosmore process environment
Dennis Nienhüser [Sun, 8 Aug 2010 09:31:17 +0000 (09:31 +0000)]
set LC_ALL to C in the gosmore process environment

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1160554 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoAdding Bookmark Feature in QT and KDE version
Gaurav Gupta [Sun, 8 Aug 2010 08:16:50 +0000 (08:16 +0000)]
Adding Bookmark Feature in QT and KDE version

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1160528 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoRecreated .cache files.
Bastian Holst [Sat, 7 Aug 2010 13:00:24 +0000 (13:00 +0000)]
Recreated .cache files.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1160231 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoFixed typo in Marble PlacemarkDialog
Bastian Holst [Sat, 7 Aug 2010 13:00:17 +0000 (13:00 +0000)]
Fixed typo in Marble PlacemarkDialog

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1160230 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoPatch by Harshit Jain:
Bastian Holst [Sat, 7 Aug 2010 12:55:51 +0000 (12:55 +0000)]
Patch by Harshit Jain:
* displaying the timezone( gmt/dst ) and state of city placemarks in Placemark Info Dialog Box.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1160228 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoGeoDataTree: no editable fields yet
Thibaut Gridel [Sat, 7 Aug 2010 09:31:07 +0000 (09:31 +0000)]
GeoDataTree: no editable fields yet

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1160167 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoPositionTracking: styling the gps track
Thibaut Gridel [Fri, 6 Aug 2010 22:01:26 +0000 (22:01 +0000)]
PositionTracking: styling the gps track

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1160061 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoNormalize qt includes. Please use <module/class> instead of <class> to include qt...
Dennis Nienhüser [Fri, 6 Aug 2010 20:22:37 +0000 (20:22 +0000)]
Normalize qt includes. Please use <module/class> instead of <class> to include qt headers.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1160020 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agofix compiler warning (newline at eol)
Dennis Nienhüser [Fri, 6 Aug 2010 19:34:33 +0000 (19:34 +0000)]
fix compiler warning (newline at eol)

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1160004 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agonew routing plugin using routino for offline routing
Niko Sams [Fri, 6 Aug 2010 17:53:36 +0000 (17:53 +0000)]
new routing plugin using routino for offline routing

See: http://www.routino.org/

Usage:
copy generated nodes.mem, segments.mem, ways.mem and profiles.xml,into
~/.local/share/marble/maps/earth/routino and make the router binary callable in
PATH trough routino-router.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1159987 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoFix vertical size policies to avoid unnecessary vertical scrollbars.
Dennis Nienhüser [Thu, 5 Aug 2010 11:02:27 +0000 (11:02 +0000)]
Fix vertical size policies to avoid unnecessary vertical scrollbars.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1159430 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoMarbleModel: on theme change, detect the previous theme's geodata files
Thibaut Gridel [Wed, 4 Aug 2010 22:26:01 +0000 (22:26 +0000)]
MarbleModel: on theme change, detect the previous theme's geodata files
and close them if they are not used in the new one.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1159264 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoremove AbstractFileviewItem
Thibaut Gridel [Wed, 4 Aug 2010 18:17:19 +0000 (18:17 +0000)]
remove AbstractFileviewItem

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1159202 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agodrop gps/ and AbstractLayer/ completely!
Thibaut Gridel [Wed, 4 Aug 2010 18:17:10 +0000 (18:17 +0000)]
drop gps/ and AbstractLayer/ completely!

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1159201 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoPositionTracking: name the placemarks and improve tracking representation
Thibaut Gridel [Wed, 4 Aug 2010 17:36:36 +0000 (17:36 +0000)]
PositionTracking: name the placemarks and improve tracking representation

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1159190 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoAlso show the combo box if only one route exists
Dennis Nienhüser [Tue, 3 Aug 2010 08:10:35 +0000 (08:10 +0000)]
Also show the combo box if only one route exists

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1158604 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years ago-pedantic
André Wöbbeking [Mon, 2 Aug 2010 20:56:27 +0000 (20:56 +0000)]
-pedantic

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1158490 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoRe-enable auto zoom on the (current=best) route after clicking on 'Get Directions...
Dennis Nienhüser [Mon, 2 Aug 2010 18:57:30 +0000 (18:57 +0000)]
Re-enable auto zoom on the (current=best) route after clicking on 'Get Directions' button

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1158409 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoAllow slacker routes to replace similar ones with lower scores. Fix detection whether...
Dennis Nienhüser [Mon, 2 Aug 2010 18:47:40 +0000 (18:47 +0000)]
Allow slacker routes to replace similar ones with lower scores. Fix detection whether routes contain turn instructions.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1158407 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoCan't assert that a route request exists in updateRoute(), the update can be triggere...
Dennis Nienhüser [Sun, 1 Aug 2010 19:09:42 +0000 (19:09 +0000)]
Can't assert that a route request exists in updateRoute(), the update can be triggered by modifying the very first point. Fixes marble crashing when modifying route points before calculating directions (thanks jmho).

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1157975 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoChanged to US English spelling of meter, rather than British 'metre'. Don't worry...
Andrew Coles [Fri, 30 Jul 2010 21:39:16 +0000 (21:39 +0000)]
Changed to US English spelling of meter, rather than British 'metre'.  Don't worry, I'll
translate it back in en_GB ;).

SVN_SILENT

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1157380 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoProof-reading:
Andrew Coles [Fri, 30 Jul 2010 21:37:41 +0000 (21:37 +0000)]
Proof-reading:
- recenter -> re-center - as it is not really a word, it needs to be hyphenated
- gps -> GPS
- missing period at end of tool-tip, and slight rewording.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1157379 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoAdd missing tr calls. CCBUG: 246051
Dennis Nienhüser [Fri, 30 Jul 2010 18:20:37 +0000 (18:20 +0000)]
Add missing tr calls. CCBUG: 246051

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1157335 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoAdd tr() calls to tooltips. CCBUG: 246048
Dennis Nienhüser [Fri, 30 Jul 2010 17:37:48 +0000 (17:37 +0000)]
Add tr() calls to tooltips. CCBUG: 246048

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1157327 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoremove AbstractScanlineTextureMapper::resizeMap() and the therein updated members
Bernhard Beschow [Fri, 30 Jul 2010 17:30:14 +0000 (17:30 +0000)]
remove AbstractScanlineTextureMapper::resizeMap() and the therein updated members

According to the single point of truth principle, calculate the respective values dynamically rather than relying on an external entity to keep them synchronized to the
view parameters.
The performance impact should not be dramatic since they are computed once before an expensive operation.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1157325 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoassert that a texture mapper actually gets a texture
Bernhard Beschow [Fri, 30 Jul 2010 17:05:54 +0000 (17:05 +0000)]
assert that a texture mapper actually gets a texture

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1157316 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agocleanup: remove dead code & unused attributes, protect a method
Bernhard Beschow [Fri, 30 Jul 2010 17:05:53 +0000 (17:05 +0000)]
cleanup: remove dead code & unused attributes, protect a method

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1157315 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agofix segfault (instructions can be empty when waypoints are not)
Dennis Nienhüser [Thu, 29 Jul 2010 19:58:07 +0000 (19:58 +0000)]
fix segfault (instructions can be empty when waypoints are not)

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1156840 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agogit-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1156835 283d02a7...
Siddharth Srivastava [Thu, 29 Jul 2010 19:48:31 +0000 (19:48 +0000)]
git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1156835 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agofix route parsing for yours
Dennis Nienhüser [Thu, 29 Jul 2010 19:25:05 +0000 (19:25 +0000)]
fix route parsing for yours

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1156829 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agofixed compiler warnings
Siddharth Srivastava [Thu, 29 Jul 2010 19:20:03 +0000 (19:20 +0000)]
fixed compiler warnings

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1156825 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agofix compiler warnings (init order, unused variable)
Dennis Nienhüser [Thu, 29 Jul 2010 19:13:03 +0000 (19:13 +0000)]
fix compiler warnings (init order, unused variable)

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1156824 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoexport routing model and manager used by the routing plugin.
Dennis Nienhüser [Thu, 29 Jul 2010 19:13:01 +0000 (19:13 +0000)]
export routing model and manager used by the routing plugin.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1156823 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agodownload region returns a vector of pyramids now
Dennis Nienhüser [Thu, 29 Jul 2010 19:13:00 +0000 (19:13 +0000)]
download region returns a vector of pyramids now

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1156822 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoDon't hide the virtual method.
Dennis Nienhüser [Thu, 29 Jul 2010 19:12:59 +0000 (19:12 +0000)]
Don't hide the virtual method.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1156821 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoAdded Auto Centering, Auto Zooming features while navigating. Added a routing informa...
Siddharth Srivastava [Thu, 29 Jul 2010 18:43:42 +0000 (18:43 +0000)]
Added Auto Centering, Auto Zooming features while navigating. Added a routing information plugin showing the time and distance remaining along the route. The current instruction shows up on the while navigating along the route and before reaching it. Added support for downloading route for offline usage. The region to be downloaded for the offline usage  can be specified according to an offset around the route and the tile levels required.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1156807 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoFix some compiler warnings (unused variables, init order, missing brackets)
Dennis Nienhüser [Wed, 28 Jul 2010 20:41:08 +0000 (20:41 +0000)]
Fix some compiler warnings (unused variables, init order, missing brackets)

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1156288 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoShow alternative routes in the map, order them in the drop down box by score (rudimen...
Dennis Nienhüser [Wed, 28 Jul 2010 20:11:40 +0000 (20:11 +0000)]
Show alternative routes in the map, order them in the drop down box by score (rudimentary only considering whether instructions are there atm), filter similar routes with lower score (similar = deviation to other route < 0.2 of the total length), start working on a semantic description of routes (deactivated for now).
Add coordinates from reverse geocoding requests to runner signals to distinguish results (needed to reduce the total number of runner managers in the future).
Provide nominatim reverse geocoding result also in a more structured way to be able to separate address details.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1156275 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoMake it compile again. Replace qWarning with qDebug. Do not ignore kml parsing errors...
Dennis Nienhüser [Wed, 28 Jul 2010 18:55:04 +0000 (18:55 +0000)]
Make it compile again. Replace qWarning with qDebug. Do not ignore kml parsing errors, otherwise it segfaults.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1156235 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agorealize that StackedTiles are never empty => remove StackedTile::hasTiles()
Bernhard Beschow [Tue, 27 Jul 2010 21:59:02 +0000 (21:59 +0000)]
realize that StackedTiles are never empty => remove StackedTile::hasTiles()

StackedTiles can now be assigned tiles via the constructor only.
The constructor asserts that more than zero tiles are passed.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1155696 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agodead code--: remove tile states
Bernhard Beschow [Tue, 27 Jul 2010 21:58:59 +0000 (21:58 +0000)]
dead code--: remove tile states

TextureTiles are never empty because they always hold a valid QImage (see the Q_ASSERTions in TextureTile).
Although the tile state can also be scaled or expired, the tile states are only checked for being empty.
Hence, these comparisons are needless.

Similar to the above reasoning, StackedTile::deriveCompletionState() will always result in the TileComplete state.
That way, checking for the state of a StackedTile is equivalent to checking whether it contains tiles.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1155695 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoconst'ify GeoSceneTexture in TileLoader and StackedTileLoader
Bernhard Beschow [Tue, 27 Jul 2010 10:35:46 +0000 (10:35 +0000)]
const'ify GeoSceneTexture in TileLoader and StackedTileLoader

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1155435 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoconst'ify GeoSceneTexture::downloadUrl()
Bernhard Beschow [Tue, 27 Jul 2010 10:35:45 +0000 (10:35 +0000)]
const'ify GeoSceneTexture::downloadUrl()

Even though this method changes the internal state, it may be const because the compiler is forced to invoke this method for different TileIds.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1155434 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoExport MarbleAbstractRunner and RouteSkeleton used in plugins. Fixes linking with...
Dennis Nienhüser [Mon, 26 Jul 2010 17:56:40 +0000 (17:56 +0000)]
Export MarbleAbstractRunner and RouteSkeleton used in plugins. Fixes linking with -fvisibility=hidden.
CCMAIL: binner@kde.org

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1155009 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoMove MarbleAbstractRunner* from src/lib/runners/ to src/lib. Create a RunnerPlugin...
Dennis Nienhüser [Fri, 23 Jul 2010 17:34:34 +0000 (17:34 +0000)]
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 gosmore 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.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1153659 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoremove GeoSceneTexture parameter from StackedTileLoader::mergeDecorations()
Bernhard Beschow [Wed, 21 Jul 2010 20:36:17 +0000 (20:36 +0000)]
remove GeoSceneTexture parameter from StackedTileLoader::mergeDecorations()

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1152723 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agodead code--
Bernhard Beschow [Wed, 21 Jul 2010 20:36:16 +0000 (20:36 +0000)]
dead code--

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1152722 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agono value returned from function and callers don't
Dirk Mueller [Mon, 19 Jul 2010 14:18:11 +0000 (14:18 +0000)]
no value returned from function and callers don't
expect a return value -> make it void

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1151760 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoalways return something
Dirk Mueller [Mon, 19 Jul 2010 11:13:44 +0000 (11:13 +0000)]
always return something

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1151693 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years ago- Don't crash on startup if the map theme doesn't have texture layers.
Torsten Rahn [Mon, 19 Jul 2010 09:57:28 +0000 (09:57 +0000)]
- Don't crash on startup if the map theme doesn't have texture layers.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1151664 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoFileLoader: provide a PNT file loader so that GeoPainter could render those
Thibaut Gridel [Sun, 18 Jul 2010 21:52:43 +0000 (21:52 +0000)]
FileLoader: provide a PNT file loader so that GeoPainter could render those

This does not deprecate or change in any way the current PNT file loading
from DGML files, still using VectorComposer

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1151350 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoLatLonBox: fixes
Thibaut Gridel [Sun, 18 Jul 2010 21:49:56 +0000 (21:49 +0000)]
LatLonBox: fixes
- isEmpty shows if the box is uninitialised
- center() should return 0,0 if box is not initialised
- center() should normalize longitude result
- united returns the bounding box of this and the given one

- MultiGeometry uses |= to get the bounding box of all its geometries

at last, testing in TestGeoData.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1151349 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoOnfRunner: feed a new vector with copies of placemarks
Thibaut Gridel [Sat, 17 Jul 2010 22:21:57 +0000 (22:21 +0000)]
OnfRunner: feed a new vector with copies of placemarks

This is because the original placemarks get deleted along with the
GeoDatadocument which got parsed

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1151118 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoChange license header to match that of the other marble files (point to LICENSE.txt...
Dennis Nienhüser [Sat, 17 Jul 2010 21:59:10 +0000 (21:59 +0000)]
Change license header to match that of the other marble files (point to LICENSE.txt). Acknowledged by Henry de Valence on IRC.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1151114 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoPlacemark: provide coordinates for all geometries
Thibaut Gridel [Sat, 17 Jul 2010 16:40:57 +0000 (16:40 +0000)]
Placemark: provide coordinates for all geometries

- combine latLonBoxes with operator+=
- provide virtual latLonAltBox for GeoDataGeometry and give implementation
  for multigeometries as well
- simplify GeoDataPlacemark::coordinates if it has a geometry

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1151064 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoGeoRenderGeometry: do not render LineStrings as polygons as well
Thibaut Gridel [Sat, 17 Jul 2010 09:09:45 +0000 (09:09 +0000)]
GeoRenderGeometry: do not render LineStrings as polygons as well

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1150967 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoFileManager: setting a fileManager should first disconnect from previous one
Thibaut Gridel [Sat, 17 Jul 2010 09:09:39 +0000 (09:09 +0000)]
FileManager: setting a fileManager should first disconnect from previous one

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1150966 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoGeoDataTreeModel: provide column information for Popularity
Thibaut Gridel [Sat, 17 Jul 2010 09:09:33 +0000 (09:09 +0000)]
GeoDataTreeModel: provide column information for Popularity

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1150965 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoGeoDataTreeModel: remove parenting hack now that
Thibaut Gridel [Sat, 17 Jul 2010 09:00:31 +0000 (09:00 +0000)]
GeoDataTreeModel: remove parenting hack now that
placemark and multigeometry use pointer to set geometry

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1150964 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoKml handlers: use dynamic cast for tests
Thibaut Gridel [Sat, 17 Jul 2010 09:00:24 +0000 (09:00 +0000)]
Kml handlers: use dynamic cast for tests

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1150963 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoGeoDataPlacemark: use setGeometry(GeoDataGeometry*) instead of references
Thibaut Gridel [Sat, 17 Jul 2010 09:00:17 +0000 (09:00 +0000)]
GeoDataPlacemark: use setGeometry(GeoDataGeometry*) instead of references

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1150962 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoGeoDataGeometry: get rid of geometryId for type determination
Thibaut Gridel [Sat, 17 Jul 2010 09:00:09 +0000 (09:00 +0000)]
GeoDataGeometry: get rid of geometryId for type determination

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1150961 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoGeoDataFeature: get rid of featureId for type determination
Thibaut Gridel [Sat, 17 Jul 2010 09:00:02 +0000 (09:00 +0000)]
GeoDataFeature: get rid of featureId for type determination

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1150960 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoGeoDataTree: get rid of NodeType for type determination
Thibaut Gridel [Sat, 17 Jul 2010 08:59:54 +0000 (08:59 +0000)]
GeoDataTree: get rid of NodeType for type determination

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1150959 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoGeoDataMultiGeometry: use append(GeoDataGeometry*) instead of append(GeoDataGeometry&)
Thibaut Gridel [Fri, 16 Jul 2010 22:36:10 +0000 (22:36 +0000)]
GeoDataMultiGeometry: use append(GeoDataGeometry*) instead of append(GeoDataGeometry&)

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1150837 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoGeoDataFeature: drop copy converters to downcast classes
Thibaut Gridel [Fri, 16 Jul 2010 22:36:02 +0000 (22:36 +0000)]
GeoDataFeature: drop copy converters to downcast classes

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1150836 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoGeoDataContainer: use append(GeoDataFeature*) instead of append(GeoDataFeature&)
Thibaut Gridel [Fri, 16 Jul 2010 22:35:55 +0000 (22:35 +0000)]
GeoDataContainer: use append(GeoDataFeature*) instead of append(GeoDataFeature&)

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1150835 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoGeoDataContainer: use folderList instead of folders
Thibaut Gridel [Fri, 16 Jul 2010 22:35:48 +0000 (22:35 +0000)]
GeoDataContainer: use folderList instead of folders

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1150834 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoGeoDataContainer: use featureList instead of features
Thibaut Gridel [Fri, 16 Jul 2010 22:35:41 +0000 (22:35 +0000)]
GeoDataContainer: use featureList instead of features

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1150833 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoMarbleGeoDataModel is broken and not used
Thibaut Gridel [Fri, 16 Jul 2010 22:35:34 +0000 (22:35 +0000)]
MarbleGeoDataModel is broken and not used

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1150832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoGeoDataContainer: use placemarkList and drop vector of data
Thibaut Gridel [Fri, 16 Jul 2010 22:35:27 +0000 (22:35 +0000)]
GeoDataContainer: use placemarkList and drop vector of data

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1150831 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoGeoDataTreeModel: provide visibility checkbox and decoration
Thibaut Gridel [Fri, 16 Jul 2010 22:35:20 +0000 (22:35 +0000)]
GeoDataTreeModel: provide visibility checkbox and decoration

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1150830 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoFileViewWidget: display the treeModel
Thibaut Gridel [Fri, 16 Jul 2010 22:35:13 +0000 (22:35 +0000)]
FileViewWidget: display the treeModel

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1150829 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoMarblePlacemarkModel: use QVector<GeoDataPlacemark*>
Thibaut Gridel [Fri, 16 Jul 2010 22:35:07 +0000 (22:35 +0000)]
MarblePlacemarkModel: use QVector<GeoDataPlacemark*>

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1150828 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agoPlacemarkLayout: fix the filtering according to PopularityIndex
Thibaut Gridel [Fri, 16 Jul 2010 22:34:59 +0000 (22:34 +0000)]
PlacemarkLayout: fix the filtering according to PopularityIndex

loading a document with no popularity values should not disable
filtering altogether

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1150827 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agofix updates of MarblePlacemarkModel:
Thibaut Gridel [Fri, 16 Jul 2010 22:34:53 +0000 (22:34 +0000)]
fix updates of MarblePlacemarkModel:

- the sort proxies should use dynamic sorting to react to changes
- removing a document should call layoutChanged as proxies don't update otherwise

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1150826 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 years agofix warning for overloaded setParent
Thibaut Gridel [Fri, 16 Jul 2010 22:34:47 +0000 (22:34 +0000)]
fix warning for overloaded setParent

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdeedu/marble@1150825 283d02a7-25f6-0310-bc7c-ecb5cbfe19da