better zone information catching
This commit is contained in:
parent
002d9ff599
commit
0f91309598
15
API/ZONE.sh
15
API/ZONE.sh
|
@ -59,7 +59,16 @@ LAT=$(makecoord $LAT)
|
|||
LON=$(makecoord $LON)
|
||||
|
||||
echo "REQUEST $LAT / $LON / $DEG"
|
||||
if [[ $DEG == "0.01" ]]; then
|
||||
# /ipfs/QmYNpzG3qi6GzciP6D6NsLgv5KwcsKtYJ5EZt7s23ToaNj/map_render.html?southWestLat=43.60&southWestLon=1.40°=0.1
|
||||
SECLAT="${LAT::-1}"
|
||||
SECLON="${LON::-1}"
|
||||
SECTOR="_${SECLAT}_${SECLON}"
|
||||
echo "SECTOR = ${SECTOR}"
|
||||
SECTORG1PUB=$(${MY_PATH}/../tools/keygen -t duniter "${UPLANETNAME}${SECTOR}" "${UPLANETNAME}${SECTOR}")
|
||||
SECTORTW="/ipns/"$(${MY_PATH}/../tools/keygen -t ipfs "${UPLANETNAME}${SECTOR}" "${UPLANETNAME}${SECTOR}")"/TW"
|
||||
|
||||
fi
|
||||
if [[ $DEG == "0.001" ]]; then
|
||||
|
||||
G1PUB=$(${MY_PATH}/../tools/keygen -t duniter "${UPLANETNAME}${LAT}" "${UPLANETNAME}${LON}")
|
||||
|
@ -82,9 +91,11 @@ echo '{ "gridNumbers": [' >> ~/.zen/tmp/${MOATS}.http
|
|||
for i in $(seq 0 9);
|
||||
do
|
||||
ZLAT=$(echo "$LAT + $DEG * $i" | bc -l )
|
||||
[[ -z ${ZLAT} ]] && ZLAT=0
|
||||
# [[ ! $(echo $ZLAT | grep "\." ) ]] && ZLAT="${ZLAT}."
|
||||
for j in $(seq 0 9); do
|
||||
ZLON=$(echo "$LON + $DEG * $j" | bc -l )
|
||||
[[ -z ${ZLON} ]] && ZLON=0
|
||||
# [[ ! $(echo $ZLON | grep "\." ) ]] && ZLON="${ZLON}."
|
||||
echo " ## SEARCH _${ZLAT}*_${ZLON}*"
|
||||
swarmnum=$(ls -d ~/.zen/tmp/swarm/*/UPLANET/_${ZLAT}*_${ZLON}*/TW/* 2>/dev/null | wc -l )
|
||||
|
@ -93,8 +104,8 @@ do
|
|||
|
||||
[[ $totnum -gt 9 ]] && totnum="X"
|
||||
|
||||
[[ $totnum != "0" ]] && echo '{"lat": '${ZLAT}', "lon": '${ZLON}', "number": "'${totnum}'", "ipns": "" }
|
||||
,' >> ~/.zen/tmp/${MOATS}.http && echo "$DEG :" '{"lat": '${ZLAT}', "lon": '${ZLON}', "number": "'${totnum}'", "ipns": "" }'
|
||||
[[ $totnum != "0" ]] && echo '{"lat": '${ZLAT}', "lon": '${ZLON}', "number": "'${totnum}'", "ipns": "'${SECTORTW}'" }
|
||||
,' >> ~/.zen/tmp/${MOATS}.http && echo "$DEG :" '{"lat": '${ZLAT}', "lon": '${ZLON}', "number": "'${totnum}'", "ipns": "'${SECTORTW}'" }'
|
||||
|
||||
done
|
||||
done
|
||||
|
|
|
@ -21,17 +21,17 @@
|
|||
MY_PATH="`dirname \"$0\"`" # relative
|
||||
MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized
|
||||
|
||||
LOWMODE=$(sudo systemctl status ipfs | grep disabled) ## IPFS DISABLED - START ONLY FOR SYNC -
|
||||
# echo "$USER ALL=(ALL) NOPASSWD:/bin/systemctl" | (sudo su -c 'EDITOR="tee" visudo -f /etc/sudoers.d/systemctl')
|
||||
if [[ $LOWMODE != "" ]]; then
|
||||
espeak "Low Mode"
|
||||
sudo systemctl start ipfs
|
||||
fi
|
||||
#~ LOWMODE=$(sudo systemctl status ipfs | grep disabled) ## IPFS DISABLED - START ONLY FOR SYNC -
|
||||
#~ # echo "$USER ALL=(ALL) NOPASSWD:/bin/systemctl" | (sudo su -c 'EDITOR="tee" visudo -f /etc/sudoers.d/systemctl')
|
||||
#~ if [[ $LOWMODE != "" ]]; then
|
||||
#~ espeak "Low Mode"
|
||||
#~ sudo systemctl start ipfs
|
||||
#~ fi
|
||||
|
||||
########################################################################
|
||||
#~ ########################################################################
|
||||
|
||||
espeak "restarting I P F S daemon"
|
||||
[[ "$isLAN" ]] && sudo systemctl restart ipfs
|
||||
#~ espeak "restarting I P F S daemon"
|
||||
#~ [[ "$isLAN" ]] && sudo systemctl restart ipfs
|
||||
|
||||
## CHECK IF IPFS DAEMON IS STARTS WELL
|
||||
floop=0
|
||||
|
|
|
@ -480,7 +480,7 @@ if [[ $XDG_SESSION_TYPE == 'x11' ]]; then
|
|||
###
|
||||
fi
|
||||
|
||||
EARTHCID="/ipfs/QmYNpzG3qi6GzciP6D6NsLgv5KwcsKtYJ5EZt7s23ToaNj"
|
||||
EARTHCID="/ipfs/QmR3am7JVzNuF2ebKMCi4UffKnh8HbNZEY51v4jieS7kbh"
|
||||
FLIPPERCID="${EARTHCID}/coinflip"
|
||||
|
||||
myUPLANET="${myIPFS}${EARTHCID}" ## EMAIL LAT LON KEY
|
||||
|
|
Loading…
Reference in New Issue