find products

README.md

@@ -87,8 +87,23 @@ The script works as follows:
 
 
 ### Example
+```json
+{
+	"wkt":"POLYGON((-89.62955474853516 21.05230266883862,-89.55093383789061 21.05230266883862,-89.52930450439452 20.965126493194475,-89.6484375 20.873408465645696,-89.72877502441405 20.95294341625548,-89.65805053710938 21.056788298627097,-89.62955474853516 21.05230266883862))" ,
+	"platform": "Sentinel-2",
+	"productLevel":"L2A",
+	"startDate": "20181001",
+	"endDate": "20181101",
+	"clouds":"40",
+	"productsDir":"/home/geoint/NAS/sentinelImages/L2A/",
+	"linksDir": "/home/geoint/NAs/merida/"
+}
+
+
+```
+## Extract Images from Product ZIP File (`tools/L2AProductListExtractData.sh`)
 ```bash
-findProducts.py "POLYGON((-89.62955474853516 21.05230266883862,-89.55093383789061 21.05230266883862,-89.52930450439452 20.965126493194475,-89.6484375 20.873408465645696,-89.72877502441405 20.95294341625548,-89.65805053710938 21.056788298627097,-89.62955474853516 21.05230266883862))" 20181001 20181101 Sentinel-2 30 /home/geoint/NAS/sentinelImages/L2A/ /home/geoint/NAS/merida/
+findProducts.py cfg.json
 
 ```
 ## Extract Images from Product ZIP File (`tools/L2AProductListExtractData.sh`)

examples/findproducts.json

+{
+	"wkt":"POLYGON((-89.62955474853516 21.05230266883862,-89.55093383789061 21.05230266883862,-89.52930450439452 20.965126493194475,-89.6484375 20.873408465645696,-89.72877502441405 20.95294341625548,-89.65805053710938 21.056788298627097,-89.62955474853516 21.05230266883862))" ,
+	"platform": "Sentinel-2",
+	"productLevel":"L2A",
+	"startDate": "20181001",
+	"endDate": "20181101",
+	"clouds":"40",
+	"productsDir":"/home/geoint/NAS/sentinelImages/L2A/",
+	"linksDir": "/home/geoint/NAs/merida/"
+}
+
+

geosentinel/findProducts.py

@@ -3,9 +3,6 @@
 
 import sys, os
 import json
-from contextlib import contextmanager
-import contextlib
-
 
 sys.path.append('/home/geoint/GeoSentinel')
 from geosentinel import APISentinel
@@ -13,15 +10,6 @@ from geosentinel import polygonToBox
 
 from datetime import date 
 
-#@contextmanager
-#def suppress_stdout():
-#    with open(os.devnull, "w") as devnull:
-#        old_stdout = sys.stdout
-#        sys.stdout = devnull
-#        try:  
-#            yield
-#        finally:
-#            sys.stdout = old_stdout
 
 def findSentinelProducts(wkt, startDate, endDate, platform, cloud):
 	sentinel = APISentinel.APISentinel('asalazarg',  'geo135asg')
@@ -33,17 +21,19 @@ def findSentinelProducts(wkt, startDate, endDate, platform, cloud):
 def main(argv):
 
 	if len(sys.argv) != 8:
-		print("Usage: " + argv[0] + " <WKT Polygon> <Start Date> <End Date> <Platform> <Maximum Cloud %> <Source> <Destination>")
+		print("Usage: " + argv[0] + " <JSON File>")
 	else:
-#	        with suppress_stdout():
-#		with contextlib.redirect_stdout(None):
-		wkt = polygonToBox.getWKTPolygonBoundingBox(sys.argv[1], True)
-		productList = findSentinelProducts(wkt, sys.argv[2], sys.argv[3], sys.argv[4], sys.argv[5])
+		jsonFile=open(argv[1]).read()
+		cfg = json.loads(jsonFile)
+
+		wkt = polygonToBox.getWKTPolygonBoundingBox(cfg['wkt'], True)
+		productList = findSentinelProducts(wkt, cfg['startDate'], cfg['endDate'], cfg['platform'], cfg['clouds'])
+
  
-		fileNames = [productList[k]['filename'].replace("SAFE", "zip").replace("L1C", "L2A") for k in productList.keys() ]
+		fileNames = [productList[k]['filename'].replace("SAFE", "zip").replace(productList[k]['filename'][:3], cfg['productLevel']) for k in productList.keys() ]
 
-		inDir =  sys.argv[6]
-		outdir =  sys.argv[7]
+		inDir =  cfg["productsDir"]
+		outdir =  cfg["linksDir"]
 		dirList = os.listdir(inDir)
 		
 		matchingProducts = set(fileNames).intersection(set(dirList))
@@ -53,7 +43,6 @@ def main(argv):
 		for f in matchingProducts:
 			print (f)
 			os.system("ln -s " + inDir+f + " " + outdir+f)
-#			print ("ln -s " + inDir+f + " " + outdir+f)
 		print (str(len(matchingProducts)) + " Linked to " + outdir)
 		
 if __name__ == "__main__":