mapping-component-package-jp 0.0.28 → 0.0.30

package/package.json

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

package/src/js/mapEncapsulation/mapOverlayManager.js

@@ -2458,11 +2458,15 @@ export class MapOverlayManager {
 
         fpolies.forEach(function (poly) {
             polygonListeners.push(google.maps.event.addListener(poly, 'mouseover', function (event) {
+                poly.setOptions({strokeColor: '#f1a81e', zIndex: 10010});
                 deleteTooltip();
                 injectTooltip(event, poly.content);
             }));
             polygonListeners.push(google.maps.event.addListener(poly, 'mousemove', moveTooltip));
-            polygonListeners.push(google.maps.event.addListener(poly, 'mouseout', deleteTooltip));
+            polygonListeners.push(google.maps.event.addListener(poly, 'mouseout', function(event) {
+                poly.setOptions({strokeColor: '#000000', zIndex: 10000});
+                deleteTooltip();
+            }));
             if(!isDashboard) {
                 polygonListeners.push(google.maps.event.addListener(poly, 'click', function (event) {
                     deleteTooltip();
@@ -2566,8 +2570,8 @@ export class MapOverlayManager {
 			    }
 
 			    var carea = v.geomarea/10000;
-                //var content = 'Farm: '+v.name+'<br>'+v.lpi+'<br>'+carea.toFixed(2)+' ha'; 
-                var content = 'Farm: '+v.name+'<br>';//+v.lpi+'<br>'+carea.toFixed(2)+' ha'; 
+                var content = 'Farm: '+v.name+'<br>'+v.lpi+'<br>'+carea.toFixed(2)+' ha'; 
+                //var content = 'Farm: '+v.name+'<br>';//+v.lpi+'<br>'+carea.toFixed(2)+' ha'; 
 
 			    var fpoly = new google.maps.Polygon({
 				    map: map,
@@ -2579,6 +2583,7 @@ export class MapOverlayManager {
 				    fillOpacity: 0.01,
 				    id: v.id,
                     content: content,
+                    type: 'pf',
 				    zIndex: 10001,
 			    });
 			
@@ -2626,6 +2631,7 @@ export class MapOverlayManager {
 			    }
 
 			    var carea = v.geomarea/10000;
+                var content = 'Farm: '+v.farm+'<br>Portion: '+v.name+'<br>'+v.lpi+'<br>'+carea.toFixed(2)+' ha';
 
 			    var fpoly = new google.maps.Polygon({
 				    map: map,
@@ -2636,11 +2642,9 @@ export class MapOverlayManager {
 				    fillColor: '#000000',
 				    fillOpacity: 0.01,
 				    id: v.id,
-				    name: v.name,
-                    farm: '',
-				    //lpi: v.lpi,
-				    area: carea.toFixed(2),
-				    zIndex: 10001,
+                    content: content,
+                    type: 'fp',
+				    zIndex: 10002,
 			    });
 			
 			    if(fitBounds) {
@@ -2687,6 +2691,7 @@ export class MapOverlayManager {
 			    }
 
 			    var carea = v.geomarea/10000;
+                var content = 'Erf: '+v.name+'<br>'+v.lpi+'<br>'+carea.toFixed(2)+' ha'; 
 
 			    var fpoly = new google.maps.Polygon({
 				    map: map,
@@ -2697,11 +2702,9 @@ export class MapOverlayManager {
 				    fillColor: '#000000',
 				    fillOpacity: 0.01,
 				    id: v.id,
-				    name: v.name,
-                    farm: '',
-				    //lpi: v.lpi,
-				    area: carea.toFixed(2),
-				    zIndex: 10001,
+				    content: content,
+                    type: 'er',
+				    zIndex: 10003,
 			    });
 			
 			    if(fitBounds) {
@@ -2710,20 +2713,46 @@ export class MapOverlayManager {
 			    fpolies.push(fpoly);
             });
         }        
+        SACadastral_BindPolyEvents(isDashboard);
+    }
 
+    function SACadastral_BindPolyEvents(isDashboard) {
+        deleteTooltip();
 
-/*        
-        if(type == 'pf') {
-			addListeners(pfpolies, type);
-		} else if(type == 'fp') {
-			addListeners(fppolies, type);
-		} else if(type == 'er') {
-			addListeners(erpolies, type);
-		}
-*/
-
+        fpolies.forEach(function (poly) {
+            polygonListeners.push(google.maps.event.addListener(poly, 'mouseover', function (event) {
+                if(poly.type == 'pf') {
+                    poly.setOptions({strokeColor: '#f1a81e', strokeWeight: 5, zIndex: 10011});
+                } else if(poly.type == 'fp') {
+                    poly.setOptions({strokeColor: '#f1a81e', strokeWeight: 3, zIndex: 10012});
+                } else if(poly.type == 'er') {
+                    poly.setOptions({strokeColor: '#f1a81e', strokeWeight: 1, zIndex: 10013});
+                }    
+                
+                deleteTooltip();
+                injectTooltip(event, poly.content);
+            }));
+            polygonListeners.push(google.maps.event.addListener(poly, 'mousemove', moveTooltip));
+            polygonListeners.push(google.maps.event.addListener(poly, 'mouseout', function(event) {
+                if(poly.type == 'pf') {
+                    poly.setOptions({strokeColor: '#000000', strokeWeight: 5, zIndex: 10001});
+                } else if(poly.type == 'fp') {
+                    poly.setOptions({strokeColor: '#000000', strokeWeight: 3, zIndex: 10002});
+                } else if(poly.type == 'er') {
+                    poly.setOptions({strokeColor: '#000000', strokeWeight: 1, zIndex: 10003});
+                }    
+                deleteTooltip();
+            }));
+            if(!isDashboard) {
+                polygonListeners.push(google.maps.event.addListener(poly, 'click', function (event) {
+                    deleteTooltip();
+                    eventHandlers["SACadastralPolyOnClick"](this.id);
+                }));
+            }
+        });
     }
 
+
     _this.RenderSACadastral = function (saCadastralJson, offsetX, offsetY, vmWidth, isDashboard, fitBounds) {
         SACadastral_DrawSACadastral(saCadastralJson, offsetX, offsetY, vmWidth, isDashboard, fitBounds);
     }