issue #93 and #94

ec-melodies · Oct 18, 2016 · fb05bf2 · fb05bf2
1 parent 9ac8a80
commit fb05bf2
Show file tree

Hide file tree

Showing 8 changed files with 944 additions and 11 deletions.
diff --git a/pom.xml b/pom.xml
@@ -86,7 +86,7 @@
 							</resources>
 						</configuration>
 					</execution>
-					<!--<execution>
+					<execution>
 						<id>copy-data-resources</id>
 						<phase>install</phase>
 						<goals>
@@ -98,12 +98,12 @@
 								<resource>
 									<directory>${basedir}/src/main/app-resources/</directory>
 									<includes>
-										<include>**/GRASS_data/**</include>
+										<include>**/variables.txt</include>
 									</includes>
 								</resource>
 							</resources>
 						</configuration>
-					</execution>-->
+					</execution>
 				</executions>
 			</plugin>
 

diff --git a/src/main/app-resources/application.xml b/src/main/app-resources/application.xml
@@ -7,6 +7,7 @@
         <parameter id="years" title="Years" abstract="Set the Years(s) you want to generate" scope="runtime" maxOccurs="1"></parameter>
         <parameter id="MMU" title="MMU" abstract="Set the Minimum Mapping Unit in hectares for your final Land Cover map" scope="runtime" maxOccurs="1"></parameter>
         <parameter id="User_training_data" title="User training data" abstract="Paste link to User Training Data zip file" scope="runtime" maxOccurs="1"/>
+        <parameter id="User_config_file" title="User configuration file" abstract="Paste link to User Configuration file - variables.txt" scope="runtime" maxOccurs="1"/>
         <parameter id="JobID" title="JobID" abstract="teste" scope="runtime" maxOccurs="1"/>
       </defaultParameters>
       <defaultJobconf>
@@ -26,6 +27,7 @@
         <parameter id="years"></parameter>
         <parameter id="MMU">10</parameter>
         <parameter id="User_training_data">no</parameter>
+        <parameter id="User_config_file">no</parameter>
       </parameters>
     </node>
   </workflow>

diff --git a/src/main/app-resources/bin/lulc_main.py b/src/main/app-resources/bin/lulc_main.py
@@ -317,7 +317,7 @@ def main():
     ciop = cioppy.Cioppy()
     dirname=os.path.dirname
     appdir=os.path.abspath(os.path.join(os.path.dirname(__file__),".."))
-    variablesfile= os.path.join(appdir,'variables.txt')
+    variablesfile= os.path.join('/data','variables.txt')
     getVarFromFile(variablesfile)
     gisbase = data.gisbase
     gisdbase = data.gisdbase
@@ -344,6 +344,7 @@ def main():
     spatialr = data.spatialr
     maxiter = data.maxiter
     ranger = data.ranger
+    outputgeotriplesfile = data.outputgeotriplesfile
     threshold = data.threshold
     minsize = data.minsize
     tilesize = data.tilesize
@@ -602,7 +603,9 @@ def main():
                     grass.run_command('r.colors', map = gen_lulcmap, rules = lulc_color_path, quiet=True)
                     grass.run_command("r.out.gdal", input=gen_lulcmap, output=lulcmaptif, overwrite=True)				
 			    	#PUBLISH DATA
-                    write_metadata(lulcmaptif.replace('.tif','_metadata.xml'),gen_lulcmap,lulcmaptif,name_dry,name_wet,MMU)		
+                    write_metadata(lulcmaptif.replace('.tif','_metadata.xml'),gen_lulcmap,lulcmaptif,name_dry,name_wet,MMU)	
+                    write_metadata_mapping(lulcmaptif.replace('.tif','_metadata.xml'),"/application/etc/mapping_wp7.ttl",lulcmaptif.replace('.tif','_metadata.ttl'))
+                    convert_to_geotriples(lulcmaptif.replace('.tif','_metadata.ttl'),outputgeotriplesfile)					
                     ciop.publish(lulcmaptif, metalink = True)		
                     ciop.publish(lulcmaptif.replace('.tif','_metadata.xml'), metalink = True)
                     if p_aa==0: