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

Use the input data srid when the worldpop grid is empty #723

Merged
merged 1 commit into from
Apr 12, 2022
Merged

Use the input data srid when the worldpop grid is empty #723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 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 @@ -1441,15 +1441,15 @@ def bdtopo_processing(def h2gis_datasource, def processing_parameters,def id_zo
info "Create a default empty worldpop table"
def outputTableWorldPopName = postfix "world_pop"
h2gis_datasource.execute("""drop table if exists $outputTableWorldPopName;
create table $outputTableWorldPopName (the_geom GEOMETRY(POLYGON, $epsg), ID_POP INTEGER, POP FLOAT);""".toString())
create table $outputTableWorldPopName (the_geom GEOMETRY(POLYGON, $srid), ID_POP INTEGER, POP FLOAT);""".toString())
results.put("populationTableName", outputTableWorldPopName)
}

}else {
info "Cannot find the population grid $coverageId \n Create a default empty worldpop table"
def outputTableWorldPopName = postfix "world_pop"
h2gis_datasource.execute("""drop table if exists $outputTableWorldPopName;
create table $outputTableWorldPopName (the_geom GEOMETRY(POLYGON, $epsg), ID_POP INTEGER, POP FLOAT);""".toString())
create table $outputTableWorldPopName (the_geom GEOMETRY(POLYGON, $srid), ID_POP INTEGER, POP FLOAT);""".toString())
results.put("populationTableName", outputTableWorldPopName)
}
}
Expand Down
4 changes: 2 additions & 2 deletions osm/src/main/groovy/org/orbisgis/geoclimate/osm/WorkflowOSM.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -744,15 +744,15 @@ IProcess osm_processing() {
info "Create a default empty worldpop table"
def outputTableWorldPopName = postfix "world_pop"
h2gis_datasource.execute("""drop table if exists $outputTableWorldPopName;
create table $outputTableWorldPopName (the_geom GEOMETRY(POLYGON, $epsg), ID_POP INTEGER, POP FLOAT);""".toString())
create table $outputTableWorldPopName (the_geom GEOMETRY(POLYGON, $srid), ID_POP INTEGER, POP FLOAT);""".toString())
results.put("populationTableName", outputTableWorldPopName)
}

}else {
info "Cannot find the population grid $coverageId \n Create a default empty worldpop table"
def outputTableWorldPopName = postfix "world_pop"
h2gis_datasource.execute("""drop table if exists $outputTableWorldPopName;
create table $outputTableWorldPopName (the_geom GEOMETRY(POLYGON, $epsg), ID_POP INTEGER, POP FLOAT);""".toString())
create table $outputTableWorldPopName (the_geom GEOMETRY(POLYGON, $srid), ID_POP INTEGER, POP FLOAT);""".toString())
results.put("populationTableName", outputTableWorldPopName)
}
}
Expand Down