STI/Astroport.ONE
STI
/
Astroport.ONE
4
1
Fork 2
Code Issues 11 Pull Requests Projects Releases 1 Wiki Activity

correction

This commit is contained in:
fred 2023-09-13 00:01:03 +02:00
parent 3708707231
commit 132e7bbea4
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
RUNTIME/PLAYER.refresh.sh
View File

@ -130,14 +130,19 @@ for PLAYER in ${PLAYERONE[@]}; do
IPNSTAIL=$(echo ${ASTROPORT} | rev | cut -f 1 -d '/' | rev) # Remove "/ipns/" part
echo "TW ASTROPORT GATEWAY : ${ASTROPORT}"
## GET "GPS" TIDDLER
## GET "GPS" TIDDLER - 0.00 0.00 (if empty: null)
tiddlywiki --load ~/.zen/tmp/${IPFSNODEID}/TW/${PLAYER}/index.html \
--output ~/.zen/tmp/${MOATS} \
--render '.' 'GPS.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'GPS' ## GPS Tiddler
UMAPNS=$(cat ~/.zen/tmp/${MOATS}/GPS.json | jq -r .[].umap)
[[ $UMAPNS == "null" ]] && UMAPNS="/ipns/k51qzi5uqu5djg1gqzujq5p60w25mi235gdg0lgkk5qztkfrpi5c22oolrriyu"
LAT=$(cat ~/.zen/tmp/${MOATS}/GPS.json | jq -r .[].lat)
[[ $LAT == "null" ]] && LAT="0.00"
LON=$(cat ~/.zen/tmp/${MOATS}/GPS.json | jq -r .[].lon)
[[ $LON == "null" ]] && LON="0.00"
echo "LAT=${LAT}; LON=${LON}; UMAPNS=${UMAPNS}"
## STORE IN PLAYER CACHE
echo "_${LAT}_${LON}" > ~/.zen/game/players/${PLAYER}/.umap

13
RUNTIME/UPLANET.refresh.sh
View File

@ -87,6 +87,7 @@ mkdir ~/.zen/tmp/${MOATS}
######################################################## # NODE SELECTION in UMAP.refresh
##############################################################
rm ~/.zen/tmp/${MOATS}/${UMAP}/geolinks.json
##############################################################
if [[ ! -s ~/.zen/tmp/${MOATS}/${UMAP}/geolinks.json ]]; then
##############################################################
@ -160,7 +161,7 @@ mkdir ~/.zen/tmp/${MOATS}
echo "NORTH WEST UMAP NWWALLET : ${NWWALLET}"
ipfs key rm ${NWWALLET} > /dev/null 2>&1 ## AVOID ERROR ON IMPORT
${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/NWWALLET.priv "$NWLAT" "$NWLON"
SWUMAPNS=$(ipfs key import ${NWWALLET} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/NWWALLET.priv)
NWUMAPNS=$(ipfs key import ${NWWALLET} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/NWWALLET.priv)
ipfs key rm ${NWWALLET}
##############################################################
@ -172,7 +173,7 @@ mkdir ~/.zen/tmp/${MOATS}
echo "NORTH EAST UMAP NEWALLET : ${NEWALLET}"
ipfs key rm ${NEWALLET} > /dev/null 2>&1 ## AVOID ERROR ON IMPORT
${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/NEWALLET.priv "$NELAT" "$NELON"
SWUMAPNS=$(ipfs key import ${NEWALLET} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/NEWALLET.priv)
NEUMAPNS=$(ipfs key import ${NEWALLET} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/NEWALLET.priv)
ipfs key rm ${NEWALLET}
##############################################################
@ -184,7 +185,7 @@ mkdir ~/.zen/tmp/${MOATS}
echo "SOUTH EAST UMAP SEWALLET : ${SEWALLET}"
ipfs key rm ${SEWALLET} > /dev/null 2>&1 ## AVOID ERROR ON IMPORT
${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/SEWALLET.priv "$SELAT" "$SELON"
SWUMAPNS=$(ipfs key import ${SEWALLET} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/SEWALLET.priv)
SEUMAPNS=$(ipfs key import ${SEWALLET} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/SEWALLET.priv)
ipfs key rm ${SEWALLET}
jq -n \
@ -194,8 +195,8 @@ mkdir ~/.zen/tmp/${MOATS}
--arg west "${myIPFS}/ipns/${WUMAPNS}" \
--arg northeast "${myIPFS}/ipns/${NEUMAPNS}" \
--arg northwest "${myIPFS}/ipns/${NWUMAPNS}" \
--arg southeast "${myIPFS}/ipns/${SEMAPNS}" \
--arg southwest "${myIPFS}/ipns/${SWMAPNS}" \
--arg southeast "${myIPFS}/ipns/${SEUMAPNS}" \
--arg southwest "${myIPFS}/ipns/${SWUMAPNS}" \
'{north: $north, south: $south, east: $east, west: $west, northeast: $northeast, northwest: $northwest, southeast: $southeast, southwest: $southwest}' \
> ~/.zen/tmp/${MOATS}/${UMAP}/geolinks.json
@ -203,7 +204,7 @@ mkdir ~/.zen/tmp/${MOATS}
### SET navigator.html ## MAKE EVOLVE template/umap.html
cp ${MY_PATH}/../templates/umap.html ~/.zen/tmp/${MOATS}/${UMAP}/navigator_Umap.html
cat ~/.zen/tmp/${MOATS}/${UMAP}/navigator_map.html | sed "s~Umap~Usat~g" > ~/.zen/tmp/${MOATS}/${UMAP}/navigator_Usat.html
cat ~/.zen/tmp/${MOATS}/${UMAP}/navigator_Umap.html | sed "s~Umap~Usat~g" > ~/.zen/tmp/${MOATS}/${UMAP}/navigator_Usat.html
### REFRESH PLAYERS DATA (SHOULD BE THERE, but Station rebuilds it )
# FIND WHICH PLAYERS MATCH SAME "_LAT_LON" IN ~/.zen/game/players/*/.umap