Merge branch 'master' into 'master'

Master

See merge request !61

map_test.py

-import folium 
-import os
-import json
-# Create map object
-m = folium.Map(location=[17.540267, 78.386352], zoom_start=15)
-# Global tooltip
-tooltip = 'Click For More Info'
-# Create custom marker icon
-logoIcon = folium.features.CustomIcon('hospital.png', icon_size=(25, 25))
-# Create markers
-folium.Marker([17.538376, 78.385291],
-              popup='<strong>Parking</strong>',
-              tooltip=tooltip,
-              icon=folium.Icon(color='blue',icon='paragraph',prefix='fa')).add_to(m),
-folium.Marker([17.538171, 78.385107],
-              popup='<strong>saraswati statue</strong>',
-              tooltip=tooltip,
-              icon=folium.Icon(icon='glyphicon glyphicon-tower')).add_to(m),
-folium.Marker([17.538577, 78.385014],
-              popup='<strong>canteen</strong>',
-              tooltip=tooltip,
-              icon=folium.Icon(color='purple', icon='glyphicon glyphicon-glass')).add_to(m),
-folium.Marker([17.536517, 78.384611],
-              popup='<strong>coffee shop</strong>',
-              tooltip=tooltip,
-              icon=folium.Icon(color='orange', icon='coffee', prefix='fa')).add_to(m),
-folium.Marker([17.5337555,78.3592283],
-              popup='<strong>Hospital</strong>',
-              tooltip=tooltip,
-              icon=folium.Icon(color='red',icon='glyphicon glyphicon-header')).add_to(m),
-# Circle marker
-folium.CircleMarker(
-    location=[17.537380, 78.384909],
-    radius=200,
-    popup='VNR VJIET',
-    color='#428bca',
-    fill=True,
-    fill_color='#428bca'
-).add_to(m)
-# Generate map
-m.save('H:\Sickaid\map.html')