소스 검색

Actualizo el controlador y vista de mapas para usar los valores(datos para acceder a geoserver) cargados
en el parameters de stats.

Maximiliano Schvindt 7 년 전
부모
커밋
00e307a420

+ 22 - 6
src/StatsBundle/Controller/StatsController.php

@@ -127,8 +127,14 @@ class StatsController extends Controller
         $adminPool = $this->get('sonata.admin.pool');
 
         $api = $this->get('geoserver.api');
-        $data = $api->getLayerData("deviceServer_1", "onu_stats_tenancy_1");
-
+        $tenancyId = $this->get("base_tenancy.tenancy_service")->getTenancyIdCurrent();
+        $deviceServerId = $this->getParameter('device_server_base');
+        $gsHost = $this->getParameter('geoserver_host');
+        $gsPort = $this->getParameter('geoserver_port');
+        $workspace = "deviceServer_{$deviceServerId}";
+        $layer = "onu_stats_tenancy_{$tenancyId}";
+        
+        $data = $api->getLayerData($workspace, $layer);
         $setLatLng = $setZoom = false;
 
         if(!empty($data)) {
@@ -169,7 +175,11 @@ class StatsController extends Controller
             'base_template' => $adminPool->getTemplate('layout'),
             'admin_pool' => $adminPool,
             'admin' => $adminPool->getAdminByClass("StatsBundle\Entity\Onu"),
-            'map'   => $map
+            'map'   => $map,
+            'ws'    => $workspace,
+            'layer' => $layer,
+            'gsHost'=> $gsHost,
+            'gsPort'=> $gsPort
         ));
     }
 
@@ -340,9 +350,12 @@ class StatsController extends Controller
 
         $adminPool = $this->get('sonata.admin.pool');
         $api = $this->get('geoserver.api');
-
+        $gsHost = $this->getParameter('geoserver_host');
+        $gsPort = $this->getParameter('geoserver_port');
+        $workspace = "deviceServer_{$deviceServerId}";
         $layer = "ponport_stats_t_{$tenancyId}_o_{$oltDeviceId}_s_{$deviceServerId}_c_{$card}_s_{$slot}";
-        $data = $api->getLayerData("deviceServer_1", $layer);
+
+        $data = $api->getLayerData($workspace, $layer);
 
         $setLatLng = $setZoom = false;
         
@@ -386,7 +399,10 @@ class StatsController extends Controller
             'admin' => $adminPool->getAdminByClass("StatsBundle\Entity\PonPort"),
             'map'   => $map,
             'layer' => $layer,
-            'ponPort' => $ponPort
+            'ponPort' => $ponPort,
+            'ws'    => $workspace,
+            'gsHost'=> $gsHost,
+            'gsPort'=> $gsPort
         ));
     }
 

+ 6 - 6
src/StatsBundle/Resources/views/Stats/onu_map.html.twig

@@ -107,16 +107,16 @@ function initializeMap() {
 
     
 
-    layerGeoRx = L.tileLayer.betterWms('http://200.50.168.118:8081/geoserver/deviceServer_1/wms', {
-	    layers: 'deviceServer_1:onu_stats_tenancy_1',
+    layerGeoRx = L.tileLayer.betterWms('http://{{gsHost}}:{{gsPort}}/geoserver/{{ws}}/wms', {
+	    layers: '{{ws}}:{{layer}}',
 		transparent:true,
 		format: 'image/png',
         zIndex: 99,
 		maxZoom: 18,
         styles: 'onuRxPowerLabel'
 	});
-    layerGeoTx = L.tileLayer.betterWms('http://200.50.168.118:8081/geoserver/deviceServer_1/wms', {
-	    layers: 'deviceServer_1:onu_stats_tenancy_1',
+    layerGeoTx = L.tileLayer.betterWms('http://{{gsHost}}:{{gsPort}}/geoserver/{{ws}}/wms', {
+	    layers: '{{ws}}:{{layer}}',
 		transparent:true,
 		format: 'image/png',
         zIndex: 99,
@@ -124,8 +124,8 @@ function initializeMap() {
         styles: 'onuTxPowerLabel'
 	});
     
-    layerGeoStatus = L.tileLayer.betterWms('http://200.50.168.118:8081/geoserver/deviceServer_1/wms', {
-	    layers: 'deviceServer_1:onu_stats_tenancy_1',
+    layerGeoStatus = L.tileLayer.betterWms('http://{{gsHost}}:{{gsPort}}/geoserver/{{ws}}/wms', {
+	    layers: '{{ws}}:{{layer}}',
 		transparent:true,
 		format: 'image/png',
         zIndex: 99,

+ 6 - 6
src/StatsBundle/Resources/views/Stats/ponport_map.html.twig

@@ -109,16 +109,16 @@ function initializeMap() {
 
     
 
-    layerGeoRxPon = L.tileLayer.betterWms('http://200.50.168.118:8081/geoserver/deviceServer_1/wms', {
-	    layers: 'deviceServer_1:{{layer}}',
+    layerGeoRxPon = L.tileLayer.betterWms('http://{{gsHost}}:{{gsPort}}/geoserver/{{ws}}/wms', {
+	    layers: '{{ws}}:{{layer}}',
 		transparent:true,
 		format: 'image/png',
         zIndex: 99,
 		maxZoom: 18,
         styles: 'ponRxPowerLabel'
 	});
-    layerGeoRxOnu = L.tileLayer.betterWms('http://200.50.168.118:8081/geoserver/deviceServer_1/wms', {
-	    layers: 'deviceServer_1:{{layer}}',
+    layerGeoRxOnu = L.tileLayer.betterWms('http://{{gsHost}}:{{gsPort}}/geoserver/{{ws}}/wms', {
+	    layers: '{{ws}}:{{layer}}',
 		transparent:true,
 		format: 'image/png',
         zIndex: 99,
@@ -126,8 +126,8 @@ function initializeMap() {
         styles: 'onuRxPowerLabel'
 	});
     
-    layerGeoStatus = L.tileLayer.betterWms('http://200.50.168.118:8081/geoserver/deviceServer_1/wms', {
-	    layers: 'deviceServer_1:{{layer}}',
+    layerGeoStatus = L.tileLayer.betterWms('http://{{gsHost}}:{{gsPort}}/geoserver/{{ws}}/wms', {
+	    layers: '{{ws}}:{{layer}}',
 		transparent:true,
 		format: 'image/png',
         zIndex: 99,