Enabled automatic zoom and centering as the default behavior

ptrks · ptrks · commit edfd0401f3b2 · 2015-12-31T02:10:01.000-06:00
diff --git a/README.md b/README.md
@@ -42,12 +42,15 @@ First, import the simplemap library
 import simplemap
 ```
 
-Next,  initialize your map object: `simplemap.Map()`
+Next,  initialize your map object: `simplemap.Map()`. 
+
+**Note:** By default the map will automatically center and zoom based on points given. For a custom center point, make sure to give `center` a lat/lon value.
+
 #####Parameters:
 
 * `title`  - The title of the HTML map webpage
-* `center` - `list` object containing the latitude and longitude of where the map should be centered
-* `zoom` - Zoom level of the map, defaults to 11 - Optional
+* `center` - `list` containing the lat and lon of of map center. By default is `None`, which results in auto centering. - Optional 
+* `zoom` - Zoom level of the map, defaults to 11  - Optional
 * `markers` - `list` of markers, where a marker is a `list`: optional hovertext, lat and lon - Optional
 * `html_template` - HTML template used to generate a map. Currently the default value of `basic.html` is the only option - Optional
 * `config_file` - JSON file containing the google maps `api_key`, defaults to `config.json` - Optional
diff --git a/example.html b/example.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<title>Example Map</title>
+		<meta name="viewport" content="initial-scale=1.0">
+		<meta charset="utf-8">
+		<link rel="stylesheet" href="simplemap/templates/static/css/basic.css">
+	</head>
+	<body>
+		<div id="map"></div>
+		<script>
+
+function initMap() {
+
+	var bounds = new google.maps.LatLngBounds();
+	var center_lat_lon = null;
+
+	var map = new google.maps.Map(document.getElementById('map'), {
+		zoom: 11,
+		center:  center_lat_lon
+	});
+
+	var markers =  [['Example text', 34.4563, -118.1241], ['', 34.6432, -118.1554]];
+
+
+	for( i = 0; i < markers.length; i++ ) {
+				var position = new google.maps.LatLng(markers[i][1], markers[i][2]);
+				var title = markers[i][0]
+				bounds.extend(position);
+				marker = new google.maps.Marker({
+						position: position,
+						map: map,
+						title:title
+
+				});
+
+			}
+
+		map.fitBounds(bounds);
+}
+
+
+		</script>
+		<script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyDCOgofJoPt_bsoBncCVCzEbOF8HbTH97g&signed_in=true&callback=initMap"
+		async defer></script>
+	</body>
+</html>
diff --git a/example.py b/example.py
@@ -2,7 +2,9 @@
 
 map_title = 'Example Map'
 center_point  = [34.5124, -118.1111]
+#center_point = None
+
 gps_markers = [ ['Example text', 34.4563,-118.1241], [34.6432,-118.1554] ]
 
-example_map = simplemap.Map(map_title, center_point, markers=gps_markers, config_file='dev_config.json')
+example_map = simplemap.Map(map_title, markers=gps_markers)
 example_map.write('example.html')
diff --git a/simplemap/map.py b/simplemap/map.py
@@ -15,19 +15,44 @@
 
 
 TEMPLATES_DIR = 'simplemap/templates'
+ZOOM_DEFAULT = 11
 
 class Map(object):
 
-	def __init__(self, title, center, zoom=11, markers=None, html_template='basic.html', config_file='config.json'):
+	def __init__(self, title, center=None, zoom=11, markers=None, html_template='basic.html', config_file='config.json'):
 
 		self._env = Environment(loader=FileSystemLoader(TEMPLATES_DIR), trim_blocks=True, undefined=SilentUndefined)
 
 		self.title = title
 		self.template = self._env.get_template(html_template)
 		self.center = center
+		self.zoom = zoom
 		self.config = config_file
 		self.markers = markers
 
+
+	def set_center(self, center_point):
+		if center_point is None:
+			self._center = 'null'
+		else:
+			self._center = '{{ lat:{0}, lng:{1}}}'.format(center_point[0], center_point[1])
+
+	def get_center(self):
+		return self._center
+
+
+	def set_zoom(self, zoom):
+		if zoom is None:
+			if self.center is not None:
+				#Don't allow zoom to be null if customer center is given 
+				self._zoom = ZOOM_DEFAULT
+			else:
+				self._zoom = 'null'
+		else:
+			self._zoom = zoom
+
+	def get_zoom(self):
+		return self._zoom
 	
 	def set_config(self, config_file):
 
@@ -45,14 +70,13 @@ def set_config(self, config_file):
 
 		except Exception:
 			print "An unknown error occured while attempting to read {0} config file.".format(config_file)
+			traceback.print_exc()
 			sys.exit()
 
-
 	def get_config(self):
 		
 		return self._config
 
-
 	def set_markers(self, markers):
 		if markers:
 			for i in markers:
@@ -61,7 +85,6 @@ def set_markers(self, markers):
 
 			self._markers = markers
 
-
 	def get_markers(self):
 
 		return self._markers
@@ -70,13 +93,15 @@ def get_markers(self):
 
 	config = property(get_config, set_config)
 	markers = property(get_markers, set_markers)
+	center = property(get_center, set_center)
+	zoom = property(get_zoom, set_zoom)
 
 
 	def write(self, output_path):
 
 		try:
 
-			html = self.template.render(map_title = self.title, center=self.center, markers=self._markers, api_key=self.config['api_key'])
+			html = self.template.render(map_title = self.title, center=self.center,zoom=self.zoom, markers=self.markers, api_key=self.config['api_key'])
 			with open(output_path, "w") as output:
 				output.write(html)
 
@@ -86,7 +111,8 @@ def write(self, output_path):
 
 		except Exception:
 			print "Undefined error occured while writing generating {0}".format(output_path)
-			sys.exit(0)
+			traceback.print_exc()
+			sys.exit()
 
 
 
diff --git a/simplemap/templates/basic.html b/simplemap/templates/basic.html
@@ -13,10 +13,10 @@
 function initMap() {
 
 	var bounds = new google.maps.LatLngBounds();
-	var center_lat_lon = {lat: {{center[0]}}, lng: {{ center[1] }} };
+	var center_lat_lon = {{center|safe}};
 
 	var map = new google.maps.Map(document.getElementById('map'), {
-		zoom: 11,
+		zoom: {{ zoom|safe }},
 		center:  center_lat_lon
 	});
 
@@ -35,6 +35,8 @@
 				});
 
 			}
+
+		{{ 'map.fitBounds(bounds);' if center == 'null' else '' }}
 }
 
 
