Merge b308c54 into 2d55af8

openwisp · Jul 19, 2022 · dbd1aaf · dbd1aaf
2 parents 2d55af8 + b308c54
commit dbd1aaf
Show file tree

Hide file tree

Showing 43 changed files with 2,990 additions and 1,741 deletions.
diff --git a/dist/netjsongraph.min.js b/dist/netjsongraph.min.js
diff --git a/examples/data/floorplan.png b/examples/data/floorplan.png
diff --git a/examples/data/indoormap.jpg b/examples/data/indoormap.jpg
diff --git a/examples/data/netjson-elementsLegend.json b/examples/data/netjson-elementsLegend.json
@@ -60,18 +60,6 @@
     }
   ],
   "links": [
-    {
-      "source": "172.16.146.6",
-      "target": "172.16.145.2",
-      "cost": 1.2939453125,
-      "properties": {
-        "lq": 0.9,
-        "nlq": 0.497,
-        "bitrate": "20 mbit/s",
-        "type": "fiber",
-        "time": "2019-04-06T20:06:54.000Z"
-      }
-    },
     {
       "source": "172.16.146.6",
       "target": "172.16.146.4",
@@ -92,18 +80,7 @@
         "lq": 1.0,
         "nlq": 1.0,
         "bitrate": "30 mbit/s",
-        "type": "vpn"
-      }
-    },
-    {
-      "source": "172.16.145.2",
-      "target": "172.16.146.7",
-      "cost": 12.739,
-      "properties": {
-        "lq": 0.345,
-        "nlq": 0.227,
-        "bitrate": "1 mbit/s",
-        "type": "wireless_weak"
+        "type": "ethernet"
       }
     },
     {
@@ -114,7 +91,7 @@
         "lq": 1.0,
         "nlq": 1.0,
         "bitrate": "35 mbit/s",
-        "type": "wireless"
+        "type": "ethernet"
       }
     },
     {
@@ -136,7 +113,7 @@
         "lq": 1.0,
         "nlq": 1.0,
         "bitrate": "32 mbit/s",
-        "type": "fiber"
+        "type": "wireless"
       }
     },
     {
@@ -160,17 +137,6 @@
         "bitrate": "45 mbit/s",
         "type": "wireless"
       }
-    },
-    {
-      "source": "172.16.146.7",
-      "target": "172.16.146.4",
-      "cost": 1.0,
-      "properties": {
-        "lq": 1.0,
-        "nlq": 1.0,
-        "bitrate": "39 mbit/s",
-        "type": "fiber"
-      }
     }
   ]
 }
