|
...
|
...
|
@@ -128,7 +128,6 @@ def networkSurvey(filename, subId, devEUI = None, fileOutput= True, latestRecord
|
|
128
|
128
|
htmlOutput+="<body>\n"
|
|
129
|
129
|
if fileOutput is True:
|
|
130
|
130
|
htmlOutput += "<h2>"+filename+" - "+subId+"</h2>"
|
|
131
|
|
- #htmlOutput+=" <div id=\"mapid\" style=\"width: 95%; max-width: 400px; height: 400px; margin: auto\"></div>\n"
|
|
132
|
131
|
htmlOutput+=" <div id=\"mapid\"></div>\n"
|
|
133
|
132
|
htmlOutput+="\n"
|
|
134
|
133
|
htmlOutput+="<script>\n"
|
|
...
|
...
|
@@ -215,26 +214,7 @@ def networkSurvey(filename, subId, devEUI = None, fileOutput= True, latestRecord
|
|
215
|
214
|
zoomValue=16
|
|
216
|
215
|
elif posDelta < 0.012:
|
|
217
|
216
|
zoomValue=15
|
|
218
|
|
- #print(str(posDelta)+" : "+str(zoomValue))
|
|
219
|
217
|
|
|
220
|
|
-
|
|
221
|
|
- # Adapt Radius to number of circles
|
|
222
|
|
- #radiusValue=5
|
|
223
|
|
- #if count < 50:
|
|
224
|
|
- # radiusValue=1
|
|
225
|
|
- #elif count < 100:
|
|
226
|
|
- # radiusValue=10
|
|
227
|
|
- #elif count < 500:
|
|
228
|
|
- # radiusValue=5
|
|
229
|
|
- #elif count < 1000:
|
|
230
|
|
- # radiusValue=2
|
|
231
|
|
- #elif count < 2000:
|
|
232
|
|
- # radiusValue=1
|
|
233
|
|
- #pointList=pointList.replace("XXXX",str(radiusValue))
|
|
234
|
|
-
|
|
235
|
|
-
|
|
236
|
|
-
|
|
237
|
|
- #print(str(posDelta))
|
|
238
|
218
|
latMid=(latMin+latMax)/2
|
|
239
|
219
|
lonMid=(lonMin+lonMax)/2
|
|
240
|
220
|
htmlOutput+=" var mymap = L.map('mapid').setView(["+str(latMid)+", "+str(lonMid)+"], "+str(zoomValue)+");\n"
|