mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-12 08:37:25 -05:00
- cosmetics naming changes
This commit is contained in:
@@ -65,7 +65,7 @@ public abstract class AbstractTileFactory extends TileFactory
|
||||
private int threadPoolSize = 4;
|
||||
private ExecutorService service;
|
||||
|
||||
// TODO the tile ua.in.smartjava.map should be static ALWAYS, regardless of the number
|
||||
// TODO the tile map should be static ALWAYS, regardless of the number
|
||||
// of GoogleTileFactories because each tile is, really, a singleton.
|
||||
private Map<String, Tile> tileMap = new HashMap<String, Tile>();
|
||||
|
||||
@@ -123,7 +123,7 @@ public abstract class AbstractTileFactory extends TileFactory
|
||||
else
|
||||
{
|
||||
tile = tileMap.get(url);
|
||||
// if its in the ua.in.smartjava.map but is low and isn't loaded yet
|
||||
// if its in the map but is low and isn't loaded yet
|
||||
// but we are in high mode
|
||||
if (tile.getPriority() == Tile.Priority.Low && eagerLoad && !tile.isLoaded())
|
||||
{
|
||||
@@ -208,7 +208,7 @@ public abstract class AbstractTileFactory extends TileFactory
|
||||
@Override
|
||||
public Thread newThread(Runnable r)
|
||||
{
|
||||
Thread t = new Thread(r, "ua.in.smartjava.map tile fetcher-pool-" + count++);
|
||||
Thread t = new Thread(r, "map tile fetcher-pool-" + count++);
|
||||
t.setPriority(Thread.MIN_PRIORITY);
|
||||
t.setDaemon(true);
|
||||
return t;
|
||||
|
||||
@@ -59,9 +59,9 @@ public class EmptyTileFactory extends TileFactory
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets an instance of an empty tile for the given tile position and zoom on the world ua.in.smartjava.map.
|
||||
* @param x The tile's x position on the world ua.in.smartjava.map.
|
||||
* @param y The tile's y position on the world ua.in.smartjava.map.
|
||||
* Gets an instance of an empty tile for the given tile position and zoom on the world map.
|
||||
* @param x The tile's x position on the world map.
|
||||
* @param y The tile's y position on the world map.
|
||||
* @param zoom The current zoom level.
|
||||
*/
|
||||
@Override
|
||||
|
||||
@@ -31,7 +31,7 @@ public final class GeoUtil
|
||||
/**
|
||||
* @param zoom the zoom level
|
||||
* @param info the tile factory info
|
||||
* @return the size of the ua.in.smartjava.map at the given zoom, in tiles (num tiles tall by num tiles wide)
|
||||
* @return the size of the map at the given zoom, in tiles (num tiles tall by num tiles wide)
|
||||
*/
|
||||
public static Dimension getMapSize(int zoom, TileFactoryInfo info)
|
||||
{
|
||||
@@ -50,17 +50,17 @@ public final class GeoUtil
|
||||
{
|
||||
// int x = (int)coord.getX();
|
||||
// int y = (int)coord.getY();
|
||||
// if off the ua.in.smartjava.map to the top or left
|
||||
// if off the map to the top or left
|
||||
if (x < 0 || y < 0)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
// if of the ua.in.smartjava.map to the right
|
||||
// if of the map to the right
|
||||
if (info.getMapCenterInPixelsAtZoom(zoomLevel).getX() * 2 <= x * info.getTileSize(zoomLevel))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
// if off the ua.in.smartjava.map to the bottom
|
||||
// if off the map to the bottom
|
||||
if (info.getMapCenterInPixelsAtZoom(zoomLevel).getY() * 2 <= y * info.getTileSize(zoomLevel))
|
||||
{
|
||||
return false;
|
||||
@@ -136,8 +136,8 @@ public final class GeoUtil
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the ua.in.smartjava.map bounds.
|
||||
* @param mapViewer The ua.in.smartjava.map viewer.
|
||||
* Gets the map bounds.
|
||||
* @param mapViewer The map viewer.
|
||||
* @return Returns the bounds.
|
||||
*/
|
||||
public static GeoBounds getMapBounds(JXMapViewer mapViewer)
|
||||
@@ -147,9 +147,9 @@ public final class GeoUtil
|
||||
|
||||
/**
|
||||
* Gets the bounds as a set of two <code>GeoPosition</code> objects.
|
||||
* @param mapViewer The ua.in.smartjava.map viewer.
|
||||
* @param mapViewer The map viewer.
|
||||
* @return Returns the set of two <code>GeoPosition</code> objects that represent the north west and south east
|
||||
* corners of the ua.in.smartjava.map.
|
||||
* corners of the map.
|
||||
*/
|
||||
private static Set<GeoPosition> getMapGeoBounds(JXMapViewer mapViewer)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user