Changeset 6650

Timestamp:

Dec 1, 2016 1:20:45 PM (8 years ago)

Author:

ldelgass

Message:

fix for profile validation

Location:

geovis/trunk

Files:

• Renderer.cpp (modified) (2 diffs)
• RendererCmd.cpp (modified) (2 diffs)

geovis/trunk/Renderer.cpp

@@ -815 +815 @@
                 mapOpts.profile()->srsString() = profile;
             }
-            TRACE("Input bounds: %g %g %g %g srs:\"%s\"",
+            TRACE("Input bounds: %g %g %g %g srs: \"%s\"",
                   bounds[0], bounds[1], bounds[2], bounds[3], boundsSRS);
             if (boundsSRS != NULL) {
@@ -830 +830 @@
             }
             TRACE("Setting profile bounds: %g %g %g %g",
-                  bounds[0], bounds[1], bounds[2], bounds[3]);
+                  mapOpts.profile()->bounds()->xMin(),
+                  mapOpts.profile()->bounds()->yMin(),
+                  mapOpts.profile()->bounds()->xMax(),
+                  mapOpts.profile()->bounds()->yMax());
         } else {
             mapOpts.profile() = osgEarth::ProfileOptions(profile);

geovis/trunk/RendererCmd.cpp

@@ -3086 +3086 @@
         }
         char *profile = Tcl_GetString(objv[6]);
+        if (strcmp(profile, "global-geodetic") == 0 ||
+            strcmp(profile, "geodetic") == 0 ||
+            strcmp(profile, "epsg:4326") == 0 ||
+            strcmp(profile, "wgs84") == 0 ||
+            strcmp(profile, "plate-carre") == 0 ||
+            strcmp(profile, "plate-carree") == 0) {
+            // As of osgearth 2.7, these are not permitted as map profiles.
+            // Use epsg:32663 instead
+            Tcl_AppendResult(interp, "Invalid profile: can't use geographic coordinate system as projection.  Consider using an equirectangular projection (epsg:32663) instead.", (char*)NULL);
+            return TCL_ERROR;
+        }
         if (objc > 7) {
             if (objc < 11) {
@@ -3108 +3119 @@
                 bounds[3] < -90. || bounds[3] > 90.) {
                 Tcl_AppendResult(interp, "invalid bounds", (char*)NULL);
-                return TCL_ERROR;
-            }
-            // Note: plate-carre generates same SRS as others, but with 
-            // _is_plate_carre flag set
-            // In map profile, _is_plate_carre is forced on for
-            // geographic+projected SRS
-            if (strcmp(profile, "geodetic") == 0 ||
-                strcmp(profile, "epsg:4326") == 0 ||
-                strcmp(profile, "wgs84") == 0 ||
-                strcmp(profile, "plate-carre") == 0 ||
-                strcmp(profile, "plate-carree") == 0) {
-                // As of osgearth 2.7, these are not permitted as map profiles.
-                // Use epsg:32663 instead
-                Tcl_AppendResult(interp, "Invalid profile: can't use geographic coordinate system as projection.  Consider using an equirectangular projection (epsg:32663) instead.", (char*)NULL);
                 return TCL_ERROR;
             }