diff --git a/pom.xml b/pom.xml index 6b18816..3469c3b 100755 --- a/pom.xml +++ b/pom.xml @@ -4,13 +4,15 @@ org.orbisgis demat 1.0.1-SNAPSHOT - bundle + jar Demat is breton word to said "Hello". Demat is library to run Vega-lite specifications. UTF-8 YYYY-MM-dd ${maven.build.timestamp} + 11 + 11 3.5.0 11 @@ -27,19 +29,26 @@ 3.0.0 3.0.2 + 3.2.0 3.3.0 5.1.2 3.1.0 3.8.1 + 3.0.0-M1 3.0.0 3.0.1 + 3.0.0-M1 3.2.0 3.3.1 3.0.0-M4 + 3.2.0 + 3.9.1 3.0.0-M5 2.8.1 - 11 - 11 + + + 3.1.2 + @@ -105,6 +114,14 @@ + + + + org.apache.maven.archetype + archetype-packaging + ${archetype-packaging-version} + + @@ -289,7 +306,7 @@ all,-missing true - + diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java deleted file mode 100644 index bbb80ba..0000000 --- a/src/main/java/module-info.java +++ /dev/null @@ -1,11 +0,0 @@ -module demat { - requires com.kitfox.svg; - requires data.api; - requires h2gis.utilities; - requires org.locationtech.jts; - requires com.fasterxml.jackson.databind; - requires java.sql; - requires com.caoccao.javet; - requires java.desktop; - requires com.j2html; -} \ No newline at end of file diff --git a/src/main/java/org/orbisgis/demat/JavascriptEngine.java b/src/main/java/org/orbisgis/demat/JavascriptEngine.java index 05c8160..cf3548e 100755 --- a/src/main/java/org/orbisgis/demat/JavascriptEngine.java +++ b/src/main/java/org/orbisgis/demat/JavascriptEngine.java @@ -117,15 +117,13 @@ void initV8Engine() throws JavetException, IOException { "}"; v8Runtime.getExecutor(svgFunction).executeVoid(); jsonMapper = new ObjectMapper(); - } /** * Save the vega-lite chart in a SVG file * - * @param outputFile - * @return - * @throws JavetException + * @param outputFile the file to store the result + * @return the absolute path of the file */ public String saveSVG(String json, File outputFile, boolean delete) throws JavetException, IOException { if (outputFile.exists()) { @@ -162,13 +160,12 @@ public String saveSVG(String json, File outputFile, boolean delete) throws Javet return outputFile.getAbsolutePath(); } - /** * Save the vega-lite chart in a PNG file * - * @param outputFile - * @return - * @throws JavetException + * @param vega_spec the input vega spec + * @param outputFile the file to store the result + * @return the absolute path of the file */ public String savePNG(String vega_spec, File outputFile, boolean delete, float ratio) throws JavetException { if (outputFile.exists()) { @@ -204,7 +201,6 @@ public String savePNG(String vega_spec, File outputFile, boolean delete, float r return outputFile.getAbsolutePath(); } - public void setDirectory(String jsDirectory) throws JavetException, IOException { if (!this.jsDirectory.equals(jsDirectory)) { this.jsDirectory = jsDirectory;