diff --git a/README.md b/README.md index fb9be1da..3189bb6f 100644 --- a/README.md +++ b/README.md @@ -366,19 +366,19 @@ GET /?player=${PLAYER}&moa=json&tag=G1CopierYoutube check available "logo.png" in [./images](./images) ## ➤ UPLANET : Create Umap, AstroID & ZenCard for PLAYER (email) -### ```/?uplanet=${PLAYER}&salt=${LAT}&pepper=${LON}&g1pub=${PASS}``` +### ```/?uplanet=${PLAYER}&zlat=${LAT}&zlon=${LON}&g1pub=${PASS}``` | Parameter | Type | Description | | :-------- | :------- | :-------------------------------- | | `uplanet` | `email` | **Required** Your EMAIL token | -| `salt` | `decimal` | **Required** LATITUDE with 2 decimals digits | -| `pepper` | `decimal` | **Required** LONGITUDE with 2 decimals digits | +| `zlat` | `decimal` | **Required** LATITUDE with 2 decimals digits | +| `zlon` | `decimal` | **Required** LONGITUDE with 2 decimals digits | | `g1pub` | `string` | **Facultative** choose Umap AstroID PASS | Create à Umap key (LAT/LON), then a PLAYER TW with GPS as Umap IPNS reference This API is used by OSM2IPFS code. -UPlanet Entrance : https://qo-op.com +* [UPlanet Entrance](https://qo-op.com) ### ➤ QRCODE (API SandBox) ```http diff --git a/RUNTIME/REGION.refresh.sh b/RUNTIME/REGION.refresh.sh index 7b28585d..75da4832 100755 --- a/RUNTIME/REGION.refresh.sh +++ b/RUNTIME/REGION.refresh.sh @@ -83,7 +83,7 @@ for REGION in ${REGIONS[@]}; do TODATEREGIONNS=$(ipfs key import ${TODATE}${REGIONG1PUB} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/REGION.priv) ############################################################## ## GET from IPNS - ipfs --timeout 180s get -o ~/.zen/tmp/${MOATS}/${REGION}/ /ipns/${REGIONNS}/ + ipfs --timeout 180s get -o ~/.zen/tmp/${MOATS}/${REGION}/ /ipns/${YESTERDATEREGIONNS}/ # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> mkdir -p ~/.zen/tmp/${MOATS}/${REGION}/RSS diff --git a/RUNTIME/SECTOR.refresh.sh b/RUNTIME/SECTOR.refresh.sh index 484dd633..0d04e977 100755 --- a/RUNTIME/SECTOR.refresh.sh +++ b/RUNTIME/SECTOR.refresh.sh @@ -87,7 +87,7 @@ for SECTOR in ${SECTORS[@]}; do # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> start=`date +%s` # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> - #~ ## IPFS GET ONLINE SECTORNS + #~ ## IPFS GET ONLINE YESTERDATE SECTORNS ipfs --timeout 180s get -o ~/.zen/tmp/${MOATS}/${SECTOR}/ /ipns/${YESTERDATENS}/ # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> end=`date +%s` @@ -299,7 +299,7 @@ echo "${TODATE && IPFSPOP=$(ipfs add -rwq ~/.zen/tmp/${MOATS}/${SECTOR}/* | tail -n 1) && echo "ROOT was ${ZCHAIN}" ###################################################### - echo "% START PUBLISHING ${SECTOR} ${myIPFS}/ipns/${SECTORNS}" + echo "% START PUBLISHING ${SECTOR} ${myIPFS}/ipns/${TODATENS}" start=`date +%s` ipfs name publish -k ${TODATE}${G1PUB} /ipfs/${IPFSPOP} ipfs key rm ${TODATE}${G1PUB} ${YESYERDATE}${G1PUB} ${G1PUB} > /dev/null 2>&1 diff --git a/RUNTIME/UPLANET.refresh.sh b/RUNTIME/UPLANET.refresh.sh index 6afd729e..e532a004 100755 --- a/RUNTIME/UPLANET.refresh.sh +++ b/RUNTIME/UPLANET.refresh.sh @@ -180,7 +180,7 @@ echo "" > ~/ COINS=$($MY_PATH/../tools/COINScheck.sh ${SECTORG1PUB} | tail -n 1) echo "SECTOR : ${SECTOR} (${COINS} G1) WALLET : ${SECTORG1PUB}" - ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/${SECTOR}.priv "${UPLANETNAME}${SECTOR}" "${UPLANETNAME}${SECTOR}" + ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/${SECTOR}.priv "${TODATE}${UPLANETNAME}${SECTOR}" "${TODATE}${UPLANETNAME}${SECTOR}" ipfs key rm ${SECTORG1PUB} > /dev/null 2>&1 ## AVOID ERROR ON IMPORT SECTORNS=$(ipfs key import ${SECTORG1PUB} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/${SECTOR}.priv) ipfs key rm ${SECTORG1PUB} @@ -201,13 +201,13 @@ echo "" > ~/ COINS=$($MY_PATH/../tools/COINScheck.sh ${REGIONG1PUB} | tail -n 1) echo "REGION : ${REGION} (${COINS} G1) WALLET : ${REGIONG1PUB}" - ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/REGION.priv "${UPLANETNAME}${REGION}" "${UPLANETNAME}${REGION}" + ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/REGION.priv "${TODATE}${UPLANETNAME}${REGION}" "${TODATE}${UPLANETNAME}${REGION}" ipfs key rm ${REGIONG1PUB} > /dev/null 2>&1 ## AVOID ERROR ON IMPORT - REGIONNS=$(ipfs key import ${REGIONG1PUB} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/REGION.priv) + TODATEREGIONNS=$(ipfs key import ${REGIONG1PUB} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/REGION.priv) ipfs key rm ${REGIONG1PUB} ############################################################## mkdir -p ~/.zen/tmp/${MOATS}/${UMAP}/${RLAT}_${RLON} - echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/${RLAT}_${RLON}/index.html + echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/${RLAT}_${RLON}/index.html # %%%%%%%%%% ################################################## ## COLLECT RSS FROM ALL PLAYERS WITH SAME UMAP IN SWARM MEMORY /UPLANET/__/_*_*/_*.?_*.?/_*.??_*.?? @@ -232,8 +232,8 @@ echo "" > ~/ ################################## ## OSM2IPFS ### UMAP = 0.01° Planet Slice - UMAPGEN="${EARTHCID}/Umap.html?southWestLat=${LAT}&southWestLon=${LON}°=0.01&ipns=${UMAPNS}/_index.html" - USATGEN="${EARTHCID}/Usat.html?southWestLat=${LAT}&southWestLon=${LON}°=0.01&ipns=${UMAPNS}/_index.html" + UMAPGEN="${EARTHCID}/Umap.html?southWestLat=${LAT}&southWestLon=${LON}°=0.01&ipns=${TODATENS}/_index.html" + USATGEN="${EARTHCID}/Usat.html?southWestLat=${LAT}&southWestLon=${LON}°=0.01&ipns=${TODATENS}/_index.html" echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/Umap.html echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/Usat.html diff --git a/WWW/favicon.groceliande.png b/WWW/favicon.groceliande.png new file mode 100644 index 00000000..0e47a3fd Binary files /dev/null and b/WWW/favicon.groceliande.png differ diff --git a/templates/UPlanetSector/index.html b/templates/UPlanetSector/index.html index b43cbffb..08886cfd 100644 --- a/templates/UPlanetSector/index.html +++ b/templates/UPlanetSector/index.html @@ -161,7 +161,7 @@ iframe { | _ | | - ( ) + ( ) ( ° - °)📺 |        diff --git a/templates/UPlanetUmap/index.html b/templates/UPlanetUmap/index.html index bbfd8b1a..0bad1946 100644 --- a/templates/UPlanetUmap/index.html +++ b/templates/UPlanetUmap/index.html @@ -155,7 +155,7 @@ iframe { | ♥ (° - ° )📺 | - ( ) + ( )