consolidate php

outage.html

@@ -54,12 +54,12 @@ Note: move the map slightly after loading data if you want to capture</div>
 
 
   .tabulator {
-    font-size: 26px;  // change font size
+    font-size: 26px;  /* change font size */
 	    padding:4px 4px;
   }
 
 
-//#mapid { height: 800px; }
+/*#mapid { height: 800px; }*/
         body {
             padding: 0;
             margin: 0;
@@ -75,9 +75,7 @@ Note: move the map slightly after loading data if you want to capture</div>
             background: none !important;
  
         }
-        #bottombar {
-//            height: 98%;
-        }
+
 
 .box{
     position: absolute;
@@ -173,7 +171,6 @@ input[type=text] {
     top: 0px;
     position: fixed;
 }
-}
 </style>
 
 
@@ -339,7 +336,7 @@ bufferlink.innerHTML = "Outages Without Buffer";
 
 
 } else {
-var powerapi = 'powerapi.php'
+var powerapi = 'main.php?service=powerapi'
 var countiesjson = 'rlxtest.json'
 var states = 'states.geojson'
 } 
@@ -697,7 +694,7 @@ function county_archive_play(start,end) {
 
 
 
-    $.getJSON(powerapi + `?svr=archive&start=${start}&end=${end}`, function(data3) {
+    $.getJSON(powerapi + `&svr=archive&start=${start}&end=${end}`, function(data3) {
         var geojsonsvr = data3;
         geoJSONsvr.clearLayers();
         geoJSONsvr.addData(geojsonsvr);
@@ -848,7 +845,7 @@ function countyTable(data) {
 
 
 function update_position() {
-    $.getJSON(powerapi + '?county=r', function(data) {
+    $.getJSON(powerapi + '&county=r', function(data) {
         console.log(data);
 
         const dataMap = {};
@@ -895,7 +892,7 @@ function update_position() {
         geoJSONPoint.bringToFront();
 });
 
-    $.getJSON(powerapi + '?svr=current', function(data2) {
+    $.getJSON(powerapi + '&svr=current', function(data2) {
         var geojsonsvr = data2;
         geoJSONsvr.clearLayers();
         geoJSONsvr.addData(geojsonsvr);
@@ -904,7 +901,7 @@ function update_position() {
 });
 
 
-    $.getJSON('fire.php', function(data2) {
+    $.getJSON('main.php?service=fire', function(data2) {
         var fire = data2;
         geoJSONfire.clearLayers();
         geoJSONfire.addData(fire);
@@ -912,7 +909,7 @@ function update_position() {
         geoJSONfire.removeEventListener('click');
 });
 
-    $.getJSON('lsr.php?ohgo=p', function(data3) {
+    $.getJSON('main.php?service=lsr&ohgo=p', function(data3) {
         var flood = data3;
         geoJSONflood.clearLayers();
         geoJSONflood.addData(flood);