archive-gh-me/MeteoInfo
1
0
Fork 0
mirror of https://github.com/meteoinfo/MeteoInfo.git synced 2025-12-08 20:36:05 +00:00
Code Issues Projects Releases Wiki Activity

update jackson to version 2.15.1

Browse Source
This commit is contained in:
wyq 2024-01-25 09:15:01 +08:00
parent 2dd1102d1f
commit 19189dfa4d
4 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meteoinfo-chart/src/main/java/org/meteoinfo/chart/graphic/GraphicFactory.java
View File

@ -5309,7 +5309,7 @@ public class GraphicFactory {
min = v;
max = maxData;
} else {
if (v > ls.getMaxValue()) {
if (poly.HighValue > ls.getMaxValue()) {
switch (extendType) {
case NEITHER:
case MIN:
@ -5321,7 +5321,7 @@ public class GraphicFactory {
}
} else if (valueIdx == 0){
if (poly.IsHighCenter) {
if (poly.HighValue < ls.getMinValue()) {
if (v < ls.getMinValue()) {
switch (extendType) {
case NEITHER:
case MAX:
@ -5338,7 +5338,7 @@ public class GraphicFactory {
continue;
}
}
max = v;
max = poly.HighValue;
min = minData;
}
} else {

6
meteoinfo-geo/src/main/java/org/meteoinfo/geo/meteodata/DrawMeteoData.java
View File

@ -952,7 +952,7 @@ public class DrawMeteoData {
min = v;
max = maxData;
} else {
if (v > ls.getMaxValue()) {
if (poly.HighValue > ls.getMaxValue()) {
switch (extendType) {
case NEITHER:
case MIN:
@ -964,7 +964,7 @@ public class DrawMeteoData {
}
} else if (valueIdx == 0){
if (poly.IsHighCenter) {
if (poly.HighValue < ls.getMinValue()) {
if (v < ls.getMinValue()) {
switch (extendType) {
case NEITHER:
case MAX:
@ -981,7 +981,7 @@ public class DrawMeteoData {
continue;
}
}
max = v;
max = poly.HighValue;
min = minData;
}
} else {

5
meteoinfo-geometry/pom.xml
View File

@ -14,6 +14,7 @@
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<jackson.version>2.15.1</jackson.version>
</properties>
<dependencies>
@ -40,12 +41,12 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.13.4.2</version>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.13.4</version>
<version>${jackson.version}</version>
</dependency>
</dependencies>

14
meteoinfo-lab/milconfig.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<MeteoInfo File="milconfig.xml" Type="configurefile">
<Path OpenPath="D:\Working\MIScript\Jython\mis\io\json">
<Path OpenPath="D:\Working\MIScript\Jython\mis\plot_types\contour">
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\common_math\interpolate"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\imshow"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\surf"/>
@ -14,19 +14,19 @@
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\meteo\wrf"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\io\awx"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\io"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\contour"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\io\json"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\contour"/>
</Path>
<File>
<OpenedFiles>
<OpenedFile File="D:\Working\MIScript\Jython\mis\plot_types\contour\contourf_bgcolor.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\plot_types\contour\contourf_extend_max.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\io\json\hy_conc_nuclear_geojson.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\io\json\hy_conc_geojson_extend.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\plot_types\contour\contourf_extend_both.py"/>
</OpenedFiles>
<RecentFiles>
<RecentFile File="D:\Working\MIScript\Jython\mis\plot_types\contour\contourf_bgcolor.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\plot_types\contour\contourf_extend_max.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\io\json\hy_conc_nuclear_geojson.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\io\json\hy_conc_geojson_extend.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\plot_types\contour\contourf_extend_both.py"/>
</RecentFiles>
</File>
<Font>
@ -34,5 +34,5 @@
</Font>
<LookFeel DockWindowDecorated="true" LafDecorated="true" Name="FlatDarkLaf"/>
<Figure DoubleBuffering="true"/>
<Startup MainFormLocation="-7,-7" MainFormSize="1293,685"/>
<Startup MainFormLocation="-7,0" MainFormSize="1366,770"/>
</MeteoInfo>