use PartialCookie approach

Author: Delta456

java/src/org/openqa/selenium/bidi/emulation/GeolocationCoordinates.java

@@ -21,142 +21,98 @@
 import java.util.Map;
 
 public class GeolocationCoordinates {
-  private final double latitude;
-  private final double longitude;
-  private final double accuracy;
-  private final Double altitude;
-  private final Double altitudeAccuracy;
-  private final Double heading;
-  private final Double speed;
-
-  // Constructor with default accuracy = 1.0
-  public GeolocationCoordinates(
-      double latitude,
-      double longitude,
-      Double altitude,
-      Double altitudeAccuracy,
-      Double heading,
-      Double speed) {
-    this(latitude, longitude, 1.0, altitude, altitudeAccuracy, heading, speed);
-  }
-
-  // Constructor with no altitude, altitudeAccuracy, heading, or speed
-  public GeolocationCoordinates(double latitude, double longitude, double accuracy) {
-    this(latitude, longitude, accuracy, null, null, null, null);
-  }
-
-  // Constructor with no altitudeAccuracy, heading, or speed
-  public GeolocationCoordinates(
-      double latitude, double longitude, double accuracy, Double altitude) {
-    this(latitude, longitude, accuracy, altitude, null, null, null);
-  }
-
-  // Constructor no heading or speed
-  public GeolocationCoordinates(
-      double latitude,
-      double longitude,
-      double accuracy,
-      Double altitude,
-      Double altitudeAccuracy) {
-    this(latitude, longitude, accuracy, altitude, altitudeAccuracy, null, null);
-  }
-
-  // Constructor with no speed
-  public GeolocationCoordinates(
-      double latitude,
-      double longitude,
-      double accuracy,
-      Double altitude,
-      Double altitudeAccuracy,
-      Double heading) {
-    this(latitude, longitude, accuracy, altitude, altitudeAccuracy, heading, null);
-  }
-
-  public GeolocationCoordinates(
-      double latitude,
-      double longitude,
-      double accuracy,
-      Double altitude,
-      Double altitudeAccuracy,
-      Double heading,
-      Double speed) {
+  private final Map<String, Object> map = new HashMap<>();
 
+  public GeolocationCoordinates(double latitude, double longitude) {
     if (latitude < -90.0 || latitude > 90.0) {
       throw new IllegalArgumentException("Latitude must be between -90.0 and 90.0");
     }
     if (longitude < -180.0 || longitude > 180.0) {
       throw new IllegalArgumentException("Longitude must be between -180.0 and 180.0");
     }
+
+    map.put("latitude", latitude);
+    map.put("longitude", longitude);
+    map.put("accuracy", 1.0); // Default accuracy
+  }
+
+  public GeolocationCoordinates accuracy(double accuracy) {
     if (accuracy < 0.0) {
       throw new IllegalArgumentException("Accuracy must be >= 0.0");
     }
-    if (altitudeAccuracy != null && altitude == null) {
-      throw new IllegalArgumentException("altitudeAccuracy cannot be set without altitude");
-    }
-    if (altitudeAccuracy != null && altitudeAccuracy < 0.0) {
-      throw new IllegalArgumentException("Altitude accuracy must be >= 0.0");
+    map.put("accuracy", accuracy);
+    return this;
+  }
+
+  public GeolocationCoordinates altitude(Double altitude) {
+    if (altitude != null) {
+      map.put("altitude", altitude);
     }
-    if (heading != null && (heading < 0.0 || heading >= 360.0)) {
-      throw new IllegalArgumentException("Heading must be between 0.0 and 360.0");
+    return this;
+  }
+
+  public GeolocationCoordinates altitudeAccuracy(Double altitudeAccuracy) {
+    if (altitudeAccuracy != null) {
+      if (!map.containsKey("altitude")) {
+        throw new IllegalArgumentException("altitudeAccuracy cannot be set without altitude");
+      }
+      if (altitudeAccuracy < 0.0) {
+        throw new IllegalArgumentException("Altitude accuracy must be >= 0.0");
+      }
+      map.put("altitudeAccuracy", altitudeAccuracy);
     }
-    if (speed != null && speed < 0.0) {
-      throw new IllegalArgumentException("Speed must be >= 0.0");
+    return this;
+  }
+
+  public GeolocationCoordinates heading(Double heading) {
+    if (heading != null) {
+      if (heading < 0.0 || heading >= 360.0) {
+        throw new IllegalArgumentException("Heading must be between 0.0 and 360.0");
+      }
+      map.put("heading", heading);
     }
+    return this;
+  }
 
-    this.latitude = latitude;
-    this.longitude = longitude;
-    this.accuracy = accuracy;
-    this.altitude = altitude;
-    this.altitudeAccuracy = altitudeAccuracy;
-    this.heading = heading;
-    this.speed = speed;
+  public GeolocationCoordinates speed(Double speed) {
+    if (speed != null) {
+      if (speed < 0.0) {
+        throw new IllegalArgumentException("Speed must be >= 0.0");
+      }
+      map.put("speed", speed);
+    }
+    return this;
   }
 
   public double getLatitude() {
-    return latitude;
+    return (Double) map.get("latitude");
   }
 
   public double getLongitude() {
-    return longitude;
+    return (Double) map.get("longitude");
   }
 
   public double getAccuracy() {
-    return accuracy;
+    return (Double) map.get("accuracy");
   }
 
   public Double getAltitude() {
-    return altitude;
+    return (Double) map.get("altitude");
   }
 
   public Double getAltitudeAccuracy() {
-    return altitudeAccuracy;
+    return (Double) map.get("altitudeAccuracy");
   }
 
   public Double getHeading() {
-    return heading;
+    return (Double) map.get("heading");
   }
 
   public Double getSpeed() {
-    return speed;
+    return (Double) map.get("speed");
   }
 
   public Map<String, Object> toMap() {
-    Map<String, Object> map = new HashMap<>();
-    map.put("latitude", getLatitude());
-    map.put("longitude", getLongitude());
-    map.put("accuracy", getAccuracy());
-    if (getAltitude() != null) {
-      map.put("altitude", getAltitude());
-    }
-    if (getAltitudeAccuracy() != null) {
-      map.put("altitudeAccuracy", getAltitudeAccuracy());
-    }
-    if (getHeading() != null) {
-      map.put("heading", getHeading());
-    }
-    if (getSpeed() != null) {
-      map.put("speed", getSpeed());
-    }
     return Map.copyOf(map);
   }
 }

java/test/org/openqa/selenium/bidi/emulation/EmulationTest.java

@@ -83,8 +83,7 @@ void canSetGeolocationOverrideWithCoordinatesInContext() {
         (String) ((JavascriptExecutor) driver).executeScript("return window.location.origin;");
 
     Emulation emul = new Emulation(driver);
-    GeolocationCoordinates coords =
-        new GeolocationCoordinates(37.7749, -122.4194, 10.0, null, null, null);
+    GeolocationCoordinates coords = new GeolocationCoordinates(37.7749, -122.4194);
     emul.setGeolocationOverride(
         new SetGeolocationOverrideParameters(coords, null, List.of(contextId), null));
 
@@ -118,8 +117,7 @@ void canSetGeolocationOverrideWithMultipleUserContexts() {
         new BrowsingContext(
             driver, new CreateContextParameters(WindowType.TAB).userContext(userContext2));
 
-    GeolocationCoordinates coords =
-        new GeolocationCoordinates(45.5, -122.4194, 10.0, null, null, null);
+    GeolocationCoordinates coords = new GeolocationCoordinates(45.5, -122.4194);
 
     Emulation emulation = new Emulation(driver);
     emulation.setGeolocationOverride(