Merge pull request #359 from BibMartin/try_branca

Try branca dependency

Author: ocefpaf

.travis.yml

@@ -16,6 +16,7 @@ before_install:
     - travis_retry conda create --yes -n test python=$PYTHON --file requirements.txt
     - source activate test
     - conda install --yes --file requirements-dev.txt;
+    - pip install git+https://github.com/python-visualization/branca.git@a27055b3a9bd823a917a9a9847efac8dbd590238
     - if [[ "$PYTHON" == "3.4" ]]; then
         travis_retry conda install --yes nbconvert jupyter_client ipykernel;
         conda install --yes -c ioos geopandas;

examples/Colormaps.ipynb

@@ -31,6 +31,7 @@
     "import sys\n",
     "sys.path.append('..')\n",
     "import folium\n",
+    "import branca\n",
     "print (folium.__file__)\n",
     "print (folium.__version__)"
    ]
@@ -142,7 +143,7 @@
    },
    "outputs": [],
    "source": [
-    "import folium.colormap as cm"
+    "import branca.colormap as cm"
    ]
   },
   {
@@ -747,7 +748,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.4.3"
+   "version": "3.5.1"
   }
  },
  "nbformat": 4,

examples/Features.ipynb

@@ -21,6 +21,7 @@
    },
    "outputs": [],
    "source": [
+    "import branca\n",
     "import folium\n",
     "from folium import features"
    ]
@@ -94,7 +95,7 @@
     }
    ],
    "source": [
-    "f = folium.element.Figure(figsize=(8,8))\n",
+    "f = branca.element.Figure(figsize=(8,8))\n",
     "m = folium.Map([0,0], zoom_start=1)\n",
     "mk = features.Marker([0,0])\n",
     "pp = features.Popup(\"hello\")\n",
@@ -137,7 +138,7 @@
     }
    ],
    "source": [
-    "f = folium.element.Figure()\n",
+    "f = branca.element.Figure()\n",
     "m = folium.Map([0,0], zoom_start=1)\n",
     "mk = features.RegularPolygonMarker([0,0])\n",
     "mk2 = features.RegularPolygonMarker([0,45])\n",
@@ -187,7 +188,7 @@
     "scatter = vincent.Scatter(multi_iter2, iter_idx='x', height=100, width=200)\n",
     "data = json.loads(scatter.to_json())\n",
     "\n",
-    "f = folium.element.Figure()\n",
+    "f = branca.element.Figure()\n",
     "m = folium.Map([0,0], zoom_start=1)\n",
     "mk = features.Marker([0,0])\n",
     "p = features.Popup(\"Hello\")\n",
@@ -238,7 +239,7 @@
     "scatter = vincent.Scatter(multi_iter2, iter_idx='x', height=400, width=600)\n",
     "data = json.loads(scatter.to_json())\n",
     "\n",
-    "f = folium.element.Figure()\n",
+    "f = branca.element.Figure()\n",
     "v = features.Vega(data, height=40, width=600)\n",
     "f.add_children(v)\n",
     "\n",
@@ -283,7 +284,7 @@
     "scatter = vincent.Scatter(multi_iter2, iter_idx='x', height=250, width=420)\n",
     "data = json.loads(scatter.to_json())\n",
     "\n",
-    "f = folium.element.Figure()\n",
+    "f = branca.element.Figure()\n",
     "\n",
     "# Create two maps\n",
     "m = folium.Map([0,0], tiles='stamenwatercolor',\n",
@@ -441,7 +442,7 @@
     "scatter = vincent.Scatter(multi_iter2, iter_idx='x', height=250, width=420)\n",
     "data = json.loads(scatter.to_json())\n",
     "\n",
-    "f = folium.element.Figure()\n",
+    "f = branca.element.Figure()\n",
     "\n",
     "d1 = f.add_subplot(1,2,1)\n",
     "d2 = f.add_subplot(1,2,2)\n",

examples/GeoJSON and choropleth.ipynb

@@ -436,7 +436,7 @@
     }
    ],
    "source": [
-    "from folium.colormap import linear\n",
+    "from branca.colormap import linear\n",
     "\n",
     "colormap = linear.YlGn.scale(\n",
     "    unemployment.Unemployment.min(),\n",
@@ -871,7 +871,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.4.4"
+   "version": "3.5.1"
   }
  },
  "nbformat": 4,

examples/ImageOverlay.ipynb

