Aster DEM

qgis · Jul 5, 2011 · 169de3a · 169de3a
1 parent 71ff101
commit 169de3a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/plugins/globe/globe.earth b/src/plugins/globe/globe.earth
@@ -1,7 +1,9 @@
 <map name="QGIS Map" type="geocentric">
 
+    <loading_policy mode="preemptive"/>
+
     <image name="world" driver="gdal">
-        <url>/home/pi/devel/gis/osgearth/data/world.tif</url>
+        <url>/usr/share/osgearth/data/world.tif</url>
     </image>
 
     <!--
@@ -13,17 +15,22 @@
     </image>
     -->
 
+    <!--
     <heightfield name="pelican srtm" driver="tms">
       <url>http://demo.pelicanmapping.com/rmweb/data/srtm30_plus_tms/tms.xml</url>
     </heightfield>
+    -->
     <!--
     <heightfield name="WorldWind bil" driver="worldwind">
       <worldwind_cache>worldwind_SRTM</worldwind_cache>
     </heightfield>
     -->
+    <heightfield name="aster_dem" driver="gdal">
+      <url>/home/pi/data/geodata/Lech/ASTGTM_N47E010/ASTGTM_N47E010_dem.tif</url>
+    </heightfield>
 
-    <vertical_scale>2</vertical_scale>
     <!--
+    <vertical_scale>2</vertical_scale>
     <sample_ratio>0.25</sample_ratio>
     -->
 </map>
diff --git a/src/plugins/globe/globe_plugin.cpp b/src/plugins/globe/globe_plugin.cpp
@@ -52,7 +52,7 @@ static osgEarthUtil::Viewpoint VPs[] = {
     osgEarthUtil::Viewpoint( "Africa",        osg::Vec3d(    0.0,   0.0, 0.0 ), 0.0, -90.0, 10e6 ),
     osgEarthUtil::Viewpoint( "California",    osg::Vec3d( -121.0,  34.0, 0.0 ), 0.0, -90.0, 6e6 ),
     osgEarthUtil::Viewpoint( "Europe",        osg::Vec3d(    0.0,  45.0, 0.0 ), 0.0, -90.0, 4e6 ),
-    osgEarthUtil::Viewpoint( "Washington DC", osg::Vec3d(  -77.0,  38.0, 0.0 ), 0.0, -90.0, 1e6 ),
+    osgEarthUtil::Viewpoint( "Lech",          osg::Vec3d(  10.14, 47.21, 0.0 ), 0.0, -90.0, 1e4 ),
     osgEarthUtil::Viewpoint( "Australia",     osg::Vec3d(  135.0, -20.0, 0.0 ), 0.0, -90.0, 2e6 )
 };