diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index a53884a1b..043d858f5 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -21,6 +21,7 @@ order by last name) and are considered "The icepyx Developers": * `Jessica Scheick `_ - Unaffiliated (ORCID: `0000-0002-3421-4459 `_) * `David Shean `_ - University of Washington * `Ben Smith `_ - University of Washington +* `Trey Stafford `_ - NSIDC, University of Colorado * `Amy Steiker `_ - NSIDC, University of Colorado * `Tyler Sutterley `_ - University of Washington * `Anna Valentine `_ - Colorado School of Mines diff --git a/examples/ICESat-2_DAAC_DataAccess_Example.ipynb b/examples/ICESat-2_DAAC_DataAccess_Example.ipynb index 4dd9e2327..e9ce68a75 100644 --- a/examples/ICESat-2_DAAC_DataAccess_Example.ipynb +++ b/examples/ICESat-2_DAAC_DataAccess_Example.ipynb @@ -354,7 +354,7 @@ "metadata": {}, "source": [ "Once we have generated our session, we must build the required configuration parameters needed to actually download data. These will tell the system how we want to download the data. As with the CMR search parameters, these will be built automatically when you run `region_a.order_granules()`, but you can also create and view them with `region_a.reqparams`. The default parameters, given below, should work for most users.\n", - "- `page_size` = 10. This is the number of granules we will request per order.\n", + "- `page_size` = 2000. This is the number of granules we will request per order.\n", "- `page_num` = 1. Determine the number of pages based on page size and the number of granules available. If no page_num is specified, this calculation is done automatically to set page_num, which then provides the number of individual orders we will request given the number of granules.\n", "- `request_mode` = 'async'\n", "- `agent` = 'NO'\n", diff --git a/icepyx/core/APIformatting.py b/icepyx/core/APIformatting.py index 7c5c9b8a7..e7fce8f7c 100644 --- a/icepyx/core/APIformatting.py +++ b/icepyx/core/APIformatting.py @@ -193,13 +193,13 @@ def combine_params(*param_dicts): Examples -------- >>> CMRparams = {'short_name': 'ATL06', 'version': '002', 'temporal': '2019-02-20T00:00:00Z,2019-02-28T23:59:59Z', 'bounding_box': '-55,68,-48,71'} - >>> reqparams = {'page_size': 10, 'page_num': 1} + >>> reqparams = {'page_size': 2000, 'page_num': 1} >>> icepyx.core.APIformatting.combine_params(CMRparams, reqparams) {'short_name': 'ATL06', 'version': '002', 'temporal': '2019-02-20T00:00:00Z,2019-02-28T23:59:59Z', 'bounding_box': '-55,68,-48,71', - 'page_size': 10, + 'page_size': 2000, 'page_num': 1} """ params = {} @@ -223,10 +223,10 @@ def to_string(params): Examples -------- >>> CMRparams = {'short_name': 'ATL06', 'version': '002', 'temporal': '2019-02-20T00:00:00Z,2019-02-28T23:59:59Z', 'bounding_box': '-55,68,-48,71'} - >>> reqparams = {'page_size': 10, 'page_num': 1} + >>> reqparams = {'page_size': 2000, 'page_num': 1} >>> params = icepyx.core.APIformatting.combine_params(CMRparams, reqparams) >>> icepyx.core.APIformatting.to_string(params) - 'short_name=ATL06&version=002&temporal=2019-02-20T00:00:00Z,2019-02-28T23:59:59Z&bounding_box=-55,68,-48,71&page_size=10&page_num=1' + 'short_name=ATL06&version=002&temporal=2019-02-20T00:00:00Z,2019-02-28T23:59:59Z&bounding_box=-55,68,-48,71&page_size=2000&page_num=1' """ param_list = [] for k, v in params.items(): @@ -441,7 +441,7 @@ def build_params(self, **kwargs): else: reqkeys = self.poss_keys[self._reqtype] defaults = { - "page_size": 10, + "page_size": 2000, "page_num": 1, "request_mode": "async", "include_meta": "Y", diff --git a/icepyx/core/query.py b/icepyx/core/query.py index d56c61770..7844b8046 100644 --- a/icepyx/core/query.py +++ b/icepyx/core/query.py @@ -387,14 +387,14 @@ def reqparams(self): -------- >>> reg_a = icepyx.query.Query('ATL06',[-55, 68, -48, 71],['2019-02-20','2019-02-28']) >>> reg_a.reqparams - {'page_size': 10, 'page_num': 1} + {'page_size': 2000, 'page_num': 1} >>> reg_a = icepyx.query.Query('ATL06',[-55, 68, -48, 71],['2019-02-20','2019-02-28']) >>> reg_a.earthdata_login(user_id,user_email) Earthdata Login password: ········ >>> reg_a.order_granules() >>> reg_a.reqparams - {'page_size': 10, 'page_num': 1, 'request_mode': 'async', 'include_meta': 'Y', 'client_string': 'icepyx'} + {'page_size': 2000, 'page_num': 1, 'request_mode': 'async', 'include_meta': 'Y', 'client_string': 'icepyx'} """ if not hasattr(self, "_reqparams"): diff --git a/icepyx/tests/test_APIformatting.py b/icepyx/tests/test_APIformatting.py index c4daf559f..3f7d5d427 100644 --- a/icepyx/tests/test_APIformatting.py +++ b/icepyx/tests/test_APIformatting.py @@ -1052,13 +1052,13 @@ def test_to_string(): "temporal": "2019-02-20T00:00:00Z,2019-02-28T23:59:59Z", "bounding_box": "-55,68,-48,71", } - reqparams = {"page_size": 10, "page_num": 1} + reqparams = {"page_size": 2000, "page_num": 1} params = apifmt.combine_params(CMRparams, reqparams) obs = apifmt.to_string(params) expected = ( "short_name=ATL06&version=002" "&temporal=2019-02-20T00:00:00Z,2019-02-28T23:59:59Z" - "&bounding_box=-55,68,-48,71&page_size=10&page_num=1" + "&bounding_box=-55,68,-48,71&page_size=2000&page_num=1" ) assert obs == expected