correct GPS tiddler
This commit is contained in:
parent
30a9274005
commit
99dead74f9
|
@ -145,7 +145,8 @@ for PLAYER in ${PLAYERONE[@]}; do
|
||||||
tiddlywiki --load ~/.zen/tmp/${IPFSNODEID}/TW/${PLAYER}/index.html \
|
tiddlywiki --load ~/.zen/tmp/${IPFSNODEID}/TW/${PLAYER}/index.html \
|
||||||
--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
|
||||||
[[ ! -s ~/.zen/tmp/${MOATS}/GPS.json ]] && echo "${PLAYER} GPS : BAD TW (☓‿‿☓) " && continue
|
[[ ! -s ~/.zen/tmp/${MOATS}/GPS.json || $(cat ~/.zen/tmp/${MOATS}/GPS.json) == "[]" ]] \
|
||||||
|
&& echo "${PLAYER} GPS : BAD TW (☓‿‿☓) " && continue
|
||||||
|
|
||||||
#############################################################
|
#############################################################
|
||||||
## CHECK MadeInZion
|
## CHECK MadeInZion
|
||||||
|
@ -153,7 +154,8 @@ for PLAYER in ${PLAYERONE[@]}; do
|
||||||
--output ~/.zen/tmp/${MOATS} \
|
--output ~/.zen/tmp/${MOATS} \
|
||||||
--render '.' 'MadeInZion.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'MadeInZion' ## MadeInZion Tiddler
|
--render '.' 'MadeInZion.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'MadeInZion' ## MadeInZion Tiddler
|
||||||
|
|
||||||
[[ ! -s ~/.zen/tmp/${MOATS}/MadeInZion.json ]] && echo "${PLAYER} MadeInZion : BAD TW (☓‿‿☓) " && continue
|
[[ ! -s ~/.zen/tmp/${MOATS}/MadeInZion.json || $(cat ~/.zen/tmp/${MOATS}/MadeInZion.json) == "[]" ]] \
|
||||||
|
&& echo "${PLAYER} MadeInZion : BAD TW (☓‿‿☓) " && continue
|
||||||
|
|
||||||
player=$(cat ~/.zen/tmp/${MOATS}/MadeInZion.json | jq -r .[].player)
|
player=$(cat ~/.zen/tmp/${MOATS}/MadeInZion.json | jq -r .[].player)
|
||||||
#############################################################
|
#############################################################
|
||||||
|
@ -181,6 +183,9 @@ for PLAYER in ${PLAYERONE[@]}; do
|
||||||
tiddlywiki --load ~/.zen/tmp/${IPFSNODEID}/TW/${PLAYER}/index.html \
|
tiddlywiki --load ~/.zen/tmp/${IPFSNODEID}/TW/${PLAYER}/index.html \
|
||||||
--output ~/.zen/tmp/${MOATS} \
|
--output ~/.zen/tmp/${MOATS} \
|
||||||
--render '.' 'Astroport.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'Astroport' ## Astroport Tiddler
|
--render '.' 'Astroport.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'Astroport' ## Astroport Tiddler
|
||||||
|
[[ ! -s ~/.zen/tmp/${MOATS}/Astroport.json || $(cat ~/.zen/tmp/${MOATS}/Astroport.json) == "[]" ]] \
|
||||||
|
&& echo "${PLAYER} Astroport : BAD TW (☓‿‿☓) " && continue
|
||||||
|
|
||||||
BIRTHDATE=$(cat ~/.zen/tmp/${MOATS}/Astroport.json | jq -r .[].birthdate)
|
BIRTHDATE=$(cat ~/.zen/tmp/${MOATS}/Astroport.json | jq -r .[].birthdate)
|
||||||
ASTROPORT=$(cat ~/.zen/tmp/${MOATS}/Astroport.json | jq -r .[].astroport) ## ZenStation IPNS address
|
ASTROPORT=$(cat ~/.zen/tmp/${MOATS}/Astroport.json | jq -r .[].astroport) ## ZenStation IPNS address
|
||||||
CURCHAIN=$(cat ~/.zen/tmp/${MOATS}/Astroport.json | jq -r .[].chain | rev | cut -f 1 -d '/' | rev) # Remove "/ipfs/" part
|
CURCHAIN=$(cat ~/.zen/tmp/${MOATS}/Astroport.json | jq -r .[].chain | rev | cut -f 1 -d '/' | rev) # Remove "/ipfs/" part
|
||||||
|
@ -217,38 +222,36 @@ for PLAYER in ${PLAYERONE[@]}; do
|
||||||
#### UPLANET GEO COORD EXTRACTION
|
#### UPLANET GEO COORD EXTRACTION
|
||||||
## GET "GPS" TIDDLER - 0.00 0.00 (if empty: null)
|
## GET "GPS" TIDDLER - 0.00 0.00 (if empty: null)
|
||||||
LAT=$(cat ~/.zen/tmp/${MOATS}/GPS.json | jq -r .[].lat)
|
LAT=$(cat ~/.zen/tmp/${MOATS}/GPS.json | jq -r .[].lat)
|
||||||
[[ $LAT == "null" || $LAT == "" ]] && LAT="0.00"
|
[[ $LAT == "null" || $LAT == "" ]] && LAT="0.00"
|
||||||
LON=$(cat ~/.zen/tmp/${MOATS}/GPS.json | jq -r .[].lon)
|
LON=$(cat ~/.zen/tmp/${MOATS}/GPS.json | jq -r .[].lon)
|
||||||
[[ $LON == "null" || $LON == "" ]] && LON="0.00"
|
[[ $LON == "null" || $LON == "" ]] && LON="0.00"
|
||||||
|
|
||||||
UMAPG1PUB=$(${MY_PATH}/../tools/keygen "${UPLANETNAME}${LAT}" "${UPLANETNAME}${LON}")
|
UMAPG1PUB=$(${MY_PATH}/../tools/keygen "${UPLANETNAME}${LAT}" "${UPLANETNAME}${LON}")
|
||||||
|
|
||||||
SECTOR="_${LAT::-1}_${LON::-1}"
|
|
||||||
## CALCULATE UMAP TODATENS ################
|
## CALCULATE UMAP TODATENS ################
|
||||||
######################################
|
######################################
|
||||||
ipfs key rm "temp" >/dev/null 2>&1
|
ipfs key rm "temp" >/dev/null 2>&1
|
||||||
${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/todate.ipfskey "${TODATE}${UPLANETNAME}${LAT}" "${TODATE}${UPLANETNAME}${LON}"
|
${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/todate.ipfskey "${TODATE}${UPLANETNAME}${LAT}" "${TODATE}${UPLANETNAME}${LON}"
|
||||||
UMAPNS=$(ipfs key import "temp" -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/todate.ipfskey)
|
UMAPNS=$(ipfs key import "temp" -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/todate.ipfskey)
|
||||||
|
|
||||||
cat ~/.zen/tmp/${MOATS}/GPS.json | jq '.[0] + {"umap": "/ipns/_UMAPNS_"}' \
|
|
||||||
> ~/.zen/tmp/${MOATS}/GPStw.json \
|
|
||||||
&& mv ~/.zen/tmp/${MOATS}/GPStw.json ~/.zen/tmp/${MOATS}/GPS.json
|
|
||||||
sed -i "s~_UMAPNS_~${UMAPNS}~g" ~/.zen/tmp/${MOATS}/GPS.json
|
|
||||||
###################################### INJECT JSON
|
|
||||||
|
|
||||||
#~ cat ~/.zen/tmp/${MOATS}/GPS.json
|
|
||||||
echo "UMAP _${LAT}_${LON} UMAPNS=/ipns/${UMAPNS}"
|
echo "UMAP _${LAT}_${LON} UMAPNS=/ipns/${UMAPNS}"
|
||||||
|
|
||||||
|
SECTOR="_${LAT::-1}_${LON::-1}"
|
||||||
## CALCULATE SECTOR TODATENS ################
|
## CALCULATE SECTOR TODATENS ################
|
||||||
ipfs key rm "temp" >/dev/null 2>&1
|
ipfs key rm "temp" >/dev/null 2>&1
|
||||||
${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/sectodate.ipfskey "${TODATE}${UPLANETNAME}${SECTOR}" "${TODATE}${UPLANETNAME}${SECTOR}"
|
${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/sectodate.ipfskey "${TODATE}${UPLANETNAME}${SECTOR}" "${TODATE}${UPLANETNAME}${SECTOR}"
|
||||||
TODATESECTORNS=$(ipfs key import "temp" -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/sectodate.ipfskey)
|
TODATESECTORNS=$(ipfs key import "temp" -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/sectodate.ipfskey)
|
||||||
|
ipfs key rm "temp" >/dev/null 2>&1
|
||||||
cat ~/.zen/tmp/${MOATS}/GPS.json | jq '. + {"sectortw": "_SECTORTW_"}' \
|
#############################################
|
||||||
> ~/.zen/tmp/${MOATS}/GPSsec.json \
|
# MAKE TODATE "GPS" TIDDLER
|
||||||
&& mv ~/.zen/tmp/${MOATS}/GPSsec.json ~/.zen/tmp/${MOATS}/GPS.json
|
cat ${MY_PATH}/../templates/data/GPS.json \
|
||||||
sed -i "s~_SECTORTW_~/ipns/${TODATESECTORNS}/TW~g" ~/.zen/tmp/${MOATS}/GPS.json
|
| sed -e "s~_MOATS_~${MOATS}~g" \
|
||||||
###################################### INJECT JSON
|
-e "s~_PLAYER_~${PLAYER}~g" \
|
||||||
|
-e "s~_LAT_~${LAT}~g" \
|
||||||
|
-e "s~_LON_~${LON}~g" \
|
||||||
|
-e "s~_UMAPNS_~${UMAPNS}~g" \
|
||||||
|
-e "s~_SECTORTW_~/ipns/${TODATESECTORNS}/TW~g" \
|
||||||
|
> ~/.zen/tmp/${MOATS}/GPS.json
|
||||||
|
|
||||||
################# PERSONAL VDO.NINJA ADDRESS)
|
################# PERSONAL VDO.NINJA ADDRESS)
|
||||||
PHONEBOOTH=${PLAYER/@/_}
|
PHONEBOOTH=${PLAYER/@/_}
|
||||||
|
@ -263,8 +266,6 @@ for PLAYER in ${PLAYERONE[@]}; do
|
||||||
-e "s~_PHONEBOOTH_~${PHONEBOOTH}~g" \
|
-e "s~_PHONEBOOTH_~${PHONEBOOTH}~g" \
|
||||||
> ~/.zen/tmp/${MOATS}/VISIO.json
|
> ~/.zen/tmp/${MOATS}/VISIO.json
|
||||||
|
|
||||||
ipfs key rm "temp" >/dev/null 2>&1
|
|
||||||
|
|
||||||
## UPDATE PLAYER CACHE
|
## UPDATE PLAYER CACHE
|
||||||
echo "_${LAT}_${LON}" > ~/.zen/game/players/${PLAYER}/.umap
|
echo "_${LAT}_${LON}" > ~/.zen/game/players/${PLAYER}/.umap
|
||||||
cp ~/.zen/tmp/${MOATS}/GPS.json ~/.zen/game/players/${PLAYER}/
|
cp ~/.zen/tmp/${MOATS}/GPS.json ~/.zen/game/players/${PLAYER}/
|
||||||
|
|
|
@ -1,12 +1,13 @@
|
||||||
[
|
[
|
||||||
{
|
{
|
||||||
"created": "20231007123717877",
|
|
||||||
"text": "<$leafmap\ntileControl\ntile='sat'\nzoom='12'\nplaces='{\"point\":\"44.2301, 1.6518\"}'\n/>\n\n! <a target='_blank' href='/ipns/k51qzi5uqu5djg1gqzujq5p60w25mi235gdg0lgkk5qztkfrpi5c22oolrriyu/_index.html'>Visit UMap_44.2301_1.6518</a>\n\n!! UPlanet moves your data with you\n<<<\n''DO NOT CHANGE MANUALY''\n\n* \"PLUG/UNPLUG\" using ''AstroID''\n<<<\n",
|
|
||||||
"tags": "_PLAYER_",
|
|
||||||
"title": "GPS",
|
"title": "GPS",
|
||||||
"modified": "20231207180819081",
|
"created": "_MOATS_",
|
||||||
"lat": "44.2301",
|
"modified": "_MOATS_",
|
||||||
"lon": "1.6518",
|
"text": "<$leafmap\ntileControl\ntile='sat'\nzoom='12'\nplaces='{\"point\":\"_LAT_, _LON_\"}'\n/>\n\n! <a target='_blank' href='/ipns/_UMAPNS_/_index.html'>Visit UMap__LAT___LON_</a>\n\n!! UPlanet moves your data with you\n<<<\n''DO NOT CHANGE MANUALY''\n<<<\n",
|
||||||
"umap": "/ipns/k51qzi5uqu5djg1gqzujq5p60w25mi235gdg0lgkk5qztkfrpi5c22oolrriyu"
|
"tags": "_PLAYER_",
|
||||||
|
"lat": "_LAT_",
|
||||||
|
"lon": "_LON_",
|
||||||
|
"umap": "/ipns/_UMAPNS_",
|
||||||
|
"sectortw": "_SECTORTW_"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
"created": "_MOATS_",
|
"created": "_MOATS_",
|
||||||
"modified": "_MOATS_",
|
"modified": "_MOATS_",
|
||||||
"title": "_SECTOR_.NEWS",
|
"title": "_SECTOR_.NEWS",
|
||||||
"text": "\\procedure loadMyWiki()\n\\import [[$:/plugins/sq/ExternalContent/loadWikiActions]]\n<$transclude\n $variable=\"loadWikiActions\"\n wikiURL={{!!wikiURL}}\n contentFilter={{!!filter}}\n deserializer=\"text/html\"\n />\n\\end\n\n<details close=\"yes\">\n <summary>[[_SECTOR_.NEWS|_SECTOR_.NEWS]]</summary>\n <div>\n\n<$edit size=60 field=\"wikiURL\"/> ⬅︎ TW <br>\n<$edit size=50 field=\"filter\"/> ⬅︎ Filtration\n\n </div>\n</details>\n<$button actions=<<loadMyWiki>> > _SECTOR_ (⌐■_■) </$button> (<a target=\"_blank\" href={{{ [[/..]addsuffix{!!wikiURL}] }}} >TW</a>) \n<<hspace>>\n\n_UPLAYERSTIDS_ \n\n<<hspace>>\n\n<details open ><summary> (☓‿‿☓) </summary>\n<div class=\"sh-multicol\">\n <<list-links [is_volatile[yes]]>>\n</div>\n</details>\n\n<details open ><summary> (✜‿‿✜) </summary>\n<div class=\"sh-multicol\">\n <<list-links [externalTiddler[yes]!is_volatile[yes]]>>\n</div>",
|
"text": "\\procedure loadMyWiki()\n\\import [[$:/plugins/sq/ExternalContent/loadWikiActions]]\n<$transclude\n $variable=\"loadWikiActions\"\n wikiURL={{!!wikiURL}}\n contentFilter={{!!filter}}\n deserializer=\"text/html\"\n />\n\\end\n\n[[GPS|GPS]]\n\n<details close=\"yes\">\n <summary>[[_SECTOR_.NEWS|_SECTOR_.NEWS]]</summary>\n <div>\n\n<$edit size=60 field=\"wikiURL\"/> ⬅︎ TW <br>\n<$edit size=50 field=\"filter\"/> ⬅︎ Filtration\n\n </div>\n</details>\n<$button actions=<<loadMyWiki>> > (⌐■_■) </$button> (<a target=\"_blank\" href={{{ [[/..]addsuffix{!!wikiURL}] }}} >TW</a>) \n<<hspace>>\n\n_UPLAYERSTIDS_ \n\n<<hspace>>\n\n<details open ><summary> (☓‿‿☓) </summary>\n<div class=\"sh-multicol\">\n <<list-links [is_volatile[yes]]>>\n</div>\n</details>\n\n<details open ><summary> (✜‿‿✜) </summary>\n<div class=\"sh-multicol\">\n <<list-links [externalTiddler[yes]!is_volatile[yes]]>>\n</div>",
|
||||||
"tags": "load-external _SECTOR_ $:/tags/SideBar",
|
"tags": "load-external _SECTOR_ $:/tags/SideBar",
|
||||||
"filter": "[days[-7]!is[system]!tag[G1Voeu]]",
|
"filter": "[days[-7]!is[system]!tag[G1Voeu]]",
|
||||||
"caption": "_SECTOR_",
|
"caption": "_SECTOR_",
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
"created": "_MOATS_",
|
"created": "_MOATS_",
|
||||||
"modified": "_MOATS_",
|
"modified": "_MOATS_",
|
||||||
"title": "_UPPERFPLAYER_",
|
"title": "_UPPERFPLAYER_",
|
||||||
"text": "\\procedure loadMyWiki()\n\\import [[$:/plugins/sq/ExternalContent/loadWikiActions]]\n<$transclude\n $variable=\"loadWikiActions\"\n wikiURL={{!!wikiURL}}\n contentFilter={{!!filter}}\n deserializer=\"text/html\"\n />\n\\end\n\n<details close=\"yes\">\n<summary> [[_UPPERFPLAYER_|_UPPERFPLAYER_]] </summary>\n<div>\n\n<$edit size=56 field=\"wikiURL\"/> ⬅︎ TW <br>\n<$edit size=42 field=\"filter\"/> ⬅︎ Filtration\n\n<<hspace>>\n\n</div>\n</details>\n\n<$button actions=<<loadMyWiki>> > _UPPERFPLAYER_ (⌐■_■) </$button>\n\n<details open ><summary> (☓‿‿☓) </summary>\n<div class=\"sh-multicol\">\n<<list-links [is_volatile[yes]tag[_FPLAYER_]]>>\n</div>\n</details>\n\n<details open ><summary> (✜‿‿✜) </summary>\n<div class=\"sh-multicol\">\n<<list-links [externalTiddler[yes]!is_volatile[yes]tag[_FPLAYER_]]>>\n</div>\n</details>\n\n<$button class='tc-tiddlylink'>\n <$list filter='[tag[_FPLAYER_]]'>\n <$action-navigate $to=<<currentTiddler>> $scroll=no/>\n </$list>\n _FPLAYER_\n</$button>\n\n(<a target=\"_blank\" href={{{ [[/..]addsuffix{!!wikiURL}] }}} >TW</a>) ",
|
"text": "\\procedure loadMyWiki()\n\\import [[$:/plugins/sq/ExternalContent/loadWikiActions]]\n<$transclude\n $variable=\"loadWikiActions\"\n wikiURL={{!!wikiURL}}\n contentFilter={{!!filter}}\n deserializer=\"text/html\"\n />\n\\end\n\n<details close=\"yes\">\n<summary> [[_UPPERFPLAYER_|_UPPERFPLAYER_]] </summary>\n<div>\n\n<$edit size=56 field=\"wikiURL\"/> ⬅︎ TW <br>\n<$edit size=42 field=\"filter\"/> ⬅︎ Filtration\n\n<<hspace>>\n\n</div>\n</details>\n\n<$button actions=<<loadMyWiki>> > (⌐■_■) </$button>\n\n<details open ><summary> (☓‿‿☓) </summary>\n<div class=\"sh-multicol\">\n<<list-links [is_volatile[yes]tag[_FPLAYER_]]>>\n</div>\n</details>\n\n<details open ><summary> (✜‿‿✜) </summary>\n<div class=\"sh-multicol\">\n<<list-links [externalTiddler[yes]!is_volatile[yes]tag[_FPLAYER_]]>>\n</div>\n</details>\n\n<$button class='tc-tiddlylink'>\n <$list filter='[tag[_FPLAYER_]]'>\n <$action-navigate $to=<<currentTiddler>> $scroll=no/>\n </$list>\n _FPLAYER_\n</$button>\n\n(<a target=\"_blank\" href={{{ [[/..]addsuffix{!!wikiURL}] }}} >TW</a>) ",
|
||||||
"tags": "load-external _PLAYER_ ",
|
"tags": "load-external _PLAYER_ ",
|
||||||
"ihash": "_IHASH_",
|
"ihash": "_IHASH_",
|
||||||
"filter": "[days[-2]!is[system]!tag[G1Voeu]]",
|
"filter": "[days[-2]!is[system]!tag[G1Voeu]]",
|
||||||
|
|
Loading…
Reference in New Issue