aboutsummaryrefslogtreecommitdiffstats
path: root/marbledata
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2013-05-25 08:28:35 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2013-05-25 08:58:37 -0700
commit92ee374494b83c47115f6f479530e7e9678ad562 (patch)
tree8455b81d5f1cbe26492331f6716693e66c574ad2 /marbledata
parentdbb84188c2d323365e100a47cdddd6e793d5e068 (diff)
downloadsubsurface-92ee374494b83c47115f6f479530e7e9678ad562.tar.gz
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 <dirk@hohndel.org>
Diffstat (limited to 'marbledata')
-rw-r--r--marbledata/bitmaps/default_location.pngbin0 -> 400 bytes
-rw-r--r--marbledata/maps/earth/googlemaps/0/0/0.pngbin0 -> 159 bytes
-rw-r--r--marbledata/maps/earth/googlemaps/googlemaps.dgml80
-rw-r--r--marbledata/maps/earth/googlemaps/preview.pngbin0 -> 22138 bytes
-rw-r--r--marbledata/maps/earth/googlesat/0/0/0.jpgbin0 -> 10036 bytes
-rw-r--r--marbledata/maps/earth/googlesat/bicycle/0/0/0.pngbin0 -> 191 bytes
-rw-r--r--marbledata/maps/earth/googlesat/googlesat.dgml130
-rw-r--r--marbledata/maps/earth/googlesat/preview.pngbin0 -> 28358 bytes
-rw-r--r--marbledata/maps/earth/googlesat/streets/0/0/0.pngbin0 -> 191 bytes
9 files changed, 210 insertions, 0 deletions
diff --git a/marbledata/bitmaps/default_location.png b/marbledata/bitmaps/default_location.png
new file mode 100644
index 000000000..3d4f3b5c3
--- /dev/null
+++ b/marbledata/bitmaps/default_location.png
Binary files differ
diff --git a/marbledata/maps/earth/googlemaps/0/0/0.png b/marbledata/maps/earth/googlemaps/0/0/0.png
new file mode 100644
index 000000000..f7ab669ca
--- /dev/null
+++ b/marbledata/maps/earth/googlemaps/0/0/0.png
Binary files differ
diff --git a/marbledata/maps/earth/googlemaps/googlemaps.dgml b/marbledata/maps/earth/googlemaps/googlemaps.dgml
new file mode 100644
index 000000000..01a63864b
--- /dev/null
+++ b/marbledata/maps/earth/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&amp;hl=de&amp;x={x}&amp;y={y}&amp;z={zoomLevel}&amp;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/marbledata/maps/earth/googlemaps/preview.png b/marbledata/maps/earth/googlemaps/preview.png
new file mode 100644
index 000000000..aa3181d29
--- /dev/null
+++ b/marbledata/maps/earth/googlemaps/preview.png
Binary files differ
diff --git a/marbledata/maps/earth/googlesat/0/0/0.jpg b/marbledata/maps/earth/googlesat/0/0/0.jpg
new file mode 100644
index 000000000..4b9b73295
--- /dev/null
+++ b/marbledata/maps/earth/googlesat/0/0/0.jpg
Binary files differ
diff --git a/marbledata/maps/earth/googlesat/bicycle/0/0/0.png b/marbledata/maps/earth/googlesat/bicycle/0/0/0.png
new file mode 100644
index 000000000..febf01a9c
--- /dev/null
+++ b/marbledata/maps/earth/googlesat/bicycle/0/0/0.png
Binary files differ
diff --git a/marbledata/maps/earth/googlesat/googlesat.dgml b/marbledata/maps/earth/googlesat/googlesat.dgml
new file mode 100644
index 000000000..0b70f14da
--- /dev/null
+++ b/marbledata/maps/earth/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&amp;hl=de&amp;x={x}&amp;s=&amp;y={y}&amp;z={zoomLevel}&amp;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&amp;hl=de&amp;x={x}&amp;s=&amp;y={y}&amp;z={zoomLevel}&amp;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&amp;x={x}&amp;s=&amp;y={y}&amp;z={zoomLevel}&amp;" />
+ <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/marbledata/maps/earth/googlesat/preview.png b/marbledata/maps/earth/googlesat/preview.png
new file mode 100644
index 000000000..5048d0a0f
--- /dev/null
+++ b/marbledata/maps/earth/googlesat/preview.png
Binary files differ
diff --git a/marbledata/maps/earth/googlesat/streets/0/0/0.png b/marbledata/maps/earth/googlesat/streets/0/0/0.png
new file mode 100644
index 000000000..febf01a9c
--- /dev/null
+++ b/marbledata/maps/earth/googlesat/streets/0/0/0.png
Binary files differ
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-12-25 13:24:24 +0000