Set polygon clickable option with style instead of forced true.

(cherry picked from commit 253f099)
googlemaps · Apr 26, 2018 · dd40a69 · dd40a69
1 parent 0c7715f
commit dd40a69
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/library/src/com/google/maps/android/data/Renderer.java b/library/src/com/google/maps/android/data/Renderer.java
@@ -423,11 +423,11 @@ protected void storeData(HashMap<String, KmlStyle> styles,
      *
      * @param feature feature to add to the map
      */
-     public void addFeature(Feature feature) {
+    public void addFeature(Feature feature) {
         Object mapObject = FEATURE_NOT_ON_MAP;
-         if (feature instanceof GeoJsonFeature) {
-             setFeatureDefaultStyles((GeoJsonFeature) feature);
-         }
+        if (feature instanceof GeoJsonFeature) {
+            setFeatureDefaultStyles((GeoJsonFeature) feature);
+        }
         if (mLayerOnMap) {
             if (mFeatures.containsKey(feature)) {
                 // Remove current map objects before adding new ones
@@ -637,7 +637,7 @@ private void setInlinePointStyle(MarkerOptions markerOptions, KmlStyle inlineSty
      * @return Polyline object created from given LineString
      */
     protected Polyline addLineStringToMap(PolylineOptions polylineOptions,
-                                       LineString lineString) {
+                                          LineString lineString) {
         // Add coordinates
         polylineOptions.addAll(lineString.getGeometryObject());
         Polyline addedPolyline = mMap.addPolyline(polylineOptions);
@@ -680,7 +680,7 @@ protected Polygon addPolygonToMap(PolygonOptions polygonOptions, DataPolygon pol
             polygonOptions.addHole(innerBoundary);
         }
         Polygon addedPolygon = mMap.addPolygon(polygonOptions);
-        addedPolygon.setClickable(true);
+        addedPolygon.setClickable(polygonOptions.isClickable());
         return addedPolygon;
     }
 

diff --git a/library/src/com/google/maps/android/data/geojson/GeoJsonPolygonStyle.java b/library/src/com/google/maps/android/data/geojson/GeoJsonPolygonStyle.java
@@ -166,6 +166,7 @@ public PolygonOptions toPolygonOptions() {
         polygonOptions.strokeWidth(mPolygonOptions.getStrokeWidth());
         polygonOptions.visible(mPolygonOptions.isVisible());
         polygonOptions.zIndex(mPolygonOptions.getZIndex());
+        polygonOptions.clickable(mPolygonOptions.isClickable());
         return polygonOptions;
     }
 
@@ -182,4 +183,8 @@ public String toString() {
         sb.append("\n}\n");
         return sb.toString();
     }
+
+    public void setClickable(boolean clickable) {
+        mPolygonOptions.clickable(clickable);
+    }
 }