Commit d8eb1c87 authored by Kevin Di Lallo's avatar Kevin Di Lallo
Browse files

repocfg version bump + frontend map fix

parent 03485802

.meepctl-repocfg.yaml

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
# See the License for the specific language governing permissions and

# limitations under the License.



version: 1.5.2

version: 1.5.3

repo:

  name: AdvantEDGE

js-apps/meep-frontend/src/js/containers/idc-map.js

+32 −28
Original line number Diff line number Diff line
@@ -593,6 +593,8 @@ class IDCMap extends Component { 


  // UE Marker Event Handler

  updateUePopup(marker) {

    var table = this.getTable();

    if (marker && table && table.entries) {

      var latlng = marker.getLatLng();

      var hasPath = (marker.options.meep.ue.path) ? true : false;

      var msg = '<b>id: ' + marker.options.meep.ue.id + '</b><br>';
@@ -600,21 +602,22 @@ class IDCMap extends Component { 


      if (this.isConnected(marker.options.meep.ue.id)) {

        var poa = this.getUePoa(marker.options.meep.ue.id);

      var poaType = getElemFieldVal(this.getTable().entries[poa], FIELD_TYPE);

        var poaType = getElemFieldVal(table.entries[poa], FIELD_TYPE);

        msg += 'poa: ' + poa + '<br>';

        switch(poaType) {

        case ELEMENT_TYPE_POA_4G:

        msg += 'cell: ' + getElemFieldVal(this.getTable().entries[poa], FIELD_CELL_ID) + '<br>';

          msg += 'cell: ' + getElemFieldVal(table.entries[poa], FIELD_CELL_ID) + '<br>';

          break;

        case ELEMENT_TYPE_POA_5G:

        msg += 'cell: ' + getElemFieldVal(this.getTable().entries[poa], FIELD_NR_CELL_ID) + '<br>';

          msg += 'cell: ' + getElemFieldVal(table.entries[poa], FIELD_NR_CELL_ID) + '<br>';

          break;

        case ELEMENT_TYPE_POA_WIFI:

        msg += 'mac: ' + getElemFieldVal(this.getTable().entries[poa], FIELD_MAC_ID) + '<br>';

          msg += 'mac: ' + getElemFieldVal(table.entries[poa], FIELD_MAC_ID) + '<br>';

          break;

        default:

          break;

        }



        msg += 'zone: ' + this.getUeZone(marker.options.meep.ue.id) + '<br>';

      } else {

        msg += 'state: <b style="color:red;">DISCONNECTED</b><br>';
@@ -624,6 +627,7 @@ class IDCMap extends Component { 
      msg += 'location: ' + this.getLocationStr(latlng);

      marker.getPopup().setContent(msg);

    }

  }



  // POA Marker Event Handler

  updatePoaPopup(marker) {