From ea1d10354bfecf2a3fa0b035122e82826971ad79 Mon Sep 17 00:00:00 2001 From: fred Date: Mon, 6 Nov 2023 21:04:17 +0100 Subject: [PATCH] Sector map_render & OSM2IPFS/earth update --- RUNTIME/REGION.refresh.sh | 4 ++-- RUNTIME/UPLANET.refresh.sh | 12 ++++++------ adventure/rooms/meteofrance.sh | 5 +++-- templates/register.html | 4 ++-- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/RUNTIME/REGION.refresh.sh b/RUNTIME/REGION.refresh.sh index 3f041c0e..5584edcb 100755 --- a/RUNTIME/REGION.refresh.sh +++ b/RUNTIME/REGION.refresh.sh @@ -44,8 +44,8 @@ REGIONNS=$(ipfs key import ${REGIONG1PUB} -f pem-pkcs8-cleartext ~/.zen/tmp/${MO mkdir -p ~/.zen/tmp/${MOATS}/${UMAP}/${REGION} echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/${REGION}/index.html -REGIONMAPGEN="/ipfs/QmReVMqhMNcKWijAUVmj3EDmHQNfztVUT413m641eV237z/Umap.html?southWestLat=${CLAT}&southWestLon=${CLON}°=1&ipns=${REGIONNS}" -REGIONSATGEN="/ipfs/QmReVMqhMNcKWijAUVmj3EDmHQNfztVUT413m641eV237z/Usat.html?southWestLat=${CLAT}&southWestLon=${CLON}°=1&ipns=${REGIONNS}" +REGIONMAPGEN="/ipfs/QmWRfn9wszPzCmo7VHxc5f6tTJmAnLUrBiygsjjnU99HA2/Umap.html?southWestLat=${CLAT}&southWestLon=${CLON}°=1&ipns=${REGIONNS}" +REGIONSATGEN="/ipfs/QmWRfn9wszPzCmo7VHxc5f6tTJmAnLUrBiygsjjnU99HA2/Usat.html?southWestLat=${CLAT}&southWestLon=${CLON}°=1&ipns=${REGIONNS}" echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/REGION${REGION}.Map.html echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/REGION${REGION}.Sat.html diff --git a/RUNTIME/UPLANET.refresh.sh b/RUNTIME/UPLANET.refresh.sh index fe484b8b..93ee4635 100755 --- a/RUNTIME/UPLANET.refresh.sh +++ b/RUNTIME/UPLANET.refresh.sh @@ -156,8 +156,8 @@ mkdir ~/.zen/tmp/${MOATS} mkdir -p ~/.zen/tmp/${MOATS}/${UMAP}/${SLAT}_${SLON} echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/${SLAT}_${SLON}/index.html - SECTORMAPGEN="/ipfs/QmReVMqhMNcKWijAUVmj3EDmHQNfztVUT413m641eV237z/Umap.html?southWestLat=${SLAT}&southWestLon=${SLON}°=1&ipns=${SECTORNS}" - SECTORSATGEN="/ipfs/QmReVMqhMNcKWijAUVmj3EDmHQNfztVUT413m641eV237z/Usat.html?southWestLat=${SLAT}&southWestLon=${SLON}°=1&ipns=${SECTORNS}" + SECTORMAPGEN="/ipfs/QmWRfn9wszPzCmo7VHxc5f6tTJmAnLUrBiygsjjnU99HA2/map_render.html?southWestLat=${SLAT}&southWestLon=${SLON}°=0.1&ipns=${SECTORNS}" + SECTORSATGEN="/ipfs/QmWRfn9wszPzCmo7VHxc5f6tTJmAnLUrBiygsjjnU99HA2/sat_render.html?southWestLat=${SLAT}&southWestLon=${SLON}°=0.1&ipns=${SECTORNS}" echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/${SLAT}_${SLON}.SECTOR.Map.html echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/${SLAT}_${SLON}.SECTOR.Sat.html @@ -180,8 +180,8 @@ mkdir ~/.zen/tmp/${MOATS} mkdir -p ~/.zen/tmp/${MOATS}/${UMAP}/${CLAT}_${CLON} echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/${CLAT}_${CLON}/index.html - REGIONMAPGEN="/ipfs/QmReVMqhMNcKWijAUVmj3EDmHQNfztVUT413m641eV237z/Umap.html?southWestLat=${CLAT}&southWestLon=${CLON}°=1&ipns=${REGIONNS}" - REGIONSATGEN="/ipfs/QmReVMqhMNcKWijAUVmj3EDmHQNfztVUT413m641eV237z/Usat.html?southWestLat=${CLAT}&southWestLon=${CLON}°=1&ipns=${REGIONNS}" + REGIONMAPGEN="/ipfs/QmWRfn9wszPzCmo7VHxc5f6tTJmAnLUrBiygsjjnU99HA2/map_render.html?southWestLat=${CLAT}&southWestLon=${CLON}°=1&ipns=${REGIONNS}" + REGIONSATGEN="/ipfs/QmWRfn9wszPzCmo7VHxc5f6tTJmAnLUrBiygsjjnU99HA2/sat_render.html?southWestLat=${CLAT}&southWestLon=${CLON}°=1&ipns=${REGIONNS}" echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/${CLAT}_${CLON}.REGION.Map.html echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/${CLAT}_${CLON}.REGION.Sat.html @@ -204,8 +204,8 @@ mkdir ~/.zen/tmp/${MOATS} ################################## ## OSM2IPFS ### UMAP = 0.01° Planet Slice - UMAPGEN="/ipfs/QmReVMqhMNcKWijAUVmj3EDmHQNfztVUT413m641eV237z/Umap.html?southWestLat=${LAT}&southWestLon=${LON}°=0.01&ipns=${UMAPNS}" - USATGEN="/ipfs/QmReVMqhMNcKWijAUVmj3EDmHQNfztVUT413m641eV237z/Usat.html?southWestLat=${LAT}&southWestLon=${LON}°=0.01&ipns=${UMAPNS}" + UMAPGEN="/ipfs/QmWRfn9wszPzCmo7VHxc5f6tTJmAnLUrBiygsjjnU99HA2/Umap.html?southWestLat=${LAT}&southWestLon=${LON}°=0.01&ipns=${UMAPNS}" + USATGEN="/ipfs/QmWRfn9wszPzCmo7VHxc5f6tTJmAnLUrBiygsjjnU99HA2/Usat.html?southWestLat=${LAT}&southWestLon=${LON}°=0.01&ipns=${UMAPNS}" echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/Umap.html echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/Usat.html diff --git a/adventure/rooms/meteofrance.sh b/adventure/rooms/meteofrance.sh index 7aaaaec9..4ee66a3e 100755 --- a/adventure/rooms/meteofrance.sh +++ b/adventure/rooms/meteofrance.sh @@ -17,9 +17,12 @@ rm -f ~/.zen/adventure/meteo.anim.eu/meteo.png curl -m 20 --output ~/.zen/adventure/meteo.anim.eu/meteo.png https://s.w-x.co/staticmaps/wu/wu/satir1200_cur/europ/animate.png if [[ ! -f ~/.zen/adventure/meteo.anim.eu/meteo.png ]]; then + echo "Impossible de vous connecter au service meteo" exit 1 + else + echo "NEED HTML TEMPLATING" echo "Mise à jour archive points meteo : $ts" echo $ts > ~/.zen/adventure/meteo.anim.eu/.ts @@ -40,7 +43,5 @@ else IPFS=$(ipfs add -Rw ~/.zen/adventure/meteo.anim.eu/) echo $IPFS > ~/.zen/adventure/meteo.anim.eu/.chain - - fi diff --git a/templates/register.html b/templates/register.html index 297214ae..b031315a 100644 --- a/templates/register.html +++ b/templates/register.html @@ -210,9 +210,9 @@ document.addEventListener('DOMContentLoaded', function() { var latMAP = (parseFloat(latElement.value) - 0.05).toFixed(2); // Subtract 0.05 from latElement var lonMAP = (parseFloat(lonElement.value) - 0.05).toFixed(2); // Subtract 0.05 from lonElement - const satURL = `http://127.0.0.1:8080/ipfs/QmReVMqhMNcKWijAUVmj3EDmHQNfztVUT413m641eV237z/sat_render.html?southWestLat=${latMAP}&southWestLon=${lonMAP}°=0.1`; + const satURL = `http://127.0.0.1:8080/ipfs/QmWRfn9wszPzCmo7VHxc5f6tTJmAnLUrBiygsjjnU99HA2/sat_render.html?southWestLat=${latMAP}&southWestLon=${lonMAP}°=0.1`; document.getElementById("satLink").href = satURL; - const mapURL = `http://127.0.0.1:8080/ipfs/QmReVMqhMNcKWijAUVmj3EDmHQNfztVUT413m641eV237z/map_render.html?southWestLat=${latMAP}&southWestLon=${lonMAP}°=0.1`; + const mapURL = `http://127.0.0.1:8080/ipfs/QmWRfn9wszPzCmo7VHxc5f6tTJmAnLUrBiygsjjnU99HA2/map_render.html?southWestLat=${latMAP}&southWestLon=${lonMAP}°=0.1`; document.getElementById("mapLink").href = mapURL; document.getElementById("LAT").innerHTML = latElement.value ;