mapping-component-package-jp 0.2.30 → 0.4.0

package/package.json

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

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

@@ -42,8 +42,8 @@ export class MapOverlayManager {
     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;
     RenderSADelineatedFields(saDelineatedFieldsJson: any, offsetX: number, offsetY: number, vmWidth: number, isDashboard: boolean, fitBounds: 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;
+    RenderGSGPRegions(gpRegionsJson: any[], gsByRegionJson: any[], selectedRegion: number, offsetX: number, offsetY: number, vMapWidth: number, isDashboard: boolean, countryIso2: string): void;
+    RenderGSProvinces(provincesJson: any[], gsByProvinceJson: any[], selectedProvince: number, offsetX: number, offsetY: number, vMapWidth: number, isDashboard: boolean, countryIso2: string): void;
     RenderGSWithinRadius(gsJson: any[], fieldLat: number, fieldLng: number, offsetX: number, offsetY: number, radius: number): void;
 
     // Shape Selection and Management

package/src/js/mapEncapsulation/mapOverlayManager.js

@@ -3822,7 +3822,7 @@ export class MapOverlayManager {
     }
 
 
-    function GSGPRegions_DrawProductionRegions(gpRegionsJson, gsJson, selectedRegion, offsetX, offsetY, vMapWidth, isDashboard) {
+    function GSGPRegions_DrawProductionRegions(gpRegionsJson, gsJson, selectedRegion, offsetX, offsetY, vMapWidth, isDashboard, countryIso2) {
 
 		mapListeners_clear();
         polygonListeners_clear();
@@ -3834,10 +3834,10 @@ export class MapOverlayManager {
         GPRegions_BindPolyEvents(isDashboard);
         
 		Display_DrawGS(gsJson, offsetX, offsetY, vMapWidth);
-        GS_BindPolyEvents(isDashboard);
+        GS_BindPolyEvents(isDashboard, countryIso2);
     }
 
-    function GSProvinces_DrawProvinces(provincesJson, gsJson, selectedProvince, offsetX, offsetY, vMapWidth, isDashboard) {
+    function GSProvinces_DrawProvinces(provincesJson, gsJson, selectedProvince, offsetX, offsetY, vMapWidth, isDashboard, countryIso2) {
 		mapListeners_clear();
         polygonListeners_clear();
 		markerListeners_clear();
@@ -3848,7 +3848,7 @@ export class MapOverlayManager {
         GSProvinces_BindPolyEvents(isDashboard);
 
         Display_DrawGS(gsJson, offsetX, offsetY, vMapWidth);
-        GS_BindPolyEvents(isDashboard);
+        GS_BindPolyEvents(isDashboard, countryIso2);
     }
 
     function GS_DrawGSWithinRadius(gsJson, fieldLat, fieldLng, offsetX, offsetY, radius) {
@@ -3919,24 +3919,29 @@ export class MapOverlayManager {
         });
     }
 
-    function GS_BindPolyEvents(isDashboard) {
+    function GS_BindPolyEvents(isDashboard, countryIso2) {
 		
 		deleteTooltip();
 
 		fmarkers.forEach(function (marker) {
             var ttc = marker.id.split('|'); 
+            
             var ttdata = '<b>'+ttc[1]+'</b><br>';
-            ttdata += 'Company: '+ttc[2]+' ('+ttc[3]+')<br>';
+            if(countryIso2 == 'ZA') {
+                ttdata += 'Company: '+ttc[2]+' ('+ttc[3]+')<br>';
+            } else {
+                ttdata += 'Company: '+ttc[2]+'<br>';
+            }    
             ttdata += 'Type: '+ttc[4]+'<br>';
             if(parseInt(ttc[5]) > 0) {
                 ttdata += 'Capacity: '+ttc[5]+'t<br>';
             } else {
                 ttdata += 'Capacity: n/a<br>';
             }	
-            if(parseInt(ttc[6]) > 0) {
+            if(parseInt(ttc[6]) > 0 && countryIso2 == 'ZA') {
                 ttdata += 'Sagis Code: '+ttc[6];
             } else {
-                    ttdata += 'Sagis Code: n/a';
+                ttdata += 'Sagis Code: n/a';
             }	
             var mclickListener = marker.addListener('click', function (event) {
                 eventHandlers["GSMarkerOnClick"]({
@@ -3995,12 +4000,12 @@ export class MapOverlayManager {
         });
     }
 
-    _this.RenderGSGPRegions = function(gpRegionsJson, gsJson, selectedRegion, offsetX, offsetY, vMapWidth, isDashboard) {
-        GSGPRegions_DrawProductionRegions(gpRegionsJson, gsJson, selectedRegion, offsetX, offsetY, vMapWidth, isDashboard);
+    _this.RenderGSGPRegions = function(gpRegionsJson, gsJson, selectedRegion, offsetX, offsetY, vMapWidth, isDashboard, countryIso2) {
+        GSGPRegions_DrawProductionRegions(gpRegionsJson, gsJson, selectedRegion, offsetX, offsetY, vMapWidth, isDashboard, countryIso2);
     }    
     
-    _this.RenderGSProvinces = function(provincesJson, gsJson, selectedProvince, offsetX, offsetY, vMapWidth, isDashboard) {
-        GSProvinces_DrawProvinces(provincesJson, gsJson, selectedProvince, offsetX, offsetY, vMapWidth, isDashboard);
+    _this.RenderGSProvinces = function(provincesJson, gsJson, selectedProvince, offsetX, offsetY, vMapWidth, isDashboard, countryIso2) {
+        GSProvinces_DrawProvinces(provincesJson, gsJson, selectedProvince, offsetX, offsetY, vMapWidth, isDashboard, countryIso2);
     }
 
     _this.RenderGSWithinRadius = function(gsJson, fieldLat, fieldLng, offsetX, offsetY, radius) {