Changeset 4247 for trunk

Timestamp:

Mar 16, 2014, 6:26:41 PM (11 years ago)

Author:

ldelgass

Message:

Only set map profile bounds when specifying a profile string

File:

• trunk/packages/vizservers/geovis/Renderer.cpp (modified) (2 diffs)

trunk/packages/vizservers/geovis/Renderer.cpp

@@ -274 +274 @@
                 mapOpts.profile()->srsString() = profile;
             }
+            TRACE("Setting profile bounds: %g %g %g %g",
+                  bounds[0], bounds[1], bounds[2], bounds[3]);
             mapOpts.profile()->bounds() = 
                 osgEarth::Bounds(bounds[0], bounds[1], bounds[2], bounds[3]);
@@ -281 +283 @@
     } else if (type == osgEarth::MapOptions::CSTYPE_PROJECTED) {
         mapOpts.profile() = osgEarth::ProfileOptions("global-mercator");
-    }
-    if (bounds != NULL) {
-        TRACE("Setting profile bounds: %g %g %g %g",
-              bounds[0], bounds[1], bounds[2], bounds[3]);
-        mapOpts.profile()->bounds() = 
-            osgEarth::Bounds(bounds[0], bounds[1], bounds[2], bounds[3]);
     }
     osgEarth::Map *map = new osgEarth::Map(mapOpts);