From b14af4336cd3a151171a36e86f61fc7b4c50e7ae Mon Sep 17 00:00:00 2001 From: labcode-de Date: Mon, 5 Jun 2017 20:22:05 +0200 Subject: [PATCH] Add Link to KBU --- community-config.inc.php | 66 +++++----- geojson/bonn.geojson | 234 ++++++++++++++++++++++++++++++++++ geojson/hennef.geojson | 6 +- geojson/lohmar.geojson | 2 +- geojson/meckenheim.geojson | 2 +- geojson/much.geojson | 2 +- geojson/neunkirchen.geojson | 2 +- geojson/niederkassel.geojson | 2 +- geojson/rheinbach.geojson | 2 +- geojson/ruppichteroth.geojson | 2 +- geojson/siegburg.geojson | 2 +- geojson/staugustin.geojson | 2 +- geojson/troisdorf.geojson | 2 +- geojson/wachtberg.geojson | 2 +- js/firmware.js | 1 - 15 files changed, 284 insertions(+), 45 deletions(-) create mode 100644 geojson/bonn.geojson diff --git a/community-config.inc.php b/community-config.inc.php index 8525d30..9a65445 100644 --- a/community-config.inc.php +++ b/community-config.inc.php @@ -31,12 +31,18 @@ ), 1 => array( "community_id" => 1, + "name" => "Bonn", + "linktoseite" => "https://kbu.freifunk.net/wiki/index.php?title=Firmware_herunterladen", + "geojson" => "geojson/bonn.geojson" + ), + 2 => array( + "community_id" => 2, "name" => "Hennef", "linktoseite" => "https://images.freifunk-hennef.de/downloader/firmware.php?id=0", "geojson" => "geojson/hennef.geojson" ), - 2 => array( - "community_id" => 2, + 3 => array( + "community_id" => 3, "name" => "Königswinter", "head_titel" => "Freifunk Königswinter Firmware", "link_text" => "Zurück zur Startseite", @@ -47,8 +53,8 @@ "sub_auswahl" => "", "geojson" => "geojson/koenigswinter.geojson" ), - 3 => array( - "community_id" => 3, + 4 => array( + "community_id" => 4, "name" => "Lohmar", "head_titel" => "Freifunk Lohmar Firmware", "link_text" => "Zurück zur Startseite", @@ -59,8 +65,8 @@ "sub_auswahl" => "", "geojson" => "geojson/lohmar.geojson" ), - 4 => array( - "community_id" => 4, + 5 => array( + "community_id" => 5, "name" => "Meckenheim", "head_titel" => "Freifunk Meckenheim Firmware", "link_text" => "Zurück zur Startseite", @@ -71,8 +77,8 @@ "sub_auswahl" => "", "geojson" => "geojson/meckenheim.geojson" ), - 5 => array( - "community_id" => 5, + 6 => array( + "community_id" => 6, "name" => "Much", "head_titel" => "Freifunk Much Firmware", "link_text" => "Zurück zur Startseite", @@ -83,8 +89,8 @@ "sub_auswahl" => "", "geojson" => "geojson/much.geojson" ), - 6 => array( - "community_id" => 6, + 7 => array( + "community_id" => 7, "name" => "Neunkirchen", "head_titel" => "Freifunk Neunkirchen Firmware", "link_text" => "Zurück zur Startseite", @@ -95,8 +101,8 @@ "sub_auswahl" => "", "geojson" => "geojson/neunkirchen.geojson" ), - 7 => array( - "community_id" => 7, + 8 => array( + "community_id" => 8, "name" => "Niederkassel", "head_titel" => "Freifunk Niederkassel Firmware", "link_text" => "Zurück zur Startseite", @@ -107,8 +113,8 @@ "sub_auswahl" => "", "geojson" => "geojson/niederkassel.geojson" ), - 8 => array( - "community_id" => 8, + 9 => array( + "community_id" => 9, "name" => "Rheinbach", "head_titel" => "Freifunk Rheinbach Firmware", "link_text" => "Zurück zur Startseite", @@ -119,8 +125,8 @@ "sub_auswahl" => "", "geojson" => "geojson/rheinbach.geojson" ), - 9 => array( - "community_id" => 9, + 10 => array( + "community_id" => 10, "name" => "Ruppichteroth", "head_titel" => "Freifunk Ruppichteroth Firmware", "link_text" => "Zurück zur Startseite", @@ -131,8 +137,8 @@ "sub_auswahl" => "", "geojson" => "geojson/ruppichteroth.geojson" ), - 10 => array( - "community_id" => 10, + 11 => array( + "community_id" => 11, "name" => "Sankt Augustin", "head_titel" => "Freifunk Sankt Augustin Firmware", "link_text" => "Zurück zur Startseite", @@ -143,8 +149,8 @@ "sub_auswahl" => "", "geojson" => "geojson/staugustin.geojson" ), - 11 => array( - "community_id" => 11, + 12 => array( + "community_id" => 12, "name" => "Siegburg", "head_titel" => "Freifunk Siegburg Firmware", "link_text" => "Zurück zur Startseite", @@ -155,8 +161,8 @@ "sub_auswahl" => "", "geojson" => "geojson/siegburg.geojson" ), - 12 => array( - "community_id" => 12, + 13 => array( + "community_id" => 13, "name" => "Soziale Netzwerke", "head_titel" => "Freifunk für Soziale Netzwerke Firmware", "link_text" => "Zurück zur Startseite", @@ -167,8 +173,8 @@ "sub_auswahl" => "", "geojson" => "" ), - 13 => array( - "community_id" => 13, + 14 => array( + "community_id" => 14, "name" => "Troisdorf", "head_titel" => "Freifunk Troisdorf Firmware", "link_text" => "Zurück zur Startseite", @@ -179,8 +185,8 @@ "sub_auswahl" => "", "geojson" => "geojson/troisdorf.geojson" ), - 14 => array( - "community_id" => 14, + 15 => array( + "community_id" => 15, "name" => "Troisdorf - Fußgängerzone", "head_titel" => "Freifunk Troisdorf Fußgänerzone Firmware", "link_text" => "Zurück zur Startseite", @@ -191,8 +197,8 @@ "sub_auswahl" => "", "geojson" => "" ), - 15 => array( - "community_id" => 15, + 16 => array( + "community_id" => 16, "name" => "Troisdorf - Soziale Netzwerke", "head_titel" => "Freifunk für Troisdorfer Soziale Netzwerke Firmware", "link_text" => "Zurück zur Startseite", @@ -203,8 +209,8 @@ "sub_auswahl" => "", "geojson" => "" ), - 16 => array( - "community_id" => 16, + 17 => array( + "community_id" => 17, "name" => "Wachtberg", "head_titel" => "Freifunk Wachtberg Firmware", "link_text" => "Zurück zur Startseite", diff --git a/geojson/bonn.geojson b/geojson/bonn.geojson new file mode 100644 index 0000000..64ea36b --- /dev/null +++ b/geojson/bonn.geojson @@ -0,0 +1,234 @@ +{ + "type":"FeatureCollection", + "crs":{ + "type":"name", + "properties":{ + "name":"urn:ogc:def:crs:OGC:1.3:CRS84" + } + }, + "source":"© GeoBasis-DE / BKG 2013 (Daten verändert)", + "features":[ + { + "type":"Feature", + "properties":{ + "community_id":"1", + "color":"#2962ff" + }, + "geometry":{ + "type":"Polygon", + "coordinates":[ + [ + [ + 7.132213394040407, + 50.77185443737477 + ], + [ + 7.152489927594899, + 50.76003796335712 + ], + [ + 7.156681239926158, + 50.753918746788344 + ], + [ + 7.162994368356174, + 50.75637051875951 + ], + [ + 7.18258567762452, + 50.75173376635224 + ], + [ + 7.194960773577625, + 50.74376603541352 + ], + [ + 7.198575927383396, + 50.7475638018129 + ], + [ + 7.20910622998096, + 50.736931027156174 + ], + [ + 7.191262592081926, + 50.72659467341673 + ], + [ + 7.196577745091191, + 50.71305632943136 + ], + [ + 7.19396780408392, + 50.71045092369741 + ], + [ + 7.174971638245492, + 50.707700013470934 + ], + [ + 7.168237685458138, + 50.70348964302292 + ], + [ + 7.176563878575886, + 50.687114469613675 + ], + [ + 7.210871863698702, + 50.64954362372206 + ], + [ + 7.198485710421648, + 50.64820873532703 + ], + [ + 7.194148580910829, + 50.64267364884345 + ], + [ + 7.18116837749634, + 50.652288167476165 + ], + [ + 7.17344532565691, + 50.65112043013336 + ], + [ + 7.156430690284973, + 50.65468256279831 + ], + [ + 7.128048493073197, + 50.64726487495967 + ], + [ + 7.1240276330048, + 50.65507371967986 + ], + [ + 7.105341569450315, + 50.659692359928265 + ], + [ + 7.076663672842178, + 50.642760008384485 + ], + [ + 7.068919533825873, + 50.63310892052369 + ], + [ + 7.0560982867468, + 50.63186602981456 + ], + [ + 7.060008559766892, + 50.63888119867724 + ], + [ + 7.050659280246245, + 50.63962725833799 + ], + [ + 7.03248204073807, + 50.65430012419505 + ], + [ + 7.026879245740833, + 50.65495159085289 + ], + [ + 7.024341991575346, + 50.662009381215405 + ], + [ + 7.027070449016924, + 50.665609812928174 + ], + [ + 7.03774665833277, + 50.66181177162897 + ], + [ + 7.044293391365702, + 50.67427663296409 + ], + [ + 7.031343309555846, + 50.6778388764734 + ], + [ + 7.039260745561086, + 50.68874024285856 + ], + [ + 7.030360320724697, + 50.69468965664956 + ], + [ + 7.031426026188501, + 50.70057656063367 + ], + [ + 7.023486323874297, + 50.70472497388864 + ], + [ + 7.028916532786433, + 50.71314799337683 + ], + [ + 7.040284265648467, + 50.7192172053215 + ], + [ + 7.029793034960393, + 50.72607449826665 + ], + [ + 7.040359268497073, + 50.753213920196245 + ], + [ + 7.03655090539037, + 50.75764892001314 + ], + [ + 7.048730628273394, + 50.76422761631534 + ], + [ + 7.056525284280213, + 50.76426139527427 + ], + [ + 7.065658279092976, + 50.7717654261705 + ], + [ + 7.098686033671748, + 50.76161572855177 + ], + [ + 7.106758396344927, + 50.763482747852436 + ], + [ + 7.112695173852172, + 50.771096360566695 + ], + [ + 7.125265297984769, + 50.774435466448885 + ], + [ + 7.132213394040407, + 50.77185443737477 + ] + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/geojson/hennef.geojson b/geojson/hennef.geojson index f3e676f..c183b38 100644 --- a/geojson/hennef.geojson +++ b/geojson/hennef.geojson @@ -10,9 +10,9 @@ "features":[ { "type":"Feature", - "properties":{ - "community_id":"1", - "color":"#f44336" + "properties":{ + "community_id":"2", + "color":"#607d8b" }, "geometry":{ "type":"Polygon", diff --git a/geojson/lohmar.geojson b/geojson/lohmar.geojson index be0581d..7f481a9 100644 --- a/geojson/lohmar.geojson +++ b/geojson/lohmar.geojson @@ -11,7 +11,7 @@ { "type":"Feature", "properties":{ - "community_id": "3", + "community_id": "4", "color":"#9c27b0" }, "geometry":{ diff --git a/geojson/meckenheim.geojson b/geojson/meckenheim.geojson index aa63115..e74598a 100644 --- a/geojson/meckenheim.geojson +++ b/geojson/meckenheim.geojson @@ -11,7 +11,7 @@ { "type":"Feature", "properties":{ - "community_id":"4", + "community_id":"5", "color":"#673ab7" }, "geometry":{ diff --git a/geojson/much.geojson b/geojson/much.geojson index 9362afe..d90fd81 100644 --- a/geojson/much.geojson +++ b/geojson/much.geojson @@ -11,7 +11,7 @@ { "type":"Feature", "properties":{ - "community_id":"5", + "community_id":"6", "color":"#795548" }, "geometry":{ diff --git a/geojson/neunkirchen.geojson b/geojson/neunkirchen.geojson index e997ac1..73358d0 100644 --- a/geojson/neunkirchen.geojson +++ b/geojson/neunkirchen.geojson @@ -11,7 +11,7 @@ { "type":"Feature", "properties":{ - "community_id":"6", + "community_id":"7", "color":"#3f51b5" }, "geometry":{ diff --git a/geojson/niederkassel.geojson b/geojson/niederkassel.geojson index 44ed642..f883e5f 100644 --- a/geojson/niederkassel.geojson +++ b/geojson/niederkassel.geojson @@ -11,7 +11,7 @@ { "type":"Feature", "properties":{ - "community_id":"7", + "community_id":"8", "color":"#8bc34a" }, "geometry":{ diff --git a/geojson/rheinbach.geojson b/geojson/rheinbach.geojson index 9d8d710..ddfd1a8 100644 --- a/geojson/rheinbach.geojson +++ b/geojson/rheinbach.geojson @@ -11,7 +11,7 @@ { "type":"Feature", "properties":{ - "community_id":"8", + "community_id":"9", "color":"#00bcd4" }, "geometry":{ diff --git a/geojson/ruppichteroth.geojson b/geojson/ruppichteroth.geojson index b39cd40..931c1e5 100644 --- a/geojson/ruppichteroth.geojson +++ b/geojson/ruppichteroth.geojson @@ -11,7 +11,7 @@ { "type":"Feature", "properties":{ - "community_id":"9", + "community_id":"10", "color":"#009688" }, "geometry":{ diff --git a/geojson/siegburg.geojson b/geojson/siegburg.geojson index 6c12db4..3cc7b51 100644 --- a/geojson/siegburg.geojson +++ b/geojson/siegburg.geojson @@ -11,7 +11,7 @@ { "type":"Feature", "properties":{ - "community_id": "11", + "community_id": "12", "color":"#2196f3" }, "geometry":{ diff --git a/geojson/staugustin.geojson b/geojson/staugustin.geojson index f5124c6..cd43b69 100644 --- a/geojson/staugustin.geojson +++ b/geojson/staugustin.geojson @@ -11,7 +11,7 @@ { "type":"Feature", "properties":{ - "community_id":"10", + "community_id":"11", "color":"#4caf50" }, "geometry":{ diff --git a/geojson/troisdorf.geojson b/geojson/troisdorf.geojson index 002d47d..b9393b1 100644 --- a/geojson/troisdorf.geojson +++ b/geojson/troisdorf.geojson @@ -11,7 +11,7 @@ { "type":"Feature", "properties":{ - "community_id":"13", + "community_id":"14", "color":"#ff9800" }, "geometry":{ diff --git a/geojson/wachtberg.geojson b/geojson/wachtberg.geojson index 19898cd..f699578 100644 --- a/geojson/wachtberg.geojson +++ b/geojson/wachtberg.geojson @@ -11,7 +11,7 @@ { "type":"Feature", "properties":{ - "community_id":"16", + "community_id":"17", "color":"#ff5722" }, "geometry":{ diff --git a/js/firmware.js b/js/firmware.js index 01f498f..b9338ed 100644 --- a/js/firmware.js +++ b/js/firmware.js @@ -159,7 +159,6 @@ function change (origin, select) { link = router_json[id].stablesysupgradelink linkclass = 'btn-success' } - console.log(link) $('#download').attr("href", link) $('#download').removeAttr('disabled') }