[Marble-commits] KDE/kdeedu/marble/data

[Dennis Nienhüser]

SVN commit 1210906 by nienhueser:

Add the hillshading layer to the OSM map theme. Move checkboxes on top of the legend.

 M  +4 -0      CMakeLists.txt  
 M  +25 -4     maps/earth/openstreetmap/openstreetmap.dgml  


--- trunk/KDE/kdeedu/marble/data/CMakeLists.txt #1210905:1210906
@@ -127,6 +127,10 @@
 DESTINATION ${MARBLE_DATA_INSTALL_PATH}/maps/earth/openstreetmap/0/0)
 
 install (FILES
+maps/earth/hillshading/0/0/0.png
+DESTINATION ${MARBLE_DATA_INSTALL_PATH}/maps/earth/hillshading/0/0)
+
+install (FILES
 maps/earth/temp-july/temp-july.jpg
 maps/earth/temp-july/temp-july-preview.png
 maps/earth/temp-july/temp-july.dgml
--- trunk/KDE/kdeedu/marble/data/maps/earth/openstreetmap/openstreetmap.dgml #1210905:1210906
@@ -32,6 +32,13 @@
                     <downloadPolicy usage="Browse" maximumConnections="20" />
                     <downloadPolicy usage="Bulk" maximumConnections="2" />
                 </texture>
+                <texture name="hillshading" expire="31536000" >
+                    <sourcedir format="PNG"> earth/hillshading </sourcedir>
+                    <storageLayout levelZeroColumns="1" levelZeroRows="1" maximumTileLevel="17" mode="OpenStreetMap" />
+                    <projection name="Mercator" />
+                    <downloadUrl protocol="http" host="toolserver.org" path="/~cmarqu/hill/" />
+                    <blending name="AlphaBlending" />
+                </texture>
             </layer>
             <layer name="standardplaces" backend="geodata">
                <geodata name="cityplacemarks">
@@ -92,8 +99,26 @@
                     <available>false</available>
                 </property>
             </group>
+            <group name="Texture Layers">
+                <property name="hillshading">
+                    <value>false</value>
+                    <available>true</available>
+                </property>
+            </group>
         </settings>
         <legend>
+            <section>
+                <heading>Guides</heading>
+            </section>
+
+            <section name="coordinate-grid" checkable="true" connect="coordinate-grid"  spacing="12">
+                <heading>Coordinate Grid</heading>
+            </section>
+
+            <section name="hillshading" checkable="true" connect="hillshading" spacing="12">
+                <heading>Hillshading</heading>
+            </section>
+
             <section name="traffic" checkable="false" spacing="12">
                 <heading>Transportation</heading>
 
@@ -277,10 +302,6 @@
                     <text>Summit, peak</text>
                 </item>
             </section>
-
-            <section name="coordinate-grid" checkable="true" connect="coordinate-grid" spacing="12">
-                <heading>Coordinate Grid</heading>
-            </section>
         </legend>
     </document>
 </dgml>