Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release: V6.7.0 #235

Merged
merged 50 commits into from
Nov 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
4b17683
adds frame number support for new Sentinel-1 Interferogram (BETA) pro…
May 30, 2023
5af62d8
update changelog
May 30, 2023
5ecb09a
adds asf_frame_asf_platforms check to should_use_asf_frame, asfPlatfo…
May 31, 2023
3fd55e1
update changelog
May 31, 2023
cde9f9f
Merge branch 'master' into bugfix-frameNumber-s1-aria-gunw
Jun 8, 2023
bc34b54
removes asfPlatform keyword from field_map, validator_map, translate
Jun 8, 2023
55f491d
removes blank space added in changelog
Jun 9, 2023
7213a91
fix asf logger method name error
kevinxmorales Oct 1, 2023
d721c22
adds ERS-1/2, JERS-1, and RADARASAT-1 to list of products that use FR…
Oct 18, 2023
93de226
update changelog
Oct 18, 2023
0ce7234
Merge pull request #229 from asfadmin/topic-ers-jers-radar-framenumber
SpicyGarlicAlbacoreRoll Oct 18, 2023
f90baad
Merge branch 'master' into master
SpicyGarlicAlbacoreRoll Oct 18, 2023
75d4bfd
Merge pull request #227 from kevinxmorales/master
SpicyGarlicAlbacoreRoll Oct 19, 2023
c28eadc
adds datasets keyword, removes explcicit umm versioning, update chang…
Nov 3, 2023
aa5537c
adds RTC/CSLC-STATIC concept ids to opera dataset collections
Nov 3, 2023
5881ada
adds opera burst id as searchable param
Nov 6, 2023
06f46e9
check fileID instead of sceneName in opera check
Nov 6, 2023
b3b6f5d
accounts for products with undefined fileIDs
Nov 6, 2023
e12e2b0
adds explicit fileID None check around OPERA product check
Nov 6, 2023
d33cdbc
error handling for invalid dataset passed to datasets keyword
Nov 6, 2023
cf9c311
update OPERA-S1 dataset collections list
Nov 7, 2023
19fd587
WIP: adds test case for datasets keyword
Nov 7, 2023
ea4774c
adds test for datasets based search
Nov 7, 2023
e80946a
collects dataset concept ids by shortNames
Nov 7, 2023
c8ae701
rolls dataset tests into project testing framework
Nov 8, 2023
076ecdc
adds check for S1/ALOS dataset to should_use_asf_frame()
Nov 8, 2023
0eda5ad
changes 'datasets' to 'dataset'
Nov 8, 2023
2a9cc9d
update test name
Nov 8, 2023
fddc544
fixes search test using "datasets"
Nov 8, 2023
12a3172
fixes last instance of "datasets"
Nov 8, 2023
70b6238
Merge pull request #232 from asfadmin/feature-dataset-search
SpicyGarlicAlbacoreRoll Nov 8, 2023
ea3ff69
Merge branch 'master' into topic-opera-burst-id
Nov 8, 2023
6f1bc52
uses list for opera product polarizations
Nov 9, 2023
9854c81
fixes issue with downloading all opera products
Nov 9, 2023
bdbd55a
updates changelog
Nov 9, 2023
7afa2da
Merge branch 'master' into bugfix-frameNumber-s1-aria-gunw
Nov 9, 2023
6e263a4
adds non-beta version to list of asf_frame_platforms
Nov 9, 2023
234f758
update changelog
Nov 9, 2023
ae0eb16
Merge pull request #200 from asfadmin/bugfix-frameNumber-s1-aria-gunw
SpicyGarlicAlbacoreRoll Nov 9, 2023
64740f7
Merge branch 'master' into topic-opera-burst-id
Nov 9, 2023
6e3c67f
changes urrlib parse import
Nov 9, 2023
df971ed
wraps walrus in parenthesis
Nov 9, 2023
811e5d7
Added constant to let users adjust CMR Timing out, instead of hard-co…
Cameronsplaze Nov 9, 2023
593cb79
Removing debug prints
Cameronsplaze Nov 9, 2023
014d4f6
Added extra info to the exception, now that it's avalible
Cameronsplaze Nov 9, 2023
64ed737
Merge pull request #234 from asfadmin/cs.add_timeout_variable
Cameronsplaze Nov 9, 2023
bbdcb49
Merge branch 'master' into topic-opera-burst-id
SpicyGarlicAlbacoreRoll Nov 9, 2023
6b00e8f
Merge pull request #233 from asfadmin/topic-opera-burst-id
SpicyGarlicAlbacoreRoll Nov 9, 2023
292a5eb
Update CHANGELOG.md
SpicyGarlicAlbacoreRoll Nov 9, 2023
5f9ff0b
Merge branch 'stable' into master
SpicyGarlicAlbacoreRoll Nov 9, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,22 @@ and uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-

