mapping-component-package-jp 0.1.11 → 0.1.13

package/package.json

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

package/src/js/mapEncapsulation/mapOverlayManager.js

@@ -636,32 +636,40 @@ export class MapOverlayManager {
         locations = JSON.parse(locationsJson, true);
 		
 		var cpid;
+        var mbounds = new google.maps.LatLngBounds();        
 
         locations.forEach(function (location) {
 
-            if (location && location.Poly && location.Poly.length > 0 && location.Id > 0) {
+            if(location && location.Poly && location.Poly.length > 0 && location.Id > 0) {
 
-                var polies = location.Poly.split(',');
-				
-				var paths = [];
-                polies.forEach(function (poly, pIndex) {
-                    var path = [];
-                    poly.forEach(function (v, idx) {
-                        path.push(new google.maps.LatLng(parseFloat(v[1]), parseFloat(v[0])));
-                    });
-					paths.push(path);
+                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));
+
+                let content = `${location.FarmName} - ${location.LocationName}<br>${location.Area} ha${location.IsIrrigated ? ', irrigated' : ''}`;
+
+                if(location.CropPlanted) {
+                    content += `<br>${location.CropPlanted}`;
+                    if (location.CultivarPlanted) {
+                        content += ` (${location.CultivarPlanted})`;
+                    }
+                    if (location.PlantingDate) {
+                        content += `<br>Planted: ${location.PlantingDate.replace(/-/g, "/")}`;
+                    }
+                }
+
+                location.Poly.forEach(function(poly, lpi) {    
 
                     if (location.Id == locationId) {
 
                         var pArea = google.maps.geometry.spherical.computeSignedArea(path);
-                        var isHole = pArea > 0 && pIndex !== 0;
-						cpid = Date.now() + Math.floor(Math.random() * 100000);
+                        var isHole = pArea > 0 && pi !== 0;
+					    cpid = Date.now() + Math.floor(Math.random() * 100000);
 
                         var polygon = new google.maps.Polygon({
                             map: map,
-                            path: path,
+                            path: paths[lpi],
                             id: cpid,
-                            content: location.LocationName,
+                            //content: location.LocationName,
                             strokeColor: shapeConfig.StrokeColor_DrawEditShape,
                             strokeOpacity: shapeConfig.StrokeOpacity,
                             strokeWeight: shapeConfig.StrokeWeight,
@@ -691,11 +699,23 @@ export class MapOverlayManager {
 
                     cpid = Date.now() + Math.floor(Math.random() * 100000);
 
+                    let content = `${location.FarmName} - ${location.LocationName}<br>${location.Area} ha${location.IsIrrigated ? ', irrigated' : ''}`;
+
+                    if (location.CropPlanted) {
+                        content += `<br>${location.CropPlanted}`;
+                        if (location.CultivarPlanted) {
+                            content += ` (${location.CultivarPlanted})`;
+                        }
+                        if (location.PlantingDate) {
+                            content += `<br>Planted: ${location.PlantingDate.replace(/-/g, "/")}`;
+                        }
+                    }
+
                     var polygon = new google.maps.Polygon({
                         map: map,
                         paths: paths,
                         id: cpid,
-                        content: location.LocationName,
+                        content: content,
                         strokeColor: shapeConfig.StrokeColor_Other,
                         strokeOpacity: shapeConfig.StrokeOpacity,
                         strokeWeight: shapeConfig.StrokeWeight,
@@ -704,20 +724,23 @@ export class MapOverlayManager {
                         zIndex: 10000,
                         clickable: false,
                         editable: false,
-                        draggable: false
+                        draggable: false,
                     });
 
                     polygons.push(polygon);
+                    
 				}					
             }
         });
 		
+        map.fitBounds(bounds);
+        fields_BindPolyEvents();
 		//console.log(polygons);
 	}
 
     _this.Shape_IsShapeHole = function(ShapeId) {
         let isHole = false;
-        locPolygons.forEach(function (polygon, index) {
+        locPolygons.forEach(function (polygon) {
             if (polygon.id == ShapeId) { 
                 isHole = polygon.isHole;
             }