Merge pull request #8 from kmuehlbauer/fix-zonal-mask

FIX: zonal mask, fixes #125

Author: kmuehlbauer

notebooks/zonalstats/wradlib_zonalstats_example.ipynb

@@ -165,8 +165,8 @@
     "buffer = 5000.\n",
     "bbox = dict(left=bbox[0] - buffer, right=bbox[1] + buffer,\n",
     "            bottom=bbox[2] - buffer, top=bbox[3] + buffer)\n",
-    "mask, shape = wrl.zonalstats.mask_from_bbox(xy[..., 0], xy[..., 1],\n",
-    "                                                bbox)\n",
+    "mask = (((xy[..., 1] > bbox['bottom']) & (xy[..., 1] < bbox['top'])) &\n",
+    "        ((xy[..., 0] > bbox['left']) & (xy[..., 0] < bbox['right'])))\n",
     "xy_ = np.vstack((xy[..., 0][mask].ravel(), xy[..., 1][mask].ravel())).T\n",
     "data_ = data[mask]"
    ]
@@ -487,10 +487,8 @@
     "bbox = dict(left=bbox[0] - buffer, right=bbox[1] + buffer,\n",
     "            bottom=bbox[2] - buffer, top=bbox[3] + buffer)\n",
     "\n",
-    "mask, shape = wrl.zonalstats.mask_from_bbox(radar_gkc[..., 0],\n",
-    "                                            radar_gkc[..., 1],\n",
-    "                                            bbox,\n",
-    "                                            polar=True)\n",
+    "mask = (((radar_gkc[..., 1] > bbox['bottom']) & (radar_gkc[..., 1] < bbox['top'])) &\n",
+    "        ((radar_gkc[..., 0] > bbox['left']) & (radar_gkc[..., 0] < bbox['right'])))\n",
     "\n",
     "radar_gkc_ = radar_gkc[mask, :]\n",
     "radar_gk_ = radar_gk[mask]\n",

notebooks/zonalstats/wradlib_zonalstats_quickstart.ipynb

@@ -230,9 +230,8 @@
     "buffer = 5000.\n",
     "bbox = dict(left=bbox[0] - buffer, right=bbox[1] + buffer,\n",
     "            bottom=bbox[2] - buffer, top=bbox[3] + buffer)\n",
-    "mask, shape = wrl.zonalstats.mask_from_bbox(xy[..., 0], \n",
-    "                                            xy[..., 1],\n",
-    "                                            bbox)\n",
+    "mask = (((xy[..., 1] > bbox['bottom']) & (xy[..., 1] < bbox['top'])) &\n",
+    "        ((xy[..., 0] > bbox['left']) & (xy[..., 0] < bbox['right'])))\n",
     "xy_ = np.dstack((xy[..., 0][mask].ravel(), xy[..., 1][mask].ravel()))\n",
     "data_ = data[mask]"
    ]
@@ -452,7 +451,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.3"
+   "version": "3.6.4"
   },
   "livereveal": {
    "scroll": true