From 20751de040e35d4556c382ebe3a11d065e94b5d7 Mon Sep 17 00:00:00 2001 From: Simon Liu Date: Mon, 20 Nov 2023 14:19:24 -0800 Subject: [PATCH] fix pylint flake8 --- podaac/subsetter/subset.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/podaac/subsetter/subset.py b/podaac/subsetter/subset.py index 8ef2eac0..9ad002d6 100644 --- a/podaac/subsetter/subset.py +++ b/podaac/subsetter/subset.py @@ -38,7 +38,7 @@ import pandas as pd import xarray as xr import xarray.coding.times -from shapely.geometry import Point +from shapely.geometry import Point, Polygon, MultiPolygon from shapely.ops import transform from podaac.subsetter import gpm_cleanup as gc @@ -959,9 +959,6 @@ def subset_with_shapefile(dataset: xr.Dataset, # assumption that the shapefile is -180,180. if is_360(dataset[lon_var_name], lon_scale, lon_offset): # Transform - def convert_180_to_360(lon, lat): - return tuple(map(lambda value: value + 360 if value < 0 else value, lon)), lat - def translate_longitude(geometry): def translate_point(point): # Translate the point's x-coordinate (longitude) by adding 360 @@ -969,11 +966,11 @@ def translate_point(point): def translate_polygon(polygon): def translate_coordinates(coords): - first_coord = coords[0] if len(coords[0]) == 2: - return [((x+360)%360, y) for x,y in coords] - elif len(coords[0]) == 3: - return [((x+360)%360, y, z) for x,y,z in coords] + return [((x + 360) % 360, y) for x, y in coords] + if len(coords[0]) == 3: + return [((x + 360) % 360, y, z) for x, y, z in coords] + return coords exterior = translate_coordinates(polygon.exterior.coords) @@ -984,7 +981,7 @@ def translate_coordinates(coords): return Polygon(exterior, interiors) - if isinstance(geometry, (Point, Polygon)): + if isinstance(geometry, (Point, Polygon)): # pylint: disable=no-else-return return translate_point(geometry) if isinstance(geometry, Point) else translate_polygon(geometry) elif isinstance(geometry, MultiPolygon): # Translate each polygon in the MultiPolygon