--- dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/BoundingBox.java	2014/12/10 07:36:40	2239
+++ dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/BoundingBox.java	2015/06/14 15:11:23	2588
@@ -1,5 +1,7 @@
 package dk.daoas.fulddaekning;
 
+import geocode.GeoPoint;
+
 public class BoundingBox {
 		
 	
@@ -10,15 +12,12 @@
 		
 		private static final long serialVersionUID = 1L;		
 	}
-	
-	//public static final double LATITUDE_MARGIN = 0.02702703;
-	//public static final double LONGUTUDE_MARGIN = 0.046875; 
-	
+		
 	public double latitudeMax;
-	public double latitudeMin;
+	public double latitudeMin = Double.MAX_VALUE;
 	
 	public double longitudeMax;
-	public double longitudeMin;
+	public double longitudeMin = Double.MAX_VALUE;
 	
 	
 	@Override
@@ -27,34 +26,37 @@
 	}
 	
 	public void validateBbox() throws BoundingBoxException {
-		
+
 		double latDiff = Math.abs(latitudeMax - latitudeMin);		
-		if ( latDiff > 1.0) {
+		if ( latDiff > 1.1) {
 			throw new BoundingBoxException("For stor latitude forskel / " + latDiff);
 		}
 		
 		double lngDiff = Math.abs(longitudeMax - longitudeMin);	
-		if ( lngDiff > 1.0) {
+		if ( lngDiff > 1.1) {
 			throw new BoundingBoxException("For stor longitude forskel / " + lngDiff);
 		}
 		
 		GeoPoint min = new GeoPoint(latitudeMin, longitudeMin);
 		GeoPoint max = new GeoPoint(latitudeMax, longitudeMax);
-		double afstand = GeoPoint.beregnAfstand(min, max);
+		double afstand = GeoPointHelper.beregnAfstand(min, max);
 		
-		if (afstand >= 80.0) { //hvis cross afstand er over 80 km - så er postnummeret for stort
+		if (afstand >= 125.0) { //hvis cross afstand er over X km - så er postnummeret for stort
 			throw new BoundingBoxException("For stor cross afstand " + afstand);
 		}
 	}
 	
-	public void adjustToMargin() {
-		Constants consts = Constants.getInstance();
+	
+	@Override
+	public BoundingBox clone() {
+		BoundingBox bb = new BoundingBox();
+		bb.latitudeMax = this.latitudeMax;
+		bb.longitudeMax = this.longitudeMax;
 		
-		latitudeMax += consts.getLatitudeMargin();
-		latitudeMin -= consts.getLatitudeMargin();
+		bb.latitudeMin = this.latitudeMin;
+		bb.longitudeMin = this.longitudeMin;
 		
-		longitudeMax += consts.getLongitudeMargin();
-		longitudeMin -= consts.getLongitudeMargin();
+		return bb;
 	}