fix: apply dkhawk's changes - countdown maxDepth and updated tests

Author: ZeroX-404

library/src/main/java/com/google/maps/android/data/geojson/GeoJsonParser.java

@@ -181,12 +181,12 @@ private static LatLngBounds parseBoundingBox(JSONArray coordinates) throws JSONE
     private static final int MAX_GEOMETRY_DEPTH = 20;
 
     public static Geometry parseGeometry(JSONObject geoJsonGeometry) {
-        return parseGeometry(geoJsonGeometry, 0);
+        return parseGeometry(geoJsonGeometry, MAX_GEOMETRY_DEPTH);
     }
 
-    private static Geometry parseGeometry(JSONObject geoJsonGeometry, int depth) {
-        if (depth > MAX_GEOMETRY_DEPTH) {
-            Log.w(LOG_TAG, "GeoJSON geometry nesting depth exceeds maximum (" + MAX_GEOMETRY_DEPTH + "), ignoring.");
+    public static Geometry parseGeometry(JSONObject geoJsonGeometry, int maxDepth) {
+        if (maxDepth < 0) {
+            Log.w(LOG_TAG, "GeoJSON geometry nesting depth limit exhausted, ignoring.");
             return null;
         }
         try {
@@ -201,7 +201,7 @@ private static Geometry parseGeometry(JSONObject geoJsonGeometry, int depth) {
                 // No geometries or coordinates array
                 return null;
             }
-            return createGeometry(geometryType, geometryArray, depth);
+            return createGeometry(geometryType, geometryArray, maxDepth);
         } catch (JSONException e) {
             return null;
         }
@@ -250,7 +250,7 @@ private static HashMap<String, String> parseProperties(JSONObject properties)
      * @return Geometry object
      * @throws JSONException if the coordinates or geometries could be parsed
      */
-    private static Geometry createGeometry(String geometryType, JSONArray geometryArray, int depth)
+    private static Geometry createGeometry(String geometryType, JSONArray geometryArray, int maxDepth)
             throws JSONException {
         switch (geometryType) {
             case POINT:
@@ -266,7 +266,7 @@ private static Geometry createGeometry(String geometryType, JSONArray geometryAr
             case MULTIPOLYGON:
                 return createMultiPolygon(geometryArray);
             case GEOMETRY_COLLECTION:
-                return createGeometryCollection(geometryArray, depth + 1);
+                return createGeometryCollection(geometryArray, maxDepth - 1);
         }
         return null;
     }
@@ -371,13 +371,13 @@ private static GeoJsonMultiPolygon createMultiPolygon(JSONArray coordinates)
      * @return GeoJsonGeometryCollection object
      * @throws JSONException if geometries cannot be parsed
      */
-    private static GeoJsonGeometryCollection createGeometryCollection(JSONArray geometries, int depth)
+    private static GeoJsonGeometryCollection createGeometryCollection(JSONArray geometries, int maxDepth)
             throws JSONException {
         ArrayList<Geometry> geometryCollectionElements
                 = new ArrayList<>();
         for (int i = 0; i < geometries.length(); i++) {
             JSONObject geometryElement = geometries.getJSONObject(i);
-            Geometry geometry = parseGeometry(geometryElement, depth);
+            Geometry geometry = parseGeometry(geometryElement, maxDepth);
             if (geometry != null) {
                 // Do not add geometries that could not be parsed
                 geometryCollectionElements.add(geometry);

library/src/test/java/com/google/maps/android/data/geojson/GeoJsonParserTest.java

@@ -414,17 +414,37 @@ public void testDeeplyNestedGeometryCollection_doesNotThrowStackOverflow() throw
             GeoJsonParser.parseGeometry(deeplyNested);
         } catch (StackOverflowError e) {
             throw new AssertionError(
-                "StackOverflowError thrown for deeply nested GeometryCollection — fix tidak bekerja!", e);
+                "StackOverflowError thrown for deeply nested GeometryCollection — fix did not work!", e);
         }
     }
 
 
     @Test
+    public void testGeometryBeyondMaxDepth_returnsNull() throws Exception {
+        JSONObject point = new JSONObject();
+        point.put("type", "Point");
+        point.put("coordinates", new org.json.JSONArray("[0, 0]"));
+        Geometry result = GeoJsonParser.parseGeometry(point, -1);
+        assertNull("Geometry exceeding max depth (countdown < 0) should be null", result);
+    }
+
+    @Test
+    public void testCustomMaxDepth_respectsLimit() throws Exception {
+        JSONObject point = new JSONObject();
+        point.put("type", "Point");
+        point.put("coordinates", new org.json.JSONArray("[0, 0]"));
+        Geometry valid = GeoJsonParser.parseGeometry(point, 0);
+        assertNotNull("Geometry at maxDepth 0 should not be null", valid);
+        Geometry invalid = GeoJsonParser.parseGeometry(point, -1);
+        assertNull("Geometry at maxDepth -1 should be null", invalid);
+    }
+
+        @Test
     public void testShallowNestedGeometryCollection_parsedCorrectly() throws Exception {
         JSONObject shallow = buildNestedGeometryCollection(3);
         Geometry result = GeoJsonParser.parseGeometry(shallow);
-        assertNotNull("GeometryCollection dengan nesting normal seharusnya tidak null", result);
-        assertTrue("Tipe geometry harus GeoJsonGeometryCollection",
+        assertNotNull("GeometryCollection with normal nesting should not be null", result);
+        assertTrue("Geometry type must be GeoJsonGeometryCollection",
                 result instanceof GeoJsonGeometryCollection);
     }
 }