Zone debug

API/ZONE.sh

@@ -62,31 +62,28 @@ LON="${WHAT}"
 LAT=$(makecoord ${LAT})
 LON=$(makecoord ${LON})
 JSON="ZONE_${LAT}_${LON}_${DEG}.json"
+$(${MY_PATH}/../tools/getUMAP_ENV.sh "${LAT}" "${LON}" | tail -n 1)
+echo "UMAPG1PUB=$UMAPG1PUB UMAPIPNS=$UMAPIPNS SECTORG1PUB=$SECTORG1PUB SECTORIPNS=$SECTORIPNS REGIONG1PUB=$REGIONG1PUB REGIONIPNS=$REGIONIPNS LAT=$LAT LON=$LON SLAT=$SLAT SLON=$SLON RLAT=$RLAT RLON=$RLON"
 
     ## SECTOR LEVEL
     if [[ ${DEG} == "0.01" ]]; then
-        SLAT="${LAT::-1}"
-        SLON="${LON::-1}"
+        LAT=${SLAT}
+        LON=${SLON}
         SECTOR="_${SLAT}_${SLON}"
         echo "SECTOR = ${SECTOR}"
-        ZONEINDEX="/ipns/"$(cat ~/.zen/tmp/swarm/*/UPLANET/__/_*_*/_*.?_*.?/_${SLAT}*_${SLON}*/SECTORNS | tail -n 1)
-        [[ ! $ZONEINDEX ]] && ZONEINDEX="/ipns/"$(cat ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_*_*/_*.?_*.?/_${SLAT}*_${SLON}*/SECTORNS | tail -n 1)
-        ZONEG1PUB=$(cat ~/.zen/tmp/swarm/*/UPLANET/__/_*_*/_*.?_*.?/_${SLAT}*_${SLON}*/SECTORG1PUB | tail -n 1)
-        [[ ! $ZONEG1PUB ]] && ZONEG1PUB=$(cat ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_*_*/_*.?_*.?/_${SLAT}*_${SLON}*/SECTORG1PUB | tail -n 1)
+        ZONEINDEX=$SECTORIPNS
+        ZONEG1PUB=$SECTORG1PUB
         JSON="ZONE${SECTOR}_${DEG}.json"
-
     fi
 
     ## REGION & ABOVE LEVEL
     if [[ ${DEG} == "0.1" ||  ${DEG} == "1" ]]; then
-        RLAT="$(echo ${LAT} | cut -d '.' -f 1)"
-        RLON="$(echo ${LON} | cut -d '.' -f 1)"
+        LAT=${RLAT}
+        LON=${RLON}
         REGION="_${RLAT}_${RLON}"
         echo "REGION = ${REGION}"
-        ZONEINDEX="/ipns/"$(cat ~/.zen/tmp/swarm/*/UPLANET/__/_*_*/_*.?_*.?/_${RLAT}*_${RLON}*/REGIONNS | tail -n 1)
-        [[ ! $ZONEINDEX ]] && ZONEINDEX="/ipns/"$(cat ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_*_*/_*.?_*.?/_${RLAT}*_${RLON}*/REGIONNS | tail -n 1)
-        ZONEG1PUB=$(cat ~/.zen/tmp/swarm/*/UPLANET/__/_*_*/_*.?_*.?/_${RLAT}*_${RLON}*/REGIONG1PUB | tail -n 1)
-        [[ ! $ZONEG1PUB ]] && ZONEG1PUB=$(cat ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_*_*/_*.?_*.?/_${RLAT}*_${RLON}*/REGIONG1PUB | tail -n 1)
+        ZONEINDEX=$REGIONIPNS
+        ZONEG1PUB=$REGIONG1PUB
         JSON="ZONE${REGION}_${DEG}.json"
 
     fi

templates/UPlanetZine/style.css

@@ -109,9 +109,9 @@ figcaption {
     padding: 10px;
     border-left: 4px solid #741b47;
     border-bottom: 4px solid #741b47;
-    
+
   }
-  
+
   .zine-page {
     margin-top: 10px;
   }
@@ -121,30 +121,30 @@ figcaption {
 
 @media print {
 
-  
+
   body {
-    font-size: 69%;
+    font-size: 66%;
   }
-  
+
   a {
     color: inherit;
     text-decoration: none;
   }
- 
+
   .mini-img {
     max-width: 4.4rem;
   }
-  
+
   /* The styles below here are specifically for creating the page layout.
    * -> DON'T CHANGE THESE <- unless you know what you're doing!
    */
-  
+
   @page {
     size: landscape;
     margin: 0;
     bleed: 0;
   }
-  
+
   .zine {
     width: 100vw;
     height: 100vh;
@@ -201,4 +201,4 @@ figcaption {
   .page-8 {
     grid-area: page-8;
   }
-}
+}

tools/getUMAP_ENV.sh

@@ -14,8 +14,8 @@ LON="$2"
 ZLAT=$(makecoord ${LAT})
 ZLON=$(makecoord ${LON})
 ## CHECK
-[[ "$ZLAT" != "$LAT" ]] && echo "# ERROR - $LAT bad format -" && exit 1
-[[ "$ZLON" != "$LON" ]] && echo "# ERROR - $LON bad format -" && exit 1
+[[ "$ZLAT" != "$LAT" || "$LAT" == "" ]] && echo "# ERROR - $LAT bad format -" && exit 1
+[[ "$ZLON" != "$LON" || "$LON" == "" ]] && echo "# ERROR - $LON bad format -" && exit 1
 
 ## COMPUTE UMAP, USECTOR, UREGION
 SLAT="${LAT::-1}"