[Hipgmap-cvs] gmap/com/trileet/gmap GMap.java,1.30,1.31 Tile.java,1.10,1.11 TileSet.java,1.27,1.28

[Nicolas P. <nic...@us...>]

Update of /cvsroot/hipgmap/gmap/com/trileet/gmap
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10888/com/trileet/gmap

Modified Files:
	GMap.java Tile.java TileSet.java 
Log Message:
Fix panning of new tiles.


Index: Tile.java
===================================================================
RCS file: /cvsroot/hipgmap/gmap/com/trileet/gmap/Tile.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Tile.java	5 Jul 2005 23:50:14 -0000	1.10
--- Tile.java	9 Jul 2005 19:06:18 -0000	1.11
***************
*** 90,97 ****
  	public static String makeURL(int x, int y, int zoom) {
  		return "http://hipster.trileet.com/tmpimg/img.php?nocache=true&url=" +
! 		     URLEncoder.encode("http://mt.google.com/mt?v=w2.4&x=" + x + "&y=" + y + "&zoom="	+ zoom);
! // no direct request till Danger fixes their gateway		
! //		return "http://mt.google.com/mt?v=2.4&x=" + x + "&y=" + y + "&zoom="
! //		+ zoom;
  	}
  
--- 90,94 ----
  	public static String makeURL(int x, int y, int zoom) {
  		return "http://hipster.trileet.com/tmpimg/img.php?nocache=true&url=" +
!   		        URLEncoder.encode("http://mt.google.com/mt?v=w2.4&x=" + x + "&y=" + y + "&zoom="	+ zoom);
  	}
  

Index: GMap.java
===================================================================
RCS file: /cvsroot/hipgmap/gmap/com/trileet/gmap/GMap.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** GMap.java	23 Apr 2005 05:27:19 -0000	1.30
--- GMap.java	9 Jul 2005 19:06:18 -0000	1.31
***************
*** 20,26 ****
   * GMap
   *
-  * Test of cvs list.
-  * CVS Test
-  *
   *
   * @author <a href='ni...@tr...'>Nic Pottier</a>
--- 20,23 ----
***************
*** 193,197 ****
  					zoom = 4;
  				}
- 				System.out.println("SPAN: " + latSpan + " ZOOM: "+ zoom);
  				s_mapWindow.setCenter(s_dirs.lat, s_dirs.lng, zoom);
  			}
--- 190,193 ----

Index: TileSet.java
===================================================================
RCS file: /cvsroot/hipgmap/gmap/com/trileet/gmap/TileSet.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** TileSet.java	5 Jul 2005 23:50:14 -0000	1.27
--- TileSet.java	9 Jul 2005 19:06:18 -0000	1.28
***************
*** 351,356 ****
  
  			// Figure out our offset based on how much we moved
! 			m_offsetX = m_offsetX % TILE_WIDTH + TILE_WIDTH * 2;
! 			m_offsetY = m_offsetY % TILE_WIDTH + TILE_WIDTH * 2;
  			setMapTilesByCenter(mapX, mapY, m_zoom);
  		}
--- 351,357 ----
  
  			// Figure out our offset based on how much we moved
! 			m_offsetX = m_offsetX % TILE_WIDTH + TILE_WIDTH;
! 			m_offsetY = m_offsetY % TILE_WIDTH + TILE_WIDTH;
! 			
  			setMapTilesByCenter(mapX, mapY, m_zoom);
  		}
***************
*** 472,475 ****
--- 473,477 ----
  	int m_hitY = -1;
  	if (!displayPhoto) {
+ 		
  	    for (int x = 0; x < getWidth(); x++) {
  			for (int y = 0; y < getHeight(); y++) {