SECTOR better 32.34 just remove last char => 32.1 1st decimal only

This commit is contained in:
fred 2024-03-11 17:59:36 +01:00
parent ff35d8c5cb
commit 2a61784d3c
11 changed files with 25 additions and 25 deletions

View File

@ -71,8 +71,8 @@ echo "${THEDATE}"
## SECTOR LEVEL ## SECTOR LEVEL
if [[ ${DEG} == "0.01" ]]; then if [[ ${DEG} == "0.01" ]]; then
SECLAT="${LAT::-1}" SECLAT="${LAT%.*}.1"
SECLON="${LON::-1}" SECLON="${LON%.*}.1"
SECTOR="_${SECLAT}_${SECLON}" SECTOR="_${SECLAT}_${SECLON}"
echo "SECTOR = ${SECTOR}" echo "SECTOR = ${SECTOR}"
ZONEG1PUB=$(${MY_PATH}/../tools/keygen -t duniter "${UPLANETNAME}${SECTOR}" "${UPLANETNAME}${SECTOR}") ZONEG1PUB=$(${MY_PATH}/../tools/keygen -t duniter "${UPLANETNAME}${SECTOR}" "${UPLANETNAME}${SECTOR}")

View File

@ -201,7 +201,7 @@ for PLAYER in ${PLAYERONE[@]}; do
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"
SECTOR="_${LAT::-1}_${LON::-1}" SECTOR="_${LAT%.*}.1_${LON%.*}.1"
## UMAP TODATENS ################ ## UMAP TODATENS ################
ipfs key rm "temp" >/dev/null 2>&1 ipfs key rm "temp" >/dev/null 2>&1
@ -522,8 +522,8 @@ for PLAYER in ${PLAYERONE[@]}; do
################################################# #################################################
if [[ ${LAT} && ${LON} ]]; then if [[ ${LAT} && ${LON} ]]; then
## SECTOR BANK COORD ## SECTOR BANK COORD
SECLAT="${LAT::-1}" SECLAT="${LAT%.*}.1"
SECLON="${LON::-1}" SECLON="${LON%.*}.1"
## REGION ## REGION
REGLAT=$(echo ${LAT} | cut -d '.' -f 1) REGLAT=$(echo ${LAT} | cut -d '.' -f 1)
REGLON=$(echo ${LON} | cut -d '.' -f 1) REGLON=$(echo ${LON} | cut -d '.' -f 1)

View File

@ -30,7 +30,9 @@ mkdir -p ~/.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)
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"
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"
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
@ -42,8 +44,8 @@ mkdir -p ~/.zen/tmp/${MOATS}
############################################################## ##############################################################
# UMAPG1PUB=$(${MY_PATH}/keygen -t duniter "${UPLANETNAME}${LAT}" "${UPLANETNAME}${LON}") # UMAPG1PUB=$(${MY_PATH}/keygen -t duniter "${UPLANETNAME}${LAT}" "${UPLANETNAME}${LON}")
############################################################## ##############################################################
SECLAT="${LAT::-1}" SECLAT="${LAT%.*}.1"
SECLON="${LON::-1}" SECLON="${LON%.*}.1"
SECTOR="_${SECLAT}_${SECLON}" SECTOR="_${SECLAT}_${SECLON}"
############################################################## ##############################################################
SECTORG1PUB=$(${MY_PATH}/../tools/keygen -t duniter "${UPLANETNAME}${SECTOR}" "${UPLANETNAME}${SECTOR}") SECTORG1PUB=$(${MY_PATH}/../tools/keygen -t duniter "${UPLANETNAME}${SECTOR}" "${UPLANETNAME}${SECTOR}")

View File

@ -45,8 +45,8 @@ for UMAP in ${UMAPS[@]}; do
[[ ${LAT} == "" || ${LON} == "" ]] && echo ">> ERROR BAD ${LAT} ${LON}" && continue [[ ${LAT} == "" || ${LON} == "" ]] && echo ">> ERROR BAD ${LAT} ${LON}" && continue
[[ ${LAT} == "null" || ${LON} == "null" ]] && echo ">> ERROR BAD ${LAT} ${LON}" && continue [[ ${LAT} == "null" || ${LON} == "null" ]] && echo ">> ERROR BAD ${LAT} ${LON}" && continue
SECLAT="${LAT::-1}" SECLAT="${LAT%.*}.1"
SECLON="${LON::-1}" SECLON="${LON%.*}.1"
MYSECTORS=("_${SECLAT}_${SECLON}" ${MYSECTORS[@]}) MYSECTORS=("_${SECLAT}_${SECLON}" ${MYSECTORS[@]})