diff --git a/examples/data/netjsonmap-indoormap.json b/examples/data/netjsonmap-indoormap.json
@@ -6,172 +6,62 @@
   "metric": "ETX",
   "date": "2019-04-03T05:06:54.000Z",
   "nodes": [
-    {"id": "172.16.138.1", "location": {"lng": 12.021, "lat": 46.8245}},
-    {
-      "id": "172.16.181.10",
-      "location": {"lng": 14.384999999999998, "lat": 47.92375}
-    },
-    {
-      "id": "172.16.49.3",
-      "location": {"lng": 28.918999999999997, "lat": 47.50749999999999}
-    },
-    {
-      "id": "172.16.185.12",
-      "location": {"lng": 29.366, "lat": 49.70099999999999}
-    },
-    {
-      "id": "wq35oo",
-      "location": {"lat": 49.75764874137261, "lng": 5.3064823150634775}
-    },
     {
       "id": "i3ehd7",
-      "location": {"lat": 48.69096039092552, "lng": 12.458496093750002}
-    },
-    {
-      "id": "t39e8p",
-      "location": {"lat": 50.190967765585604, "lng": 10.261230468750002}
-    },
-    {
-      "id": "5lu7zw",
-      "location": {"lat": 46.31658418182218, "lng": 10.085449218750002}
-    },
-    {
-      "id": "huj13q",
-      "location": {"lat": 45.78284835197676, "lng": 8.833007812500002}
-    },
-    {
-      "id": "gjqoc0",
-      "location": {"lat": 45.85941212790755, "lng": 14.765625000000002}
-    },
-    {
-      "id": "cl401j",
-      "location": {"lat": 49.374661232470956, "lng": 22.43107795715332}
-    },
-    {
-      "id": "b95i1d",
-      "location": {"lat": 48.275310282737294, "lng": 21.002855300903324}
-    },
-    {
-      "id": "1n30of",
-      "location": {"lat": 48.369536273943815, "lng": 32.203760147094734}
-    },
-    {
-      "id": "6arfsx",
-      "location": {"lat": 49.87920553932855, "lng": 31.47866249084473}
+      "location": {"lat": 47.49, "lng": 12.298496093750002},
+      "name": "Family room"
     },
     {
       "id": "i74rhs",
-      "location": {"lat": 48.5007394591129, "lng": 29.17153358459473}
-    },
-    {
-      "id": "ur8l3k",
-      "location": {"lat": 50.85651382037179, "lng": 20.444526672363285}
-    },
-    {
-      "id": "jlgi7s",
-      "location": {"lat": 51.4354439242938, "lng": 6.096382141113282}
+      "location": {"lat": 48.5007394591129, "lng": 28.47153358459473},
+      "name": "Lounge"
     },
     {
       "id": "5vjb7b",
-      "location": {"lat": 47.363304126849265, "lng": 6.294136047363282}
-    },
-    {
-      "id": "03z02m",
-      "location": {"lat": 49.67679293818404, "lng": 26.333198547363285}
-    },
-    {
-      "id": "rfoycu",
-      "location": {"lat": 51.3119985247114, "lng": 30.683784484863285}
-    },
-    {
-      "id": "zi8tv5",
-      "location": {"lat": 47.0123325207779, "lng": 30.722408294677738}
+      "location": {"lat": 47.863304126849265, "lng": 6.294136047363282},
+      "name": "Bedroom 1"
     },
     {
       "id": "liwv7p",
-      "location": {"lat": 46.19718091651456, "lng": 28.744869232177738}
-    },
-    {
-      "id": "dhpay8",
-      "location": {"lat": 45.75434934033757, "lng": 32.34838485717774}
-    },
-    {
-      "id": "xhg8ed",
-      "location": {"lat": 45.63156563882012, "lng": 30.129146575927738}
-    },
-    {
-      "id": "3aj0w5",
-      "location": {"lat": 46.83224759932888, "lng": 26.130123138427738}
+      "location": {"lat": 44.89718091651456, "lng": 28.944869232177738},
+      "name": "Bedroom 4"
     },
     {
       "id": "m7qhnj",
-      "location": {"lat": 46.530760483351195, "lng": 22.109127044677738}
+      "location": {"lat": 47.530760483351195, "lng": 24.609127044677738},
+      "name": "Study Area"
     },
     {
       "id": "a0mg9w",
-      "location": {"lat": 46.47026114691636, "lng": 18.835201263427738}
+      "location": {"lat": 44.99, "lng": 18.435201263427738},
+      "name": "Dining room"
     },
     {
       "id": "dsm2x7",
-      "location": {"lat": 49.549382175122965, "lng": 15.345840454101564}
-    },
-    {
-      "id": "mhfphx",
-      "location": {"lat": 49.59213053471149, "lng": 12.950820922851564}
-    },
-    {
-      "id": "qf3hci",
-      "location": {"lat": 49.53512440198944, "lng": 20.553359985351566}
+      "location": {"lat": 50.559382175122965, "lng": 13.955840454101564},
+      "name": "Bedroom 2"
     },
     {
       "id": "nwlpcd",
-      "location": {"lat": 49.57788524115151, "lng": 18.839492797851566}
-    },
-    {
-      "id": "lo621p",
-      "location": {"lat": 47.66087849116105, "lng": 8.973770141601564}
-    },
-    {
-      "id": "rcaslg",
-      "location": {"lat": 47.823413360078675, "lng": 7.721328735351563}
-    },
-    {
-      "id": "3iwfec",
-      "location": {"lat": 51.64113955167631, "lng": 10.358047485351564}
-    },
-    {
-      "id": "2iz56s",
-      "location": {"lat": 51.72288115298209, "lng": 15.433731079101564}
+      "location": {"lat": 50.57788524115151, "lng": 19.339492797851566},
+      "name": "Bedroom 3"
     },
     {
       "id": "9p0bos",
-      "location": {"lat": 51.736490408464164, "lng": 25.936660766601562}
+      "location": {"lat": 51.736490408464164, "lng": 25.936660766601562},
+      "name": "Garage"
     }
   ],
   "links": [
-    {"source": "172.16.49.3", "target": "zi8tv5", "cost": 0.5},
-    {"source": "xhg8ed", "target": "zi8tv5", "cost": 0.5},
-    {"source": "dhpay8", "target": "zi8tv5", "cost": 0.5},
-    {"source": "liwv7p", "target": "zi8tv5", "cost": 0.5},
-    {"source": "rcaslg", "target": "5vjb7b", "cost": 1},
-    {"source": "lo621p", "target": "rcaslg", "cost": 0.5},
-    {"source": "huj13q", "target": "rcaslg", "cost": 1},
-    {"source": "5lu7zw", "target": "lo621p", "cost": 1},
-    {"source": "huj13q", "target": "5lu7zw", "cost": 0.5},
-    {"source": "172.16.138.1", "target": "lo621p", "cost": 0.8},
-    {"source": "nwlpcd", "target": "qf3hci", "cost": 0.5},
-    {"source": "ur8l3k", "target": "qf3hci", "cost": 0.5},
-    {"source": "cl401j", "target": "qf3hci", "cost": 0.5},
-    {"source": "b95i1d", "target": "qf3hci", "cost": 0.5},
-    {"source": "mhfphx", "target": "dsm2x7", "cost": 0.5},
-    {"source": "172.16.181.10", "target": "dsm2x7", "cost": 0.5},
-    {"source": "mhfphx", "target": "i3ehd7", "cost": 0.2},
-    {"source": "jlgi7s", "target": "wq35oo", "cost": 0.5},
-    {"source": "3iwfec", "target": "t39e8p", "cost": 0.5},
-    {"source": "a0mg9w", "target": "m7qhnj", "cost": 1.5},
-    {"source": "rfoycu", "target": "6arfsx", "cost": 0.8},
-    {"source": "172.16.185.12", "target": "6arfsx", "cost": 0.5},
-    {"source": "i74rhs", "target": "6arfsx", "cost": 0.5},
-    {"source": "1n30of", "target": "6arfsx", "cost": 0.5}
+    {"source": "5vjb7b", "target": "i3ehd7", "cost": 1},
+    {"source": "5vjb7b", "target": "dsm2x7", "cost": 1},
+    {"source": "i3ehd7", "target": "dsm2x7", "cost": 1},
+    {"source": "i3ehd7", "target": "a0mg9w", "cost": 1},
+    {"source": "dsm2x7", "target": "nwlpcd", "cost": 0.9},
+    {"source": "m7qhnj", "target": "9p0bos", "cost": 1},
+    {"source": "m7qhnj", "target": "liwv7p", "cost": 1.2},
+    {"source": "m7qhnj", "target": "i74rhs", "cost": 1.1},
+    {"source": "nwlpcd", "target": "m7qhnj", "cost": 1},
+    {"source": "a0mg9w", "target": "m7qhnj", "cost": 0.7}
   ]
 }
