Commit 5ca70b61 authored by Jan-Tarek Butt's avatar Jan-Tarek Butt

Merge branch 'johannes/201704' into 'master'

20170409

See merge request !30
parents 57b36ed0 ffc6529a
......@@ -4,26 +4,6 @@
"bssid": "02:CA:FF:EE:BA:BF",
"defaulthood": true,
"servers": [
{
"host": "default02.ffnw.de",
"port": "11111",
"publickey": "32a02dd5e6b9233926e178ac609023ad30bcf26954d38d410088bbdc0b2258cb"
},
{
"host": "default03.ffnw.de",
"port": "11111",
"publickey": "9737c65a17cfaa8339315ee53d2b9e02520733780362efacf9503737f5a23204"
},
{
"host": "default04.ffnw.de",
"port": "11111",
"publickey": "18199a10620dbd13728a09402ca2364436ca27e46e669a2ebdfe20976dc45e6f"
},
{
"host": "default05.ffnw.de",
"port": "11111",
"publickey": "5c1738236ba6930f654fd5e815e0c63ac03f81551ee2b183045b256fb133f77d"
},
{
"host": "default06.ffnw.de",
"port": "11111",
......@@ -33,7 +13,7 @@
"boxes": []
},
{
"name": "lk-st",
"name": "landkreis-steinfurt",
"bssid": "02:00:0A:12:80:00",
"defaulthood": false,
"servers": [
......@@ -56,13 +36,43 @@
],
[
52.35,
7.66
]
],
[
[
52.3,
7.66
],
[
52.35,
7.9
]
],
[
[
52.18,
7.66
],
[
52.25,
7.9
]
],
[
[
52.25,
7.76
],
[
52.3,
7.9
]
]
]
},
{
"name": "lk-fri",
"name": "landkreis-friesland",
"bssid": "02:00:0A:12:88:00",
"defaulthood": false,
"servers": [
......@@ -84,14 +94,14 @@
7.85
],
[
53.82,
53.72,
8.18
]
],
[
[
53.36,
7.79
7.956
],
[
53.5,
......@@ -111,7 +121,7 @@
]
},
{
"name": "ol",
"name": "oldenburg",
"bssid": "02:00:0A:12:98:00",
"defaulthood": false,
"servers": [
......@@ -133,14 +143,24 @@
8.14
],
[
53.22,
53.2,
8.3
]
],
[
[
53.2,
8.19
],
[
53.21,
8.22
]
]
]
},
{
"name": "stadt-os",
"name": "osnabrueck",
"bssid": "02:00:0A:12:90:00",
"defaulthood": false,
"servers": [
......@@ -198,7 +218,7 @@
]
},
{
"name": "wittmund",
"name": "landkreis-wittmund",
"bssid": "02:00:0A:12:B8:00",
"defaulthood": false,
"servers": [
......@@ -223,6 +243,36 @@
53.72,
7.85
]
],
[
[
53.72,
7.648
],
[
53.806,
8.052
]
],
[
[
53.436,
7.68
],
[
53.5,
7.956
]
],
[
[
53.36,
7.825
],
[
53.436,
7.956
]
]
]
},
......@@ -244,7 +294,7 @@
7.85
],
[
53.36,
53.28,
8.32
]
],
......@@ -255,13 +305,43 @@
],
[
53.22,
8.14
8.19
]
],
[
[
53.28,
7.85
],
[
53.36,
8.13
]
],
[
[
53.21,
8.19
],
[
53.22,
8.22
]
],
[
[
53.2,
8.22
],
[
53.22,
8.3
]
]
]
},
{
"name": "lk-vec",
"name": "landkreis-vechta",
"bssid": "02:00:0A:12:A8:00",
"defaulthood": false,
"servers": [
......@@ -301,11 +381,21 @@
52.64,
8.32
]
],
[
[
52.76,
8.21
],
[
52.93,
8.67
]
]
]
},
{
"name": "Delmenhorst",
"name": "delmenhorst",
"bssid": "02:00:0A:12:C0:00",
"defaulthood": false,
"servers": [
......@@ -334,7 +424,7 @@
]
},
{
"name": "lk-os",
"name": "landkreis-osnabrueck",
"bssid": "02:00:0A:12:C8:00",
"defaulthood": false,
"servers": [
......@@ -393,7 +483,7 @@
]
},
{
"name": "Leer-Emden-Aurich",
"name": "leer-emden-aurich",
"bssid": "02:00:0A:12:D0:00",
"defaulthood": false,
"servers": [
......@@ -416,7 +506,7 @@
],
[
53.5,
7.79
7.68
]
],
[
......@@ -425,24 +515,34 @@
6.6
],
[
53.82,
53.72,
7.68
]
],
[
[
53.72,
7.135
],
[
53.766,
7.648
]
],
[
[
53.2,
7.68
],
[
53.82,
7.85
53.436,
7.825
]
],
[
[
53.2,
7.79
7.825
],
[
53.36,
......@@ -497,11 +597,21 @@
52.35,
7.41
]
],
[
[
52.76,
8.14
],
[
52.93,
8.21
]
]
]
},
{
"name": "whv",
"name": "wilhelmshaven",
"bssid": "02:00:0A:12:E8:00",
"defaulthood": false,
"servers": [
......@@ -557,5 +667,167 @@
]
]
]
},
{
"name": "landkreis-wesermarsch",
"bssid": "02:00:0A:12:38:00",
"defaulthood": false,
"servers": [
{
"host": "bra01.sn.ffnw.de",
"port": "10002",
"publickey": "2416b256c7b980832f741a8ab4617a501fd1b590e52405d9556565c0fe0006a7"
},
{
"host": "bra01.sn.ffnw.de",
"port": "10003",
"publickey": "cee553559bee169806a1b33649367377edff5f74e0323dc8206ecf0171c48ede"
}
],
"boxes": [
[
[
53.36,
8.18
],
[
53.45,
8.57
]
],
[
[
53.22,
8.32
],
[
53.36,
8.57
]
],
[
[
53.28,
8.13
],
[
53.36,
8.32
]
]
]
},
{
"name": "suedost",
"bssid": "02:00:0A:12:30:00",
"defaulthood": false,
"servers": [
{
"host": "suedost01.sn.ffnw.de",
"port": "10006",
"publickey": "2f4fdcfea81ae7122455846bc5b2ea7a0b70506afc365861931221898bcb3e05"
},
{
"host": "suedost01.sn.ffnw.de",
"port": "10007",
"publickey": "353dc2fb5ef923af2512f873e208357cf2b56e922ff2520ccf56659cda5d87a2"
}
],
"boxes": [
[
[
52.76,
8.67
],
[
53,
9.3
]
],
[
[
52.69,
8.67
],
[
52.76,
9.3
]
],
[
[
52.46,
8.32
],
[
52.69,
9.3
]
],
[
[
52.37,
7.9
],
[
52.46,
9.3
]
],
[
[
52.07,
8.42
],
[
52.37,
9.3
]
],
[
[
52.93,
8.14
],
[
53.08,
8.3
]
],
[
[
52.93,
8.3
],
[
53,
8.67
]
]
]
},
{
"name": "ibbenbueren",
"bssid": "02:00:0A:12:48:00",
"defaulthood": false,
"servers": [
{
"host": "",
"port": "",
"publickey": ""
}
],
"boxes": [
[
[
52.25,
7.66
],
[
52.3,
7.76
]
]
]
}
]
]
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment