Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Udapte GeoClimate #729

Merged
merged 2 commits into from
May 2, 2022
Merged

Udapte GeoClimate #729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2c135b
Udapte GeoClimate
ebocher May 2, 2022
f408dcd
Fix package
ebocher May 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 10 additions & 36 deletions bdtopo_v2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion bdtopo_v2/src/main/groovy/org/orbisgis/geoclimate/bdtopo_v2/BDTopo_V2.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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


Expand Down
4 changes: 2 additions & 2 deletions bdtopo_v2/src/main/groovy/org/orbisgis/geoclimate/bdtopo_v2/InputDataFormatting.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions bdtopo_v2/src/main/groovy/org/orbisgis/geoclimate/bdtopo_v2/InputDataLoading.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
14 changes: 7 additions & 7 deletions bdtopo_v2/src/main/groovy/org/orbisgis/geoclimate/bdtopo_v2/WorkflowBDTopo_V2.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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();
Expand Down
13 changes: 0 additions & 13 deletions bdtopo_v2/src/main/resources/log4j2.xml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion bdtopo_v2/src/test/groovy/org/orbisgis/geoclimate/bdtopo_v2/InputDataFormattingTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*

Expand Down
3 changes: 1 addition & 2 deletions bdtopo_v2/src/test/groovy/org/orbisgis/geoclimate/bdtopo_v2/InputDataLoadingTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.*

Expand Down
2 changes: 1 addition & 1 deletion bdtopo_v2/src/test/groovy/org/orbisgis/geoclimate/bdtopo_v2/WorkflowAbstractTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions bdtopo_v2/src/test/groovy/org/orbisgis/geoclimate/bdtopo_v2/WorkflowBDTopo_V2Test.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*

Expand Down
50 changes: 12 additions & 38 deletions geoclimate/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
13 changes: 0 additions & 13 deletions geoclimate/src/main/resources/log4j2.xml
View file
Open in desktop

This file was deleted.

52 changes: 10 additions & 42 deletions geoindicators/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion geoindicators/src/main/groovy/org/orbisgis/geoclimate/Geoindicators.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/BlockIndicators.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading