default 0.00
This commit is contained in:
parent
678e9cafdf
commit
edb0fee3a9
|
@ -295,11 +295,12 @@ if [[ ${wishnumbers} -gt 0 ]]; then
|
||||||
--output ~/.zen/tmp/${MOATS} \
|
--output ~/.zen/tmp/${MOATS} \
|
||||||
--render '.' 'GPS.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'GPS' ## GPS Tiddler
|
--render '.' 'GPS.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'GPS' ## GPS Tiddler
|
||||||
TWMAPNS=$(cat ~/.zen/tmp/${MOATS}/GPS.json | jq -r .[].umap)
|
TWMAPNS=$(cat ~/.zen/tmp/${MOATS}/GPS.json | jq -r .[].umap)
|
||||||
|
[[ $TWMAPNS == "null" || $TWMAPNS == "" ]] && TWMAPNS="/ipns/k51qzi5uqu5djg1gqzujq5p60w25mi235gdg0lgkk5qztkfrpi5c22oolrriyu"
|
||||||
LAT=$(cat ~/.zen/tmp/${MOATS}/GPS.json | jq -r .[].lat)
|
LAT=$(cat ~/.zen/tmp/${MOATS}/GPS.json | jq -r .[].lat)
|
||||||
[[ ${LAT} == "null" ]] && LAT="0.00"
|
[[ ${LAT} == "null" || ${LAT} == "" ]] && LAT="0.00"
|
||||||
LAT=$(makecoord $LAT)
|
LAT=$(makecoord $LAT)
|
||||||
LON=$(cat ~/.zen/tmp/${MOATS}/GPS.json | jq -r .[].lon)
|
LON=$(cat ~/.zen/tmp/${MOATS}/GPS.json | jq -r .[].lon)
|
||||||
[[ ${LON} == "null" ]] && LON="0.00"
|
[[ ${LON} == "null" || ${LON} == "" ]] && LON="0.00"
|
||||||
LON=$(makecoord $LON)
|
LON=$(makecoord $LON)
|
||||||
echo "LAT=${LAT}; LON=${LON}; UMAPNS=${TWMAPNS}"
|
echo "LAT=${LAT}; LON=${LON}; UMAPNS=${TWMAPNS}"
|
||||||
rm ~/.zen/tmp/${MOATS}/GPS.json
|
rm ~/.zen/tmp/${MOATS}/GPS.json
|
||||||
|
|
|
@ -48,9 +48,11 @@ fi
|
||||||
|
|
||||||
mkdir -p $HOME/.zen/tmp/coucou/
|
mkdir -p $HOME/.zen/tmp/coucou/
|
||||||
COINSFILE=$HOME/.zen/tmp/coucou/${G1PUB}.COINS
|
COINSFILE=$HOME/.zen/tmp/coucou/${G1PUB}.COINS
|
||||||
|
#######################################################
|
||||||
## GET EXTERNAL G1 DATA
|
## GET EXTERNAL G1 DATA
|
||||||
${MY_PATH}/GetGCAttributesFromG1PUB.sh ${G1PUB}
|
${MY_PATH}/GetGCAttributesFromG1PUB.sh ${G1PUB}
|
||||||
|
#######################################################
|
||||||
|
#######################################################
|
||||||
|
|
||||||
# echo "ACTUAL $COINSFILE CONTAINS"
|
# echo "ACTUAL $COINSFILE CONTAINS"
|
||||||
CURCOINS=$(cat $COINSFILE 2>/dev/null)
|
CURCOINS=$(cat $COINSFILE 2>/dev/null)
|
||||||
|
|
|
@ -40,9 +40,9 @@ fi
|
||||||
## SCAN GCHANGE +
|
## SCAN GCHANGE +
|
||||||
if [[ ! -s ~/.zen/tmp/coucou/${G1PUB}.gchange.json ]]; then
|
if [[ ! -s ~/.zen/tmp/coucou/${G1PUB}.gchange.json ]]; then
|
||||||
${MY_PATH}/timeout.sh -t 20 curl -s ${myDATA}/user/profile/${G1PUB} > ~/.zen/tmp/${MOATS}/${G1PUB}.gchange.json
|
${MY_PATH}/timeout.sh -t 20 curl -s ${myDATA}/user/profile/${G1PUB} > ~/.zen/tmp/${MOATS}/${G1PUB}.gchange.json
|
||||||
GFOUND=$(cat ~/.zen/tmp/${MOATS}/${G1PUB}.gchange.json | jq -r '.found')
|
GFOUND=$(cat ~/.zen/tmp/${MOATS}/${G1PUB}.gchange.json 2>/dev/null | jq -r '.found')
|
||||||
|
|
||||||
if [[ $GFOUND == "false" ]]; then
|
if [[ ! $GFOUND || $GFOUND == "false" ]]; then
|
||||||
echo "-- NO GCHANGE "
|
echo "-- NO GCHANGE "
|
||||||
else
|
else
|
||||||
cp -f ~/.zen/tmp/${MOATS}/${G1PUB}.gchange.json ~/.zen/tmp/coucou/
|
cp -f ~/.zen/tmp/${MOATS}/${G1PUB}.gchange.json ~/.zen/tmp/coucou/
|
||||||
|
@ -57,9 +57,9 @@ fi
|
||||||
if [[ ! -s ~/.zen/tmp/coucou/${G1PUB}.cesium.json ]]; then
|
if [[ ! -s ~/.zen/tmp/coucou/${G1PUB}.cesium.json ]]; then
|
||||||
|
|
||||||
${MY_PATH}/timeout.sh -t 10 curl -s ${myCESIUM}/user/profile/${G1PUB} > ~/.zen/tmp/${MOATS}/${G1PUB}.cesium.json 2>/dev/null
|
${MY_PATH}/timeout.sh -t 10 curl -s ${myCESIUM}/user/profile/${G1PUB} > ~/.zen/tmp/${MOATS}/${G1PUB}.cesium.json 2>/dev/null
|
||||||
GCFOUND=$(cat ~/.zen/tmp/${MOATS}/${G1PUB}.cesium.json | jq -r '.found')
|
GCFOUND=$(cat ~/.zen/tmp/${MOATS}/${G1PUB}.cesium.json 2>/dev/null | jq -r '.found')
|
||||||
|
|
||||||
if [[ $GCFOUND == "false" ]]; then
|
if [[ ! $GCFOUND || $GCFOUND == "false" ]]; then
|
||||||
echo "-- NO CESIUM"
|
echo "-- NO CESIUM"
|
||||||
else
|
else
|
||||||
cp -f ~/.zen/tmp/${MOATS}/${G1PUB}.cesium.json ~/.zen/tmp/coucou/
|
cp -f ~/.zen/tmp/${MOATS}/${G1PUB}.cesium.json ~/.zen/tmp/coucou/
|
||||||
|
|
Loading…
Reference in New Issue