Merge pull request #4507 from lasalvavida/idl-rectangles

Rotate back across the globe when points cross the IDL
CesiumGS · Oct 24, 2016 · 8ba579b · 8ba579b
2 parents 4a6d632 + 2fe71f0
commit 8ba579b
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/Source/Core/RectangleGeometryLibrary.js b/Source/Core/RectangleGeometryLibrary.js
@@ -109,7 +109,7 @@ define([
         var granYSin = 0.0;
         var granXSin = 0.0;
 
-        if (defined(rotation) && rotation !== 0) { // rotation doesn't work when center is on/near IDL
+        if (defined(rotation) && rotation !== 0) {
             var cosRotation = Math.cos(rotation);
             granYCos *= cosRotation;
             granXCos *= cosRotation;
@@ -118,6 +118,10 @@ define([
             granYSin = granularityY * sinRotation;
             granXSin = granularityX * sinRotation;
 
+            if (center.longitude < nwCorner.longitude) {
+                center.longitude += CesiumMath.TWO_PI;
+            }
+
             nwCartesian = proj.project(nwCorner, nwCartesian);
             centerCartesian = proj.project(center, centerCartesian);
 

diff --git a/Specs/Core/RectangleGeometrySpec.js b/Specs/Core/RectangleGeometrySpec.js
@@ -303,6 +303,24 @@ defineSuite([
         }).not.toThrowDeveloperError();
     });
 
+    it('can create rectangle geometry where the nw corner and the center are on opposite sides of the IDL', function() {
+        var rectangle = new Rectangle(
+            Math.PI - 0.005,
+            CesiumMath.PI_OVER_SIX + 0.02,
+            0.01 - Math.PI,
+            CesiumMath.PI_OVER_SIX + 0.04
+        );
+
+        var geometry = new RectangleGeometry({
+            rectangle: rectangle,
+            rotation: 0.5
+        });
+
+        expect(function() {
+            RectangleGeometry.createGeometry(geometry);
+        }).not.toThrowDeveloperError();
+    });
+
     var rectangle = new RectangleGeometry({
         vertexFormat : VertexFormat.POSITION_ONLY,
         rectangle : new Rectangle(-2.0, -1.0, 0.0, 1.0),