mapping-component-package-jp 0.1.14 → 0.1.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mapping-component-package-jp",
-  "version": "0.1.14",
+  "version": "0.1.16",
   "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' : ''}`;
 
@@ -670,7 +674,7 @@ export class MapOverlayManager {
                             path: paths[lpi],
                             id: cpid,
                             //content: location.LocationName,
-                            strokeColor: shapeConfig.StrokeColor_DrawEditShape,
+                            strokeColor: shapeConfig.StrokeColor,
                             strokeOpacity: shapeConfig.StrokeOpacity,
                             strokeWeight: shapeConfig.StrokeWeight,
                             fillColor: shapeConfig.FillColor,
@@ -716,11 +720,11 @@ export class MapOverlayManager {
                         paths: paths,
                         id: cpid,
                         content: content,
-                        strokeColor: shapeConfig.StrokeColor_Other,
+                        strokeColor: shapeConfig.StrokeColor,
                         strokeOpacity: shapeConfig.StrokeOpacity,
                         strokeWeight: shapeConfig.StrokeWeight,
                         fillColor: shapeConfig.FillColor,
-                        fillOpacity: 0.3, //shapeConfig.FillOpacity,
+                        fillOpacity: shapeConfig.FillOpacity,
                         zIndex: 10000,
                         clickable: false,
                         editable: false,