mapping-component-package-jp 0.0.26 → 0.0.28

package/package.json

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

package/src/components/JPMapComponent.tsx

@@ -32,7 +32,8 @@ const mapOptions = {
   mapTypeId: 'hybrid', //this causes the reloading of tiles if const mapOptions is inside the component
   mapTypeControl: true,
   zoomControl: true,
-
+  //fullScreenControl: false,
+  //streetViewControl: false,
 };
 
 

package/src/js/mapEncapsulation/mapOverlayManager.js

@@ -2484,8 +2484,11 @@ export class MapOverlayManager {
 		fmarkers_clear();
         fPolies_clear();
 
+        console.log('SACadastral_DrawSACadastral before adding map listeners');
+
         var mdeListener = google.maps.event.addListener(map, 'dragend', function() { 
             if(map.getZoom() >= 12 && map.getZoom() <= 17) {
+                console.log('SACadastral, map on dragend, zoom >= 12 and zoom <= 17');
                 eventHandlers["ReloadCadastralData"]({
                     type: 'SUCCESS',
                     message: 'Reload cadastral data on dragend',
@@ -2494,6 +2497,7 @@ export class MapOverlayManager {
                 });
 
             } else {
+                console.log('SACadastral, map on dragend, zoom < 12 or zoom > 17');
         		mapListeners_clear();
                 fPolies_clear();
             }	
@@ -2502,6 +2506,7 @@ export class MapOverlayManager {
 
         var mzcListener = google.maps.event.addListener(map, 'zoom_changed', function() { 
             if(map.getZoom() >= 12 && map.getZoom() <= 17) {
+                console.log('SACadastral, map on zoom changed, zoom >= 12 and zoom <= 17');
                 eventHandlers["ReloadCadastralData"]({
                     type: 'SUCCESS',
                     message: 'Reload cadastral data on zoom changed',
@@ -2509,13 +2514,14 @@ export class MapOverlayManager {
                     data: null
                 });
             } else {
+                console.log('SACadastral, map on zoom changed, zoom < 12 or zoom > 17');
         		mapListeners_clear();
                 fPolies_clear();
             }	
         });
         mapListeners.push(mzcListener);
 
-		Display_SACadastral(saCadastralJson, offsetX, offsetY, vmWidth, isDashboard);
+		Display_SACadastral(saCadastralJson, offsetX, offsetY, vmWidth, isDashboard, fitBounds);
     }
 
     function Display_SACadastral(saCadastralJson, offsetX, offsetY, vmWidth, isDashboard, fitBounds) {
@@ -2560,6 +2566,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 fpoly = new google.maps.Polygon({
 				    map: map,
@@ -2567,8 +2575,66 @@ export class MapOverlayManager {
 				    strokeWeight: 5,
 				    strokeColor: '#000000',
 				    strokeOpacity: 1,
-				    fillColor: 'transparent',
-				    fillOpacity: 1,
+				    fillColor: '#000000',
+				    fillOpacity: 0.01,
+				    id: v.id,
+                    content: content,
+				    zIndex: 10001,
+			    });
+			
+			    if(fitBounds) {
+				    map.fitBounds(bounds);
+			    }
+			    fpolies.push(fpoly);
+            });
+        
+        }        
+			
+        if(farmPortionsJson.length > 0) { 
+            farmPortionsJson.forEach(function(v) {
+			    if(fitBounds) {
+				    bounds = new google.maps.LatLngBounds();
+			    }
+
+			    var geojson = JSON.parse(v.geojson,true);
+				
+			    if(geojson.type == 'Polygon') {
+				
+				    var paths = [];
+				    var path = [];
+
+				    geojson.coordinates[0].forEach(function(c,ci) {
+					    path.push(new google.maps.LatLng(c[1],c[0]));
+					    if(fitBounds) {
+						    bounds.extend(new google.maps.LatLng(c[1],c[0]));
+					    }
+				    });
+				    paths.push(path);
+					
+			    } else if(geojson.type == 'MultiPolygon') {
+				    var paths = [];
+				    geojson.coordinates.forEach(function(p,pi) {
+					    var path = [];
+					    p[0].forEach(function(c,ci) {
+						    path.push(new google.maps.LatLng(c[1],c[0]));
+						    if(fitBounds) {
+							    bounds.extend(new google.maps.LatLng(c[1],c[0]));
+						    }
+					    });
+					    paths.push(path);
+				    });
+			    }
+
+			    var carea = v.geomarea/10000;
+
+			    var fpoly = new google.maps.Polygon({
+				    map: map,
+				    paths: paths,
+				    strokeWeight: 3,
+				    strokeColor: '#000000',
+				    strokeOpacity: 1,
+				    fillColor: '#000000',
+				    fillOpacity: 0.01,
 				    id: v.id,
 				    name: v.name,
                     farm: '',
@@ -2584,7 +2650,67 @@ export class MapOverlayManager {
             });
         
         }        
+
+        if(ervenJson.length > 0) { 
+            ervenJson.forEach(function(v) {
+			    if(fitBounds) {
+				    bounds = new google.maps.LatLngBounds();
+			    }
+
+			    var geojson = JSON.parse(v.geojson,true);
+				
+			    if(geojson.type == 'Polygon') {
+				
+				    var paths = [];
+				    var path = [];
+
+				    geojson.coordinates[0].forEach(function(c,ci) {
+					    path.push(new google.maps.LatLng(c[1],c[0]));
+					    if(fitBounds) {
+						    bounds.extend(new google.maps.LatLng(c[1],c[0]));
+					    }
+				    });
+				    paths.push(path);
+					
+			    } else if(geojson.type == 'MultiPolygon') {
+				    var paths = [];
+				    geojson.coordinates.forEach(function(p,pi) {
+					    var path = [];
+					    p[0].forEach(function(c,ci) {
+						    path.push(new google.maps.LatLng(c[1],c[0]));
+						    if(fitBounds) {
+							    bounds.extend(new google.maps.LatLng(c[1],c[0]));
+						    }
+					    });
+					    paths.push(path);
+				    });
+			    }
+
+			    var carea = v.geomarea/10000;
+
+			    var fpoly = new google.maps.Polygon({
+				    map: map,
+				    paths: paths,
+				    strokeWeight: 1,
+				    strokeColor: '#000000',
+				    strokeOpacity: 1,
+				    fillColor: '#000000',
+				    fillOpacity: 0.01,
+				    id: v.id,
+				    name: v.name,
+                    farm: '',
+				    //lpi: v.lpi,
+				    area: carea.toFixed(2),
+				    zIndex: 10001,
+			    });
 			
+			    if(fitBounds) {
+				    map.fitBounds(bounds);
+			    }
+			    fpolies.push(fpoly);
+            });
+        }        
+
 
 /*        
         if(type == 'pf') {