Included urls

tkrajina · tkrajina · commit c504c0a3346e · 2013-06-10T19:33:10.000+02:00
diff --git a/setup.py b/setup.py
@@ -26,10 +26,11 @@
     author_email = 'tkrajina@gmail.com',
     url = 'https://github.com/tkrajina/srtm.py',
     packages = ['srtm',],
+    package_data = {'': ['*.json']},
+    include_package_data = True,
     classifiers = [
         "Programming Language :: Python",
         "Programming Language :: Python :: 2",
-#        "Programming Language :: Python :: 3",
     ],
     scripts=['gpxelevations']
 )
diff --git a/srtm/__init__.py b/srtm/__init__.py
@@ -27,7 +27,11 @@
 SRTM1_URL = 'http://dds.cr.usgs.gov/srtm/version2_1/SRTM1/'
 SRTM3_URL = 'http://dds.cr.usgs.gov/srtm/version2_1/SRTM3/'
 
-def get_data(reduce_big_files=False, leave_zipped=False, file_handler=None):
+package_location = mod_data.__file__[: mod_data.__file__.rfind(mod_path.sep)]
+DEFAULT_LIST_JSON = package_location + mod_os.sep + 'list.json'
+
+def get_data(reduce_big_files=False, leave_zipped=False, file_handler=None,
+             use_included_urls=True):
     """
     Get the utility object for querying elevation data.
 
@@ -55,27 +59,36 @@ def get_data(reduce_big_files=False, leave_zipped=False, file_handler=None):
     if not file_handler:
         file_handler = FileHandler()
 
-    files_list_file_name = 'list.json'
-    try:
-        contents = file_handler.read(files_list_file_name)
+    srtm1_files, srtm3_files = _get_urls(use_included_urls, file_handler)
 
-        urls = mod_json.loads(contents)
+    assert srtm1_files
+    assert srtm3_files
+
+    return mod_data.GeoElevationData(srtm1_files, srtm3_files, file_handler=file_handler,
+                                     reduce_big_files=reduce_big_files,
+                                     leave_zipped=leave_zipped)
 
-        srtm1_files = urls['srtm1']
-        srtm3_files = urls['srtm3']
+def _get_urls(use_included_urls, file_handler):
+    files_list_file_name = 'list.json'
+    try:
+        urls_json = _get_urls_json(use_included_urls, file_handler)
+        return urls_json['srtm1'], urls_json['srtm3']
     except:
         srtm1_files = mod_retriever.retrieve_all_files_urls(SRTM1_URL)
         srtm3_files = mod_retriever.retrieve_all_files_urls(SRTM3_URL)
 
         file_handler.write(files_list_file_name,
                            mod_json.dumps({'srtm1': srtm1_files, 'srtm3': srtm3_files}, sort_keys=True, indent=4))
 
-    assert srtm1_files
-    assert srtm3_files
+        return srtm1_files, srtm3_files
 
-    return mod_data.GeoElevationData(srtm1_files, srtm3_files, file_handler=file_handler,
-                                     reduce_big_files=reduce_big_files,
-                                     leave_zipped=leave_zipped)
+def _get_urls_json(use_included_urls, file_handler):
+    if use_included_urls:
+        with open(DEFAULT_LIST_JSON, 'r') as f:
+            return mod_json.loads(f.read())
+
+    contents = file_handler.read(files_list_file_name)
+    return mod_json.loads(contents)
 
 class FileHandler:
     """
diff --git a/srtm/list.json b/srtm/list.json
