Merge branch 'master' into config-file

README.md

@@ -30,6 +30,6 @@ Erklärung:
 * gateway_nexthop:    Die Node ID (MAC ohne :) des Freifunk Routers an den der AP angeschlossen ist.
 * gateway:    Im Normalfall die NodeID des Supernodes (zu finden in der MAP)
 * linked_to: (Optional) Die MAC Adresse des Routers an dem der AP angeschlossen ist. Normalerweise gateway_nexthop mit Doppelpunkten. Wenn nicht gesetzt wird kein Link auf der Map angezeigt.
-* domain: Die Domain in der sich der AP befindet. (TDF, UML, FLU)
+* domain: Die Domain in der sich der AP befindet. (tdf, inn, flu)
 
 Die Blocks müssen am ende immer ein , haben. Nur der Letzte Block nicht!

ucDevices.json

@@ -847,6 +847,138 @@
           "longitude":7.195436060,
           "latitude":50.856953199
         }
+      },
+      {
+        "name": "GGStr_EG-li",
+        "mac": "b4:fb:e4:10:8a:a8",
+        "gateway_nexthop": "18e82923f1e3",
+        "gateway": "a28cae6ff606",
+        "linked_to": "18:e8:29:23:f1:e3",
+        "domain": "flu",
+        "location": {
+          "longitude":7.122119218,
+          "latitude":50.802161461
+        }
+      },
+      {
+        "name": "GGStr_1St-re",
+        "mac": "18:e8:29:c0:ad:bb",
+        "gateway_nexthop": "18e82923f1e3",
+        "gateway": "a28cae6ff606",
+        "linked_to": "18:e8:29:23:f1:e3",
+        "domain": "flu",
+        "location": {
+          "longitude":7.121954262,
+          "latitude":50.802191974
+        }
+      },
+      {
+        "name": "GGStr_2St-re",
+        "mac": "18:e8:29:c0:b1:dd",
+        "gateway_nexthop": "18e82923f1e3",
+        "gateway": "a28cae6ff606",
+        "linked_to": "18:e8:29:23:f1:e3",
+        "domain": "flu",
+        "location": {
+          "longitude":7.122009248,
+          "latitude":50.802158919
+        }
+      },
+      {
+        "name": "AdS-01",
+        "mac": "74:83:c2:90:93:1d",
+        "gateway_nexthop": "7483c208ca32",
+        "gateway": "a28cae6ff606",
+        "linked_to": "74:83:c2:08:ca:32",
+        "domain": "flu",
+        "location": {
+          "longitude":7.130041122,
+          "latitude":50.817252695
+        }
+      },
+      {
+        "name": "AdS-02",
+        "mac": "74:83:c2:93:3d:53",
+        "gateway_nexthop": "7483c208ca32",
+        "gateway": "a28cae6ff606",
+        "linked_to": "74:83:c2:08:ca:32",
+        "domain": "flu",
+        "location": {
+          "longitude":7.130320072,
+          "latitude":50.817347593
+        }
+      },
+      {
+        "name": "AdS-03",
+        "mac": "74:83:c2:93:40:10",
+        "gateway_nexthop": "7483c208ca32",
+        "gateway": "a28cae6ff606",
+        "linked_to": "74:83:c2:08:ca:32",
+        "domain": "flu",
+        "location": {
+          "longitude":7.129949927,
+          "latitude":50.817096791
+        }
+      },
+      {
+        "name": "AdS-04",
+        "mac": "74:83:c2:93:46:c4",
+        "gateway_nexthop": "7483c208ca32",
+        "gateway": "a28cae6ff606",
+        "linked_to": "74:83:c2:08:ca:32",
+        "domain": "flu",
+        "location": {
+          "longitude":7.13006258,
+          "latitude":50.816944275
+        }
+      },
+      {
+        "name": "AK-01",
+        "mac": "74:83:c2:96:e2:61",
+        "gateway_nexthop": "7483c2f90816",
+        "gateway": "a28cae6ff606",
+        "linked_to": "74:83:c2:f9:08:16",
+        "domain": "flu",
+        "location": {
+          "longitude":7.095741034,
+          "latitude":50.779693546
+        }
+       },
+       {
+         "name": "AK-02",
+         "mac": "74:83:c2:96:e4:24",
+         "gateway_nexthop": "7483c2f90816",
+         "gateway": "a28cae6ff606",
+         "linked_to": "74:83:c2:f9:08:16",
+         "domain": "flu",
+         "location": {
+           "longitude":7.095525116,
+           "latitude":50.779660474
+         }
+       },
+       {
+         "name": "AK-03",
+         "mac": "74:83:c2:96:e5:ab",
+         "gateway_nexthop": "7483c2f90816",
+         "gateway": "a28cae6ff606",
+         "linked_to": "74:83:c2:f9:08:16",
+         "domain": "flu",
+         "location": {
+           "longitude":7.095366865,
+           "latitude":50.779635035
+         }
+       },
+       {
+         "name": "AK-04",
+         "mac": "74:83:c2:96:e6:15",
+         "gateway_nexthop": "7483c2f90816",
+         "gateway": "a28cae6ff606",
+         "linked_to": "74:83:c2:f9:08:16",
+         "domain": "flu",
+         "location": {
+           "longitude":7.095156312,
+           "latitude":50.779601115
+         }
       }
     ]
   }