Update BNG constants (#18)

* Use an exact copy of ADMSConstants in AERIUS-II # Conflicts: # search-service-geo/src/main/java/nl/aerius/search/tasks/BNGConstants.java * Make things private and remove obsolete fields
aerius · Nov 15, 2022 · fe1d45e · fe1d45e
1 parent 42f3f88
commit fe1d45e
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 9 deletions.
diff --git a/search-service-geo/src/main/java/nl/aerius/search/tasks/BNGConstants.java b/search-service-geo/src/main/java/nl/aerius/search/tasks/BNGConstants.java
@@ -16,20 +16,31 @@
  */
 package nl.aerius.search.tasks;
 
+import java.util.ArrayList;
+
 import nl.overheid.aerius.geo.shared.BBox;
+import nl.overheid.aerius.shared.domain.geo.HexagonZoomLevel;
 import nl.overheid.aerius.shared.domain.geo.ReceptorGridSettings;
 import nl.overheid.aerius.shared.geo.EPSG;
 
 public final class BNGConstants {
- // NOTE Both of the below values are not yet guaranteed to be as constant as the
- // RDNew counterparts
- public static final int MIN_ZL_SURFACE_AREA = 250_000;
- public static final int HEX_HOR = 721;
- public static final BBox BOUNDS = new BBox(1393.0196, 671196.3657, 13494.9764, 1234954.16);
+ private static final EPSG EPSG = nl.overheid.aerius.shared.geo.EPSG.BNG;
+
+ private static final int HEX_HOR = 1785;
+
+ private static final double MIN_X = -4_000.0;
+ private static final double MAX_X = 660_000.0;
+ private static final double MIN_Y = 4_000.0;
+ private static final double MAX_Y = 1_222_000.0;
+
+ private static final HexagonZoomLevel ZOOM_LEVEL_1 = new HexagonZoomLevel(1, 40_000);
 
  private BNGConstants() {}
 
- public static ReceptorGridSettings create() {
- return ReceptorUtils.createReceptorUtil(EPSG.BNG, BNGConstants.MIN_ZL_SURFACE_AREA, BNGConstants.HEX_HOR, BNGConstants.BOUNDS);
+ public static ReceptorGridSettings getReceptorUtil() {
+ final ArrayList<HexagonZoomLevel> hexagonZoomLevels = new ArrayList<>();
+ hexagonZoomLevels.add(ZOOM_LEVEL_1);
+ final BBox boundingBox = new BBox(MIN_X, MIN_Y, MAX_X, MAX_Y);
+ return new ReceptorGridSettings(boundingBox, EPSG, HEX_HOR, hexagonZoomLevels);
  }
 }
diff --git a/...rvice-geo/src/main/java/nl/aerius/search/tasks/coordinate/BNGCoordinateSearchService.java b/...rvice-geo/src/main/java/nl/aerius/search/tasks/coordinate/BNGCoordinateSearchService.java
@@ -27,6 +27,6 @@
 @ImplementsCapability(value = SearchCapability.COORDINATE, region = SearchRegion.UK)
 public class BNGCoordinateSearchService extends AbstractCoordinateSearchService {
  public BNGCoordinateSearchService() {
- super(BNGConstants.create());
+ super(BNGConstants.getReceptorUtil());
  }
 }
diff --git a/...h-service-geo/src/main/java/nl/aerius/search/tasks/receptor/BNGReceptorSearchService.java b/...h-service-geo/src/main/java/nl/aerius/search/tasks/receptor/BNGReceptorSearchService.java
@@ -27,6 +27,6 @@
 @ImplementsCapability(value = SearchCapability.RECEPTOR, region = SearchRegion.UK)
 public class BNGReceptorSearchService extends AbstractReceptorSearchService {
  public BNGReceptorSearchService() {
- super(BNGConstants.create());
+ super(BNGConstants.getReceptorUtil());
  }
 }