make activity03 more efficient

Author: timgrossmann

lesson07/Activity03/activity03_solution.ipynb

@@ -27,7 +27,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": 1,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -47,7 +47,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 2,
    "metadata": {},
    "outputs": [
     {
@@ -78,7 +78,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": 3,
    "metadata": {},
    "outputs": [
     {
@@ -325,7 +325,7 @@
        "[5 rows x 96 columns]"
       ]
      },
-     "execution_count": 5,
+     "execution_count": 3,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -379,7 +379,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 6,
+   "execution_count": 4,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -413,7 +413,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": 5,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -428,7 +428,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 8,
+   "execution_count": 6,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -457,7 +457,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 9,
+   "execution_count": 7,
    "metadata": {},
    "outputs": [
     {
@@ -588,7 +588,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 10,
+   "execution_count": 8,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -599,7 +599,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 11,
+   "execution_count": 9,
    "metadata": {},
    "outputs": [
     {
@@ -684,7 +684,7 @@
        "4  21644  40.828028 -73.947308          89.0                 100.0"
       ]
      },
-     "execution_count": 11,
+     "execution_count": 9,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -725,7 +725,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 12,
+   "execution_count": 10,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -736,7 +736,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 13,
+   "execution_count": 43,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -804,7 +804,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 15,
+   "execution_count": 20,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -832,12 +832,14 @@
     "        max_val = max(self.data[self.display])\n",
     "        scale = 'log' if self.display == 'dollar_price' else 'lin'\n",
     "        \n",
-    "        for id in self.data['id']:\n",
-    "            grp = self.data.where(self.data['id'] == id)\n",
-    "            color = self.cmap.to_color(max(grp[self.display], 1), max_val, scale)\n",
-    "            self.painter.set_color(color)\n",
+    "        for index, id in enumerate(self.data['id']):\n",
+    "            # log scale can't start at 0, must be 1\n",
+    "            min_val = max(self.data[self.display][index], 1)\n",
     "            \n",
-    "            x, y = proj.lonlat_to_screen(grp['lon'], grp['lat'])\n",
+    "            color = self.cmap.to_color(min_val, max_val, scale)\n",
+    "            self.painter.set_color(color)\n",
+    "            lat, lon = self.data['lon'][index], self.data['lat'][index]\n",
+    "            x, y = proj.lonlat_to_screen(lat, lon)\n",
     "            self.painter.points(x, y, 5)\n",
     "        \n",
     "    def draw(self, proj, mouse_x, mouse_y, ui_manager):\n",
@@ -869,7 +871,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 16,
+   "execution_count": 21,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -881,7 +883,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 17,
+   "execution_count": 22,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -890,6 +892,13 @@
     "geoplotlib.add_layer(ValueLayer(data, bbox=ny_bbox))\n",
     "geoplotlib.show()"
    ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
   }
  ],
  "metadata": {