Merge pull request #23 from klemenkenda/master

Fixing sentinelhub imports in OGC web services example.
sentinel-hub · Mar 1, 2018 · fa3ca10 · fa3ca10
2 parents 52ac063 + 06e4687
commit fa3ca10
Showing 1 changed file with 75 additions and 26 deletions.
diff --git a/examples/ogc_request.ipynb b/examples/ogc_request.ipynb
@@ -39,7 +39,9 @@
   {
    "cell_type": "code",
    "execution_count": 1,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "INSTANCE_ID = ''"
@@ -55,7 +57,9 @@
   {
    "cell_type": "code",
    "execution_count": 2,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "%reload_ext autoreload\n",
@@ -66,7 +70,9 @@
   {
    "cell_type": "code",
    "execution_count": 3,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "import matplotlib.pyplot as plt\n",
@@ -76,7 +82,9 @@
   {
    "cell_type": "code",
    "execution_count": 4,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "import datetime"
@@ -88,13 +96,16 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from sentinelhub.data_request import WmsRequest, WcsRequest, MimeType, CRS, BBox"
+    "from sentinelhub.data_request import WmsRequest, WcsRequest, MimeType\n",
+    "from sentinelhub.common import CRS, BBox"
    ]
   },
   {
    "cell_type": "code",
    "execution_count": 6,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "def plot_image(data, factor=1):\n",
@@ -135,7 +146,9 @@
   {
    "cell_type": "code",
    "execution_count": 7,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "betsiboka_coords_wgs84 = [-16.15, 46.16, -15.58, 46.51]"
@@ -151,7 +164,9 @@
   {
    "cell_type": "code",
    "execution_count": 8,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "betsiboka_bbox = BBox(bbox=betsiboka_coords_wgs84, crs=CRS.WGS84)"
@@ -187,7 +202,9 @@
   {
    "cell_type": "code",
    "execution_count": 9,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "wms_true_color_request = WmsRequest(layer='TRUE_COLOR',\n",
@@ -200,7 +217,9 @@
   {
    "cell_type": "code",
    "execution_count": 10,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "wms_true_color_img = wms_true_color_request.get_data()"
@@ -279,7 +298,9 @@
   {
    "cell_type": "code",
    "execution_count": 14,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "wms_true_color_request = WmsRequest(layer='TRUE_COLOR',\n",
@@ -292,7 +313,9 @@
   {
    "cell_type": "code",
    "execution_count": 15,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "wms_true_color_img = wms_true_color_request.get_data()"
@@ -354,7 +377,9 @@
   {
    "cell_type": "code",
    "execution_count": 18,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "wms_true_color_request = WmsRequest(layer='TRUE_COLOR',\n",
@@ -367,7 +392,9 @@
   {
    "cell_type": "code",
    "execution_count": 19,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "wms_true_color_img = wms_true_color_request.get_data()"
@@ -447,7 +474,9 @@
   {
    "cell_type": "code",
    "execution_count": 23,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "wms_true_color_request = WmsRequest(layer='TRUE_COLOR',\n",
@@ -461,7 +490,9 @@
   {
    "cell_type": "code",
    "execution_count": 24,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "wms_true_color_img = wms_true_color_request.get_data()"
@@ -541,7 +572,9 @@
   {
    "cell_type": "code",
    "execution_count": 28,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "wms_bands_request = WmsRequest(layer='ALL_BANDS',\n",
@@ -619,7 +652,9 @@
   {
    "cell_type": "code",
    "execution_count": 31,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "wms_bands_request = WmsRequest(data_folder='test_dir',\n",
@@ -684,7 +719,9 @@
   {
    "cell_type": "code",
    "execution_count": 34,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "wms_bands_request_from_disk = WmsRequest(data_folder='test_dir',\n",
@@ -780,7 +817,9 @@
   {
    "cell_type": "code",
    "execution_count": 38,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "wms_true_color_request = WmsRequest(data_folder='test_dir_tiff',\n",
@@ -854,7 +893,9 @@
   {
    "cell_type": "code",
    "execution_count": 41,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "betsiboka_bbox_large = BBox(bbox=[-16.12, 45.88,-15.45, 47.29], \n",
@@ -911,7 +952,9 @@
   {
    "cell_type": "code",
    "execution_count": 43,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "betsiboka_bbox_large = BBox(bbox=[-16.12, 45.88,-15.45, 47.29], \n",
@@ -989,7 +1032,9 @@
   {
    "cell_type": "code",
    "execution_count": 46,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "wcs_true_color_request = WcsRequest(layer='TRUE_COLOR',\n",
@@ -1002,7 +1047,9 @@
   {
    "cell_type": "code",
    "execution_count": 47,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "wcs_true_color_img = wcs_true_color_request.get_data()"
@@ -1096,7 +1143,9 @@
   {
    "cell_type": "code",
    "execution_count": 51,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "custom_wms_request = WmsRequest(layer='TRUE_COLOR',\n",
@@ -1487,7 +1536,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.5.3"
+   "version": "3.6.1"
   }
  },
  "nbformat": 4,