NASADEM 2.0.0__tar.gz → 2.1.0__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (30) hide show
  1. {nasadem-2.0.0 → nasadem-2.1.0}/NASADEM/NASADEM.py +56 -31
  2. {nasadem-2.0.0 → nasadem-2.1.0/NASADEM.egg-info}/PKG-INFO +5 -4
  3. {nasadem-2.0.0 → nasadem-2.1.0}/NASADEM.egg-info/SOURCES.txt +2 -0
  4. {nasadem-2.0.0 → nasadem-2.1.0}/NASADEM.egg-info/requires.txt +2 -1
  5. {nasadem-2.0.0/NASADEM.egg-info → nasadem-2.1.0}/PKG-INFO +5 -4
  6. {nasadem-2.0.0 → nasadem-2.1.0}/README.md +2 -2
  7. nasadem-2.1.0/debug.py +8 -0
  8. {nasadem-2.0.0 → nasadem-2.1.0}/makefile +3 -1
  9. {nasadem-2.0.0 → nasadem-2.1.0}/notebooks/Generate a tile of elevation.ipynb +12 -223
  10. {nasadem-2.0.0 → nasadem-2.1.0}/pyproject.toml +3 -2
  11. nasadem-2.1.0/test_nasadem_elevation.py +129 -0
  12. {nasadem-2.0.0 → nasadem-2.1.0}/.github/.DS_Store +0 -0
  13. {nasadem-2.0.0 → nasadem-2.1.0}/.github/workflows/ci.yml +0 -0
  14. {nasadem-2.0.0 → nasadem-2.1.0}/.github/workflows/python-publish.yml +0 -0
  15. {nasadem-2.0.0 → nasadem-2.1.0}/.gitignore +0 -0
  16. {nasadem-2.0.0 → nasadem-2.1.0}/LICENSE +0 -0
  17. {nasadem-2.0.0 → nasadem-2.1.0}/NASADEM/__init__.py +0 -0
  18. {nasadem-2.0.0 → nasadem-2.1.0}/NASADEM/version.py +0 -0
  19. {nasadem-2.0.0 → nasadem-2.1.0}/NASADEM.egg-info/dependency_links.txt +0 -0
  20. {nasadem-2.0.0 → nasadem-2.1.0}/NASADEM.egg-info/top_level.txt +0 -0
  21. {nasadem-2.0.0 → nasadem-2.1.0}/debug/debug_point_extraction.py +0 -0
  22. {nasadem-2.0.0 → nasadem-2.1.0}/docs/Changelog.md +0 -0
  23. {nasadem-2.0.0 → nasadem-2.1.0}/docs/Migration-Guide.md +0 -0
  24. {nasadem-2.0.0 → nasadem-2.1.0}/docs/Release-Summary.md +0 -0
  25. {nasadem-2.0.0 → nasadem-2.1.0}/notebooks/Extract Point.ipynb +0 -0
  26. {nasadem-2.0.0 → nasadem-2.1.0}/setup.cfg +0 -0
  27. {nasadem-2.0.0 → nasadem-2.1.0}/tests/test_import_NASADEM.py +0 -0
  28. {nasadem-2.0.0 → nasadem-2.1.0}/tests/test_import_dependencies.py +0 -0
  29. {nasadem-2.0.0 → nasadem-2.1.0}/tests/test_nasadem_v2.py +0 -0
  30. {nasadem-2.0.0 → nasadem-2.1.0}/tox.ini +0 -0
@@ -42,6 +42,7 @@ class NASADEMGranule:
42
42
  URI = self.hgt_URI
43
43
  logger.info(f"loading elevation: {cl.URL(URI)}")
44
44
  data = Raster.open(URI, geometry=geometry)
45
+ logger.info(f"elevation data shape: {data.shape}, nodata: {data.nodata}")
45
46
 
46
47
  if isinstance(data, Raster):
47
48
  data = rasters.where(data == data.nodata, np.nan, data.astype(np.float32))
@@ -313,7 +314,7 @@ class NASADEMConnection:
313
314
  Returns:
314
315
  Elevation raster for RasterGeometry, elevation value(s) for Point/MultiPoint
315
316
  """
316
- if isinstance(geometry, MultiPoint):
317
+ if isinstance(geometry, (Point, MultiPoint)):
317
318
  return self._extract_point_values(geometry, 'elevation_m')
318
319
 
319
320
  result = None
@@ -358,52 +359,76 @@ class NASADEMConnection:
358
359
  Returns:
359
360
  Single value for Point, array of values for MultiPoint
360
361
  """
361
- tiles = self.tiles(geometry)
362
-
363
362
  if isinstance(geometry, Point):
364
363
  points = [geometry]
365
364
  else:
366
365
  points = [Point(geom.x, geom.y) for geom in geometry.geoms]
367
366
 
