Filling in parameters

domesticmouse · domesticmouse · commit 5363a32ccb26 · 2018-03-26T13:24:11.000+11:00
diff --git a/src/main/java/com/google/maps/PendingResultBase.java b/src/main/java/com/google/maps/PendingResultBase.java
@@ -96,6 +96,14 @@ protected A param(String key, String val) {
     return result;
   }
 
+  protected A param(String key, int val) {
+    params.put(key, Integer.toString(val));
+
+    @SuppressWarnings("unchecked") // safe by specification - A is the actual class of this instance
+    A result = (A) this;
+    return result;
+  }
+
   protected A param(String key, UrlValue val) {
     params.put(key, val.toUrlValue());
 
diff --git a/src/main/java/com/google/maps/StaticMapsApi.java b/src/main/java/com/google/maps/StaticMapsApi.java
@@ -1,10 +1,18 @@
 package com.google.maps;
 
+import com.google.maps.model.Size;
+
 public class StaticMapsApi {
 
   private StaticMapsApi() {}
 
-  public static StaticMapsRequest newRequest(GeoApiContext context) {
-    return new StaticMapsRequest(context);
+  /**
+   * Create a new {@code StaticMapRequest}.
+   * 
+   * @param context The {@code GeoApiContext} to make this request through.
+   * @param size The size of the static map.
+   */
+  public static StaticMapsRequest newRequest(GeoApiContext context, Size size) {
+    return new StaticMapsRequest(context).size(size);
   }
 }
diff --git a/src/main/java/com/google/maps/StaticMapsRequest.java b/src/main/java/com/google/maps/StaticMapsRequest.java
@@ -1,6 +1,7 @@
 package com.google.maps;
 
 import com.google.maps.internal.ApiConfig;
+import com.google.maps.internal.StringJoin.UrlValue;
 import com.google.maps.model.LatLng;
 import com.google.maps.model.Size;
 import java.awt.image.BufferedImage;
@@ -55,10 +56,64 @@ public StaticMapsRequest center(String location) {
    * @return Returns this {@code StaticMapsRequest} for call chaining.
    */
   public StaticMapsRequest zoom(int zoom) {
-    return param("zoom", Integer.toString(zoom));
+    return param("zoom", zoom);
   }
 
+  /**
+   * <code>size</code> defines the rectangular dimensions of the map image.
+   * 
+   * @param size The Size of the static map.
+   * @return Returns this {@code StaticMapsRequest} for call chaining.
+   */
   public StaticMapsRequest size(Size size) {
     return param("size", size);
   }
+
+  /**
+   * <code>scale</code> affects the number of pixels that are returned. Setting <code>scale</code> to 2 returns twice as many pixels as <code>scale</code> set to 1 while retaining the same coverage area and level of detail (i.e. the contents of the map doesn't change).
+   * 
+   * @param scale The scale of the static map.
+   * @return Returns this {@code StaticMapsRequest} for call chaining.
+   */
+  public StaticMapsRequest scale(int scale) {
+    return param("scale", scale);
+  }
+
+  /**
+   * <code>format</code> defines the format of the resulting image. By default, the Google Static Maps API creates PNG images. There are several possible formats including GIF, JPEG and PNG types.
+   * 
+   * @param format The format of the static map.
+   * @return Returns this {@code StaticMapsRequest} for call chaining.
+   */
+  public StaticMapsRequest format(String format) {
+    return param("format", format);
+  }
+
+  public enum StaticMapType implements UrlValue {
+    roadmap, satellite, terrain, hybrid;
+
+    public String toUrlValue() {
+      return this.name();
+    }
+  }
+
+  /**
+   * <code>maptype</code> defines the type of map to construct.
+   * 
+   * @param maptype The map type of the static map.
+   * @return Returns this {@code StaticMapsRequest} for call chaining.
+   */
+  public StaticMapsRequest maptype(StaticMapType maptype) {
+    return param("maptype", maptype);
+  }
+
+  /**
+   * <code>region</code> defines the appropriate borders to display, based on geo-political sensitivities. Accepts a region code specified as a two-character ccTLD ('top-level domain') value.
+   * 
+   * @param region The region of the static map.
+   * @return Returns this {@code StaticMapsRequest} for call chaining.
+   */
+  public StaticMapsRequest region(String region) {
+    return param("region", region);
+  }
 }
diff --git a/src/main/java/com/google/maps/model/PhotoResult.java b/src/main/java/com/google/maps/model/PhotoResult.java
diff --git a/src/test/java/com/google/maps/StaticMapsApiTest.java b/src/test/java/com/google/maps/StaticMapsApiTest.java
@@ -22,10 +22,9 @@ public void setUp() throws IOException {
   public void testGetSydneyStaticMap() throws Exception {
     try (LocalTestServerContext sc = new LocalTestServerContext(bufferedImage)) {
 
-      StaticMapsRequest req = StaticMapsApi.newRequest(sc.context);
+      StaticMapsRequest req = StaticMapsApi.newRequest(sc.context, new Size(300, 300));
       req.center("Google Sydney");
       req.zoom(16);
-      req.size(new Size(300, 300));
       BufferedImage img = req.await();
 
       assertNotNull(img);
