mapping-component-package-jp 0.0.10 → 0.0.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mapping-component-package-jp",
-  "version": "0.0.10",
+  "version": "0.0.12",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.mjs",

package/src/js/mapEncapsulation/mapOverlayManager.js

@@ -174,6 +174,7 @@ export class MapOverlayManager {
                 console.warn('Invalid polygon object found in fpolies array:', poly);
             }
         });
+        AdvancedMarker(farmLocations, icon, 'farm', false);
     }
 
     function injectTooltip(event, data) {
@@ -511,7 +512,8 @@ export class MapOverlayManager {
 
     function fmarkers_clear() {
 		fmarkers.forEach(function (fm) {
-            fm.setMap(null);
+            fm.setMap(null); //for Marker
+            fm.map = null; //for AdvancedMarkerElement
             fm = null;
         });
         fmarkers = [];
@@ -519,7 +521,8 @@ export class MapOverlayManager {
 
     _this.fmarkers_clear = function() {
 		fmarkers.forEach(function (fm) {
-            fm.setMap(null);
+            fm.setMap(null); //for Marker
+            fm.map = null; //for AdvancedMarkerElement
             fm = null;
         });
         fmarkers = [];
@@ -2114,7 +2117,7 @@ export class MapOverlayManager {
         }   
     }
 
-    _this.RenderRegions = function (locations, properties) {
+    _this.RenderRegions = function (regionLocations, properties, farmLocations, icon) {
         var polygon = null;
         var polyPath = null;
         var path = null;
@@ -2122,7 +2125,7 @@ export class MapOverlayManager {
         mapListeners = [];
 		var rbounds = new google.maps.LatLngBounds();
         
-        locations.forEach(function (location) {
+        regionLocations.forEach(function (location) {
  
             const hasId = typeof location.Id === "string"
             ? location.Id.length > 0
@@ -2172,7 +2175,7 @@ export class MapOverlayManager {
                 fpolies.push(polygon);
             }
         });
-
+/*
         var rboundsChangedListener = google.maps.event.addListenerOnce(map, "bounds_changed", function() {
             eventHandlers["RegionBoundsChanged"]({
                 type: 'SUCCESS',
@@ -2182,9 +2185,9 @@ export class MapOverlayManager {
             });   
         });
         mapListeners.push(rboundsChangedListener);
-
+*/
 		map.fitBounds(rbounds);
-        regions_BindPolyEvents();
+        regions_BindPolyEvents(farmLocations, icon);
     }
 
     _this.Shape_Convert = function (ShapeId) {