feat: add GoogleMapAdvancedMarker

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>com.flowingcode.vaadin.addons</groupId>
     <artifactId>google-maps</artifactId>
-    <version>2.6.1-SNAPSHOT</version>
+    <version>2.7.0-SNAPSHOT</version>
     <name>Google Maps Addon</name>
     <description>Integration of google-map for Vaadin platform</description>
 

src/main/java/com/flowingcode/vaadin/addons/googlemaps/GoogleMap.java

@@ -51,15 +51,15 @@
 @SuppressWarnings("serial")
 @Tag("google-map")
 @JsModule("@flowingcode/google-map/google-map.js")
-@NpmPackage(value = "@flowingcode/google-map", version = "3.9.0")
-@NpmPackage(value = "@googlemaps/markerclusterer", version = "2.0.8")
+@NpmPackage(value = "@flowingcode/google-map", version = "3.10.1")
+@NpmPackage(value = "@googlemaps/markerclusterer", version = "2.6.2")
 @JsModule("./googlemaps/geolocation.js")
 @ExtensionMethod(value = JsonMigration.class, suppressBaseMethods = true)
 public class GoogleMap extends Component implements HasSize {
 
   private Integer trackLocationId = null;
 
   private List<CustomControl> customControls = new ArrayList<>();
 
   /** Base map types supported by Google Maps. */
   public enum MapType {
@@ -259,7 +259,7 @@
   public void addMarker(GoogleMapMarker marker) {
     getElement().appendChild(marker.getElement());
     if (getElement().getParent() != null) {
       getElement().executeJs("this._updateMarkers()");
     }
   }
 
@@ -270,6 +270,38 @@
     getElement().executeJs("this._updateMarkers()");
   }
 
+  /**
+   * Adds an advanced marker to the map. Advanced markers require the map to have a Map ID (see
+   * {@link #setMapId(String)}), set before the map is shown.
+   *
+   * @param marker The marker to add.
+   * @throws IllegalStateException if the map is already shown and has no Map ID
+   * @since 2.7.0
+   */
+  public void addMarker(GoogleMapAdvancedMarker marker) {
+    if (isAttached()) {
+      // checked before adding the marker, so that it isn't left in the map on failure
+      GoogleMapAdvancedMarker.checkMapId(this);
+    }
+    getElement().appendChild(marker.getElement());
+    if (getElement().getParent() != null) {
+      getElement().executeJs("this._updateMarkers()");
+    }
+  }
+
+  /**
+   * Removes an advanced marker from the map.
+   *
+   * @param marker The marker to remove.
+   * @since 2.7.0
+   */
+  @SuppressWarnings("squid:S3242")
+  public void removeMarker(GoogleMapAdvancedMarker marker) {
+    getElement().removeChild(marker.getElement());
+    // markers need to be updated on removal
+    getElement().executeJs("this._updateMarkers()");
+  }
+
   /**
    * Sets the type of the base map.
    *
@@ -400,6 +432,10 @@
    * Sets the mapId. See
    * https://developers.google.com/maps/documentation/javascript/cloud-based-map-styling
    *
+   * <p>The Map ID must be set before the map is shown: it's only read when the map is created, so
+   * setting it afterwards has no effect. Advanced markers ({@link GoogleMapAdvancedMarker}) require
+   * a Map ID.
+   *
    * @param mapId If set, the custom style associated with that map id is applied.
    */
   public void setMapId(String mapId) {
@@ -626,7 +662,7 @@
   /** Event that is called when current location can't be found. */
   public class GeolocationErrorEvent extends ComponentEvent<GoogleMap> {
 
     private boolean browserHasGeolocationSupport;
 
     public GeolocationErrorEvent(
         GoogleMap source, boolean fromClient, boolean browserHasGeolocationSupport) {
@@ -919,7 +955,7 @@
    */
   public static class FullScreenEvent extends ComponentEvent<GoogleMap> {
 
     private boolean isFullScreen;
 
     /**
      * Creates a new FullScreenEvent.