[GRASS-SVN] r40982 - in grass-addons/ossim_grass: r.planet v.planet

[svn_grass at osgeo.org]

Author: epifanio
Date: 2010-02-13 18:38:58 -0500 (Sat, 13 Feb 2010)
New Revision: 40982

Modified:
   grass-addons/ossim_grass/r.planet/r.planet.py
   grass-addons/ossim_grass/v.planet/v.planet.py
Log:
adjusted output directory three

Modified: grass-addons/ossim_grass/r.planet/r.planet.py
===================================================================
--- grass-addons/ossim_grass/r.planet/r.planet.py	2010-02-13 16:38:40 UTC (rev 40981)
+++ grass-addons/ossim_grass/r.planet/r.planet.py	2010-02-13 23:38:58 UTC (rev 40982)
@@ -103,14 +103,17 @@
 	try :
 		rasterpath = os.path.join(grassenv['GISDBASE'], grassenv['LOCATION_NAME'], mappa[1], 'cellhd') 
 		mapfile = os.path.join(rasterpath, mappa[0])
-		vrtdir = os.path.join(grassenv['GISDBASE'], grassenv['LOCATION_NAME'], mappa[1], 'vrt')
+		vrtdir = os.path.join(grassenv['GISDBASE'], grassenv['LOCATION_NAME'], mappa[1], 'vrt/raster/')
+		#print vrtdir
 	except :
 		rasterpath = os.path.join(grassenv['GISDBASE'], grassenv['LOCATION_NAME'], grassenv['MAPSET'], 'cellhd')
 		mapfile = os.path.join(rasterpath, mappa[0])   
-		vrtdir = os.path.join(grassenv['GISDBASE'], grassenv['LOCATION_NAME'], grassenv['MAPSET'], 'vrt')
+		vrtdir = os.path.join(grassenv['GISDBASE'], grassenv['LOCATION_NAME'], grassenv['MAPSET'], 'vrt/raster/')
+		#print vrtdir
 	d = os.path.dirname(vrtdir)
 	if not os.path.exists(d):
 		os.makedirs(d)
+	#os.makedirs(d)
 	vrtfilename =  mappa[0] + '.vrt'
 	output = os.path.join(vrtdir, vrtfilename) 
 	if not os.path.exists(output):
@@ -142,8 +145,8 @@
 		if orthoigen :
 			if tile != '':
 				path = os.path.dirname(output)
-				elevdir = os.path.join(path,'elevation',mappa[0])
-				if not os.path.exists(d):
+				elevdir = os.path.join(path,'elevation',mappa[0]+'/')
+				if not os.path.exists(elevdir):
 					os.makedirs(elevdir)
 				elev = mappa[0]+'.tiff'
 				exportiff(output,elev)
@@ -164,6 +167,7 @@
 	ossimdata.connect((host, int(dport)))
 	ossimdata.send(ossim_data_xml)
 	ossimdata.close()
+	
 
 def zoomto(lon,lat,distance,host,pport):
 	ossim_zoom_xml = '<Set target=":navigator" vref="wgs84"><Camera><longitude>%s</longitude><latitude>%s</latitude><altitude>%s</altitude><heading>0</heading><pitch>0</pitch><roll>0</roll><altitudeMode>absolute</altitudeMode><range>%s</range></Camera></Set>' % (lon, lat, distance, distance)

Modified: grass-addons/ossim_grass/v.planet/v.planet.py
===================================================================
--- grass-addons/ossim_grass/v.planet/v.planet.py	2010-02-13 16:38:40 UTC (rev 40981)
+++ grass-addons/ossim_grass/v.planet/v.planet.py	2010-02-13 23:38:58 UTC (rev 40982)
@@ -131,11 +131,11 @@
 	try :
 		vectorpath = os.path.join(grassenv['GISDBASE'], grassenv['LOCATION_NAME'], mappa[1], 'vector' , mappa[0] ) 
 		mapfile = os.path.join(vectorpath, 'head')
-		vrtdir = os.path.join(grassenv['GISDBASE'], grassenv['LOCATION_NAME'], mappa[1], 'vrt', 'vector')
+		vrtdir = os.path.join(grassenv['GISDBASE'], grassenv['LOCATION_NAME'], mappa[1], 'vrt', 'vector/')
 	except :
 		vectorpath = os.path.join(grassenv['GISDBASE'], grassenv['LOCATION_NAME'], grassenv['MAPSET'], mappa[0] )
 		mapfile = os.path.join(vectorpath, 'head' )   
-		vrtdir = os.path.join(grassenv['GISDBASE'], grassenv['LOCATION_NAME'], grassenv['MAPSET'], 'vrt', 'vector')
+		vrtdir = os.path.join(grassenv['GISDBASE'], grassenv['LOCATION_NAME'], grassenv['MAPSET'], 'vrt', 'vector/')
 	d = os.path.dirname(vrtdir)
 	if not os.path.exists(d):
 		os.makedirs(d)