Commit 3339eb52 authored by M. Rehan Abbasi's avatar M. Rehan Abbasi
Browse files

remove poaName for out of range coordinate in response of POST method on... 

remove poaName for out of range coordinate in response of POST method on /geodata/cellularPower endpoint
parent 4263411b

go-apps/meep-gis-engine/server/gis-engine.go

+4 −1
Original line number Diff line number Diff line
@@ -1676,8 +1676,11 @@ func geGetGeoDataPowerValues(w http.ResponseWriter, r *http.Request) { 
			Longitude: coordinatePower.Longitude,

			Rsrq:      int32(coordinatePower.Rsrq),

			Rsrp:      int32(coordinatePower.Rsrp),

			PoaName:   coordinatePower.PoaName,

		}

		if coordinatePower.PoaName != "" {

			intCoordinatePower.PoaName = coordinatePower.PoaName

		}



		intCoordinatesPower.CoordinatesPower = append(intCoordinatesPower.CoordinatesPower, intCoordinatePower)

	}

go-apps/meep-gis-engine/server/model_coordinate_power_list.go

+0 −1
Original line number Diff line number Diff line
@@ -26,6 +26,5 @@ package server 


// List of geo coordinates with RSRQ/RSRP values

type CoordinatePowerList struct {



	CoordinatesPower []CoordinatePower `json:"CoordinatesPower,omitempty"`

}

go-packages/meep-gis-asset-mgr/asset-mgr.go

+10 −5
Original line number Diff line number Diff line
@@ -2124,10 +2124,10 @@ func (am *AssetMgr) GetPowerValuesForCoordinates(coordinates []Coordinate) ([]Co 


	var position Position

	var CoordinatePowerValues []CoordinatePowerValue

	var bestPoa string

	for _, coord := range coordinates {

		var maxRsrp float32 = 40

		var maxRsrq float32 = -2

		maxRsrp := minCell4gRsrp

		maxRsrq := minCell4gRsrq

		var bestPoa string

		for _, poa := range poaMap {

			_ = json.Unmarshal([]byte(poa.Position), &position)

			poaLat := position.Coordinates[1]
@@ -2157,17 +2157,22 @@ func (am *AssetMgr) GetPowerValuesForCoordinates(coordinates []Coordinate) ([]Co 
			if rsrp > maxRsrp {

				maxRsrp = rsrp

				maxRsrq = rsrq

				if maxRsrp != minCell4gRsrp && maxRsrq != minCell4gRsrq {

					bestPoa = poa.Name

				}

			}

		}



		newCoordinatePowerValue := CoordinatePowerValue{

			Latitude:  coord.Latitude,

			Longitude: coord.Longitude,

			Rsrp:      maxRsrp,

			Rsrq:      maxRsrq,

			PoaName:   bestPoa,

		}

		if maxRsrp != minCell4gRsrp && maxRsrq != minCell4gRsrq {

			newCoordinatePowerValue.PoaName = bestPoa

		}



		CoordinatePowerValues = append(CoordinatePowerValues, newCoordinatePowerValue)

	}

	return CoordinatePowerValues, nil