Skip to content

Commit 794ad25

Browse files
committed
Support for GeoJson Paths and Polygons
1 parent 34104e2 commit 794ad25

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

src/main/java/org/computate/frFR/java/EcrireGenClasse.java

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3768,11 +3768,17 @@ else if(entiteSetUpper)
37683768
tl(2, "if(o != null) {");
37693769
tl(3, "try {");
37703770
tl(4, entiteNomCanoniqueGenerique == null ? entiteNomSimple : entiteNomSimpleGenerique, " shape = new ", entiteNomCanoniqueGenerique == null ? entiteNomSimple : entiteNomSimpleGenerique, "();");
3771-
tl(4, "o.getJsonArray(\"coordinates\").stream().map(a -> (JsonArray)a).forEach(g -> {");
3772-
tl(5, "g.stream().map(a -> (JsonArray)a).forEach(points -> {");
3773-
tl(6, "shape.addPoint(new Point(Double.parseDouble(points.getString(0)), Double.parseDouble(points.getString(1))));");
3774-
tl(5, "});");
3775-
tl(4, "});");
3771+
if(StringUtils.equals(entiteNomCanonique, VAL_nomCanoniquePath) || StringUtils.equals(entiteNomCanoniqueGenerique, VAL_nomCanoniquePath)) {
3772+
tl(4, "o.getJsonArray(\"coordinates\").stream().map(a -> (JsonArray)a).forEach(points -> {");
3773+
tl(5, "shape.addPoint(new Point(Double.parseDouble(points.getString(0)), Double.parseDouble(points.getString(1))));");
3774+
tl(4, "});");
3775+
} else if(StringUtils.equals(entiteNomCanonique, VAL_nomCanoniquePolygon) || StringUtils.equals(entiteNomCanoniqueGenerique, VAL_nomCanoniquePolygon)) {
3776+
tl(4, "o.getJsonArray(\"coordinates\").stream().map(a -> (JsonArray)a).forEach(g -> {");
3777+
tl(5, "g.stream().map(a -> (JsonArray)a).forEach(points -> {");
3778+
tl(6, "shape.addPoint(new Point(Double.parseDouble(points.getString(0)), Double.parseDouble(points.getString(1))));");
3779+
tl(5, "});");
3780+
tl(4, "});");
3781+
}
37763782
tl(4, "return shape;");
37773783
tl(3, "} catch(Exception ex) {");
37783784
tl(4, "ExceptionUtils.rethrow(ex);");

0 commit comments

Comments
 (0)