View File

@ -57,8 +57,8 @@ for UMAP in ${unique_combined[@]}; do
[[ ${LAT} == "null" || ${LON} == "null" ]] && echo ">> ERROR BAD ${LAT} ${LON}" && continue [[ ${LAT} == "null" || ${LON} == "null" ]] && echo ">> ERROR BAD ${LAT} ${LON}" && continue
## SECTOR BANK COORD ## SECTOR BANK COORD
SECLAT="${LAT::-1}" SECLAT="${LAT%.*}.1"
SECLON="${LON::-1}" SECLON="${LON%.*}.1"
## REGION ## REGION
REGLAT=$(echo ${LAT} | cut -d '.' -f 1) REGLAT=$(echo ${LAT} | cut -d '.' -f 1)
REGLON=$(echo ${LON} | cut -d '.' -f 1) REGLON=$(echo ${LON} | cut -d '.' -f 1)
@ -193,8 +193,8 @@ for UMAP in ${unique_combined[@]}; do
# %%%%%%%%%% ################################################## # %%%%%%%%%% ##################################################
## SECTOR LINKING >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>${SLAT}_${SLON} ## SECTOR LINKING >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>${SLAT}_${SLON}
# %%%%%%%%%% ################################################## # %%%%%%%%%% ##################################################
SLAT="${LAT::-1}" SLAT="${LAT%.*}.1"
SLON="${LON::-1}" SLON="${LON%.*}.1"
SECTOR="_${SLAT}_${SLON}" SECTOR="_${SLAT}_${SLON}"
echo "SECTOR ${SECTOR}" echo "SECTOR ${SECTOR}"
############################################################## "${UPLANETNAME}${LAT}" "${UPLANETNAME}${LON}" ############################################################## "${UPLANETNAME}${LAT}" "${UPLANETNAME}${LON}"
@ -386,8 +386,8 @@ for UMAP in ${unique_combined[@]}; do
echo "JSON UMAP WORLD READY /ipfs/${IAMAP}/world.js" echo "JSON UMAP WORLD READY /ipfs/${IAMAP}/world.js"
########################################################################################### ###########################################################################################
### APPLY ON APP MODEL ### APPLY ON APP MODEL
SECLAT="${LAT::-1}" SECLAT="${LAT%.*}.1"
SECLON="${LON::-1}" SECLON="${LON%.*}.1"
SECTOR="_${SECLAT}_${SECLON}" SECTOR="_${SECLAT}_${SECLON}"
TODATESECTORNS=$(${MY_PATH}/../tools/keygen -t ipfs "${TODATE}${UPLANETNAME}${SECTOR}" "${TODATE}${UPLANETNAME}${SECTOR}") TODATESECTORNS=$(${MY_PATH}/../tools/keygen -t ipfs "${TODATE}${UPLANETNAME}${SECTOR}" "${TODATE}${UPLANETNAME}${SECTOR}")

View File

