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.

Sign up for GitHub

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

added cloud_score+ #48

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

added cloud_score+ #48

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 19 additions & 2 deletions ee_extra/QA/clouds.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,10 @@ def maskClouds(
method : Method used to mask clouds.\n
Available options:
- 'cloud_prob' : Use cloud probability.
- 'cloud_score+' : Use cloud score+.
- 'qa' : Use Quality Assessment band.
This parameter is ignored for Landsat products.
prob : Cloud probability threshold. Valid just for method = 'cloud_prob'. This parameter is ignored for Landsat products.
prob : Cloud probability threshold. Valid for method = 'cloud_prob' or 'cloud_score+'. This parameter is ignored for Landsat products.
maskCirrus : Whether to mask cirrus clouds. Valid just for method = 'qa'. This parameter is ignored for Landsat products.
maskShadows : Whether to mask cloud shadows. For more info see 'Braaten, J. 2020. Sentinel-2 Cloud Masking with s2cloudless. Google Earth Engine, Community Tutorials'.
scaledImage : Whether the pixel values are scaled to the range [0,1] (reflectance values). This parameter is ignored for Landsat products.
Expand All @@ -43,7 +44,7 @@ def maskClouds(
Cloud-shadow masked image or image collection.
"""

validMethods = ["cloud_prob", "qa"]
validMethods = ["cloud_prob", "cloud_score+", "qa"]

if method not in validMethods:
raise Exception(
Expand All @@ -60,6 +61,11 @@ def cloud_prob(img):
clouds = ee.Image(img.get("cloud_mask")).select("probability")
isCloud = clouds.gte(prob).rename("CLOUD_MASK")
return img.addBands(isCloud)

def cloud_score(img):
clouds = img.select("cs_cdf")
isCloud = clouds.lte(1-(prob/100)).rename("CLOUD_MASK")
return img.addBands(isCloud)

def QA(img):
qa = img.select("QA60")
Expand Down Expand Up @@ -128,6 +134,11 @@ def apply_mask(img):
ee.ImageCollection(args), S2Clouds, fil
)
S2Masked = ee.ImageCollection(S2WithCloudMask).map(cloud_prob).first()
elif method == 'cloud_score+':
QA_BAND = 'cs_cdf'
S2Clouds = ee.ImageCollection('GOOGLE/CLOUD_SCORE_PLUS/V1/S2_HARMONIZED').select(QA_BAND)
S2WithCloudMask = ee.ImageCollection(args).linkCollection(S2Clouds, [QA_BAND])
S2Masked = ee.ImageCollection(S2WithCloudMask).map(cloud_score).first()
elif method == "qa":
S2Masked = QA(args)
if cdi != None:
Expand All @@ -145,6 +156,11 @@ def apply_mask(img):
args, S2Clouds, fil
)
S2Masked = ee.ImageCollection(S2WithCloudMask).map(cloud_prob)
elif method == 'cloud_score+':
QA_BAND = 'cs_cdf'
S2Clouds = ee.ImageCollection('GOOGLE/CLOUD_SCORE_PLUS/V1/S2_HARMONIZED').select(QA_BAND)
S2WithCloudMask = ee.ImageCollection(args).linkCollection(S2Clouds, [QA_BAND])
S2Masked = ee.ImageCollection(S2WithCloudMask).map(cloud_score)
elif method == "qa":
S2Masked = args.map(QA)
if cdi != None:
Expand Down Expand Up @@ -336,3 +352,4 @@ def VNP13A1(args):
else:
masked = x.map(lookup[platformDict["platform"]])
return masked