Commit 5a3ea15c authored by Greifeneder Felix's avatar Greifeneder Felix

minor fixes

parent 405f6836
......@@ -3,7 +3,6 @@
<component name="ChangeListManager">
<list default="true" id="0b304d2a-93b9-4b4d-ab03-85bd0c9bb482" name="Default" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pysmm/GEE_wrappers.py" beforeDir="false" afterPath="$PROJECT_DIR$/pysmm/GEE_wrappers.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pysmm/derive_SM.py" beforeDir="false" afterPath="$PROJECT_DIR$/pysmm/derive_SM.py" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
......@@ -27,10 +26,10 @@
</provider>
</entry>
</file>
<file leaf-file-name="GEE_wrappers.py" pinned="false" current-in-tab="true">
<file leaf-file-name="GEE_wrappers.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pysmm/GEE_wrappers.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="205">
<state relative-caret-position="17">
<caret line="366" column="95" selection-start-line="366" selection-start-column="95" selection-end-line="366" selection-end-column="95" />
<folding>
<element signature="e#0#37#0" expanded="true" />
......@@ -51,11 +50,11 @@
</provider>
</entry>
</file>
<file leaf-file-name="derive_SM.py" pinned="false" current-in-tab="false">
<file leaf-file-name="derive_SM.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/pysmm/derive_SM.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="994">
<caret line="190" column="14" selection-start-line="190" selection-start-column="14" selection-end-line="190" selection-end-column="14" />
<state relative-caret-position="323">
<caret line="24" column="75" selection-start-line="24" selection-start-column="75" selection-end-line="24" selection-end-column="75" />
</state>
</provider>
</entry>
......@@ -111,8 +110,8 @@
<option value="$PROJECT_DIR$/MANIFEST.in" />
<option value="$PROJECT_DIR$/setup.py" />
<option value="$PROJECT_DIR$/docs/source/index.rst" />
<option value="$PROJECT_DIR$/pysmm/derive_SM.py" />
<option value="$PROJECT_DIR$/pysmm/GEE_wrappers.py" />
<option value="$PROJECT_DIR$/pysmm/derive_SM.py" />
</list>
</option>
</component>
......@@ -134,7 +133,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
......@@ -151,6 +149,7 @@
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
......@@ -344,7 +343,14 @@
<option name="project" value="LOCAL" />
<updated>1523458965350</updated>
</task>
<option name="localTasksCounter" value="21" />
<task id="LOCAL-00021" summary="- added option to specify time-series names (for plot output)&#10;- added error handling in case of an empty time-series&#10;- application of snow mask to the final time-series for better performance">
<created>1524811979532</created>
<option name="number" value="00021" />
<option name="presentableId" value="LOCAL-00021" />
<option name="project" value="LOCAL" />
<updated>1524811979535</updated>
</task>
<option name="localTasksCounter" value="22" />
<servers />
</component>
<component name="TestHistory">
......@@ -372,7 +378,7 @@
<window_info active="true" anchor="bottom" id="Python Console" order="7" sideWeight="0.49946696" visible="true" weight="0.32900432" />
<window_info anchor="bottom" id="Run" order="2" weight="0.32900432" />
<window_info anchor="bottom" id="Terminal" order="7" weight="0.32900432" />
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2867804" />
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.28997868" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="right" id="Database" order="3" />
<window_info anchor="right" id="SciView" order="3" />
......@@ -410,7 +416,8 @@
<MESSAGE value="fixing a link in the documentation" />
<MESSAGE value="integrating support for multiple points" />
<MESSAGE value="added the support to extract soil moisture time series for a list of points" />
<option name="LAST_COMMIT_MESSAGE" value="added the support to extract soil moisture time series for a list of points" />
<MESSAGE value="- added option to specify time-series names (for plot output)&#10;- added error handling in case of an empty time-series&#10;- application of snow mask to the final time-series for better performance" />
<option name="LAST_COMMIT_MESSAGE" value="- added option to specify time-series names (for plot output)&#10;- added error handling in case of an empty time-series&#10;- application of snow mask to the final time-series for better performance" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
......@@ -820,16 +827,9 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pysmm/derive_SM.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="994">
<caret line="190" column="14" selection-start-line="190" selection-start-column="14" selection-end-line="190" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pysmm/GEE_wrappers.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="205">
<state relative-caret-position="17">
<caret line="366" column="95" selection-start-line="366" selection-start-column="95" selection-end-line="366" selection-end-column="95" />
<folding>
<element signature="e#0#37#0" expanded="true" />
......@@ -849,5 +849,12 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pysmm/derive_SM.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="323">
<caret line="24" column="75" selection-start-line="24" selection-start-column="75" selection-end-line="24" selection-end-column="75" />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
......@@ -5,7 +5,8 @@ import os
import matplotlib.pyplot as plt
import pandas as pd
def get_map(minlon, minlat, maxlon, maxlat, outpath,
def get_map(minlon, minlat, maxlon, maxlat,
outpath,
sampling=100,
year=None, month=None, day=None,
tracknr=None,
......@@ -13,6 +14,22 @@ def get_map(minlon, minlat, maxlon, maxlat, outpath,
tempfilter=True,
mask='Globcover',
masksnow=True):
"""Get S1 soil moisture map
Atributes:
minlon, minlat, maxlon, maxlat: (float) extent of soil moisture map
outpath: (string) destination for soil moisture map export
sampling: (integer) map sampling
year, month, day (optional): specify date for extracted map - if not specified, the entire
time-series of maps will be extracted; if specified, the S1 acquisition
closest (in time) will be selected
tracknr (optional): (integer) Use data from a specific Sentinel-1 track only
tempfilter: (boolean) apply multi-temporal speckle filter
mask: (string) select 'Globcover' or 'Corine' (europe only) land-cover classifications for the
masking of the map
masksnow: (boolean) apply snow mask
"""
maskcorine=False
maskglobcover=False
......
from setuptools import setup
setup(name='pysmm',
version='0.5',
version='0.5.1',
description='Python Sentinel Soil-Moisture Mapping',
long_description='For detailed documentation go-to http://pysmm.readthedocs.io/en/latest/',
classifiers=[
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment