mapping-component-package-jp 0.1.54 → 0.2.0

package/package.json

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

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

@@ -35,6 +35,7 @@ export class MapOverlayManager {
 
     // Rendering Methods
     RenderFields(locations: any[], properties: any, editMode?: boolean): void;
+    RenderFieldsNew(locations: any[], properties: any, editMode?: boolean): void;
     RenderRegionFarms(locationsJson: any, icon: any, fitBounds: boolean, offsetX: number, offsetY: number): void;
     RenderRegions(regionLocations: any[], properties: any, farmLocations: any[], icon: any, offsetX: number, offsetY: number): void;
     RenderBackgroundFields(locations: any[], properties: any): void;

package/src/js/mapEncapsulation/mapOverlayManager.js

@@ -185,6 +185,7 @@ export class MapOverlayManager {
             tipObj.innerHTML = data;
             tipObj.style.top = event.domEvent.clientY + window.scrollY + ttOffset.y + "px";
             tipObj.style.left = event.domEvent.clientX + window.scrollX + ttOffset.x + "px";
+            tipObj.style.zIndex = 20000;
             document.body.appendChild(tipObj);
         }
     }
@@ -196,6 +197,7 @@ export class MapOverlayManager {
             tipObj.innerHTML = data;
             tipObj.style.top = event.clientY + window.scrollY + ttOffset.y + "px";
             tipObj.style.left = event.clientX + window.scrollX + ttOffset.x + "px";
+            tipObj.style.zIndex = 20000;
             document.body.appendChild(tipObj);
         }
     }
@@ -333,6 +335,28 @@ export class MapOverlayManager {
 		return map.overlayMapTypes;
 	}
 
+    function polygonsToMap_setNew() {
+        [...polygons, ...locPolygons].forEach(p => p.setMap(map));
+
+        const showLabels = map.getZoom() >= 13;
+        polyLabels.forEach(pl => pl.setMap(showLabels ? map : null));
+
+        if (zoomChangedListener) {
+            google.maps.event.removeListener(zoomChangedListener);
+        }
+
+        zoomChangedListener = map.addListener('zoom_changed', function () {
+            const currentZoom = map.getZoom();
+            const shouldShow = currentZoom >= 13;
+        
+            polyLabels.forEach(pl => {
+                if (shouldShow && !pl.getMap()) pl.setMap(map);
+                if (!shouldShow && pl.getMap()) pl.setMap(null);
+            });
+        });
+
+        mapListeners.push(zoomChangedListener);
+    }
 
     //#DRAW/DISPLAY FIELDS
     _this.RenderFields = function (locations, properties) {
@@ -397,6 +421,71 @@ export class MapOverlayManager {
         polygonsToMap_set();
     };
 
+    //#DRAW/DISPLAY FIELDS
+    _this.RenderFieldsNew = function (locations, properties) {
+        var mbounds = new google.maps.LatLngBounds();
+
+        locations.forEach(function (location) {
+            if (location && location.Poly && location.Poly.length > 0 && location.Id.length > 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));
+
+                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 polygonOptions = {
+                    paths: paths,
+                    id: location.Id,
+                    content: content
+                }
+
+                if (location.MapLocationFeature) {
+                    polygonOptions = {
+                        ...polygonOptions,
+                        content,
+                        strokeColor: location.MapLocationFeature.StrokeColor,
+                        strokeOpacity: location.MapLocationFeature.StrokeOpacity,
+                        strokeWeight: location.MapLocationFeature.StrokeWeight,
+                        fillColor: location.MapLocationFeature.FillColor,
+                        fillOpacity: location.MapLocationFeature.FillOpacity,
+                        zIndex: location.MapLocationFeature.ZIndex
+                    };
+                }
+                else
+                {
+                    polygonOptions = {
+                        ...polygonOptions,
+                        ...properties.polygonOptions.unselected,
+                    };
+                }
+
+                var polygon = new google.maps.Polygon(polygonOptions);
+                polygons.push(polygon);
+                if (properties.labelVisable) AddLabel(location);
+            }
+        });
+
+        polygonsToMap_setNew();
+
+        map.fitBounds(mbounds);
+
+        fields_BindPolyEvents();
+        
+        if(properties.icon){
+            AdvancedMarker(locations, properties.icon);
+        }
+
+    };
+
     _this.destroy = function () {
         mapId = null;
         mapConfig = null;