-->
------
## [v6.7.0](https://github.com/asfadmin/Discovery-asf_search/compare/v6.6.3...v6.7.0)
### Added
- Adds new `dataset` keyword to `search()` as an alternative to `platform`. Allows users to get results from multiple platforms at once in a single page
- Adds `operaBurstID` keyword to `search()`
- Adds OPERA-S1 param `operaBurstID` to `ASFProduct.properties`, and adds Opera product urls to `additionalUrls`
- OPERA-S1 RTC product `polarization` now shows both polarizations as list
- adds `frameNumber` properties support for new `Sentinel-1 Interferogram` products
- added `CMR_TIMEOUT` constant. This is the amount of time in seconds to wait without seeing *any* data. (Default=30)

### Changed
- Changes `CMR_FORMAT_EXT` constant from `umm_json_v1_4` to `umm_json`, umm returned from CMR will now be in latest umm format by default

### Fixed
- ERS-1, ERS-2, JERS-1, and RADARSAT-1 now assign `FRAME_NUMBER` to the `frameNumber` properties field

------
## [v6.6.3](https://github.com/asfadmin/Discovery-asf_search/compare/v6.6.2...v6.6.3)
### Fixed
Expand Down
13 changes: 10 additions & 3 deletions asf_search/ASFProduct.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import os
import warnings
from shapely.geometry import shape, Point, Polygon, mapping
import json

from urllib import parse

from asf_search import ASFSession, ASFSearchResults
from asf_search.ASFSearchOptions import ASFSearchOptions
from asf_search.download import download_url
Expand Down Expand Up @@ -64,10 +67,14 @@ def download(self, path: str, filename: str = None, session: ASFSession = None,

def get_additional_urls():
output = []
base_filename = '.'.join(default_filename.split('.')[:-1])
for url in self.properties['additionalUrls']:
extension = url.split('.')[-1]
urls.append((f"{base_filename}.{extension}", url))
if self.properties['processingLevel'] == 'BURST':
# Burst XML filenames are just numbers, this makes it more indentifiable
file_name = '.'.join(default_filename.split('.')[:-1]) + url.split('.')[-1]
else:
# otherwise just use the name found in the url
file_name = os.path.split(parse.urlparse(url).path)[1]
urls.append((f"{file_name}", url))

return output

Expand Down
2 changes: 1 addition & 1 deletion asf_search/ASFSearchOptions/ASFSearchOptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ def merge_args(self, **kwargs) -> None:
# Spit out warning if the value is something other than the default:
if not self._is_val_default(key):
msg = f'While merging search options, existing option {key}:{getattr(self, key, None)} overwritten by kwarg with value {kwargs[key]}'
ASF_LOGGER.warging(msg)
ASF_LOGGER.warning(msg)
warnings.warn(msg)
self.__setattr__(key, kwargs[key])

Expand Down
12 changes: 7 additions & 5 deletions asf_search/ASFSearchOptions/validator_map.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,14 @@ def validate(key, value):
'instrument': parse_string,
'collections': parse_string_list,
'temporalBaselineDays': parse_string_list,

'operaBurstID': parse_string_list,
'absoluteBurstID': parse_int_list,
'relativeBurstID': parse_int_list,
'fullBurstID': parse_string_list,
'dataset': parse_string_list,

# Config parameters Parser
'session': parse_session,
'host': parse_string,
'provider': parse_string,
'absoluteBurstID': parse_int_list,
'relativeBurstID': parse_int_list,
'fullBurstID': parse_string_list
'provider': parse_string
}
3 changes: 2 additions & 1 deletion asf_search/CMR/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from .MissionList import get_campaigns
from .subquery import build_subqueries
from .translate import translate_product, translate_opts, get_additional_fields
from .field_map import field_map
from .field_map import field_map
from .datasets import dataset_collections
Loading
Loading