Merge branch 'master' of github.com:makepath/xarray-spatial

Author: brendancol

.gitignore

@@ -130,3 +130,4 @@ dmypy.json
 .pyre/
 .DS_Store
 /test_tiles_output
+*.TIF*

MANIFEST.in

@@ -12,6 +12,10 @@ prune examples
 prune img
 
 exclude xrspatial/_version.py
+exclude xrspatial/__pycache__/*
+exclude xrspatial/examples/*
+exclude xrspatial/examples/user_guide/*
+exclude xrspatial/examples/user_guide_idea/*
 exclude tile_idea.py
 exclude *.yml
 exclude *.enc
@@ -21,3 +25,4 @@ exclude *.dot
 exclude *.gif
 exclude *.svg
 exclude tox.ini
+exclude test_examples_cli.py

README.md

@@ -204,3 +204,5 @@ With the introduction of projects like Numba, Python gained new ways to provide
 - @jthetzel
 - @chase-dwelle
 - @SAN154
+- @SapirLastimoza-Dooley
+- @lex-c

conda.recipe/build.sh

@@ -3,8 +3,7 @@
 set -e
 set -x
 
-BLD_DIR=`pwd`
-
+BLD_DIR='pwd'
 SRC_DIR=$RECIPE_DIR/..
 pushd $SRC_DIR
 

conda.recipe/meta.yaml

@@ -1,20 +1,30 @@
+{% set sdata = load_setup_py_data() %}
 
 package:
   name: xarray-spatial
   version: 0.1.2
 
+source:
+  path: ..
+  
 requirements:
-  build:
+  host:
     - python
     - setuptools
-
+    - pyct
   run:
     - python
-    - datashader
+    {% for dep in sdata.get('install_requires', {}) %}
+    - {{ dep }}
+    {% endfor %}
 
+# will need the extras_require['tests'] deps below once those are added in setup.py
 test:
   requires:
     - pytest >=2.8.5
+    # {% for dep in sdata['extras_require']['tests'] %}
+    # - {{ dep }}
+    # {% endfor %}
   imports:
     - xrspatial
 

conda.recipe/run_test.py

@@ -1 +1,2 @@
-import xrspatial; xrspatial.test()
+import xrspatial
+xrspatial.test()

docs/source/conf.py

@@ -14,6 +14,8 @@
 #
 import os
 import sys
+import xrspatial
+
 sys.path.insert(0, os.path.abspath('../..'))
 
 # -- Project information -----------------------------------------------------
@@ -22,7 +24,6 @@
 copyright = u'2020, Brendan Collins'
 author = u'Brendan Collins'
 
-import xrspatial
 version = release = xrspatial.__version__
 
 # -- General configuration ---------------------------------------------------
@@ -34,8 +35,8 @@
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
-extensions = [ 
-# 'recommonmark'
+extensions = [
+    # 'recommonmark'
     'sphinx.ext.autodoc',
     'sphinx.ext.napoleon',
     'sphinx.ext.viewcode',

examples/animated_hillshade.py

@@ -2,8 +2,6 @@
 import datashader as ds
 from datashader.transfer_functions import shade
 from datashader.transfer_functions import stack
-from datashader.transfer_functions import dynspread
-from datashader.transfer_functions import set_background
 from datashader.colors import Elevation
 
 
@@ -23,6 +21,7 @@
 
 terrain = generate_terrain(canvas=cvs)
 
+
 def heights(locations, src, src_range, height=20):
     num_bumps = locations.shape[0]
     out = np.zeros(num_bumps, dtype=np.uint16)
@@ -35,11 +34,15 @@ def heights(locations, src, src_range, height=20):
             out[r] = height
     return out
 
+
 T = 300000  # Number of trees to add per call
 src = terrain.data
-trees = bump(W, H, count=T, height_func=partial(heights, src=src, src_range=(1000, 1300), height=5))
-trees += bump(W, H, count=T//2, height_func=partial(heights, src=src, src_range=(1300, 1700), height=20))
-trees += bump(W, H, count=T//3, height_func=partial(heights, src=src, src_range=(1700, 2000), height=5))
+trees = bump(W, H, count=T, height_func=partial(heights, src=src,
+             src_range=(1000, 1300), height=5))
+trees += bump(W, H, count=T//2, height_func=partial(
+        heights, src=src, src_range=(1300, 1700), height=20))
+trees += bump(W, H, count=T//3, height_func=partial(
+        heights, src=src, src_range=(1700, 2000), height=5))
 
 tree_colorize = trees.copy()
 tree_colorize.data[tree_colorize.data == 0] = np.nan
@@ -51,6 +54,7 @@ def heights(locations, src, src_range, height=20):
 water = mean(water, passes=50, excludes=[LAND_CONSTANT])
 water.data[water.data == LAND_CONSTANT] = np.nan
 
+
 def create_map(azimuth):
 
     global cvs
@@ -59,10 +63,11 @@ def create_map(azimuth):
     global trees
 
     img = stack(shade(terrain, cmap=Elevation, how='linear'),
-      shade(water, cmap=['aqua', 'white']),
-      shade(hillshade(terrain + trees, azimuth=azimuth), cmap=['black', 'white'], how='linear', alpha=128),
-      shade(tree_colorize, cmap='limegreen', how='linear')
-    )
+                shade(water, cmap=['aqua', 'white']),
+                shade(hillshade(terrain + trees, azimuth=azimuth),
+                      cmap=['black', 'white'], how='linear', alpha=128),
+                shade(tree_colorize, cmap='limegreen', how='linear')
+                )
 
     print('image created')
 
@@ -85,29 +90,33 @@ def create_map2():
     yield img.to_pil()
 
     img = stack(shade(terrain, cmap=Elevation, how='linear'),
-      shade(hillshade(terrain, azimuth=210), cmap=['black', 'white'], how='linear', alpha=128),
-    )
+                shade(hillshade(terrain, azimuth=210),
+                      cmap=['black', 'white'], how='linear', alpha=128),
+                )
 
     yield img.to_pil()
 
     img = stack(shade(terrain, cmap=Elevation, how='linear'),
-      shade(water, cmap=['aqua', 'white']),
-      shade(hillshade(terrain, azimuth=210), cmap=['black', 'white'], how='linear', alpha=128),
-    )
+                shade(water, cmap=['aqua', 'white']),
+                shade(hillshade(terrain, azimuth=210),
+                      cmap=['black', 'white'], how='linear', alpha=128),
+                )
 
     yield img.to_pil()
 
     img = stack(shade(terrain, cmap=Elevation, how='linear'),
-      shade(water, cmap=['aqua', 'white']),
-      shade(hillshade(terrain + trees, azimuth=210), cmap=['black', 'white'], how='linear', alpha=128),
-      shade(tree_colorize, cmap='limegreen', how='linear')
-    )
+                shade(water, cmap=['aqua', 'white']),
+                shade(hillshade(terrain + trees, azimuth=210),
+                      cmap=['black', 'white'], how='linear', alpha=128),
+                shade(tree_colorize, cmap='limegreen', how='linear')
+                )
 
     yield img.to_pil()
     yield img.to_pil()
     yield img.to_pil()
     yield img.to_pil()
 
+
 def gif1():
 
     images = []
@@ -119,6 +128,7 @@ def gif1():
                    save_all=True, append_images=images[1:],
                    optimize=False, duration=5000, loop=0)
 
+
 def gif2():
 
     images = list(create_map2())
@@ -127,4 +137,5 @@ def gif2():
                    save_all=True, append_images=images[1:],
                    optimize=False, duration=1000, loop=0)
 
+
 gif2()

examples/datasets.yml

@@ -0,0 +1,15 @@
+---
+
+data:
+  - url: https://xarrayspatial.blob.core.windows.net/examples-data/facilities.csv
+    title: 'Pharmacy Facilities Data'
+    files:
+      - facilities.csv
+  - url: https://xarrayspatial.blob.core.windows.net/examples-data/USA_Block_Groups-shp.zip/USA_Block_Groups.shp
+    title: 'USA Block Groups Shapefile'
+    files:
+      - USA_Block_Groups.shp
+  - url: https://xarrayspatial.blob.core.windows.net/examples-data/USA_Counties-shp.zip/USA_Counties.shp
+    title: 'USA Counties Shapefile'
+    files:
+      - USA_Counties.shp