Update call sites to use ZoneView#getVisibility(PlayerView)

This lets us remove `ZoneView#getExposedArea(PlayerView)` and `ZoneView#getVisibleArea(PlayerView)`.

Author: kwvanderlinde

src/main/java/net/rptools/maptool/client/tool/PointerTool.java

@@ -1952,9 +1952,11 @@ private boolean validateMove(
             ExposedAreaMetaData meta = zone.getExposedAreaMetaData(token.getExposedAreaGUID());
             tokenFog.add(meta.getExposedAreaHistory());
 
-            // Jamz: Allow a token without site to move within the current PlayerView
+            // Jamz: Allow a token without sight to move within the current PlayerView
             if (!token.getHasSight()) {
-              tokenFog.add(renderer.getZoneView().getVisibleArea(new PlayerView(Role.PLAYER)));
+              var view = new PlayerView(Role.PLAYER);
+              var visibleArea = renderer.getZoneView().getVisibility(view).visibleArea();
+              tokenFog.add(visibleArea);
             }
           }
 

src/main/java/net/rptools/maptool/client/ui/zone/ZoneView.java

@@ -293,31 +293,6 @@ public ZoneView(Zone zone) {
         });
   }
 
-  /**
-   * Gets the exposed area (area without hard FoW0 for the given view.
-   *
-   * <p>The results of this method are only meaningful if the zone has fog enabled.
-   *
-   * @param view The player view
-   * @return The exposed area for {@code view}.
-   */
-  public @Nonnull Area getExposedArea(PlayerView view) {
-    return getVisibility(view).exposedArea();
-  }
-
-  /**
-   * Gets the visible area of the view, cache it in visibleAreaMap, and return it
-   *
-   * <p>The visible area is calculated for each token in the view. The token's visible area is its
-   * vision obstructed by topology and restricted to the illuminated portions of the map.
-   *
-   * @param view the PlayerView
-   * @return the visible area
-   */
-  public @Nonnull Area getVisibleArea(PlayerView view) {
-    return getVisibility(view).visibleArea();
-  }
-
   /**
    * Get the vision status of the zone.
    *

src/main/java/net/rptools/maptool/client/ui/zone/ZoneViewModel.java

@@ -347,7 +347,7 @@ private void updateViewport() {
 
   /** Updates {@link #visibleArea} based on {@link #playerView}. */
   private void updateVisibleArea() {
-    visibleArea = zoneView.getVisibleArea(playerView);
+    visibleArea = zoneView.getVisibility(playerView).visibleArea();
   }
 
   /** Updates {@link #playerView}. */

src/main/java/net/rptools/maptool/client/ui/zone/gdx/GdxRenderer.java

@@ -688,7 +688,8 @@ private boolean prerender(PlayerView view) {
     timer.start("calcs-1");
     timer.start("ZoneRenderer-getVisibleArea");
     if (visibleScreenArea == null) {
-      visibleScreenArea = zoneCache.getZoneView().getVisibleArea(viewModel.getPlayerView());
+      visibleScreenArea =
+          zoneCache.getZoneView().getVisibility(viewModel.getPlayerView()).visibleArea();
     }
     timer.stop("ZoneRenderer-getVisibleArea");
 
@@ -1090,7 +1091,8 @@ private void showBlockedMoves(PlayerView view, Set<SelectionSet> movementSet) {
                       || zoneCache
                           .getZoneRenderer()
                           .getZoneView()
-                          .getVisibleArea(view)
+                          .getVisibility(view)
+                          .visibleArea()
                           .intersects(tokenRectangle);
             }
           } else {

src/main/java/net/rptools/maptool/client/ui/zone/renderer/LightsRenderer.java

@@ -111,7 +111,7 @@ private void renderWorld(
       Color backgroundFill) {
     var timer = CodeTimer.get();
 
-    var visibleArea = zoneView.getVisibleArea(view);
+    var visibleArea = zoneView.getVisibility(view).visibleArea();
 
     var originalClip = worldG.getClip();
     var bounds = originalClip.getBounds();

src/main/java/net/rptools/maptool/client/ui/zone/renderer/LumensRenderer.java

@@ -61,7 +61,7 @@ private void renderWorld(Graphics2D worldG, PlayerView view) {
     var timer = CodeTimer.get();
     var overlayOpacity = AppPreferences.lumensOverlayOpacity.get() / 255.0f;
 
-    var visibleArea = zoneView.getVisibleArea(view);
+    var visibleArea = zoneView.getVisibility(view).visibleArea();
     final var disjointLumensLevels = zoneView.getDisjointObscuredLumensLevels(view);
 
     var originalClip = worldG.getClip();

src/main/java/net/rptools/maptool/client/ui/zone/renderer/VisionOverlayRenderer.java

@@ -77,7 +77,7 @@ private void renderWorld(Graphics2D worldG, PlayerView view, Token token) {
     }
     if (zone.hasFog()) {
       currentTokenVisionArea = new Area(currentTokenVisionArea);
-      currentTokenVisionArea.intersect(zoneView.getExposedArea(tokenView));
+      currentTokenVisionArea.intersect(zoneView.getVisibility(tokenView).exposedArea());
     }
 
     // Keep the line a consistent thickness

src/main/java/net/rptools/maptool/client/ui/zone/renderer/ZoneRenderer.java

@@ -860,7 +860,7 @@ public void renderZone(Graphics2D g2d, @Nullable PlayerView view) {
     timer.start("calcs-1");
     if (visibleScreenArea == null) {
       timer.start("ZoneRenderer-getVisibleArea");
-      Area a = zoneView.getVisibleArea(view);
+      Area a = zoneView.getVisibility(view).visibleArea();
       timer.stop("ZoneRenderer-getVisibleArea");
 
       timer.start("createTransformedArea");
@@ -1184,7 +1184,7 @@ protected void showBlockedMoves(Graphics2D g, PlayerView view, Set<SelectionSet>
       if (zone.hasFog()) {
         clearArea = zoneView.getVisibility(view).clearArea();
       } else if (zoneView.isUsingVision()) {
-        clearArea = zoneView.getVisibleArea(view);
+        clearArea = zoneView.getVisibility(view).visibleArea();
       }
 
       if (clearArea != null) {

src/main/java/net/rptools/maptool/client/walker/astar/AbstractAStarWalker.java

@@ -235,7 +235,9 @@ protected List<CellPoint> calculatePath(CellPoint start, CellPoint goal) {
 
       var view = zoneRenderer.getPlayerView();
       newFowExposedArea =
-          zone.hasFog() && !view.isGMView() ? zoneView.getExposedArea(view) : new Area();
+          zone.hasFog() && !view.isGMView()
+              ? zoneView.getVisibility(view).exposedArea()
+              : new Area();
     }
 
     if (!Objects.equals(newFowExposedArea, fowExposedArea)) {