Commit 6ed66372 authored by Kevin Di Lallo's avatar Kevin Di Lallo Committed by GitHub Enterprise
Browse files

Merge pull request #22 from wbu-tep/my_sp33_maps 

STF599 Maintenance fix to render compute node
parents 85fe7bb9 02751001

js-apps/frontend/src/js/containers/app-container.js

+10 −10
Original line number Diff line number Diff line
@@ -864,14 +864,14 @@ class AppContainer extends Component { 
  //  * @param {module:model/GeoDataAssetList} data The data returned by the service call.

  //  * @param {String} response The complete HTTP response.

  //  */

  // getComputeAssetDataCb(error, data) {

  //   if (error !== null) {

  //     return;

  //   }

  getComputeAssetDataCb(error, data) {

    if (error !== null) {

      return;

    }



  //   // Update Compute list

  //   this.props.changeMapComputeList(data.geoDataAssets ? _.sortBy(data.geoDataAssets, ['assetName']) : []);

  // }

    // Update Compute list

    this.props.changeMapComputeList(data.geoDataAssets ? _.sortBy(data.geoDataAssets, ['assetName']) : []);

  }



  // Refresh Map

  refreshMap() {
@@ -886,9 +886,9 @@ class AppContainer extends Component { 
    this.meepGeoDataApi.getAssetData({ assetType: 'POA' }, (error, data) =>

      this.getPoaAssetDataCb(error, data)

    );

    // this.meepGeoDataApi.getAssetData({assetType: 'COMPUTE'}, (error, data) =>

    //   this.getComputeAssetDataCb(error, data)

    // );

    this.meepGeoDataApi.getAssetData({ assetType: 'COMPUTE' }, (error, data) =>

      this.getComputeAssetDataCb(error, data)

    );

  }



  /**

js-apps/frontend/src/js/containers/sandbox/map-info.js

+3 −3
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ const POA_RANGE_OPACITY = 0.05; 


const COMPUTE_ICON = 'ion-android-cloud';

const COMPUTE_COLOR_DEFAULT = '#696969';

const COMPUTE_OPACITY = 0.6;

const COMPUTE_OPACITY = 1.0;



const DEFAULT_MAP_STYLE = 'Positron';

const DEFAULT_MAP_LATITUDE = 43.737368;
@@ -174,8 +174,8 @@ class MapInfo extends Component { 
      'terminal': this.ueOverlay,

      'terminal-path': this.uePathOverlay,

      'poa': this.poaOverlay,

      'poa-coverage': this.poaRangeOverlay

      // 'compute': this.computeOverlay

      'poa-coverage': this.poaRangeOverlay,

      'compute': this.computeOverlay

    };



    // Create Layer Controller