Merge pull request #221 from KNMI/fix-log-legend

2.7.6 Fix: Legend with a logaritmic scale do work again.

Dockerfile

@@ -4,7 +4,7 @@ USER root
 LABEL maintainer="[email protected]"
 
 # Version should be same as in Definitions.h
-LABEL version="2.7.5"
+LABEL version="2.7.6"
 
 ######### First stage (build) ############
 

NEWS.md

@@ -1,3 +1,7 @@
+**Version 2.7.6 2022-07-12**
+
+- Fix: Legend with a logaritmic scale do work again.
+
 **Version 2.7.5 2022-07-11**
 
 - Implemented quantize for time on ingest too (for rounding product times up/down to values spaced with fixed intervals)

adagucserverEC/CLegendRenderers/CCreateLegendRenderContinuousLegend.cpp

@@ -2,7 +2,7 @@
 #include "CDataReader.h"
 #include "CImageDataWriter.h"
 #include <algorithm>
-int CCreateLegend::renderContinuousLegend(CDataSource *dataSource, CDrawImage *legendImage, CStyleConfiguration *styleConfiguration, bool, bool estimateMinMax) {
+int CCreateLegend::renderContinuousLegend(CDataSource *dataSource, CDrawImage *legendImage, CStyleConfiguration *styleConfiguration, bool, bool ) {
 #ifdef CIMAGEDATAWRITER_DEBUG
   CDBDebug("legendtype continous");
 #endif
@@ -146,7 +146,8 @@ int CCreateLegend::renderContinuousLegend(CDataSource *dataSource, CDrawImage *l
         v = pow(styleConfiguration->legendLog, v);
       }
       {
-        legendImage->line(((int)cbW - 1) * scaling + pLeft, (int)c + 6 + dH + pTop, ((int)cbW + 6) * scaling + pLeft, (int)c + 6 + dH + pTop, lineWidth, 248);
+        int labelY = (int)c + 6 + dH + pTop;
+        legendImage->line(((int)cbW - 1) * scaling + pLeft, labelY, ((int)cbW + 6) * scaling + pLeft, (int)c + 6 + dH + pTop, lineWidth, 248);
         if (textformatting.empty() == false) {
           CT::string textFormat;
           textFormat.print("%s", textformatting.c_str());
@@ -158,8 +159,11 @@ int CCreateLegend::renderContinuousLegend(CDataSource *dataSource, CDrawImage *l
             floatToString(szTemp, 255, tickRound, v);
           }
         }
+
         if (!fontLocation.empty()) {
-          legendImage->drawText(((int)cbW + 12 + pLeft) * scaling, (pTop) - ((fontSize * scaling) / 4) + 3, fontLocation.c_str(), fontSize * scaling, 0, szTemp, 248);
+          int textX = ((int)cbW + 12 + pLeft) * scaling;
+          int textY = labelY + 4;
+          legendImage->drawText(textX, textY, fontLocation.c_str(), fontSize * scaling, 0, szTemp, 248);
         }
       }
     }

adagucserverEC/Definitions.h

@@ -28,7 +28,7 @@
 #ifndef Definitions_H
 #define Definitions_H
 
-#define ADAGUCSERVER_VERSION "2.7.5" // Please also update in the Dockerfile to the same version
+#define ADAGUCSERVER_VERSION "2.7.6" // Please also update in the Dockerfile to the same version
 
 // CConfigReaderLayerType
 #define CConfigReaderLayerTypeUnknown 0

data/config/datasets/adaguc.tests.invertedlegend.xml

@@ -8,13 +8,21 @@
     <RenderMethod>nearest</RenderMethod>
   </Style>
 
+  <Style name="testdatalog10">
+    <Legend fixedclasses="true" tickinterval="5" tickround=".01">no2</Legend>
+    <Min>0.1</Min>
+    <Max>30.0</Max>
+    <Log>10</Log>
+    <RenderMethod>nearest</RenderMethod>
+  </Style>
+
 
   <!-- Layers -->
   <Layer type="database">
 
     <FilePath filter="">{ADAGUC_PATH}data/datasets/testdata.nc</FilePath>
     <Variable>testdata</Variable>
-    <Styles>testdatainverted</Styles>
+    <Styles>testdatainverted,testdatalog10</Styles>
   </Layer>
 
 </Configuration>

tests/AdagucTests/TestWMS.py

@@ -928,6 +928,25 @@ def test_WMSGetLegendGraphic_inverted_min_max(self):
         self.assertEqual(status, 0)
         self.assertEqual(data.getvalue(), AdagucTestTools(
         ).readfromfile(self.expectedoutputsspath + filename))
+
+    def test_WMSGetLegendGraphic_log10(self):
+        AdagucTestTools().cleanTempDir()
+        ADAGUC_PATH = os.environ['ADAGUC_PATH']
+        config = ADAGUC_PATH + '/data/config/adaguc.tests.dataset.xml,' + \
+            ADAGUC_PATH + '/data/config/datasets/adaguc.tests.invertedlegend.xml'
+        env = {'ADAGUC_CONFIG': config}
+
+        status, data, headers = AdagucTestTools().runADAGUCServer(
+            args=['--updatedb', '--config', config], env=self.env, isCGI=False)
+        self.assertEqual(status, 0)
+
+        filename = "test_WMSGetLegendGraphic_log10.png"
+        status, data, headers = AdagucTestTools().runADAGUCServer(
+            "DATASET=adaguc.tests.invertedlegend&SERVICE=WMS&&version=1.1.1&service=WMS&request=GetLegendGraphic&layer=testdata&format=image/png&STYLE=testdatalog10/nearest&layers=testdata&&&transparent=false", env=env)
+        AdagucTestTools().writetofile(self.testresultspath + filename, data.getvalue())
+        self.assertEqual(status, 0)
+        self.assertEqual(data.getvalue(), AdagucTestTools(
+        ).readfromfile(self.expectedoutputsspath + filename))
 
     def test_WMSGetMapQuantizeLow(self):
         AdagucTestTools().cleanTempDir()