diff --git a/css/style_selection.css b/css/style_selection.css index 9c3b280..acde786 100644 --- a/css/style_selection.css +++ b/css/style_selection.css @@ -1,3 +1,72 @@ -.drop-selection { +.block-products-comparison .map { + width: 100%; + margin: auto; + border: 2px solid #c8c7c7; +} +.block-products-comparison .map:-moz-full-screen { + height: 100%; +} +.block-products-comparison .map:-webkit-full-screen { + height: 100%; +} +.block-products-comparison .map:-ms-fullscreen { + height: 100%; +} +.block-products-comparison .map:fullscreen { + height: 100%; +} +.block-products-comparison .drop-selection { height: 30px !important; + display: inline !important; + margin-right: auto; + margin-left: auto; +} + +.block-products-comparison .table, th, td, tr { + border: 1px solid #c8c7c7; +} +.block-products-comparison #info { + height: 1px; + width: 1px; + z-index: 100; + left: 200px; + top: 100px; +} +.block-products-comparison .popover { + max-width: unset; + left: 200px; + top: 100px; +} +.block-products-comparison .popover table tr td { + padding: 0 2px 0 2px; +} +.block-products-comparison .popover.top { + left:10px; +} +.block-products-comparison .popover.top .arrow{ + display: none; +} + +.block-products-comparison #swipe::-moz-range-thumb { + align: center; + width: 15px; + height: 15px; + border-radius: 50%; + background: #81b6da; + border-color: #000; + border-width: 1px; + cursor: pointer; +} +.block-products-comparison .ol-mouse-position { + top: 95%; + left: 2%; +} + +.block-products-comparison .ol-full-screen { + right: .5em; + bottom: auto; + top: .5em; + left: auto; } + + diff --git a/includes/.select_options.inc.swp b/includes/.select_options.inc.swp deleted file mode 100644 index 9a7908d..0000000 Binary files a/includes/.select_options.inc.swp and /dev/null differ diff --git a/includes/global_functions.inc b/includes/global_functions.inc deleted file mode 100644 index 72f2d1a..0000000 --- a/includes/global_functions.inc +++ /dev/null @@ -1,52 +0,0 @@ - $daysmonth) { - $day = $daysmonth; - } - - return array($year,$month,$day); -} - -function monthnum2monthstr($monnum) { - - $monthnames = array("january","february","march","april","may","june", - "july","august","september","october","november","december"); - - if ($monnum < 1 || $monnum > 12) { - return "NA"; - } - else { - return $monthnames[$monnum-1]; - } -} diff --git a/includes/global_variables.inc b/includes/global_variables.inc index d51f33d..aaa09aa 100644 --- a/includes/global_variables.inc +++ b/includes/global_variables.inc @@ -1,6 +1,6 @@ "MSIL1C", - "S2B" => "MSIL1C" +$layers_array = array("true_color_vegetation", + "false_color_vegetation", + "false_color_glacier" ); +$layersN_array = array("True Color Vegetation", + "False Color Vegetation", + "False Color Glacier" + ); + $tiles_array = Array ( "None", "T25WEQ","T25WER","T25WES","T25WET","T25WEU","T25WEV","T25WFQ","T25WFR","T25WFS","T25WFT","T25WFU","T25WFV","T25XEA","T25XEB","T25XEC","T25XED","T25XEE","T25XEF","T25XEG","T25XEH","T25XEJ","T25XEK","T25XEL","T25XEM","T25XEN","T25XFA","T26VNR","T26VPR","T26WMA","T26WMB","T26WMC","T26WMD","T26WME","T26WMV","T26WNA","T26WNB","T26WNC","T26WND","T26WNE","T26WNS","T26WNT","T26WNU","T26WNV","T26WPA","T26WPB","T26WPC","T26WPD","T26WPE","T26WPS","T26WPT","T26WPU","T26WPV","T26XMF","T26XMG","T26XMH","T26XMJ","T26XMK","T26XML","T26XMM","T26XMN","T26XMP","T26XMQ","T26XMR","T26XNF","T26XNG","T26XNH","T26XNJ","T26XNK","T26XNL","T26XNM","T26XNN","T26XNP","T26XNQ","T26XNR","T26XNS","T26XNT","T26XPF","T27VUL","T27VVK","T27VVL","T27VWK","T27VWL","T27VXK","T27VXL","T27WVM","T27WVN","T27WVP","T27WVQ","T27WVR","T27WVS","T27WVT","T27WVU","T27WVV","T27WWM","T27WWN","T27WWP","T27WWQ","T27WWR","T27WWS","T27WWT","T27WWU","T27WWV","T27WXM","T27WXN","T27WXP","T27WXQ","T27WXR","T27WXS","T27WXT","T27WXU","T27WXV","T27XVA","T27XVB","T27XVC","T27XVD","T27XVE","T27XVF","T27XVG","T27XVH","T27XVJ","T27XVK","T27XVL","T27XWA","T27XWB","T27XWC","T27XWD","T27XWE","T27XWF","T27XWG","T27XWH","T27XWJ","T27XWK","T27XWL","T27XWM","T27XWN","T27XXA","T28VCP","T28VCQ","T28VCR","T28VDJ","T28VDK","T28VDP","T28VDQ","T28VDR","T28VEJ","T28VEK","T28VEP","T28VEQ","T28VER","T28VFJ","T28VFK","T28VFL","T28VFM","T28VFP","T28VFQ","T28VFR","T28WDA","T28WDB","T28WDC","T28WDD","T28WDE","T28WDS","T28WDT","T28WDU","T28WDV","T28WEC","T28WED","T28WEE","T28WES","T28WET","T28WEU","T28WEV","T28WFC","T28WFD","T28WFE","T28WFS","T28WFT","T28WFU","T28XDF","T28XDG","T28XDH","T28XDJ","T28XDK","T28XDL","T28XDM","T28XDN","T28XDP","T28XDQ","T28XDR","T28XEF","T28XEG","T28XEH","T28XEJ","T28XEK","T28XEL","T28XEM","T28XEN","T28XEP","T28XEQ","T28XER","T28XES","T28XFF","T29VLC","T29VLD","T29VLE","T29VLF","T29VLG","T29VLH","T29VLJ","T29VLK","T29VLL","T29VMC","T29VMD","T29VME","T29VMF","T29VMG","T29VMH","T29VMJ","T29VMK","T29VML","T29VNC","T29VND","T29VNE","T29VNF","T29VNG","T29VNH","T29VNJ","T29VNK","T29VNL","T29VPC","T29VPD","T29VPE","T29VPF","T29VPG","T29VPH","T29VPJ","T29VPK","T29WMM","T29WMN","T29WMP","T29WMT","T29WMU","T29WMV","T29WNM","T29WNN","T29WNT","T29WNU","T29WNV","T29WPS","T29WPT","T29WPU","T29XMA","T29XMB","T29XMC","T29XMD","T29XME","T29XMF","T29XMG","T29XMH","T29XMJ","T29XMK","T29XML","T29XNA","T29XNB","T29XND","T29XNE","T29XNF","T29XNG","T29XNH","T29XNJ","T29XNK","T29XNL","T30VUH","T30VUJ","T30VUK","T30VUL","T30VUM","T30VUN","T30VUP","T30VUQ","T30VVH","T30VVJ","T30VVK","T30VVL","T30VVM","T30VVN","T30VVP","T30VVQ","T30VWH","T30VWJ","T30VWK","T30VWL","T30VWM","T30VWN","T30VWP","T30VWQ","T30VWR","T30VXH","T30VXJ","T30VXK","T30VXL","T30VXM","T30VXN","T30VXP","T30VXQ","T30VXR","T30WVB","T30WVC","T30WVD","T30WWB","T30WWC","T30WWD","T30WWS","T30WXS","T30XVM","T30XVN","T30XVP","T30XVQ","T30XVR","T30XWN","T30XWP","T30XWQ","T30XWR","T30XWS","T31VCC","T31VCD","T31VCE","T31VCF","T31VCG","T31VCH","T31VCJ","T31VCK","T31VCL","T31VDC","T31VDD","T31VDE","T31VDF","T31VDG","T31VDH","T31VDJ","T31VDK","T31VDL","T31VEC","T31VED","T31VEE","T31VEF","T31VEG","T31VEH","T31VEJ","T31VEK","T31VEL","T31VFC","T31VFL","T31WDM","T31WDN","T31WDP","T31WEM","T31WEN","T31WEP","T31WEQ","T31WER","T31WES","T31WFM","T31WFN","T31WFP","T31WFQ","T31WFR","T31WFS","T31WFT","T31WFU","T31WGV","T31XDD","T31XDE","T31XDF","T31XDG","T31XDH","T31XDJ","T31XDK","T31XDL","T31XED","T31XEE","T31XEF","T31XEG","T31XEH","T31XEJ","T31XEK","T31XEL","T31XEM","T31XEN","T31XFD","T31XFE","T31XFF","T31XFG","T31XFH","T31XFJ","T31XFK","T31XFL","T32VKJ","T32VKK","T32VKL","T32VKM","T32VKN","T32VKP","T32VKQ","T32VKR","T32VLH","T32VLJ","T32VLK","T32VLL","T32VLM","T32VLN","T32VLP","T32VLQ","T32VLR","T32VMH","T32VMJ","T32VMK","T32VML","T32VMM","T32VMN","T32VMP","T32VMQ","T32VMR","T32VNH","T32VNJ","T32VNK","T32VNL","T32VNM","T32VNN","T32VNP","T32VNQ","T32VNR","T32VPH","T32VPJ","T32VPK","T32VPL","T32VPM","T32VPN","T32VPP","T32VPQ","T32VPR","T32WMA","T32WMB","T32WMC","T32WMD","T32WMS","T32WMT","T32WMU","T32WMV","T32WNA","T32WNB","T32WNC","T32WND","T32WNE","T32WNS","T32WNT","T32WNU","T32WNV","T32WPA","T32WPB","T32WPC","T32WPD","T32WPE","T32WPS","T32WPT","T32WPU","T32WPV","T33VUC","T33VUD","T33VUE","T33VUF","T33VUG","T33VUH","T33VUJ","T33VUK","T33VUL","T33VVC","T33VVD","T33VVE","T33VVF","T33VVG","T33VVH","T33VVJ","T33VVK","T33VVL","T33VWC","T33VWD","T33VWE","T33VWF","T33VWG","T33VWH","T33VWJ","T33VWK","T33VWL","T33VXC","T33VXD","T33VXE","T33VXF","T33VXG","T33VXH","T33VXJ","T33VXK","T33VXL","T33WUV","T33WVM","T33WVN","T33WVP","T33WVQ","T33WVR","T33WVS","T33WVT","T33WVU","T33WVV","T33WWM","T33WWN","T33WWP","T33WWQ","T33WWR","T33WWS","T33WWT","T33WWU","T33WWV","T33WXM","T33WXN","T33WXP","T33WXQ","T33WXR","T33WXS","T33WXT","T33WXU","T33WXV","T33WYV","T33XUC","T33XUD","T33XUE","T33XUF","T33XVA","T33XVB","T33XVC","T33XVD","T33XVE","T33XVF","T33XVG","T33XVH","T33XVJ","T33XVK","T33XVL","T33XVM","T33XVN","T33XWA","T33XWB","T33XWC","T33XWD","T33XWE","T33XWF","T33XWG","T33XWH","T33XWJ","T33XWK","T33XWL","T33XWM","T33XWN","T33XXA","T33XXB","T33XXC","T33XXD","T33XXE","T33XXF","T33XXG","T33XXH","T33XXJ","T33XXK","T33XXL","T33XYA","T34VCH","T34VCJ","T34VCK","T34VCL","T34VCM","T34VCN","T34VCP","T34VCQ","T34VCR","T34VDH","T34VDJ","T34VDK","T34VDL","T34VDM","T34VDN","T34VDP","T34VDQ","T34VDR","T34VEH","T34VEJ","T34VEK","T34VEL","T34VEM","T34VEN","T34VEP","T34VEQ","T34VER","T34VFH","T34VFJ","T34VFK","T34VFL","T34VFM","T34VFN","T34VFP","T34VFQ","T34VFR","T34WDA","T34WDB","T34WDC","T34WDD","T34WDS","T34WDT","T34WDU","T34WDV","T34WEA","T34WEB","T34WEC","T34WED","T34WEE","T34WES","T34WET","T34WEU","T34WEV","T34WFA","T34WFB","T34WFC","T34WFD","T34WFE","T34WFS","T34WFT","T34WFU","T34WFV","T35VLC","T35VLD","T35VLE","T35VLF","T35VLG","T35VLH","T35VLJ","T35VLK","T35VLL","T35VMC","T35VMD","T35VME","T35VMF","T35VMG","T35VMH","T35VMJ","T35VMK","T35VML","T35VNC","T35VND","T35VNE","T35VNF","T35VNG","T35VNH","T35VNJ","T35VNK","T35VNL","T35VPC","T35VPD","T35VPE","T35VPF","T35VPG","T35VPH","T35VPJ","T35VPK","T35VPL","T35WLV","T35WMM","T35WMN","T35WMP","T35WMQ","T35WMR","T35WMS","T35WMT","T35WMU","T35WMV","T35WNM","T35WNN","T35WNP","T35WNQ","T35WNR","T35WNS","T35WNT","T35WNU","T35WNV","T35WPM","T35WPN","T35WPP","T35WPQ","T35WPR","T35WPS","T35WPT","T35WPU","T35WPV","T35WQV","T35XLA","T35XLB","T35XLC","T35XLD","T35XLE","T35XLF","T35XMA","T35XMB","T35XMC","T35XMD","T35XME","T35XMF","T35XMG","T35XMH","T35XMJ","T35XMK","T35XML","T35XMM","T35XMN","T35XNA","T35XNB","T35XNC","T35XND","T35XNE","T35XNF","T35XNG","T35XNH","T35XNJ","T35XNK","T35XNL","T35XNM","T35XPC","T35XPD","T35XPE","T35XPF","T35XPG","T35XPH","T35XPJ","T35XPK","T35XPL","T35XQA","T36VUH","T36VUJ","T36VUK","T36VUL","T36VUM","T36VUN","T36VUP","T36VUQ","T36VUR","T36VVH","T36VVJ","T36VVK","T36VVL","T36VVM","T36VVN","T36VVP","T36VVQ","T36VVR","T36VWH","T36VWJ","T36VWK","T36VWL","T36VWM","T36VWN","T36VWP","T36VWQ","T36VWR","T36VXJ","T36VXK","T36VXL","T36VXM","T36VXN","T36VXP","T36VXQ","T36VXR","T36WVA","T36WVB","T36WVC","T36WVD","T36WVS","T36WVT","T36WVU","T36WVV","T36WWA","T36WWB","T36WWC","T36WWD","T36WWE","T36WWS","T36WWT","T36WWU","T36WWV","T36WXA","T36WXB","T36WXC","T36WXD","T36WXE","T36WXS","T36WXT","T36WXU","T36WXV","T37VCD","T37VCE","T37VCF","T37VCG","T37VCH","T37VCJ","T37VCK","T37VCL","T37VDD","T37VDE","T37VDF","T37VDG","T37VDH","T37VDJ","T37VDK","T37VDL","T37VED","T37VEE","T37VEF","T37VEG","T37VEH","T37VEJ","T37VEK","T37VEL","T37VFD","T37VFE","T37VFF","T37VFG","T37VFH","T37VFJ","T37VFK","T37VFL","T37WCV","T37WDM","T37WDN","T37WDP","T37WDQ","T37WDR","T37WDS","T37WDT","T37WDU","T37WDV","T37WEM","T37WEN","T37WEP","T37WEQ","T37WER","T37WES","T37WET","T37WEU","T37WEV","T37WFM","T37WFN","T37WFP","T37WFQ","T37WFR","T37WFS","T37WFT","T37WFU","T37WFV","T37XCA","T37XCD","T37XCE","T37XCF","T37XDA","T37XDD","T37XDE","T37XDF","T37XDG","T37XDH","T37XDJ","T37XDK","T37XDL","T37XDM","T37XEE","T37XEF","T37XEG","T37XEH","T37XEJ","T37XEK","T37XEL","T37XEM","T37XEN","T37XFA","T38KLU","T38VLJ","T38VLK","T38VLL","T38VLM","T38VLN","T38VLP","T38VLQ","T38VLR","T38VMJ","T38VMK","T38VML","T38VMM","T38VMN","T38VMP","T38VMQ","T38VMR","T38VNJ","T38VNK","T38VNL","T38VNM","T38VNN","T38VNP","T38VNQ","T38VNR","T38VPJ","T38VPK","T38VPL","T38VPM","T38VPN","T38VPP","T38VPQ","T38VPR","T38WMA","T38WMB","T38WMC","T38WMD","T38WME","T38WMS","T38WMT","T38WMU","T38WMV","T38WNA","T38WNB","T38WNC","T38WND","T38WNE","T38WNS","T38WNT","T38WNU","T38WNV","T38WPA","T38WPB","T38WPC","T38WPD","T38WPE","T38WPS","T38WPT","T38WPU","T38WPV","T38XMF","T38XMG","T38XMH","T38XMK","T38XML","T38XMM","T38XMN","T38XMP","T38XMQ","T38XMR","T38XNF","T38XNG","T38XNH","T38XNJ","T38XNK","T38XNL","T38XNM","T38XNN","T38XNP","T38XNQ","T38XNR","T38XNS","T38XNT","T38XPF","T39VUD","T39VUE","T39VUF","T39VUG","T39VUH","T39VUJ","T39VUK","T39VUL","T39VVD","T39VVE","T39VVF","T39VVG","T39VVH","T39VVJ","T39VVK","T39VVL","T39VWD","T39VWE","T39VWF","T39VWG","T39VWH","T39VWJ","T39VWK","T39VWL","T39VXD","T39VXE","T39VXF","T39VXG","T39VXH","T39VXJ","T39VXK","T39VXL","T39WVM","T39WVN","T39WVP","T39WVQ","T39WVR","T39WVS","T39WVT","T39WVU","T39WVV","T39WWM","T39WWN","T39WWP","T39WWQ","T39WWR","T39WWS","T39WWT","T39WWU","T39WWV","T39WXM","T39WXN","T39WXP","T39WXQ","T39WXR","T39WXS","T39WXT","T39WXU","T39WXV","T39XVA","T39XVB","T39XVC","T39XVD","T39XVE","T39XVF","T39XVG","T39XVH","T39XVJ","T39XVK","T39XVL","T39XWA","T39XWB","T39XWC","T39XWD","T39XWE","T39XWF","T39XWG","T39XWH","T39XWJ","T39XWK","T39XWL","T39XWM","T39XXA","T40VCJ","T40VCK","T40VCL","T40VCM","T40VCN","T40VCP","T40VCQ","T40VCR","T40VDJ","T40VDK","T40VDL","T40VDM","T40VDN","T40VDP","T40VDQ","T40VDR","T40VEJ","T40VEK","T40VEL","T40VEM","T40VEN","T40VEP","T40VEQ","T40VER","T40VFJ","T40VFK","T40VFL","T40VFM","T40VFN","T40VFP","T40VFQ","T40VFR","T40WDA","T40WDB","T40WDC","T40WDD","T40WDE","T40WDS","T40WDT","T40WDU","T40WDV","T40WEA","T40WEB","T40WEC","T40WED","T40WEE","T40WES","T40WET","T40WEU","T40WEV","T40WFA","T40WFB","T40WFC","T40WFD","T40WFE","T40WFS","T40WFT","T40WFU","T40WFV","T40XDF","T40XDG","T40XDH","T40XDJ","T40XDK","T40XDL","T40XDM","T40XDN","T40XDP","T40XDQ","T40XDR","T40XEF","T40XEG","T40XEH","T40XEJ","T40XEK","T40XEL","T40XEM","T40XEN","T40XEP","T40XEQ","T40XER","T40XES","T40XET","T40XFF","T41VLD","T41VLE","T41VLF","T41VLG","T41VLH","T41VLJ","T41VLK","T41VLL","T41VMD","T41VME","T41VMF","T41VMG","T41VMH","T41VMJ","T41VMK","T41VML","T41VND","T41VNE","T41VNF","T41VNG","T41VNH","T41VNJ","T41VNK","T41VNL","T41VPD","T41VPE","T41VPF","T41VPG","T41VPJ","T41VPK","T41VPL","T41WMM","T41WMN","T41WMP","T41WMQ","T41WMR","T41WMS","T41WMT","T41WMU","T41WMV","T41WNM","T41WNN","T41WNP","T41WNQ","T41WNR","T41WNS","T41WNT","T41WNU","T41WNV","T41WPM","T41WPN","T41WPP","T41WPQ","T41WPR","T41WPS","T41WPT","T41WPU","T41WPV","T41XMA","T41XMB","T41XMC","T41XMD","T41XME","T41XMF","T41XMG","T41XMH","T41XMJ","T41XMK","T41XML","T41XNA","T41XNB","T41XNC","T41XND","T41XNE","T41XNF","T41XNG","T41XNH","T41XNJ","T41XNK","T41XNL","T41XNM","T41XPA","T42VUJ","T42VUK","T42VUL","T42VUM","T42VUN","T42VUP","T42VUQ","T42VUR","T42VVJ","T42VVK","T42VVL","T42VVM","T42VVN","T42VVP","T42VVQ","T42VVR","T42VWJ","T42VWK","T42VWL","T42VWM","T42VWN","T42VWP","T42VWQ","T42VWR","T42VXJ","T42VXK","T42VXL","T42VXM","T42VXN","T42VXP","T42VXQ","T42VXR","T42WVA","T42WVB","T42WVC","T42WVD","T42WVE","T42WVS","T42WVT","T42WVU","T42WVV","T42WWA","T42WWB","T42WWC","T42WWD","T42WWE","T42WWS","T42WWT","T42WWU","T42WWV","T42WXA","T42WXB","T42WXC","T42WXD","T42WXE","T42WXS","T42WXT","T42WXU","T42WXV","T42XVF","T42XVG","T42XVH","T42XVJ","T42XVK","T42XVL","T42XVM","T42XVN","T42XVP","T42XVQ","T42XVR","T42XWF","T42XWG","T42XWH","T42XWJ","T42XWK","T42XWL","T42XWM","T42XWN","T42XWP","T42XWQ","T42XWR","T42XWS","T42XWT","T42XXF","T43VCD","T43VCE","T43VCF","T43VCG","T43VCH","T43VCJ","T43VCK","T43VCL","T43XDA","T43XDB","T43XDC","T43XDD","T43XDE","T43XDF","T43XDG","T43XDH","T43XDJ","T43XDK","T43XDL","T47UNA","T50LQP" diff --git a/includes/select_options.inc b/includes/select_options.inc index 74e75fa..3581f01 100644 --- a/includes/select_options.inc +++ b/includes/select_options.inc @@ -1,15 +1,16 @@ \n"; // $output .= "Select a tile and the date from the available lists. Move the slider to compare the products\n"; $output .= ""; +======= + $output .= "
"; +>>>>>>> tiles $output .= ""; $output .= ""; + $output .= ""; + $output .= ""; $output .= ""; $output .= ""; #set up the tile selection + $output .= "\n"; $output .= ""; + - #set up the year selection + #set up the time selection for pr1 $output .= ""; + #set up the composite/band selection for pr1 + $output .= ""; $output .= ""; $output .= ""; - #set up the year selection $output .= ""; + #set up the composite/band selection + $output .= ""; $output .= ""; if ($pr1 !== 'None' && $pr2 !== 'None'){ $output .= ""; +<<<<<<< HEAD $output .= ""; $output .= ""; } - $output .= "
"; $output .= "Tile"; @@ -17,12 +18,17 @@ function select_image($scr_name,$pr1,$pr2,$prinfo,$tile,$action,$tiles_array) { $output .= ""; $output .= "Date - Time"; $output .= ""; + $output .= "Composites"; + $output .= "
"; - $output .= "Select a Tile: \n"; for ($p=0;$p\n"; @@ -34,17 +40,21 @@ function select_image($scr_name,$pr1,$pr2,$prinfo,$tile,$action,$tiles_array) { $output .= "
"; $output .= "\n"; $output .= "		"; - $output .= "First Product: \n"; + //$output .= "\n"; $output .= ""; + $output .= "\n"; + for ($p=0;$p".$layersN_array[$p]."\n"; + } + else { + $output .= "\n"; + } + } + $output .= "\n"; + $output .= "
"; - $output .= "Second Product: \n"; + //$output .= "\n"; $output .= ""; + $output .= "\n"; + for ($p=0;$p".$layersN_array[$p]."\n"; + } + else { + $output .= "\n"; + } + } + $output .= "\n"; + $output .= "
"; $output .= "You are comparing Sentinel-2 products:
"; $output .= $pr1."
".$pr2; +======= + $output .= "		"; + if ($pr1 == $pr2){ + $output .= "You are comparing the same Sentinel-2 product:
"; + $output .= $pr1; + }else{ + $output .= "You are comparing Sentinel-2 products:
"; + $output .= $pr1."
".$pr2; + } +>>>>>>> tiles $output .= "
"; - $output .= "\n"; + $output .= "\n"; + $output .= ""; return [$output,$address1,$address2,$latlon1,$latlon2]; } diff --git a/products_comparison.module b/products_comparison.module index 2cb792e..169108e 100644 --- a/products_comparison.module +++ b/products_comparison.module @@ -5,6 +5,7 @@ require_once 'includes/select_options.inc'; function products_comparison_init(){ $mpath = drupal_get_path('module', 'products_comparison'); drupal_add_js($mpath . '/js/comparison_slider.js'); + drupal_add_css($mpath . '/css/style_selection.css'); } @@ -28,11 +29,13 @@ function products_comparison_block_view($delta='') { function products_comparison_main_content(){ - global $platforms, $firstyears_array, $tiles_array, $fname_postf, $fname_sensor; + global $platforms, $firstyears_array, $tiles_array, $layers_array, $layersN_array; global $datadir, $datadir2; global $defyear; global $base_url; global $metsis_conf; + + $site_name = variable_get('site_name', 'Default'); // $scr_name = $base_url ."/comparison"; // @@ -55,17 +58,30 @@ function products_comparison_main_content(){ $pr2 = "None"; } + if(isset($_GET["layer1"])){ + $layer1 = $_GET["layer1"]; + }else{ + $layer1 = $layers_array[0]; + } + + if(isset($_GET["layer2"])){ + $layer2 = $_GET["layer2"]; + }else{ + $layer2 = $layers_array[0]; + } + if(isset($_GET["action"])){ $action = $_GET["action"]; }else{ $action = ""; } - $prinfo = array(array(array("YYYY", "MM","DD", "THHMMSS"), "None","None", array(68, 10))); +// define first array with dummy values for "date, id, address, latlong" + $prinfo = array(array(array("YYYY", "MM","DD", "THHMMSS"), "None","None", array(68, 12))); $query_res = []; if ($tile !== "None"){ //extract prinfo - $fields = "id, mmd_data_access_resource, mmd_geographic_extent_rectangle_north, mmd_geographic_extent_rectangle_south, mmd_geographic_extent_rectangle_east, mmd_geographic_extent_rectangle_west"; + $fields = "id, mmd_data_access_resource, mmd_geographic_extent_rectangle_north, mmd_geographic_extent_rectangle_south, mmd_geographic_extent_rectangle_east, mmd_geographic_extent_rectangle_west, mmd_data_access_wms_layers_wms_layer"; $query_prd = 'full_text:S2*'.$tile.'*'; $con = new HttpConnection(SOLR_SERVER_IP, SOLR_SERVER_PORT); $res = $con->get('/solr/'.SOLR_CORE_PARENT.'/select', array("q" =>$query_prd, "start" => 0, "rows" => 100000, "wt" => "json", "fl" => $fields,)); @@ -84,103 +100,115 @@ function products_comparison_main_content(){ $south = $doc['mmd_geographic_extent_rectangle_south']; $east = $doc['mmd_geographic_extent_rectangle_east']; $west = $doc['mmd_geographic_extent_rectangle_west']; + $layers = $doc['mmd_data_access_wms_layers_wms_layer']; $ayear = substr($time_string, 0, 4); $amonth = substr($time_string, 4, 2); $aday = substr($time_string, 6, 2); $atime = substr($time_string, 8, 7); $date = array($ayear,$amonth, $aday, $atime); $latlon = array(($south+$north)/2, ($east+$west)/2); - $prinfo[$count] = array($date, $id, $address, $latlon); + $prinfo[$count] = array($date, $id, $address, $latlon,$layers); $count = $count + 1; } - sort($prinfo); + rsort($prinfo); + $first = array_pop($prinfo); + array_unshift($prinfo,$first); + } +// #if the tile is selected place the last and second last products on the map +// if ($tile !== "None") { +// //latest product +// $pr1 = $prinfo[0][1]; +// $address1 = $prinfo[0][2]; +// $latlon1 = array($prinfo[0][3][0],$prinfo[0][3][1]); +// //second latest product +// $pr2 = $prinfo[1][1]; +// $address2 = $prinfo[1][2]; +// $latlon2 = array($prinfo[1][3][0],$prinfo[1][3][1]); +// } +// drupal_set_message(print_r($pr1, TRUE), 'warning'); // all available prods +// drupal_set_message(print_r($latlon1, TRUE), 'warning'); //pr1 +// drupal_set_message(print_r($pr2, TRUE), 'warning'); // all available prods +// drupal_set_message(print_r($latlon2, TRUE), 'warning'); //url pr1 + + #call the function creating the selection options $selection_out = []; - $selection_out = select_image($scr_name,$pr1,$pr2,$prinfo,$tile,$action,$tiles_array); + $selection_out = select_image($scr_name,$pr1,$pr2,$prinfo,$tile,$layer1,$layer2,$action, $tiles_array, $layers_array, $layersN_array); $out = $selection_out[0]; $address1 = $selection_out[1]; $address2 = $selection_out[2]; $latlon1 = $selection_out[3]; $latlon2 = $selection_out[4]; - + + + $build_path1 = "null"; $build_path2 = "null"; - $zoom = 2; + $zoom = 3; $ll = $latlon1; + if ($pr1 !== 'None'){ $build_path1 = '"'.$address1.'"'; - $zoom = 6; + $zoom = 7; } if ($pr2 !== 'None'){ $build_path2 = '"'.$address2.'"'; - $zoom = 6; + $zoom = 7; $ll = $latlon2; } - + $tile_j = '"'.$tile.'"'; + $id_j1 = '"'.$pr1.'"'; $id_j2 = '"'.$pr2.'"'; + $ly_j1 = '"'.$layer1.'"'; + $ly_j2 = '"'.$layer2.'"'; + + $sn_j = '"'.$site_name.'"'; + return $out . ' - - - - - - + + + + + + + -
- + ';