@@ -146,6 +146,13 @@ def networkSurvey(filename, subId, devEUI = None, fileOutput= True, latestRecord

         lines=reversed(fin.readlines())

         for line in lines:

             part=line.split(',')

+

+            radius=part[7]

+            solver=0

+            if part[19].replace("\n","") == "1":

+                radius=10

+                solver=1

+

             countRaw += 1

             if subId == part[0]:

                 if devEUI is None:

@@ -156,7 +163,7 @@ def networkSurvey(filename, subId, devEUI = None, fileOutput= True, latestRecord

                         if count > latest:

                             break

                         color=networkSurveyColor(part[10])

-                        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"

+                        jsLine="  L.circle(["+part[5]+","+part[6]+"],{color: '"+color+"', fillcolor: '"+color+"', fillOpacity: "+str(circleOpacity)+", radius:"+str(radius)+"}).addTo(mymap); //"+part[2]+" "+part[9]+" "+part[10]+"\n"

                         if float(part[5]) > latMax:

                             latMax=float(part[5])

                         if float(part[5]) < latMin:

@@ -174,7 +181,10 @@ def networkSurvey(filename, subId, devEUI = None, fileOutput= True, latestRecord

                         if count > latest:

                             break

                         color=networkSurveyColor(part[10])

-                        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"

+                        if solver == 0:

+                            jsLine="  L.circle(["+part[5]+","+part[6]+"],{color: '"+color+"', fillcolor: '"+color+"', fillOpacity: "+str(circleOpacity)+", radius:"+str(radius)+"}).addTo(mymap); //"+part[2]+" "+part[9]+" "+part[10]+"\n"

+                        else:

+                            jsLine="  L.circle(["+part[5]+","+part[6]+"],{color: '"+color+"', fillcolor: '"+color+"', fillOpacity: "+str(circleOpacity)+", radius:"+str(radius)+"}).addTo(mymap); //"+part[2]+" "+part[9]+" "+part[10]+"  solved, real err:"+str(part[7])+"\n"

                         if float(part[5]) > latMax:

                             latMax=float(part[5])

                         if float(part[5]) < latMin:

@@ -208,18 +218,18 @@ def networkSurvey(filename, subId, devEUI = None, fileOutput= True, latestRecord

     # Adapt Radius to number of circles

-    radiusValue=5

-    if count < 50:

-        radiusValue=1

-    elif count < 100:

-        radiusValue=10

-    elif count < 500:

-        radiusValue=5

-    elif count < 1000:

-        radiusValue=2

-    elif count < 2000:

-        radiusValue=1

-    pointList=pointList.replace("XXXX",str(radiusValue))

+    #radiusValue=5

+    #if count < 50:

+    #    radiusValue=1

+    #elif count < 100:

+    #    radiusValue=10

+    #elif count < 500:

+    #    radiusValue=5

+    #elif count < 1000:

+    #    radiusValue=2

+    #elif count < 2000:

+    #    radiusValue=1

+    #pointList=pointList.replace("XXXX",str(radiusValue))