mapping-component-package-jp 0.1.13 → 0.1.15

package/package.json

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

package/src/js/mapEncapsulation/mapOverlayManager.d.ts

@@ -50,7 +50,7 @@ export class MapOverlayManager {
     CircleSegment_Edit(ShapeId: string | number, isMobile: boolean): void;
 
     // Field Management
-    DrawField_DrawLocation(locationsJson: string, locationId: any, shapeConfig: any): void;
+    DrawField_DrawLocation(locationsJson: string, selectedFarmIdentifier: string, locationId: any, shapeConfig: any): void;
     TriggerField_ChangeEvent(): any;
     DrawField_AttachEvents(eHandlers: any): void;
     DrawField_DetachEvents(StrokeColor: string, SelectedShapeId: string): void;

package/src/js/mapEncapsulation/mapOverlayManager.js

@@ -130,6 +130,8 @@ export class MapOverlayManager {
     function fields_BindPolyEvents() {
         deleteTooltip();
 
+        console.log('mapOverlayManager, fields_BindPolyEvents', polygons);
+
         polygons.forEach(function (poly) {
             polygonListeners.push(google.maps.event.addListener(poly, 'mouseover', function (event) {
                 deleteTooltip();
@@ -631,7 +633,7 @@ export class MapOverlayManager {
     
 	// #endregion
     
-    _this.DrawField_DrawLocation = function (locationsJson, locationId, shapeConfig) {
+    _this.DrawField_DrawLocation = function (locationsJson, selectedFarmIdentifier, locationId, shapeConfig) {
 
         locations = JSON.parse(locationsJson, true);
 		
@@ -643,7 +645,9 @@ export class MapOverlayManager {
             if(location && location.Poly && location.Poly.length > 0 && location.Id > 0) {
 
                 var paths = location.Poly.map(poly => poly.map(v => new google.maps.LatLng(parseFloat(v[1]), parseFloat(v[0]))));
-                paths[0].forEach(coord => mbounds.extend(coord));
+                if(location.FarmIdentifier == selectedFarmIdentifier) {
+                    paths[0].forEach(coord => mbounds.extend(coord));
+                }
 
                 let content = `${location.FarmName} - ${location.LocationName}<br>${location.Area} ha${location.IsIrrigated ? ', irrigated' : ''}`;
 
@@ -662,7 +666,7 @@ export class MapOverlayManager {
                     if (location.Id == locationId) {
 
                         var pArea = google.maps.geometry.spherical.computeSignedArea(path);
-                        var isHole = pArea > 0 && pi !== 0;
+                        var isHole = pArea > 0 && lpi !== 0;
 					    cpid = Date.now() + Math.floor(Math.random() * 100000);
 
                         var polygon = new google.maps.Polygon({
@@ -733,7 +737,7 @@ export class MapOverlayManager {
             }
         });
 		
-        map.fitBounds(bounds);
+        map.fitBounds(mbounds);
         fields_BindPolyEvents();
 		//console.log(polygons);
 	}