FD3-616 Se agrega TX Power como capa de calor.

src/StatsBundle/Resources/translations/StatsBundle.es.yml

@@ -411,4 +411,5 @@ star_table_daily_header: Consumo(GB) por día
 star_table_daily_sub_header: Puede ordenarse la tabla haciendo click en la cabecera
 Map: Mapa
 Status: Estado
-RX Power: RX Power
+RX Power: RX Power
+TX Power: TX Power

src/StatsBundle/Resources/views/Stats/Template/cmts_cms_location.html.twig

@@ -64,6 +64,9 @@ function initializeMap() {
     heatRxR = [];
     heatRxY = [];
     heatRxG = [];
+    heatTxR = [];
+    heatTxY = [];
+    heatTxG = [];
     
     for(e in elements) {
         
@@ -88,36 +91,52 @@ function initializeMap() {
         } else {
             heatRxR.push([cm.lat, cm.lng, 1.0]);
         }
-        
+
+
+        if(cm.tx < 34) {
+            heatTxR.push([cm.lat, cm.lng, 1.0]);
+        } else if(cm.tx >= 34 && cm.tx < 40) {
+            heatTxY.push([cm.lat, cm.lng, 1.0]);
+        } else if(cm.tx >= 40 && cm.tx < 50) {
+            heatTxG.push([cm.lat, cm.lng, 1.0]);
+        } else if(cm.tx >= 50 && cm.tx < 54) {
+            heatTxY.push([cm.lat, cm.lng, 1.0]);
+        } else {
+            heatTxR.push([cm.lat, cm.lng, 1.0]);
+        }
+
     }
 
     map.fitBounds(bounds);
     
 
-    var gradient = {0.0: '#00a65a', 1.0: '#00a65a'};
-    var online = L.heatLayer(heatOn, {blur: 10, radius: 10, maxZoom:10, gradient: gradient});
+    var gradientOn = {0.0: '#00a65a', 1.0: '#00a65a'};
+    var gradientOff = {0.0: '#ff0000', 1.0: '#ff0000'};
     
-    var gradient = {0.0: '#ff0000', 1.0: '#ff0000'};
-    var offline = L.heatLayer(heatOff, {blur: 10, radius: 10, maxZoom: 10, gradient: gradient});
+    var online = L.heatLayer(heatOn, {blur: 10, radius: 10, maxZoom:10, gradient: gradientOn});
+    var offline = L.heatLayer(heatOff, {blur: 10, radius: 10, maxZoom: 10, gradient: gradientOff});
     var statusGroup = L.layerGroup([online,offline]).addTo(window.map);
 
-    var gradient = {0.0: '#ff4d3f', 1.0: '#ff4d3f'};
-    var rxR = L.heatLayer(heatRxR, {blur: 10, radius: 10, maxZoom: 10, gradient: gradient});
-    var gradient = {0.0: '#ffa732', 1.0: '#ffa732'};
-    var rxY = L.heatLayer(heatRxY, {blur: 10, radius: 10, maxZoom: 10, gradient: gradient});
-    var gradient = {0.0: '#00a65a', 1.0: '#00a65a'};
-    var rxG = L.heatLayer(heatRxG, {blur: 10, radius: 10, maxZoom: 10, gradient: gradient});
+    var gradientR = {0.0: '#ff4d3f', 1.0: '#ff4d3f'};
+    var gradientY = {0.0: '#ffa732', 1.0: '#ffa732'};
+    var gradientG = {0.0: '#00a65a', 1.0: '#00a65a'};
     
+    var rxR = L.heatLayer(heatRxR, {blur: 10, radius: 10, maxZoom: 10, gradient: gradientR});
+    var rxY = L.heatLayer(heatRxY, {blur: 10, radius: 10, maxZoom: 10, gradient: gradientY});
+    var rxG = L.heatLayer(heatRxG, {blur: 10, radius: 10, maxZoom: 10, gradient: gradientG});
     var rxGroup = L.layerGroup([rxR, rxY, rxG]);
     
-    var overlayMaps = {"{{ 'Status'|trans({}, 'StatsBundle') }}": statusGroup, "{{ 'RX Power'|trans({}, 'StatsBundle') }}": rxGroup};
+    var txR = L.heatLayer(heatTxR, {blur: 10, radius: 10, maxZoom: 10, gradient: gradientR});
+    var txY = L.heatLayer(heatTxY, {blur: 10, radius: 10, maxZoom: 10, gradient: gradientY});
+    var txG = L.heatLayer(heatTxG, {blur: 10, radius: 10, maxZoom: 10, gradient: gradientG});
+    var txGroup = L.layerGroup([txR, txY, txG]);
+
+
+    
+    var overlayMaps = {"{{ 'Status'|trans({}, 'StatsBundle') }}": statusGroup, "{{ 'RX Power'|trans({}, 'StatsBundle') }}": rxGroup, "{{ 'TX Power'|trans({}, 'StatsBundle') }}": txGroup};
 
     L.control.layers(overlayMaps,{},{collapsed: false}).addTo(window.map);
 
-    console.log(heatRxR);
-    console.log(heatRxY);
-    console.log(heatRxG);
-        
 }
 
 </script>

