--- dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/BoundingBox.java 2015/02/20 08:52:52 2330 +++ dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/BoundingBox.java 2015/09/27 13:21:45 2707 @@ -1,6 +1,6 @@ package dk.daoas.fulddaekning; -public class BoundingBox { +public class BoundingBox implements Cloneable{ public static class BoundingBoxException extends Exception{ @@ -10,10 +10,7 @@ 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 = Double.MAX_VALUE; @@ -38,25 +35,15 @@ 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); + Adresse min = new Adresse(latitudeMin, longitudeMin); + Adresse max = new Adresse(latitudeMax, longitudeMax); + double afstand = GeoPointHelper.beregnAfstand(min, max); - if (afstand >= 125.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(double kmMargin) { - double latMargin = GeoPoint.kmToLatitude(kmMargin); - double lngMargin = GeoPoint.kmToLongitude(kmMargin); - - latitudeMax += latMargin; - latitudeMin -= latMargin; - - longitudeMax += lngMargin; - longitudeMin -= lngMargin; - } @Override public BoundingBox clone() {