Reload srtm file list

tkrajina · tkrajina · commit 7c59e3b4bec8 · 2013-06-09T23:48:23.000+02:00
diff --git a/makefile b/makefile
@@ -21,5 +21,7 @@ upload-sample-images-to-github-pages: check-all-commited create-sample-images
 	git commit -m "Images"
 	git push origin gh-pages
 	git checkout master
+reload-urls:
+	python reload_srtm_file_list.py
 ctags:
 	ctags -R . /usr/lib/python2.7/
diff --git a/reload_srtm_file_list.py b/reload_srtm_file_list.py
@@ -21,7 +21,11 @@
 import pickle         as mod_pickle
 import os.path        as mod_path
 
-import data           as mod_data
+mod_logging.basicConfig(level=mod_logging.DEBUG,
+                        format='%(asctime)s %(name)-12s %(levelname)-8s %(message)s')
+
+SRTM1_URL = 'http://dds.cr.usgs.gov/srtm/version2_1/SRTM1/'
+SRTM3_URL = 'http://dds.cr.usgs.gov/srtm/version2_1/SRTM3/'
 
 def retrieve_all_files_urls(url):
     mod_logging.info('Retrieving {0}'.format(url))
@@ -58,9 +62,19 @@ def get_files(url):
 
     return result
 
-if __name__ == '__main__':
-    latitude = 45.
-    longitude = 45.
+srtm1_files = retrieve_all_files_urls(SRTM1_URL)
+srtm3_files = retrieve_all_files_urls(SRTM3_URL)
 
-    print get_geo_elevation_data()
+file_name = 'srtm/urls.py'
+with open(file_name, 'w') as f:
+    f.write('URLS = { \'srtm1\': {}, \'srtm3\': {} }\n')
+    keys = srtm1_files.keys()
+    keys.sort()
+    for key in keys:
+        f.write('URLS[\'srtm1\'][\'%s\'] = \'%s\'\n' % (key, srtm1_files[key]))
+    keys = srtm3_files.keys()
+    keys.sort()
+    for key in keys:
+        f.write('URLS[\'srtm3\'][\'%s\'] = \'%s\'\n' % (key, srtm3_files[key]))
 
+print 'Saved to %s' % file_name
diff --git a/srtm/__init__.py b/srtm/__init__.py
@@ -22,9 +22,7 @@
 
 from . import data      as mod_data
 from . import retriever as mod_retriever
-
-SRTM1_URL = 'http://dds.cr.usgs.gov/srtm/version2_1/SRTM1/'
-SRTM3_URL = 'http://dds.cr.usgs.gov/srtm/version2_1/SRTM3/'
+from . import urls      as mod_urls
 
 def get_default_srtm_dir():
     """ The default path to store files. """
@@ -66,24 +64,8 @@ def get_data(local_srtm_dir=None, reduce_big_files=False, leave_zipped=False):
     if not local_srtm_dir:
         raise Error('Please specify a path where to store files')
 
-    files_list_file_name = '{0}/list.json'.format(local_srtm_dir)
-    try:
-        f = open(files_list_file_name, 'r')
-        contents = f.read()
-        f.close()
-
-        urls = mod_json.loads(contents)
-
-        srtm1_files = urls['srtm1']
-        srtm3_files = urls['srtm3']
-    except:
-        srtm1_files = mod_retriever.retrieve_all_files_urls(SRTM1_URL)
-        srtm3_files = mod_retriever.retrieve_all_files_urls(SRTM3_URL)
-
-        f = open(files_list_file_name, 'w')
-        f.write(mod_json.dumps({'srtm1': srtm1_files, 'srtm3': srtm3_files},
-                               sort_keys=True, indent=4))
-        f.close()
+    srtm1_files = mod_urls.URLS['srtm1']
+    srtm3_files = mod_urls.URLS['srtm3']
 
     assert srtm1_files
     assert srtm3_files
diff --git a/srtm/urls.py b/srtm/urls.py
