Putting features in the top namespace

Author: themiurgo

examples/Features.ipynb

@@ -291,10 +291,10 @@
     "pp = features.Popup(\"hello\")\n",
     "ic = features.Icon(color='red')\n",
     "\n",
-    "f.add_children(m)\n",
-    "mk.add_children(ic)\n",
-    "mk.add_children(pp)\n",
-    "m.add_children(mk)\n",
+    "f.add_child(m)\n",
+    "mk.add_child(ic)\n",
+    "mk.add_child(pp)\n",
+    "m.add_child(mk)\n",
     "\n",
     "f"
    ]
@@ -438,9 +438,9 @@
     "mk = features.RegularPolygonMarker([0,0])\n",
     "mk2 = features.RegularPolygonMarker([0,45])\n",
     "\n",
-    "f.add_children(m)\n",
-    "m.add_children(mk)\n",
-    "m.add_children(mk2)\n",
+    "f.add_child(m)\n",
+    "m.add_child(mk)\n",
+    "m.add_child(mk2)\n",
     "\n",
     "f"
    ]
@@ -738,10 +738,10 @@
     "mk = features.Marker([0,0])\n",
     "p = features.Popup(\"Hello\")\n",
     "v = features.Vega(data, width=\"100%\", height=\"100%\")\n",
-    "f.add_children(m)\n",
-    "mk.add_children(p)\n",
-    "p.add_children(v)\n",
-    "m.add_children(mk)\n",
+    "f.add_child(m)\n",
+    "mk.add_child(p)\n",
+    "p.add_child(v)\n",
+    "m.add_child(mk)\n",
     "\n",
     "f"
    ]
@@ -993,7 +993,7 @@
     "\n",
     "f = features.Figure()\n",
     "v = features.Vega(data, height=40, width=600)\n",
-    "f.add_children(v)\n",
+    "f.add_child(v)\n",
     "\n",
     "f"
    ]
@@ -1455,10 +1455,10 @@
     "\n",
     "v2 = features.Vega(data, position='absolute', left=\"0%\", width=\"50%\", height=\"50%\", top='50%')\n",
     "\n",
-    "f.add_children(m)\n",
-    "f.add_children(m2)\n",
-    "f.add_children(v)\n",
-    "f.add_children(v2)\n",
+    "f.add_child(m)\n",
+    "f.add_child(m2)\n",
+    "f.add_child(v)\n",
+    "f.add_child(v2)\n",
     "\n",
     "f"
    ]
@@ -2329,7 +2329,7 @@
     "        ],\n",
     "    }\n",
     "m = features.Map([48.,5.], zoom_start=6)\n",
-    "m.add_children(features.GeoJson(data))\n",
+    "m.add_child(features.GeoJson(data))\n",
     "m"
    ]
   },
@@ -4076,10 +4076,10 @@
     "for i in range(N):\n",
     "    mk = features.Marker([data[i][0],data[i][1]])\n",
     "    p = features.Popup(str(data[i][2]))\n",
-    "    mk.add_children(p)\n",
-    "    mc.add_children(mk)\n",
+    "    mk.add_child(p)\n",
+    "    mc.add_child(mk)\n",
     "\n",
-    "m.add_children(mc)\n",
+    "m.add_child(mc)\n",
     "m"
    ]
   },
@@ -4251,8 +4251,8 @@
     "d1 = f.add_subplot(1,2,1)\n",
     "d2 = f.add_subplot(1,2,2)\n",
     "\n",
-    "d1.add_children(features.Map([0,0], tiles='stamenwatercolor', zoom_start=1))\n",
-    "d2.add_children(features.Map([46,3], tiles='mapquestopen', zoom_start=5))\n",
+    "d1.add_child(features.Map([0,0], tiles='stamenwatercolor', zoom_start=1))\n",
+    "d2.add_child(features.Map([46,3], tiles='mapquestopen', zoom_start=5))\n",
     "\n",
     "f"
    ]
@@ -6092,9 +6092,9 @@
     "m = features.Map([43,-100], zoom_start=4)\n",
     "g = features.GeoJson(geojson_data)\n",
     "\n",
