Merge remote-tracking branch 'origin/master'

This commit is contained in:
joylink_zhangsai 2023-09-25 10:38:32 +08:00
commit 62c6482584

View File

@ -493,11 +493,11 @@ func findTurnoutIds(axleCountingMap map[string]*graphicData.AxleCounting, axleId
func buildKmConverts(ksList []*graphicData.KilometerSystem) []*proto.KilometerConvert { func buildKmConverts(ksList []*graphicData.KilometerSystem) []*proto.KilometerConvert {
var kmConverts []*proto.KilometerConvert var kmConverts []*proto.KilometerConvert
for i, ks := range ksList { for i, ks := range ksList {
if ks.Kilometer == 0 { if ks.Kilometer == 0 || ks.CoordinateSystem == "" {
continue continue
} }
for j := i + 1; j < len(ksList); j++ { for j := i + 1; j < len(ksList); j++ {
if ks.Kilometer == 0 { if ksList[j].Kilometer == 0 || ksList[j].CoordinateSystem == "" {
continue continue
} }
kmConverts = append(kmConverts, buildKmConvert(ks, ksList[j])) kmConverts = append(kmConverts, buildKmConvert(ks, ksList[j]))