368
- values = []
367
+ # Group points by tile to minimize data loading
368
+ from collections import defaultdict
369
+ points_by_tile = defaultdict(list)
370
+
371
+ for i, point in enumerate(points):
372
+ # Calculate which tile this point belongs to
373
+ lat, lon = point.y, point.x
374
+ tile = f"{'s' if lat < 0 else 'n'}{abs(int(np.floor(lat))):02d}{'w' if lon < 0 else 'e'}{abs(int(np.floor(lon))):03d}"
375
+ points_by_tile[tile].append((i, point))
376
+
377
+ # Initialize results array
378
+ values = [np.nan] * len(points)
369
379
 
370
- for point in points:
371
- point_value = np.nan
380
+ # Process each tile only once
381
+ for tile, point_list in points_by_tile.items():
382
+ try:
383
+ granule = self.download_tile(tile)
384
+ except TileNotAvailable as e:
385
+ logger.warning(e)
386
+ continue
372
387
 
373
- for tile in tiles:
374
- try:
375
- granule = self.download_tile(tile)
376
- except TileNotAvailable as e:
377
- logger.warning(e)
378
- continue
379
-
380
- # Get the appropriate data layer
388
+ # Load the full tile data
389
+ try:
381
390
  if data_type == 'elevation_m':
382
- data_layer = granule.elevation_m
391
+ data_layer = granule.get_elevation_m(geometry=None)
383
392
  elif data_type == 'swb':
384
- data_layer = granule.swb.astype(np.float32)
393
+ data_layer = granule.get_swb(geometry=None)
385
394
  else:
386
395
  raise ValueError(f"Unknown data type: {data_type}")
387
396
 
388
- # Check if point is within this tile's bounds
389
- tile_geometry = data_layer.geometry
390
- if (tile_geometry.x_min <= point.x <= tile_geometry.x_max and
391
- tile_geometry.y_min <= point.y <= tile_geometry.y_max):
392
-
393
- # Extract value at point location
397
+ if not isinstance(data_layer, Raster):
398
+ logger.warning(f"Expected Raster, got {type(data_layer)}")
399
+ continue
400
+
401
+ # Extract values for all points in this tile
402
+ for idx, point in point_list:
394
403
  try:
395
- point_raster = data_layer.to_point(point)
396
- if hasattr(point_raster, 'values') and len(point_raster.values) > 0:
397
- point_value = point_raster.values[0]
398
- else:
399
- point_value = np.nan
400
- if not np.isnan(point_value):
401
- break # Found valid value, stop searching tiles
404
+ # Check if point is within tile bounds
405
+ tile_geometry = data_layer.geometry
406
+ if not (tile_geometry.x_min <= point.x <= tile_geometry.x_max and
407
+ tile_geometry.y_min <= point.y <= tile_geometry.y_max):
408
+ continue
409
+
410
+ # Convert geographic coordinates to pixel indices
411
+ row = int((tile_geometry.y_max - point.y) / abs(tile_geometry.cell_height))
412
+ col = int((point.x - tile_geometry.x_min) / abs(tile_geometry.cell_width))
413
+
414
+ # Clip to array bounds
415
+ row = max(0, min(row, data_layer.shape[0] - 1))
416
+ col = max(0, min(col, data_layer.shape[1] - 1))
417
+
418
+ # Extract the value
419
+ value = float(data_layer.array[row, col])
420
+
421
+ # Store if valid
422
+ if not np.isnan(value) and value != data_layer.nodata:
423
+ values[idx] = value
424
+
402
425
  except Exception as e:
403
426
  logger.warning(f"Failed to sample point ({point.x}, {point.y}) from tile {tile}: {e}")
404
427
  continue
405
-
406
- values.append(point_value)
428
+
429
+ except Exception as e:
430
+ logger.warning(f"Failed to load data from tile {tile}: {e}")
431
+ continue
407
432
 
408
433
  # Apply post-processing for swb
409
434
  if data_type == 'swb':
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: NASADEM
3
- Version: 2.0.0
3
+ Version: 2.1.0
4
4
  Summary: Shuttle Radar Topography Mission (SRTM) Digital Elevation Model (DEM) search and download utility
5
5
  Author-email: "Gregory H. Halverson" <gregory.h.halverson@jpl.nasa.gov>
6
6
  Project-URL: Homepage, https://github.com/JPL-Evapotranspiration-Algorithms/NASADEM
@@ -11,8 +11,9 @@ Description-Content-Type: text/markdown
11
11
  License-File: LICENSE
12
12
  Requires-Dist: colored-logging
13
13
  Requires-Dist: earthaccess>=0.8.0
14
+ Requires-Dist: ECOv002_calval_tables
14
15
  Requires-Dist: numpy
15
- Requires-Dist: rasters>=1.14.0
16
+ Requires-Dist: rasters>=1.17.1
16
17
  Requires-Dist: sentinel-tiles
