mapping-component-package-jp 0.0.42 → 0.0.44

package/package.json

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

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

@@ -19,11 +19,13 @@ export class MapOverlayManager {
     // Rendering Methods
     RenderFields(locations: any[], properties: any, editMode?: boolean): void;
     RenderRegionFarms(locationsJson: any, icon: any, fitBounds: boolean): void;
-    RenderRegions(regionLocations: any[], properties: any, farmLocations: any[], icon: any): void;
+    RenderRegions(regionLocations: any[], properties: any, farmLocations: any[], icon: any, offsetX: number, offsetY: number): void;
     RenderBackgroundFields(locations: any[], properties: any): void;
     RenderSAAdministrative(saAdministrativeJson: any[], selectedSAProvince: number, selectedSADM: number, selectedSALM: number, selectedSAWard: number, offsetX: number, offsetY: number, vMapWidth: number, isDashboard: boolean): void;
     RenderSACadastral(saCadastralJson: any, offsetX: number, offsetY: number, vmWidth: number, isDashboard: boolean, fitBounds: boolean): void;
-    RenderGPRegions(gpRegionsJson: any[], gsByRegionJson: any[], selectedRegion: number, offsetX: number, offsetY: number, vMapWidth: number, isDashboard: boolean): void;
+    RenderGSGPRegions(gpRegionsJson: any[], gsByRegionJson: any[], selectedRegion: number, offsetX: number, offsetY: number, vMapWidth: number, isDashboard: boolean): void;
+    RenderGSProvinces(provincesJson: any[], gsByProvinceJson: any[], selectedProvince: number, offsetX: number, offsetY: number, vMapWidth: number, isDashboard: boolean): void;
+
     // Shape Selection and Management
     selectShape(shapeId: string | number, selectedStyle: any, unselectedStyle: any): void;
     isShapeInLocPolygons(shapeId: string | number): boolean;

package/src/js/mapEncapsulation/mapOverlayManager.js

@@ -2117,7 +2117,7 @@ export class MapOverlayManager {
         }   
     }
 
-    _this.RenderRegions = function (regionLocations, properties, farmLocations, icon) {
+    _this.RenderRegions = function (regionLocations, properties, farmLocations, icon, offsetX, offsetY) {
         var polygon = null;
         var polyPath = null;
         var path = null;
@@ -2175,17 +2175,12 @@ export class MapOverlayManager {
                 fpolies.push(polygon);
             }
         });
-/*
+
         var rboundsChangedListener = google.maps.event.addListenerOnce(map, "bounds_changed", function() {
-            eventHandlers["RegionBoundsChanged"]({
-                type: 'SUCCESS',
-                message: 'Region bounds changed',
-                code: 200,
-                data: null
-            });   
+            offsetCenter(map.getCenter(), offsetX, offsetY);
         });
         mapListeners.push(rboundsChangedListener);
-*/
+
 		map.fitBounds(rbounds);
         regions_BindPolyEvents(farmLocations, icon);
     }
@@ -2398,8 +2393,8 @@ export class MapOverlayManager {
 	}
 
 	function Display_SAAdministrative(saAdministrativeJson, selectedSAProvince, selectedSADM, selectedSALM, selectedSAWard, offsetX, offsetY, vmWidth, isDashboard) {
-		console.log('Display_SAAdministrative');
-		console.log(saAdministrativeJson);
+		//console.log('Display_SAAdministrative');
+		//console.log(saAdministrativeJson);
 
 		var locations = saAdministrativeJson;
 
@@ -2845,7 +2840,41 @@ export class MapOverlayManager {
 		});	
 	}
     
-    function Display_DrawGSByRegion(locationsJson, offsetX, offsetY, vMapWidth) {
+    function Display_DrawGSProvinces(locationsJson, selectedProvince, offsetX, offsetY) {
+        var polygon = null;
+		var locations = locationsJson;
+        var dp, paths;
+
+        locations.forEach(function (location) {
+			if(location.id == selectedProvince || selectedProvince === 0) { 
+			    if (location && location.poly && location.poly.length > 0) {
+
+                    paths = [];
+                    var spolies = location.poly.split(',');
+                    spolies.forEach(function(poly) {
+                        dp = google.maps.geometry.encoding.decodePath(location.poly, 5);      
+                        paths.push(dp);    
+                    });
+
+				    polygon = new google.maps.Polygon({
+					    map: map,
+					    paths: paths,
+					    strokeColor: '#000000',
+					    strokeOpacity: 1,
+					    strokeWeight: 3,
+					    fillColor: '#000000',
+					    fillOpacity: 0.3,
+					    id: location.id,
+					    content: location.name,
+					    zIndex: 10000
+				    });
+				    fpolies.push(polygon);
+			    }
+			}
+		});	
+	}
+
+    function Display_DrawGS(locationsJson, offsetX, offsetY, vMapWidth) {
 		
 		var locations = locationsJson;
         bounds = new google.maps.LatLngBounds();
@@ -2902,7 +2931,6 @@ export class MapOverlayManager {
 
 		} else if(locations.length == 1) {
 
-
 			var boundsChangedListener = google.maps.event.addListenerOnce(map, 'bounds_changed', function () {
 				if(!mapPanned) {
 				
@@ -2919,7 +2947,7 @@ export class MapOverlayManager {
 		//map.fitBounds(bounds);
 	}	
 
-    function GPRegions_DrawProductionRegions(gpRegionsJson, gsByRegionJson, selectedRegion, offsetX, offsetY, vMapWidth, isDashboard) {
+    function GSGPRegions_DrawProductionRegions(gpRegionsJson, gsJson, selectedRegion, offsetX, offsetY, vMapWidth, isDashboard) {
 
 		mapListeners_clear();
         polygonListeners_clear();
@@ -2930,8 +2958,22 @@ export class MapOverlayManager {
         Display_DrawGPRegions(gpRegionsJson, selectedRegion, offsetX, offsetY);
         GPRegions_BindPolyEvents(isDashboard);
         
-		Display_DrawGSByRegion(gsByRegionJson, offsetX, offsetY, vMapWidth);
-        GSByRegion_BindPolyEvents(isDashboard);
+		Display_DrawGS(gsJson, offsetX, offsetY, vMapWidth);
+        GS_BindPolyEvents(isDashboard);
+    }
+
+    function GSProvinces_DrawProvinces(provincesJson, gsJson, selectedProvince, offsetX, offsetY, vMapWidth, isDashboard) {
+		mapListeners_clear();
+        polygonListeners_clear();
+		markerListeners_clear();
+		fmarkers_clear();
+        fPolies_clear();
+
+        Display_DrawGSProvinces(provincesJson, selectedProvince, offsetX, offsetY);
+        GSProvinces_BindPolyEvents(isDashboard);
+
+        Display_DrawGS(gsJson, offsetX, offsetY, vMapWidth);
+        GS_BindPolyEvents(isDashboard);
     }
 
     function GPRegions_BindPolyEvents(isDashboard) {
@@ -2962,7 +3004,35 @@ export class MapOverlayManager {
         });
     }
 
-    function GSByRegion_BindPolyEvents(isDashboard) {
+    function GSProvinces_BindPolyEvents(isDashboard) {
+        deleteTooltip();
+
+        fpolies.forEach(function (poly) {
+            polygonListeners.push(google.maps.event.addListener(poly, 'mouseover', function (event) {
+                poly.setOptions({strokeColor: '#f1a81e', strokeWeight: 3, zIndex: 10012});
+                deleteTooltip();
+                injectTooltip(event, poly.content);
+            }));
+            polygonListeners.push(google.maps.event.addListener(poly, 'mousemove', moveTooltip));
+            polygonListeners.push(google.maps.event.addListener(poly, 'mouseout', function(event) {
+                poly.setOptions({strokeColor: '#000000', strokeWeight: 3, zIndex: 10002});
+                deleteTooltip();
+            }));
+            if(!isDashboard) {
+                polygonListeners.push(google.maps.event.addListener(poly, 'click', function (event) {
+                    deleteTooltip();
+                    eventHandlers["CSProvincePolyOnClick"]({
+                        type: 'SUCCESS',
+                        message: 'CSProvincePoly clicked',
+                        code: 200,
+                        data: poly.id,
+                    });    
+                }));
+            }
+        });
+    }
+
+    function GS_BindPolyEvents(isDashboard) {
 		
 		deleteTooltip();
 
@@ -2986,7 +3056,7 @@ export class MapOverlayManager {
                     type: 'SUCCESS',
                     message: 'GSMarker clicked',
                     code: 200,
-                    data: ttc[0],
+                    data: parseInt(ttc[0]),
                 });
             });
             markerListeners.push(mclickListener);
@@ -3009,9 +3079,13 @@ export class MapOverlayManager {
         });
     }
 
-    _this.RenderGPRegions = function(gpRegionsJson, gsByRegionJson, selectedRegion, offsetX, offsetY, vMapWidth, isDashboard) {
-        GPRegions_DrawProductionRegions(gpRegionsJson, gsByRegionJson, selectedRegion, offsetX, offsetY, vMapWidth, isDashboard);
+    _this.RenderGSGPRegions = function(gpRegionsJson, gsJson, selectedRegion, offsetX, offsetY, vMapWidth, isDashboard) {
+        GSGPRegions_DrawProductionRegions(gpRegionsJson, gsJson, selectedRegion, offsetX, offsetY, vMapWidth, isDashboard);
     }    
+    
+    _this.RenderGSProvinces = function(provincesJson, gsJson, selectedProvince, offsetX, offsetY, vMapWidth, isDashboard) {
+        GSProvinces_DrawProvinces(provincesJson, gsJson, selectedProvince, offsetX, offsetY, vMapWidth, isDashboard);
+    }
 
     _this.NDVI_AddOverlay_DEA = function (locationJson, ndviTileURL, validGMTiles, eosLocationCropperRefId, eosViewId, spinnerURL, spinnerLat, spinnerLon, paletteId, colorMapTypeIdValue, isFullView, onComplete) {