Merge pull request #729 from ebocher/orbisdata_update

Udapte GeoClimate
orbisgis · May 2, 2022 · 40f194d · 40f194d
2 parents a08df65 + f408dcd
commit 40f194d
Show file tree

Hide file tree

Showing 60 changed files with 177 additions and 430 deletions.
diff --git a/bdtopo_v2/pom.xml b/bdtopo_v2/pom.xml
@@ -25,34 +25,20 @@
             <artifactId>groovy-json</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.orbisgis.orbisdata.datamanager</groupId>
-            <artifactId>jdbc</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-simple</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>org.orbisgis.data</groupId>
+            <artifactId>h2gis</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.orbisgis.orbisdata.processmanager</groupId>
+            <groupId>org.orbisgis.data</groupId>
+            <artifactId>postgis</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.orbisgis</groupId>
             <artifactId>process</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-simple</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.orbisgis.orbisdata.datamanager</groupId>
+            <groupId>org.orbisgis.data</groupId>
             <artifactId>dataframe</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-simple</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.orbisgis.geoclimate</groupId>
@@ -67,16 +53,8 @@
             <artifactId>slf4j-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
         </dependency>
         <!-- Test dependencies -->
         <dependency>
@@ -115,10 +93,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>

diff --git a/bdtopo_v2/src/main/groovy/org/orbisgis/geoclimate/bdtopo_v2/BDTopo_V2.groovy b/bdtopo_v2/src/main/groovy/org/orbisgis/geoclimate/bdtopo_v2/BDTopo_V2.groovy
@@ -1,6 +1,6 @@
 package org.orbisgis.geoclimate.bdtopo_v2
 
-import org.orbisgis.orbisdata.processmanager.process.GroovyProcessFactory
+import org.orbisgis.process.GroovyProcessFactory
 import org.slf4j.LoggerFactory
 
 

diff --git a/bdtopo_v2/src/main/groovy/org/orbisgis/geoclimate/bdtopo_v2/InputDataFormatting.groovy b/bdtopo_v2/src/main/groovy/org/orbisgis/geoclimate/bdtopo_v2/InputDataFormatting.groovy
@@ -1,8 +1,8 @@
 package org.orbisgis.geoclimate.bdtopo_v2
 
 import groovy.transform.BaseScript
-import org.orbisgis.orbisdata.datamanager.jdbc.JdbcDataSource
-import org.orbisgis.orbisdata.processmanager.api.IProcess
+import org.orbisgis.data.jdbc.JdbcDataSource
+import org.orbisgis.process.api.IProcess
 
 @BaseScript BDTopo_V2 BDTopo_V2
 

diff --git a/bdtopo_v2/src/main/groovy/org/orbisgis/geoclimate/bdtopo_v2/InputDataLoading.groovy b/bdtopo_v2/src/main/groovy/org/orbisgis/geoclimate/bdtopo_v2/InputDataLoading.groovy
@@ -2,8 +2,8 @@
 package org.orbisgis.geoclimate.bdtopo_v2
 
 import groovy.transform.BaseScript
-import org.orbisgis.orbisdata.datamanager.jdbc.JdbcDataSource
-import org.orbisgis.orbisdata.processmanager.api.IProcess
+import org.orbisgis.data.jdbc.JdbcDataSource
+import org.orbisgis.process.api.IProcess
 
 @BaseScript BDTopo_V2 BDTopo_V2
 

diff --git a/bdtopo_v2/src/main/groovy/org/orbisgis/geoclimate/bdtopo_v2/WorkflowBDTopo_V2.groovy b/bdtopo_v2/src/main/groovy/org/orbisgis/geoclimate/bdtopo_v2/WorkflowBDTopo_V2.groovy
@@ -3,15 +3,15 @@ package org.orbisgis.geoclimate.bdtopo_v2
 import groovy.json.JsonSlurper
 import groovy.transform.BaseScript
 import org.h2.tools.DeleteDbFiles
-import org.h2gis.postgis_jts_osgi.DataSourceFactoryImpl
+import org.h2gis.postgis_jts.PostGISDBFactory
 import org.h2gis.utilities.FileUtilities
 import org.h2gis.utilities.GeometryTableUtilities
 import org.h2gis.utilities.JDBCUtilities
