Changeset 6649

Timestamp:

Dec 1, 2016 12:47:31 PM (8 years ago)

Author:

ldelgass

Message:

Fix validation of map extents

Location:

geovis/trunk

Files:

• Renderer.cpp (modified) (3 diffs)
• Renderer.h (modified) (1 diff)
• RendererCmd.cpp (modified) (2 diffs)

geovis/trunk/Renderer.cpp

@@ -794 +794 @@
                         const osg::Vec4f& bgColor,
                         const char *profile,
-                        double bounds[4])
+                        double bounds[4],
+                        const char *boundsSRS)
 {
     TRACE("Restting map with type %d, profile %s", type, profile);
@@ -814 +815 @@
                 mapOpts.profile()->srsString() = profile;
             }
-            TRACE("Setting profile bounds: %g %g %g %g",
-                  bounds[0], bounds[1], bounds[2], bounds[3]);
-            if (1) {
-                osg::ref_ptr<osgEarth::SpatialReference> fromSRS = osgEarth::SpatialReference::create("wgs84");
+            TRACE("Input bounds: %g %g %g %g srs:\"%s\"",
+                  bounds[0], bounds[1], bounds[2], bounds[3], boundsSRS);
+            if (boundsSRS != NULL) {
+                osg::ref_ptr<osgEarth::SpatialReference> fromSRS = osgEarth::SpatialReference::create(boundsSRS);
                 osg::ref_ptr<osgEarth::SpatialReference> toSRS = osgEarth::SpatialReference::create(mapOpts.profile()->srsString().get());
                 osgEarth::Bounds extents(bounds[0], bounds[1], bounds[2], bounds[3]);
@@ -828 +829 @@
                     osgEarth::Bounds(bounds[0], bounds[1], bounds[2], bounds[3]);
             }
+            TRACE("Setting profile bounds: %g %g %g %g",
+                  bounds[0], bounds[1], bounds[2], bounds[3]);
         } else {
             mapOpts.profile() = osgEarth::ProfileOptions(profile);

geovis/trunk/Renderer.h

@@ -200 +200 @@
                   const osg::Vec4f& bgColor = osg::Vec4f(1,1,1,1),
                   const char *profile = NULL,
-                  double bounds[4] = NULL);
+                  double bounds[4] = NULL,
+                  const char *boundsSRS = NULL);
 
     void clearMap();

geovis/trunk/RendererCmd.cpp

@@ -3103 +3103 @@
                 return TCL_ERROR;
             }
+            if (bounds[0] < -180. || bounds[0] > 180. ||
+                bounds[2] < -180. || bounds[2] > 180. ||
+                bounds[1] < -90. || bounds[1] > 90. ||
+                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
@@ -3112 +3119 @@
                 strcmp(profile, "plate-carre") == 0 ||
                 strcmp(profile, "plate-carree") == 0) {
-                if (bounds[0] < -180. || bounds[0] > 180. ||
-                    bounds[2] < -180. || bounds[2] > 180. ||
-                    bounds[1] < -90. || bounds[1] > 90. ||
-                    bounds[3] < -90. || bounds[3] > 90.) {
-                    Tcl_AppendResult(interp, "invalid bounds", (char*)NULL);
-                    return TCL_ERROR;
-                }
                 // 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;
-            } else if (strcmp(profile, "spherical-mercator") == 0 ||
-                       strcmp(profile, "epsg:900913") == 0 ||
-                       strcmp(profile, "epsg:3785") == 0 ||
-                       strcmp(profile, "epsg:3857") == 0 ||
-                       strcmp(profile, "epsg:102113") == 0) {
-                for (int i = 0; i < 4; i++) {
-                    if (bounds[i] < -20037508.34278925 || bounds[i] > 20037508.34278925) {
-                        Tcl_AppendResult(interp, "invalid bounds", (char*)NULL);
-                        return TCL_ERROR;
-                    }
-                }
-            } else if (strcmp(profile, "epsg:32662") == 0 ||
-                       strcmp(profile, "epsg:32663") == 0) {
-                // epsg:32662 is deprecated: spherical method applied to ellipsoid WGS84
-                // Equirectangular projection (WGS84/World Equidistant Cylindrical)
-                if (bounds[0] < -20037508.34278925 || bounds[0] > 20037508.34278925 ||
-                    bounds[2] < -20037508.34278925 || bounds[2] > 20037508.34278925 ||
-                    bounds[1] < -10018754.17139463 || bounds[1] > 10018754.17139463 ||
-                    bounds[3] < -10018754.17139463 || bounds[3] > 10018754.17139463) {
-                    Tcl_AppendResult(interp, "invalid bounds", (char*)NULL);
-                    return TCL_ERROR;
-                }
-            }
-            g_renderer->resetMap(type, bgColor, profile, bounds);
+            }
+            g_renderer->resetMap(type, bgColor, profile, bounds, "wgs84");
         } else {
             // If no bounds are given, this must be a named profile with implicit bounds