Merge branch 'develop' of https://github.com/WorldWindEarth/WorldWindJava into develop

Author: gbburkhardt

src/gov/nasa/worldwind/view/orbit/FlyToOrbitViewAnimator.java

@@ -51,7 +51,7 @@ public static FlyToOrbitViewAnimator createFlyToOrbitViewAnimator(
         Angle beginPitch, Angle endPitch,
         double beginZoom, double endZoom, long timeToMove, int altitudeMode)
     {
-        OnSurfacePositionAnimator centerAnimator = new OnSurfacePositionAnimator(orbitView.getGlobe(),
+        OnSurfacePositionAnimator centerAnimator = new OnSurfacePositionAnimator(orbitView,
             new ScheduledInterpolator(timeToMove),
             beginCenterPos, endCenterPos,
             OrbitViewPropertyAccessor.createCenterPositionAccessor(
@@ -84,17 +84,17 @@ public static FlyToOrbitViewAnimator createFlyToOrbitViewAnimator(
 
     protected static class OnSurfacePositionAnimator extends PositionAnimator
     {
-        Globe globe;
+        OrbitView orbitView;
         int altitudeMode;
         boolean useMidZoom = true;
 
-        public OnSurfacePositionAnimator(Globe globe, Interpolator interpolator,
+        public OnSurfacePositionAnimator(OrbitView orbitView, Interpolator interpolator,
             Position begin,
             Position end,
             PropertyAccessor.PositionAccessor propertyAccessor, int altitudeMode)
         {
             super(interpolator, begin, end, propertyAccessor);
-            this.globe = globe;
+            this.orbitView = orbitView;
             this.altitudeMode = altitudeMode;
         }
 
@@ -117,16 +117,18 @@ protected Position nextPosition(double interpolant)
             // correct altitude.
             double endElevation = 0.0;
             boolean overrideEndElevation = false;
-
+            
+            Globe globe = this.orbitView.getGlobe();
+            
             if (this.altitudeMode == WorldWind.CLAMP_TO_GROUND)
             {
                 overrideEndElevation = true;
-                endElevation = this.globe.getElevation(getEnd().getLatitude(), getEnd().getLongitude());
+                endElevation = globe.getElevation(getEnd().getLatitude(), getEnd().getLongitude());
             }
             else if (this.altitudeMode == WorldWind.RELATIVE_TO_GROUND)
             {
                 overrideEndElevation = true;
-                endElevation = this.globe.getElevation(getEnd().getLatitude(), getEnd().getLongitude())
+                endElevation = globe.getElevation(getEnd().getLatitude(), getEnd().getLongitude())
                     + getEnd().getAltitude();
             }