Index: contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestCartesian.java
===================================================================
--- contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestCartesian.java	(revision 800954)
+++ contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestCartesian.java	(working copy)
@@ -146,8 +146,8 @@
   public void testRange() throws IOException, InvalidGeoException {
     searcher = new IndexSearcher(directory);
 
-    final double[] milesToTest = new double[] {6.0, 0.5, 0.001, 0.0};
-    final int[] expected = new int[] {7, 1, 0, 0};
+    final double[] milesToTest = new double[] {6000.0, 6.0, 0.5, 0.001, 0.0};
+    final int[] expected = new int[] {17, 7, 1, 0, 0};
 
     for(int x=0;x<expected.length;x++) {
     
@@ -226,7 +226,7 @@
         System.out.println("Name: "+ name +", Distance "+ distance); //(res, ortho, harvesine):"+ distance +" |"+ geo_distance +"|"+ llm +" | score "+ hits.score(i));
         assertTrue(Math.abs((distance - llm)) < 1);
         assertTrue((distance < miles ));
-        assertTrue(geo_distance > lastDistance);
+        assertTrue(geo_distance >= lastDistance);
         lastDistance = geo_distance;
       }
     }
@@ -237,8 +237,8 @@
   public void testGeoHashRange() throws IOException, InvalidGeoException {
     searcher = new IndexSearcher(directory);
 	    
-    final double[] milesToTest = new double[] {6.0, 0.5, 0.001, 0.0};
-    final int[] expected = new int[] {7, 1, 0, 0};
+    final double[] milesToTest = new double[] {6000.0, 6.0, 0.5, 0.001, 0.0};
+    final int[] expected = new int[] {17, 7, 1, 0, 0};
 
     for(int x=0;x<expected.length;x++) {
       final double miles = milesToTest[x];
Index: contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/LLRect.java
===================================================================
--- contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/LLRect.java	(revision 801040)
+++ contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/LLRect.java	(working copy)
@@ -86,10 +86,15 @@
     double lngDelta=(widthMi/2)/miplngdeg;
     double latDelta=(heightMi/2)/miplatdeg;
     
+    double llnormLat = center.getLat()-latDelta;
+    double llnormLng = center.getLng()-lngDelta;
+    double urnormLat = center.getLat()+latDelta;
+    double urnormLng = center.getLng()+lngDelta;
+
     // TODO: Prob only works in northern hemisphere?
-    LatLng ll=new FloatLatLng(center.getLat()-latDelta, center.getLng()-lngDelta);
-    LatLng ur=new FloatLatLng(center.getLat()+latDelta, center.getLng()+lngDelta);
-    
+    LatLng ll=new FloatLatLng(normLat(llnormLat), normLng(llnormLng));
+    LatLng ur=new FloatLatLng(normLat(urnormLat), normLng(urnormLng));
+
     return new LLRect(ll, ur);
   }
   
@@ -99,4 +104,28 @@
   public Rectangle toRectangle() {
     return new Rectangle(ll.getLng(), ll.getLat(), ur.getLng(), ur.getLat());
   }
+  
+  /**
+   * Returns a normalized Lat rectangle shape for the bounding box
+   */
+  private static double normLat(double lat) {
+    if (lat > 90.0) {
+        lat = 90.0 - (lat - 90.0);
+    } else if (lat < -90.0) {
+        lat = -90.0 - (lat + 90.0);
+    }
+    return lat;
+  }
+
+  /**
+   * Returns a normalized Lng rectangle shape for the bounding box
+   */
+  private static double normLng(double lng) {
+    if (lng > 180.0) {
+        lng = -1.0*(180.0 - (lng - 180.0));
+    } else if (lng < -180.0) {
+        lng = (lng + 180.0)+180.0;
+    }
+    return lng;
+  }
 }