https://github.com/open768/curiosity_browser/issues/117

open768 · Oct 10, 2024 · c25e57e · c25e57e
1 parent 55c1b68
commit c25e57e
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 11 deletions.
diff --git a/js/pages/solmosaic.js b/js/pages/solmosaic.js
@@ -68,17 +68,24 @@ class cSolMosaic {
 	static onMosaicResponse(poHttp) {
 		var oDiv = cJquery.element(cSolMosaicPageConstants.MOSAIC_ID)
 		oDiv.empty()
-		oDiv.append('i Got something')
-	}
 
-	static onClickMosaicButton() {
-		const oParams = {}
-		{
-			oParams[cSpaceUrlParams.SOL] = this.current_sol
-			oParams[cSpaceUrlParams.MISSION] = cMission.ID
+		const oData = poHttp.response
+		if (oData.mos == null) {
+			oDiv.append(cRender.messagebox('unable to create highlight'))
+			return
 		}
-		const sUrl = cBrowser.buildUrl('solmosaic.php', oParams)
-		cBrowser.openWindow(sUrl, 'solmosaic')
+
+		const sImgUrl = cBrowser.buildUrl(cAppLocations.mosaicer, oData)
+		const oImg = $('<img>', { src: sImgUrl, class: 'image' })
+		const oThis = this
+		oImg.click(() => oThis.onClickMosaic(oData))
+		oDiv.append(oImg)
+	}
+
+	//***************************************************************
+	static onClickMosaic(poData) {
+		const sUrl = cBrowser.buildUrl('solhigh.php', { s: poData[cSpaceUrlParams.SOL] })
+		cBrowser.openWindow(sUrl, 'index')
 	}
 
 	//***************************************************************

diff --git a/php/app-config/app-config.php b/php/app-config/app-config.php
@@ -67,6 +67,7 @@ class cAppLocations {
     static $cropper = null;
     static $images = null;
     static $appconfig = null;
+    static $mosaicer = null;
 
     static function init() {
         global $home;
@@ -76,6 +77,7 @@ static function init() {
         self::$thumbnailer = cAppGlobals::$jsThumbNailer;
         self::$images = cAppGlobals::$jsImages;
         self::$cropper = cAppGlobals::$jsCropper;
+        self::$mosaicer = cAppGlobals::$jsMosaicer;
         self::$appconfig = "$home/php/app-config/app-config.php";
     }
 }

diff --git a/php/images/mosaicer.php b/php/images/mosaicer.php
@@ -0,0 +1,15 @@
+<?php
+$home = "../..";
+require_once "$home/php/fragments/app-common.php";
+require_once  cAppGlobals::$ckPhpInc . "/image.php";
+
+$sKey = cHeader::get(cAppUrlParams::MOSAIC_PARAM, true);
+try {
+    $oBlob = cMosaicer::get($sKey);
+    $sMime = $oBlob->mime_type;
+
+    header("Content-Type: $sMime");
+    echo $oBlob->blob;
+} catch (Exception $e) {
+    cHeader::redirect(cAppLocations::$images . "/browser/nothumb.png");
+}
diff --git a/php/rest/solmosaic.php b/php/rest/solmosaic.php
@@ -25,13 +25,15 @@
 $sSol = cHeader::get(cSpaceUrlParams::SOL, true, true);
 $sMission = cHeader::get(cSpaceUrlParams::MISSION, true);
 $oResult = cSpaceImageMosaic::get_sol_high_mosaic($sSol);
-
+$sKey = null;
+if ($oResult !== null) $sKey = $oResult->key;
+cDebug::vardump($oResult);
 
 //############################### response ####################
 include cAppGlobals::$appPhpFragments . "/rest_header.php";
 $aOut = []; {
     $aOut[cSpaceUrlParams::SOL] = $sSol;
     $aOut[cSpaceUrlParams::MISSION] = $sMission;
-    $aOut[cAppUrlParams::MOSAIC_PARAM] = $oResult->key;
+    $aOut[cAppUrlParams::MOSAIC_PARAM] = $sKey;
 }
 cCommon::write_json((object)$aOut);