@@ -22,50 +22,12 @@
    },
    "outputs": [],
    "source": [
-    "import sys"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 5,
-   "metadata": {
-    "collapsed": true
-   },
-   "outputs": [],
-   "source": [
-    "sys.path.insert(0,'..')"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 6,
-   "metadata": {
-    "collapsed": true
-   },
-   "outputs": [],
-   "source": [
-    "import folium"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 7,
-   "metadata": {
-    "collapsed": true
-   },
-   "outputs": [],
-   "source": [
-    "from folium.six import PY3"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 8,
-   "metadata": {
-    "collapsed": false
-   },
-   "outputs": [],
-   "source": [
+    "import sys\n",
+    "sys.path.insert(0,'..')\n",
+    "\n",
+    "from branca.six import PY3\n",
+    "\n",
+    "import folium\n",
     "from folium import plugins"
    ]
   },

examples/Popups.ipynb

@@ -27,6 +27,7 @@
     "import sys\n",
     "sys.path.insert(0,'..')\n",
     "import folium\n",
+    "import branca\n",
     "print (folium.__file__)\n",
     "print (folium.__version__)"
    ]
@@ -222,7 +223,7 @@
     "    </code>\n",
     "    </p>\n",
     "    \"\"\"\n",
-    "iframe = folium.element.IFrame(html=html, width=500, height=300)\n",
+    "iframe = branca.element.IFrame(html=html, width=500, height=300)\n",
     "popup = folium.Popup(iframe, max_width=2650)\n",
     "\n",
     "folium.Marker([30,-100], popup=popup).add_to(m)\n",
@@ -265,11 +266,11 @@
    ],
    "source": [
     "# Let's create a Figure, with a map inside.\n",
-    "f = folium.element.Figure()\n",
+    "f = branca.element.Figure()\n",
     "folium.Map([-25,150], zoom_start=3).add_to(f)\n",
     "\n",
     "# Let's put the figure into an IFrame.\n",
-    "iframe = folium.element.IFrame(width=500, height=300)\n",
+    "iframe = branca.element.IFrame(width=500, height=300)\n",
     "f.add_to(iframe)\n",
     "\n",
     "# Let's put the IFrame in a Popup\n",
@@ -299,21 +300,21 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python 2.7",
    "language": "python",
-   "name": "python3"
+   "name": "py27"
   },
   "language_info": {
    "codemirror_mode": {
     "name": "ipython",
-    "version": 3
+    "version": 2
    },
    "file_extension": ".py",
    "mimetype": "text/x-python",
    "name": "python",
    "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.5.1"
+   "pygments_lexer": "ipython2",
+   "version": "2.7.11"
   }
  },
  "nbformat": 4,

examples/folium_examples.ipynb

@@ -11,6 +11,7 @@
     "import sys\n",
     "sys.path.insert(0,'..')\n",
     "import folium\n",
+    "import branca\n",
     "#import pandas as pd\n",
     "#folium.initialize_notebook()"
    ]
@@ -414,7 +415,7 @@
     "df = pd.read_csv(county_data, na_values=[' '])\n",
     "\n",
     "\n",
-    "colorscale = folium.colormap.linear.YlOrRd.scale(0,50e3)\n",
+    "colorscale = branca.colormap.linear.YlOrRd.scale(0,50e3)\n",
     "employed_series = df.set_index('FIPS_Code')['Employed_2011']\n",
     "\n",
     "def style_function(feature):\n",
@@ -458,7 +459,7 @@
     }
    ],
    "source": [
-    "colorscale = folium.colormap.linear.YlGnBu.scale(0,30)\n",
+    "colorscale = branca.colormap.linear.YlGnBu.scale(0,30)\n",
     "employed_series = df.set_index('FIPS_Code')['Unemployment_rate_2011']\n",
     "\n",
     "def style_function(feature):\n",
@@ -502,7 +503,7 @@
     }
    ],
    "source": [
-    "colorscale = folium.colormap.linear.PuRd.scale(0,100000)\n",
+    "colorscale = branca.colormap.linear.PuRd.scale(0,100000)\n",
     "employed_series = df.set_index('FIPS_Code')['Median_Household_Income_2011'].dropna()\n",
     "\n",
     "def style_function(feature):\n",

folium/__init__.py

@@ -12,8 +12,6 @@
                              MarkerCluster, MultiPolyLine, PolyLine, Vega,
                              RegularPolygonMarker, TopoJson, WmsTileLayer)
 
-import folium.colormap as colormap
-
 __version__ = '0.3.0.dev'
 
 __all__ = ['Map',
@@ -27,7 +25,6 @@
            'Popup',
            'TileLayer',
            'ClickForMarker',
-           'colormap',
            'CustomIcon',
            'DivIcon',
            'GeoJson',