-    "f.add_children(m)\n",
-    "m.add_children(g)\n",
-    "g.add_children(features.GeoJsonStyle([3.0, 7.0, 8.0, 9.0, 9.0], 'YlGn', sd, key_on='feature.id'))\n",
+    "f.add_child(m)\n",
+    "m.add_child(g)\n",
+    "g.add_child(features.GeoJsonStyle([3.0, 7.0, 8.0, 9.0, 9.0], 'YlGn', sd, key_on='feature.id'))\n",
     "\n",
     "f"
    ]

tests/test_plugins.py

@@ -16,7 +16,7 @@ class TestPlugins(object):
 
     def test_scroll_zoom_toggler(self):
         mapa = folium.Map([45., 3.], zoom_start=4)
-        mapa.add_children(plugins.ScrollZoomToggler())
+        mapa.add_child(plugins.ScrollZoomToggler())
         mapa._repr_html_()
 
     def test_marker_cluster(self):
@@ -27,17 +27,18 @@ def test_marker_cluster(self):
             range(N),                                    # Popups.
             ]).T
         mapa = folium.Map([45., 3.], zoom_start=4)
-        mapa.add_children(plugins.MarkerCluster(data))
+        mapa.add_child(plugins.MarkerCluster(data))
         mapa._repr_html_()
 
     def test_terminator(self):
         mapa = folium.Map([45., 3.], zoom_start=1)
-        mapa.add_children(plugins.Terminator())
-        mapa.add_children(plugins.ScrollZoomToggler())
+        mapa.add_child(plugins.Terminator())
+        mapa.add_child(plugins.ScrollZoomToggler())
         mapa._repr_html_()
 
     def test_boat_marker(self):
         mapa = folium.Map([30., 0.], zoom_start=3)
+<<<<<<< b656b5ef3efcb6db92e094ec69159bcc6babeab3
         mapa.add_children(plugins.BoatMarker((34, -43),
                                              heading=45,
                                              wind_heading=150,
@@ -48,18 +49,36 @@ def test_boat_marker(self):
                                              wind_heading=46,
                                              wind_speed=25,
                                              color="#88f"))
+=======
+        mapa.add_child(plugins.BoatMarker((34, -43),
+                                           heading=45,
+                                           wind_heading=150,
+                                           wind_speed=45,
+                                           color="#8f8"))
+        mapa.add_child(plugins.BoatMarker((46, -30),
+                                           heading=-20,
+                                           wind_heading=46,
+                                           wind_speed=25,
+                                           color="#88f"))
+>>>>>>> Putting features in the top namespace
         mapa._repr_html_()
 
     def test_layer(self):
         mapa = folium.Map([48., 5.], tiles='stamentoner', zoom_start=6)
         layer = 'http://otile1.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.png'
+<<<<<<< b656b5ef3efcb6db92e094ec69159bcc6babeab3
         mapa.add_children(folium.map.TileLayer(layer, name='MapQuest',
                                                attr='attribution'))
         mapa.add_children(folium.map.TileLayer(layer,
                                                name='MapQuest2',
                                                attr='attribution2',
                                                overlay=True))
         mapa.add_children(folium.map.LayerControl())
+=======
+        mapa.add_child(folium.map.TileLayer(layer, name='MapQuest',  attr='attribution'))
+        mapa.add_child(folium.map.TileLayer(layer, name='MapQuest2', attr='attribution2', overlay=True))
+        mapa.add_child(folium.map.LayerControl())
+>>>>>>> Putting features in the top namespace
         mapa._repr_html_()
 
     def test_timestamped_geo_json(self):
@@ -135,12 +154,12 @@ def test_timestamped_geo_json(self):
             }
 
         mape = folium.Map([47, 3], zoom_start=1)
-        mape.add_children(plugins.TimestampedGeoJson(data))
+        mape.add_child(plugins.TimestampedGeoJson(data))
         mape._repr_html_()
 
     def test_heat_map(self):
         data = (np.random.normal(size=(100, 2)) * np.array([[1, 1]]) +
                 np.array([[48, 5]])).tolist()
         mapa = folium.Map([48., 5.], tiles='stamentoner', zoom_start=6)
-        mapa.add_children(plugins.HeatMap(data))
+        mapa.add_child(plugins.HeatMap(data))
         mapa._repr_html_()