Commit c5f70510 authored by Mudassar Khan's avatar Mudassar Khan
Browse files

delete debug logs which were added for scenario debugging during scenario... 

delete debug logs which were added for scenario debugging during scenario updates, fix map view which was not visible after update, ToDo: location pinpoint remaining
parent c3c12fa0

go-packages/meep-model/model.go

+0 −3
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package model 
import (

	"encoding/json"

	"errors"

	"fmt"

	"reflect"

	"strings"

	"sync"
@@ -978,7 +977,6 @@ func (m *Model) GetNodeContext(name string) (ctx *NodeContext) { 


	ctx = nil

	n := m.nodeMap.nameMap[name]

	log.Debug("Node name: ", name, " Node: ", fmt.Sprintf("%+v", n))

	if len(n) > 0 {

		nodeCtx := n[0].context

		var ok bool
@@ -1333,7 +1331,6 @@ func (m *Model) parseNodes() (err error) { 
								procCtx := NewNodeContext(m.scenario.Name, domain.Name, zone.Name, nl.Name, pl.Name)

								m.nodeMap.AddNode(NewNode(proc.Id, proc.Name, proc.Type_, proc, nil, pl, procCtx))

								m.networkGraph.AddNode(proc.Name, pl.Name, false)

								log.Info("Model.go: Added process: ", proc.Name, " type: ", proc.Type_, " to physical location: ", pl.Name)

								// Update service map for external processes

								if proc.IsExternal {

									var nodeServiceMaps dataModel.NodeServiceMaps

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

+6 −5
Original line number Diff line number Diff line
@@ -227,8 +227,8 @@ class IDCMap extends Component { 
                      assetName: pl.name,

                      id: pl.id,

                      radius: pl.geoData ? pl.geoData.radius : 0,

                      position: pl.geoData && pl.geoData.location ? pl.geoData.location.coordinates : [0,0],

                      path: pl.geoData && pl.geoData.path ? pl.geoData.path.coordinates : null,

                      location: pl.geoData && pl.geoData.location ? pl.geoData.location : {type: 'Point', coordinates: [0,0]},

                      path: pl.geoData && pl.geoData.path ? pl.geoData.path : null,

                      eopMode: pl.geoData ? pl.geoData.eopMode : null,

                      velocity: pl.geoData ? pl.geoData.velocity : null

                    });
@@ -236,7 +236,7 @@ class IDCMap extends Component { 
                    map.computeList.push({

                      assetName: pl.name,

                      id: pl.id,

                      position: pl.geoData && pl.geoData.location ? pl.geoData.location.coordinates : [0,0]

                      location: pl.geoData && pl.geoData.location ? pl.geoData.location : {type: 'Point', coordinates: [0,0]}

                    });

                  }

                });
@@ -246,7 +246,8 @@ class IDCMap extends Component { 
                map.poaList.push({

                  assetName: nl.name,

                  id: nl.id,

                  position: nl.geoData && nl.geoData.location ? nl.geoData.location.coordinates : [0,0]

                  location: nl.geoData && nl.geoData.location ? nl.geoData.location : {type: 'Point', coordinates: [0,0]},

                  radius: nl.geoData ? nl.geoData.radius : 0

                });

              }

            });
@@ -802,7 +803,7 @@ class IDCMap extends Component { 


  setUeMarker(ue) {

    var latlng = L.latLng(L.GeoJSON.coordsToLatLng(ue.location.coordinates));

    var pathLatLngs = ue.path ? L.GeoJSON.coordsToLatLngs(ue.path.coordinates) : null;

    var pathLatLngs = (ue.path && ue.path.coordinates) ? L.GeoJSON.coordsToLatLngs(ue.path.coordinates) : null;



    // Find existing UE marker

    var existingMarker;