Remove class structure as not adding anything, just making more difficult to use.

Author: petebunting

bin/pysl4landgeditools.py

@@ -49,6 +49,6 @@
 
     args = parser.parse_args()
 
-    geditools = pysl4land.pysl4land_gedi.GEDITools()
     valid_only = not args.all
-    geditools.gedi02_b_beams_gpkg(args.input, args.output, valid_only, args.epsg)
+    pysl4land.pysl4land_gedi.gedi02_b_beams_gpkg(args.input, args.output, valid_only, args.epsg)
+

bin/pysl4landicesat2tools.py

@@ -51,5 +51,5 @@
 
     args = parser.parse_args()
 
-    icesat2tools = pysl4land.pysl4land_icesat2.ICESAT2Tools()
-    icesat2tools.icesat2_alt08_beams_gpkg(args.input, args.output, args.polys, args.epsg)
+    pysl4land.pysl4land_icesat2.icesat2_alt08_beams_gpkg(args.input, args.output, args.polys, args.epsg)
+

pysl4land/__init__.py

@@ -40,8 +40,8 @@
 import json
 
 PYSL4LAND_VERSION_MAJOR = 0
-PYSL4LAND_VERSION_MINOR = 0
-PYSL4LAND_VERSION_PATCH = 1
+PYSL4LAND_VERSION_MINOR = 1
+PYSL4LAND_VERSION_PATCH = 0
 
 PYSL4LAND_VERSION = str(PYSL4LAND_VERSION_MAJOR) + "."  + str(PYSL4LAND_VERSION_MINOR) + "." + str(PYSL4LAND_VERSION_PATCH)
 PYSL4LAND_VERSION_OBJ = LooseVersion(PYSL4LAND_VERSION)
@@ -78,3 +78,4 @@
     logging.config.dictConfig(config)
 else:
     logging.basicConfig(level=log_default_level, format="%(asctime)s - %(name)s - %(levelname)s - %(message)s")
+

pysl4land/pysl4land_gedi.py

@@ -36,42 +36,41 @@
 
 logger = logging.getLogger(__name__)
 
-class PySL4LandUtils(object):
+def latlon_to_utm_zone_number(latitude, longitude):
+    """
+    Find the UTM zone number for a give latitude and longitude. UTM zone will be returned for all the
+    lat/longs within the input arrays, which must be of the same length. Function will also work with
+    a single value, at which point a single int will be returned.
 
-    def latlon_to_utm_zone_number(self, latitude, longitude):
-        """
-        Find the UTM zone number for a give latitude and longitude. UTM zone will be returned for all the
-        lat/longs within the input arrays, which must be of the same length. Function will also work with
-        a single value, at which point a single int will be returned.
+    :param latitude: numpy array of floats
+    :param longitude: numpy array of floats
 
-        :param latitude: numpy array of floats
-        :param longitude: numpy array of floats
+    :return: int or array of ints.
 
-        :return: int or array of ints.
+    """
+    import numpy
+    utm_zones = (((longitude + 180) / 6) + 1)
+    utm_zones = numpy.rint(utm_zones).astype(int)
 
-        """
-        import numpy
-        utm_zones = (((longitude + 180) / 6) + 1)
-        utm_zones = numpy.rint(utm_zones).astype(int)
+    utm_zones[(56 <= latitude) & (latitude < 64) & (3 <= longitude) & (longitude < 12)] = 32
+    utm_zones[(72 <= latitude) & (latitude <= 84) & (longitude >= 0) & (longitude < 9)] = 31
+    utm_zones[(72 <= latitude) & (latitude <= 84) & (longitude >= 0) & (longitude < 21)] = 33
+    utm_zones[(72 <= latitude) & (latitude <= 84) & (longitude >= 0) & (longitude < 33)] = 35
+    utm_zones[(72 <= latitude) & (latitude <= 84) & (longitude >= 0) & (longitude < 42)] = 37
 
-        utm_zones[(56 <= latitude) & (latitude < 64) & (3 <= longitude) & (longitude < 12)] = 32
-        utm_zones[(72 <= latitude) & (latitude <= 84) & (longitude >= 0) & (longitude < 9)] = 31
-        utm_zones[(72 <= latitude) & (latitude <= 84) & (longitude >= 0) & (longitude < 21)] = 33
-        utm_zones[(72 <= latitude) & (latitude <= 84) & (longitude >= 0) & (longitude < 33)] = 35
-        utm_zones[(72 <= latitude) & (latitude <= 84) & (longitude >= 0) & (longitude < 42)] = 37
+    return utm_zones
 
-        return utm_zones
+def latlon_to_mode_utm_zone_number(latitude, longitude):
+    """
+    Find the mode UTM zone for a list of lat/lon values.
 
-    def latlon_to_mode_utm_zone_number(self, latitude, longitude):
-        """
-        Find the mode UTM zone for a list of lat/lon values.
+    :param latitude: numpy array of floats
+    :param longitude: numpy array of floats
+    :return: int (mode UTM zone)
 
-        :param latitude: numpy array of floats
-        :param longitude: numpy array of floats
-        :return: int (mode UTM zone)
+    """
+    import scipy.stats
+    utm_zones = latlon_to_utm_zone_number(latitude, longitude)
+    mode, count = scipy.stats.mode(utm_zones)
+    return mode[0]
 
-        """
-        import scipy.stats
-        utm_zones = self.latlon_to_utm_zone_number(latitude, longitude)
-        mode, count = scipy.stats.mode(utm_zones)
-        return mode[0]

pysl4land/pysl4land_icesat2.py

@@ -37,7 +37,7 @@
 import os
 
 setuptools.setup(name='pysl4land',
-    version='0.0.1',
+    version='0.1.0',
     description='Python tools to process spaceborne lidar (GEDI and ICESAT2) for land (pySL4Land) applications.',
     author='Pete Bunting',
     author_email='[email protected]',