Small bug-fixes and additions to visualization.

Author: abhyshr

viz/app.js

@@ -59,11 +59,12 @@ casedata = mod_casedata.get_casedata();
 // Source data GeoJSON
 const geodata = casedata['geojsondata']
 
-
+const style='pos';
 const MAP_STYLE = {
   pos_no_label: 'https://basemaps.cartocdn.com/gl/positron-nolabels-gl-style/style.json',
   pos: 'https://basemaps.cartocdn.com/gl/positron-gl-style/style.json',
-  dark: 'https://basemaps.cartocdn.com/gl/dark-matter-gl-style/style.json'
+  dark: 'https://basemaps.cartocdn.com/gl/dark-matter-gl-style/style.json',
+  none:''
 };
 
 
@@ -402,9 +403,10 @@ export default function App({ refdata = data, refflowdata = flowdata, ggdata = g
         popup.name = info.object.properties.NAME
         popup.info = "Substation Info"
       } else {
-        var popup = {};
-        popup.name = info.object.properties.NAME
-        popup.info = "Line Info"
+          var popup = {};
+	  var loading = Math.abs(info.object.properties.PF / info.object.properties.RATE_A)*100.0;
+          popup.name = info.object.properties.NAME
+          popup.info = "KV: "+info.object.properties.KV.toFixed(2)+"KV \nLoading: "+loading.toFixed(2)+ "%"; 
       }
       setShowPopup(showPopup => ({ ...showPopup, ...popup }));
     } else if (info.layer.id == "gen-column") {
@@ -1479,7 +1481,7 @@ export default function App({ refdata = data, refflowdata = flowdata, ggdata = g
 
 
         <StaticMap reuseMaps
-          mapStyle={mapStyle['pos']}
+          mapStyle={mapStyle[style]}
           preventStyleDiffing={true}
           initialViewState={INITIAL_VIEW_STATE}
         >

viz/src/dataprocess.js

@@ -283,7 +283,9 @@ function getArea(data,area_num) {
     };
 
     var areahull = convex(filteredGeoJSON);
-    areahull.properties ={name: area_num};
+    if(areahull) {
+	areahull.properties ={name: area_num};
+    }
 
     return areahull;
 }
@@ -293,7 +295,10 @@ function getAreas(sysdata) {
     var areas = [];
 
     for(var i = 0; i < sysdata.nareas; i++) {
-	areas.push(getArea(sysdata.geojsondata,sysdata.areas[i]));
+	var area = getArea(sysdata.geojsondata,sysdata.areas[i]);
+	if(area) {
+	    areas.push(area);
+	}
     }
 
     return {type:"FeatureCollection", features:areas};
@@ -312,7 +317,9 @@ function getZone(data,zone_num) {
     };
 
     var zonehull = convex(filteredGeoJSON);
-    zonehull.properties ={name: zone_num};
+    if(zonehull) {
+	zonehull.properties ={name: zone_num};
+    }
 
     return zonehull;
 }
@@ -322,7 +329,10 @@ function getZones(sysdata) {
     var zones = [];
 
     for(var i = 0; i < sysdata.nzones; i++) {
-	zones.push(getZone(sysdata.geojsondata,sysdata.zones[i]));
+	var zone = getZone(sysdata.geojsondata,sysdata.zones[i]);
+	if(zone) {
+	    zones.push(zone);
+	}
     }
 
     return {type:"FeatureCollection", features:zones};