Take requested layer into account

Author: leonardehrenfried

application/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java

@@ -15,6 +15,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
+import java.util.Set;
 import java.util.function.Predicate;
 import org.glassfish.grizzly.http.server.Request;
 import org.opentripplanner.apis.support.TileJson;
@@ -96,12 +97,14 @@ public TileJson getTileJson(
         TileJson.urlWithDefaultPath(uri, headers, rLayers, ignoreRouterId, "vectorTiles")
       );
 
+    int minZoom = config.minZoom(Set.copyOf(rLayers));
+    int maxZoom = config.maxZoom(Set.copyOf(rLayers));
     return config
       .attribution()
-      .map(attr -> new TileJson(url, envelope, attr, config.minZoom(), config.maxZoom()))
+      .map(attr -> new TileJson(url, envelope, attr, minZoom, maxZoom))
       .orElseGet(() -> {
         var feedInfos = getFeedInfos();
-        return new TileJson(url, envelope, feedInfos, config.minZoom(), config.maxZoom());
+        return new TileJson(url, envelope, feedInfos, minZoom, maxZoom);
       });
   }
 

application/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java

@@ -11,6 +11,8 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Stream;
 import javax.annotation.Nullable;
 import org.opentripplanner.ext.vectortiles.VectorTilesResource;
 import org.opentripplanner.ext.vectortiles.VectorTilesResource.LayerType;
@@ -162,17 +164,21 @@ public static Layer mapLayer(NodeAdapter node) {
   }
 
   /**
-   * The lowest configured minZoom value of any layer or the fallback of {@link LayerParameters#MIN_ZOOM}
+   * The lowest configured minZoom value of the requested layers or the fallback of {@link LayerParameters#MIN_ZOOM}
    */
-  public int minZoom() {
-    return layers.stream().mapToInt(LayerParameters::minZoom).min().orElse(MIN_ZOOM);
+  public int minZoom(Set<String> requestedLayers) {
+    return selectLayers(requestedLayers).mapToInt(LayerParameters::minZoom).min().orElse(MIN_ZOOM);
   }
 
   /**
-   * The highest configured maxZoom value of any layer or the fallback of {@link LayerParameters#MAX_ZOOM}
+   * The highest configured maxZoom value of the requested layers or the fallback of {@link LayerParameters#MAX_ZOOM}
    */
-  public int maxZoom() {
-    return layers.stream().mapToInt(LayerParameters::maxZoom).max().orElse(MAX_ZOOM);
+  public int maxZoom(Set<String> requestedLayers) {
+    return selectLayers(requestedLayers).mapToInt(LayerParameters::maxZoom).max().orElse(MAX_ZOOM);
+  }
+
+  private Stream<LayerParameters<LayerType>> selectLayers(Set<String> requestedLayers) {
+    return layers.stream().filter(l -> requestedLayers.contains(l.name()));
   }
 
   record Layer(

application/src/test/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfigTest.java

@@ -3,6 +3,7 @@
 import static org.junit.jupiter.api.Assertions.*;
 
 import java.util.List;
+import java.util.Set;
 import org.junit.jupiter.api.Test;
 import org.opentripplanner.ext.vectortiles.VectorTilesResource;
 import org.opentripplanner.ext.vectortiles.layers.LayerFilters;
@@ -12,26 +13,35 @@ class VectorTileConfigTest {
 
   @Test
   void fallbackWhenEmpty() {
-    assertEquals(LayerParameters.MIN_ZOOM, VectorTileConfig.DEFAULT.minZoom());
-    assertEquals(LayerParameters.MAX_ZOOM, VectorTileConfig.DEFAULT.maxZoom());
+    assertEquals(LayerParameters.MIN_ZOOM, VectorTileConfig.DEFAULT.minZoom(Set.of()));
+    assertEquals(LayerParameters.MAX_ZOOM, VectorTileConfig.DEFAULT.maxZoom(Set.of()));
+  }
+
+  @Test
+  void fallbackWhenNotFound() {
+    assertEquals(LayerParameters.MIN_ZOOM, VectorTileConfig.DEFAULT.minZoom(Set.of("x")));
+    assertEquals(LayerParameters.MAX_ZOOM, VectorTileConfig.DEFAULT.maxZoom(Set.of("x")));
   }
 
   @Test
   void computeZoomFromLayers() {
     final int maxZoom = 24;
     final int minZoom = 2;
     var config = new VectorTileConfig(
-      List.of(layerConfig(maxZoom, minZoom), layerConfig(maxZoom - 1, minZoom + 1)),
+      List.of(layerConfig("a", minZoom, maxZoom), layerConfig("b", minZoom + 1, maxZoom - 1)),
       null,
       null
     );
-    assertEquals(minZoom, config.minZoom());
-    assertEquals(maxZoom, config.maxZoom());
+    assertEquals(minZoom, config.minZoom(Set.of("a", "b")));
+    assertEquals(maxZoom, config.maxZoom(Set.of("a", "b")));
+
+    assertEquals(minZoom, config.minZoom(Set.of("a")));
+    assertEquals(maxZoom, config.maxZoom(Set.of("a")));
   }
 
-  private static VectorTileConfig.Layer layerConfig(int maxZoom, int minZoom) {
+  private static VectorTileConfig.Layer layerConfig(String name, int minZoom, int maxZoom) {
     return new VectorTileConfig.Layer(
-      "aaa",
+      name,
       VectorTilesResource.LayerType.Stop,
       "a-mapper",
       maxZoom,