Merge pull request #723 from ebocher/worldpop_epsg

Use the input data srid when the worldpop grid is empty
orbisgis · Apr 12, 2022 · 1b80994 · 1b80994
2 parents 704f702 + 02e316a
commit 1b80994
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
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
@@ -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)
                 }
             }

diff --git a/osm/src/main/groovy/org/orbisgis/geoclimate/osm/WorkflowOSM.groovy b/osm/src/main/groovy/org/orbisgis/geoclimate/osm/WorkflowOSM.groovy
@@ -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)
                                 }
                             }