diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2013-05-24 07:16:37 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2013-05-24 07:16:37 -0700 |
| commit | 5926f9d4dfefba022dd2e436d9b8f4b0e38da345 (patch) | |
| tree | 476df47f72789059008fb673e3fc2886b3717acd | |
| parent | 5e0a3cdad8d02eff7ffa7c2abb4ac48c332f144f (diff) | |
| parent | dfa59f98784d7bcd24f38a83049f98cf7381983a (diff) | |
| download | subsurface-5926f9d4dfefba022dd2e436d9b8f4b0e38da345.tar.gz | |
Merge branch 'googleEarth' of https://github.com/tcanabrava/subsurface
| -rw-r--r-- | googlemaps/0/0/0.png | bin | 0 -> 159 bytes | |||
| -rw-r--r-- | googlemaps/googlemaps.dgml | 80 | ||||
| -rw-r--r-- | googlemaps/preview.png | bin | 0 -> 22138 bytes | |||
| -rw-r--r-- | googlesat/0/0/0.jpg | bin | 0 -> 10036 bytes | |||
| -rw-r--r-- | googlesat/bicycle/0/0/0.png | bin | 0 -> 191 bytes | |||
| -rw-r--r-- | googlesat/googlesat.dgml | 130 | ||||
| -rw-r--r-- | googlesat/preview.png | bin | 0 -> 28358 bytes | |||
| -rw-r--r-- | googlesat/streets/0/0/0.png | bin | 0 -> 191 bytes | |||
| -rw-r--r-- | qt-ui/globe.cpp | 2 |
9 files changed, 211 insertions, 1 deletions
diff --git a/googlemaps/0/0/0.png b/googlemaps/0/0/0.png Binary files differnew file mode 100644 index 000000000..f7ab669ca --- /dev/null +++ b/googlemaps/0/0/0.png 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 @@ +<?xml version="1.0" encoding="UTF-8"?> +<dgml xmlns="http://edu.kde.org/marble/dgml/2.0"> + <document> + + <head> + <name>Google Maps</name> + <target>earth</target> + <theme>googlemaps</theme> + <icon pixmap="preview.png"/> + <visible>true</visible> + <description><![CDATA[<p>A <i>global roadmap</i> provided by Google.]]></description> + <zoom> + <minimum> 900 </minimum> + <maximum> 3700 </maximum> + <discrete> true </discrete> + </zoom> + </head> + + <map bgcolor="#000000"> + <canvas/> + <target/> + <layer name="googlemaps" backend="texture" > + <!-- Let Google Maps rendered tiles expire after one week + (604800 seconds) --> + <texture name="map" expire="604800" > + <sourcedir format="PNG"> earth/googlemaps </sourcedir> + <storageLayout levelZeroColumns="1" levelZeroRows="1" maximumTileLevel="20" mode="Custom" /> + <projection name="Mercator" /> + <downloadUrl protocol="http" host="mt.google.com" path="/vt/lrys=m@130&hl=de&x={x}&y={y}&z={zoomLevel}&s=Ga" /> + </texture> + </layer> + <layer name="standardplaces" backend="geodata"> + <geodata name="cityplacemarks"> + <sourcefile format="KML">cityplacemarks.kml</sourcefile> + <pick>placemark</pick> + </geodata> + <geodata name="baseplacemarks"> + <sourcefile format="KML">baseplacemarks.kml</sourcefile> + <pick>placemark</pick> + </geodata> + <geodata name="elevplacemarks"> + <sourcefile format="KML">elevplacemarks.kml</sourcefile> + <pick>placemark</pick> + </geodata> + <geodata name="otherplacemarks"> + <sourcefile + format="KML">otherplacemarks.kml</sourcefile> + <pick>placemark</pick> + </geodata> + <geodata name="boundaryplacemarks"> + <sourcefile format="KML">boundaryplacemarks</sourcefile> + <pick>placemark</pick> + </geodata> + </layer> + </map> + <settings> + <property name="coordinate-grid"> + <value>true</value> + <available>true</available> + </property> + <property name="overviewmap"> + <value>true</value> + <available>true</available> + </property> + <property name="compass"> + <value>true</value> + <available>true</available> + </property> + <property name="scalebar"> + <value>true</value> + <available>true</available> + </property> + </settings> + <legend> + <section name="coordinate-grid" checkable="true" connect="coordinate-grid" spacing="12"> + <heading>Coordinate Grid</heading> + </section> + </legend> + </document> +</dgml> diff --git a/googlemaps/preview.png b/googlemaps/preview.png Binary files differnew file mode 100644 index 000000000..aa3181d29 --- /dev/null +++ b/googlemaps/preview.png diff --git a/googlesat/0/0/0.jpg b/googlesat/0/0/0.jpg Binary files differnew file mode 100644 index 000000000..4b9b73295 --- /dev/null +++ b/googlesat/0/0/0.jpg diff --git a/googlesat/bicycle/0/0/0.png b/googlesat/bicycle/0/0/0.png Binary files differnew file mode 100644 index 000000000..febf01a9c --- /dev/null +++ b/googlesat/bicycle/0/0/0.png 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 @@ +<?xml version="1.0" encoding="UTF-8"?> +<dgml xmlns="http://edu.kde.org/marble/dgml/2.0"> + <document> + + <head> + <name>Google Satellite</name> + <target>earth</target> + <theme>googlesat</theme> + <icon pixmap="preview.png"/> + <visible>true</visible> + <description><![CDATA[<p>A <i>global roadmap</i> provided by Google.]]></description> + <zoom> + <minimum> 900 </minimum> + <maximum> 3700 </maximum> + <discrete> true </discrete> + </zoom> + </head> + + <map bgcolor="#000000"> + <canvas/> + <target/> + <layer name="googlesat" backend="texture" > + <!-- Let Google Maps rendered tiles expire after one year + or 31536000 seconds --> + <texture name="map" expire="31536000" > + <sourcedir format="JPG"> earth/googlesat </sourcedir> + <storageLayout levelZeroColumns="1" levelZeroRows="1" maximumTileLevel="20" mode="Custom" /> + <projection name="Mercator" /> + <downloadUrl protocol="http" host="khm.google.com" path="/kh/v=124&hl=de&x={x}&s=&y={y}&z={zoomLevel}&s=Ga" /> + </texture> + <texture name="streets" expire="604800" > + <sourcedir format="PNG"> earth/googlesat/streets </sourcedir> + <storageLayout levelZeroColumns="1" levelZeroRows="1" maximumTileLevel="20" mode="Custom" /> + <projection name="Mercator" /> + <downloadUrl protocol="http" host="mt.google.com" path="/vt/lyrs=h@126&hl=de&x={x}&s=&y={y}&z={zoomLevel}&s=Ga" /> + <blending name="OverpaintBlending" /> + </texture> + <texture name="bicycle" expire="604800" > + <sourcedir format="PNG"> earth/googlesat/bicycle </sourcedir> + <storageLayout levelZeroColumns="1" levelZeroRows="1" maximumTileLevel="20" mode="Custom" /> + <projection name="Mercator" /> + <downloadUrl protocol="http" host="mt.google.com" path="/vt/lyrs=h@179207685,bike&x={x}&s=&y={y}&z={zoomLevel}&" /> + <blending name="OverpaintBlending" /> + </texture> + </layer> + <layer name="standardplaces" backend="geodata"> + <geodata name="cityplacemarks"> + <sourcefile format="KML">cityplacemarks.kml</sourcefile> + <pick>placemark</pick> + </geodata> + <geodata name="baseplacemarks"> + <sourcefile format="KML">baseplacemarks.kml</sourcefile> + <pick>placemark</pick> + </geodata> + <geodata name="elevplacemarks"> + <sourcefile format="KML">elevplacemarks.kml</sourcefile> + <pick>placemark</pick> + </geodata> + <geodata name="otherplacemarks"> + <sourcefile format="KML">otherplacemarks.kml</sourcefile> + <pick>placemark</pick> + </geodata> + <geodata name="boundaryplacemarks"> + <sourcefile format="KML">boundaryplacemarks.kml</sourcefile> + <pick>placemark</pick> + </geodata> + </layer> + </map> + <settings> + <property name="coordinate-grid"> + <value>true</value> + <available>true</available> + </property> + <property name="overviewmap"> + <value>true</value> + <available>true</available> + </property> + <property name="compass"> + <value>true</value> + <available>true</available> + </property> + <property name="scalebar"> + <value>true</value> + <available>true</available> + </property> + <group name="Places"> + <property name="places"> + <value>true</value> + <available>true</available> + </property> + <property name="cities"> + <value>false</value> + <available>false</available> + </property> + <property name="terrain"> + <value>false</value> + <available>false</available> + </property> + <property name="otherplaces"> + <value>false</value> + <available>false</available> + </property> + </group> + <group name="Texture Layers"> + <property name="streets"> + <value>true</value> + <available>true</available> + </property> + <property name="bicycle"> + <value>false</value> + <available>true</available> + </property> + </group> + </settings> + <legend> + <section name="streets" checkable="true" connect="streets" spacing="12"> + <heading>Transportation</heading> + </section> + <section name="bicycle" checkable="true" connect="bicycle" spacing="12"> + <heading>Bicycle Routes</heading> + </section> + <section name="coordinate-grid" checkable="true" connect="coordinate-grid" spacing="12"> + <heading>Coordinate Grid</heading> + </section> + <section name="places" checkable="true" connect="places" spacing="12"> + <heading>Places of Interest</heading> + </section> + </legend> + </document> +</dgml> diff --git a/googlesat/preview.png b/googlesat/preview.png Binary files differnew file mode 100644 index 000000000..5048d0a0f --- /dev/null +++ b/googlesat/preview.png diff --git a/googlesat/streets/0/0/0.png b/googlesat/streets/0/0/0.png Binary files differnew file mode 100644 index 000000000..febf01a9c --- /dev/null +++ b/googlesat/streets/0/0/0.png 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); |
