|
...
|
...
|
@@ -25,6 +25,13 @@ def networkSurveyColor(rssi):
|
|
25
|
25
|
color="#15ab00"
|
|
26
|
26
|
return color
|
|
27
|
27
|
|
|
|
28
|
+def networkSurveySetLeaflet(useLocal):
|
|
|
29
|
+ global useLeafletLocal
|
|
|
30
|
+ if True is useLocal:
|
|
|
31
|
+ useLeafletLocal=1
|
|
|
32
|
+ else:
|
|
|
33
|
+ useLeafletLocal=0
|
|
|
34
|
+
|
|
28
|
35
|
def networkSurveyAddLeaflet():
|
|
29
|
36
|
global useLeafletLocal
|
|
30
|
37
|
leaflet=""
|
|
...
|
...
|
@@ -32,13 +39,13 @@ def networkSurveyAddLeaflet():
|
|
32
|
39
|
leafletJsPath="leaflet.js"
|
|
33
|
40
|
if useLeafletLocal is 0:
|
|
34
|
41
|
leafletCssPath="https://unpkg.com/leaflet@1.7.1/dist/leaflet.css"
|
|
35
|
|
- leafletJsPath="https://unpkg.com/leaflet@1.7.1/dist/leaflet.css"
|
|
|
42
|
+ leafletJsPath="https://unpkg.com/leaflet@1.7.1/dist/leaflet.js"
|
|
36
|
43
|
leaflet+=" <link rel=\"stylesheet\" href=\""+leafletCssPath+"\"\n"
|
|
37
|
44
|
leaflet+=" integrity=\"sha512-xodZBNTC5n17Xt2atTPuE1HxjVMSvLVW9ocqUKLsCC5CXdbqCmblAshOMAS6/keqq/sMZMZ19scR4PsZChSR7A==\"\n"
|
|
38
|
45
|
leaflet+=" crossorigin=\"\"/>\n"
|
|
39
|
46
|
leaflet+=" <script src=\""+leafletJsPath+"\"\n"
|
|
40
|
|
- leaflet+=" integrity=\"sha512-XQoYMqMTK8LvdxXYG3nZ448hOEQiglfqkJs1NOQV44cWnUrBc8PkAOcXy20w0vlaXaVUearIOBhiXZ5V3ynxwA==\"\n"
|
|
41
|
|
- leaflet+=" crossorigin=\"\"></script>\n"
|
|
|
47
|
+ leaflet+=" integrity=\"sha512-XQoYMqMTK8LvdxXYG3nZ448hOEQiglfqkJs1NOQV44cWnUrBc8PkAOcXy20w0vlaXaVUearIOBhiXZ5V3ynxwA==\"\ncrossorigin=\"\"/>\n"
|
|
|
48
|
+ leaflet+=" </script>\n"
|
|
42
|
49
|
return leaflet
|
|
43
|
50
|
|
|
44
|
51
|
def networkSurveySetMapboxApiToken():
|
|
...
|
...
|
@@ -92,6 +99,8 @@ def networkSurvey(filename, subId, devEUI = None, fileOutput= True):
|
|
92
|
99
|
htmlOutput+="</style>\n"
|
|
93
|
100
|
htmlOutput+="</head>\n"
|
|
94
|
101
|
htmlOutput+="<body>\n"
|
|
|
102
|
+ if fileOutput is True:
|
|
|
103
|
+ htmlOutput += "<h2>"+filename+" - "+subId+"</h2>"
|
|
95
|
104
|
htmlOutput+=" <div id=\"mapid\" style=\"width: 95%; max-width: 400px; height: 400px; margin: auto\"></div>\n"
|
|
96
|
105
|
htmlOutput+="\n"
|
|
97
|
106
|
htmlOutput+="<script>\n"
|