Renamed ImageOptions.imageFormat as ImageOptions.imageConfig to disambiguate it from retrieval format

Author: pdavidc

worldwind-examples/src/main/java/gov/nasa/worldwindx/experimental/AtmosphereLayer.java

@@ -45,7 +45,7 @@ public AtmosphereLayer() {
         this.setDisplayName("Atmosphere");
         this.setPickEnabled(false);
         this.nightImageSource = ImageSource.fromResource(R.drawable.dnb_land_ocean_ice_2012);
-        this.nightImageOptions = ImageOptions.fromImageFormat(WorldWind.IMAGE_FORMAT_RGB_565);
+        this.nightImageOptions = new ImageOptions(WorldWind.RGB_565);
     }
 
     public ImageSource getNightImageSource() {

worldwind/src/main/java/gov/nasa/worldwind/WorldWind.java

@@ -134,24 +134,24 @@ public class WorldWind {
     }
 
     /**
-     * {@link ImageFormat} constant indicating 32-bit RGBA_8888 image format.
+     * {@link ImageConfig} constant indicating 32-bit RGBA_8888 image configuration.
      */
-    public static final int IMAGE_FORMAT_RGBA_8888 = 0;
+    public static final int RGBA_8888 = 0;
 
     /**
-     * {@link ImageFormat} constant indicating 16-bit RGBA_565 image format.
+     * {@link ImageConfig} constant indicating 16-bit RGBA_565 image configuration.
      */
-    public static final int IMAGE_FORMAT_RGB_565 = 1;
+    public static final int RGB_565 = 1;
 
     /**
-     * Image format indicates the in-memory representation for images displayed by World Wind components. Images are
-     * typically represented in the 32-bit RGBA_8888 format, the highest quality available. Components that do not
-     * require an alpha channel and want to conserve memory may use the 16-bit RGBA_565 format. Accepted values are
-     * {@link #IMAGE_FORMAT_RGBA_8888} and {@link #IMAGE_FORMAT_RGB_565}.
+     * Image config indicates the in-memory representation for images displayed by World Wind components. Images are
+     * typically represented in the 32-bit RGBA_8888 configuration, the highest quality available. Components that do
+     * not require an alpha channel and want to conserve memory may use the 16-bit RGBA_565 configuration. Accepted
+     * values are {@link #RGBA_8888} and {@link #RGB_565}.
      */
-    @IntDef({IMAGE_FORMAT_RGBA_8888, IMAGE_FORMAT_RGB_565})
+    @IntDef({RGBA_8888, RGB_565})
     @Retention(RetentionPolicy.SOURCE)
-    public @interface ImageFormat {
+    public @interface ImageConfig {
 
     }
 

worldwind/src/main/java/gov/nasa/worldwind/layer/BackgroundLayer.java

@@ -26,7 +26,7 @@ public class BackgroundLayer extends RenderableLayer {
      * associated with the World Window.
      */
     public BackgroundLayer() {
-        this(ImageSource.fromResource(R.drawable.gov_nasa_worldwind_worldtopobathy2004053), ImageOptions.fromImageFormat(WorldWind.IMAGE_FORMAT_RGB_565));
+        this(ImageSource.fromResource(R.drawable.gov_nasa_worldwind_worldtopobathy2004053), new ImageOptions(WorldWind.RGB_565));
     }
 
     /**

worldwind/src/main/java/gov/nasa/worldwind/layer/BlueMarbleLandsatLayer.java

@@ -64,10 +64,6 @@ public BlueMarbleLandsatLayer(String serviceAddress) {
         landsatConfig.transparent = false; // combining BlueMarble and esat layers results in opaque images
         this.landsatUrlFactory = new WmsGetMapUrlFactory(landsatConfig);
 
-        // Configure this layer's image options to reduce memory usage by using a 16-bit format with no alpha.
-        ImageOptions imageOptions = new ImageOptions();
-        imageOptions.imageFormat = WorldWind.IMAGE_FORMAT_RGB_565;
-
         // Configure this layer's level set to capture the entire globe at 15m resolution.
         double metersPerPixel = 15;
         double radiansPerPixel = metersPerPixel / WorldWind.WGS84_SEMI_MAJOR_AXIS;
@@ -78,7 +74,7 @@ public BlueMarbleLandsatLayer(String serviceAddress) {
         this.setLevelSet(new LevelSet(levelsConfig));
         this.setTileUrlFactory(this);
         this.setImageFormat("image/png");
-        this.setImageOptions(imageOptions);
+        this.setImageOptions(new ImageOptions(WorldWind.RGB_565)); // reduce memory usage by using a 16-bit configuration with no alpha
     }
 
     @Override

worldwind/src/main/java/gov/nasa/worldwind/layer/BlueMarbleLayer.java

@@ -48,11 +48,8 @@ public BlueMarbleLayer(String serviceAddress) {
         config.coordinateSystem = "EPSG:4326";
         config.transparent = false; // the BlueMarble layer is opaque
 
-        ImageOptions imageOptions = new ImageOptions();
-        imageOptions.imageFormat = WorldWind.IMAGE_FORMAT_RGB_565; // exploit opaque imagery to reduce memory usage
-
         this.setDisplayName("Blue Marble");
         this.setConfiguration(new Sector().setFullSphere(), 500, config); // 500m resolution on Earth
-        this.setImageOptions(imageOptions);
+        this.setImageOptions(new ImageOptions(WorldWind.RGB_565));  // exploit opaque imagery to reduce memory usage
     }
 }

worldwind/src/main/java/gov/nasa/worldwind/render/ImageOptions.java

@@ -13,13 +13,13 @@
 public class ImageOptions {
 
     /**
-     * Indicates the in-memory representation for images displayed by World Wind components. By default, images are
-     * represented in the 32-bit RGBA_8888 format, the highest quality available. Components that do not require an
-     * alpha channel and want to conserve memory may use the 16-bit RGBA_565 format. Accepted values are {@link
-     * WorldWind#IMAGE_FORMAT_RGBA_8888} and {@link WorldWind#IMAGE_FORMAT_RGB_565}.
+     * Indicates the in-memory configuration for images displayed by World Wind components. By default, images are
+     * represented in the 32-bit RGBA_8888 configuration, the highest quality available. Components that do not require
+     * an alpha channel and want to conserve memory may use the 16-bit RGBA_565 configuration. Accepted values are
+     * {@link WorldWind#RGBA_8888} and {@link WorldWind#RGB_565}.
      */
-    @WorldWind.ImageFormat
-    public int imageFormat = WorldWind.IMAGE_FORMAT_RGBA_8888;
+    @WorldWind.ImageConfig
+    public int imageConfig = WorldWind.RGBA_8888;
 
     /**
      * Constructs an image options with default values.
@@ -28,16 +28,12 @@ public ImageOptions() {
     }
 
     /**
-     * Constructs an image options with an image format.
+     * Constructs an image options with an image configuration.
      *
-     * @param imageFormat the image format to use. Accepted values are {@link WorldWind#IMAGE_FORMAT_RGBA_8888} and
-     *                    {@link WorldWind#IMAGE_FORMAT_RGB_565}.
-     *
-     * @return the new image options
+     * @param imageConfig the image configuration to use. Accepted values are {@link WorldWind#RGBA_8888} and {@link
+     *                    WorldWind#RGB_565}.
      */
-    public static ImageOptions fromImageFormat(@WorldWind.ImageFormat int imageFormat) {
-        ImageOptions imageOptions = new ImageOptions();
-        imageOptions.imageFormat = imageFormat;
-        return imageOptions;
+    public ImageOptions(@WorldWind.ImageConfig int imageConfig) {
+        this.imageConfig = imageConfig;
     }
 }

worldwind/src/main/java/gov/nasa/worldwind/render/ImageRetriever.java

@@ -118,11 +118,11 @@ protected BitmapFactory.Options bitmapFactoryOptions(ImageOptions imageOptions)
         factoryOptions.inScaled = false; // suppress default image scaling; load the image in its native dimensions
 
         if (imageOptions != null) {
-            switch (imageOptions.imageFormat) {
-                case WorldWind.IMAGE_FORMAT_RGBA_8888:
+            switch (imageOptions.imageConfig) {
+                case WorldWind.RGBA_8888:
                     factoryOptions.inPreferredConfig = Bitmap.Config.ARGB_8888;
                     break;
-                case WorldWind.IMAGE_FORMAT_RGB_565:
+                case WorldWind.RGB_565:
                     factoryOptions.inPreferredConfig = Bitmap.Config.RGB_565;
                     break;
             }

worldwind/src/main/java/gov/nasa/worldwind/render/RenderResourceCache.java

@@ -71,7 +71,7 @@ public static int recommendedCapacity(Context context) {
         if (am != null) {
             ActivityManager.MemoryInfo mi = new ActivityManager.MemoryInfo();
             am.getMemoryInfo(mi);
-            if (mi.totalMem >= 1024 * 1024 * 2048L) { // use 384 MB on machines with 1536 MB or more
+            if (mi.totalMem >= 1024 * 1024 * 2048L) { // use 384 MB on machines with 2048 MB or more
                 return 1024 * 1024 * 384;
             } else if (mi.totalMem >= 1024 * 1024 * 1536) { // use 256 MB on machines with 1536 MB or more
                 return 1024 * 1024 * 256;