Changeset 24 for trunk/net

Timestamp:

04/14/08 22:24:26 (9 months ago)

Author:

relet.net

Message:

restored ColorScheme? temporarily, as it is still required by some background elements. consistent renaming of OsmMercatorProjection? (was missing in TileCache?)

Location:

trunk/net/relet/freimap

Files:

• ColorScheme.java (added)
• background/TileCache.java (modified) (2 diffs)

trunk/net/relet/freimap/background/TileCache.java

@@ -10 +10 @@
 
 import net.relet.freimap.Configurator;
-import net.relet.freimap.OSMMercatorProjection;
+import net.relet.freimap.OsmMercatorProjection;
 
 /**
@@ -115 +115 @@
         void paintTiles(Graphics2D g, int zoom, int wx, int wy, int ww, int wh) {
                 int max = (int) Math.pow(2, zoom) - 1;
-                int x1 = OSMMercatorProjection.worldToTile(Math.max(wx, 0)); 
-                int x2 = Math.min(OSMMercatorProjection.worldToTile(wx + ww), max); 
-                int y1 = OSMMercatorProjection.worldToTile(Math.max(wy, 0)); 
-                int y2 = Math.min(OSMMercatorProjection.worldToTile(wy + wh), max); 
+                int x1 = OsmMercatorProjection.worldToTile(Math.max(wx, 0)); 
+                int x2 = Math.min(OsmMercatorProjection.worldToTile(wx + ww), max); 
+                int y1 = OsmMercatorProjection.worldToTile(Math.max(wy, 0)); 
+                int y2 = Math.min(OsmMercatorProjection.worldToTile(wy + wh), max); 
                 
                 if (zoom <= 18) {