Merge pull request #642 from nicolas-f/fix_leq_column

Issue with database column with long negative values
Universite-Gustave-Eiffel · Jan 23, 2024 · e194896 · e194896
2 parents 074efc5 + fed1de4
commit e194896
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/...ing-jdbc/src/main/java/org/noise_planet/noisemodelling/jdbc/LDENPointNoiseMapFactory.java b/...ing-jdbc/src/main/java/org/noise_planet/noisemodelling/jdbc/LDENPointNoiseMapFactory.java
@@ -402,15 +402,15 @@ private String forgeCreateTable(String tableName) {
  sb.append(" (IDRECEIVER bigint NOT NULL");
  }
  if (ldenConfig.computeLAEQOnly){
- sb.append(", LAEQ numeric(5, 2)");
+ sb.append(", LAEQ REAL");
  sb.append(");");
  } else {
  for (int idfreq = 0; idfreq < ldenConfig.propagationProcessPathDataDay.freq_lvl.size(); idfreq++) {
  sb.append(", HZ");
  sb.append(ldenConfig.propagationProcessPathDataDay.freq_lvl.get(idfreq));
- sb.append(" numeric(5, 2)");
+ sb.append(" REAL");
  }
- sb.append(", LAEQ numeric(5, 2), LEQ numeric(5, 2)");
+ sb.append(", LAEQ REAL, LEQ REAL");
  sb.append(");");
  }
  return sb.toString();

diff --git a/.../groovy/org/noise_planet/noisemodelling/wps/NoiseModelling/Noise_level_from_source.groovy b/.../groovy/org/noise_planet/noisemodelling/wps/NoiseModelling/Noise_level_from_source.groovy
@@ -317,9 +317,9 @@ def forgeCreateTable(Sql sql, String tableName, LDENConfig ldenConfig, String ge
  for (int idfreq = 0; idfreq < freqLvl.size(); idfreq++) {
  sb.append(", HZ");
  sb.append(freqLvl.get(idfreq));
- sb.append(" numeric(5, 2)");
+ sb.append(" REAL");
  }
- sb.append(", LAEQ numeric(5, 2), LEQ numeric(5, 2) ) AS SELECT PK");
+ sb.append(", LAEQ REAL, LEQ REAL ) AS SELECT PK");
  if (!ldenConfig.mergeSources) {
  sb.append(", IDSOURCE");
  }

diff --git a/...groovy/org/noise_planet/noisemodelling/wps/NoiseModelling/Noise_level_from_traffic.groovy b/...groovy/org/noise_planet/noisemodelling/wps/NoiseModelling/Noise_level_from_traffic.groovy
@@ -339,9 +339,9 @@ def forgeCreateTable(Sql sql, String tableName, LDENConfig ldenConfig, String ge
  for (int idfreq = 0; idfreq < pathData.freq_lvl.size(); idfreq++) {
  sb.append(", HZ");
  sb.append(pathData.freq_lvl.get(idfreq));
- sb.append(" numeric(5, 2)");
+ sb.append(" REAL");
  }
- sb.append(", LAEQ numeric(5, 2), LEQ numeric(5, 2) ) AS SELECT PK");
+ sb.append(", LAEQ REAL, LEQ REAL ) AS SELECT PK");
  if (!ldenConfig.mergeSources) {
  sb.append(", IDSOURCE");
  }