diff --git a/examples/data/netjsonmap.json b/examples/data/netjsonmap.json
@@ -294,22 +294,42 @@
     }
   ],
   "links": [
-    {"source": "172.16.146.6", "target": "172.16.146.4", "cost": 1},
+    {
+      "source": "172.16.146.6",
+      "target": "172.16.146.4",
+      "cost": 1
+    },
     {"source": "172.16.139.4", "target": "172.16.138.1", "cost": 1.02734375},
     {"source": "172.16.135.15", "target": "10.123.10.10", "cost": 1},
     {"source": "192.168.145.145", "target": "10.254.254.2", "cost": 1},
     {"source": "172.16.186.249", "target": "172.16.159.187", "cost": 1},
     {"source": "172.16.186.249", "target": "172.16.159.50", "cost": 1},
     {"source": "172.16.12.10", "target": "172.16.12.12", "cost": 1},
-    {"source": "172.16.177.31", "target": "172.16.155.4", "cost": 1.1796875},
-    {"source": "10.183.1.11", "target": "172.16.145.3", "cost": 1},
+    {
+      "source": "172.16.177.31",
+      "target": "172.16.155.4",
+      "cost": 1.1796875
+    },
+    {
+      "source": "10.183.1.11",
+      "target": "172.16.145.3",
+      "cost": 1,
+      "properties": {
+        "status": "down"
+      }
+    },
     {"source": "172.16.200.67", "target": "172.16.200.2", "cost": 1},
     {"source": "172.16.185.11", "target": "192.168.176.10", "cost": 1},
     {"source": "172.16.159.187", "target": "172.16.159.50", "cost": 1},
     {"source": "172.16.159.187", "target": "172.16.39.31", "cost": 1.36328125},
-    {"source": "10.254.254.4", "target": "10.254.254.2", "cost": 1},
-    {"source": "10.254.254.2", "target": "10.254.254.4", "cost": 1},
-    {"source": "10.254.254.2", "target": "10.254.254.4", "cost": 1.3},
+    {
+      "source": "10.254.254.2",
+      "target": "10.254.254.4",
+      "cost": 1.3,
+      "properties": {
+        "status": "down"
+      }
+    },
     {"source": "172.16.171.1", "target": "172.16.169.1", "cost": 1.1181640625},
     {"source": "172.16.155.5", "target": "172.16.155.4", "cost": 1},
     {"source": "172.16.155.5", "target": "172.16.44.10", "cost": 1.1328125},
@@ -319,7 +339,14 @@
     {"source": "10.149.3.3", "target": "172.16.146.4", "cost": 1.26171875},
     {"source": "172.16.185.13", "target": "10.185.1.1", "cost": 1},
     {"source": "172.16.185.13", "target": "10.185.1.11", "cost": 1},
-    {"source": "10.185.1.11", "target": "10.185.1.1", "cost": 1},
+    {
+      "source": "10.185.1.11",
+      "target": "10.185.1.1",
+      "cost": 1,
+      "properties": {
+        "status": "down"
+      }
+    },
     {
       "source": "172.16.133.11",
       "target": "192.168.176.10",