src/StatsBundle/Resources/views/Stats/Template/olt_onus_location.html.twig

@@ -64,6 +64,9 @@ function initializeMap() {
     heatRxR = [];
     heatRxY = [];
     heatRxG = [];
+    heatTxR = [];
+    heatTxY = [];
+    heatTxG = [];
     
     for(e in elements) {
         
@@ -92,29 +95,45 @@ function initializeMap() {
         } else {
             heatRxR.push([onu.lat, onu.lng, 1.0]);
         }
-        
+
+        if(onu.tx < 1) {
+            heatTxR.push([onu.lat, onu.lng, 1.0]);
+        } else if(onu.tx >= 1 && onu.tx < 1.5) {
+            heatTxY.push([onu.lat, onu.lng, 1.0]);
+        } else if(onu.tx >= 1.5 && onu.tx < 3.5) {
+            heatTxG.push([onu.lat, onu.lng, 1.0]);
+        } else if(onu.tx >= 3.5 && onu.tx < 4.5) {
+            heatTxY.push([onu.lat, onu.lng, 1.0]);
+        } else {
+            heatTxR.push([onu.lat, onu.lng, 1.0]);
+        }
+
     }
 
     map.fitBounds(bounds);
     
 
-    var gradient = {0.0: '#00a65a', 1.0: '#00a65a'};
-    var online = L.heatLayer(heatOn, {blur: 10, radius: 10, maxZoom:10, gradient: gradient});
-    
-    var gradient = {0.0: '#ff0000', 1.0: '#ff0000'};
-    var offline = L.heatLayer(heatOff, {blur: 10, radius: 10, maxZoom: 10, gradient: gradient});
+    var gradientOn = {0.0: '#00a65a', 1.0: '#00a65a'};
+    var gradientOff = {0.0: '#ff0000', 1.0: '#ff0000'};
+    var online = L.heatLayer(heatOn, {blur: 10, radius: 10, maxZoom:10, gradient: gradientOn});
+    var offline = L.heatLayer(heatOff, {blur: 10, radius: 10, maxZoom: 10, gradient: gradientOff});
     var statusGroup = L.layerGroup([online,offline]).addTo(window.map);
 
-    var gradient = {0.0: '#ff4d3f', 1.0: '#ff4d3f'};
-    var rxR = L.heatLayer(heatRxR, {blur: 10, radius: 10, maxZoom: 10, gradient: gradient});
-    var gradient = {0.0: '#ffa732', 1.0: '#ffa732'};
-    var rxY = L.heatLayer(heatRxY, {blur: 10, radius: 10, maxZoom: 10, gradient: gradient});
-    var gradient = {0.0: '#00a65a', 1.0: '#00a65a'};
-    var rxG = L.heatLayer(heatRxG, {blur: 10, radius: 10, maxZoom: 10, gradient: gradient});
+    var gradientR = {0.0: '#ff4d3f', 1.0: '#ff4d3f'};
+    var gradientY = {0.0: '#ffa732', 1.0: '#ffa732'};
+    var gradientG = {0.0: '#00a65a', 1.0: '#00a65a'};
     
+    var rxR = L.heatLayer(heatRxR, {blur: 10, radius: 10, maxZoom: 10, gradient: gradientR});
+    var rxY = L.heatLayer(heatRxY, {blur: 10, radius: 10, maxZoom: 10, gradient: gradientY});
+    var rxG = L.heatLayer(heatRxG, {blur: 10, radius: 10, maxZoom: 10, gradient: gradientG});
     var rxGroup = L.layerGroup([rxR, rxY, rxG]);
     
-    var overlayMaps = {"{{ 'Status'|trans({}, 'StatsBundle') }}": statusGroup, "{{ 'RX Power'|trans({}, 'StatsBundle') }}": rxGroup};
+    var txR = L.heatLayer(heatTxR, {blur: 10, radius: 10, maxZoom: 10, gradient: gradientR});
+    var txY = L.heatLayer(heatTxY, {blur: 10, radius: 10, maxZoom: 10, gradient: gradientY});
+    var txG = L.heatLayer(heatTxG, {blur: 10, radius: 10, maxZoom: 10, gradient: gradientG});
+    var txGroup = L.layerGroup([txR, txY, txG]);
+    
+    var overlayMaps = {"{{ 'Status'|trans({}, 'StatsBundle') }}": statusGroup, "{{ 'RX Power'|trans({}, 'StatsBundle') }}": rxGroup, "{{ 'TX Power'|trans({}, 'StatsBundle') }}": txGroup};
 
     L.control.layers(overlayMaps,{},{collapsed: false}).addTo(window.map);