Skip to content

Commit

Permalink
Add TARGET model input
Browse files Browse the repository at this point in the history
  • Loading branch information
@ebocher
ebocher committed Nov 19, 2024
1 parent 4988519 commit 80bc7fd
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 23 deletions.
46 changes: 23 additions & 23 deletions bdtopo/src/test/groovy/org/orbisgis/geoclimate/bdtopo/WorkflowAbstractTest.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,15 +92,15 @@ abstract class WorkflowAbstractTest {
def bdTopoParameters = [
"description" : "Full workflow configuration file",
"geoclimatedb": [
"folder": folder.absolutePath,
"folder": getDBFolderPath(),
"name" : "testFullWorflow;AUTO_SERVER=TRUE",
"delete": false
],
"input" : [
"folder" : dataFolder,
"locations": [getInseeCode()]],
"output" : [
"folder": ["path": folder.absolutePath]],
"folder": ["path": getDBFolderPath()]],
"parameters" :
["distance" : 0,
rsu_indicators : [
Expand All @@ -122,7 +122,7 @@ abstract class WorkflowAbstractTest {

def tableNames = process[getInseeCode()]
assertTrue(tableNames.size() > 0)
H2GIS h2gis = H2GIS.open(folder.absolutePath + File.separator + "testFullWorflow;AUTO_SERVER=TRUE")
H2GIS h2gis = H2GIS.open(getDBFolderPath() + File.separator + "testFullWorflow;AUTO_SERVER=TRUE")

//Test zone
assertTrue h2gis.firstRow("select count(*) as count from ${tableNames.zone} where the_geom is not null").count > 0
Expand Down Expand Up @@ -170,7 +170,7 @@ abstract class WorkflowAbstractTest {
def filePath = getClass().getResource(getFolderName() + File.separator + "COMMUNE.shp")
// If some layers are missing, do not try to load them...
if (filePath) {
H2GIS h2GIS = H2GIS.open(folder.absolutePath + File.separator + "tmpdb")
H2GIS h2GIS = H2GIS.open(getDBFolderPath() + File.separator + "tmpdb")
h2GIS.link(filePath, "COMMUNE", true)
Geometry geom = h2GIS.firstRow("""SELECT ST_BUFFER(ST_POINTONSURFACE(the_geom), 200) AS the_geom from commune""".toString()).the_geom
h2GIS.close()
Expand All @@ -180,15 +180,15 @@ abstract class WorkflowAbstractTest {
def bdTopoParameters = [
"description" : "Example of configuration file to set the SRID",
"geoclimatedb": [
"folder": folder.absolutePath,
"folder": getDBFolderPath(),
"name" : "testFullWorflowSRID;AUTO_SERVER=TRUE",
"delete": false
],
"input" : [
"folder" : dataFolder,
"locations": [location]],
"output" : [
"folder": ["path": folder.absolutePath, "tables": ["grid_indicators"]],
"folder": ["path": getDBFolderPath(), "tables": ["grid_indicators"]],
"srid" : 4326],
"parameters" :
["distance" : 0,
Expand All @@ -208,10 +208,10 @@ abstract class WorkflowAbstractTest {
def tableNames = process.values()
def grid_table = tableNames.grid_indicators[0]
assertNotNull(grid_table)
H2GIS h2gis = H2GIS.open("${folder.absolutePath + File.separator}testFullWorflowSRID;AUTO_SERVER=TRUE")
H2GIS h2gis = H2GIS.open("${getDBFolderPath() + File.separator}testFullWorflowSRID;AUTO_SERVER=TRUE")
assertTrue h2gis.firstRow("select count(*) as count from $grid_table".toString()).count == 100
assertTrue h2gis.firstRow("select count(*) as count from $grid_table where BUILDING_FRACTION>0".toString()).count > 0
File grid_file = new File(folder.absolutePath + File.separator + "bdtopo_" + getVersion() + "_" + location.join("_") + File.separator + "grid_indicators.fgb")
File grid_file = new File(getDBFolderPath() + File.separator + "bdtopo_" + getVersion() + "_" + location.join("_") + File.separator + "grid_indicators.fgb")
assertTrue(grid_file.exists())
h2gis.load(grid_file.absolutePath, "grid_indicators_file", true)
assertEquals(4326, h2gis.getSpatialTable("grid_indicators_file").srid)
Expand All @@ -220,7 +220,7 @@ abstract class WorkflowAbstractTest {

@Test
void workflowExternalDB() {
def externaldb_dbProperties = [databaseName: "${folder.absolutePath + File.separator}external_db",
def externaldb_dbProperties = [databaseName: "${getDBFolderPath() + File.separator}external_db",
user : 'sa',
password : 'sa'
]
Expand All @@ -230,13 +230,13 @@ abstract class WorkflowAbstractTest {
"zone" : "zone",
"grid_indicators" : "grid_indicators"]
//Drop all output tables if exist
H2GIS externalDB = H2GIS.open(folder.absolutePath + File.separator + externaldb_dbProperties.databaseName,
H2GIS externalDB = H2GIS.open(getDBFolderPath() + File.separator + externaldb_dbProperties.databaseName,
externaldb_dbProperties.user, externaldb_dbProperties.password)
externalDB.execute("DROP TABLE IF EXISTS ${outputTables.values().join(",")};".toString())
def bdTopoParameters = [
"description" : "Example of configuration file to run the BDTopo workflow and store the results in a folder",
"geoclimatedb": [
"folder": folder.getAbsolutePath(),
"folder": getDBFolderPath(),
"name" : "bdtopo_workflow_db;AUTO_SERVER=TRUE",
"delete": true
],
Expand All @@ -247,7 +247,7 @@ abstract class WorkflowAbstractTest {
"database":
["user" : externaldb_dbProperties.user,
"password" : externaldb_dbProperties.password,
"databaseName": folder.absolutePath + File.separator + externaldb_dbProperties.databaseName,
"databaseName": getDBFolderPath() + File.separator + externaldb_dbProperties.databaseName,
"tables" : outputTables]],
"parameters" :
["distance" : 0,
Expand Down Expand Up @@ -280,11 +280,11 @@ abstract class WorkflowAbstractTest {
def filePath = getClass().getResource(getFolderName() + File.separator + "COMMUNE.shp")
// If some layers are missing, do not try to load them...
if (filePath) {
def externaldb_dbProperties = [databaseName: "${folder.absolutePath + File.separator}external_db_bbox",
def externaldb_dbProperties = [databaseName: "${getDBFolderPath() + File.separator}external_db_bbox",
user : 'sa',
password : 'sa'
]
H2GIS externalDB = H2GIS.open(folder.absolutePath + File.separator + externaldb_dbProperties.databaseName, externaldb_dbProperties.user, externaldb_dbProperties.password)
H2GIS externalDB = H2GIS.open(getDBFolderPath() + File.separator + externaldb_dbProperties.databaseName, externaldb_dbProperties.user, externaldb_dbProperties.password)
externalDB.link(filePath, "COMMUNE", true)
Geometry geom = externalDB.firstRow("""SELECT ST_BUFFER(ST_POINTONSURFACE(the_geom), 200) AS the_geom from commune""".toString()).the_geom

Expand All @@ -300,7 +300,7 @@ abstract class WorkflowAbstractTest {
def bdTopoParameters = [
"description" : "Example of configuration file to run the BDTopo workflow and store the results in a folder",
"geoclimatedb": [
"folder": folder.absolutePath,
"folder": getDBFolderPath(),
"name" : "bdtopo_workflow_db_bbox;AUTO_SERVER=TRUE",
"delete": true
],
Expand All @@ -311,7 +311,7 @@ abstract class WorkflowAbstractTest {
"database":
["user" : externaldb_dbProperties.user,
"password" : externaldb_dbProperties.password,
"databaseName": folder.absolutePath + File.separator + externaldb_dbProperties.databaseName,
"databaseName": getDBFolderPath() + File.separator + externaldb_dbProperties.databaseName,
"tables" : outputTables]],
"parameters" :
["distance" : 0,
Expand Down Expand Up @@ -344,15 +344,15 @@ abstract class WorkflowAbstractTest {
def bdTopoParameters = [
"description" : "Example of configuration file to run the grid indicators",
"geoclimatedb": [
"folder": folder.absolutePath,
"folder": getDBFolderPath(),
"name" : "geoclimate_chain_db;AUTO_SERVER=TRUE",
"delete": false
],
"input" : [
"folder" : dataFolder,
"locations": [2000, 2001, 2002]],
"output" : [
"folder": ["path" : folder.absolutePath,
"folder": ["path" : getDBFolderPath(),
"tables": ["grid_indicators"]]],
"parameters" :
["distance" : 0,
Expand All @@ -372,15 +372,15 @@ abstract class WorkflowAbstractTest {
def bdTopoParameters = [
"description" : "Full workflow configuration file",
"geoclimatedb": [
"folder": folder.absolutePath,
"folder": getDBFolderPath(),
"name" : "testFormatedData;AUTO_SERVER=TRUE",
"delete": true
],
"input" : [
"folder" : dataFolder,
"locations": [getInseeCode()]],
"output" : [
"folder": ["path": folder.absolutePath]],
"folder": ["path": getDBFolderPath()]],
"parameters" :
["distance": 0]
]
Expand All @@ -396,23 +396,23 @@ abstract class WorkflowAbstractTest {
def bdTopoParameters = [
"description" : "Workflow format data",
"geoclimatedb": [
"folder": folder.absolutePath,
"folder": getDBFolderPath(),
"name" : "testFormat;AUTO_SERVER=TRUE",
"delete": false
],
"input" : [
"folder" : dataFolder,
"locations": [getInseeCode()]],
"output" : [
"folder": ["path": folder.absolutePath]]
"folder": ["path": getDBFolderPath()]]
]

Map process = BDTopo.workflow(bdTopoParameters, getVersion())
assertNotNull(process)

def tableNames = process[getInseeCode()]
assertTrue(tableNames.size() > 0)
H2GIS h2gis = H2GIS.open(folder.absolutePath + File.separator + "testFormat;AUTO_SERVER=TRUE")
H2GIS h2gis = H2GIS.open(getDBFolderPath() + File.separator + "testFormat;AUTO_SERVER=TRUE")

//Test zone
assertTrue h2gis.firstRow("select count(*) as count from ${tableNames.zone} where the_geom is not null").count > 0
Expand Down
1 change: 1 addition & 0 deletions docs/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@
- Simplify database url in config file. Use only the name of the database. e.g : h2://, postgis://
- Add a test to check if the worldpop service is available
- Fix github actions
- Add TARGET landcover production

0 comments on commit 80bc7fd

Please sign in to comment.