--- dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/BoundingBox.java 2014/12/15 11:12:21 2247 +++ 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,15 +10,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,35 +24,26 @@ } 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); + 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() { - Constants consts = Constants.getInstance(); - - latitudeMax += consts.getLatitudeMargin(); - latitudeMin -= consts.getLatitudeMargin(); - - longitudeMax += consts.getLongitudeMargin(); - longitudeMin -= consts.getLongitudeMargin(); - } @Override public BoundingBox clone() {