Completed implementation of logo display. Modified CoordinatesDisplayLayer to accomodate logo

Author: Beak-man

src/WorldWind.js

@@ -1112,8 +1112,6 @@ define([ // PLEASE KEEP ALL THIS IN ALPHABETICAL ORDER BY MODULE NAME (not direc
          *     <li><code>baseUrl</code>: The URL of the directory containing the WorldWind Library and its resources.</li>
          *     <li><code>layerRetrievalQueueSize</code>: The number of concurrent tile requests allowed per layer. The default is 16.</li>
          *     <li><code>coverageRetrievalQueueSize</code>: The number of concurrent tile requests allowed per elevation coverage. The default is 16.</li>
-         *     <li><code>worldWindLogoPlacement</code>: An {@link Offset} to place the official WorldWind logo. The default is a 7px margin inset from the upper left corner of the screen.</li>
-         *     <li><code>worldWindLogoAlignment</code>: An {@link Offset} to align the WorldWind logo relative to its placement position. The default is the upper left corner of the logo.</li>
          *     <li><code>bingLogoPlacement</code>: An {@link Offset} to place a Bing logo attribution. The default is a 7px margin inset from the lower right corner of the screen.</li>
          *     <li><code>bingLogoAlignment</code>: An {@link Offset} to align the Bing logo relative to its placement position. The default is the lower right corner of the logo.</li>
          * </ul>
@@ -1124,8 +1122,6 @@ define([ // PLEASE KEEP ALL THIS IN ALPHABETICAL ORDER BY MODULE NAME (not direc
             baseUrl: (WWUtil.worldwindlibLocation()) || (WWUtil.currentUrlSansFilePart() + '/../'),
             layerRetrievalQueueSize: 16,
             coverageRetrievalQueueSize: 16,
-            worldWindLogoPlacement: new Offset(WorldWind.OFFSET_PIXELS, 7, WorldWind.OFFSET_INSET_PIXELS, 7),
-            worldWindLogoAlignment: new Offset(WorldWind.OFFSET_FRACTION, 0, WorldWind.OFFSET_FRACTION, 1),
             bingLogoPlacement: new Offset(WorldWind.OFFSET_INSET_PIXELS, 7, WorldWind.OFFSET_PIXELS, 7),
             bingLogoAlignment: new Offset(WorldWind.OFFSET_FRACTION, 1, WorldWind.OFFSET_FRACTION, 0)
         };

src/layer/CoordinatesDisplayLayer.js

@@ -163,14 +163,14 @@ define([
                 y = 11;
                 yUnitsScreen = WorldWind.OFFSET_PIXELS;
                 yUnitsText = 0;
-            } else if (canvasWidth > 400) { // medium canvas, align the text in the top left
-                x = 60;
-                y = 5;
+            } else if (canvasWidth > 400) { // medium canvas, align the text in the top left, below the logo
+                x = 64;
+                y = 33;
                 yUnitsScreen = WorldWind.OFFSET_INSET_PIXELS;
                 yUnitsText = 1;
-            } else { // small canvas, suppress the eye altitude, align the text in the top left and suppress eye alt
-                x = 60;
-                y = 5;
+            } else { // small canvas, suppress the eye altitude, align the text in the top left, below the logo, and suppress eye alt
+                x = 64;
+                y = 33;
                 yUnitsScreen = WorldWind.OFFSET_INSET_PIXELS;
                 yUnitsText = 1;
                 hideEyeAlt = true;

src/shapes/WorldWindLogo.js

@@ -55,30 +55,31 @@ function (ArgumentError,
     var WorldWindLogo = function (screenOffset, imagePath) {
 
         var sOffset = screenOffset ? screenOffset
-            : new Offset(WorldWind.configuration.worldWindLogoAlignment),
+            : new Offset(WorldWind.OFFSET_FRACTION, 0, WorldWind.OFFSET_FRACTION, 1),
             iPath = imagePath ? imagePath : WorldWind.configuration.baseUrl + "images/worldwind-logo.png";
+            console.log(WorldWind.configuration.worldWindLogoPlacement);
 
         ScreenImage.call(this, sOffset, iPath);
 
         // Must set the configured image offset after calling the constructor above.
 
         if (!screenOffset) {
-            this.imageOffset = new Offset(WorldWind.configuration.worldWindLogoAlignment);
+            this.imageOffset = new Offset(WorldWind.OFFSET_PIXELS, -7, WorldWind.OFFSET_INSET_PIXELS, -7);
         }
     };
 
     WorldWindLogo.prototype = Object.create(ScreenImage.prototype);
 
     WorldWindLogo.prototype.render = function (dc) {
 
-        // // Capture the navigator's heading and tilt and apply it to the compass' screen image.
-        // this.imageRotation = dc.navigator.heading;
-        // this.imageTilt = dc.navigator.tilt;
+        // Capture the navigator's heading and tilt and apply it to the compass' screen image.
+        this.imageRotation = dc.navigator.heading;
+        this.imageTilt = dc.navigator.tilt;
 
-        // var t = this.getActiveTexture(dc);
-        // if (t) {
-        //     this.imageScale = this.size * dc.currentGlContext.drawingBufferWidth / t.imageWidth;
-        // }
+        var t = this.getActiveTexture(dc);
+        if (t) {
+            this.imageScale = 1.0;
+        }
 
         ScreenImage.prototype.render.call(this, dc);
     };