Würzburg Json angepasst auf Monitoring und neu API Version

From: Christoph <suepke.christoph@gmail.com>

Signed-off-by: Christoph <suepke.christoph@gmail.com>
---
 wuerzburg.json | 148 ++++++++++++++++++++++++++++-----------------------------
 1 file changed, 74 insertions(+), 74 deletions(-)

On Sat,  9 Apr 2016 21:05:44 +0200
christoph süpke <mistercrumble@web.de> wrote:

Hallo Christoph

Wie schon im IRC erwaehnt, ist es der falsche Ansatz die Community-Dateien direkt anzupassen.
Diese werden aus mit Hilfe eines Skriptes aus der Datei communitys_franken.json (1)
Abgesehen davon dass einige Daten zur Erzeugung aus dem Netmon geholt werden,
hat der jetzige Ansatz noch einige andere Probleme, die ich gerne am Mittwoch beim Treffen ins Nuernberg diskutieren moechte.


Gruss
-Steffen

(1) https://github.com/FreifunkFranken/community.franken.freifunk.net/blob/master/communitys_franken.json

> From: Christoph <suepke.christoph@gmail.com>
> 
> Signed-off-by: Christoph <suepke.christoph@gmail.com>
> ---
>  wuerzburg.json | 148
> ++++++++++++++++++++++++++++----------------------------- 1 file
> changed, 74 insertions(+), 74 deletions(-)
> 
> diff --git a/wuerzburg.json b/wuerzburg.json
> index 6d88138..bec15a4 100644
> --- a/wuerzburg.json
> +++ b/wuerzburg.json
> @@ -1,82 +1,82 @@
>  {
> -    "api": "0.4.8",
> -    "contact": {
> -        "email": "fragen@freifunk-franken.de",
> -        "facebook":
> "https://www.facebook.com/pages/Freifunk-W%C3%BCrzburg/1551181611834107",
> -        "irc": "irc://irc.freenode.net/#freifunkfranken",
> -        "ml":
> "http://lists.freifunk.net/mailman/listinfo/franken-freifunk.net",
> -        "phone": "+49 9101 7018607",
> -        "twitter": "@FreifunkFranken"
> -    },
> -    "location": {
> -        "city": "Würzburg",
> -        "country": "DE",
> -        "lat": 49.796880000000002,
> -        "lon": 9.9348899999999993
> -    },
> -    "metacommunity": "Freifunk Franken",
> -    "name": "Freifunk Würzburg",
> -    "networks": {
> -        "ipv4": [
> -            {
> -                "network": "10.50.72.0/21"
> -            }
> -        ]
> -    },
> -    "nodeMaps": [
> -        {
> -            "mapType": "geographical",
> -            "technicalType": "netmon",
> -            "url":
> "https://netmon.freifunk-franken.de/map.php?zoom=13&lat=49.78524&lon=9.92406&layers=B0000TTTTTT"
> -        },
> -        {
> -            "mapType": "list/status",
> -            "technicalType": "netmon",
> -            "url":
> "https://netmon.freifunk-franken.de/routerlist.php"
> -        }
> +  "name": "Freifunk Würzburg",
> +  "url": "http://freifunk-franken.de",
> +  "location": {
> +    "city": "Würzburg",
> +    "country": "DE",
> +    "lat": 49.79688,
> +    "lon": 9.93489
> +  },
> +  "contact": {
> +    "email": "fragen@freifunk-franken.de",
> +    "phone": "+49 9101 7018607",
> +    "irc": "irc://irc.freenode.net/#freifunkfranken",
> +    "ml":
> "http://lists.freifunk.net/mailman/listinfo/franken-freifunk.net",
> +    "facebook":
> "https://www.facebook.com/pages/Freifunk-W%C3%BCrzburg/1551181611834107",
> +    "twitter": "@FreifunkFranken"
> +  },
> +  "metacommunity": "Freifunk Franken",
> +  "state": {
> +    "nodes": 57,
> +    "focus": [
> +      "infrastructure/backbone",
> +      "Public Free Wifi",
> +      "Free internet access"
>      ],
> -    "state": {
> -        "focus": [
> -            "infrastructure/backbone",
> -            "Public Free Wifi",
> -            "Free internet access"
> -        ],
> -        "lastchange": "2016-04-09T10:00:18.027195Z",
> -        "nodes": 58
> +    "lastchange": "2016-04-09T18:42:03.571Z"
> +  },
> +  "timeline": [
> +    {
> +      "description": "20 Router an die Piratenpartei Würzburg
> übergeben",
> +      "timestamp": "2013-07-27"
> +    }
> +  ],
> +  "nodeMaps": [
> +    {
> +      "url":
> "https://netmon.freifunk-franken.de/map.php?zoom=13&lat=49.78524&lon=9.92406&layers=B0000TTTTTT",
> +      "technicalType": "netmon",
> +      "mapType": "geographical"
>      },
> -    "support": {
> -        "donations": {
> -            "campaigns": [
> -                {
> -                    "projectid": "14713",
> -                    "provider": "betterplace"
> -                }
> -            ]
> +    {
> +      "url": "https://netmon.freifunk-franken.de/routerlist.php",
> +      "technicalType": "netmon",
> +      "mapType": "list/status"
> +    }
> +  ],
> +  "support": {
> +    "donations": {
> +      "campaigns": [
> +        {
> +          "provider": "betterplace",
> +          "projectid": "14713"
>          }
> +      ]
> +    }
> +  },
> +  "techDetails": {
> +    "firmware": {
> +      "name": "Freifunk-Franken Firmware",
> +      "url": "https://dev.freifunk-franken.de/firmware/",
> +      "docs": "https://wiki.freifunk-franken.de/w/Portal:Firmware"
>      },
> -    "techDetails": {
> -        "firmware": {
> -            "docs":
> "https://wiki.freifunk-franken.de/w/Portal:Firmware",
> -            "name": "Freifunk-Franken Firmware",
> -            "url": "https://dev.freifunk-franken.de/firmware/"
> -        },
> -        "legals": [
> -            "vpnnational",
> -            "vpninternational"
> -        ],
> -        "routing": [
> -            "batman-adv",
> -            "OLSR"
> -        ],
> -        "updatemode": [
> -            "manual"
> -        ]
> -    },
> -    "timeline": [
> +    "networks": {
> +      "ipv4": [
>          {
> -            "description": "20 Router an die Piratenpartei Würzburg
> übergeben",
> -            "timestamp": "2013-07-27"
> +          "network": "10.50.72.0/21"
>          }
> +      ]
> +    },
> +    "routing": [
> +      "batman-adv",
> +      "OLSR"
> +    ],
> +    "updatemode": [
> +      "manual"
>      ],
> -    "url": "http://freifunk-franken.de"
> -}
> \ No newline at end of file
> +    "legals": [
> +      "vpnnational",
> +      "vpninternational"
> +    ]
> +  },
> +  "api": "0.4.12"
> +}
> -- 
> 1.9.1
> 
> -- 
> franken-dev mailing list
> franken-dev@freifunk.net
> http://lists.freifunk.net/mailman/listinfo/franken-dev-freifunk.net