17
18
  Requires-Dist: shapely
18
19
  Provides-Extra: dev
@@ -112,10 +113,10 @@ nasadem = NASADEMConnection(
112
113
 
113
114
  ```python
114
115
  from NASADEM import NASADEM
115
- from rasters import RasterGeometry
116
+ from rasters import RasterGrid
116
117
 
117
118
  # Define target area
118
- geometry = RasterGeometry.from_bbox(
119
+ geometry = RasterGrid.from_bbox(
119
120
  xmin=-118.5, ymin=33.5, xmax=-117.5, ymax=34.5,
120
121
  cell_size=30, crs="EPSG:4326"
121
122
  )
@@ -1,8 +1,10 @@
1
1
  .gitignore
2
2
  LICENSE
3
3
  README.md
4
+ debug.py
4
5
  makefile
5
6
  pyproject.toml
7
+ test_nasadem_elevation.py
6
8
  tox.ini
7
9
  .github/.DS_Store
8
10
  .github/workflows/ci.yml
@@ -1,7 +1,8 @@
1
1
  colored-logging
2
2
  earthaccess>=0.8.0
3
+ ECOv002_calval_tables
3
4
  numpy
4
- rasters>=1.14.0
5
+ rasters>=1.17.1
5
6
  sentinel-tiles
6
7
  shapely
7
8
 
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: NASADEM
3
- Version: 2.0.0
3
+ Version: 2.1.0
4
4
  Summary: Shuttle Radar Topography Mission (SRTM) Digital Elevation Model (DEM) search and download utility
5
5
  Author-email: "Gregory H. Halverson" <gregory.h.halverson@jpl.nasa.gov>
6
6
  Project-URL: Homepage, https://github.com/JPL-Evapotranspiration-Algorithms/NASADEM
@@ -11,8 +11,9 @@ Description-Content-Type: text/markdown
11
11
  License-File: LICENSE
12
12
  Requires-Dist: colored-logging
13
13
  Requires-Dist: earthaccess>=0.8.0
14
+ Requires-Dist: ECOv002_calval_tables
14
15
  Requires-Dist: numpy
15
- Requires-Dist: rasters>=1.14.0
16
+ Requires-Dist: rasters>=1.17.1
16
17
  Requires-Dist: sentinel-tiles
17
18
  Requires-Dist: shapely
18
19
  Provides-Extra: dev
@@ -112,10 +113,10 @@ nasadem = NASADEMConnection(
112
113
 
113
114
  ```python
114
115
  from NASADEM import NASADEM
115
- from rasters import RasterGeometry
116
+ from rasters import RasterGrid
116
117
 
117
118
  # Define target area
118
- geometry = RasterGeometry.from_bbox(
119
+ geometry = RasterGrid.from_bbox(
119
120
  xmin=-118.5, ymin=33.5, xmax=-117.5, ymax=34.5,
120
121
  cell_size=30, crs="EPSG:4326"
121
122
  )
@@ -85,10 +85,10 @@ nasadem = NASADEMConnection(
85
85
 
86
86
  ```python
87
87
  from NASADEM import NASADEM
88
- from rasters import RasterGeometry
88
+ from rasters import RasterGrid
89
89
 
90
90
  # Define target area
91
- geometry = RasterGeometry.from_bbox(
91
+ geometry = RasterGrid.from_bbox(
92
92
  xmin=-118.5, ymin=33.5, xmax=-117.5, ymax=34.5,
93
93
  cell_size=30, crs="EPSG:4326"
94
94
  )
nasadem-2.1.0/debug.py ADDED
@@ -0,0 +1,8 @@
1
+ from NASADEM import NASADEM
2
+ from rasters import RasterGeometry
3
+
4
+ # Define target area
5
+ geometry = RasterGeometry.from_bbox(
6
+ xmin=-118.5, ymin=33.5, xmax=-117.5, ymax=34.5,
7
+ cell_size=30, crs="EPSG:4326"
8
+ )
@@ -1,3 +1,5 @@
1
+ PYTHON_VERSION ?= 3.13
2
+
1
3
  PACKAGE_NAME = NASADEM
2
4
  ENVIRONMENT_NAME = $(PACKAGE_NAME)
3
5
  DOCKER_IMAGE_NAME = $(shell echo $(PACKAGE_NAME) | tr '[:upper:]' '[:lower:]')
@@ -38,7 +40,7 @@ reinstall:
38
40
  make install
39
41
 
40
42
  environment:
41
- mamba create -y -n $(ENVIRONMENT_NAME) -c conda-forge python=3.10
43
+ mamba create -y -n $(ENVIRONMENT_NAME) -c conda-forge python=$(PYTHON_VERSION)
42
44
 
43
45
  remove-environment:
44
46
  mamba env remove -y -n $(ENVIRONMENT_NAME)