Merge pull request orbisgis#4 from SPalominos/ebocher-buildandblockin…

…dicators Fix building.
ebocher · May 21, 2019 · b9b55fd · b9b55fd
2 parents d2ac781 + fddd4eb
commit b9b55fd
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -144,7 +144,6 @@
             <url>http://nexus-ng.orbisgis.org/repository/orbisgis-snapshot</url>
             <snapshots>
                 <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
             </snapshots>
             <releases>
                 <enabled>false</enabled>

diff --git a/prepare_data/src/main/groovy/org/orbisgis/common/AbstractTablesInitialization.groovy b/prepare_data/src/main/groovy/org/orbisgis/common/AbstractTablesInitialization.groovy
@@ -46,7 +46,7 @@ static IProcess initParametersAbstract(){
                 def vegetAbstractType = 'VEGET_ABSTRACT_TYPE_' + uuid
                 def vegetAbstractParam = 'VEGET_ABSTRACT_PARAMETERS_' + uuid
 
-                datasource.executeScript(getClass().getResource('parametersAndAbstractTables.sql').toString(),
+                datasource.executeScript(getClass().getResourceAsStream('parametersAndAbstractTables.sql'),
                         [BUILDING_ABSTRACT_USE_TYPE: buildingAbstractUseType,
                          BUILDING_ABSTRACT_PARAMETERS: buildingAbstractParam,
                          ROAD_ABSTRACT_TYPE: roadAbstractType,

diff --git a/prepare_data/src/main/groovy/org/orbisgis/common/InputDataFormatting.groovy b/prepare_data/src/main/groovy/org/orbisgis/common/InputDataFormatting.groovy
@@ -149,7 +149,7 @@ static IProcess inputDataFormatting(){
                 def VEGET_STATS_EXT_ZONE='VEGET_STATS_EXT_ZONE'
 
                 //Run the sql script
-                datasource.executeScript(getClass().getResource('inputDataFormatting.sql').toString(),
+                datasource.executeScript(getClass().getResourceAsStream('inputDataFormatting.sql'),
                             [INPUT_BUILDING : inputBuilding, INPUT_ROAD: inputRoad, INPUT_RAIL: inputRail,
                              INPUT_HYDRO  : inputHydro, INPUT_VEGET: inputVeget, ZONE: inputZone, ZONE_NEIGHBORS: inputZoneNeighbors,
                              H_LEV_MIN : hLevMin, H_LEV_MAX: hLevMax, H_THRESHOLD_LEV2: hThresholdLev2, ID_ZONE: idZone,

diff --git a/processing_chain/src/main/groovy/org/orbisgis/processingchain/PrepareOSM.groovy b/processing_chain/src/main/groovy/org/orbisgis/processingchain/PrepareOSM.groovy
@@ -2,7 +2,9 @@ package org.orbisgis.processingchain
 
 import groovy.transform.BaseScript
 import org.orbisgis.SpatialUnits
+import org.orbisgis.common.AbstractTablesInitialization
 import org.orbisgis.datamanager.JdbcDataSource
+import org.orbisgis.osm.OSMGISLayers
 import org.orbisgis.processingchain.ProcessingChain
 import org.orbisgis.processmanagerapi.IProcess
 import org.orbisgis.processmanagerapi.IProcessFactory
@@ -433,7 +435,7 @@ import org.slf4j.LoggerFactory
 
 
                     //Init model
-                    IProcess initParametersAbstract = org.orbisgis.common.AbstractTablesInitialization.initParametersAbstract()
+                    IProcess initParametersAbstract = AbstractTablesInitialization.initParametersAbstract()
                     if(!initParametersAbstract.execute(datasource:datasource)){
                         logger.info("Cannot initialize the geoclimate data model.")
                         return
@@ -443,7 +445,7 @@ import org.slf4j.LoggerFactory
 
                     logger.info("Transform OSM data to GIS tables.")
 
-                    IProcess prepareBuildings = org.orbisgis.osm.OSMGISLayers.prepareBuildings()
+                    IProcess prepareBuildings = OSMGISLayers.prepareBuildings()
 
                     if(!prepareBuildings.execute([datasource:datasource, osmTablesPrefix:osmTablesPrefix,
                                               buildingTableColumnsNames : buildingTableColumnsNames,