Skip to content

Commit

Permalink
Fix formatting in SRTM DEM prepare scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
omad committed Nov 24, 2016
1 parent 34542b4 commit e7db4da
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 19 deletions.
23 changes: 13 additions & 10 deletions utils/srtm_dem1sv1_0_prepare.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"""
Ingest data from the command-line.
python srtm_prepare.py --output Elevation_1secSRTM_DEMs_v1.0_DEM_Mosaic_dem1sv1_0.yaml /g/data/rr1/Elevation/NetCDF/1secSRTM_DEMs_v1.0/DEM/Elevation_1secSRTM_DEMs_v1.0_DEM_Mosaic_dem1sv1_0.nc
python srtm_prepare.py --output Elevation_1secSRTM_DEMs_v1.0_DEM_Mosaic_dem1sv1_0.yaml \
/g/data/rr1/Elevation/NetCDF/1secSRTM_DEMs_v1.0/DEM/Elevation_1secSRTM_DEMs_v1.0_DEM_Mosaic_dem1sv1_0.nc
"""
from __future__ import absolute_import

Expand All @@ -12,28 +13,30 @@
import click
import netCDF4
import os


def prepare_layers(images):
layerdict={}
layerdict = {}
for i in images:
image = netCDF4.Dataset(i)
layerpath = str(image.filepath())
for targetlayer in image.variables.values():
if targetlayer.name not in ['crs', 'lat', 'lon']:
layername = str(targetlayer.name)
layerdict[layername]= {'path': layerpath,'layer': layername,}
layerdict[layername] = {'path': layerpath, 'layer': layername, }
return layerdict

def prepare_dataset(image, datasets):

def prepare_dataset(image, datasets):
image = netCDF4.Dataset(image)
projection = image.variables.values()[0].spatial_ref
geotransform = ((str(image.variables.values()[0].GeoTransform)).split())
fgeotransform = [float(i) for i in geotransform]
lon_pixels = int(image.dimensions.values()[0].size)
lat_pixels = int(image.dimensions.values()[1].size)

left, right = float(fgeotransform[0]), float(fgeotransform[0]+(lon_pixels*fgeotransform[1]))
bottom, top = float(fgeotransform[3]+(lat_pixels*fgeotransform[5])), float(fgeotransform[3])
left, right = float(fgeotransform[0]), float(fgeotransform[0] + (lon_pixels * fgeotransform[1]))
bottom, top = float(fgeotransform[3] + (lat_pixels * fgeotransform[5])), float(fgeotransform[3])

return {
'id': str(uuid.uuid4()),
Expand Down Expand Up @@ -73,12 +76,12 @@ def prepare_dataset(image, datasets):


@click.command(help="Prepare single layer netcdf with common grid spec for ingestion to Data Cube.")
@click.argument('datasets', type=click.Path(exists=True, readable=True),nargs=-1)
@click.argument('datasets', type=click.Path(exists=True, readable=True), nargs=-1)
@click.option('--output', help="Write datasets into this file", type=click.Path(exists=False, writable=True))
def main(datasets, output):
with open(output, 'w') as stream:
yaml.dump((prepare_dataset(datasets[0], datasets)),stream)
if __name__ == "__main__":
main()
yaml.dump((prepare_dataset(datasets[0], datasets)), stream)


if __name__ == "__main__":
main()
22 changes: 13 additions & 9 deletions utils/srtm_prepare.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"""
Ingest data from the command-line.
python srtm_prepare.py --output Elevation_1secSRTM_DEMs_v1.0_DEM_Mosaic_dem1sv1_0.yaml /g/data/rr1/Elevation/NetCDF/1secSRTM_DEMs_v1.0/DEM/Elevation_1secSRTM_DEMs_v1.0_DEM_Mosaic_dem1sv1_0.nc
python srtm_prepare.py --output Elevation_1secSRTM_DEMs_v1.0_DEM_Mosaic_dem1sv1_0.yaml \
/g/data/rr1/Elevation/NetCDF/1secSRTM_DEMs_v1.0/DEM/Elevation_1secSRTM_DEMs_v1.0_DEM_Mosaic_dem1sv1_0.nc
"""
from __future__ import absolute_import

Expand All @@ -12,28 +13,30 @@
import click
import netCDF4
import os


def prepare_layers(images):
layerdict={}
layerdict = {}
for i in images:
image = netCDF4.Dataset(i)
layerpath = str(image.filepath())
for targetlayer in image.variables.values():
if targetlayer.name not in ['crs', 'lat', 'lon']:
layername = str(targetlayer.name)
layerdict[layername]= {'path': layerpath,'layer': layername,}
layerdict[layername] = {'path': layerpath, 'layer': layername, }
return layerdict

def prepare_dataset(image, datasets):

def prepare_dataset(image, datasets):
image = netCDF4.Dataset(image)
projection = image.variables.values()[0].spatial_ref
geotransform = ((str(image.variables.values()[0].GeoTransform)).split())
fgeotransform = [float(i) for i in geotransform]
lon_pixels = int(image.dimensions.values()[0].size)
lat_pixels = int(image.dimensions.values()[1].size)

left, right = float(fgeotransform[0]), float(fgeotransform[0]+(lon_pixels*fgeotransform[1]))
bottom, top = float(fgeotransform[3]+(lat_pixels*fgeotransform[5])), float(fgeotransform[3])
left, right = float(fgeotransform[0]), float(fgeotransform[0] + (lon_pixels * fgeotransform[1]))
bottom, top = float(fgeotransform[3] + (lat_pixels * fgeotransform[5])), float(fgeotransform[3])

return {
'id': str(uuid.uuid4()),
Expand Down Expand Up @@ -73,11 +76,12 @@ def prepare_dataset(image, datasets):


@click.command(help="Prepare single layer netcdf with common grid spec for ingestion to Data Cube.")
@click.argument('datasets', type=click.Path(exists=True, readable=True),nargs=-1)
@click.argument('datasets', type=click.Path(exists=True, readable=True), nargs=-1)
@click.option('--output', help="Write datasets into this file", type=click.Path(exists=False, writable=True))
def main(datasets, output):
with open(output, 'w') as stream:
yaml.dump((prepare_dataset(datasets[0], datasets)),stream)
yaml.dump((prepare_dataset(datasets[0], datasets)), stream)


if __name__ == "__main__":
main()

0 comments on commit e7db4da

Please sign in to comment.