|
...
|
...
|
@@ -144,23 +144,18 @@ def networkSurvey(filename, subId, devEUI = None, fileOutput= True, latestRecord
|
|
144
|
144
|
latest = 100000
|
|
145
|
145
|
with open(filename, "rt") as fin:
|
|
146
|
146
|
lines=reversed(fin.readlines())
|
|
147
|
|
- #lines=fin.readlines()
|
|
148
|
|
- #lastLine=lines[0]
|
|
149
|
147
|
for line in lines:
|
|
150
|
148
|
part=line.split(',')
|
|
151
|
149
|
countRaw += 1
|
|
152
|
150
|
if subId == part[0]:
|
|
153
|
151
|
if devEUI is None:
|
|
154
|
|
- #if lastLine is "" and countRaw != 1:
|
|
155
|
|
- #lastLine=line
|
|
156
|
152
|
if part[5] is not "0" and part[6] is not "0":
|
|
157
|
153
|
if lastLine is "":
|
|
158
|
154
|
lastLine = line
|
|
159
|
155
|
count += 1
|
|
160
|
156
|
if count > latest:
|
|
161
|
157
|
break
|
|
162
|
|
- color=networkSurveyColor(part[9])
|
|
163
|
|
- #jsLine=" L.circle(["+part[5]+","+part[6]+"],{color: '"+color+"', fillcolor: '"+color+"', fillOpacity: "+str(circleOpacity)+", radius:XXXX}).addTo(mymap); //"+part[2]+"\n"
|
|
|
158
|
+ color=networkSurveyColor(part[10])
|
|
164
|
159
|
jsLine=" L.circle(["+part[5]+","+part[6]+"],{color: '"+color+"', fillcolor: '"+color+"', fillOpacity: "+str(circleOpacity)+", radius:"+str(part[7])+"}).addTo(mymap); //"+part[2]+" "+part[9]+" "+part[10]+"\n"
|
|
165
|
160
|
if float(part[5]) > latMax:
|
|
166
|
161
|
latMax=float(part[5])
|
|
...
|
...
|
@@ -172,17 +167,13 @@ def networkSurvey(filename, subId, devEUI = None, fileOutput= True, latestRecord
|
|
172
|
167
|
lonMin=float(part[6])
|
|
173
|
168
|
pointList+=jsLine
|
|
174
|
169
|
elif part[1] == devEUI:
|
|
175
|
|
- #if lastLine == "":
|
|
176
|
|
- #lastLine=line
|
|
177
|
170
|
if part[5] is not "0" and part[6] is not "0":
|
|
178
|
171
|
if lastLine is "":
|
|
179
|
172
|
lastLine = line
|
|
180
|
173
|
count += 1
|
|
181
|
174
|
if count > latest:
|
|
182
|
175
|
break
|
|
183
|
|
- #color=networkSurveyColor(part[9])
|
|
184
|
176
|
color=networkSurveyColor(part[10])
|
|
185
|
|
- #jsLine=" L.circle(["+part[5]+","+part[6]+"],{color: '"+color+"', fillcolor: '"+color+"', fillOpacity: "+str(circleOpacity)+", radius:XXXX}).addTo(mymap); //"+part[2]+"\n"
|
|
186
|
177
|
jsLine=" L.circle(["+part[5]+","+part[6]+"],{color: '"+color+"', fillcolor: '"+color+"', fillOpacity: "+str(circleOpacity)+", radius:"+str(part[7])+"}).addTo(mymap); //"+part[2]+" "+part[9]+" "+part[10]+"\n"
|
|
187
|
178
|
if float(part[5]) > latMax:
|
|
188
|
179
|
latMax=float(part[5])
|