Merge pull request #330 from gisaia/feature/increaseZoomMax

Increase max zoom for tiled geosearch
gisaia · Jul 11, 2018 · 606d7a3 · 606d7a3
2 parents b86a2b8 + 9f17113
commit 606d7a3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/arlas-core/src/main/java/io/arlas/server/utils/CheckParams.java b/arlas-core/src/main/java/io/arlas/server/utils/CheckParams.java
@@ -40,7 +40,7 @@ public class CheckParams {
 
     private static final String POLYGON_TYPE = "POLYGON";
     private static final String INVALID_SORT_PARAMETER = "Invalid sort syntax. Please use the following syntax : 'fieldName:ASC' or 'fieldName:DESC'. ";
-    private static final String INVALID_XYZ_PARAMETER = "Z must be between 0 and 22. X and Y must be between 0 and (2^Z-1)";
+    private static final String INVALID_XYZ_PARAMETER = "Z must be between 0 and 28. X and Y must be between 0 and (2^Z-1)";
     private static final String INVALID_DATE_MATH_UNIT = "Invalid date math unit. Please use the following list : y, M, w, d, h, H, m, s. ";
     private static final String INVALID_DATE_MATH_VALUE = "Invalid date math value. Please specify an integer. ";
     private static final String INVALID_DATE_MATH_OPERATOR = "Invalid date math operator. Please use the following list : /, +, -";
@@ -294,7 +294,7 @@ public static Double getValidHistogramInterval(String aggInterval) throws ArlasE
     }
 
     public static void checkXYZTileValidity(int x, int y, int z) throws ArlasException {
-        if (z >= 0 && z <= 22) {
+        if (z >= 0 && z <= 28) {
             if (!isIntegerInXYZRange(x, z) || !isIntegerInXYZRange(x, z)) {
                 throw new InvalidParameterException(INVALID_XYZ_PARAMETER);
             }

diff --git a/arlas-tests/src/test/java/io/arlas/server/rest/explore/AbstractXYZTiledTest.java b/arlas-tests/src/test/java/io/arlas/server/rest/explore/AbstractXYZTiledTest.java
@@ -67,7 +67,7 @@ public void testXYZTile() throws Exception {
     @Test
     public void testInvalidXYZTile() throws Exception {
         handleInvalidXYZ(xyzTileGet(null, null, 0, 1, 0));
-        handleInvalidXYZ(xyzTileGet(null, null, 23, 1, 0));
+        handleInvalidXYZ(xyzTileGet(null, null, 29, 1, 0));
     }
 
     protected abstract void handleXYZ(ValidatableResponse then, String bottomLeft, String topRight) throws Exception;