Commit 1b304fc8 authored by mray's avatar mray

Merge branch 'master' into 'master'

Master

See merge request !23
parents 09d203c4 9f33b422
......@@ -26,7 +26,7 @@
"Public Free Wifi",
"Free internet access"
],
"lastchange": "2015-12-25T12:55:00.902Z"
"lastchange": "@newdate@"
},
"timeline": [
{
......@@ -36,11 +36,18 @@
],
"nodeMaps": [
{
"url": "https://freiburg.freifunk.net/ffmap-backend",
"url": "https://openfreiburg.de/freifunk",
"interval": "1m",
"technicalType": "meshviewer",
"mapType": "ffmap/backend"
},
{
"url": "https://openfreiburg.de/freifunk/meshviewer",
"interval": "1m",
"technicalType": "meshviewer",
"mapType": "list/status"
},
{
"url": "https://freiburg.freifunk.net/meshviewer",
......
......@@ -35,10 +35,11 @@ newnumber=$(grep -o '"online": true' ../ffmap-backend/nodelist.json|wc -l)
#
if [ $newnumber -ge 100 -a $newnumber -le 10000 ];
then
sed -e s/@nodes@/$newnumber/g $apilocation > ${apilocation%.in};
sed -e s/@nodes@/$newnumber/g $apilocation > ${apilocation%.in}
# for timestamp update
# TODO expansion to end-of-line in origin-expression is missing
# sed -e s/' "lastchange": '/' "lastchange": "'$(date -I +%Y-%m-%dT%T%Z)'"'/g API-File
sed -e s/@newdate@/$(date +%Y-%m-%dT%T%Z)/g $apilocation > ${apilocation%.in}
fi
#
......
......@@ -50,7 +50,7 @@ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(bp
<div class="row map">
<div class="ganzekarte">
<a href="https://freiburg.freifunk.net/meshviewer">Detailkarte</a>
<a href="https://openfreiburg.de/freifunk/meshviewer">Detailkarte</a>
<a href="https://freiburg-karte.de/"></a>
</div>
<iframe width="999" height="333" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="https://freiburg.freifunk.net/de-map/?lat=48.00187&lng=7.8257&z=12&l=Nodes"></iframe>
......@@ -198,4 +198,4 @@ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(bp
</div>
</body>
</html>
\ No newline at end of file
</html>
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