From dfa59f98784d7bcd24f38a83049f98cf7381983a Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Fri, 24 May 2013 11:07:59 -0300 Subject: Trying the googlemaps integration --- googlemaps/0/0/0.png | Bin 0 -> 159 bytes googlemaps/googlemaps.dgml | 80 +++++++++++++++++++++++++++ googlemaps/preview.png | Bin 0 -> 22138 bytes googlesat/0/0/0.jpg | Bin 0 -> 10036 bytes googlesat/bicycle/0/0/0.png | Bin 0 -> 191 bytes googlesat/googlesat.dgml | 130 ++++++++++++++++++++++++++++++++++++++++++++ googlesat/preview.png | Bin 0 -> 28358 bytes googlesat/streets/0/0/0.png | Bin 0 -> 191 bytes qt-ui/globe.cpp | 2 +- 9 files changed, 211 insertions(+), 1 deletion(-) create mode 100644 googlemaps/0/0/0.png create mode 100644 googlemaps/googlemaps.dgml create mode 100644 googlemaps/preview.png create mode 100644 googlesat/0/0/0.jpg create mode 100644 googlesat/bicycle/0/0/0.png create mode 100644 googlesat/googlesat.dgml create mode 100644 googlesat/preview.png create mode 100644 googlesat/streets/0/0/0.png diff --git a/googlemaps/0/0/0.png b/googlemaps/0/0/0.png new file mode 100644 index 000000000..f7ab669ca Binary files /dev/null and b/googlemaps/0/0/0.png differ diff --git a/googlemaps/googlemaps.dgml b/googlemaps/googlemaps.dgml new file mode 100644 index 000000000..01a63864b --- /dev/null +++ b/googlemaps/googlemaps.dgml @@ -0,0 +1,80 @@ + + + + + + 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 new file mode 100644 index 000000000..aa3181d29 Binary files /dev/null and b/googlemaps/preview.png differ diff --git a/googlesat/0/0/0.jpg b/googlesat/0/0/0.jpg new file mode 100644 index 000000000..4b9b73295 Binary files /dev/null and b/googlesat/0/0/0.jpg differ diff --git a/googlesat/bicycle/0/0/0.png b/googlesat/bicycle/0/0/0.png new file mode 100644 index 000000000..febf01a9c Binary files /dev/null and b/googlesat/bicycle/0/0/0.png differ diff --git a/googlesat/googlesat.dgml b/googlesat/googlesat.dgml new file mode 100644 index 000000000..0b70f14da --- /dev/null +++ b/googlesat/googlesat.dgml @@ -0,0 +1,130 @@ + + + + + + Google Satellite + earth + googlesat + + true + A global roadmap provided by Google.]]> + + 900 + 3700 + true + + + + + + + + + + earth/googlesat + + + + + + earth/googlesat/streets + + + + + + + earth/googlesat/bicycle + + + + + + + + + cityplacemarks.kml + placemark + + + baseplacemarks.kml + placemark + + + elevplacemarks.kml + placemark + + + otherplacemarks.kml + placemark + + + boundaryplacemarks.kml + placemark + + + + + + true + true + + + true + true + + + true + true + + + true + true + + + + true + true + + + false + false + + + false + false + + + false + false + + + + + true + true + + + false + true + + + + +
+ Transportation +
+
+ Bicycle Routes +
+
+ Coordinate Grid +
+
+ Places of Interest +
+ + + diff --git a/googlesat/preview.png b/googlesat/preview.png new file mode 100644 index 000000000..5048d0a0f Binary files /dev/null and b/googlesat/preview.png differ diff --git a/googlesat/streets/0/0/0.png b/googlesat/streets/0/0/0.png new file mode 100644 index 000000000..febf01a9c Binary files /dev/null and b/googlesat/streets/0/0/0.png differ diff --git a/qt-ui/globe.cpp b/qt-ui/globe.cpp index 7eee4fb2a..19dbb048b 100644 --- a/qt-ui/globe.cpp +++ b/qt-ui/globe.cpp @@ -19,7 +19,7 @@ GlobeGPS::GlobeGPS(QWidget* parent) : MarbleWidget(parent), loadedDives(0) { - setMapThemeId("earth/bluemarble/bluemarble.dgml"); + setMapThemeId("earth/googlesat/googlesat.dgml"); //setMapThemeId("earth/openstreetmap/openstreetmap.dgml"); setProjection(Marble::Spherical); -- cgit v1.2.3-70-g09d2