diff --git a/API/QRCODE.sh b/API/QRCODE.sh
index 053fa861..4642c357 100755
--- a/API/QRCODE.sh
+++ b/API/QRCODE.sh
@@ -688,6 +688,7 @@ fi
################################################################################
## QRCODE = IPNS or G1PUB ? Can be ASTRONAUTENS or G1PUB format
+QRCODE="${QRCODE%%:*}" ## TRIM :ZEN :ChK
################################################################################
## QRCODE IS IPNS FORMAT : CHANGE .current AND MAKE G1BILLETS
ASTROPATH=$(grep -r $QRCODE ~/.zen/game/players/*/ipfs/moa | tail -n 1 | cut -d ':' -f 1 | rev | cut -d '/' -f 2- | rev 2>/dev/null)
@@ -696,9 +697,9 @@ if [[ ${ASTROPATH} != "" && $APPNAME == "" ]]; then
PLAYER=$(echo ${ASTROPATH} | rev | cut -d '/' -f 3 | rev)
- rm ~/.zen/game/players/.current
- ln -s ~/.zen/game/players/${PLAYER} ~/.zen/game/players/.current
- echo "LINKING ${PLAYER} to .current"
+ #~ rm ~/.zen/game/players/.current
+ #~ ln -s ~/.zen/game/players/${PLAYER} ~/.zen/game/players/.current
+ #~ echo "LINKING ${PLAYER} to .current"
#### SELECT PARRAIN "G1PalPay"
echo "#>>>>>>>>>>>> # REDIRECT TO CREATE ZENCARD"
diff --git a/API/ZONE.sh b/API/ZONE.sh
index 10f9a7e2..fcc7109e 100755
--- a/API/ZONE.sh
+++ b/API/ZONE.sh
@@ -8,7 +8,7 @@
## Used by OSM2IPFS map_render.html & other UPlanet Client App
# ?zone=DEG&ulat=LAT&ulon=LON
## Search for TW numbers in received zone
-# =
+# = json
################################################################################
MY_PATH="`dirname \"$0\"`" # relative
MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized
@@ -30,25 +30,74 @@ PORT="$1" THAT="$2" AND="$3" THIS="$4" APPNAME="$5" WHAT="$6" OBJ="$7" VAL="$8"
### transfer variables according to script
HTTPCORS="HTTP/1.1 200 OK
-Access-Control-Allow-Origin: ${myASTROPORT}
+Access-Control-Allow-Origin: *
Access-Control-Allow-Credentials: true
Access-Control-Allow-Methods: GET
Server: Astroport.ONE
Content-Type: text/html; charset=UTF-8
"
+
function urldecode() { : "${*//+/ }"; echo -e "${_//%/\\x}"; }
## CHECK FOR NOT PUBLISHING ALREADY (AVOID IPNS CRUSH)
alreadypublishing=$(ps axf --sort=+utime | grep -w 'ipfs name publish --key=' | grep -v -E 'color=auto|grep' | tail -n 1 | cut -d " " -f 1)
if [[ ${alreadypublishing} ]]; then
- echo "$HTTPCORS ERROR - (╥☁╥ ) - IPFS ALREADY PUBLISHING RETRY LATER" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &
+ echo "$HTTPCORS {[error: ALREADY IPNS ERROR]}" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &
exit 1
fi
## START MANAGING UPLANET LAT/LON & PLAYER
mkdir -p ~/.zen/tmp/${MOATS}/
+# GET RECEPTION : zone=0.001&ulat=0.02&ulon=0.01
+DEG=${THAT}
+[[ -z $DEG ]] && DEG=1
+# DEG=$(echo "$DEG * 10" | bc -l )
+LAT=${THIS}
+[[ -z $LAT ]] && LAT=0.00
+LON=${WHAT}
+[[ -z $LON ]] && LON=0.00
+echo '{ "gridNumbers": [ {"lat": '${LAT}', "lon": '${LON}', "number": SCAN}] }'
+
+echo "${HTTPCORS}" > ~/.zen/tmp/${MOATS}.http
+sed -i "s~text/html~application/json~g" ~/.zen/tmp/${MOATS}.http
+echo '{ "gridNumbers": [' >> ~/.zen/tmp/${MOATS}.http
+for i in $(seq 0 9);
+do
+ ZLAT=$(echo "$LAT + $DEG * $i" | bc -l)
+ # [[ ! $(echo $ZLAT | grep "\." ) ]] && ZLAT="${ZLAT}."
+ for j in $(seq 0 9); do
+ ZLON=$(echo "$LON + $DEG * $j" | bc -l)
+ # [[ ! $(echo $ZLON | grep "\." ) ]] && ZLON="${ZLON}."
+ ## SEARCH HOW MUCH TW
+ twnum=$(ls -d ~/.zen/tmp/swarm/*/UPLANET/_${ZLAT}*_${ZLON}*/TW/* 2>/dev/null | wc -l )
+ [[ $twnum -gt 0 ]] && echo '{"lat": '${ZLAT}', "lon": '${ZLON}', "number": '${twnum}'}
+ ,' >> ~/.zen/tmp/${MOATS}.http && echo "$DEG ~/.zen/tmp/swarm/*/UPLANET/_${ZLAT}*_${ZLON}*/TW/* = $twnum"
+
+ done
+done
+
+sed -i '$ d' ~/.zen/tmp/${MOATS}.http ## REMOVE LAST ','
+
+echo ']}' >> ~/.zen/tmp/${MOATS}.http
+
+cat ~/.zen/tmp/${MOATS}.http | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &
+
+
+# PRODUCE A JSON COUNTING PLAYERS TW IN EACH UMAP
+# UPLANET OCCUPANCY LIST
+#~ {
+ #~ "gridNumbers": [
+ #~ {"lat": 0.05, "lon": 0.05, "number": 1},
+ #~ {"lat": 0.05, "lon": 0.15, "number": 2},
+ #~ {"lat": 0.15, "lon": 0.05, "number": 3},
+ #~ {"lat": 0.15, "lon": 0.15, "number": 4},
+ #~ // Add more grid cells with their corresponding latitude, longitude, and number
+ #~ ]
+#~ }
rm -Rf ~/.zen/tmp/${MOATS}/
+end=`date +%s`
+echo "(ZONE) Operation time was "`expr $end - $start` seconds.
exit 0
diff --git a/templates/register.html b/templates/register.html
index 31a8f5c8..5a93e8c4 100644
--- a/templates/register.html
+++ b/templates/register.html
@@ -153,14 +153,14 @@ a:active{
-(...+-+ [[ € == Ẑ ]] +-+...)
-
- - Libre Crypto Grid -
+
Astroport.ONE
Welkom - Mirë se vini - Willkommen - Welkomma - Welcome - Marhaban - Bari galoust - Xos gelmissiniz - Welkum - Ongi etorri- Swagata - Ansuf yiswen - ščyra zaprašajem - Kyo tzo pa eit - ॐ★ॐ - Ani kié - Dobro došli - Dagemer mat - Dobre doshŭl - Benvinguts - Ulihebisdi - ௐ- Huān yíng - Karibu - Eoso eoseyo - Benvenuti - Bel bonjou - Bienvini - Dobrodošli - Velkommen - Bienvenido - Bonvenon - Tere tulemast - Gabitê - Vælkomin - Tervetuloa - Welkom - Wìllkòmme - Binvignut - Fàilte - Benvido - Croeso - Planvenguda - Mikouabô - Kalos irthate - Eguahé porá - Baroukh habaim - ﷽
+
+(...+-+ [[ € == Ẑ ]] +-+...)