From 92ee374494b83c47115f6f479530e7e9678ad562 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sat, 25 May 2013 08:28:35 -0700 Subject: Find Google maps in Subsurface's source tree This way the user doesn't need to move the two folders googlemaps and googlesat around in the filesystem. This only works if Subsurface is started from the build directory - it doesn't work when Subsurface is installed (and it doesn't at all address the need to install these files and bundle them as well). I'd consider this a hack to show how the real solution should work. There is one more part of this that is a hack: Marble no longer searches its default data directory; the path we set replaces the Marble system search path. Sadly, Marble doesn't support paths the way Unix thinks of them with multiple directories, separated by ':'. So this means that Marble no longer finds any of its default icons. For most of them that seems fine as I don't think lacking the icons for "manned_landing", "robotic_rover", "unmanned_hard_landing" or the various types of places of worship that Marble supports is necessarily a big issues for Subsurface, but at least the default_location icon seemed important. And since we now need to carry our own, I replaced the boring circle with a tiny dive flag. Signed-off-by: Dirk Hohndel --- googlemaps/0/0/0.png | Bin 159 -> 0 bytes googlemaps/googlemaps.dgml | 80 --------------------------------------------- googlemaps/preview.png | Bin 22138 -> 0 bytes 3 files changed, 80 deletions(-) delete mode 100644 googlemaps/0/0/0.png delete mode 100644 googlemaps/googlemaps.dgml delete mode 100644 googlemaps/preview.png (limited to 'googlemaps') diff --git a/googlemaps/0/0/0.png b/googlemaps/0/0/0.png deleted file mode 100644 index f7ab669ca..000000000 Binary files a/googlemaps/0/0/0.png and /dev/null differ diff --git a/googlemaps/googlemaps.dgml b/googlemaps/googlemaps.dgml deleted file mode 100644 index 01a63864b..000000000 --- a/googlemaps/googlemaps.dgml +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - Google Maps - earth - googlemaps - - true - A global roadmap provided by Google.]]> - - 900 - 3700 - true - - - - - - - - - - earth/googlemaps - - - - - - - - cityplacemarks.kml - placemark - - - baseplacemarks.kml - placemark - - - elevplacemarks.kml - placemark - - - otherplacemarks.kml - placemark - - - boundaryplacemarks - placemark - - - - - - true - true - - - true - true - - - true - true - - - true - true - - - -
- Coordinate Grid -
- - - diff --git a/googlemaps/preview.png b/googlemaps/preview.png deleted file mode 100644 index aa3181d29..000000000 Binary files a/googlemaps/preview.png and /dev/null differ -- cgit v1.2.3-70-g09d2