distances on geofence, fixes #141

This commit is contained in:
Josh Baker 2017-02-24 06:25:50 -07:00
parent 374d199d07
commit d88f4594ac
1 changed files with 9 additions and 4 deletions

View File

@ -155,6 +155,10 @@ func fenceMatch(hookName string, sw *scanWriter, fence *liveFenceSwitches, metas
break break
} }
sw.mu.Lock() sw.mu.Lock()
var distance float64
if fence.distance {
distance = details.obj.CalculatedPoint().DistanceTo(geojson.Position{X: fence.lon, Y: fence.lat, Z: 0})
}
sw.fmap = details.fmap sw.fmap = details.fmap
sw.fullFields = true sw.fullFields = true
sw.msg.OutputType = server.JSON sw.msg.OutputType = server.JSON
@ -163,6 +167,7 @@ func fenceMatch(hookName string, sw *scanWriter, fence *liveFenceSwitches, metas
o: details.obj, o: details.obj,
fields: details.fields, fields: details.fields,
noLock: true, noLock: true,
distance: distance,
}) })
if sw.wr.Len() == 0 { if sw.wr.Len() == 0 {