-import org.orbisgis.orbisdata.datamanager.api.dataset.ITable
-import org.orbisgis.orbisdata.datamanager.jdbc.JdbcDataSource
-import org.orbisgis.orbisdata.datamanager.jdbc.h2gis.H2GIS
-import org.orbisgis.orbisdata.datamanager.jdbc.postgis.POSTGIS
-import org.orbisgis.orbisdata.processmanager.api.IProcess
+import org.orbisgis.data.api.dataset.ITable
+import org.orbisgis.data.jdbc.JdbcDataSource
+import org.orbisgis.data.H2GIS
+import org.orbisgis.data.POSTGIS
+import org.orbisgis.process.api.IProcess
 import org.orbisgis.geoclimate.Geoindicators
 import org.h2gis.functions.io.utility.IOMethods
 import org.osgi.service.jdbc.DataSourceFactory
@@ -840,7 +840,7 @@ def loadDataFromDatasource(def input_database_properties, def code, def distance
         error "The commune table must be specified to run Geoclimate"
         return
     }
-    DataSourceFactory dataSourceFactory = new DataSourceFactoryImpl();
+    PostGISDBFactory dataSourceFactory = new PostGISDBFactory();
     Connection sourceConnection = null;
     try {
         Properties props = new Properties();

diff --git a/bdtopo_v2/src/main/resources/log4j2.xml b/bdtopo_v2/src/main/resources/log4j2.xml
diff --git a/bdtopo_v2/src/test/groovy/org/orbisgis/geoclimate/bdtopo_v2/InputDataFormattingTest.groovy b/bdtopo_v2/src/test/groovy/org/orbisgis/geoclimate/bdtopo_v2/InputDataFormattingTest.groovy
@@ -2,7 +2,7 @@ package org.orbisgis.geoclimate.bdtopo_v2
 
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
-import org.orbisgis.orbisdata.datamanager.jdbc.h2gis.H2GIS
+import org.orbisgis.data.H2GIS
 
 import static org.junit.jupiter.api.Assertions.*
 

diff --git a/bdtopo_v2/src/test/groovy/org/orbisgis/geoclimate/bdtopo_v2/InputDataLoadingTest.groovy b/bdtopo_v2/src/test/groovy/org/orbisgis/geoclimate/bdtopo_v2/InputDataLoadingTest.groovy
@@ -1,8 +1,7 @@
 package org.orbisgis.geoclimate.bdtopo_v2
 
 import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.TestInfo
-import org.orbisgis.orbisdata.datamanager.jdbc.h2gis.H2GIS
+import org.orbisgis.data.H2GIS
 
 import static org.junit.jupiter.api.Assertions.*
 

diff --git a/bdtopo_v2/src/test/groovy/org/orbisgis/geoclimate/bdtopo_v2/WorkflowAbstractTest.groovy b/bdtopo_v2/src/test/groovy/org/orbisgis/geoclimate/bdtopo_v2/WorkflowAbstractTest.groovy
@@ -1,7 +1,7 @@
 package org.orbisgis.geoclimate.bdtopo_v2
 
 
-import org.orbisgis.orbisdata.processmanager.api.IProcess
+import org.orbisgis.process.api.IProcess
 import org.orbisgis.geoclimate.Geoindicators
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory

diff --git a/bdtopo_v2/src/test/groovy/org/orbisgis/geoclimate/bdtopo_v2/WorkflowBDTopo_V2Test.groovy b/bdtopo_v2/src/test/groovy/org/orbisgis/geoclimate/bdtopo_v2/WorkflowBDTopo_V2Test.groovy
@@ -10,10 +10,10 @@ import org.junit.jupiter.api.condition.EnabledIfSystemProperty
 import org.locationtech.jts.geom.Envelope
 import org.locationtech.jts.geom.Geometry
 import org.locationtech.jts.io.WKTReader
-import org.orbisgis.orbisdata.datamanager.jdbc.JdbcDataSource
-import org.orbisgis.orbisdata.datamanager.jdbc.h2gis.H2GIS
-import org.orbisgis.orbisdata.datamanager.jdbc.postgis.POSTGIS
-import org.orbisgis.orbisdata.processmanager.api.IProcess
+import org.orbisgis.data.jdbc.JdbcDataSource
+import org.orbisgis.data.H2GIS
+import org.orbisgis.data.POSTGIS
+import org.orbisgis.process.api.IProcess
 import org.orbisgis.geoclimate.Geoindicators
 import static org.junit.jupiter.api.Assertions.*
 

diff --git a/geoclimate/pom.xml b/geoclimate/pom.xml
@@ -37,10 +37,6 @@
             <groupId>org.orbisgis</groupId>
             <artifactId>postgis-jts</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.orbisgis</groupId>
-            <artifactId>postgis-jts-osgi</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.orbisgis</groupId>
             <artifactId>cts</artifactId>
@@ -74,46 +70,28 @@
             <artifactId>picocli</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
+            <groupId>org.orbisgis.data</groupId>
+            <artifactId>h2gis</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-api</artifactId>
+            <groupId>org.orbisgis</groupId>
+            <artifactId>process</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
+            <groupId>org.orbisgis.geoclimate</groupId>
+            <artifactId>osmtools</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.orbisgis.orbisdata.datamanager</groupId>
-            <artifactId>jdbc</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-simple</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.orbisgis.orbisdata.processmanager</groupId>
-            <artifactId>process</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-simple</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.orbisgis.geoclimate</groupId>
-            <artifactId>osmtools</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-simple</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
         </dependency>
         <!-- Test dependencies -->
         <dependency>
@@ -152,10 +130,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>

diff --git a/geoclimate/src/main/resources/log4j2.xml b/geoclimate/src/main/resources/log4j2.xml
diff --git a/geoindicators/pom.xml b/geoindicators/pom.xml
@@ -29,48 +29,24 @@
             <artifactId>groovy</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.orbisgis.orbisdata.datamanager</groupId>
-            <artifactId>jdbc</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-simple</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>org.orbisgis.data</groupId>
+            <artifactId>h2gis</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.orbisgis.orbisdata.datamanager</groupId>
-            <artifactId>api</artifactId>
+            <groupId>org.orbisgis.data</groupId>
+            <artifactId>postgis</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.orbisgis.orbisdata.processmanager</groupId>
+            <groupId>org.orbisgis</groupId>
             <artifactId>process</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-simple</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.orbisgis.orbisdata.datamanager</groupId>
+            <groupId>org.orbisgis.data</groupId>
             <artifactId>dataframe</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-simple</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.orbisgis</groupId>
             <artifactId>h2gis-network</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-simple</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.github.haifengl</groupId>
@@ -88,16 +64,12 @@
             <version>${smile-version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-api</artifactId>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
         </dependency>
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
@@ -141,10 +113,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>

diff --git a/geoindicators/src/main/groovy/org/orbisgis/geoclimate/Geoindicators.groovy b/geoindicators/src/main/groovy/org/orbisgis/geoclimate/Geoindicators.groovy
@@ -9,7 +9,7 @@ import org.orbisgis.geoclimate.geoindicators.RsuIndicators
 import org.orbisgis.geoclimate.geoindicators.SpatialUnits
 import org.orbisgis.geoclimate.geoindicators.TypologyClassification
 import org.orbisgis.geoclimate.geoindicators.WorkflowGeoIndicators
-import org.orbisgis.orbisdata.processmanager.process.GroovyProcessFactory
+import org.orbisgis.process.GroovyProcessFactory
 import org.slf4j.LoggerFactory
 
 abstract class Geoindicators  extends GroovyProcessFactory  {

diff --git a/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/BlockIndicators.groovy b/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/BlockIndicators.groovy
@@ -2,8 +2,8 @@ package org.orbisgis.geoclimate.geoindicators
 
 import groovy.transform.BaseScript
 import org.orbisgis.geoclimate.Geoindicators
-import org.orbisgis.orbisdata.datamanager.jdbc.*
-import org.orbisgis.orbisdata.processmanager.api.IProcess
+import org.orbisgis.data.jdbc.*
+import org.orbisgis.process.api.IProcess
 
 @BaseScript Geoindicators geoindicators