Changed meter conversion

Author: jnidzwetzki

bboxdb-commons/src/main/java/org/bboxdb/commons/math/Hyperrectangle.java

@@ -320,28 +320,35 @@ public Hyperrectangle enlargeByAmount(final double amount) {
 	 */
 	public Hyperrectangle enlargeByMeters(final double meterLat, final double meterLon) {
 
-	    // The equatorial radius as defined by WGS84
-	    final double EQUATORIAL_RADIUS = 6378137.0;
-
 	    final int dimension = getDimension();
 
 		if(dimension != 2) {
 			throw new IllegalArgumentException("Bounding box has the wrong dimension: " + dimension);
 		}
-				
+		
 		final double latitudeLow = getCoordinateLow(0);
 		final double lonitudeLow = getCoordinateLow(1);
 		final double latitudeHigh = getCoordinateHigh(0);
 		final double lonitudeHigh = getCoordinateHigh(1);
 
-		final double latChange = (180.0/Math.PI) * (meterLat / EQUATORIAL_RADIUS);
-		final double longChange = (180.0/Math.PI) * (meterLon / EQUATORIAL_RADIUS) / Math.cos(Math.toRadians(latitudeLow));
+	    //final double lat0 = Math.toRadians(latitudeLow);
+	    final double lat0=(latitudeLow * (Math.PI) / 180);
+
+	    // The radius as defined by WGS84
+	    final double equator_circumference = 6371000.0;
+	    final double polar_circumference = 6356800.0;
+
+	    final double m_per_deg_long = 360 / polar_circumference;
+	    final double m_per_deg_lat = Math.abs(360 / (Math.cos(lat0) * equator_circumference));
+
+	    final double deg_diff_lat = meterLat * m_per_deg_lat; 
+	    final double deg_diff_long = meterLon * m_per_deg_long;
 
 		return new Hyperrectangle(
-				latitudeLow - (latChange / 2.0), 
-				latitudeHigh + (latChange / 2.0), 
-				lonitudeLow - (longChange / 2.0), 
-				lonitudeHigh + (longChange / 2.0));
+				latitudeLow - (deg_diff_lat / 2.0), 
+				latitudeHigh + (deg_diff_lat / 2.0), 
+				lonitudeLow - (deg_diff_long / 2.0), 
+				lonitudeHigh + (deg_diff_long / 2.0));
 	}
 
 	/**

bboxdb-commons/src/test/java/org/bboxdb/math/TestHyperrectangle.java

@@ -701,5 +701,19 @@ public void testEnlargeByFactor() {
 		Assert.assertEquals(new Hyperrectangle(-50d, 50d, -250d, 250d), bb2.enlargeByFactor(5));
 		Assert.assertEquals(new Hyperrectangle(-20.0d, 30.0d, -250d, 250d, -320.0d, 230.0d), bb3.enlargeByFactor(5));
 	}
+	
+	
+	/**
+	 * Test the enlarge function
+	 */
+	@Test(timeout=60000)
+	public void testEnlargeByMeters() {
+		final Hyperrectangle bb0 = new Hyperrectangle(176.451691, 176.451691, 24.48522, 24.48522);
+		final Hyperrectangle enlargedBox0 = bb0.enlargeByMeters(50, 60);
+		Assert.assertEquals(enlargedBox0, new Hyperrectangle(176.4502756356295700, 176.4531063643704600, 24.4835210319657720, 24.4869189680342300));
 
+		final Hyperrectangle bb1 = new Hyperrectangle(239.848892, 239.848892, -131.3928222, -131.392822);
+		final Hyperrectangle enlargedBox1 = bb1.enlargeByMeters(50, 60);
+		Assert.assertEquals(enlargedBox1, new Hyperrectangle(239.8460795353730600, 239.8517044646269500, -131.3945211680342300, -131.3911230319657800));
+	}
 }

bboxdb-server/src/test/java/org/bboxdb/test/distribution/TestContinuousQueryEnlargement.java

@@ -30,7 +30,7 @@ public class TestContinuousQueryEnlargement {
 	/**
 	 * The name of the cluster for this test
 	 */
-	private static final String CLUSTER_NAME = "testcluster";
+	private static final String DISTRIBUTION_GROUP = "testgroupenlagement";
 
 	/**
 	 * The delta for the asserts
@@ -44,7 +44,7 @@ public static void init() throws Exception {
 
 	@Test(timeout=60_000)
 	public void testQueryRegister0() {
-		final ContinuousQueryRegisterer registerer = new ContinuousQueryRegisterer(CLUSTER_NAME, "abc1");
+		final ContinuousQueryRegisterer registerer = new ContinuousQueryRegisterer(DISTRIBUTION_GROUP, "abc1");
 		final QueryEnlagement enlargement = registerer.getMaxEnlagementFactorForTable();
 		Assert.assertEquals(0, enlargement.getMaxAbsoluteEnlargement(), DELTA);
 		Assert.assertEquals(1, enlargement.getMaxEnlargementFactor(), DELTA);
@@ -54,7 +54,7 @@ public void testQueryRegister0() {
 
 	@Test(timeout=60_000)
 	public void testQueryRegister1() throws ZookeeperException {
-		final ContinuousQueryRegisterer registerer = new ContinuousQueryRegisterer(CLUSTER_NAME, "abc2");
+		final ContinuousQueryRegisterer registerer = new ContinuousQueryRegisterer(DISTRIBUTION_GROUP, "abc2");
 		registerer.updateQueryOnTable(10, 20, 30, 40);
 
 		final QueryEnlagement enlargement = registerer.getMaxEnlagementFactorForTable();
@@ -67,7 +67,7 @@ public void testQueryRegister1() throws ZookeeperException {
 
 	@Test(timeout=60_000)
 	public void testQueryRegister2() throws ZookeeperException {
-		final ContinuousQueryRegisterer registerer = new ContinuousQueryRegisterer(CLUSTER_NAME, "abc3");
+		final ContinuousQueryRegisterer registerer = new ContinuousQueryRegisterer(DISTRIBUTION_GROUP, "abc3");
 		registerer.updateQueryOnTable(30, 40, 50, 60);
 
 		final QueryEnlagement enlargement = registerer.getMaxEnlagementFactorForTable();
@@ -79,7 +79,7 @@ public void testQueryRegister2() throws ZookeeperException {
 
 	@Test(timeout=60_000)
 	public void testQueryUnRegister0() throws ZookeeperException, InterruptedException {
-		final ContinuousQueryRegisterer registerer = new ContinuousQueryRegisterer(CLUSTER_NAME, "abc4");
+		final ContinuousQueryRegisterer registerer = new ContinuousQueryRegisterer(DISTRIBUTION_GROUP, "abc4");
 		registerer.updateQueryOnTable(30, 40, 50, 60);
 
 		final QueryEnlagement enlargement = registerer.getMaxEnlagementFactorForTable();
@@ -97,4 +97,9 @@ public void testQueryUnRegister0() throws ZookeeperException, InterruptedExcepti
 		Assert.assertEquals(0, enlargement.getMaxEnlargementLon(), DELTA);
 	}
 
+	public static void main(String[] args) throws ZookeeperException {
+		final ContinuousQueryRegisterer registerer = new ContinuousQueryRegisterer("mydgroup", "table1");
+		registerer.updateQueryOnTable(30, 40, 50, 60);
+	}
+	
 }