Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .flake8

This file was deleted.

135 changes: 2 additions & 133 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,136 +1,5 @@
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
pip-wheel-metadata/
share/python-wheels/
*.egg-info/
.installed.cfg
*.egg
MANIFEST

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.nox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*.cover
*.py,cover
.hypothesis/
.pytest_cache/

# Translations
*.mo
*.pot

# Django stuff:
*.log
local_settings.py
db.sqlite3
db.sqlite3-journal

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# Sphinx documentation
docs/_build/

# PyBuilder
target/

# Jupyter Notebook
.ipynb_checkpoints

# IPython
profile_default/
ipython_config.py

# pyenv
.python-version

# pipenv
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
# However, in case of collaboration, if having platform-specific dependencies or dependencies
# having no cross-platform support, pipenv may install dependencies that don't work, or not
# install all needed dependencies.
#Pipfile.lock

# PEP 582; used by e.g. github.com/David-OConnor/pyflow
__pypackages__/

# Celery stuff
celerybeat-schedule
celerybeat.pid

# SageMath parsed files
*.sage.py

# Environments
.env
.venv
env/
venv/
ENV/
env.bak/
venv.bak/

# Spyder project settings
.spyderproject
.spyproject

# Rope project settings
.ropeproject

# mkdocs documentation
/site

# mypy
.mypy_cache/
.dmypy.json
dmypy.json

# Pyre type checker
.pyre/
mapshader/_version.py

# VS code stuff
.vscode

mapshader/.version
examples/large_geotiff/
mapshader.egg-info/
mapshader/.version
19 changes: 0 additions & 19 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,25 +1,6 @@
include *.txt
include *.md
include mapshader/.version
include mapshader/templates/*.html

graft mapshader

prune docs
prune *.egg-info

global-exclude *.png
prune conda.recipe
prune examples
prune img

exclude mapshader/_version.py
exclude tile_idea.py
exclude *.yml
exclude *.enc
exclude .gitignore
exclude .isort.cfg
exclude *.dot
exclude *.gif
exclude *.svg
exclude tox.ini
70 changes: 0 additions & 70 deletions conda.recipe/README.md

This file was deleted.

14 changes: 0 additions & 14 deletions conda.recipe/build.sh

This file was deleted.

34 changes: 0 additions & 34 deletions conda.recipe/meta.yaml

This file was deleted.

4 changes: 0 additions & 4 deletions conda.recipe/run_test.py

This file was deleted.

1 change: 1 addition & 0 deletions example_multiband/run_multiband_netcdf.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ def run(x, y, z, index, j):
pillow_img = PIL.Image.open(bytes)
pillow_img.save(f"out_{j}_{index}.png", format="png")


def xyz_contains_data(z):
ntiles = 2**z # In both x and y directions.
x = ntiles // 2
Expand Down
2 changes: 2 additions & 0 deletions mapshader/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,7 @@ def raster_aggregation(cvs, data, interpolate='linear', padding=0, agg_method=rd
additional_transforms = {'hillshade': hillshade,
'quantile': quantile}


def apply_additional_transforms(source: MapSource, agg: xr.DataArray):
"""
Apply additional transforms over the data, which options could be
Expand Down Expand Up @@ -416,6 +417,7 @@ def shade_agg(source: MapSource, agg: xr.DataArray, xmin, ymin, xmax, ymax):
print('Shade without Span')
return tf.shade(agg, cmap=cmap, how=how)


def to_raster(source: MapSource,
xmin: float = None, ymin: float = None,
xmax: float = None, ymax: float = None,
Expand Down
1 change: 1 addition & 0 deletions mapshader/mercator.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import math


def invert_y_tile(y, z):
"""
Convert from TMS to Google tile y coordinate, and vice versa
Expand Down
1 change: 1 addition & 0 deletions mapshader/multifile.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
tile_def = MercatorTileDefinition(x_range=(-20037508.34, 20037508.34),
y_range=(-20037508.34, 20037508.34))


class SharedMultiFile:
"""
Simple thread-safe implementation of shared MultiFileRaster objects.
Expand Down
4 changes: 4 additions & 0 deletions mapshader/overview.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,20 @@ def _apply_transforms(da, transforms):

return da


def _get_crs(ds):
crs = ds.rio.crs
if not crs:
# Fallback for reading spatial_ref written in strange way.
crs = ds.spatial_ref.spatial_ref
return crs


def _overview_combine(da1, da2):
# Elementwise maximum taking into account nans.
return xr.where(np.logical_and(np.isfinite(da1), ~(da1 > da2)), da1, da2)


def _overview_map(filename, band, overview_crs, overview_shape, overview_transform, transforms):
with xr.open_dataset(filename, chunks=dict(y=512, x=512)) as ds:
da = ds[band]
Expand All @@ -55,6 +58,7 @@ def _overview_map(filename, band, overview_crs, overview_shape, overview_transfo

return da


def create_single_band_overview(filenames, overview_shape, overview_transform, overview_crs, band,
overview_filename, transforms):
bag = db.from_sequence(filenames)
Expand Down
1 change: 1 addition & 0 deletions mapshader/services.py
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ def default_url(self):
def service_type(self):
return 'image'


class WMSService(MapService):
"""
This class represents a WMS service object.
Expand Down
Loading