@ -294,7 +294,7 @@ sed -i "s~ipfs.copylaradio.com~$myTUBE~g" ~/.zen/game/players/${PLAYER}/ipfs/moa
[[ ! ${LAT} ]] && LAT="0.00" [[ ! ${LAT} ]] && LAT="0.00"
[[ ! ${LON} ]] && LON="0.00" [[ ! ${LON} ]] && LON="0.00"
SECTOR="_${LAT::-1}_${LON::-1}" ### SECTOR = 0.1° Planet Slice in MadeInZion Tiddler SECTOR="_${LAT%.*}.1_${LON%.*}.1" ### SECTOR = 0.1° Planet Slice in MadeInZion Tiddler
echo "UPlanet 0.1° SECTOR : ${SECTOR}" echo "UPlanet 0.1° SECTOR : ${SECTOR}"
sed -i "s~_SECTOR_~${SECTOR}~g" ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html sed -i "s~_SECTOR_~${SECTOR}~g" ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html
@ -340,8 +340,8 @@ if [[ "${MACHINEPUB}" != "" ]]; then
${MY_PATH}/../tools/natools.py encrypt \ ${MY_PATH}/../tools/natools.py encrypt \
-p ${MACHINEPUB} \ -p ${MACHINEPUB} \
-i $HOME/.zen/game/players/${PLAYER}/secret.june \ -i $HOME/.zen/game/players/${PLAYER}/secret.june \
-o $HOME/.zen/tmp/${MOATS}/secret.dunikey.${G1PUB}.enc -o $HOME/.zen/tmp/${MOATS}/secret.june.${G1PUB}.enc
ENCODING=$(cat ~/.zen/tmp/${MOATS}/bafybeiewwxkmiojbskcqhbj2gbkde3czkeqftn6fgvwoa7ez5n5whido3qsecret.dunikey.$G1PUB.enc | base16) ENCODING=$(cat ~/.zen/tmp/${MOATS}/secret.june.$G1PUB.enc | base16)
sed -i "s~${OLD16}~${ENCODING}~g" ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html sed -i "s~${OLD16}~${ENCODING}~g" ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html
echo "ENCODING: ${ENCODING}" echo "ENCODING: ${ENCODING}"
@ -603,7 +603,7 @@ do
done <"$asciiart" done <"$asciiart"
echo " echo "
<h2> <--> 0.1 SECTOR : <a href='${EARTHCID}/map_render.html?southWestLat=${LAT::-1}&southWestLon=${LON::-1}&deg=0.1'>${SECTOR}</a> <--> </h2> <h2> <--> 0.1 SECTOR : <a href='${EARTHCID}/map_render.html?southWestLat=${LAT%.*}.1&southWestLon=${LON%.*}.1&deg=0.1'>${SECTOR}</a> <--> </h2>
<br>PRINT & KEEP SAFE <a href='${myIPFS}/ipns/${ASTRONAUTENS}#AstroID'>AstroID<br><img width=120px src='${myIPFSGW}${ASTROQR}'\></a> <br>PRINT & KEEP SAFE <a href='${myIPFS}/ipns/${ASTRONAUTENS}#AstroID'>AstroID<br><img width=120px src='${myIPFSGW}${ASTROQR}'\></a>
<br>SECRET1=$SALT<br>SECRET2=$PEPPER<br>($PASS)<br> <br>SECRET1=$SALT<br>SECRET2=$PEPPER<br>($PASS)<br>
<h3>ASTROPORT : <a href='${myIPFS}/ipns/${IPFSNODEID}'>/ipns/${IPFSNODEID}</a></h3> <h3>ASTROPORT : <a href='${myIPFS}/ipns/${IPFSNODEID}'>/ipns/${IPFSNODEID}</a></h3>

View File

@ -304,8 +304,8 @@ if [[ ${wishnumbers} -gt 0 ]]; then
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
SECLAT="${LAT::-1}" SECLAT="${LAT%.*}.1"
SECLON="${LON::-1}" SECLON="${LON%.*}.1"
SECTOR="_${SECLAT}_${SECLON}" SECTOR="_${SECLAT}_${SECLON}"
############################################################## ##############################################################
UMAPG1PUB=$(${MY_PATH}/../tools/keygen -t duniter "${UPLANETNAME}${LAT}" "${UPLANETNAME}${LON}") UMAPG1PUB=$(${MY_PATH}/../tools/keygen -t duniter "${UPLANETNAME}${LAT}" "${UPLANETNAME}${LON}")

View File

@ -32,8 +32,8 @@ LAT=$(echo ${UMAP} | cut -d '_' -f 2)
LON=$(echo ${UMAP} | cut -d '_' -f 3) LON=$(echo ${UMAP} | cut -d '_' -f 3)
## SECTOR COORD ## SECTOR COORD
SECLAT="${LAT::-1}" SECLAT="${LAT%.*}.1"
SECLON="${LON::-1}" SECLON="${LON%.*}.1"
SECTOR="_${SECLAT}_${SECLON}" SECTOR="_${SECLAT}_${SECLON}"

View File

@ -1 +0,0 @@
ici

View File

@ -1 +0,0 @@
dedab23fbf01dc62a9b5d894aa696486dc0fe362

View File