Updates example data, removes downloading unit test for time being

wri · Jul 21, 2020 · 8ca32f4 · 8ca32f4
1 parent 8057fab
commit 8ca32f4
Show file tree

Hide file tree

Showing 4 changed files with 426 additions and 24 deletions.
diff --git a/notebooks/.ipynb_checkpoints/4a-download-large-area-checkpoint.ipynb b/notebooks/.ipynb_checkpoints/4a-download-large-area-checkpoint.ipynb
@@ -42,10 +42,10 @@
    "source": [
     "# If using example raw data\n",
     "import os\n",
-    "if not os.path.exists(\"../data/raw/\"):\n",
-    "    os.makedirs(\"../data/raw/\")\n",
+    "if not os.path.exists(\"../data/example/raw\"):\n",
+    "    os.makedirs(\"../data/example/raw/\")\n",
     "    \n",
-    "landscape = 'example-raw'\n",
+    "landscape = 'example'\n",
     "OUTPUT_FOLDER = '../data/{}/'.format(landscape)\n",
     "coords = (13.727334, -90.015579)\n",
     "coords = (coords[1], coords[0])"
@@ -58,9 +58,9 @@
    "outputs": [],
    "source": [
     "# Download example raw data - only if you don't have an API key!\n",
-    "!curl https://restoration-monitoring-external.s3.amazonaws.com/restoration-mapper/example/example-raw.zip \\\n",
-    "    -o ../data/data.zip\n",
-    "!unzip ../data/data.zip -d ../data/"
+    "!curl https://restoration-monitoring-external.s3.amazonaws.com/restoration-mapper/example/example.zip \\\n",
+    "    -o ../data/example/raw/data.zip\n",
+    "!unzip ../data/example/raw/data.zip -d ../data/example/raw/"
    ]
   },
   {
@@ -117,11 +117,14 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "with open(\"../config.yaml\", 'r') as stream:\n",
-    "    key = (yaml.safe_load(stream))\n",
-    "    API_KEY = key['key']\n",
-    "    AWSKEY = key['awskey']\n",
-    "    AWSSECRET = key['awssecret']"
+    "if os.path.exists(\"../config.yaml\"):\n",
+    "    with open(\"../config.yaml\", 'r') as stream:\n",
+    "        key = (yaml.safe_load(stream))\n",
+    "        API_KEY = key['key']\n",
+    "        AWSKEY = key['awskey']\n",
+    "        AWSSECRET = key['awssecret']\n",
+    "else:\n",
+    "    API_KEY = \"none\""
    ]
   },
   {
@@ -272,7 +275,7 @@
     "}\n",
     "\n",
     "landscape = 'brazil-buffer'\n",
-    "OUTPUT_FOLDER = '../tile_data/{}/'.format(landscape)\n",
+    "OUTPUT_FOLDER = '../data/{}/'.format(landscape)\n",
     "coords = landscapes[landscape]\n",
     "coords = (coords[1], coords[0])\n",
     "print(OUTPUT_FOLDER, coords)"

diff --git a/notebooks/4a-download-large-area.ipynb b/notebooks/4a-download-large-area.ipynb
@@ -42,10 +42,10 @@
    "source": [
     "# If using example raw data\n",
     "import os\n",
-    "if not os.path.exists(\"../data/raw/\"):\n",
-    "    os.makedirs(\"../data/raw/\")\n",
+    "if not os.path.exists(\"../data/example/raw\"):\n",
+    "    os.makedirs(\"../data/example/raw/\")\n",
     "    \n",
-    "landscape = 'example-raw'\n",
+    "landscape = 'example'\n",
     "OUTPUT_FOLDER = '../data/{}/'.format(landscape)\n",
     "coords = (13.727334, -90.015579)\n",
     "coords = (coords[1], coords[0])"
@@ -58,9 +58,9 @@
    "outputs": [],
    "source": [
     "# Download example raw data - only if you don't have an API key!\n",
-    "!curl https://restoration-monitoring-external.s3.amazonaws.com/restoration-mapper/example/example-raw.zip \\\n",
-    "    -o ../data/data.zip\n",
-    "!unzip ../data/data.zip -d ../data/"
+    "!curl https://restoration-monitoring-external.s3.amazonaws.com/restoration-mapper/example/example.zip \\\n",
+    "    -o ../data/example/raw/data.zip\n",
+    "!unzip ../data/example/raw/data.zip -d ../data/example/raw/"
    ]
   },
   {
@@ -117,11 +117,14 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "with open(\"../config.yaml\", 'r') as stream:\n",
-    "    key = (yaml.safe_load(stream))\n",
-    "    API_KEY = key['key']\n",
-    "    AWSKEY = key['awskey']\n",
-    "    AWSSECRET = key['awssecret']"
+    "if os.path.exists(\"../config.yaml\"):\n",
+    "    with open(\"../config.yaml\", 'r') as stream:\n",
+    "        key = (yaml.safe_load(stream))\n",
+    "        API_KEY = key['key']\n",
+    "        AWSKEY = key['awskey']\n",
+    "        AWSSECRET = key['awssecret']\n",
+    "else:\n",
+    "    API_KEY = \"none\""
    ]
   },
   {
@@ -272,7 +275,7 @@
     "}\n",
     "\n",
     "landscape = 'brazil-buffer'\n",
-    "OUTPUT_FOLDER = '../tile_data/{}/'.format(landscape)\n",
+    "OUTPUT_FOLDER = '../data/{}/'.format(landscape)\n",
     "coords = landscapes[landscape]\n",
     "coords = (coords[1], coords[0])\n",
     "print(OUTPUT_FOLDER, coords)"