Fixed default raster scaling

FZJ-IEK3-VSA · Sep 5, 2018 · bd3fb17 · bd3fb17
1 parent ee4b05b
commit bd3fb17
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/geokit/core/location.py b/geokit/core/location.py
@@ -258,6 +258,10 @@ def __init__(s, locations, srs=4326, _skip_check=False):
         if not _skip_check:
             if isinstance(locations, ogr.Geometry) or isinstance(locations, Location):
                 s._locations = np.array([Location.load(locations, srs=srs), ])
+            elif isinstance(locations, LocationSet):
+                s._locations = locations[:]
+            elif isinstance(locations, pd.DataFrame): 
+                s._locations = LocationSet( locations["geom"] )[:]
             else:
                 try: # Try loading all locations one at a time
                     s._locations = np.array([Location.load(l, srs=srs) for l in locations])

diff --git a/geokit/core/raster.py b/geokit/core/raster.py
@@ -61,7 +61,7 @@ def gdalType(s):
 
 ####################################################################
 # Raster writer
-def createRaster( bounds, output=None, pixelWidth=100, pixelHeight=100, dtype=None, srs='europe_m', compress=True, noData=None, overwrite=True, fill=None, data=None, meta=None, scale=0, offset=0, **kwargs):
+def createRaster( bounds, output=None, pixelWidth=100, pixelHeight=100, dtype=None, srs='europe_m', compress=True, noData=None, overwrite=True, fill=None, data=None, meta=None, scale=1, offset=0, **kwargs):
     """Create a raster file
     
     NOTE: