From 991c8b3f1e6a85160d97b2863e80c8f9d21c1502 Mon Sep 17 00:00:00 2001
From: Bradley Cornford <bcornford@plus.net>
Date: Fri, 12 Jun 2015 11:18:53 +0100
Subject: [PATCH 01/40] Updated support for Laravel 5.

---
 README.md     | 6 ++++--
 composer.json | 3 +--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 9096cc8..50e5ae5 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,9 @@
 [![Build Status](https://travis-ci.org/bradcornford/Googlmapper.svg?branch=master)](https://travis-ci.org/bradcornford/Googlmapper)
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/bradcornford/Googlmapper/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/bradcornford/Googlmapper/?branch=master)
 
-Think of Googlmapper as an easy way to integrate Google Maps with Laravel 4, providing a variety of helpers to speed up the utilisation of mapping. These include:
+### For Laravel 4.x, check [version 1.0.1](https://github.com/bradcornford/Googlmapper/tree/v1.0.1)
+
+Think of Googlmapper as an easy way to integrate Google Maps with Laravel, providing a variety of helpers to speed up the utilisation of mapping. These include:
 
 - `Mapper::map`
 - `Mapper::stretview`
@@ -22,7 +24,7 @@ Think of Googlmapper as an easy way to integrate Google Maps with Laravel 4, pro
 Begin by installing this package through Composer. Edit your project's `composer.json` file to require `cornford/googlmapper`.
 
 	"require": {
-		"cornford/googlmapper": "1.*"
+		"cornford/googlmapper": "2.*"
 	}
 
 Next, update Composer from the Terminal:
diff --git a/composer.json b/composer.json
index 07684b2..7a00fe9 100644
--- a/composer.json
+++ b/composer.json
@@ -10,8 +10,7 @@
         }
     ],
     "require": {
-        "php": ">=5.4.0",
-        "illuminate/support": "4.2.*"
+        "php": ">=5.4.0"
     },
     "require-dev": {
         "phpspec/phpspec": "2.0.*@dev",

From 9c3fefb4ceb985c991a53f6148bdd11db00f9556 Mon Sep 17 00:00:00 2001
From: Bradley Cornford <bcornford@plus.net>
Date: Fri, 12 Jun 2015 11:18:53 +0100
Subject: [PATCH 02/40] Updated support for Laravel 5.

---
 README.md                                     |  6 ++-
 composer.json                                 |  3 +-
 .../Googlmapper/MapperServiceProvider.php     | 13 ++++--
 src/views/circle.blade.php                    | 24 +++++------
 src/views/map.blade.php                       | 32 +++++++--------
 src/views/mapper.blade.php                    |  4 +-
 src/views/marker.blade.php                    | 40 +++++++++----------
 src/views/overlay.blade.php                   | 12 +++---
 src/views/polygon.blade.php                   | 22 +++++-----
 src/views/polyline.blade.php                  | 20 +++++-----
 src/views/rectangle.blade.php                 | 22 +++++-----
 src/views/streetview.blade.php                | 20 +++++-----
 12 files changed, 112 insertions(+), 106 deletions(-)

diff --git a/README.md b/README.md
index 9096cc8..50e5ae5 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,9 @@
 [![Build Status](https://travis-ci.org/bradcornford/Googlmapper.svg?branch=master)](https://travis-ci.org/bradcornford/Googlmapper)
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/bradcornford/Googlmapper/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/bradcornford/Googlmapper/?branch=master)
 
-Think of Googlmapper as an easy way to integrate Google Maps with Laravel 4, providing a variety of helpers to speed up the utilisation of mapping. These include:
+### For Laravel 4.x, check [version 1.0.1](https://github.com/bradcornford/Googlmapper/tree/v1.0.1)
+
+Think of Googlmapper as an easy way to integrate Google Maps with Laravel, providing a variety of helpers to speed up the utilisation of mapping. These include:
 
 - `Mapper::map`
 - `Mapper::stretview`
@@ -22,7 +24,7 @@ Think of Googlmapper as an easy way to integrate Google Maps with Laravel 4, pro
 Begin by installing this package through Composer. Edit your project's `composer.json` file to require `cornford/googlmapper`.
 
 	"require": {
-		"cornford/googlmapper": "1.*"
+		"cornford/googlmapper": "2.*"
 	}
 
 Next, update Composer from the Terminal:
diff --git a/composer.json b/composer.json
index 07684b2..7a00fe9 100644
--- a/composer.json
+++ b/composer.json
@@ -10,8 +10,7 @@
         }
     ],
     "require": {
-        "php": ">=5.4.0",
-        "illuminate/support": "4.2.*"
+        "php": ">=5.4.0"
     },
     "require-dev": {
         "phpspec/phpspec": "2.0.*@dev",
diff --git a/src/Cornford/Googlmapper/MapperServiceProvider.php b/src/Cornford/Googlmapper/MapperServiceProvider.php
index 479a4e7..22d4b78 100644
--- a/src/Cornford/Googlmapper/MapperServiceProvider.php
+++ b/src/Cornford/Googlmapper/MapperServiceProvider.php
@@ -19,7 +19,11 @@ class MapperServiceProvider extends ServiceProvider {
 	 */
 	public function boot()
 	{
-		$this->package('cornford/googlmapper');
+		$configPath = __DIR__ . '/../../config/config.php';
+		$this->publishes([$configPath => config_path('config.php')], 'config');
+
+		$viewPath = __DIR__ . '/../../views';
+		$this->loadViewsFrom($viewPath, 'googlmapper');
 	}
 
 	/**
@@ -29,13 +33,14 @@ public function boot()
 	 */
 	public function register()
 	{
+		$configPath = __DIR__ . '/../../config/config.php';
+		$this->mergeConfigFrom($configPath, 'googlmapper');
+
 		$this->app['mapper'] = $this->app->share(function($app)
 		{
-			$config = $app['config']->get('googlmapper::config');
-
 			return new Mapper(
 				$this->app->view,
-				$config
+				$app['config']->get('googlmapper')
 			);
 		});
 	}
diff --git a/src/views/circle.blade.php b/src/views/circle.blade.php
index ce263b6..2425d13 100644
--- a/src/views/circle.blade.php
+++ b/src/views/circle.blade.php
@@ -1,18 +1,18 @@
-var circleCoordinates_{{ $id }} = (
+var circleCoordinates_{!! $id !!} = (
 	@foreach ($options['coordinates'] as $key => $coordinate)
-		new google.maps.LatLng({{ $coordinate['latitude'] }}, {{ $coordinate['longitude'] }})
+		new google.maps.LatLng({!! $coordinate['latitude'] !!}, {!! $coordinate['longitude'] !!})
 	@endforeach
 );
 
-var circle_{{ $id }} = new google.maps.Circle({
-	strokeColor: '{{ $options['strokeColor'] }}',
-	strokeOpacity: {{ $options['strokeOpacity'] }},
-	strokeWeight: {{ $options['strokeWeight'] }},
-	fillColor: '{{ $options['fillColor'] }}',
-	fillOpacity: {{ $options['fillOpacity'] }},
-	center: circleCoordinates_{{ $id }},
-	radius: {{ $options['radius'] }},
-	editable: {{ $options['editable'] ? 'true' : 'false' }}
+var circle_{!! $id !!} = new google.maps.Circle({
+	strokeColor: '{!! $options['strokeColor'] !!}',
+	strokeOpacity: {!! $options['strokeOpacity'] !!},
+	strokeWeight: {!! $options['strokeWeight'] !!},
+	fillColor: '{!! $options['fillColor'] !!}',
+	fillOpacity: {!! $options['fillOpacity'] !!},
+	center: circleCoordinates_{!! $id !!},
+	radius: {!! $options['radius'] !!},
+	editable: {!! $options['editable'] ? 'true' : 'false' !!}
 });
 
-circle_{{ $id }}.setMap({{ $options['map'] }});
\ No newline at end of file
+circle_{!! $id !!}.setMap({!! $options['map'] !!});
\ No newline at end of file
diff --git a/src/views/map.blade.php b/src/views/map.blade.php
index 2bc0d0c..99a8052 100644
--- a/src/views/map.blade.php
+++ b/src/views/map.blade.php
@@ -1,56 +1,56 @@
-<div id="map-canvas-{{ $id }}" style="height: 100%; margin: 0; padding: 0;"></div>
+<div id="map-canvas-{!! $id !!}" style="height: 100%; margin: 0; padding: 0;"></div>
 
 <script type="text/javascript">
 
-	function initialize_{{ $id }}() {
+	function initialize_{!! $id !!}() {
 		var bounds = new google.maps.LatLngBounds();
 		var infowindow = new google.maps.InfoWindow();
-		var position = new google.maps.LatLng({{ $options['latitude'] }}, {{ $options['longitude'] }});
+		var position = new google.maps.LatLng({!! $options['latitude'] !!}, {!! $options['longitude'] !!});
 
-		var mapOptions_{{ $id }} = {
+		var mapOptions_{!! $id !!} = {
 			@if ($options['center'])
 				center: position,
 			@endif
-			mapTypeId: google.maps.MapTypeId.{{ $options['type'] }},
+			mapTypeId: google.maps.MapTypeId.{!! $options['type'] !!},
 			disableDefaultUI: @if (!$options['ui']) true @else false @endif
 		};
 
-		var map_{{ $id }} = new google.maps.Map(document.getElementById('map-canvas-{{ $id }}'), mapOptions_{{ $id }});
-		map_{{ $id }}.setTilt({{ $options['tilt'] }});
+		var map_{!! $id !!} = new google.maps.Map(document.getElementById('map-canvas-{!! $id !!}'), mapOptions_{!! $id !!});
+		map_{!! $id !!}.setTilt({!! $options['tilt'] !!});
 
 		@foreach ($options['markers'] as $key => $marker)
-			{{ $marker->render($key, $view) }}
+			{!! $marker->render($key, $view) !!}
 		@endforeach
 
 		@foreach ($options['shapes'] as $key => $shape)
-			{{ $shape->render($key, $view) }}
+			{!! $shape->render($key, $view) !!}
 		@endforeach
 
 		@if (!$options['center'])
-			map_{{ $id }}.fitBounds(bounds);
+			map_{!! $id !!}.fitBounds(bounds);
 		@endif
 
 		@if ($options['overlay'] == 'BIKE')
 			var bikeLayer = new google.maps.BicyclingLayer();
-			bikeLayer.setMap(map_{{ $id }});
+			bikeLayer.setMap(map_{!! $id !!});
 		@endif
 
 		@if ($options['overlay'] == 'TRANSIT')
 			var transitLayer = new google.maps.TransitLayer();
-			transitLayer.setMap(map_{{ $id }});
+			transitLayer.setMap(map_{!! $id !!});
 		@endif
 
 		@if ($options['overlay'] == 'TRAFFIC')
 			var trafficLayer = new google.maps.TrafficLayer();
-			trafficLayer.setMap(map_{{ $id }});
+			trafficLayer.setMap(map_{!! $id !!});
 		@endif
 
-		var listener = google.maps.event.addListener(map_{{ $id }}, "idle", function () {
-			map_{{ $id }}.setZoom({{ $options['zoom'] }});
+		var listener = google.maps.event.addListener(map_{!! $id !!}, "idle", function () {
+			map_{!! $id !!}.setZoom({!! $options['zoom'] !!});
 			google.maps.event.removeListener(listener);
 		});
 	}
 
-	google.maps.event.addDomListener(window, 'load', initialize_{{ $id }});
+	google.maps.event.addDomListener(window, 'load', initialize_{!! $id !!});
 
 </script>
\ No newline at end of file
diff --git a/src/views/mapper.blade.php b/src/views/mapper.blade.php
index d3c4c60..3fffcb9 100644
--- a/src/views/mapper.blade.php
+++ b/src/views/mapper.blade.php
@@ -1,8 +1,8 @@
-<script type="text/javascript" src="//maps.googleapis.com/maps/api/js?v={{ $options['version'] }}&region={{ $options['region'] }}&language={{ $options['language'] }}&key={{ $options['key'] }}&signed_in={{ $options['user'] ? 'true' : 'false' }}&libraries=places"></script>
+<script type="text/javascript" src="//maps.googleapis.com/maps/api/js?v={!! $options['version'] !!}&region={!! $options['region'] !!}&language={!! $options['language'] !!}&key={!! $options['key'] !!}&signed_in={!! $options['user'] ? 'true' : 'false' !!}&libraries=places"></script>
 
 @foreach ($items as $id => $item)
 
-	{{ $item->render($id, $view) }}
+	{!! $item->render($id, $view) !!}
 
 @endforeach
 
diff --git a/src/views/marker.blade.php b/src/views/marker.blade.php
index 47ebf5a..099f707 100644
--- a/src/views/marker.blade.php
+++ b/src/views/marker.blade.php
@@ -1,8 +1,8 @@
 @if ($options['user'] && $options['place'])
 
-	var service = new google.maps.places.PlacesService({{ $options['map'] }});
+	var service = new google.maps.places.PlacesService({!! $options['map'] !!});
 	var request = {
-		placeId: '{{ $options['place'] }}'
+		placeId: '{!! $options['place'] !!}'
 	};
 
 	service.getDetails(request, function(placeResult, status) {
@@ -13,41 +13,41 @@
 
 @endif
 
-var markerPosition_{{ $id }} = new google.maps.LatLng({{ $options['latitude'] }}, {{ $options['longitude'] }});
+var markerPosition_{!! $id !!} = new google.maps.LatLng({!! $options['latitude'] !!}, {!! $options['longitude'] !!});
 
-var marker_{{ $id }} = new google.maps.Marker({
-	position: markerPosition_{{ $id }},
+var marker_{!! $id !!} = new google.maps.Marker({
+	position: markerPosition_{!! $id !!},
 	@if ($options['user'] && $options['place'])
 		place: {
-			placeId: '{{ $options['place'] }}',
-			location: { lat: {{ $options['latitude'] }}, lng: {{ $options['longitude'] }} }
+			placeId: '{!! $options['place'] !!}',
+			location: { lat: {!! $options['latitude'] !!}, lng: {!! $options['longitude'] !!} }
 		},
 		attribution: {
 			source: document.title,
 			webUrl: document.URL
 		},
 	@endif
-	title: '{{ $options['title'] }}',
-	animation: @if (empty($options['animation']) || $options['animation'] == 'NONE') '' @else google.maps.Animation.{{ $options['animation'] }} @endif,
+	title: '{!! $options['title'] !!}',
+	animation: @if (empty($options['animation']) || $options['animation'] == 'NONE') '' @else google.maps.Animation.{!! $options['animation'] !!} @endif,
 	@if ($options['symbol'])
 		icon: {
-			path: google.maps.SymbolPath.{{ $options['symbol'] }},
-			scale: {{ $options['scale'] }}
+			path: google.maps.SymbolPath.{!! $options['symbol'] !!},
+			scale: {!! $options['scale'] !!}
 		}
 	@else
-		icon: '{{ $options['icon'] }}'
+		icon: '{!! $options['icon'] !!}'
 	@endif
 });
 
-bounds.extend(marker_{{ $id }}.position);
+bounds.extend(marker_{!! $id !!}.position);
 
-marker_{{ $id }}.setMap({{ $options['map'] }});
+marker_{!! $id !!}.setMap({!! $options['map'] !!});
 
 @if ($options['user'] && $options['place'])
 
-		marker_{{ $id }}.addListener('click', function() {
+		marker_{!! $id !!}.addListener('click', function() {
 			infowindow.setContent('<a href="' + placeResult.website + '">' + placeResult.name + '</a>');
-			infowindow.open({{ $options['map'] }}, this);
+			infowindow.open({!! $options['map'] !!}, this);
 		});
 	});
 
@@ -55,12 +55,12 @@
 
 	@if (!empty($options['content']))
 
-		var infowindow_{{ $id }} = new google.maps.InfoWindow({
-			content: '{{ $options['content'] }}'
+		var infowindow_{!! $id !!} = new google.maps.InfoWindow({
+			content: '{!! $options['content'] !!}'
 		});
 
-		google.maps.event.addListener(marker_{{ $id }}, 'click', function() {
-			infowindow_{{ $id }}.open({{ $options['map'] }}, marker_{{ $id }});
+		google.maps.event.addListener(marker_{!! $id !!}, 'click', function() {
+			infowindow_{!! $id !!}.open({!! $options['map'] !!}, marker_{!! $id !!});
 		});
 
 	@endif
diff --git a/src/views/overlay.blade.php b/src/views/overlay.blade.php
index d53bb66..da22bbc 100644
--- a/src/views/overlay.blade.php
+++ b/src/views/overlay.blade.php
@@ -1,12 +1,12 @@
-var overlayCoordinates_{{ $id }} = new google.maps.LatLngBounds(
+var overlayCoordinates_{!! $id !!} = new google.maps.LatLngBounds(
 	@foreach ($options['coordinates'] as $coordinate)
-		new google.maps.LatLng({{ $coordinate['latitude'] }}, {{ $coordinate['longitude'] }}),
+		new google.maps.LatLng({!! $coordinate['latitude'] !!}, {!! $coordinate['longitude'] !!}),
 	@endforeach
 );
 
-overlay_{{ $id }} = new google.maps.GroundOverlay(
-	'{{ $options['image'] }}',
-	overlayCoordinates_{{ $id }}
+overlay_{!! $id !!} = new google.maps.GroundOverlay(
+	'{!! $options['image'] !!}',
+	overlayCoordinates_{!! $id !!}
 );
 
-overlay_{{ $id }}.setMap({{ $options['map'] }});
+overlay_{!! $id !!}.setMap({!! $options['map'] !!});
diff --git a/src/views/polygon.blade.php b/src/views/polygon.blade.php
index fa77fc3..6b24f94 100644
--- a/src/views/polygon.blade.php
+++ b/src/views/polygon.blade.php
@@ -1,17 +1,17 @@
-var polygonCoordinates_{{ $id }} = [
+var polygonCoordinates_{!! $id !!} = [
 	@foreach ($options['coordinates'] as $coordinate)
-		new google.maps.LatLng({{ $coordinate['latitude'] }}, {{ $coordinate['longitude'] }}),
+		new google.maps.LatLng({!! $coordinate['latitude'] !!}, {!! $coordinate['longitude'] !!}),
 	@endforeach
 ];
 
-var polygon_{{ $id }} = new google.maps.Polygon({
-	paths: polygonCoordinates_{{ $id }},
-	strokeColor: '{{ $options['strokeColor'] }}',
-	strokeOpacity: {{ $options['strokeOpacity'] }},
-	strokeWeight: {{ $options['strokeWeight'] }},
-	fillColor: '{{ $options['fillColor'] }}',
-	fillOpacity: {{ $options['fillOpacity'] }},
-	editable: {{ $options['editable'] ? 'true' : 'false' }}
+var polygon_{!! $id !!} = new google.maps.Polygon({
+	paths: polygonCoordinates_{!! $id !!},
+	strokeColor: '{!! $options['strokeColor'] !!}',
+	strokeOpacity: {!! $options['strokeOpacity'] !!},
+	strokeWeight: {!! $options['strokeWeight'] !!},
+	fillColor: '{!! $options['fillColor'] !!}',
+	fillOpacity: {!! $options['fillOpacity'] !!},
+	editable: {!! $options['editable'] ? 'true' : 'false' !!}
 });
 
-polygon_{{ $id }}.setMap({{ $options['map'] }});
+polygon_{!! $id !!}.setMap({!! $options['map'] !!});
diff --git a/src/views/polyline.blade.php b/src/views/polyline.blade.php
index 4203904..e536213 100644
--- a/src/views/polyline.blade.php
+++ b/src/views/polyline.blade.php
@@ -1,16 +1,16 @@
-var polylineCoordinates_{{ $id }} = [
+var polylineCoordinates_{!! $id !!} = [
 	@foreach ($options['coordinates'] as $coordinate)
-		new google.maps.LatLng({{ $coordinate['latitude'] }}, {{ $coordinate['longitude'] }}),
+		new google.maps.LatLng({!! $coordinate['latitude'] !!}, {!! $coordinate['longitude'] !!}),
 	@endforeach
 ];
 
-var polyline_{{ $id }} = new google.maps.Polyline({
-	path: polylineCoordinates_{{ $id }},
-	geodesic: {{ $options['strokeColor'] ? 'true' : 'false' }},
-	strokeColor: '{{ $options['strokeColor'] }}',
-	strokeOpacity: {{ $options['strokeOpacity'] }},
-	strokeWeight: {{ $options['strokeWeight'] }},
-	editable: {{ $options['editable'] ? 'true' : 'false' }}
+var polyline_{!! $id !!} = new google.maps.Polyline({
+	path: polylineCoordinates_{!! $id !!},
+	geodesic: {!! $options['strokeColor'] ? 'true' : 'false' !!},
+	strokeColor: '{!! $options['strokeColor'] !!}',
+	strokeOpacity: {!! $options['strokeOpacity'] !!},
+	strokeWeight: {!! $options['strokeWeight'] !!},
+	editable: {!! $options['editable'] ? 'true' : 'false' !!}
 });
 
-polyline_{{ $id }}.setMap({{ $options['map'] }});
\ No newline at end of file
+polyline_{!! $id !!}.setMap({!! $options['map'] !!});
\ No newline at end of file
diff --git a/src/views/rectangle.blade.php b/src/views/rectangle.blade.php
index c8c2119..832ac80 100644
--- a/src/views/rectangle.blade.php
+++ b/src/views/rectangle.blade.php
@@ -1,17 +1,17 @@
-var rectangleCoordinates_{{ $id }} = new google.maps.LatLngBounds(
+var rectangleCoordinates_{!! $id !!} = new google.maps.LatLngBounds(
 	@foreach ($options['coordinates'] as $key => $coordinate)
-		new google.maps.LatLng({{ $coordinate['latitude'] }}, {{ $coordinate['longitude'] }})@if (count($options['coordinates']) - 1 > $key), @endif
+		new google.maps.LatLng({!! $coordinate['latitude'] !!}, {!! $coordinate['longitude'] !!})@if (count($options['coordinates']) - 1 > $key), @endif
 	@endforeach
 );
 
-var rectangle_{{ $id }} = new google.maps.Rectangle({
-	strokeColor: '{{ $options['strokeColor'] }}',
-	strokeOpacity: {{ $options['strokeOpacity'] }},
-	strokeWeight: {{ $options['strokeWeight'] }},
-	fillColor: '{{ $options['fillColor'] }}',
-	fillOpacity: {{ $options['fillOpacity'] }},
-	bounds: rectangleCoordinates_{{ $id }},
-	editable: {{ $options['editable'] ? 'true' : 'false' }}
+var rectangle_{!! $id !!} = new google.maps.Rectangle({
+	strokeColor: '{!! $options['strokeColor'] !!}',
+	strokeOpacity: {!! $options['strokeOpacity'] !!},
+	strokeWeight: {!! $options['strokeWeight'] !!},
+	fillColor: '{!! $options['fillColor'] !!}',
+	fillOpacity: {!! $options['fillOpacity'] !!},
+	bounds: rectangleCoordinates_{!! $id !!},
+	editable: {!! $options['editable'] ? 'true' : 'false' !!}
 });
 
-rectangle_{{ $id }}.setMap({{ $options['map'] }});
+rectangle_{!! $id !!}.setMap({!! $options['map'] !!});
diff --git a/src/views/streetview.blade.php b/src/views/streetview.blade.php
index 55a4c62..94d3170 100644
--- a/src/views/streetview.blade.php
+++ b/src/views/streetview.blade.php
@@ -1,35 +1,35 @@
-<div id="map-canvas-{{ $id }}" style="height: 100%; margin: 0; padding: 0;"></div>
+<div id="map-canvas-{!! $id !!}" style="height: 100%; margin: 0; padding: 0;"></div>
 
 <script type="text/javascript">
 
-	function initialize_{{ $id }}() {
+	function initialize_{!! $id !!}() {
 		var bounds = new google.maps.LatLngBounds();
-		var position = new google.maps.LatLng({{ $options['latitude'] }}, {{ $options['longitude'] }});
+		var position = new google.maps.LatLng({!! $options['latitude'] !!}, {!! $options['longitude'] !!});
 
 		var mapOptions = {
 			@if ($options['center'])
 				center: position,
 			@endif
-			zoom: {{ $options['zoom'] }},
-			mapTypeId: google.maps.MapTypeId.{{ $options['type'] }},
+			zoom: {!! $options['zoom'] !!},
+			mapTypeId: google.maps.MapTypeId.{!! $options['type'] !!},
 			disableDefaultUI: @if (!$options['ui']) true @else false @endif
 		};
 
-		var map = new google.maps.Map(document.getElementById('map-canvas-{{ $id }}'), mapOptions);
+		var map = new google.maps.Map(document.getElementById('map-canvas-{!! $id !!}'), mapOptions);
 
 		var panoramaOptions = {
 			position: position,
 			pov: {
-				heading: {{ $options['heading'] }},
-				pitch: {{ $options['pitch'] }}
+				heading: {!! $options['heading'] !!},
+				pitch: {!! $options['pitch'] !!}
 			}
 		};
 
-		var panorama = new google.maps.StreetViewPanorama(document.getElementById('map-canvas-{{ $id }}'), panoramaOptions);
+		var panorama = new google.maps.StreetViewPanorama(document.getElementById('map-canvas-{!! $id !!}'), panoramaOptions);
 
 		map.setStreetView(panorama);
 	}
 
-	google.maps.event.addDomListener(window, 'load', initialize_{{ $id }});
+	google.maps.event.addDomListener(window, 'load', initialize_{!! $id !!});
 
 </script>
\ No newline at end of file

From 4434fecdc9065438828766ab7ac21dd09ebe762d Mon Sep 17 00:00:00 2001
From: Bradley Cornford <bcornford@plus.net>
Date: Fri, 12 Jun 2015 11:18:53 +0100
Subject: [PATCH 03/40] Updated support for Laravel 5.

---
 README.md                                     |  8 ++--
 composer.json                                 |  3 +-
 .../Googlmapper/MapperServiceProvider.php     | 13 ++++--
 src/views/circle.blade.php                    | 24 +++++------
 src/views/map.blade.php                       | 32 +++++++--------
 src/views/mapper.blade.php                    |  4 +-
 src/views/marker.blade.php                    | 40 +++++++++----------
 src/views/overlay.blade.php                   | 12 +++---
 src/views/polygon.blade.php                   | 22 +++++-----
 src/views/polyline.blade.php                  | 20 +++++-----
 src/views/rectangle.blade.php                 | 22 +++++-----
 src/views/streetview.blade.php                | 20 +++++-----
 12 files changed, 113 insertions(+), 107 deletions(-)

diff --git a/README.md b/README.md
index 9096cc8..68c42c2 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,9 @@
 [![Build Status](https://travis-ci.org/bradcornford/Googlmapper.svg?branch=master)](https://travis-ci.org/bradcornford/Googlmapper)
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/bradcornford/Googlmapper/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/bradcornford/Googlmapper/?branch=master)
 
-Think of Googlmapper as an easy way to integrate Google Maps with Laravel 4, providing a variety of helpers to speed up the utilisation of mapping. These include:
+### For Laravel 4.x, check [version 1.0.1](https://github.com/bradcornford/Googlmapper/tree/v1.0.1)
+
+Think of Googlmapper as an easy way to integrate Google Maps with Laravel, providing a variety of helpers to speed up the utilisation of mapping. These include:
 
 - `Mapper::map`
 - `Mapper::stretview`
@@ -22,7 +24,7 @@ Think of Googlmapper as an easy way to integrate Google Maps with Laravel 4, pro
 Begin by installing this package through Composer. Edit your project's `composer.json` file to require `cornford/googlmapper`.
 
 	"require": {
-		"cornford/googlmapper": "1.*"
+		"cornford/googlmapper": "2.*"
 	}
 
 Next, update Composer from the Terminal:
@@ -39,7 +41,7 @@ The next step is to introduce the facade. Open `app/config/app.php`, and add a n
 
 Finally we need to introduce the configuration files into your application/
 
-	php artisan config:publish cornford/googlmapper
+	php artisan vendor:publish --provider="Cornford\\Googlmapper\\MapperServiceProvider"
 
 That's it! You're all set to go.
 
diff --git a/composer.json b/composer.json
index 07684b2..7a00fe9 100644
--- a/composer.json
+++ b/composer.json
@@ -10,8 +10,7 @@
         }
     ],
     "require": {
-        "php": ">=5.4.0",
-        "illuminate/support": "4.2.*"
+        "php": ">=5.4.0"
     },
     "require-dev": {
         "phpspec/phpspec": "2.0.*@dev",
diff --git a/src/Cornford/Googlmapper/MapperServiceProvider.php b/src/Cornford/Googlmapper/MapperServiceProvider.php
index 479a4e7..8ad5892 100644
--- a/src/Cornford/Googlmapper/MapperServiceProvider.php
+++ b/src/Cornford/Googlmapper/MapperServiceProvider.php
@@ -19,7 +19,11 @@ class MapperServiceProvider extends ServiceProvider {
 	 */
 	public function boot()
 	{
-		$this->package('cornford/googlmapper');
+		$configPath = __DIR__ . '/../../config/config.php';
+		$this->publishes([$configPath => config_path('config.php')], 'googlmapper');
+
+		$viewPath = __DIR__ . '/../../views';
+		$this->loadViewsFrom($viewPath, 'googlmapper');
 	}
 
 	/**
@@ -29,13 +33,14 @@ public function boot()
 	 */
 	public function register()
 	{
+		$configPath = __DIR__ . '/../../config/config.php';
+		$this->mergeConfigFrom($configPath, 'googlmapper');
+
 		$this->app['mapper'] = $this->app->share(function($app)
 		{
-			$config = $app['config']->get('googlmapper::config');
-
 			return new Mapper(
 				$this->app->view,
-				$config
+				$app['config']->get('googlmapper')
 			);
 		});
 	}
diff --git a/src/views/circle.blade.php b/src/views/circle.blade.php
index ce263b6..2425d13 100644
--- a/src/views/circle.blade.php
+++ b/src/views/circle.blade.php
@@ -1,18 +1,18 @@
-var circleCoordinates_{{ $id }} = (
+var circleCoordinates_{!! $id !!} = (
 	@foreach ($options['coordinates'] as $key => $coordinate)
-		new google.maps.LatLng({{ $coordinate['latitude'] }}, {{ $coordinate['longitude'] }})
+		new google.maps.LatLng({!! $coordinate['latitude'] !!}, {!! $coordinate['longitude'] !!})
 	@endforeach
 );
 
-var circle_{{ $id }} = new google.maps.Circle({
-	strokeColor: '{{ $options['strokeColor'] }}',
-	strokeOpacity: {{ $options['strokeOpacity'] }},
-	strokeWeight: {{ $options['strokeWeight'] }},
-	fillColor: '{{ $options['fillColor'] }}',
-	fillOpacity: {{ $options['fillOpacity'] }},
-	center: circleCoordinates_{{ $id }},
-	radius: {{ $options['radius'] }},
-	editable: {{ $options['editable'] ? 'true' : 'false' }}
+var circle_{!! $id !!} = new google.maps.Circle({
+	strokeColor: '{!! $options['strokeColor'] !!}',
+	strokeOpacity: {!! $options['strokeOpacity'] !!},
+	strokeWeight: {!! $options['strokeWeight'] !!},
+	fillColor: '{!! $options['fillColor'] !!}',
+	fillOpacity: {!! $options['fillOpacity'] !!},
+	center: circleCoordinates_{!! $id !!},
+	radius: {!! $options['radius'] !!},
+	editable: {!! $options['editable'] ? 'true' : 'false' !!}
 });
 
-circle_{{ $id }}.setMap({{ $options['map'] }});
\ No newline at end of file
+circle_{!! $id !!}.setMap({!! $options['map'] !!});
\ No newline at end of file
diff --git a/src/views/map.blade.php b/src/views/map.blade.php
index 2bc0d0c..99a8052 100644
--- a/src/views/map.blade.php
+++ b/src/views/map.blade.php
@@ -1,56 +1,56 @@
-<div id="map-canvas-{{ $id }}" style="height: 100%; margin: 0; padding: 0;"></div>
+<div id="map-canvas-{!! $id !!}" style="height: 100%; margin: 0; padding: 0;"></div>
 
 <script type="text/javascript">
 
-	function initialize_{{ $id }}() {
+	function initialize_{!! $id !!}() {
 		var bounds = new google.maps.LatLngBounds();
 		var infowindow = new google.maps.InfoWindow();
-		var position = new google.maps.LatLng({{ $options['latitude'] }}, {{ $options['longitude'] }});
+		var position = new google.maps.LatLng({!! $options['latitude'] !!}, {!! $options['longitude'] !!});
 
-		var mapOptions_{{ $id }} = {
+		var mapOptions_{!! $id !!} = {
 			@if ($options['center'])
 				center: position,
 			@endif
-			mapTypeId: google.maps.MapTypeId.{{ $options['type'] }},
+			mapTypeId: google.maps.MapTypeId.{!! $options['type'] !!},
 			disableDefaultUI: @if (!$options['ui']) true @else false @endif
 		};
 
-		var map_{{ $id }} = new google.maps.Map(document.getElementById('map-canvas-{{ $id }}'), mapOptions_{{ $id }});
-		map_{{ $id }}.setTilt({{ $options['tilt'] }});
+		var map_{!! $id !!} = new google.maps.Map(document.getElementById('map-canvas-{!! $id !!}'), mapOptions_{!! $id !!});
+		map_{!! $id !!}.setTilt({!! $options['tilt'] !!});
 
 		@foreach ($options['markers'] as $key => $marker)
-			{{ $marker->render($key, $view) }}
+			{!! $marker->render($key, $view) !!}
 		@endforeach
 
 		@foreach ($options['shapes'] as $key => $shape)
-			{{ $shape->render($key, $view) }}
+			{!! $shape->render($key, $view) !!}
 		@endforeach
 
 		@if (!$options['center'])
-			map_{{ $id }}.fitBounds(bounds);
+			map_{!! $id !!}.fitBounds(bounds);
 		@endif
 
 		@if ($options['overlay'] == 'BIKE')
 			var bikeLayer = new google.maps.BicyclingLayer();
-			bikeLayer.setMap(map_{{ $id }});
+			bikeLayer.setMap(map_{!! $id !!});
 		@endif
 
 		@if ($options['overlay'] == 'TRANSIT')
 			var transitLayer = new google.maps.TransitLayer();
-			transitLayer.setMap(map_{{ $id }});
+			transitLayer.setMap(map_{!! $id !!});
 		@endif
 
 		@if ($options['overlay'] == 'TRAFFIC')
 			var trafficLayer = new google.maps.TrafficLayer();
-			trafficLayer.setMap(map_{{ $id }});
+			trafficLayer.setMap(map_{!! $id !!});
 		@endif
 
-		var listener = google.maps.event.addListener(map_{{ $id }}, "idle", function () {
-			map_{{ $id }}.setZoom({{ $options['zoom'] }});
+		var listener = google.maps.event.addListener(map_{!! $id !!}, "idle", function () {
+			map_{!! $id !!}.setZoom({!! $options['zoom'] !!});
 			google.maps.event.removeListener(listener);
 		});
 	}
 
-	google.maps.event.addDomListener(window, 'load', initialize_{{ $id }});
+	google.maps.event.addDomListener(window, 'load', initialize_{!! $id !!});
 
 </script>
\ No newline at end of file
diff --git a/src/views/mapper.blade.php b/src/views/mapper.blade.php
index d3c4c60..3fffcb9 100644
--- a/src/views/mapper.blade.php
+++ b/src/views/mapper.blade.php
@@ -1,8 +1,8 @@
-<script type="text/javascript" src="//maps.googleapis.com/maps/api/js?v={{ $options['version'] }}&region={{ $options['region'] }}&language={{ $options['language'] }}&key={{ $options['key'] }}&signed_in={{ $options['user'] ? 'true' : 'false' }}&libraries=places"></script>
+<script type="text/javascript" src="//maps.googleapis.com/maps/api/js?v={!! $options['version'] !!}&region={!! $options['region'] !!}&language={!! $options['language'] !!}&key={!! $options['key'] !!}&signed_in={!! $options['user'] ? 'true' : 'false' !!}&libraries=places"></script>
 
 @foreach ($items as $id => $item)
 
-	{{ $item->render($id, $view) }}
+	{!! $item->render($id, $view) !!}
 
 @endforeach
 
diff --git a/src/views/marker.blade.php b/src/views/marker.blade.php
index 47ebf5a..099f707 100644
--- a/src/views/marker.blade.php
+++ b/src/views/marker.blade.php
@@ -1,8 +1,8 @@
 @if ($options['user'] && $options['place'])
 
-	var service = new google.maps.places.PlacesService({{ $options['map'] }});
+	var service = new google.maps.places.PlacesService({!! $options['map'] !!});
 	var request = {
-		placeId: '{{ $options['place'] }}'
+		placeId: '{!! $options['place'] !!}'
 	};
 
 	service.getDetails(request, function(placeResult, status) {
@@ -13,41 +13,41 @@
 
 @endif
 
-var markerPosition_{{ $id }} = new google.maps.LatLng({{ $options['latitude'] }}, {{ $options['longitude'] }});
+var markerPosition_{!! $id !!} = new google.maps.LatLng({!! $options['latitude'] !!}, {!! $options['longitude'] !!});
 
-var marker_{{ $id }} = new google.maps.Marker({
-	position: markerPosition_{{ $id }},
+var marker_{!! $id !!} = new google.maps.Marker({
+	position: markerPosition_{!! $id !!},
 	@if ($options['user'] && $options['place'])
 		place: {
-			placeId: '{{ $options['place'] }}',
-			location: { lat: {{ $options['latitude'] }}, lng: {{ $options['longitude'] }} }
+			placeId: '{!! $options['place'] !!}',
+			location: { lat: {!! $options['latitude'] !!}, lng: {!! $options['longitude'] !!} }
 		},
 		attribution: {
 			source: document.title,
 			webUrl: document.URL
 		},
 	@endif
-	title: '{{ $options['title'] }}',
-	animation: @if (empty($options['animation']) || $options['animation'] == 'NONE') '' @else google.maps.Animation.{{ $options['animation'] }} @endif,
+	title: '{!! $options['title'] !!}',
+	animation: @if (empty($options['animation']) || $options['animation'] == 'NONE') '' @else google.maps.Animation.{!! $options['animation'] !!} @endif,
 	@if ($options['symbol'])
 		icon: {
-			path: google.maps.SymbolPath.{{ $options['symbol'] }},
-			scale: {{ $options['scale'] }}
+			path: google.maps.SymbolPath.{!! $options['symbol'] !!},
+			scale: {!! $options['scale'] !!}
 		}
 	@else
-		icon: '{{ $options['icon'] }}'
+		icon: '{!! $options['icon'] !!}'
 	@endif
 });
 
-bounds.extend(marker_{{ $id }}.position);
+bounds.extend(marker_{!! $id !!}.position);
 
-marker_{{ $id }}.setMap({{ $options['map'] }});
+marker_{!! $id !!}.setMap({!! $options['map'] !!});
 
 @if ($options['user'] && $options['place'])
 
-		marker_{{ $id }}.addListener('click', function() {
+		marker_{!! $id !!}.addListener('click', function() {
 			infowindow.setContent('<a href="' + placeResult.website + '">' + placeResult.name + '</a>');
-			infowindow.open({{ $options['map'] }}, this);
+			infowindow.open({!! $options['map'] !!}, this);
 		});
 	});
 
@@ -55,12 +55,12 @@
 
 	@if (!empty($options['content']))
 
-		var infowindow_{{ $id }} = new google.maps.InfoWindow({
-			content: '{{ $options['content'] }}'
+		var infowindow_{!! $id !!} = new google.maps.InfoWindow({
+			content: '{!! $options['content'] !!}'
 		});
 
-		google.maps.event.addListener(marker_{{ $id }}, 'click', function() {
-			infowindow_{{ $id }}.open({{ $options['map'] }}, marker_{{ $id }});
+		google.maps.event.addListener(marker_{!! $id !!}, 'click', function() {
+			infowindow_{!! $id !!}.open({!! $options['map'] !!}, marker_{!! $id !!});
 		});
 
 	@endif
diff --git a/src/views/overlay.blade.php b/src/views/overlay.blade.php
index d53bb66..da22bbc 100644
--- a/src/views/overlay.blade.php
+++ b/src/views/overlay.blade.php
@@ -1,12 +1,12 @@
-var overlayCoordinates_{{ $id }} = new google.maps.LatLngBounds(
+var overlayCoordinates_{!! $id !!} = new google.maps.LatLngBounds(
 	@foreach ($options['coordinates'] as $coordinate)
-		new google.maps.LatLng({{ $coordinate['latitude'] }}, {{ $coordinate['longitude'] }}),
+		new google.maps.LatLng({!! $coordinate['latitude'] !!}, {!! $coordinate['longitude'] !!}),
 	@endforeach
 );
 
-overlay_{{ $id }} = new google.maps.GroundOverlay(
-	'{{ $options['image'] }}',
-	overlayCoordinates_{{ $id }}
+overlay_{!! $id !!} = new google.maps.GroundOverlay(
+	'{!! $options['image'] !!}',
+	overlayCoordinates_{!! $id !!}
 );
 
-overlay_{{ $id }}.setMap({{ $options['map'] }});
+overlay_{!! $id !!}.setMap({!! $options['map'] !!});
diff --git a/src/views/polygon.blade.php b/src/views/polygon.blade.php
index fa77fc3..6b24f94 100644
--- a/src/views/polygon.blade.php
+++ b/src/views/polygon.blade.php
@@ -1,17 +1,17 @@
-var polygonCoordinates_{{ $id }} = [
+var polygonCoordinates_{!! $id !!} = [
 	@foreach ($options['coordinates'] as $coordinate)
-		new google.maps.LatLng({{ $coordinate['latitude'] }}, {{ $coordinate['longitude'] }}),
+		new google.maps.LatLng({!! $coordinate['latitude'] !!}, {!! $coordinate['longitude'] !!}),
 	@endforeach
 ];
 
-var polygon_{{ $id }} = new google.maps.Polygon({
-	paths: polygonCoordinates_{{ $id }},
-	strokeColor: '{{ $options['strokeColor'] }}',
-	strokeOpacity: {{ $options['strokeOpacity'] }},
-	strokeWeight: {{ $options['strokeWeight'] }},
-	fillColor: '{{ $options['fillColor'] }}',
-	fillOpacity: {{ $options['fillOpacity'] }},
-	editable: {{ $options['editable'] ? 'true' : 'false' }}
+var polygon_{!! $id !!} = new google.maps.Polygon({
+	paths: polygonCoordinates_{!! $id !!},
+	strokeColor: '{!! $options['strokeColor'] !!}',
+	strokeOpacity: {!! $options['strokeOpacity'] !!},
+	strokeWeight: {!! $options['strokeWeight'] !!},
+	fillColor: '{!! $options['fillColor'] !!}',
+	fillOpacity: {!! $options['fillOpacity'] !!},
+	editable: {!! $options['editable'] ? 'true' : 'false' !!}
 });
 
-polygon_{{ $id }}.setMap({{ $options['map'] }});
+polygon_{!! $id !!}.setMap({!! $options['map'] !!});
diff --git a/src/views/polyline.blade.php b/src/views/polyline.blade.php
index 4203904..e536213 100644
--- a/src/views/polyline.blade.php
+++ b/src/views/polyline.blade.php
@@ -1,16 +1,16 @@
-var polylineCoordinates_{{ $id }} = [
+var polylineCoordinates_{!! $id !!} = [
 	@foreach ($options['coordinates'] as $coordinate)
-		new google.maps.LatLng({{ $coordinate['latitude'] }}, {{ $coordinate['longitude'] }}),
+		new google.maps.LatLng({!! $coordinate['latitude'] !!}, {!! $coordinate['longitude'] !!}),
 	@endforeach
 ];
 
-var polyline_{{ $id }} = new google.maps.Polyline({
-	path: polylineCoordinates_{{ $id }},
-	geodesic: {{ $options['strokeColor'] ? 'true' : 'false' }},
-	strokeColor: '{{ $options['strokeColor'] }}',
-	strokeOpacity: {{ $options['strokeOpacity'] }},
-	strokeWeight: {{ $options['strokeWeight'] }},
-	editable: {{ $options['editable'] ? 'true' : 'false' }}
+var polyline_{!! $id !!} = new google.maps.Polyline({
+	path: polylineCoordinates_{!! $id !!},
+	geodesic: {!! $options['strokeColor'] ? 'true' : 'false' !!},
+	strokeColor: '{!! $options['strokeColor'] !!}',
+	strokeOpacity: {!! $options['strokeOpacity'] !!},
+	strokeWeight: {!! $options['strokeWeight'] !!},
+	editable: {!! $options['editable'] ? 'true' : 'false' !!}
 });
 
-polyline_{{ $id }}.setMap({{ $options['map'] }});
\ No newline at end of file
+polyline_{!! $id !!}.setMap({!! $options['map'] !!});
\ No newline at end of file
diff --git a/src/views/rectangle.blade.php b/src/views/rectangle.blade.php
index c8c2119..832ac80 100644
--- a/src/views/rectangle.blade.php
+++ b/src/views/rectangle.blade.php
@@ -1,17 +1,17 @@
-var rectangleCoordinates_{{ $id }} = new google.maps.LatLngBounds(
+var rectangleCoordinates_{!! $id !!} = new google.maps.LatLngBounds(
 	@foreach ($options['coordinates'] as $key => $coordinate)
-		new google.maps.LatLng({{ $coordinate['latitude'] }}, {{ $coordinate['longitude'] }})@if (count($options['coordinates']) - 1 > $key), @endif
+		new google.maps.LatLng({!! $coordinate['latitude'] !!}, {!! $coordinate['longitude'] !!})@if (count($options['coordinates']) - 1 > $key), @endif
 	@endforeach
 );
 
-var rectangle_{{ $id }} = new google.maps.Rectangle({
-	strokeColor: '{{ $options['strokeColor'] }}',
-	strokeOpacity: {{ $options['strokeOpacity'] }},
-	strokeWeight: {{ $options['strokeWeight'] }},
-	fillColor: '{{ $options['fillColor'] }}',
-	fillOpacity: {{ $options['fillOpacity'] }},
-	bounds: rectangleCoordinates_{{ $id }},
-	editable: {{ $options['editable'] ? 'true' : 'false' }}
+var rectangle_{!! $id !!} = new google.maps.Rectangle({
+	strokeColor: '{!! $options['strokeColor'] !!}',
+	strokeOpacity: {!! $options['strokeOpacity'] !!},
+	strokeWeight: {!! $options['strokeWeight'] !!},
+	fillColor: '{!! $options['fillColor'] !!}',
+	fillOpacity: {!! $options['fillOpacity'] !!},
+	bounds: rectangleCoordinates_{!! $id !!},
+	editable: {!! $options['editable'] ? 'true' : 'false' !!}
 });
 
-rectangle_{{ $id }}.setMap({{ $options['map'] }});
+rectangle_{!! $id !!}.setMap({!! $options['map'] !!});
diff --git a/src/views/streetview.blade.php b/src/views/streetview.blade.php
index 55a4c62..94d3170 100644
--- a/src/views/streetview.blade.php
+++ b/src/views/streetview.blade.php
@@ -1,35 +1,35 @@
-<div id="map-canvas-{{ $id }}" style="height: 100%; margin: 0; padding: 0;"></div>
+<div id="map-canvas-{!! $id !!}" style="height: 100%; margin: 0; padding: 0;"></div>
 
 <script type="text/javascript">
 
-	function initialize_{{ $id }}() {
+	function initialize_{!! $id !!}() {
 		var bounds = new google.maps.LatLngBounds();
-		var position = new google.maps.LatLng({{ $options['latitude'] }}, {{ $options['longitude'] }});
+		var position = new google.maps.LatLng({!! $options['latitude'] !!}, {!! $options['longitude'] !!});
 
 		var mapOptions = {
 			@if ($options['center'])
 				center: position,
 			@endif
-			zoom: {{ $options['zoom'] }},
-			mapTypeId: google.maps.MapTypeId.{{ $options['type'] }},
+			zoom: {!! $options['zoom'] !!},
+			mapTypeId: google.maps.MapTypeId.{!! $options['type'] !!},
 			disableDefaultUI: @if (!$options['ui']) true @else false @endif
 		};
 
-		var map = new google.maps.Map(document.getElementById('map-canvas-{{ $id }}'), mapOptions);
+		var map = new google.maps.Map(document.getElementById('map-canvas-{!! $id !!}'), mapOptions);
 
 		var panoramaOptions = {
 			position: position,
 			pov: {
-				heading: {{ $options['heading'] }},
-				pitch: {{ $options['pitch'] }}
+				heading: {!! $options['heading'] !!},
+				pitch: {!! $options['pitch'] !!}
 			}
 		};
 
-		var panorama = new google.maps.StreetViewPanorama(document.getElementById('map-canvas-{{ $id }}'), panoramaOptions);
+		var panorama = new google.maps.StreetViewPanorama(document.getElementById('map-canvas-{!! $id !!}'), panoramaOptions);
 
 		map.setStreetView(panorama);
 	}
 
-	google.maps.event.addDomListener(window, 'load', initialize_{{ $id }});
+	google.maps.event.addDomListener(window, 'load', initialize_{!! $id !!});
 
 </script>
\ No newline at end of file

From 84d9e6d7dc5e0f08029cb12eb2d842cea36de5ae Mon Sep 17 00:00:00 2001
From: Bradley Cornford <bcornford@plus.net>
Date: Fri, 12 Jun 2015 11:18:53 +0100
Subject: [PATCH 04/40] Updated support for Laravel 5.

---
 README.md                                     |  8 ++--
 composer.json                                 |  3 +-
 .../Googlmapper/MapperServiceProvider.php     | 13 ++++--
 src/views/circle.blade.php                    | 24 +++++------
 src/views/map.blade.php                       | 32 +++++++--------
 src/views/mapper.blade.php                    |  4 +-
 src/views/marker.blade.php                    | 40 +++++++++----------
 src/views/overlay.blade.php                   | 12 +++---
 src/views/polygon.blade.php                   | 22 +++++-----
 src/views/polyline.blade.php                  | 20 +++++-----
 src/views/rectangle.blade.php                 | 22 +++++-----
 src/views/streetview.blade.php                | 20 +++++-----
 12 files changed, 113 insertions(+), 107 deletions(-)

diff --git a/README.md b/README.md
index 9096cc8..68c42c2 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,9 @@
 [![Build Status](https://travis-ci.org/bradcornford/Googlmapper.svg?branch=master)](https://travis-ci.org/bradcornford/Googlmapper)
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/bradcornford/Googlmapper/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/bradcornford/Googlmapper/?branch=master)
 
-Think of Googlmapper as an easy way to integrate Google Maps with Laravel 4, providing a variety of helpers to speed up the utilisation of mapping. These include:
+### For Laravel 4.x, check [version 1.0.1](https://github.com/bradcornford/Googlmapper/tree/v1.0.1)
+
+Think of Googlmapper as an easy way to integrate Google Maps with Laravel, providing a variety of helpers to speed up the utilisation of mapping. These include:
 
 - `Mapper::map`
 - `Mapper::stretview`
@@ -22,7 +24,7 @@ Think of Googlmapper as an easy way to integrate Google Maps with Laravel 4, pro
 Begin by installing this package through Composer. Edit your project's `composer.json` file to require `cornford/googlmapper`.
 
 	"require": {
-		"cornford/googlmapper": "1.*"
+		"cornford/googlmapper": "2.*"
 	}
 
 Next, update Composer from the Terminal:
@@ -39,7 +41,7 @@ The next step is to introduce the facade. Open `app/config/app.php`, and add a n
 
 Finally we need to introduce the configuration files into your application/
 
-	php artisan config:publish cornford/googlmapper
+	php artisan vendor:publish --provider="Cornford\\Googlmapper\\MapperServiceProvider"
 
 That's it! You're all set to go.
 
diff --git a/composer.json b/composer.json
index 07684b2..7a00fe9 100644
--- a/composer.json
+++ b/composer.json
@@ -10,8 +10,7 @@
         }
     ],
     "require": {
-        "php": ">=5.4.0",
-        "illuminate/support": "4.2.*"
+        "php": ">=5.4.0"
     },
     "require-dev": {
         "phpspec/phpspec": "2.0.*@dev",
diff --git a/src/Cornford/Googlmapper/MapperServiceProvider.php b/src/Cornford/Googlmapper/MapperServiceProvider.php
index 479a4e7..6b1f211 100644
--- a/src/Cornford/Googlmapper/MapperServiceProvider.php
+++ b/src/Cornford/Googlmapper/MapperServiceProvider.php
@@ -19,7 +19,11 @@ class MapperServiceProvider extends ServiceProvider {
 	 */
 	public function boot()
 	{
-		$this->package('cornford/googlmapper');
+		$configPath = __DIR__ . '/../../config/config.php';
+		$this->publishes([$configPath => config_path('googlmapper.php')], 'googlmapper');
+
+		$viewPath = __DIR__ . '/../../views';
+		$this->loadViewsFrom($viewPath, 'googlmapper');
 	}
 
 	/**
@@ -29,13 +33,14 @@ public function boot()
 	 */
 	public function register()
 	{
+		$configPath = __DIR__ . '/../../config/config.php';
+		$this->mergeConfigFrom($configPath, 'googlmapper');
+
 		$this->app['mapper'] = $this->app->share(function($app)
 		{
-			$config = $app['config']->get('googlmapper::config');
-
 			return new Mapper(
 				$this->app->view,
-				$config
+				$app['config']->get('googlmapper')
 			);
 		});
 	}
diff --git a/src/views/circle.blade.php b/src/views/circle.blade.php
index ce263b6..2425d13 100644
--- a/src/views/circle.blade.php
+++ b/src/views/circle.blade.php
@@ -1,18 +1,18 @@
-var circleCoordinates_{{ $id }} = (
+var circleCoordinates_{!! $id !!} = (
 	@foreach ($options['coordinates'] as $key => $coordinate)
-		new google.maps.LatLng({{ $coordinate['latitude'] }}, {{ $coordinate['longitude'] }})
+		new google.maps.LatLng({!! $coordinate['latitude'] !!}, {!! $coordinate['longitude'] !!})
 	@endforeach
 );
 
-var circle_{{ $id }} = new google.maps.Circle({
-	strokeColor: '{{ $options['strokeColor'] }}',
-	strokeOpacity: {{ $options['strokeOpacity'] }},
-	strokeWeight: {{ $options['strokeWeight'] }},
-	fillColor: '{{ $options['fillColor'] }}',
-	fillOpacity: {{ $options['fillOpacity'] }},
-	center: circleCoordinates_{{ $id }},
-	radius: {{ $options['radius'] }},
-	editable: {{ $options['editable'] ? 'true' : 'false' }}
+var circle_{!! $id !!} = new google.maps.Circle({
+	strokeColor: '{!! $options['strokeColor'] !!}',
+	strokeOpacity: {!! $options['strokeOpacity'] !!},
+	strokeWeight: {!! $options['strokeWeight'] !!},
+	fillColor: '{!! $options['fillColor'] !!}',
+	fillOpacity: {!! $options['fillOpacity'] !!},
+	center: circleCoordinates_{!! $id !!},
+	radius: {!! $options['radius'] !!},
+	editable: {!! $options['editable'] ? 'true' : 'false' !!}
 });
 
-circle_{{ $id }}.setMap({{ $options['map'] }});
\ No newline at end of file
+circle_{!! $id !!}.setMap({!! $options['map'] !!});
\ No newline at end of file
diff --git a/src/views/map.blade.php b/src/views/map.blade.php
index 2bc0d0c..99a8052 100644
--- a/src/views/map.blade.php
+++ b/src/views/map.blade.php
@@ -1,56 +1,56 @@
-<div id="map-canvas-{{ $id }}" style="height: 100%; margin: 0; padding: 0;"></div>
+<div id="map-canvas-{!! $id !!}" style="height: 100%; margin: 0; padding: 0;"></div>
 
 <script type="text/javascript">
 
-	function initialize_{{ $id }}() {
+	function initialize_{!! $id !!}() {
 		var bounds = new google.maps.LatLngBounds();
 		var infowindow = new google.maps.InfoWindow();
-		var position = new google.maps.LatLng({{ $options['latitude'] }}, {{ $options['longitude'] }});
+		var position = new google.maps.LatLng({!! $options['latitude'] !!}, {!! $options['longitude'] !!});
 
-		var mapOptions_{{ $id }} = {
+		var mapOptions_{!! $id !!} = {
 			@if ($options['center'])
 				center: position,
 			@endif
-			mapTypeId: google.maps.MapTypeId.{{ $options['type'] }},
+			mapTypeId: google.maps.MapTypeId.{!! $options['type'] !!},
 			disableDefaultUI: @if (!$options['ui']) true @else false @endif
 		};
 
-		var map_{{ $id }} = new google.maps.Map(document.getElementById('map-canvas-{{ $id }}'), mapOptions_{{ $id }});
-		map_{{ $id }}.setTilt({{ $options['tilt'] }});
+		var map_{!! $id !!} = new google.maps.Map(document.getElementById('map-canvas-{!! $id !!}'), mapOptions_{!! $id !!});
+		map_{!! $id !!}.setTilt({!! $options['tilt'] !!});
 
 		@foreach ($options['markers'] as $key => $marker)
-			{{ $marker->render($key, $view) }}
+			{!! $marker->render($key, $view) !!}
 		@endforeach
 
 		@foreach ($options['shapes'] as $key => $shape)
-			{{ $shape->render($key, $view) }}
+			{!! $shape->render($key, $view) !!}
 		@endforeach
 
 		@if (!$options['center'])
-			map_{{ $id }}.fitBounds(bounds);
+			map_{!! $id !!}.fitBounds(bounds);
 		@endif
 
 		@if ($options['overlay'] == 'BIKE')
 			var bikeLayer = new google.maps.BicyclingLayer();
-			bikeLayer.setMap(map_{{ $id }});
+			bikeLayer.setMap(map_{!! $id !!});
 		@endif
 
 		@if ($options['overlay'] == 'TRANSIT')
 			var transitLayer = new google.maps.TransitLayer();
-			transitLayer.setMap(map_{{ $id }});
+			transitLayer.setMap(map_{!! $id !!});
 		@endif
 
 		@if ($options['overlay'] == 'TRAFFIC')
 			var trafficLayer = new google.maps.TrafficLayer();
-			trafficLayer.setMap(map_{{ $id }});
+			trafficLayer.setMap(map_{!! $id !!});
 		@endif
 
-		var listener = google.maps.event.addListener(map_{{ $id }}, "idle", function () {
-			map_{{ $id }}.setZoom({{ $options['zoom'] }});
+		var listener = google.maps.event.addListener(map_{!! $id !!}, "idle", function () {
+			map_{!! $id !!}.setZoom({!! $options['zoom'] !!});
 			google.maps.event.removeListener(listener);
 		});
 	}
 
-	google.maps.event.addDomListener(window, 'load', initialize_{{ $id }});
+	google.maps.event.addDomListener(window, 'load', initialize_{!! $id !!});
 
 </script>
\ No newline at end of file
diff --git a/src/views/mapper.blade.php b/src/views/mapper.blade.php
index d3c4c60..3fffcb9 100644
--- a/src/views/mapper.blade.php
+++ b/src/views/mapper.blade.php
@@ -1,8 +1,8 @@
-<script type="text/javascript" src="//maps.googleapis.com/maps/api/js?v={{ $options['version'] }}&region={{ $options['region'] }}&language={{ $options['language'] }}&key={{ $options['key'] }}&signed_in={{ $options['user'] ? 'true' : 'false' }}&libraries=places"></script>
+<script type="text/javascript" src="//maps.googleapis.com/maps/api/js?v={!! $options['version'] !!}&region={!! $options['region'] !!}&language={!! $options['language'] !!}&key={!! $options['key'] !!}&signed_in={!! $options['user'] ? 'true' : 'false' !!}&libraries=places"></script>
 
 @foreach ($items as $id => $item)
 
-	{{ $item->render($id, $view) }}
+	{!! $item->render($id, $view) !!}
 
 @endforeach
 
diff --git a/src/views/marker.blade.php b/src/views/marker.blade.php
index 47ebf5a..099f707 100644
--- a/src/views/marker.blade.php
+++ b/src/views/marker.blade.php
@@ -1,8 +1,8 @@
 @if ($options['user'] && $options['place'])
 
-	var service = new google.maps.places.PlacesService({{ $options['map'] }});
+	var service = new google.maps.places.PlacesService({!! $options['map'] !!});
 	var request = {
-		placeId: '{{ $options['place'] }}'
+		placeId: '{!! $options['place'] !!}'
 	};
 
 	service.getDetails(request, function(placeResult, status) {
@@ -13,41 +13,41 @@
 
 @endif
 
-var markerPosition_{{ $id }} = new google.maps.LatLng({{ $options['latitude'] }}, {{ $options['longitude'] }});
+var markerPosition_{!! $id !!} = new google.maps.LatLng({!! $options['latitude'] !!}, {!! $options['longitude'] !!});
 
-var marker_{{ $id }} = new google.maps.Marker({
-	position: markerPosition_{{ $id }},
+var marker_{!! $id !!} = new google.maps.Marker({
+	position: markerPosition_{!! $id !!},
 	@if ($options['user'] && $options['place'])
 		place: {
-			placeId: '{{ $options['place'] }}',
-			location: { lat: {{ $options['latitude'] }}, lng: {{ $options['longitude'] }} }
+			placeId: '{!! $options['place'] !!}',
+			location: { lat: {!! $options['latitude'] !!}, lng: {!! $options['longitude'] !!} }
 		},
 		attribution: {
 			source: document.title,
 			webUrl: document.URL
 		},
 	@endif
-	title: '{{ $options['title'] }}',
-	animation: @if (empty($options['animation']) || $options['animation'] == 'NONE') '' @else google.maps.Animation.{{ $options['animation'] }} @endif,
+	title: '{!! $options['title'] !!}',
+	animation: @if (empty($options['animation']) || $options['animation'] == 'NONE') '' @else google.maps.Animation.{!! $options['animation'] !!} @endif,
 	@if ($options['symbol'])
 		icon: {
-			path: google.maps.SymbolPath.{{ $options['symbol'] }},
-			scale: {{ $options['scale'] }}
+			path: google.maps.SymbolPath.{!! $options['symbol'] !!},
+			scale: {!! $options['scale'] !!}
 		}
 	@else
-		icon: '{{ $options['icon'] }}'
+		icon: '{!! $options['icon'] !!}'
 	@endif
 });
 
-bounds.extend(marker_{{ $id }}.position);
+bounds.extend(marker_{!! $id !!}.position);
 
-marker_{{ $id }}.setMap({{ $options['map'] }});
+marker_{!! $id !!}.setMap({!! $options['map'] !!});
 
 @if ($options['user'] && $options['place'])
 
-		marker_{{ $id }}.addListener('click', function() {
+		marker_{!! $id !!}.addListener('click', function() {
 			infowindow.setContent('<a href="' + placeResult.website + '">' + placeResult.name + '</a>');
-			infowindow.open({{ $options['map'] }}, this);
+			infowindow.open({!! $options['map'] !!}, this);
 		});
 	});
 
@@ -55,12 +55,12 @@
 
 	@if (!empty($options['content']))
 
-		var infowindow_{{ $id }} = new google.maps.InfoWindow({
-			content: '{{ $options['content'] }}'
+		var infowindow_{!! $id !!} = new google.maps.InfoWindow({
+			content: '{!! $options['content'] !!}'
 		});
 
-		google.maps.event.addListener(marker_{{ $id }}, 'click', function() {
-			infowindow_{{ $id }}.open({{ $options['map'] }}, marker_{{ $id }});
+		google.maps.event.addListener(marker_{!! $id !!}, 'click', function() {
+			infowindow_{!! $id !!}.open({!! $options['map'] !!}, marker_{!! $id !!});
 		});
 
 	@endif
diff --git a/src/views/overlay.blade.php b/src/views/overlay.blade.php
index d53bb66..da22bbc 100644
--- a/src/views/overlay.blade.php
+++ b/src/views/overlay.blade.php
@@ -1,12 +1,12 @@
-var overlayCoordinates_{{ $id }} = new google.maps.LatLngBounds(
+var overlayCoordinates_{!! $id !!} = new google.maps.LatLngBounds(
 	@foreach ($options['coordinates'] as $coordinate)
-		new google.maps.LatLng({{ $coordinate['latitude'] }}, {{ $coordinate['longitude'] }}),
+		new google.maps.LatLng({!! $coordinate['latitude'] !!}, {!! $coordinate['longitude'] !!}),
 	@endforeach
 );
 
-overlay_{{ $id }} = new google.maps.GroundOverlay(
-	'{{ $options['image'] }}',
-	overlayCoordinates_{{ $id }}
+overlay_{!! $id !!} = new google.maps.GroundOverlay(
+	'{!! $options['image'] !!}',
+	overlayCoordinates_{!! $id !!}
 );
 
-overlay_{{ $id }}.setMap({{ $options['map'] }});
+overlay_{!! $id !!}.setMap({!! $options['map'] !!});
diff --git a/src/views/polygon.blade.php b/src/views/polygon.blade.php
index fa77fc3..6b24f94 100644
--- a/src/views/polygon.blade.php
+++ b/src/views/polygon.blade.php
@@ -1,17 +1,17 @@
-var polygonCoordinates_{{ $id }} = [
+var polygonCoordinates_{!! $id !!} = [
 	@foreach ($options['coordinates'] as $coordinate)
-		new google.maps.LatLng({{ $coordinate['latitude'] }}, {{ $coordinate['longitude'] }}),
+		new google.maps.LatLng({!! $coordinate['latitude'] !!}, {!! $coordinate['longitude'] !!}),
 	@endforeach
 ];
 
-var polygon_{{ $id }} = new google.maps.Polygon({
-	paths: polygonCoordinates_{{ $id }},
-	strokeColor: '{{ $options['strokeColor'] }}',
-	strokeOpacity: {{ $options['strokeOpacity'] }},
-	strokeWeight: {{ $options['strokeWeight'] }},
-	fillColor: '{{ $options['fillColor'] }}',
-	fillOpacity: {{ $options['fillOpacity'] }},
-	editable: {{ $options['editable'] ? 'true' : 'false' }}
+var polygon_{!! $id !!} = new google.maps.Polygon({
+	paths: polygonCoordinates_{!! $id !!},
+	strokeColor: '{!! $options['strokeColor'] !!}',
+	strokeOpacity: {!! $options['strokeOpacity'] !!},
+	strokeWeight: {!! $options['strokeWeight'] !!},
+	fillColor: '{!! $options['fillColor'] !!}',
+	fillOpacity: {!! $options['fillOpacity'] !!},
+	editable: {!! $options['editable'] ? 'true' : 'false' !!}
 });
 
-polygon_{{ $id }}.setMap({{ $options['map'] }});
+polygon_{!! $id !!}.setMap({!! $options['map'] !!});
diff --git a/src/views/polyline.blade.php b/src/views/polyline.blade.php
index 4203904..e536213 100644
--- a/src/views/polyline.blade.php
+++ b/src/views/polyline.blade.php
@@ -1,16 +1,16 @@
-var polylineCoordinates_{{ $id }} = [
+var polylineCoordinates_{!! $id !!} = [
 	@foreach ($options['coordinates'] as $coordinate)
-		new google.maps.LatLng({{ $coordinate['latitude'] }}, {{ $coordinate['longitude'] }}),
+		new google.maps.LatLng({!! $coordinate['latitude'] !!}, {!! $coordinate['longitude'] !!}),
 	@endforeach
 ];
 
-var polyline_{{ $id }} = new google.maps.Polyline({
-	path: polylineCoordinates_{{ $id }},
-	geodesic: {{ $options['strokeColor'] ? 'true' : 'false' }},
-	strokeColor: '{{ $options['strokeColor'] }}',
-	strokeOpacity: {{ $options['strokeOpacity'] }},
-	strokeWeight: {{ $options['strokeWeight'] }},
-	editable: {{ $options['editable'] ? 'true' : 'false' }}
+var polyline_{!! $id !!} = new google.maps.Polyline({
+	path: polylineCoordinates_{!! $id !!},
+	geodesic: {!! $options['strokeColor'] ? 'true' : 'false' !!},
+	strokeColor: '{!! $options['strokeColor'] !!}',
+	strokeOpacity: {!! $options['strokeOpacity'] !!},
+	strokeWeight: {!! $options['strokeWeight'] !!},
+	editable: {!! $options['editable'] ? 'true' : 'false' !!}
 });
 
-polyline_{{ $id }}.setMap({{ $options['map'] }});
\ No newline at end of file
+polyline_{!! $id !!}.setMap({!! $options['map'] !!});
\ No newline at end of file
diff --git a/src/views/rectangle.blade.php b/src/views/rectangle.blade.php
index c8c2119..832ac80 100644
--- a/src/views/rectangle.blade.php
+++ b/src/views/rectangle.blade.php
@@ -1,17 +1,17 @@
-var rectangleCoordinates_{{ $id }} = new google.maps.LatLngBounds(
+var rectangleCoordinates_{!! $id !!} = new google.maps.LatLngBounds(
 	@foreach ($options['coordinates'] as $key => $coordinate)
-		new google.maps.LatLng({{ $coordinate['latitude'] }}, {{ $coordinate['longitude'] }})@if (count($options['coordinates']) - 1 > $key), @endif
+		new google.maps.LatLng({!! $coordinate['latitude'] !!}, {!! $coordinate['longitude'] !!})@if (count($options['coordinates']) - 1 > $key), @endif
 	@endforeach
 );
 
-var rectangle_{{ $id }} = new google.maps.Rectangle({
-	strokeColor: '{{ $options['strokeColor'] }}',
-	strokeOpacity: {{ $options['strokeOpacity'] }},
-	strokeWeight: {{ $options['strokeWeight'] }},
-	fillColor: '{{ $options['fillColor'] }}',
-	fillOpacity: {{ $options['fillOpacity'] }},
-	bounds: rectangleCoordinates_{{ $id }},
-	editable: {{ $options['editable'] ? 'true' : 'false' }}
+var rectangle_{!! $id !!} = new google.maps.Rectangle({
+	strokeColor: '{!! $options['strokeColor'] !!}',
+	strokeOpacity: {!! $options['strokeOpacity'] !!},
+	strokeWeight: {!! $options['strokeWeight'] !!},
+	fillColor: '{!! $options['fillColor'] !!}',
+	fillOpacity: {!! $options['fillOpacity'] !!},
+	bounds: rectangleCoordinates_{!! $id !!},
+	editable: {!! $options['editable'] ? 'true' : 'false' !!}
 });
 
-rectangle_{{ $id }}.setMap({{ $options['map'] }});
+rectangle_{!! $id !!}.setMap({!! $options['map'] !!});
diff --git a/src/views/streetview.blade.php b/src/views/streetview.blade.php
index 55a4c62..94d3170 100644
--- a/src/views/streetview.blade.php
+++ b/src/views/streetview.blade.php
@@ -1,35 +1,35 @@
-<div id="map-canvas-{{ $id }}" style="height: 100%; margin: 0; padding: 0;"></div>
+<div id="map-canvas-{!! $id !!}" style="height: 100%; margin: 0; padding: 0;"></div>
 
 <script type="text/javascript">
 
-	function initialize_{{ $id }}() {
+	function initialize_{!! $id !!}() {
 		var bounds = new google.maps.LatLngBounds();
-		var position = new google.maps.LatLng({{ $options['latitude'] }}, {{ $options['longitude'] }});
+		var position = new google.maps.LatLng({!! $options['latitude'] !!}, {!! $options['longitude'] !!});
 
 		var mapOptions = {
 			@if ($options['center'])
 				center: position,
 			@endif
-			zoom: {{ $options['zoom'] }},
-			mapTypeId: google.maps.MapTypeId.{{ $options['type'] }},
+			zoom: {!! $options['zoom'] !!},
+			mapTypeId: google.maps.MapTypeId.{!! $options['type'] !!},
 			disableDefaultUI: @if (!$options['ui']) true @else false @endif
 		};
 
-		var map = new google.maps.Map(document.getElementById('map-canvas-{{ $id }}'), mapOptions);
+		var map = new google.maps.Map(document.getElementById('map-canvas-{!! $id !!}'), mapOptions);
 
 		var panoramaOptions = {
 			position: position,
 			pov: {
-				heading: {{ $options['heading'] }},
-				pitch: {{ $options['pitch'] }}
+				heading: {!! $options['heading'] !!},
+				pitch: {!! $options['pitch'] !!}
 			}
 		};
 
-		var panorama = new google.maps.StreetViewPanorama(document.getElementById('map-canvas-{{ $id }}'), panoramaOptions);
+		var panorama = new google.maps.StreetViewPanorama(document.getElementById('map-canvas-{!! $id !!}'), panoramaOptions);
 
 		map.setStreetView(panorama);
 	}
 
-	google.maps.event.addDomListener(window, 'load', initialize_{{ $id }});
+	google.maps.event.addDomListener(window, 'load', initialize_{!! $id !!});
 
 </script>
\ No newline at end of file

From 2505ea7f60ac9372a4718e6c8e8bba24dcb94e04 Mon Sep 17 00:00:00 2001
From: Bradley Cornford <bcornford@plus.net>
Date: Mon, 22 Jun 2015 14:57:54 +0100
Subject: [PATCH 05/40] Intergrated marker clusters.

---
 src/Cornford/Googlmapper/MapperBase.php | 59 ++++++++++++++++++++++++-
 src/config/config.php                   | 10 +++++
 src/views/map.blade.php                 |  6 +++
 src/views/mapper.blade.php              |  6 +++
 src/views/marker.blade.php              |  1 +
 5 files changed, 81 insertions(+), 1 deletion(-)

diff --git a/src/Cornford/Googlmapper/MapperBase.php b/src/Cornford/Googlmapper/MapperBase.php
index e0b112f..89f339d 100644
--- a/src/Cornford/Googlmapper/MapperBase.php
+++ b/src/Cornford/Googlmapper/MapperBase.php
@@ -552,6 +552,13 @@ abstract class MapperBase implements MappingBaseInterface
 		'BOUNCE',
 	];
 
+	/**
+	 * Map marker cluster.
+	 *
+	 * @var boolean
+	 */
+	protected $cluster;
+
 	/**
 	 * Mapping items.
 	 *
@@ -604,6 +611,7 @@ public function __construct(View $view, array $options = [])
 		$this->setUi(isset($options['ui']) ? $options['ui'] : true);
 		$this->setIcon(isset($options['markers']['icon']) ? $options['markers']['icon'] : '');
 		$this->setAnimation(isset($options['markers']['animation']) ? $options['markers']['animation'] : self::ANIMATION_NONE);
+		$this->setCluster(isset($options['cluster']) ? $options['cluster'] : true);
 	}
 
 	/**
@@ -1119,7 +1127,8 @@ protected function getOptions()
 				'place' => '',
 				'animation' => $this->getAnimation(),
 				'symbol' => '',
-			]
+			],
+			'cluster' => $this->getCluster()
 		];
 	}
 
@@ -1169,4 +1178,52 @@ public function getItem($item)
 		return isset($this->items[$item]) ? $this->items[$item] : false;
 	}
 
+	/**
+	 * Set cluster status.
+	 *
+	 * @param boolean $value
+	 *
+	 * @throws MapperArgumentException
+	 *
+	 * @return void
+	 */
+	protected function setCluster($value)
+	{
+		if (!is_bool($value)) {
+			throw new MapperArgumentException('Invalid map cluster setting.');
+		}
+
+		$this->cluster = $value;
+	}
+
+	/**
+	 * Get the cluster status.
+	 *
+	 * @return boolean
+	 */
+	protected function getCluster()
+	{
+		return $this->cluster;
+	}
+
+	/**
+	 * Enable cluster.
+	 *
+	 * @return void
+	 */
+	public function enableCluster()
+	{
+		$this->setCluster(true);
+	}
+
+	/**
+	 * Disable cluster.
+	 *
+	 * @return void
+	 */
+	public function disableCluster()
+	{
+		$this->setCluster(false);
+	}
+
 }
\ No newline at end of file
diff --git a/src/config/config.php b/src/config/config.php
index 01009ea..e3b3674 100644
--- a/src/config/config.php
+++ b/src/config/config.php
@@ -136,4 +136,14 @@
 
     ),
 
+    /*
+    |--------------------------------------------------------------------------
+    | Map Marker Cluster
+    |--------------------------------------------------------------------------
+    |
+    | Enable default Googlmapper map marker cluster.
+    |
+    */
+    'cluster' => true,
+
 );
diff --git a/src/views/map.blade.php b/src/views/map.blade.php
index 99a8052..8975bb9 100644
--- a/src/views/map.blade.php
+++ b/src/views/map.blade.php
@@ -18,10 +18,16 @@ function initialize_{!! $id !!}() {
 		var map_{!! $id !!} = new google.maps.Map(document.getElementById('map-canvas-{!! $id !!}'), mapOptions_{!! $id !!});
 		map_{!! $id !!}.setTilt({!! $options['tilt'] !!});
 
+		var markers = [];
+
 		@foreach ($options['markers'] as $key => $marker)
 			{!! $marker->render($key, $view) !!}
 		@endforeach
 
+		@if ($options['cluster'])
+			var markerCluster = new MarkerClusterer(map_{!! $id !!}, markers);
+		@endif
+
 		@foreach ($options['shapes'] as $key => $shape)
 			{!! $shape->render($key, $view) !!}
 		@endforeach
diff --git a/src/views/mapper.blade.php b/src/views/mapper.blade.php
index 3fffcb9..c1a1040 100644
--- a/src/views/mapper.blade.php
+++ b/src/views/mapper.blade.php
@@ -1,5 +1,11 @@
 <script type="text/javascript" src="//maps.googleapis.com/maps/api/js?v={!! $options['version'] !!}&region={!! $options['region'] !!}&language={!! $options['language'] !!}&key={!! $options['key'] !!}&signed_in={!! $options['user'] ? 'true' : 'false' !!}&libraries=places"></script>
 
+@if ($options['cluster'])
+
+	<script type="text/javascript" src="//googlemaps.github.io/js-marker-clusterer/src/markerclusterer.js"></script>
+
+@endif
+
 @foreach ($items as $id => $item)
 
 	{!! $item->render($id, $view) !!}
diff --git a/src/views/marker.blade.php b/src/views/marker.blade.php
index 099f707..ab2a31d 100644
--- a/src/views/marker.blade.php
+++ b/src/views/marker.blade.php
@@ -42,6 +42,7 @@
 bounds.extend(marker_{!! $id !!}.position);
 
 marker_{!! $id !!}.setMap({!! $options['map'] !!});
+markers.push(marker_{!! $id !!});
 
 @if ($options['user'] && $options['place'])
 

From 6c0f51871a05a7995dca2e983eb66b9569030095 Mon Sep 17 00:00:00 2001
From: Michel LAURENT <michel.laurent@equipc.net>
Date: Tue, 23 Jun 2015 18:22:51 +0200
Subject: [PATCH 06/40] Use environment variable for Google api key instead of
 setting it in the config file

---
 src/config/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/config/config.php b/src/config/config.php
index e3b3674..2feb2df 100644
--- a/src/config/config.php
+++ b/src/config/config.php
@@ -20,7 +20,7 @@
     | A Google API key to link Googlmapper to Google's API.
     |
     */
-    'key' => 'AIzaSyAtqWsq5Ai3GYv6dSa6311tZiYKlbYT4mw',
+    'key' => env('GOOGLE_API_KEY'),
 
     /*
     |--------------------------------------------------------------------------

From 784333e517b432066b2843156136aed361dec9b0 Mon Sep 17 00:00:00 2001
From: Michel LAURENT <michel.laurent@equipc.net>
Date: Tue, 23 Jun 2015 18:28:29 +0200
Subject: [PATCH 07/40] Update README.md

---
 README.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 68c42c2..7632a96 100644
--- a/README.md
+++ b/README.md
@@ -39,10 +39,12 @@ The next step is to introduce the facade. Open `app/config/app.php`, and add a n
 
 	'Mapper'         => 'Cornford\Googlmapper\Facades\Mapper',
 
-Finally we need to introduce the configuration files into your application/
+Finally we need to introduce the configuration files into your application.
 
 	php artisan vendor:publish --provider="Cornford\\Googlmapper\\MapperServiceProvider"
 
+You also need to set your Google API Key into the `GOOGLE_API_KEY` environment variable. To obtain an API key for your project, visit the [Google developers console](https://console.developers.google.com/).
+
 That's it! You're all set to go.
 
 ## Configuration
@@ -152,4 +154,4 @@ The `render` method allows all maps to be rendered to the page, this method can
 
 ### License
 
-Googlmapper is open-sourced software licensed under the [MIT license](http://opensource.org/licenses/MIT)
\ No newline at end of file
+Googlmapper is open-sourced software licensed under the [MIT license](http://opensource.org/licenses/MIT)

From 5610338f8e30478470d87cc8ec363ec113c02426 Mon Sep 17 00:00:00 2001
From: Syahril Zulkefli <syahzul@gmail.com>
Date: Sun, 28 Jun 2015 22:00:58 +0800
Subject: [PATCH 08/40] Change the class name to be as same as file name

---
 src/Cornford/Googlmapper/Facades/MapperFacade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Cornford/Googlmapper/Facades/MapperFacade.php b/src/Cornford/Googlmapper/Facades/MapperFacade.php
index aa9a38e..8c13502 100644
--- a/src/Cornford/Googlmapper/Facades/MapperFacade.php
+++ b/src/Cornford/Googlmapper/Facades/MapperFacade.php
@@ -2,7 +2,7 @@
 
 use Illuminate\Support\Facades\Facade;
 
-class Mapper extends Facade {
+class MapperFacade extends Facade {
 
 	protected static function getFacadeAccessor() { return 'mapper'; }
 

From c6eec38e0e520b03327736839592d057dc2ce64b Mon Sep 17 00:00:00 2001
From: Syahril Zulkefli <syahzul@gmail.com>
Date: Sun, 28 Jun 2015 22:02:00 +0800
Subject: [PATCH 09/40] Change the alias to be as same as file and class name

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 68c42c2..c295e9f 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ Once this operation completes, the next step is to add the service provider. Ope
 
 The next step is to introduce the facade. Open `app/config/app.php`, and add a new item to the aliases array.
 
-	'Mapper'         => 'Cornford\Googlmapper\Facades\Mapper',
+	'Mapper'         => 'Cornford\Googlmapper\Facades\MapperFacade',
 
 Finally we need to introduce the configuration files into your application/
 
@@ -152,4 +152,4 @@ The `render` method allows all maps to be rendered to the page, this method can
 
 ### License
 
-Googlmapper is open-sourced software licensed under the [MIT license](http://opensource.org/licenses/MIT)
\ No newline at end of file
+Googlmapper is open-sourced software licensed under the [MIT license](http://opensource.org/licenses/MIT)

From 05754e28c93a0c22666e45bc9a2db2a7a051b5db Mon Sep 17 00:00:00 2001
From: Bradley Cornford <bcornford@plus.net>
Date: Mon, 13 Jul 2015 10:08:21 +0100
Subject: [PATCH 10/40] Adding an accessible maps variable for JS manipulation.

---
 src/config/config.php   | 2 +-
 src/views/map.blade.php | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/config/config.php b/src/config/config.php
index 2feb2df..57c7392 100644
--- a/src/config/config.php
+++ b/src/config/config.php
@@ -20,7 +20,7 @@
     | A Google API key to link Googlmapper to Google's API.
     |
     */
-    'key' => env('GOOGLE_API_KEY'),
+    'key' => env('GOOGLE_API_KEY', 'AIzaSyAtqWsq5Ai3GYv6dSa6311tZiYKlbYT4mw'),
 
     /*
     |--------------------------------------------------------------------------
diff --git a/src/views/map.blade.php b/src/views/map.blade.php
index 8975bb9..14cdc2d 100644
--- a/src/views/map.blade.php
+++ b/src/views/map.blade.php
@@ -2,6 +2,8 @@
 
 <script type="text/javascript">
 
+	var maps = [];
+
 	function initialize_{!! $id !!}() {
 		var bounds = new google.maps.LatLngBounds();
 		var infowindow = new google.maps.InfoWindow();
@@ -55,6 +57,11 @@ function initialize_{!! $id !!}() {
 			map_{!! $id !!}.setZoom({!! $options['zoom'] !!});
 			google.maps.event.removeListener(listener);
 		});
+
+		maps.push({
+			key: {!! $id !!},
+			map: map_{!! $id !!}
+		});
 	}
 
 	google.maps.event.addDomListener(window, 'load', initialize_{!! $id !!});

From 25aa8fef74eb3d1718c6afede83248b27f2a7a99 Mon Sep 17 00:00:00 2001
From: Bradley Cornford <bcornford@plus.net>
Date: Fri, 14 Aug 2015 16:07:23 +0100
Subject: [PATCH 11/40] Fixing a bug where rendering multiple maps would cause
 an error. Fixing a bug where rendering a single item from a number of items
 would cause an error

---
 src/Cornford/Googlmapper/Mapper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Cornford/Googlmapper/Mapper.php b/src/Cornford/Googlmapper/Mapper.php
index 16ef3e6..8ba36b8 100644
--- a/src/Cornford/Googlmapper/Mapper.php
+++ b/src/Cornford/Googlmapper/Mapper.php
@@ -23,7 +23,7 @@ public function render($item = -1)
 		return $this->view->make('googlmapper::mapper')
 			->withView($this->view)
 			->withOptions($this->getOptions())
-			->withItems(array_reverse($item > -1 ? $this->getItem($item) : $this->getItems()))->render();
+			->withItems($item > -1 ? [$item => $this->getItem($item)] : $this->getItems())->render();
 	}
 
 	/**

From 7d0ee845b4e0dff2bcd202f8c837e33c4a446bda Mon Sep 17 00:00:00 2001
From: Victor Nascimento <victormota15@gmail.com>
Date: Tue, 3 Nov 2015 11:42:16 -0300
Subject: [PATCH 12/40] Fixed marker icons

---
 src/Cornford/Googlmapper/Models/Marker.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Cornford/Googlmapper/Models/Marker.php b/src/Cornford/Googlmapper/Models/Marker.php
index 8767978..70064f1 100644
--- a/src/Cornford/Googlmapper/Models/Marker.php
+++ b/src/Cornford/Googlmapper/Models/Marker.php
@@ -22,7 +22,7 @@ public function __construct(array $parameters = [])
 		$this->options = $parameters;
 
 		if (isset($parameters['markers'])) {
-			$this->options = array_replace_recursive($this->options, $parameters['markers']);
+			$this->options = array_replace_recursive($parameters['markers'], $this->options);
 		}
 	}
 

From b38c386a0d9975c3ca013a0e09ab36ee36c3028c Mon Sep 17 00:00:00 2001
From: Victor Nascimento <victormota15@gmail.com>
Date: Tue, 3 Nov 2015 13:36:42 -0300
Subject: [PATCH 13/40] Exposed markers for each map

---
 src/views/map.blade.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/map.blade.php b/src/views/map.blade.php
index 14cdc2d..52c304a 100644
--- a/src/views/map.blade.php
+++ b/src/views/map.blade.php
@@ -60,6 +60,7 @@ function initialize_{!! $id !!}() {
 
 		maps.push({
 			key: {!! $id !!},
+			markers: markers,
 			map: map_{!! $id !!}
 		});
 	}

From ee6f343816c7decb51a3ea7643a712e1af649c98 Mon Sep 17 00:00:00 2001
From: Victor Nascimento <victormota15@gmail.com>
Date: Tue, 3 Nov 2015 13:36:42 -0300
Subject: [PATCH 14/40] Exposed markers for each map

---
 src/views/map.blade.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/map.blade.php b/src/views/map.blade.php
index 14cdc2d..52c304a 100644
--- a/src/views/map.blade.php
+++ b/src/views/map.blade.php
@@ -60,6 +60,7 @@ function initialize_{!! $id !!}() {
 
 		maps.push({
 			key: {!! $id !!},
+			markers: markers,
 			map: map_{!! $id !!}
 		});
 	}

From 3cb6d1ded7f32d3e4098ddeffb6c5a78bd1320f0 Mon Sep 17 00:00:00 2001
From: Victor Nascimento <victormota15@gmail.com>
Date: Fri, 6 Nov 2015 01:52:19 -0300
Subject: [PATCH 15/40] Fixed informationWindow

---
 src/Cornford/Googlmapper/Mapper.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Cornford/Googlmapper/Mapper.php b/src/Cornford/Googlmapper/Mapper.php
index 8ba36b8..7724e57 100644
--- a/src/Cornford/Googlmapper/Mapper.php
+++ b/src/Cornford/Googlmapper/Mapper.php
@@ -126,13 +126,13 @@ public function marker($latitude, $longitude, array $options = [])
 	public function informationWindow($latitude, $longitude, $content, array $options = [])
 	{
 		$items = $this->getItems();
-		$parameters = $this->getOptions();
-		$options = array_replace_recursive(['user' => $parameters['user']], $parameters['markers'], $options);
-
+		
 		if (empty($items)) {
 			throw new MapperException('No map found to add a information window to.');
 		}
 
+		$parameters = $this->getOptions();
+		$options = array_replace_recursive(['user' => $parameters['user']], ['markers' => $parameters['markers']], $options);
 		$item = end($items);
 		$item->marker($latitude, $longitude, array_replace_recursive($options, ['markers' => ['content' => $content]]));
 

From 0617c06cc47e1c613b645f2a1005f1b8a6821b83 Mon Sep 17 00:00:00 2001
From: Victor Nascimento <victormota15@gmail.com>
Date: Fri, 6 Nov 2015 01:52:19 -0300
Subject: [PATCH 16/40] Fixed informationWindow

---
 src/Cornford/Googlmapper/Mapper.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Cornford/Googlmapper/Mapper.php b/src/Cornford/Googlmapper/Mapper.php
index 8ba36b8..7724e57 100644
--- a/src/Cornford/Googlmapper/Mapper.php
+++ b/src/Cornford/Googlmapper/Mapper.php
@@ -126,13 +126,13 @@ public function marker($latitude, $longitude, array $options = [])
 	public function informationWindow($latitude, $longitude, $content, array $options = [])
 	{
 		$items = $this->getItems();
-		$parameters = $this->getOptions();
-		$options = array_replace_recursive(['user' => $parameters['user']], $parameters['markers'], $options);
-
+		
 		if (empty($items)) {
 			throw new MapperException('No map found to add a information window to.');
 		}
 
+		$parameters = $this->getOptions();
+		$options = array_replace_recursive(['user' => $parameters['user']], ['markers' => $parameters['markers']], $options);
 		$item = end($items);
 		$item->marker($latitude, $longitude, array_replace_recursive($options, ['markers' => ['content' => $content]]));
 

From ac856dbb0e7f228cb50e72b8a4f85cd579d68907 Mon Sep 17 00:00:00 2001
From: Bradley Cornford <bcornford@plus.net>
Date: Tue, 17 Nov 2015 09:14:55 +0000
Subject: [PATCH 17/40] Adding a scrollWheelZoom parameter to both the
 configuration file, and the initial options array when building a map to
 enable/disable scroll wheel zoom

---
 README.md                               |  1 +
 src/Cornford/Googlmapper/MapperBase.php | 38 +++++++++++++++++++++++++
 src/config/config.php                   | 10 +++++++
 src/views/map.blade.php                 |  3 +-
 4 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 48d4ab7..9f06ef1 100644
--- a/README.md
+++ b/README.md
@@ -59,6 +59,7 @@ You can now configure Googlmapper in a few simple steps. Open `app/config/packag
 - `marker` - Automatically add Google Maps marker for your maps initial location, e.g. true.
 - `center` - Automatically center Google Maps around the initial location, when false, Google Maps will automatically center the map, e.g. true.
 - `zoom` - Set the default zoom level for Google Maps, e.g. 8.
+- `scrollWheelZoom` - Set the default scroll wheel zoom Google Maps, e.g. true.
 - `type` - Set the default map type for Google Maps, e.g. ROADMAP, SATELLITE, HYBRID, TERRAIN.
 - `ui` - Show the Google Maps default UI options, e.g. true.
 - `markers.icon` - Set the default marker icon, e.g. img/icon.png.
diff --git a/src/Cornford/Googlmapper/MapperBase.php b/src/Cornford/Googlmapper/MapperBase.php
index 89f339d..908857d 100644
--- a/src/Cornford/Googlmapper/MapperBase.php
+++ b/src/Cornford/Googlmapper/MapperBase.php
@@ -17,6 +17,7 @@ abstract class MapperBase implements MappingBaseInterface
 	const TYPE_TERRAIN = 'TERRAIN';
 
 	const ZOOM = 8;
+	const SCROLL_WHEEL_ZOOM = true;
 
 	const TILT = 90;
 
@@ -501,6 +502,13 @@ abstract class MapperBase implements MappingBaseInterface
 	 */
 	protected $zoom;
 
+	/**
+	 * Map scroll wheel zoom.
+	 *
+	 * @var boolean
+	 */
+	protected $scrollWheelZoom;
+
 	/**
 	 * Map type.
 	 *
@@ -606,6 +614,7 @@ public function __construct(View $view, array $options = [])
 		$this->setMarker(isset($options['marker']) ? $options['marker'] : true);
 		$this->setCenter(isset($options['centre']) ? $options['centre'] : true);
 		$this->setZoom(isset($options['zoom']) ? $options['zoom'] : self::ZOOM);
+		$this->setScrollWheelZoom(isset($options['scrollWheelZoom']) ? $options['scrollWheelZoom'] : self::SCROLL_WHEEL_ZOOM);
 		$this->setType(isset($options['type']) ? $options['type'] : self::TYPE_ROADMAP);
 		$this->setTilt(isset($options['tilt']) ? $options['tilt'] : self::TILT);
 		$this->setUi(isset($options['ui']) ? $options['ui'] : true);
@@ -988,6 +997,34 @@ public function getZoom()
 		return $this->zoom;
 	}
 
+	/**
+	 * Set map scroll wheel zoom.
+	 *
+	 * @param boolean $value
+	 *
+	 * @throws MapperArgumentException
+	 *
+	 * @return void
+	 */
+	public function setScrollWheelZoom($value)
+	{
+		if (!is_bool($value)) {
+			throw new MapperArgumentException('Mouse Wheel Zoom must be a boolean.');
+		}
+
+		$this->scrollWheelZoom = $value;
+	}
+
+	/**
+	 * Get map scroll wheel zoom.
+	 *
+	 * @return boolean
+	 */
+	public function getScrollWheelZoom()
+	{
+		return $this->scrollWheelZoom;
+	}
+
 	/**
 	 * Set map type.
 	 *
@@ -1116,6 +1153,7 @@ protected function getOptions()
 			'marker' => $this->getMarker(),
 			'center' => $this->getCenter(),
 			'zoom' => $this->getZoom(),
+			'scrollWheelZoom' => $this->getScrollWheelZoom(),
 			'type' => $this->getType(),
 			'tilt' => $this->getTilt(),
 			'ui' => $this->getUi(),
diff --git a/src/config/config.php b/src/config/config.php
index 57c7392..9012af8 100644
--- a/src/config/config.php
+++ b/src/config/config.php
@@ -84,6 +84,16 @@
     */
     'zoom' => 8,
 
+    /*
+    |--------------------------------------------------------------------------
+    | Scroll wheel Zoom
+    |--------------------------------------------------------------------------
+    |
+    | Set if scroll wheel zoom should be used by Googlmapper.
+    |
+    */
+    'scrollWheelZoom' => true,
+
     /*
     |--------------------------------------------------------------------------
     | Map Type
diff --git a/src/views/map.blade.php b/src/views/map.blade.php
index 52c304a..778894a 100644
--- a/src/views/map.blade.php
+++ b/src/views/map.blade.php
@@ -14,7 +14,8 @@ function initialize_{!! $id !!}() {
 				center: position,
 			@endif
 			mapTypeId: google.maps.MapTypeId.{!! $options['type'] !!},
-			disableDefaultUI: @if (!$options['ui']) true @else false @endif
+			disableDefaultUI: @if (!$options['ui']) true @else false @endif,
+			scrollwheel: @if ($options['scrollWheelZoom']) true @else false @endif
 		};
 
 		var map_{!! $id !!} = new google.maps.Map(document.getElementById('map-canvas-{!! $id !!}'), mapOptions_{!! $id !!});

From aa4aa36993457d56eafc26c1d3ef981c4855c45e Mon Sep 17 00:00:00 2001
From: alex <ilovephp@spaces.ru>
Date: Sat, 2 Jan 2016 20:27:37 +0200
Subject: [PATCH 18/40] Add option for draggable markers

---
 src/views/marker.blade.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/views/marker.blade.php b/src/views/marker.blade.php
index ab2a31d..b5aa8dc 100644
--- a/src/views/marker.blade.php
+++ b/src/views/marker.blade.php
@@ -27,6 +27,11 @@
 			webUrl: document.URL
 		},
 	@endif
+		
+	@if ($options['draggable'] && $options['draggable'] == true)
+		draggable:true,
+	@endif
+	
 	title: '{!! $options['title'] !!}',
 	animation: @if (empty($options['animation']) || $options['animation'] == 'NONE') '' @else google.maps.Animation.{!! $options['animation'] !!} @endif,
 	@if ($options['symbol'])
@@ -66,4 +71,4 @@
 
 	@endif
 
-@endif
\ No newline at end of file
+@endif

From a7a548881a28fbd12f57ab4f0cf290000bc4d3af Mon Sep 17 00:00:00 2001
From: alex <ilovephp@spaces.ru>
Date: Sat, 2 Jan 2016 21:45:30 +0200
Subject: [PATCH 19/40] fix

---
 src/views/marker.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/marker.blade.php b/src/views/marker.blade.php
index b5aa8dc..c6768cd 100644
--- a/src/views/marker.blade.php
+++ b/src/views/marker.blade.php
@@ -28,7 +28,7 @@
 		},
 	@endif
 		
-	@if ($options['draggable'] && $options['draggable'] == true)
+	@if (isset($options['draggable']) && $options['draggable'] == true)
 		draggable:true,
 	@endif
 	

From 9a4f238505ac2a84b8d2e6820871b9fbbbe534a0 Mon Sep 17 00:00:00 2001
From: alex <ilovephp@spaces.ru>
Date: Mon, 4 Jan 2016 22:57:11 +0200
Subject: [PATCH 20/40] Update readme for draggable markers!

Update readme for draggable markers!
---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index 9f06ef1..99e84ac 100644
--- a/README.md
+++ b/README.md
@@ -106,6 +106,11 @@ The `marker` method allows a marker to be added to a map, with latitude, longitu
 	Mapper::marker(53.381128999999990000, -1.470085000000040000, ['symbol' => 'circle', 'scale' => 1000]);
 	Mapper::map(52.381128999999990000, 0.470085000000040000)->marker(53.381128999999990000, -1.470085000000040000, ['markers' => ['symbol' => 'circle', 'scale' => 1000, 'animation' => 'DROP']]);
 
+If you need draggable marker, you can add option draggable. 
+
+	Mapper::marker(53.38,-1.47,[
+		'draggable'	=> true
+	]);
 ### Information Window
 
 The `informationWindow` method allows an information window to be added to to a map, with latitude, longitude, content, and optional parameters for options.

From fa09b49ac0183f5e4fc954b568de7d67508b88ac Mon Sep 17 00:00:00 2001
From: alex <ilovephp@spaces.ru>
Date: Sat, 2 Jan 2016 20:27:37 +0200
Subject: [PATCH 21/40] Add option for draggable markers. Update readme for
 draggable markers.

---
 README.md                  | 5 +++++
 src/views/marker.blade.php | 7 ++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9f06ef1..99e84ac 100644
--- a/README.md
+++ b/README.md
@@ -106,6 +106,11 @@ The `marker` method allows a marker to be added to a map, with latitude, longitu
 	Mapper::marker(53.381128999999990000, -1.470085000000040000, ['symbol' => 'circle', 'scale' => 1000]);
 	Mapper::map(52.381128999999990000, 0.470085000000040000)->marker(53.381128999999990000, -1.470085000000040000, ['markers' => ['symbol' => 'circle', 'scale' => 1000, 'animation' => 'DROP']]);
 
+If you need draggable marker, you can add option draggable. 
+
+	Mapper::marker(53.38,-1.47,[
+		'draggable'	=> true
+	]);
 ### Information Window
 
 The `informationWindow` method allows an information window to be added to to a map, with latitude, longitude, content, and optional parameters for options.
diff --git a/src/views/marker.blade.php b/src/views/marker.blade.php
index ab2a31d..c6768cd 100644
--- a/src/views/marker.blade.php
+++ b/src/views/marker.blade.php
@@ -27,6 +27,11 @@
 			webUrl: document.URL
 		},
 	@endif
+		
+	@if (isset($options['draggable']) && $options['draggable'] == true)
+		draggable:true,
+	@endif
+	
 	title: '{!! $options['title'] !!}',
 	animation: @if (empty($options['animation']) || $options['animation'] == 'NONE') '' @else google.maps.Animation.{!! $options['animation'] !!} @endif,
 	@if ($options['symbol'])
@@ -66,4 +71,4 @@
 
 	@endif
 
-@endif
\ No newline at end of file
+@endif

From 685286576d71eeedd473fb9a790235a5de47f69b Mon Sep 17 00:00:00 2001
From: Bradley Cornford <bcornford@plus.net>
Date: Wed, 18 Nov 2015 11:40:56 +0000
Subject: [PATCH 22/40] Added new mapper method location which takes a search
 term for a location, which returns a Location object, that can have
 map/streeview methods called upon it.

---
 README.md                                     |  14 +-
 spec/Cornford/Googlmapper/MapperSpec.php      |  21 +-
 .../Googlmapper/Models/LocationSpec.php       |  46 ++++
 .../Contracts/ObjectableInterface.php         |  14 +
 .../Exceptions/MapperSearchException.php      |   7 +
 .../MapperSearchResultException.php           |   7 +
 src/Cornford/Googlmapper/Mapper.php           |  75 ++++-
 src/Cornford/Googlmapper/Models/Location.php  | 257 ++++++++++++++++++
 8 files changed, 429 insertions(+), 12 deletions(-)
 create mode 100644 spec/Cornford/Googlmapper/Models/LocationSpec.php
 create mode 100644 src/Cornford/Googlmapper/Contracts/ObjectableInterface.php
 create mode 100644 src/Cornford/Googlmapper/Exceptions/MapperSearchException.php
 create mode 100644 src/Cornford/Googlmapper/Exceptions/MapperSearchResultException.php
 create mode 100644 src/Cornford/Googlmapper/Models/Location.php

diff --git a/README.md b/README.md
index 99e84ac..ed0d05b 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,7 @@
 Think of Googlmapper as an easy way to integrate Google Maps with Laravel, providing a variety of helpers to speed up the utilisation of mapping. These include:
 
 - `Mapper::map`
+- `Mapper::location`
 - `Mapper::stretview`
 - `Mapper::marker`
 - `Mapper::informationWindow`
@@ -74,6 +75,7 @@ It's really as simple as using the Mapper class in any Controller / Model / File
 This will give you access to
 
 - [Map](#map)
+- [Location](#location)
 - [Streetview](#streetview)
 - [Marker](#marker)
 - [Information Window](#information-window)
@@ -91,12 +93,20 @@ The `map` method allows a map to be created, with latitude, longitude and option
 	Mapper::map(53.381128999999990000, -1.470085000000040000, ['zoom' => 15, 'center' => false, 'marker' => false, 'type' => 'HYBRID', 'overlay' => 'TRAFFIC']);
 	Mapper::map(53.381128999999990000, -1.470085000000040000, ['zoom' => 10, 'markers' => ['title' => 'My Location', 'Animation' => 'DROP']]);
 
+### Location
+
+The `location` method allows a location to be searched for with a string, returning a Location object with its latitude and longitude.
+
+	Mapper::location('Sheffield');
+	Mapper::location('Sheffield')->map(['zoom' => 15, 'center' => false, 'marker' => false, 'type' => 'HYBRID', 'overlay' => 'TRAFFIC']);
+	Mapper::location('Sheffield')->streetview(1, 1, ['ui' => false]);
+
 ### Streetview
 
 The `streetview` method allows a streetview map to be created, with latitude, longitude, heading, pitch and optional parameters for options.
 
-	Mapper::streetview(53.381128999999990000, -1.470085000000040000);
-	Mapper::streetview(53.381128999999990000, -1.470085000000040000, ['ui' => false]);
+	Mapper::streetview(53.381128999999990000, -1.470085000000040000, 1, 1);
+	Mapper::streetview(53.381128999999990000, -1.470085000000040000, 1, 1, ['ui' => false]);
 
 ### Marker
 
diff --git a/spec/Cornford/Googlmapper/MapperSpec.php b/spec/Cornford/Googlmapper/MapperSpec.php
index 17907ff..fa25aba 100644
--- a/spec/Cornford/Googlmapper/MapperSpec.php
+++ b/spec/Cornford/Googlmapper/MapperSpec.php
@@ -16,12 +16,16 @@ class MapperSpec extends ObjectBehavior
 
 	public function let()
 	{
+		$location = Mockery::mock('Cornford\Googlmapper\Models\Location');
+
 		$view = Mockery::mock('Illuminate\View\Factory');
 		$view->shouldReceive('make')->andReturn($view);
 		$view->shouldReceive('withView')->andReturn($view);
 		$view->shouldReceive('withOptions')->andReturn($view);
 		$view->shouldReceive('withItems')->andReturn($view);
 		$view->shouldReceive('render')->andReturn(self::STRING);
+		$view->shouldReceive('location')->andReturn($location);
+
 		$this->beConstructedWith($view, ['enabled' => true, 'key' => self::STRING, 'region' => self::REGION, 'language' => self::LANGUAGE]);
 	}
 
@@ -37,9 +41,14 @@ public function it_throws_an_exception_with_incorrect_options()
 			->during('__construct', [$view]);
 	}
 
-	public function it_can_render_map_code()
+	public function it_can_return_a_location_when_a_location_is_searched()
 	{
-		$this->render()->shouldReturn(self::STRING);
+		$this->location(self::STRING)->shouldReturnAnInstanceOf('Cornford\Googlmapper\Models\Location');
+	}
+
+	public function it_can_throws_an_exception_when_a_blank_location_is_searched()
+	{
+		$this->shouldThrow('Cornford\Googlmapper\Exceptions\MapperArgumentException')->during('location', ['']);
 	}
 
 	public function it_can_be_enabled()
@@ -77,7 +86,7 @@ public function it_can_set_and_get_language_option()
 		$this->getLanguage()->shouldReturn(self::LANGUAGE);
 	}
 
-	public function it_can_be_set_and_get_user_option()
+	public function it_can_set_and_get_user_option()
 	{
 		$this->enableUsers();
 		$this->getUser()->shouldReturn(true);
@@ -85,7 +94,7 @@ public function it_can_be_set_and_get_user_option()
 		$this->getUser()->shouldReturn(false);
 	}
 
-	public function it_can_be_set_and_get_marker_option()
+	public function it_can_set_and_get_marker_option()
 	{
 		$this->enableMarkers();
 		$this->getMarker()->shouldReturn(true);
@@ -93,7 +102,7 @@ public function it_can_be_set_and_get_marker_option()
 		$this->getMarker()->shouldReturn(false);
 	}
 
-	public function it_can_be_set_and_get_center_option()
+	public function it_can_set_and_get_center_option()
 	{
 		$this->enableCenter();
 		$this->getCenter()->shouldReturn(true);
@@ -101,7 +110,7 @@ public function it_can_be_set_and_get_center_option()
 		$this->getCenter()->shouldReturn(false);
 	}
 
-	public function it_can_be_set_and_get_ui_option()
+	public function it_can_set_and_get_ui_option()
 	{
 		$this->enableUi();
 		$this->getUi()->shouldReturn(false);
diff --git a/spec/Cornford/Googlmapper/Models/LocationSpec.php b/spec/Cornford/Googlmapper/Models/LocationSpec.php
new file mode 100644
index 0000000..104dd61
--- /dev/null
+++ b/spec/Cornford/Googlmapper/Models/LocationSpec.php
@@ -0,0 +1,46 @@
+<?php namespace spec\Cornford\Googlmapper\Models;
+
+use Cornford\Googlmapper\Models\Location;
+use PhpSpec\ObjectBehavior;
+use Mockery;
+use Illuminate\View\Factory;
+
+class LocationSpec extends ObjectBehavior
+{
+
+	const INTEGER = 1;
+	const STRING = 'string';
+
+	public function let()
+	{
+		$mapper = Mockery::mock('Cornford\Googlmapper\Mapper');
+		$mapper->shouldReceive('map')->andReturn($mapper);
+		$mapper->shouldReceive('streetview')->andReturn($mapper);
+
+		$this->beConstructedWith([
+			'mapper' => $mapper,
+			'search' => self::STRING,
+			'address' => self::STRING,
+			'type' => self::STRING,
+			'latitude' => self::INTEGER,
+			'longitude' => self::INTEGER,
+			'placeId' => self::STRING
+		]);
+	}
+
+	public function it_is_initializable()
+	{
+		$this->shouldHaveType('Cornford\Googlmapper\Models\Location');
+	}
+
+	public function it_can_create_a_map()
+	{
+		$this->map()->shouldReturnAnInstanceOf('Cornford\Googlmapper\Mapper');
+	}
+
+	public function it_can_create_a_streetview()
+	{
+		$this->streetview(self::INTEGER, self::INTEGER)->shouldReturnAnInstanceOf('Cornford\Googlmapper\Mapper');
+	}
+
+}
diff --git a/src/Cornford/Googlmapper/Contracts/ObjectableInterface.php b/src/Cornford/Googlmapper/Contracts/ObjectableInterface.php
new file mode 100644
index 0000000..c6849f6
--- /dev/null
+++ b/src/Cornford/Googlmapper/Contracts/ObjectableInterface.php
@@ -0,0 +1,14 @@
+<?php namespace Cornford\Googlmapper\Contracts;
+
+use Illuminate\View\Factory as View;
+
+interface ObjectableInterface {
+
+	/**
+	 * Public constructor.
+	 *
+	 * @param array $parameters
+	 */
+	public function __construct(array $parameters = array());
+
+}
\ No newline at end of file
diff --git a/src/Cornford/Googlmapper/Exceptions/MapperSearchException.php b/src/Cornford/Googlmapper/Exceptions/MapperSearchException.php
new file mode 100644
index 0000000..c15bb7f
--- /dev/null
+++ b/src/Cornford/Googlmapper/Exceptions/MapperSearchException.php
@@ -0,0 +1,7 @@
+<?php namespace Cornford\Googlmapper\Exceptions;
+
+use Exception;
+
+class MapperSearchException extends Exception {
+
+}
diff --git a/src/Cornford/Googlmapper/Exceptions/MapperSearchResultException.php b/src/Cornford/Googlmapper/Exceptions/MapperSearchResultException.php
new file mode 100644
index 0000000..949957a
--- /dev/null
+++ b/src/Cornford/Googlmapper/Exceptions/MapperSearchResultException.php
@@ -0,0 +1,7 @@
+<?php namespace Cornford\Googlmapper\Exceptions;
+
+use Exception;
+
+class MapperSearchResultException extends Exception {
+
+}
diff --git a/src/Cornford/Googlmapper/Mapper.php b/src/Cornford/Googlmapper/Mapper.php
index 7724e57..4e51688 100644
--- a/src/Cornford/Googlmapper/Mapper.php
+++ b/src/Cornford/Googlmapper/Mapper.php
@@ -1,7 +1,11 @@
 <?php namespace Cornford\Googlmapper;
 
 use Cornford\Googlmapper\Contracts\MappingInterface;
+use Cornford\Googlmapper\Exceptions\MapperArgumentException;
 use Cornford\Googlmapper\Exceptions\MapperException;
+use Cornford\Googlmapper\Exceptions\MapperSearchException;
+use Cornford\Googlmapper\Exceptions\MapperSearchResultException;
+use Cornford\Googlmapper\Models\Location;
 use Cornford\Googlmapper\Models\Map;
 use Cornford\Googlmapper\Models\Streetview;
 
@@ -26,6 +30,69 @@ public function render($item = -1)
 			->withItems($item > -1 ? [$item => $this->getItem($item)] : $this->getItems())->render();
 	}
 
+	/**
+	 * Search for a location against Google Maps Api.
+	 *
+	 * @param string $location
+	 *
+	 * @return mixed
+	 */
+	protected function searchLocation($location)
+	{
+		$location = urlencode($location);
+		$request = file_get_contents("http://maps.googleapis.com/maps/api/geocode/json?address={$location}&sensor=false");
+
+		return json_decode($request);
+	}
+
+	/**
+	 * Locate a location and return a Location instance.
+	 *
+	 * @param string $location
+	 *
+	 * @throws MapperArgumentException
+	 * @throws MapperSearchException
+	 * @throws MapperSearchResultException
+	 * @throws MapperException
+	 *
+	 * @return Location
+	 */
+	public function location($location)
+	{
+		if (empty($location)) {
+			throw new MapperArgumentException('Invalid location search term provided.');
+		}
+
+		try {
+			$resultObject = $this->searchLocation($location);
+		} catch (Exception $exception) {
+			throw new MapperSearchException('Unable to perform location search, the error was: "' . $exception->getMessage() .  '".');
+		}
+
+		if (!isset($resultObject->results) || count($resultObject->results) == 0) {
+			throw new MapperSearchResultException('No results found for the location search.');
+		}
+
+		if (!isset($resultObject->results[0]->formatted_address) ||
+			!isset($resultObject->results[0]->address_components[0]->types[0]) ||
+			!isset($resultObject->results[0]->geometry->location->lat) ||
+			!isset($resultObject->results[0]->geometry->location->lng) ||
+			!isset($resultObject->results[0]->place_id)
+		) {
+			throw new MapperException('The location search return invalid result data.');
+		}
+
+		return new Location([
+			'mapper' => $this,
+			'search' => $location,
+			'address' => $resultObject->results[0]->formatted_address,
+			'type' => $resultObject->results[0]->address_components[0]->types[0],
+			'latitude' => $resultObject->results[0]->geometry->location->lat,
+			'longitude' => $resultObject->results[0]->geometry->location->lng,
+			'placeId' => $resultObject->results[0]->place_id,
+		]);
+	}
+
 	/**
 	 * Add a new map.
 	 *
@@ -165,7 +232,7 @@ public function polyline(array $coordinates = [], array $options = [])
 		$options = array_replace_recursive(['user' => $parameters['user']], $defaults, $options);
 
 		if (empty($items)) {
-			throw new MapperException('No map found to add a marker to.');
+			throw new MapperException('No map found to add a polyline to.');
 		}
 
 		$item = end($items);
@@ -201,7 +268,7 @@ public function polygon(array $coordinates = [], array $options = [])
 		$options = array_replace_recursive(['user' => $parameters['user']], $defaults, $options);
 
 		if (empty($items)) {
-			throw new MapperException('No map found to add a marker to.');
+			throw new MapperException('No map found to add a polygon to.');
 		}
 
 		$item = end($items);
@@ -237,7 +304,7 @@ public function rectangle(array $coordinates = [], array $options = [])
 		$options = array_replace_recursive(['user' => $parameters['user']], $defaults, $options);
 
 		if (empty($items)) {
-			throw new MapperException('No map found to add a marker to.');
+			throw new MapperException('No map found to add a rectangle to.');
 		}
 
 		$item = end($items);
@@ -274,7 +341,7 @@ public function circle(array $coordinates = [], array $options = [])
 		$options = array_replace_recursive(['user' => $parameters['user']], $defaults, $options);
 
 		if (empty($items)) {
-			throw new MapperException('No map found to add a marker to.');
+			throw new MapperException('No map found to add a circle to.');
 		}
 
 		$item = end($items);
diff --git a/src/Cornford/Googlmapper/Models/Location.php b/src/Cornford/Googlmapper/Models/Location.php
new file mode 100644
index 0000000..e65a045
--- /dev/null
+++ b/src/Cornford/Googlmapper/Models/Location.php
@@ -0,0 +1,257 @@
+<?php namespace Cornford\Googlmapper\Models;
+
+use Cornford\Googlmapper\Contracts\ModelingInterface;
+use Cornford\Googlmapper\Contracts\ObjectableInterface;
+use Cornford\Googlmapper\Mapper;
+use Illuminate\View\Factory as View;
+
+class Location implements ObjectableInterface {
+
+	/**
+	 * Mapper instance.
+	 *
+	 * @var Mapper
+	 */
+	protected static $mapper;
+
+	/**
+	 * Search.
+	 *
+	 * @var string
+	 */
+	protected $search;
+
+	/**
+	 * Address.
+	 *
+	 * @var string
+	 */
+	protected $address;
+
+	/**
+	 * Type.
+	 *
+	 * @var string
+	 */
+	protected $type;
+
+	/**
+	 * Latitude.
+	 *
+	 * @var float
+	 */
+	protected $latitude;
+
+	/**
+	 * Longitude.
+	 *
+	 * @var float
+	 */
+	protected $longitude;
+
+	/**
+	 * Place Id.
+	 *
+	 * @var string
+	 */
+	protected $placeId;
+
+	/**
+	 * Public constructor.
+	 *
+	 * @param array $parameters
+	 */
+	public function __construct(array $parameters = [])
+	{
+		$this->setMapper($parameters['mapper']);
+		$this->setSearch($parameters['search']);
+		$this->setAddress($parameters['address']);
+		$this->setType($parameters['type']);
+		$this->setLatitude($parameters['latitude']);
+		$this->setLongitude($parameters['longitude']);
+		$this->setPlaceId($parameters['placeId']);
+	}
+
+	/**
+	 * Get the mapper instance.
+	 *
+	 * @return Mapper
+	 */
+	protected function getMapper()
+	{
+		return self::$mapper;
+	}
+
+	/**
+	 * Set the mapper instance.
+	 *
+	 * @param Mapper $mapper
+	 *
+	 * @return void
+	 */
+	protected function setMapper(Mapper $mapper)
+	{
+		self::$mapper = $mapper;
+	}
+
+	/**
+	 * Get the locations search.
+	 *
+	 * @return string
+	 */
+	public function getSearch()
+	{
+		return $this->search;
+	}
+
+	/**
+	 * Set the locations search.
+	 *
+	 * @param string $search
+	 *
+	 * @return void
+	 */
+	protected function setSearch($search)
+	{
+		$this->search = $search;
+	}
+
+	/**
+	 * Get the locations address.
+	 *
+	 * @return string
+	 */
+	public function getAddress()
+	{
+		return $this->address;
+	}
+
+	/**
+	 * Set the locations address.
+	 *
+	 * @param string $address
+	 *
+	 * @return void
+	 */
+	protected function setAddress($address)
+	{
+		$this->address = $address;
+	}
+
+	/**
+	 * Get the locations type.
+	 *
+	 * @return string
+	 */
+	public function getType()
+	{
+		return $this->type;
+	}
+
+	/**
+	 * Set the locations type.
+	 *
+	 * @param string $type
+	 *
+	 * @return void
+	 */
+	protected function setType($type)
+	{
+		$this->type = $type;
+	}
+
+	/**
+	 * Get the locations latitude.
+	 *
+	 * @return float
+	 */
+	public function getLatitude()
+	{
+		return $this->latitude;
+	}
+
+	/**
+	 * Set the locations latitude.
+	 *
+	 * @param float $latitude
+	 *
+	 * @return void
+	 */
+	protected function setLatitude($latitude)
+	{
+		$this->latitude = $latitude;
+	}
+
+	/**
+	 * Get the locations longitude.
+	 *
+	 * @return float
+	 */
+	public function getLongitude()
+	{
+		return $this->longitude;
+	}
+
+	/**
+	 * Set the locations longitude.
+	 *
+	 * @param float $longitude
+	 *
+	 * @return void
+	 */
+	protected function setLongitude($longitude)
+	{
+		$this->longitude = $longitude;
+	}
+
+	/**
+	 * Get the place id.
+	 *
+	 * @return string
+	 *
+	 * @return string
+	 */
+	public function getPlaceId()
+	{
+		return $this->placeId;
+	}
+
+	/**
+	 * Set the place id.
+	 *
+	 * @param string $placeId
+	 *
+	 * @return void
+	 */
+	protected function setPlaceId($placeId)
+	{
+		$this->placeId = $placeId;
+	}
+
+	/**
+	 * Create a new map from location.
+	 *
+	 * @param array $options
+	 *
+	 * @return Mapper
+	 */
+	public function map(array $options = [])
+	{
+		return self::$mapper->map($this->getLatitude(), $this->getLongitude(), $options);
+	}
+
+	/**
+	 * Create a new street view map from location.
+	 *
+	 * @param integer $heading
+	 * @param integer $pitch
+	 * @param array   $options
+	 *
+	 * @return Mapper
+	 */
+	public function streetview($heading, $pitch, array $options = [])
+	{
+		return self::$mapper->streetview($this->getLatitude(), $this->getLongitude(), $heading, $pitch, $options);
+	}
+
+}

From cd114b22a565cb03c1b55fe2fe3dc84fb0607c3c Mon Sep 17 00:00:00 2001
From: Bradley Cornford <bcornford@plus.net>
Date: Wed, 18 Nov 2015 11:40:56 +0000
Subject: [PATCH 23/40] Added new mapper method location which takes a search
 term for a location, which returns a Location object, that can have
 map/streeview methods called upon it.

---
 README.md                                     |  14 +-
 spec/Cornford/Googlmapper/MapperSpec.php      |  21 +-
 .../Googlmapper/Models/LocationSpec.php       |  46 ++++
 .../Contracts/ObjectableInterface.php         |  14 +
 .../Exceptions/MapperSearchException.php      |   7 +
 .../MapperSearchResultException.php           |   7 +
 src/Cornford/Googlmapper/Mapper.php           |  75 ++++-
 src/Cornford/Googlmapper/Models/Location.php  | 257 ++++++++++++++++++
 8 files changed, 429 insertions(+), 12 deletions(-)
 create mode 100644 spec/Cornford/Googlmapper/Models/LocationSpec.php
 create mode 100644 src/Cornford/Googlmapper/Contracts/ObjectableInterface.php
 create mode 100644 src/Cornford/Googlmapper/Exceptions/MapperSearchException.php
 create mode 100644 src/Cornford/Googlmapper/Exceptions/MapperSearchResultException.php
 create mode 100644 src/Cornford/Googlmapper/Models/Location.php

diff --git a/README.md b/README.md
index 99e84ac..ed0d05b 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,7 @@
 Think of Googlmapper as an easy way to integrate Google Maps with Laravel, providing a variety of helpers to speed up the utilisation of mapping. These include:
 
 - `Mapper::map`
+- `Mapper::location`
 - `Mapper::stretview`
 - `Mapper::marker`
 - `Mapper::informationWindow`
@@ -74,6 +75,7 @@ It's really as simple as using the Mapper class in any Controller / Model / File
 This will give you access to
 
 - [Map](#map)
+- [Location](#location)
 - [Streetview](#streetview)
 - [Marker](#marker)
 - [Information Window](#information-window)
@@ -91,12 +93,20 @@ The `map` method allows a map to be created, with latitude, longitude and option
 	Mapper::map(53.381128999999990000, -1.470085000000040000, ['zoom' => 15, 'center' => false, 'marker' => false, 'type' => 'HYBRID', 'overlay' => 'TRAFFIC']);
 	Mapper::map(53.381128999999990000, -1.470085000000040000, ['zoom' => 10, 'markers' => ['title' => 'My Location', 'Animation' => 'DROP']]);
 
+### Location
+
+The `location` method allows a location to be searched for with a string, returning a Location object with its latitude and longitude.
+
+	Mapper::location('Sheffield');
+	Mapper::location('Sheffield')->map(['zoom' => 15, 'center' => false, 'marker' => false, 'type' => 'HYBRID', 'overlay' => 'TRAFFIC']);
+	Mapper::location('Sheffield')->streetview(1, 1, ['ui' => false]);
+
 ### Streetview
 
 The `streetview` method allows a streetview map to be created, with latitude, longitude, heading, pitch and optional parameters for options.
 
-	Mapper::streetview(53.381128999999990000, -1.470085000000040000);
-	Mapper::streetview(53.381128999999990000, -1.470085000000040000, ['ui' => false]);
+	Mapper::streetview(53.381128999999990000, -1.470085000000040000, 1, 1);
+	Mapper::streetview(53.381128999999990000, -1.470085000000040000, 1, 1, ['ui' => false]);
 
 ### Marker
 
diff --git a/spec/Cornford/Googlmapper/MapperSpec.php b/spec/Cornford/Googlmapper/MapperSpec.php
index 17907ff..fa25aba 100644
--- a/spec/Cornford/Googlmapper/MapperSpec.php
+++ b/spec/Cornford/Googlmapper/MapperSpec.php
@@ -16,12 +16,16 @@ class MapperSpec extends ObjectBehavior
 
 	public function let()
 	{
+		$location = Mockery::mock('Cornford\Googlmapper\Models\Location');
+
 		$view = Mockery::mock('Illuminate\View\Factory');
 		$view->shouldReceive('make')->andReturn($view);
 		$view->shouldReceive('withView')->andReturn($view);
 		$view->shouldReceive('withOptions')->andReturn($view);
 		$view->shouldReceive('withItems')->andReturn($view);
 		$view->shouldReceive('render')->andReturn(self::STRING);
+		$view->shouldReceive('location')->andReturn($location);
+
 		$this->beConstructedWith($view, ['enabled' => true, 'key' => self::STRING, 'region' => self::REGION, 'language' => self::LANGUAGE]);
 	}
 
@@ -37,9 +41,14 @@ public function it_throws_an_exception_with_incorrect_options()
 			->during('__construct', [$view]);
 	}
 
-	public function it_can_render_map_code()
+	public function it_can_return_a_location_when_a_location_is_searched()
 	{
-		$this->render()->shouldReturn(self::STRING);
+		$this->location(self::STRING)->shouldReturnAnInstanceOf('Cornford\Googlmapper\Models\Location');
+	}
+
+	public function it_can_throws_an_exception_when_a_blank_location_is_searched()
+	{
+		$this->shouldThrow('Cornford\Googlmapper\Exceptions\MapperArgumentException')->during('location', ['']);
 	}
 
 	public function it_can_be_enabled()
@@ -77,7 +86,7 @@ public function it_can_set_and_get_language_option()
 		$this->getLanguage()->shouldReturn(self::LANGUAGE);
 	}
 
-	public function it_can_be_set_and_get_user_option()
+	public function it_can_set_and_get_user_option()
 	{
 		$this->enableUsers();
 		$this->getUser()->shouldReturn(true);
@@ -85,7 +94,7 @@ public function it_can_be_set_and_get_user_option()
 		$this->getUser()->shouldReturn(false);
 	}
 
-	public function it_can_be_set_and_get_marker_option()
+	public function it_can_set_and_get_marker_option()
 	{
 		$this->enableMarkers();
 		$this->getMarker()->shouldReturn(true);
@@ -93,7 +102,7 @@ public function it_can_be_set_and_get_marker_option()
 		$this->getMarker()->shouldReturn(false);
 	}
 
-	public function it_can_be_set_and_get_center_option()
+	public function it_can_set_and_get_center_option()
 	{
 		$this->enableCenter();
 		$this->getCenter()->shouldReturn(true);
@@ -101,7 +110,7 @@ public function it_can_be_set_and_get_center_option()
 		$this->getCenter()->shouldReturn(false);
 	}
 
-	public function it_can_be_set_and_get_ui_option()
+	public function it_can_set_and_get_ui_option()
 	{
 		$this->enableUi();
 		$this->getUi()->shouldReturn(false);
diff --git a/spec/Cornford/Googlmapper/Models/LocationSpec.php b/spec/Cornford/Googlmapper/Models/LocationSpec.php
new file mode 100644
index 0000000..104dd61
--- /dev/null
+++ b/spec/Cornford/Googlmapper/Models/LocationSpec.php
@@ -0,0 +1,46 @@
+<?php namespace spec\Cornford\Googlmapper\Models;
+
+use Cornford\Googlmapper\Models\Location;
+use PhpSpec\ObjectBehavior;
+use Mockery;
+use Illuminate\View\Factory;
+
+class LocationSpec extends ObjectBehavior
+{
+
+	const INTEGER = 1;
+	const STRING = 'string';
+
+	public function let()
+	{
+		$mapper = Mockery::mock('Cornford\Googlmapper\Mapper');
+		$mapper->shouldReceive('map')->andReturn($mapper);
+		$mapper->shouldReceive('streetview')->andReturn($mapper);
+
+		$this->beConstructedWith([
+			'mapper' => $mapper,
+			'search' => self::STRING,
+			'address' => self::STRING,
+			'type' => self::STRING,
+			'latitude' => self::INTEGER,
+			'longitude' => self::INTEGER,
+			'placeId' => self::STRING
+		]);
+	}
+
+	public function it_is_initializable()
+	{
+		$this->shouldHaveType('Cornford\Googlmapper\Models\Location');
+	}
+
+	public function it_can_create_a_map()
+	{
+		$this->map()->shouldReturnAnInstanceOf('Cornford\Googlmapper\Mapper');
+	}
+
+	public function it_can_create_a_streetview()
+	{
+		$this->streetview(self::INTEGER, self::INTEGER)->shouldReturnAnInstanceOf('Cornford\Googlmapper\Mapper');
+	}
+
+}
diff --git a/src/Cornford/Googlmapper/Contracts/ObjectableInterface.php b/src/Cornford/Googlmapper/Contracts/ObjectableInterface.php
new file mode 100644
index 0000000..c6849f6
--- /dev/null
+++ b/src/Cornford/Googlmapper/Contracts/ObjectableInterface.php
@@ -0,0 +1,14 @@
+<?php namespace Cornford\Googlmapper\Contracts;
+
+use Illuminate\View\Factory as View;
+
+interface ObjectableInterface {
+
+	/**
+	 * Public constructor.
+	 *
+	 * @param array $parameters
+	 */
+	public function __construct(array $parameters = array());
+
+}
\ No newline at end of file
diff --git a/src/Cornford/Googlmapper/Exceptions/MapperSearchException.php b/src/Cornford/Googlmapper/Exceptions/MapperSearchException.php
new file mode 100644
index 0000000..c15bb7f
--- /dev/null
+++ b/src/Cornford/Googlmapper/Exceptions/MapperSearchException.php
@@ -0,0 +1,7 @@
+<?php namespace Cornford\Googlmapper\Exceptions;
+
+use Exception;
+
+class MapperSearchException extends Exception {
+
+}
diff --git a/src/Cornford/Googlmapper/Exceptions/MapperSearchResultException.php b/src/Cornford/Googlmapper/Exceptions/MapperSearchResultException.php
new file mode 100644
index 0000000..949957a
--- /dev/null
+++ b/src/Cornford/Googlmapper/Exceptions/MapperSearchResultException.php
@@ -0,0 +1,7 @@
+<?php namespace Cornford\Googlmapper\Exceptions;
+
+use Exception;
+
+class MapperSearchResultException extends Exception {
+
+}
diff --git a/src/Cornford/Googlmapper/Mapper.php b/src/Cornford/Googlmapper/Mapper.php
index 7724e57..4e51688 100644
--- a/src/Cornford/Googlmapper/Mapper.php
+++ b/src/Cornford/Googlmapper/Mapper.php
@@ -1,7 +1,11 @@
 <?php namespace Cornford\Googlmapper;
 
 use Cornford\Googlmapper\Contracts\MappingInterface;
+use Cornford\Googlmapper\Exceptions\MapperArgumentException;
 use Cornford\Googlmapper\Exceptions\MapperException;
+use Cornford\Googlmapper\Exceptions\MapperSearchException;
+use Cornford\Googlmapper\Exceptions\MapperSearchResultException;
+use Cornford\Googlmapper\Models\Location;
 use Cornford\Googlmapper\Models\Map;
 use Cornford\Googlmapper\Models\Streetview;
 
@@ -26,6 +30,69 @@ public function render($item = -1)
 			->withItems($item > -1 ? [$item => $this->getItem($item)] : $this->getItems())->render();
 	}
 
+	/**
+	 * Search for a location against Google Maps Api.
+	 *
+	 * @param string $location
+	 *
+	 * @return mixed
+	 */
+	protected function searchLocation($location)
+	{
+		$location = urlencode($location);
+		$request = file_get_contents("http://maps.googleapis.com/maps/api/geocode/json?address={$location}&sensor=false");
+
+		return json_decode($request);
+	}
+
+	/**
+	 * Locate a location and return a Location instance.
+	 *
+	 * @param string $location
+	 *
+	 * @throws MapperArgumentException
+	 * @throws MapperSearchException
+	 * @throws MapperSearchResultException
+	 * @throws MapperException
+	 *
+	 * @return Location
+	 */
+	public function location($location)
+	{
+		if (empty($location)) {
+			throw new MapperArgumentException('Invalid location search term provided.');
+		}
+
+		try {
+			$resultObject = $this->searchLocation($location);
+		} catch (Exception $exception) {
+			throw new MapperSearchException('Unable to perform location search, the error was: "' . $exception->getMessage() .  '".');
+		}
+
+		if (!isset($resultObject->results) || count($resultObject->results) == 0) {
+			throw new MapperSearchResultException('No results found for the location search.');
+		}
+
+		if (!isset($resultObject->results[0]->formatted_address) ||
+			!isset($resultObject->results[0]->address_components[0]->types[0]) ||
+			!isset($resultObject->results[0]->geometry->location->lat) ||
+			!isset($resultObject->results[0]->geometry->location->lng) ||
+			!isset($resultObject->results[0]->place_id)
+		) {
+			throw new MapperException('The location search return invalid result data.');
+		}
+
+		return new Location([
+			'mapper' => $this,
+			'search' => $location,
+			'address' => $resultObject->results[0]->formatted_address,
+			'type' => $resultObject->results[0]->address_components[0]->types[0],
+			'latitude' => $resultObject->results[0]->geometry->location->lat,
+			'longitude' => $resultObject->results[0]->geometry->location->lng,
+			'placeId' => $resultObject->results[0]->place_id,
+		]);
+	}
+
 	/**
 	 * Add a new map.
 	 *
@@ -165,7 +232,7 @@ public function polyline(array $coordinates = [], array $options = [])
 		$options = array_replace_recursive(['user' => $parameters['user']], $defaults, $options);
 
 		if (empty($items)) {
-			throw new MapperException('No map found to add a marker to.');
+			throw new MapperException('No map found to add a polyline to.');
 		}
 
 		$item = end($items);
@@ -201,7 +268,7 @@ public function polygon(array $coordinates = [], array $options = [])
 		$options = array_replace_recursive(['user' => $parameters['user']], $defaults, $options);
 
 		if (empty($items)) {
-			throw new MapperException('No map found to add a marker to.');
+			throw new MapperException('No map found to add a polygon to.');
 		}
 
 		$item = end($items);
@@ -237,7 +304,7 @@ public function rectangle(array $coordinates = [], array $options = [])
 		$options = array_replace_recursive(['user' => $parameters['user']], $defaults, $options);
 
 		if (empty($items)) {
-			throw new MapperException('No map found to add a marker to.');
+			throw new MapperException('No map found to add a rectangle to.');
 		}
 
 		$item = end($items);
@@ -274,7 +341,7 @@ public function circle(array $coordinates = [], array $options = [])
 		$options = array_replace_recursive(['user' => $parameters['user']], $defaults, $options);
 
 		if (empty($items)) {
-			throw new MapperException('No map found to add a marker to.');
+			throw new MapperException('No map found to add a circle to.');
 		}
 
 		$item = end($items);
diff --git a/src/Cornford/Googlmapper/Models/Location.php b/src/Cornford/Googlmapper/Models/Location.php
new file mode 100644
index 0000000..e65a045
--- /dev/null
+++ b/src/Cornford/Googlmapper/Models/Location.php
@@ -0,0 +1,257 @@
+<?php namespace Cornford\Googlmapper\Models;
+
+use Cornford\Googlmapper\Contracts\ModelingInterface;
+use Cornford\Googlmapper\Contracts\ObjectableInterface;
+use Cornford\Googlmapper\Mapper;
+use Illuminate\View\Factory as View;
+
+class Location implements ObjectableInterface {
+
+	/**
+	 * Mapper instance.
+	 *
+	 * @var Mapper
+	 */
+	protected static $mapper;
+
+	/**
+	 * Search.
+	 *
+	 * @var string
+	 */
+	protected $search;
+
+	/**
+	 * Address.
+	 *
+	 * @var string
+	 */
+	protected $address;
+
+	/**
+	 * Type.
+	 *
+	 * @var string
+	 */
+	protected $type;
+
+	/**
+	 * Latitude.
+	 *
+	 * @var float
+	 */
+	protected $latitude;
+
+	/**
+	 * Longitude.
+	 *
+	 * @var float
+	 */
+	protected $longitude;
+
+	/**
+	 * Place Id.
+	 *
+	 * @var string
+	 */
+	protected $placeId;
+
+	/**
+	 * Public constructor.
+	 *
+	 * @param array $parameters
+	 */
+	public function __construct(array $parameters = [])
+	{
+		$this->setMapper($parameters['mapper']);
+		$this->setSearch($parameters['search']);
+		$this->setAddress($parameters['address']);
+		$this->setType($parameters['type']);
+		$this->setLatitude($parameters['latitude']);
+		$this->setLongitude($parameters['longitude']);
+		$this->setPlaceId($parameters['placeId']);
+	}
+
+	/**
+	 * Get the mapper instance.
+	 *
+	 * @return Mapper
+	 */
+	protected function getMapper()
+	{
+		return self::$mapper;
+	}
+
+	/**
+	 * Set the mapper instance.
+	 *
+	 * @param Mapper $mapper
+	 *
+	 * @return void
+	 */
+	protected function setMapper(Mapper $mapper)
+	{
+		self::$mapper = $mapper;
+	}
+
+	/**
+	 * Get the locations search.
+	 *
+	 * @return string
+	 */
+	public function getSearch()
+	{
+		return $this->search;
+	}
+
+	/**
+	 * Set the locations search.
+	 *
+	 * @param string $search
+	 *
+	 * @return void
+	 */
+	protected function setSearch($search)
+	{
+		$this->search = $search;
+	}
+
+	/**
+	 * Get the locations address.
+	 *
+	 * @return string
+	 */
+	public function getAddress()
+	{
+		return $this->address;
+	}
+
+	/**
+	 * Set the locations address.
+	 *
+	 * @param string $address
+	 *
+	 * @return void
+	 */
+	protected function setAddress($address)
+	{
+		$this->address = $address;
+	}
+
+	/**
+	 * Get the locations type.
+	 *
+	 * @return string
+	 */
+	public function getType()
+	{
+		return $this->type;
+	}
+
+	/**
+	 * Set the locations type.
+	 *
+	 * @param string $type
+	 *
+	 * @return void
+	 */
+	protected function setType($type)
+	{
+		$this->type = $type;
+	}
+
+	/**
+	 * Get the locations latitude.
+	 *
+	 * @return float
+	 */
+	public function getLatitude()
+	{
+		return $this->latitude;
+	}
+
+	/**
+	 * Set the locations latitude.
+	 *
+	 * @param float $latitude
+	 *
+	 * @return void
+	 */
+	protected function setLatitude($latitude)
+	{
+		$this->latitude = $latitude;
+	}
+
+	/**
+	 * Get the locations longitude.
+	 *
+	 * @return float
+	 */
+	public function getLongitude()
+	{
+		return $this->longitude;
+	}
+
+	/**
+	 * Set the locations longitude.
+	 *
+	 * @param float $longitude
+	 *
+	 * @return void
+	 */
+	protected function setLongitude($longitude)
+	{
+		$this->longitude = $longitude;
+	}
+
+	/**
+	 * Get the place id.
+	 *
+	 * @return string
+	 *
+	 * @return string
+	 */
+	public function getPlaceId()
+	{
+		return $this->placeId;
+	}
+
+	/**
+	 * Set the place id.
+	 *
+	 * @param string $placeId
+	 *
+	 * @return void
+	 */
+	protected function setPlaceId($placeId)
+	{
+		$this->placeId = $placeId;
+	}
+
+	/**
+	 * Create a new map from location.
+	 *
+	 * @param array $options
+	 *
+	 * @return Mapper
+	 */
+	public function map(array $options = [])
+	{
+		return self::$mapper->map($this->getLatitude(), $this->getLongitude(), $options);
+	}
+
+	/**
+	 * Create a new street view map from location.
+	 *
+	 * @param integer $heading
+	 * @param integer $pitch
+	 * @param array   $options
+	 *
+	 * @return Mapper
+	 */
+	public function streetview($heading, $pitch, array $options = [])
+	{
+		return self::$mapper->streetview($this->getLatitude(), $this->getLongitude(), $heading, $pitch, $options);
+	}
+
+}

From 11b270dbaa498f24b03e1eb9e4a5cc1b46a9f58f Mon Sep 17 00:00:00 2001
From: Bradley Cornford <bcornford@plus.net>
Date: Mon, 11 Jan 2016 11:44:11 +0000
Subject: [PATCH 24/40] Added drag events.

---
 README.md                  | 65 +++++++++++++++++++++++++++++++++++---
 src/views/marker.blade.php | 12 +++++++
 2 files changed, 73 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index ed0d05b..e54f41b 100644
--- a/README.md
+++ b/README.md
@@ -91,7 +91,7 @@ The `map` method allows a map to be created, with latitude, longitude and option
 
 	Mapper::map(53.381128999999990000, -1.470085000000040000);
 	Mapper::map(53.381128999999990000, -1.470085000000040000, ['zoom' => 15, 'center' => false, 'marker' => false, 'type' => 'HYBRID', 'overlay' => 'TRAFFIC']);
-	Mapper::map(53.381128999999990000, -1.470085000000040000, ['zoom' => 10, 'markers' => ['title' => 'My Location', 'Animation' => 'DROP']]);
+	Mapper::map(53.381128999999990000, -1.470085000000040000, ['zoom' => 10, 'markers' => ['title' => 'My Location', 'animation' => 'DROP']]);
 
 ### Location
 
@@ -116,11 +116,68 @@ The `marker` method allows a marker to be added to a map, with latitude, longitu
 	Mapper::marker(53.381128999999990000, -1.470085000000040000, ['symbol' => 'circle', 'scale' => 1000]);
 	Mapper::map(52.381128999999990000, 0.470085000000040000)->marker(53.381128999999990000, -1.470085000000040000, ['markers' => ['symbol' => 'circle', 'scale' => 1000, 'animation' => 'DROP']]);
 
+#### Draggable Markers
+
 If you need draggable marker, you can add option draggable. 
 
-	Mapper::marker(53.38,-1.47,[
-		'draggable'	=> true
-	]);
+	Mapper::marker(53.381128999999990000, -1.470085000000040000, ['draggable' => true]);
+
+##### Draggable Events
+
+**Click**
+
+This event is fired when the marker icon was clicked.
+
+	Mapper::marker(53.381128999999990000, -1.470085000000040000, ['draggable' => true, 'eventClick' => 'console.log("left click");']);
+
+**Right Click**
+
+This event is fired for a right click on the marker.
+
+	Mapper::marker(53.381128999999990000, -1.470085000000040000, ['draggable' => true, 'eventRightClick' => 'console.log("right click");']);
+
+**Mouse Over**
+
+This event is fired when the mouse enters the area of the marker icon.
+
+	Mapper::marker(53.381128999999990000, -1.470085000000040000, ['draggable' => true, 'eventMouseOver' => 'console.log("mouse over");']);
+
+**Mouse Down**
+
+This event is fired for a mouse down on the marker.
+
+	Mapper::marker(53.381128999999990000, -1.470085000000040000, ['draggable' => true, 'eventMouseDown' => 'console.log("mouse down");']);
+
+**Mouse Up**
+
+This event is fired for a mouse up on the marker.
+
+	Mapper::marker(53.381128999999990000, -1.470085000000040000, ['draggable' => true, 'eventMouseUp' => 'console.log("mouse up");']);
+
+**Mouse Out**
+
+This event is fired when the mouse leaves the area of the marker icon.
+
+	Mapper::marker(53.381128999999990000, -1.470085000000040000, ['draggable' => true, 'eventMouseOut' => 'console.log("mouse out");']);
+
+**Drag**
+
+This event is repeatedly fired while the user drags the marker.
+
+	Mapper::marker(53.381128999999990000, -1.470085000000040000, ['draggable' => true, 'eventDrag' => 'console.log("dragging");']);
+
+**Drag Start**
+
+This event is fired when the user starts dragging the marker.
+
+	Mapper::marker(53.381128999999990000, -1.470085000000040000, ['draggable' => true, 'eventDragStart' => 'console.log("drag start");']);
+
+**Drag End**
+
+This event is fired when the user stops dragging the marker.
+
+	Mapper::marker(53.381128999999990000, -1.470085000000040000, ['draggable' => true, 'eventDragEnd' => 'console.log("drag end");']);
+
 ### Information Window
 
 The `informationWindow` method allows an information window to be added to to a map, with latitude, longitude, content, and optional parameters for options.
diff --git a/src/views/marker.blade.php b/src/views/marker.blade.php
index c6768cd..d0df6eb 100644
--- a/src/views/marker.blade.php
+++ b/src/views/marker.blade.php
@@ -72,3 +72,15 @@
 	@endif
 
 @endif
+
+@foreach (['eventClick', 'eventRightClick', 'eventMouseOver', 'eventMouseDown', 'eventMouseUp', 'eventMouseOut', 'eventDrag', 'eventDragStart', 'eventDragEnd'] as $event)
+
+	@if (isset($options[$event]))
+
+		google.maps.event.addListener(marker_{!! $id !!}, '{!! str_replace('event', '', strtolower($event)) !!}', function (event) {
+			{!! $options[$event] !!}
+		});
+
+	@endif
+
+@endforeach

From 7fbea25c36f2a48f7f33fc364bde000c7a453a84 Mon Sep 17 00:00:00 2001
From: Bradley Cornford <bcornford@plus.net>
Date: Mon, 11 Jan 2016 11:44:11 +0000
Subject: [PATCH 25/40] Added drag events.

---
 README.md                  | 65 +++++++++++++++++++++++++++++++++++---
 src/views/marker.blade.php | 12 +++++++
 2 files changed, 73 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index ed0d05b..e54f41b 100644
--- a/README.md
+++ b/README.md
@@ -91,7 +91,7 @@ The `map` method allows a map to be created, with latitude, longitude and option
 
 	Mapper::map(53.381128999999990000, -1.470085000000040000);
 	Mapper::map(53.381128999999990000, -1.470085000000040000, ['zoom' => 15, 'center' => false, 'marker' => false, 'type' => 'HYBRID', 'overlay' => 'TRAFFIC']);
-	Mapper::map(53.381128999999990000, -1.470085000000040000, ['zoom' => 10, 'markers' => ['title' => 'My Location', 'Animation' => 'DROP']]);
+	Mapper::map(53.381128999999990000, -1.470085000000040000, ['zoom' => 10, 'markers' => ['title' => 'My Location', 'animation' => 'DROP']]);
 
 ### Location
 
@@ -116,11 +116,68 @@ The `marker` method allows a marker to be added to a map, with latitude, longitu
 	Mapper::marker(53.381128999999990000, -1.470085000000040000, ['symbol' => 'circle', 'scale' => 1000]);
 	Mapper::map(52.381128999999990000, 0.470085000000040000)->marker(53.381128999999990000, -1.470085000000040000, ['markers' => ['symbol' => 'circle', 'scale' => 1000, 'animation' => 'DROP']]);
 
+#### Draggable Markers
+
 If you need draggable marker, you can add option draggable. 
 
-	Mapper::marker(53.38,-1.47,[
-		'draggable'	=> true
-	]);
+	Mapper::marker(53.381128999999990000, -1.470085000000040000, ['draggable' => true]);
+
+##### Draggable Events
+
+**Click**
+
+This event is fired when the marker icon was clicked.
+
+	Mapper::marker(53.381128999999990000, -1.470085000000040000, ['draggable' => true, 'eventClick' => 'console.log("left click");']);
+
+**Right Click**
+
+This event is fired for a right click on the marker.
+
+	Mapper::marker(53.381128999999990000, -1.470085000000040000, ['draggable' => true, 'eventRightClick' => 'console.log("right click");']);
+
+**Mouse Over**
+
+This event is fired when the mouse enters the area of the marker icon.
+
+	Mapper::marker(53.381128999999990000, -1.470085000000040000, ['draggable' => true, 'eventMouseOver' => 'console.log("mouse over");']);
+
+**Mouse Down**
+
+This event is fired for a mouse down on the marker.
+
+	Mapper::marker(53.381128999999990000, -1.470085000000040000, ['draggable' => true, 'eventMouseDown' => 'console.log("mouse down");']);
+
+**Mouse Up**
+
+This event is fired for a mouse up on the marker.
+
+	Mapper::marker(53.381128999999990000, -1.470085000000040000, ['draggable' => true, 'eventMouseUp' => 'console.log("mouse up");']);
+
+**Mouse Out**
+
+This event is fired when the mouse leaves the area of the marker icon.
+
+	Mapper::marker(53.381128999999990000, -1.470085000000040000, ['draggable' => true, 'eventMouseOut' => 'console.log("mouse out");']);
+
+**Drag**
+
+This event is repeatedly fired while the user drags the marker.
+
+	Mapper::marker(53.381128999999990000, -1.470085000000040000, ['draggable' => true, 'eventDrag' => 'console.log("dragging");']);
+
+**Drag Start**
+
+This event is fired when the user starts dragging the marker.
+
+	Mapper::marker(53.381128999999990000, -1.470085000000040000, ['draggable' => true, 'eventDragStart' => 'console.log("drag start");']);
+
+**Drag End**
+
+This event is fired when the user stops dragging the marker.
+
+	Mapper::marker(53.381128999999990000, -1.470085000000040000, ['draggable' => true, 'eventDragEnd' => 'console.log("drag end");']);
+
 ### Information Window
 
 The `informationWindow` method allows an information window to be added to to a map, with latitude, longitude, content, and optional parameters for options.
diff --git a/src/views/marker.blade.php b/src/views/marker.blade.php
index c6768cd..d0df6eb 100644
--- a/src/views/marker.blade.php
+++ b/src/views/marker.blade.php
@@ -72,3 +72,15 @@
 	@endif
 
 @endif
+
+@foreach (['eventClick', 'eventRightClick', 'eventMouseOver', 'eventMouseDown', 'eventMouseUp', 'eventMouseOut', 'eventDrag', 'eventDragStart', 'eventDragEnd'] as $event)
+
+	@if (isset($options[$event]))
+
+		google.maps.event.addListener(marker_{!! $id !!}, '{!! str_replace('event', '', strtolower($event)) !!}', function (event) {
+			{!! $options[$event] !!}
+		});
+
+	@endif
+
+@endforeach

From 38c33aa1b7bbf3e568fe8f3eed50765a5cba1b0e Mon Sep 17 00:00:00 2001
From: Bradley Cornford <bcornford@plus.net>
Date: Mon, 11 Jan 2016 15:09:28 +0000
Subject: [PATCH 26/40] Adding support for publishable views.

---
 src/Cornford/Googlmapper/MapperServiceProvider.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/Cornford/Googlmapper/MapperServiceProvider.php b/src/Cornford/Googlmapper/MapperServiceProvider.php
index 6b1f211..bb8c6d0 100644
--- a/src/Cornford/Googlmapper/MapperServiceProvider.php
+++ b/src/Cornford/Googlmapper/MapperServiceProvider.php
@@ -19,11 +19,15 @@ class MapperServiceProvider extends ServiceProvider {
 	 */
 	public function boot()
 	{
-		$configPath = __DIR__ . '/../../config/config.php';
-		$this->publishes([$configPath => config_path('googlmapper.php')], 'googlmapper');
-
-		$viewPath = __DIR__ . '/../../views';
-		$this->loadViewsFrom($viewPath, 'googlmapper');
+		$this->loadViewsFrom(__DIR__ . '/../../views', 'googlmapper');
+
+		$this->publishes(
+			[
+				__DIR__ . '/../../config/config.php' => config_path('googlmapper.php'),
+				__DIR__ . '/../../views' => base_path('resources/views/cornford/googlmapper')
+			],
+			'googlmapper'
+		);
 	}
 
 	/**

From 3b9ed04c71040dbdd462e5b3aee73d453a7f0e69 Mon Sep 17 00:00:00 2001
From: Bradley Cornford <bcornford@plus.net>
Date: Mon, 11 Jan 2016 15:09:28 +0000
Subject: [PATCH 27/40] Adding support for publishable views.

---
 src/Cornford/Googlmapper/MapperServiceProvider.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/Cornford/Googlmapper/MapperServiceProvider.php b/src/Cornford/Googlmapper/MapperServiceProvider.php
index 6b1f211..0320206 100644
--- a/src/Cornford/Googlmapper/MapperServiceProvider.php
+++ b/src/Cornford/Googlmapper/MapperServiceProvider.php
@@ -19,11 +19,15 @@ class MapperServiceProvider extends ServiceProvider {
 	 */
 	public function boot()
 	{
-		$configPath = __DIR__ . '/../../config/config.php';
-		$this->publishes([$configPath => config_path('googlmapper.php')], 'googlmapper');
-
-		$viewPath = __DIR__ . '/../../views';
-		$this->loadViewsFrom($viewPath, 'googlmapper');
+		$this->loadViewsFrom(base_path('resources/views/cornford/googlmapper'), 'googlmapper');
+
+		$this->publishes(
+			[
+				__DIR__ . '/../../config/config.php' => config_path('googlmapper.php'),
+				__DIR__ . '/../../views' => base_path('resources/views/cornford/googlmapper')
+			],
+			'googlmapper'
+		);
 	}
 
 	/**

From 0f457d38bd0b78a04a44cd09572cbac1890f4294 Mon Sep 17 00:00:00 2001
From: Bradley Cornford <bcornford@plus.net>
Date: Fri, 15 Jan 2016 14:01:24 +0000
Subject: [PATCH 28/40] Added before and after load events for maps.

---
 README.md               | 14 ++++++++++++++
 src/views/map.blade.php | 13 +++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index e54f41b..84af9a6 100644
--- a/README.md
+++ b/README.md
@@ -93,6 +93,20 @@ The `map` method allows a map to be created, with latitude, longitude and option
 	Mapper::map(53.381128999999990000, -1.470085000000040000, ['zoom' => 15, 'center' => false, 'marker' => false, 'type' => 'HYBRID', 'overlay' => 'TRAFFIC']);
 	Mapper::map(53.381128999999990000, -1.470085000000040000, ['zoom' => 10, 'markers' => ['title' => 'My Location', 'animation' => 'DROP']]);
 
+##### Map Events
+
+**Before Load**
+
+This event is fired before the map is loaded.
+
+	Mapper::map(53.381128999999990000, -1.470085000000040000, ['eventBeforeLoad' => 'console.log("before load");']);
+
+**After Load**
+
+This event is fired after the map is loaded.
+
+	Mapper::map(53.381128999999990000, -1.470085000000040000, ['eventAfterLoad' => 'console.log("after load");']);
+
 ### Location
 
 The `location` method allows a location to be searched for with a string, returning a Location object with its latitude and longitude.
diff --git a/src/views/map.blade.php b/src/views/map.blade.php
index 778894a..00eae73 100644
--- a/src/views/map.blade.php
+++ b/src/views/map.blade.php
@@ -54,11 +54,20 @@ function initialize_{!! $id !!}() {
 			trafficLayer.setMap(map_{!! $id !!});
 		@endif
 
-		var listener = google.maps.event.addListener(map_{!! $id !!}, "idle", function () {
+		var idleListener = google.maps.event.addListenerOnce(map_{!! $id !!}, "idle", function () {
 			map_{!! $id !!}.setZoom({!! $options['zoom'] !!});
-			google.maps.event.removeListener(listener);
 		});
 
+		@if (isset($options['eventBeforeLoad']))
+			{!! $options['eventBeforeLoad'] !!}
+		@endif
+
+		@if (isset($options['eventAfterLoad']))
+			google.maps.event.addListenerOnce(map_{!! $id !!}, "tilesloaded", function() {
+				{!! $options['eventAfterLoad'] !!}
+			});
+		@endif
+
 		maps.push({
 			key: {!! $id !!},
 			markers: markers,

From d821a1f1e1413f50015c8fad625b8117022992b4 Mon Sep 17 00:00:00 2001
From: Bradley Cornford <bcornford@plus.net>
Date: Fri, 15 Jan 2016 14:01:24 +0000
Subject: [PATCH 29/40] Added before and after load events for maps.

---
 README.md               | 14 ++++++++++++++
 src/views/map.blade.php | 13 +++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index e54f41b..84af9a6 100644
--- a/README.md
+++ b/README.md
@@ -93,6 +93,20 @@ The `map` method allows a map to be created, with latitude, longitude and option
 	Mapper::map(53.381128999999990000, -1.470085000000040000, ['zoom' => 15, 'center' => false, 'marker' => false, 'type' => 'HYBRID', 'overlay' => 'TRAFFIC']);
 	Mapper::map(53.381128999999990000, -1.470085000000040000, ['zoom' => 10, 'markers' => ['title' => 'My Location', 'animation' => 'DROP']]);
 
+##### Map Events
+
+**Before Load**
+
+This event is fired before the map is loaded.
+
+	Mapper::map(53.381128999999990000, -1.470085000000040000, ['eventBeforeLoad' => 'console.log("before load");']);
+
+**After Load**
+
+This event is fired after the map is loaded.
+
+	Mapper::map(53.381128999999990000, -1.470085000000040000, ['eventAfterLoad' => 'console.log("after load");']);
+
 ### Location
 
 The `location` method allows a location to be searched for with a string, returning a Location object with its latitude and longitude.
diff --git a/src/views/map.blade.php b/src/views/map.blade.php
index 778894a..00eae73 100644
--- a/src/views/map.blade.php
+++ b/src/views/map.blade.php
@@ -54,11 +54,20 @@ function initialize_{!! $id !!}() {
 			trafficLayer.setMap(map_{!! $id !!});
 		@endif
 
-		var listener = google.maps.event.addListener(map_{!! $id !!}, "idle", function () {
+		var idleListener = google.maps.event.addListenerOnce(map_{!! $id !!}, "idle", function () {
 			map_{!! $id !!}.setZoom({!! $options['zoom'] !!});
-			google.maps.event.removeListener(listener);
 		});
 
+		@if (isset($options['eventBeforeLoad']))
+			{!! $options['eventBeforeLoad'] !!}
+		@endif
+
+		@if (isset($options['eventAfterLoad']))
+			google.maps.event.addListenerOnce(map_{!! $id !!}, "tilesloaded", function() {
+				{!! $options['eventAfterLoad'] !!}
+			});
+		@endif
+
 		maps.push({
 			key: {!! $id !!},
 			markers: markers,

From 3cb4a874d8f0e943e7abe52802d809d9b27baf4e Mon Sep 17 00:00:00 2001
From: Bradley Cornford <bradley.cornford@skybettingandgaming.com>
Date: Thu, 26 May 2016 11:25:57 +0100
Subject: [PATCH 30/40] Adding example file.

---
 README.md                           |  1 +
 composer.json                       |  3 +-
 example.php                         | 55 +++++++++++++++++++++++++++++
 src/Cornford/Googlmapper/Mapper.php |  1 +
 4 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 example.php

diff --git a/README.md b/README.md
index 84af9a6..ed68d3b 100644
--- a/README.md
+++ b/README.md
@@ -65,6 +65,7 @@ You can now configure Googlmapper in a few simple steps. Open `app/config/packag
 - `ui` - Show the Google Maps default UI options, e.g. true.
 - `markers.icon` - Set the default marker icon, e.g. img/icon.png.
 - `markers.animation` - Set the default marker animation, e.g. NONE, DROP, BOUNCE.
+- `cluster` - Set if map marker clusters should be used.
 
 ## Usage
 
diff --git a/composer.json b/composer.json
index 7a00fe9..d642b01 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,8 @@
         }
     ],
     "require": {
-        "php": ">=5.4.0"
+        "php": ">=5.4.0",
+        "illuminate/view": "5.*"
     },
     "require-dev": {
         "phpspec/phpspec": "2.0.*@dev",
diff --git a/example.php b/example.php
new file mode 100644
index 0000000..d12d295
--- /dev/null
+++ b/example.php
@@ -0,0 +1,55 @@
+<?php
+
+require_once __DIR__ . "/vendor/autoload.php";
+
+use Cornford\Googlmapper\Mapper;
+use Illuminate\Container\Container;
+use Illuminate\Events\Dispatcher;
+use Illuminate\Filesystem\Filesystem;
+use Illuminate\View\Compilers\BladeCompiler;
+use Illuminate\View\Engines\CompilerEngine;
+use Illuminate\View\Factory;
+use Illuminate\View\Engines\EngineResolver;
+use Illuminate\View\FileViewFinder;
+
+/**
+ * Env function.
+ *
+ * @param string $key
+ * @param string $value
+ *
+ * @return string
+ */
+function env($key, $value)
+{
+    return $value;
+}
+
+$fileViewFinder = new FileViewFinder(new Filesystem,  [__DIR__ . '/src/views']);
+$fileViewFinder->addNamespace('googlmapper', [__DIR__ . '/src/views']);
+
+$engineResolver = new EngineResolver();
+$engineResolver->register(
+    'blade',
+    function () {
+        return new CompilerEngine(new BladeCompiler(new Filesystem(), sys_get_temp_dir()));
+    }
+);
+
+$viewFactory = new Factory($engineResolver, $fileViewFinder, new Dispatcher(new Container));
+
+$config = include_once __DIR__ . '/src/config/config.php';
+
+$mapper = new Mapper($viewFactory, $config);
+
+// Location
+$mapper->location('Sheffield')->streetview(1, 1, ['ui' => false]);
+
+// Map
+$mapper->map(53.3, -1.4, ['zoom' => 10, 'markers' => ['title' => 'My Location', 'animation' => 'DROP']]);
+
+// Information window
+$mapper->informationWindow(53.4, -1.5, 'Content');
+
+// Render
+print $mapper->render();
\ No newline at end of file
diff --git a/src/Cornford/Googlmapper/Mapper.php b/src/Cornford/Googlmapper/Mapper.php
index 4e51688..1ba282a 100644
--- a/src/Cornford/Googlmapper/Mapper.php
+++ b/src/Cornford/Googlmapper/Mapper.php
@@ -8,6 +8,7 @@
 use Cornford\Googlmapper\Models\Location;
 use Cornford\Googlmapper\Models\Map;
 use Cornford\Googlmapper\Models\Streetview;
+use Exception;
 
 class Mapper extends MapperBase implements MappingInterface {
 

From 8964819782d0417a680e0b5c779e0623a091a2d9 Mon Sep 17 00:00:00 2001
From: Bradley Cornford <bradley.cornford@skybettingandgaming.com>
Date: Tue, 7 Jun 2016 11:34:00 +0100
Subject: [PATCH 31/40] Adding settings for marker clusters.

---
 README.md                                |   7 +
 spec/Cornford/Googlmapper/MapperSpec.php |  53 ++++
 src/Cornford/Googlmapper/MapperBase.php  | 318 +++++++++++++++++++----
 src/config/config.php                    |  64 +++++
 src/views/map.blade.php                  |  15 +-
 5 files changed, 397 insertions(+), 60 deletions(-)

diff --git a/README.md b/README.md
index ed68d3b..ed0bbee 100644
--- a/README.md
+++ b/README.md
@@ -66,6 +66,11 @@ You can now configure Googlmapper in a few simple steps. Open `app/config/packag
 - `markers.icon` - Set the default marker icon, e.g. img/icon.png.
 - `markers.animation` - Set the default marker animation, e.g. NONE, DROP, BOUNCE.
 - `cluster` - Set if map marker clusters should be used.
+- `clusters.icon` - Display custom images for clusters using icon path.
+- `clusters.grid` - The grid size of a cluster in pixels.
+- `clusters.zoom` - The maximum zoom level that a marker can be part of a cluster.
+- `clusters.center` - Whether the center of each cluster should be the average of all markers in the cluster.
+- `clusters.size` - The minimum number of markers to be in a cluster before the markers are hidden and a count is shown.
 
 ## Usage
 
@@ -93,6 +98,8 @@ The `map` method allows a map to be created, with latitude, longitude and option
 	Mapper::map(53.381128999999990000, -1.470085000000040000);
 	Mapper::map(53.381128999999990000, -1.470085000000040000, ['zoom' => 15, 'center' => false, 'marker' => false, 'type' => 'HYBRID', 'overlay' => 'TRAFFIC']);
 	Mapper::map(53.381128999999990000, -1.470085000000040000, ['zoom' => 10, 'markers' => ['title' => 'My Location', 'animation' => 'DROP']]);
+	Mapper::map(53.381128999999990000, -1.470085000000040000, ['zoom' => 10, 'markers' => ['title' => 'My Location', 'animation' => 'DROP'], 'cluster' => false]);
+	Mapper::map(53.381128999999990000, -1.470085000000040000, ['zoom' => 10, 'markers' => ['title' => 'My Location', 'animation' => 'DROP'], 'clusters' => ['size' => 10, 'center' => true, 'zoom' => 20]]);
 
 ##### Map Events
 
diff --git a/spec/Cornford/Googlmapper/MapperSpec.php b/spec/Cornford/Googlmapper/MapperSpec.php
index fa25aba..f3b7ffb 100644
--- a/spec/Cornford/Googlmapper/MapperSpec.php
+++ b/spec/Cornford/Googlmapper/MapperSpec.php
@@ -9,11 +9,14 @@ class MapperSpec extends ObjectBehavior
 
 	const STRING = 'test';
 	const INTEGER = 10;
+	const BOOLEAN = false;
 
 	const REGION = 'GB';
 	const LANGUAGE = 'en-gb';
 	const TYPE = 'ROADMAP';
 
+	const ANIMATION = 'NONE';
+
 	public function let()
 	{
 		$location = Mockery::mock('Cornford\Googlmapper\Models\Location');
@@ -136,6 +139,56 @@ public function it_can_set_and_get_tilt_option()
 		$this->getTilt()->shouldReturn(self::INTEGER);
 	}
 
+	public function it_can_set_and_get_icon_option()
+	{
+		$this->setIcon(self::STRING);
+		$this->getIcon()->shouldReturn(self::STRING);
+	}
+
+	public function it_can_set_and_get_animation_option()
+	{
+		$this->setAnimation(self::ANIMATION);
+		$this->getAnimation()->shouldReturn(self::ANIMATION);
+	}
+
+	public function it_can_set_and_get_cluster_option()
+	{
+		$this->enableCluster();
+		$this->getCluster()->shouldReturn(true);
+		$this->disableCluster();
+		$this->getCluster()->shouldReturn(false);
+	}
+
+	public function it_can_set_and_get_clusters_icon_option()
+	{
+		$this->setClustersIcon(self::STRING);
+		$this->getClustersIcon()->shouldReturn(self::STRING);
+	}
+
+	public function it_can_set_and_get_clusters_grid_option()
+	{
+		$this->setClustersGrid(self::INTEGER);
+		$this->getClustersGrid()->shouldReturn(self::INTEGER);
+	}
+
+	public function it_can_set_and_get_clusters_zoom_option()
+	{
+		$this->setClustersZoom(self::INTEGER);
+		$this->getClustersZoom()->shouldReturn(self::INTEGER);
+	}
+
+	public function it_can_set_and_get_clusters_center_option()
+	{
+		$this->setClustersCenter(self::BOOLEAN);
+		$this->getClustersCenter()->shouldReturn(self::BOOLEAN);
+	}
+
+	public function it_can_set_and_get_clusters_size_option()
+	{
+		$this->setClustersSize(self::INTEGER);
+		$this->getClustersSize()->shouldReturn(self::INTEGER);
+	}
+
 	public function it_can_create_a_map()
 	{
 		$this->map(self::INTEGER, self::INTEGER)->shouldReturn($this);
diff --git a/src/Cornford/Googlmapper/MapperBase.php b/src/Cornford/Googlmapper/MapperBase.php
index 908857d..e9c9d36 100644
--- a/src/Cornford/Googlmapper/MapperBase.php
+++ b/src/Cornford/Googlmapper/MapperBase.php
@@ -7,6 +7,8 @@
 abstract class MapperBase implements MappingBaseInterface
 {
 
+	const ENABLED = true;
+
 	const REGION = 'GB';
 
 	const LANGUAGE = 'en-gb';
@@ -16,11 +18,19 @@ abstract class MapperBase implements MappingBaseInterface
 	const TYPE_HYBRID = 'HYBRID';
 	const TYPE_TERRAIN = 'TERRAIN';
 
+	const USER = false;
+
+	const MARKER = true;
+
+	const CENTER = true;
+
 	const ZOOM = 8;
 	const SCROLL_WHEEL_ZOOM = true;
 
 	const TILT = 90;
 
+	const UI = true;
+
 	const ANIMATION_NONE = 'NONE';
 	const ANIMATION_DROP = 'DROP';
 	const ANIMATION_BOUNCE = 'BOUNCE';
@@ -36,6 +46,16 @@ abstract class MapperBase implements MappingBaseInterface
 	const SYMBOL_BACKWARD_OPEN_ARROW = 'BACKWARD_OPEN_ARROW';
 	const SYMBOL_FORWARD_OPEN_ARROW = 'FORWARD_OPEN_ARROW';
 
+	const ICON = '';
+
+	const CLUSTER = true;
+
+	const CLUSTERS_ICON = '//googlemaps.github.io/js-marker-clusterer/images/m';
+	const CLUSTERS_GRID = 60;
+	const CLUSTERS_ZOOM = null;
+	const CLUSTERS_CENTER = false;
+	const CLUSTERS_SIZE = 2;
+
 	/**
 	 * View.
 	 *
@@ -567,6 +587,41 @@ abstract class MapperBase implements MappingBaseInterface
 	 */
 	protected $cluster;
 
+	/**
+	 * Map marker clusters icon.
+	 *
+	 * @var array
+	 */
+	protected $clustersIcon;
+
+	/**
+	 * Map marker clusters grid.
+	 *
+	 * @var integer
+	 */
+	protected $clustersGrid;
+
+	/**
+	 * Map marker clusters zoom.
+	 *
+	 * @var integer|null
+	 */
+	protected $clustersZoom;
+
+	/**
+	 * Map marker clusters center.
+	 *
+	 * @var boolean
+	 */
+	protected $clustersCenter;
+
+	/**
+	 * Map marker clusters size.
+	 *
+	 * @var integer
+	 */
+	protected $clustersSize;
+
 	/**
 	 * Mapping items.
 	 *
@@ -606,21 +661,26 @@ public function __construct(View $view, array $options = [])
 			throw new MapperArgumentException('Language is required in ISO 639-1 code format.');
 		}
 
-		$this->setEnabled(isset($options['enabled']) ? $options['enabled'] : true);
+		$this->setEnabled(isset($options['enabled']) ? $options['enabled'] : self::ENABLED);
 		$this->setKey($options['key']);
 		$this->setRegion(isset($options['region']) ? $options['region'] : self::REGION);
 		$this->setLanguage(isset($options['language']) ? $options['language'] : self::LANGUAGE);
-		$this->setUser(isset($options['user']) ? $options['user'] : false);
-		$this->setMarker(isset($options['marker']) ? $options['marker'] : true);
-		$this->setCenter(isset($options['centre']) ? $options['centre'] : true);
+		$this->setUser(isset($options['user']) ? $options['user'] : self::USER);
+		$this->setMarker(isset($options['marker']) ? $options['marker'] : self::MARKER);
+		$this->setCenter(isset($options['center']) ? $options['center'] : self::CENTER);
 		$this->setZoom(isset($options['zoom']) ? $options['zoom'] : self::ZOOM);
 		$this->setScrollWheelZoom(isset($options['scrollWheelZoom']) ? $options['scrollWheelZoom'] : self::SCROLL_WHEEL_ZOOM);
 		$this->setType(isset($options['type']) ? $options['type'] : self::TYPE_ROADMAP);
 		$this->setTilt(isset($options['tilt']) ? $options['tilt'] : self::TILT);
-		$this->setUi(isset($options['ui']) ? $options['ui'] : true);
-		$this->setIcon(isset($options['markers']['icon']) ? $options['markers']['icon'] : '');
+		$this->setUi(isset($options['ui']) ? $options['ui'] : self::UI);
+		$this->setIcon(isset($options['markers']['icon']) ? $options['markers']['icon'] : self::ICON);
 		$this->setAnimation(isset($options['markers']['animation']) ? $options['markers']['animation'] : self::ANIMATION_NONE);
-		$this->setCluster(isset($options['cluster']) ? $options['cluster'] : true);
+		$this->setCluster(isset($options['cluster']) ? $options['cluster'] : self::CLUSTER);
+		$this->setClustersIcon(isset($options['clusters']['icon']) ? $options['clusters']['icon'] : self::CLUSTERS_ICON);
+		$this->setClustersGrid(isset($options['clusters']['grid']) ? $options['clusters']['grid'] : self::CLUSTERS_GRID);
+		$this->setClustersZoom(isset($options['clusters']['zoom']) ? $options['clusters']['zoom'] : self::CLUSTERS_ZOOM);
+		$this->setClustersCenter(isset($options['clusters']['center']) ? $options['clusters']['center'] : self::CLUSTERS_CENTER);
+		$this->setClustersSize(isset($options['clusters']['size']) ? $options['clusters']['size'] : self::CLUSTERS_SIZE);
 	}
 
 	/**
@@ -1136,6 +1196,193 @@ public function getAnimation()
 	{
 		return $this->animation;
 	}
+	/**
+	 * Set cluster status.
+	 *
+	 * @param boolean $value
+	 *
+	 * @throws MapperArgumentException
+	 *
+	 * @return void
+	 */
+	protected function setCluster($value)
+	{
+		if (!is_bool($value)) {
+			throw new MapperArgumentException('Invalid map cluster setting.');
+		}
+
+		$this->cluster = $value;
+	}
+
+	/**
+	 * Get the cluster status.
+	 *
+	 * @return boolean
+	 */
+	public function getCluster()
+	{
+		return $this->cluster;
+	}
+
+	/**
+	 * Enable cluster.
+	 *
+	 * @return void
+	 */
+	public function enableCluster()
+	{
+		$this->setCluster(true);
+	}
+
+	/**
+	 * Disable cluster.
+	 *
+	 * @return void
+	 */
+	public function disableCluster()
+	{
+		$this->setCluster(false);
+	}
+
+	/**
+	 * Set map cluster icon.
+	 *
+	 * @param string $value
+	 *
+	 * @throws MapperArgumentException
+	 *
+	 * @return void
+	 */
+	public function setClustersIcon($value)
+	{
+		if (!is_string($value)) {
+			throw new MapperArgumentException('Invalid map clusters icon setting.');
+		}
+
+		$this->clustersIcon = $value;
+	}
+
+	/**
+	 * Get map clusters icon.
+	 *
+	 * @return string
+	 */
+	public function getClustersIcon()
+	{
+		return $this->clustersIcon;
+	}
+
+	/**
+	 * Set map cluster grid.
+	 *
+	 * @param integer $value
+	 *
+	 * @throws MapperArgumentException
+	 *
+	 * @return void
+	 */
+	public function setClustersGrid($value)
+	{
+		if (!is_integer($value)) {
+			throw new MapperArgumentException('Invalid map clusters grid setting.');
+		}
+
+		$this->clustersGrid = $value;
+	}
+
+	/**
+	 * Get map cluster grid.
+	 *
+	 * @return integer
+	 */
+	public function getClustersGrid()
+	{
+		return $this->clustersGrid;
+	}
+
+	/**
+	 * Set map cluster zoom.
+	 *
+	 * @param integer|null $value
+	 *
+	 * @throws MapperArgumentException
+	 *
+	 * @return void
+	 */
+	public function setClustersZoom($value)
+	{
+		if (!is_integer($value) && !is_null($value)) {
+			throw new MapperArgumentException('Invalid map clusters zoom setting.');
+		}
+
+		$this->clustersZoom = $value;
+	}
+
+	/**
+	 * Get map cluster grid.
+	 *
+	 * @return integer|null
+	 */
+	public function getClustersZoom()
+	{
+		return $this->clustersZoom;
+	}
+
+	/**
+	 * Set map cluster center.
+	 *
+	 * @param boolean $value
+	 *
+	 * @throws MapperArgumentException
+	 *
+	 * @return void
+	 */
+	public function setClustersCenter($value)
+	{
+		if (!is_bool($value)) {
+			throw new MapperArgumentException('Invalid map clusters center setting.');
+		}
+
+		$this->clustersCenter = $value;
+	}
+
+	/**
+	 * Get map cluster center.
+	 *
+	 * @return boolean
+	 */
+	public function getClustersCenter()
+	{
+		return $this->clustersCenter;
+	}
+
+	/**
+	 * Set map cluster size.
+	 *
+	 * @param integer $value
+	 *
+	 * @throws MapperArgumentException
+	 *
+	 * @return void
+	 */
+	public function setClustersSize($value)
+	{
+		if (!is_integer($value)) {
+			throw new MapperArgumentException('Invalid map clusters size setting.');
+		}
+
+		$this->clustersSize = $value;
+	}
+
+	/**
+	 * Get map cluster size.
+	 *
+	 * @return integer
+	 */
+	public function getClustersSize()
+	{
+		return $this->clustersSize;
+	}
 
 	/**
 	 * Get mapper options.
@@ -1166,7 +1413,14 @@ protected function getOptions()
 				'animation' => $this->getAnimation(),
 				'symbol' => '',
 			],
-			'cluster' => $this->getCluster()
+			'cluster' => $this->getCluster(),
+			'clusters' => [
+				'icon' => $this->getClustersIcon(),
+				'grid' => $this->getClustersGrid(),
+				'zoom' => $this->getClustersZoom(),
+				'center' => $this->getClustersCenter(),
+				'size' => $this->getClustersSize()
+			],
 		];
 	}
 
@@ -1216,52 +1470,4 @@ public function getItem($item)
 		return isset($this->items[$item]) ? $this->items[$item] : false;
 	}
 
-	/**
-	 * Set cluster status.
-	 *
-	 * @param boolean $value
-	 *
-	 * @throws MapperArgumentException
-	 *
-	 * @return void
-	 */
-	protected function setCluster($value)
-	{
-		if (!is_bool($value)) {
-			throw new MapperArgumentException('Invalid map cluster setting.');
-		}
-
-		$this->cluster = $value;
-	}
-
-	/**
-	 * Get the cluster status.
-	 *
-	 * @return boolean
-	 */
-	protected function getCluster()
-	{
-		return $this->cluster;
-	}
-
-	/**
-	 * Enable cluster.
-	 *
-	 * @return void
-	 */
-	public function enableCluster()
-	{
-		$this->setCluster(true);
-	}
-
-	/**
-	 * Disable cluster.
-	 *
-	 * @return void
-	 */
-	public function disableCluster()
-	{
-		$this->setCluster(false);
-	}
-
 }
\ No newline at end of file
diff --git a/src/config/config.php b/src/config/config.php
index 9012af8..c9e419e 100644
--- a/src/config/config.php
+++ b/src/config/config.php
@@ -156,4 +156,68 @@
     */
     'cluster' => true,
 
+    /*
+    |--------------------------------------------------------------------------
+    | Map Marker Cluster
+    |--------------------------------------------------------------------------
+    |
+    | Set the default Googlmapper map marker cluster behaviour.
+    |
+    */
+    'clusters' => array (
+
+        /*
+        |--------------------------------------------------------------------------
+        | Cluster Icon
+        |--------------------------------------------------------------------------
+        |
+        | Display custom images for clusters using icon path. (Link to an image path)
+        |
+        */
+        'icon' => '//googlemaps.github.io/js-marker-clusterer/images/m',
+
+        /*
+        |--------------------------------------------------------------------------
+        | Cluster Size
+        |--------------------------------------------------------------------------
+        |
+        | The grid size of a cluster in pixels.
+        |
+        */
+        'grid' => 60,
+
+        /*
+        |--------------------------------------------------------------------------
+        | Cluster Zoom
+        |--------------------------------------------------------------------------
+        |
+        | The maximum zoom level that a marker can be part of a cluster.
+        |
+        */
+        'zoom' => null,
+
+        /*
+        |--------------------------------------------------------------------------
+        | Cluster Center
+        |--------------------------------------------------------------------------
+        |
+        | Whether the center of each cluster should be the average of all markers
+        | in the cluster.
+        |
+        */
+        'center' => false,
+
+        /*
+        |--------------------------------------------------------------------------
+        | Cluster Size
+        |--------------------------------------------------------------------------
+        |
+        | The minimum number of markers to be in a cluster before the markers are
+        | hidden and a count is shown.
+        |
+        */
+        'size' => 2
+
+    ),
+
 );
diff --git a/src/views/map.blade.php b/src/views/map.blade.php
index 00eae73..9c5bd19 100644
--- a/src/views/map.blade.php
+++ b/src/views/map.blade.php
@@ -27,10 +27,6 @@ function initialize_{!! $id !!}() {
 			{!! $marker->render($key, $view) !!}
 		@endforeach
 
-		@if ($options['cluster'])
-			var markerCluster = new MarkerClusterer(map_{!! $id !!}, markers);
-		@endif
-
 		@foreach ($options['shapes'] as $key => $shape)
 			{!! $shape->render($key, $view) !!}
 		@endforeach
@@ -68,6 +64,17 @@ function initialize_{!! $id !!}() {
 			});
 		@endif
 
+		@if ($options['cluster'])
+			var markerClusterOptions = {
+				imagePath: '{!! $options['clusters']['icon'] !!}',
+				gridSize: {!! $options['clusters']['grid'] !!},
+				maxZoom: @if ($options['clusters']['zoom'] === null) null @else {!! $options['clusters']['zoom'] !!} @endif,
+				averageCenter: @if ($options['clusters']['center'] === true) true @else false @endif,
+				minimumClusterSize: {!! $options['clusters']['size'] !!}
+			};
+			var markerCluster = new MarkerClusterer(map_{!! $id !!}, markers, markerClusterOptions);
+		@endif
+
 		maps.push({
 			key: {!! $id !!},
 			markers: markers,

From 66efa59cfd5e0c0be0f839ec2c22c19539f455ea Mon Sep 17 00:00:00 2001
From: Bradley Cornford <bradley.cornford@skybettingandgaming.com>
Date: Tue, 14 Jun 2016 09:10:42 +0100
Subject: [PATCH 32/40] Adding illuminate package dependencies in
 composer.json.

---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index d642b01..96a28f1 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,8 @@
     ],
     "require": {
         "php": ">=5.4.0",
-        "illuminate/view": "5.*"
+        "illuminate/view": "5.*",
+        "illuminate/support": "5.*"
     },
     "require-dev": {
         "phpspec/phpspec": "2.0.*@dev",

From 91432913864b8beb8fdbcd2b713b1182a8a5d764 Mon Sep 17 00:00:00 2001
From: Bradley Cornford <bradley.cornford@skybettingandgaming.com>
Date: Mon, 11 Jul 2016 08:50:15 +0100
Subject: [PATCH 33/40] Fixing issue with map not resizing to fit all markers
 when option center is set to false.

---
 example.php             | 4 +++-
 src/views/map.blade.php | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/example.php b/example.php
index d12d295..3afc3da 100644
--- a/example.php
+++ b/example.php
@@ -46,10 +46,12 @@ function () {
 $mapper->location('Sheffield')->streetview(1, 1, ['ui' => false]);
 
 // Map
-$mapper->map(53.3, -1.4, ['zoom' => 10, 'markers' => ['title' => 'My Location', 'animation' => 'DROP']]);
+$mapper->map(53.3, -1.4, ['zoom' => 10, 'center' => false, 'markers' => ['title' => 'My Location', 'animation' => 'DROP']]);
 
 // Information window
 $mapper->informationWindow(53.4, -1.5, 'Content');
+$mapper->informationWindow(52.4, -1.0, 'Content');
+$mapper->informationWindow(51.4, -0.5, 'Content');
 
 // Render
 print $mapper->render();
\ No newline at end of file
diff --git a/src/views/map.blade.php b/src/views/map.blade.php
index 9c5bd19..936b4f4 100644
--- a/src/views/map.blade.php
+++ b/src/views/map.blade.php
@@ -31,10 +31,6 @@ function initialize_{!! $id !!}() {
 			{!! $shape->render($key, $view) !!}
 		@endforeach
 
-		@if (!$options['center'])
-			map_{!! $id !!}.fitBounds(bounds);
-		@endif
-
 		@if ($options['overlay'] == 'BIKE')
 			var bikeLayer = new google.maps.BicyclingLayer();
 			bikeLayer.setMap(map_{!! $id !!});
@@ -52,6 +48,10 @@ function initialize_{!! $id !!}() {
 
 		var idleListener = google.maps.event.addListenerOnce(map_{!! $id !!}, "idle", function () {
 			map_{!! $id !!}.setZoom({!! $options['zoom'] !!});
+
+			@if (!$options['center'])
+				map_{!! $id !!}.fitBounds(bounds);
+			@endif
 		});
 
 		@if (isset($options['eventBeforeLoad']))

From abd5e74f1adf097d8e9822017849b2ea9f14b516 Mon Sep 17 00:00:00 2001
From: Bradley Cornford <bradley.cornford@skybettingandgaming.com>
Date: Thu, 14 Jul 2016 14:31:07 +0100
Subject: [PATCH 34/40] Updating markers to json_encode both title and content.

---
 src/views/marker.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/marker.blade.php b/src/views/marker.blade.php
index d0df6eb..55c1441 100644
--- a/src/views/marker.blade.php
+++ b/src/views/marker.blade.php
@@ -32,7 +32,7 @@
 		draggable:true,
 	@endif
 	
-	title: '{!! $options['title'] !!}',
+	title: {!! json_encode($options['title']) !!},
 	animation: @if (empty($options['animation']) || $options['animation'] == 'NONE') '' @else google.maps.Animation.{!! $options['animation'] !!} @endif,
 	@if ($options['symbol'])
 		icon: {
@@ -62,7 +62,7 @@
 	@if (!empty($options['content']))
 
 		var infowindow_{!! $id !!} = new google.maps.InfoWindow({
-			content: '{!! $options['content'] !!}'
+			content: {!! json_encode($options['content']) !!}
 		});
 
 		google.maps.event.addListener(marker_{!! $id !!}, 'click', function() {

From d5c06d3413626fa424b0e0f13c35191f53fc63a0 Mon Sep 17 00:00:00 2001
From: Bradley Cornford <bradley.cornford@skybettingandgaming.com>
Date: Mon, 25 Jul 2016 15:50:12 +0100
Subject: [PATCH 35/40] Adding an option 'locate' to locate the users current
 position, and set the center of the map on this location.

---
 README.md                                     |  1 +
 spec/Cornford/Googlmapper/MapperSpec.php      |  8 +++
 .../Contracts/MappingBaseInterface.php        | 21 +++++++
 src/Cornford/Googlmapper/MapperBase.php       | 59 +++++++++++++++++++
 src/config/config.php                         | 11 ++++
 src/views/map.blade.php                       |  8 +++
 6 files changed, 108 insertions(+)

diff --git a/README.md b/README.md
index ed0bbee..dbd2c67 100644
--- a/README.md
+++ b/README.md
@@ -59,6 +59,7 @@ You can now configure Googlmapper in a few simple steps. Open `app/config/packag
 - `user` - Use custom Google Maps for users logged into the Google service, e.g. false.
 - `marker` - Automatically add Google Maps marker for your maps initial location, e.g. true.
 - `center` - Automatically center Google Maps around the initial location, when false, Google Maps will automatically center the map, e.g. true.
+- `locate` - Automatically center Google Maps around the users current location, when false, Google Maps will automatically center the map, e.g. true.
 - `zoom` - Set the default zoom level for Google Maps, e.g. 8.
 - `scrollWheelZoom` - Set the default scroll wheel zoom Google Maps, e.g. true.
 - `type` - Set the default map type for Google Maps, e.g. ROADMAP, SATELLITE, HYBRID, TERRAIN.
diff --git a/spec/Cornford/Googlmapper/MapperSpec.php b/spec/Cornford/Googlmapper/MapperSpec.php
index f3b7ffb..8806a82 100644
--- a/spec/Cornford/Googlmapper/MapperSpec.php
+++ b/spec/Cornford/Googlmapper/MapperSpec.php
@@ -113,6 +113,14 @@ public function it_can_set_and_get_center_option()
 		$this->getCenter()->shouldReturn(false);
 	}
 
+	public function it_can_set_and_get_locate_option()
+	{
+		$this->enableLocate();
+		$this->getLocate()->shouldReturn(true);
+		$this->disableLocate();
+		$this->getLocate()->shouldReturn(false);
+	}
+
 	public function it_can_set_and_get_ui_option()
 	{
 		$this->enableUi();
diff --git a/src/Cornford/Googlmapper/Contracts/MappingBaseInterface.php b/src/Cornford/Googlmapper/Contracts/MappingBaseInterface.php
index c973630..7af864d 100644
--- a/src/Cornford/Googlmapper/Contracts/MappingBaseInterface.php
+++ b/src/Cornford/Googlmapper/Contracts/MappingBaseInterface.php
@@ -140,6 +140,27 @@ public function enableCenter();
 	 */
 	public function disableCenter();
 
+	/**
+	 * Get the map locate user status.
+	 *
+	 * @return boolean
+	 */
+	public function getLocate();
+
+	/**
+	 * Enable locate user position on maps.
+	 *
+	 * @return void
+	 */
+	public function enableLocate();
+
+	/**
+	 * Disable locate user position on maps.
+	 *
+	 * @return void
+	 */
+	public function disableLocate();
+
 	/**
 	 * Get the map UI status.
 	 *
diff --git a/src/Cornford/Googlmapper/MapperBase.php b/src/Cornford/Googlmapper/MapperBase.php
index e9c9d36..963521a 100644
--- a/src/Cornford/Googlmapper/MapperBase.php
+++ b/src/Cornford/Googlmapper/MapperBase.php
@@ -24,6 +24,8 @@ abstract class MapperBase implements MappingBaseInterface
 
 	const CENTER = true;
 
+	const LOCATE = false;
+
 	const ZOOM = 8;
 	const SCROLL_WHEEL_ZOOM = true;
 
@@ -508,6 +510,13 @@ abstract class MapperBase implements MappingBaseInterface
 	 */
 	protected $center;
 
+	/**
+	 * Locate users location.
+	 *
+	 * @var boolean
+	 */
+	protected $locate;
+
 	/**
 	 * Show map UI.
 	 *
@@ -668,6 +677,7 @@ public function __construct(View $view, array $options = [])
 		$this->setUser(isset($options['user']) ? $options['user'] : self::USER);
 		$this->setMarker(isset($options['marker']) ? $options['marker'] : self::MARKER);
 		$this->setCenter(isset($options['center']) ? $options['center'] : self::CENTER);
+		$this->setLocate(isset($options['locate']) ? $options['locate'] : self::LOCATE);
 		$this->setZoom(isset($options['zoom']) ? $options['zoom'] : self::ZOOM);
 		$this->setScrollWheelZoom(isset($options['scrollWheelZoom']) ? $options['scrollWheelZoom'] : self::SCROLL_WHEEL_ZOOM);
 		$this->setType(isset($options['type']) ? $options['type'] : self::TYPE_ROADMAP);
@@ -977,6 +987,54 @@ public function disableCenter()
 		$this->setCenter(false);
 	}
 
+	/**
+	 * Set the map locate user status.
+	 *
+	 * @param boolean $value
+	 *
+	 * @throws MapperArgumentException
+	 *
+	 * @return void
+	 */
+	protected function setLocate($value)
+	{
+		if (!is_bool($value)) {
+			throw new MapperArgumentException('Invalid map locate setting.');
+		}
+
+		$this->locate = $value;
+	}
+
+	/**
+	 * Get the map locate user status.
+	 *
+	 * @return boolean
+	 */
+	public function getLocate()
+	{
+		return $this->locate;
+	}
+
+	/**
+	 * Enable locate user position on maps.
+	 *
+	 * @return void
+	 */
+	public function enableLocate()
+	{
+		$this->setLocate(true);
+	}
+
+	/**
+	 * Disable locate user position on maps.
+	 *
+	 * @return void
+	 */
+	public function disableLocate()
+	{
+		$this->setLocate(false);
+	}
+
 	/**
 	 * Set the map UI status.
 	 *
@@ -1399,6 +1457,7 @@ protected function getOptions()
 			'user' => $this->getUser(),
 			'marker' => $this->getMarker(),
 			'center' => $this->getCenter(),
+			'locate' => $this->getLocate(),
 			'zoom' => $this->getZoom(),
 			'scrollWheelZoom' => $this->getScrollWheelZoom(),
 			'type' => $this->getType(),
diff --git a/src/config/config.php b/src/config/config.php
index c9e419e..e89bf0b 100644
--- a/src/config/config.php
+++ b/src/config/config.php
@@ -74,6 +74,17 @@
     */
     'center' => true,
 
+    /*
+    |--------------------------------------------------------------------------
+    | Locate Users Location
+    |--------------------------------------------------------------------------
+    |
+    | Automatically center the Googlmapper displayed map on the users current
+    | location.
+    |
+    */
+    'locate' => false,
+
     /*
     |--------------------------------------------------------------------------
     | Default Zoom
diff --git a/src/views/map.blade.php b/src/views/map.blade.php
index 936b4f4..d901cea 100644
--- a/src/views/map.blade.php
+++ b/src/views/map.blade.php
@@ -52,6 +52,14 @@ function initialize_{!! $id !!}() {
 			@if (!$options['center'])
 				map_{!! $id !!}.fitBounds(bounds);
 			@endif
+
+			@if ($options['locate'])
+				if (typeof navigator !== 'undefined' && navigator.geolocation) {
+					navigator.geolocation.getCurrentPosition(function (position) {
+						map_{!! $id !!}.setCenter(new google.maps.LatLng(position.coords.latitude, position.coords.longitude));
+					});
+				}
+			@endif
 		});
 
 		@if (isset($options['eventBeforeLoad']))

From 876e3b174e4ee0707af89fdbe6297032b04441df Mon Sep 17 00:00:00 2001
From: Bradley Cornford <bradley.cornford@skybettingandgaming.com>
Date: Tue, 26 Jul 2016 08:37:47 +0100
Subject: [PATCH 36/40] Fixing PHPSpec test for location searching.

---
 spec/Cornford/Googlmapper/MapperSpec.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spec/Cornford/Googlmapper/MapperSpec.php b/spec/Cornford/Googlmapper/MapperSpec.php
index 8806a82..9ff101a 100644
--- a/spec/Cornford/Googlmapper/MapperSpec.php
+++ b/spec/Cornford/Googlmapper/MapperSpec.php
@@ -8,6 +8,7 @@ class MapperSpec extends ObjectBehavior
 {
 
 	const STRING = 'test';
+	const LOCATION = 'Sheffield, United Kingdom';
 	const INTEGER = 10;
 	const BOOLEAN = false;
 
@@ -46,7 +47,7 @@ public function it_throws_an_exception_with_incorrect_options()
 
 	public function it_can_return_a_location_when_a_location_is_searched()
 	{
-		$this->location(self::STRING)->shouldReturnAnInstanceOf('Cornford\Googlmapper\Models\Location');
+		$this->location(self::LOCATION)->shouldReturnAnInstanceOf('Cornford\Googlmapper\Models\Location');
 	}
 
 	public function it_can_throws_an_exception_when_a_blank_location_is_searched()

From dba43950c876ffd98b48022bf142e3d4166f6c4c Mon Sep 17 00:00:00 2001
From: Bradley Cornford <bradley.cornford@skybettingandgaming.com>
Date: Tue, 26 Jul 2016 08:41:26 +0100
Subject: [PATCH 37/40] Removing duplicate map events.

---
 README.md | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/README.md b/README.md
index ac45c91..dbd2c67 100644
--- a/README.md
+++ b/README.md
@@ -112,20 +112,6 @@ This event is fired before the map is loaded.
 
 **After Load**
 
-This event is fired after the map is loaded.
-
-	Mapper::map(53.381128999999990000, -1.470085000000040000, ['eventAfterLoad' => 'console.log("after load");']);
-
-##### Map Events
-
-**Before Load**
-
-This event is fired before the map is loaded.
-
-	Mapper::map(53.381128999999990000, -1.470085000000040000, ['eventBeforeLoad' => 'console.log("before load");']);
-
-**After Load**
-
 This event is fired after the map is loaded.
 
 	Mapper::map(53.381128999999990000, -1.470085000000040000, ['eventAfterLoad' => 'console.log("after load");']);

From e327a7cc01d382922aa6112c77b2fea8d78bc321 Mon Sep 17 00:00:00 2001
From: Bradley Cornford <bradley.cornford@skybettingandgaming.com>
Date: Wed, 27 Jul 2016 09:02:41 +0100
Subject: [PATCH 38/40] Adding an array of the maps current shapes into a
 maps.shapes array.

---
 src/views/circle.blade.php    | 6 +++++-
 src/views/map.blade.php       | 4 +++-
 src/views/polygon.blade.php   | 4 ++++
 src/views/polyline.blade.php  | 6 +++++-
 src/views/rectangle.blade.php | 4 ++++
 5 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/views/circle.blade.php b/src/views/circle.blade.php
index 2425d13..3ebd7f8 100644
--- a/src/views/circle.blade.php
+++ b/src/views/circle.blade.php
@@ -15,4 +15,8 @@
 	editable: {!! $options['editable'] ? 'true' : 'false' !!}
 });
 
-circle_{!! $id !!}.setMap({!! $options['map'] !!});
\ No newline at end of file
+circle_{!! $id !!}.setMap({!! $options['map'] !!});
+
+shapes.push({
+	'circle_{!! $id !!}': circle_{!! $id !!}
+});
\ No newline at end of file
diff --git a/src/views/map.blade.php b/src/views/map.blade.php
index d901cea..1fbd61b 100644
--- a/src/views/map.blade.php
+++ b/src/views/map.blade.php
@@ -22,6 +22,7 @@ function initialize_{!! $id !!}() {
 		map_{!! $id !!}.setTilt({!! $options['tilt'] !!});
 
 		var markers = [];
+		var shapes = [];
 
 		@foreach ($options['markers'] as $key => $marker)
 			{!! $marker->render($key, $view) !!}
@@ -86,7 +87,8 @@ function initialize_{!! $id !!}() {
 		maps.push({
 			key: {!! $id !!},
 			markers: markers,
-			map: map_{!! $id !!}
+			map: map_{!! $id !!},
+			shapes: shapes
 		});
 	}
 
diff --git a/src/views/polygon.blade.php b/src/views/polygon.blade.php
index 6b24f94..3c7030c 100644
--- a/src/views/polygon.blade.php
+++ b/src/views/polygon.blade.php
@@ -15,3 +15,7 @@
 });
 
 polygon_{!! $id !!}.setMap({!! $options['map'] !!});
+
+shapes.push({
+	'polygon_{!! $id !!}': polygon_{!! $id !!}
+});
\ No newline at end of file
diff --git a/src/views/polyline.blade.php b/src/views/polyline.blade.php
index e536213..1b4b5e9 100644
--- a/src/views/polyline.blade.php
+++ b/src/views/polyline.blade.php
@@ -13,4 +13,8 @@
 	editable: {!! $options['editable'] ? 'true' : 'false' !!}
 });
 
-polyline_{!! $id !!}.setMap({!! $options['map'] !!});
\ No newline at end of file
+polyline_{!! $id !!}.setMap({!! $options['map'] !!});
+
+shapes.push({
+	'polyline_{!! $id !!}': polyline_{!! $id !!}
+});
\ No newline at end of file
diff --git a/src/views/rectangle.blade.php b/src/views/rectangle.blade.php
index 832ac80..1f354e3 100644
--- a/src/views/rectangle.blade.php
+++ b/src/views/rectangle.blade.php
@@ -15,3 +15,7 @@
 });
 
 rectangle_{!! $id !!}.setMap({!! $options['map'] !!});
+
+shapes.push({
+	'rectangle_{!! $id !!}': rectangle_{!! $id !!}
+});
\ No newline at end of file

From 11c7b0d289fa05f4d97df828e4e59341a316c1ff Mon Sep 17 00:00:00 2001
From: Bradley Cornford <bradley.cornford@skybettingandgaming.com>
Date: Thu, 18 Aug 2016 08:40:58 +0100
Subject: [PATCH 39/40] Adding option 'fullscreenControl' to allow toggiling
 control of the fullscreen control.

---
 .../Contracts/MappingBaseInterface.php        | 149 ++++++++++++++++++
 .../Contracts/MappingInterface.php            |  20 +++
 .../Contracts/ObjectableInterface.php         |   2 -
 src/Cornford/Googlmapper/MapperBase.php       |  40 +++++
 src/config/config.php                         |  10 ++
 src/views/map.blade.php                       |   3 +-
 6 files changed, 221 insertions(+), 3 deletions(-)

diff --git a/src/Cornford/Googlmapper/Contracts/MappingBaseInterface.php b/src/Cornford/Googlmapper/Contracts/MappingBaseInterface.php
index 7af864d..cbb7016 100644
--- a/src/Cornford/Googlmapper/Contracts/MappingBaseInterface.php
+++ b/src/Cornford/Googlmapper/Contracts/MappingBaseInterface.php
@@ -1,5 +1,7 @@
 <?php namespace Cornford\Googlmapper\Contracts;
 
+use Cornford\Googlmapper\Exceptions\MapperArgumentException;
+
 interface MappingBaseInterface {
 
 	/**
@@ -200,6 +202,42 @@ public function setZoom($zoom);
 	 */
 	public function getZoom();
 
+	/**
+	 * Set map scroll wheel zoom.
+	 *
+	 * @param boolean $value
+	 *
+	 * @throws MapperArgumentException
+	 *
+	 * @return void
+	 */
+	public function setScrollWheelZoom($value);
+
+	/**
+	 * Get map scroll wheel zoom.
+	 *
+	 * @return boolean
+	 */
+	public function getScrollWheelZoom();
+
+	/**
+	 * Set map fullscreen control.
+	 *
+	 * @param boolean $value
+	 *
+	 * @throws MapperArgumentException
+	 *
+	 * @return void
+	 */
+	public function setFullscreenControl($value);
+
+	/**
+	 * Get map fullscreen control.
+	 *
+	 * @return boolean
+	 */
+	public function getFullscreenControl();
+
 	/**
 	 * Set map type.
 	 *
@@ -272,6 +310,117 @@ public function setAnimation($value);
 	 */
 	public function getAnimation();
 
+	/**
+	 * Get the cluster status.
+	 *
+	 * @return boolean
+	 */
+	public function getCluster();
+
+	/**
+	 * Enable cluster.
+	 *
+	 * @return void
+	 */
+	public function enableCluster();
+
+	/**
+	 * Disable cluster.
+	 *
+	 * @return void
+	 */
+	public function disableCluster();
+
+	/**
+	 * Set map cluster icon.
+	 *
+	 * @param string $value
+	 *
+	 * @throws MapperArgumentException
+	 *
+	 * @return void
+	 */
+	public function setClustersIcon($value);
+
+	/**
+	 * Get map clusters icon.
+	 *
+	 * @return string
+	 */
+	public function getClustersIcon();
+
+	/**
+	 * Set map cluster grid.
+	 *
+	 * @param integer $value
+	 *
+	 * @throws MapperArgumentException
+	 *
+	 * @return void
+	 */
+	public function setClustersGrid($value);
+
+	/**
+	 * Get map cluster grid.
+	 *
+	 * @return integer
+	 */
+	public function getClustersGrid();
+
+	/**
+	 * Set map cluster zoom.
+	 *
+	 * @param integer|null $value
+	 *
+	 * @throws MapperArgumentException
+	 *
+	 * @return void
+	 */
+	public function setClustersZoom($value);
+
+	/**
+	 * Get map cluster grid.
+	 *
+	 * @return integer|null
+	 */
+	public function getClustersZoom();
+
+	/**
+	 * Set map cluster center.
+	 *
+	 * @param boolean $value
+	 *
+	 * @throws MapperArgumentException
+	 *
+	 * @return void
+	 */
+	public function setClustersCenter($value);
+
+	/**
+	 * Get map cluster center.
+	 *
+	 * @return boolean
+	 */
+	public function getClustersCenter();
+
+	/**
+	 * Set map cluster size.
+	 *
+	 * @param integer $value
+	 *
+	 * @throws MapperArgumentException
+	 *
+	 * @return void
+	 */
+	public function setClustersSize($value);
+
+	/**
+	 * Get map cluster size.
+	 *
+	 * @return integer
+	 */
+	public function getClustersSize();
+
 	/**
 	 * Get the mapping items.
 	 *
diff --git a/src/Cornford/Googlmapper/Contracts/MappingInterface.php b/src/Cornford/Googlmapper/Contracts/MappingInterface.php
index 5397e3e..38d6410 100644
--- a/src/Cornford/Googlmapper/Contracts/MappingInterface.php
+++ b/src/Cornford/Googlmapper/Contracts/MappingInterface.php
@@ -1,5 +1,11 @@
 <?php namespace Cornford\Googlmapper\Contracts;
 
+use Cornford\Googlmapper\Exceptions\MapperArgumentException;
+use Cornford\Googlmapper\Exceptions\MapperException;
+use Cornford\Googlmapper\Exceptions\MapperSearchException;
+use Cornford\Googlmapper\Exceptions\MapperSearchResultException;
+use Cornford\Googlmapper\Models\Location;
+
 interface MappingInterface {
 
     /**
@@ -11,6 +17,20 @@ interface MappingInterface {
      */
     public function render($item = -1);
 
+    /**
+     * Locate a location and return a Location instance.
+     *
+     * @param string $location
+     *
+     * @throws MapperArgumentException
+     * @throws MapperSearchException
+     * @throws MapperSearchResultException
+     * @throws MapperException
+     *
+     * @return Location
+     */
+    public function location($location);
+
     /**
      * Add a new map.
      *
diff --git a/src/Cornford/Googlmapper/Contracts/ObjectableInterface.php b/src/Cornford/Googlmapper/Contracts/ObjectableInterface.php
index c6849f6..a1eb497 100644
--- a/src/Cornford/Googlmapper/Contracts/ObjectableInterface.php
+++ b/src/Cornford/Googlmapper/Contracts/ObjectableInterface.php
@@ -1,7 +1,5 @@
 <?php namespace Cornford\Googlmapper\Contracts;
 
-use Illuminate\View\Factory as View;
-
 interface ObjectableInterface {
 
 	/**
diff --git a/src/Cornford/Googlmapper/MapperBase.php b/src/Cornford/Googlmapper/MapperBase.php
index 963521a..a48da40 100644
--- a/src/Cornford/Googlmapper/MapperBase.php
+++ b/src/Cornford/Googlmapper/MapperBase.php
@@ -29,6 +29,8 @@ abstract class MapperBase implements MappingBaseInterface
 	const ZOOM = 8;
 	const SCROLL_WHEEL_ZOOM = true;
 
+	const FULLSCREEN_CONTROL = true;
+
 	const TILT = 90;
 
 	const UI = true;
@@ -538,6 +540,13 @@ abstract class MapperBase implements MappingBaseInterface
 	 */
 	protected $scrollWheelZoom;
 
+	/**
+	 * Map fullscreen zoom.
+	 *
+	 * @var boolean
+	 */
+	protected $fullscreenControl;
+
 	/**
 	 * Map type.
 	 *
@@ -680,6 +689,7 @@ public function __construct(View $view, array $options = [])
 		$this->setLocate(isset($options['locate']) ? $options['locate'] : self::LOCATE);
 		$this->setZoom(isset($options['zoom']) ? $options['zoom'] : self::ZOOM);
 		$this->setScrollWheelZoom(isset($options['scrollWheelZoom']) ? $options['scrollWheelZoom'] : self::SCROLL_WHEEL_ZOOM);
+		$this->setFullscreenControl(isset($options['fullscreenControl']) ? $options['fullscreenControl'] : self::FULLSCREEN_CONTROL);
 		$this->setType(isset($options['type']) ? $options['type'] : self::TYPE_ROADMAP);
 		$this->setTilt(isset($options['tilt']) ? $options['tilt'] : self::TILT);
 		$this->setUi(isset($options['ui']) ? $options['ui'] : self::UI);
@@ -1143,6 +1153,34 @@ public function getScrollWheelZoom()
 		return $this->scrollWheelZoom;
 	}
 
+	/**
+	 * Set map fullscreen control.
+	 *
+	 * @param boolean $value
+	 *
+	 * @throws MapperArgumentException
+	 *
+	 * @return void
+	 */
+	public function setFullscreenControl($value)
+	{
+		if (!is_bool($value)) {
+			throw new MapperArgumentException('Fullscreen control must be a boolean.');
+		}
+
+		$this->fullscreenControl = $value;
+	}
+
+	/**
+	 * Get map fullscreen control.
+	 *
+	 * @return boolean
+	 */
+	public function getFullscreenControl()
+	{
+		return $this->fullscreenControl;
+	}
+
 	/**
 	 * Set map type.
 	 *
@@ -1254,6 +1292,7 @@ public function getAnimation()
 	{
 		return $this->animation;
 	}
+
 	/**
 	 * Set cluster status.
 	 *
@@ -1460,6 +1499,7 @@ protected function getOptions()
 			'locate' => $this->getLocate(),
 			'zoom' => $this->getZoom(),
 			'scrollWheelZoom' => $this->getScrollWheelZoom(),
+			'fullscreenControl' => $this->getFullscreenControl(),
 			'type' => $this->getType(),
 			'tilt' => $this->getTilt(),
 			'ui' => $this->getUi(),
diff --git a/src/config/config.php b/src/config/config.php
index e89bf0b..49721dc 100644
--- a/src/config/config.php
+++ b/src/config/config.php
@@ -105,6 +105,16 @@
     */
     'scrollWheelZoom' => true,
 
+    /*
+    |--------------------------------------------------------------------------
+    | Fullscreen Control
+    |--------------------------------------------------------------------------
+    |
+    | Set if fullscreen control should be displayed by Googlmapper.
+    |
+    */
+    'fullscreenControl' => true,
+
     /*
     |--------------------------------------------------------------------------
     | Map Type
diff --git a/src/views/map.blade.php b/src/views/map.blade.php
index 1fbd61b..bacd9d2 100644
--- a/src/views/map.blade.php
+++ b/src/views/map.blade.php
@@ -15,7 +15,8 @@ function initialize_{!! $id !!}() {
 			@endif
 			mapTypeId: google.maps.MapTypeId.{!! $options['type'] !!},
 			disableDefaultUI: @if (!$options['ui']) true @else false @endif,
-			scrollwheel: @if ($options['scrollWheelZoom']) true @else false @endif
+			scrollwheel: @if ($options['scrollWheelZoom']) true @else false @endif,
+			fullscreenControl: @if ($options['fullscreenControl']) true @else false @endif,
 		};
 
 		var map_{!! $id !!} = new google.maps.Map(document.getElementById('map-canvas-{!! $id !!}'), mapOptions_{!! $id !!});

From 80da5974c3f2c436ec5188c304edf9021987b6fa Mon Sep 17 00:00:00 2001
From: Bradley Cornford <bradley.cornford@skybettingandgaming.com>
Date: Thu, 18 Aug 2016 08:40:58 +0100
Subject: [PATCH 40/40] Adding option 'fullscreenControl' to allow toggiling
 control of the fullscreen control.

---
 README.md                                     |   1 +
 .../Contracts/MappingBaseInterface.php        | 149 ++++++++++++++++++
 .../Contracts/MappingInterface.php            |  20 +++
 .../Contracts/ObjectableInterface.php         |   2 -
 src/Cornford/Googlmapper/MapperBase.php       |  40 +++++
 src/config/config.php                         |  10 ++
 src/views/map.blade.php                       |   3 +-
 7 files changed, 222 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index dbd2c67..258f0a6 100644
--- a/README.md
+++ b/README.md
@@ -62,6 +62,7 @@ You can now configure Googlmapper in a few simple steps. Open `app/config/packag
 - `locate` - Automatically center Google Maps around the users current location, when false, Google Maps will automatically center the map, e.g. true.
 - `zoom` - Set the default zoom level for Google Maps, e.g. 8.
 - `scrollWheelZoom` - Set the default scroll wheel zoom Google Maps, e.g. true.
+- `fullscreenControl` - Set the default fullscreen control for Google Maps, e.g. true.
 - `type` - Set the default map type for Google Maps, e.g. ROADMAP, SATELLITE, HYBRID, TERRAIN.
 - `ui` - Show the Google Maps default UI options, e.g. true.
 - `markers.icon` - Set the default marker icon, e.g. img/icon.png.
diff --git a/src/Cornford/Googlmapper/Contracts/MappingBaseInterface.php b/src/Cornford/Googlmapper/Contracts/MappingBaseInterface.php
index 7af864d..cbb7016 100644
--- a/src/Cornford/Googlmapper/Contracts/MappingBaseInterface.php
+++ b/src/Cornford/Googlmapper/Contracts/MappingBaseInterface.php
@@ -1,5 +1,7 @@
 <?php namespace Cornford\Googlmapper\Contracts;
 
+use Cornford\Googlmapper\Exceptions\MapperArgumentException;
+
 interface MappingBaseInterface {
 
 	/**
@@ -200,6 +202,42 @@ public function setZoom($zoom);
 	 */
 	public function getZoom();
 
+	/**
+	 * Set map scroll wheel zoom.
+	 *
+	 * @param boolean $value
+	 *
+	 * @throws MapperArgumentException
+	 *
+	 * @return void
+	 */
+	public function setScrollWheelZoom($value);
+
+	/**
+	 * Get map scroll wheel zoom.
+	 *
+	 * @return boolean
+	 */
+	public function getScrollWheelZoom();
+
+	/**
+	 * Set map fullscreen control.
+	 *
+	 * @param boolean $value
+	 *
+	 * @throws MapperArgumentException
+	 *
+	 * @return void
+	 */
+	public function setFullscreenControl($value);
+
+	/**
+	 * Get map fullscreen control.
+	 *
+	 * @return boolean
+	 */
+	public function getFullscreenControl();
+
 	/**
 	 * Set map type.
 	 *
@@ -272,6 +310,117 @@ public function setAnimation($value);
 	 */
 	public function getAnimation();
 
+	/**
+	 * Get the cluster status.
+	 *
+	 * @return boolean
+	 */
+	public function getCluster();
+
+	/**
+	 * Enable cluster.
+	 *
+	 * @return void
+	 */
+	public function enableCluster();
+
+	/**
+	 * Disable cluster.
+	 *
+	 * @return void
+	 */
+	public function disableCluster();
+
+	/**
+	 * Set map cluster icon.
+	 *
+	 * @param string $value
+	 *
+	 * @throws MapperArgumentException
+	 *
+	 * @return void
+	 */
+	public function setClustersIcon($value);
+
+	/**
+	 * Get map clusters icon.
+	 *
+	 * @return string
+	 */
+	public function getClustersIcon();
+
+	/**
+	 * Set map cluster grid.
+	 *
+	 * @param integer $value
+	 *
+	 * @throws MapperArgumentException
+	 *
+	 * @return void
+	 */
+	public function setClustersGrid($value);
+
+	/**
+	 * Get map cluster grid.
+	 *
+	 * @return integer
+	 */
+	public function getClustersGrid();
+
+	/**
+	 * Set map cluster zoom.
+	 *
+	 * @param integer|null $value
+	 *
+	 * @throws MapperArgumentException
+	 *
+	 * @return void
+	 */
+	public function setClustersZoom($value);
+
+	/**
+	 * Get map cluster grid.
+	 *
+	 * @return integer|null
+	 */
+	public function getClustersZoom();
+
+	/**
+	 * Set map cluster center.
+	 *
+	 * @param boolean $value
+	 *
+	 * @throws MapperArgumentException
+	 *
+	 * @return void
+	 */
+	public function setClustersCenter($value);
+
+	/**
+	 * Get map cluster center.
+	 *
+	 * @return boolean
+	 */
+	public function getClustersCenter();
+
+	/**
+	 * Set map cluster size.
+	 *
+	 * @param integer $value
+	 *
+	 * @throws MapperArgumentException
+	 *
+	 * @return void
+	 */
+	public function setClustersSize($value);
+
+	/**
+	 * Get map cluster size.
+	 *
+	 * @return integer
+	 */
+	public function getClustersSize();
+
 	/**
 	 * Get the mapping items.
 	 *
diff --git a/src/Cornford/Googlmapper/Contracts/MappingInterface.php b/src/Cornford/Googlmapper/Contracts/MappingInterface.php
index 5397e3e..38d6410 100644
--- a/src/Cornford/Googlmapper/Contracts/MappingInterface.php
+++ b/src/Cornford/Googlmapper/Contracts/MappingInterface.php
@@ -1,5 +1,11 @@
 <?php namespace Cornford\Googlmapper\Contracts;
 
+use Cornford\Googlmapper\Exceptions\MapperArgumentException;
+use Cornford\Googlmapper\Exceptions\MapperException;
+use Cornford\Googlmapper\Exceptions\MapperSearchException;
+use Cornford\Googlmapper\Exceptions\MapperSearchResultException;
+use Cornford\Googlmapper\Models\Location;
+
 interface MappingInterface {
 
     /**
@@ -11,6 +17,20 @@ interface MappingInterface {
      */
     public function render($item = -1);
 
+    /**
+     * Locate a location and return a Location instance.
+     *
+     * @param string $location
+     *
+     * @throws MapperArgumentException
+     * @throws MapperSearchException
+     * @throws MapperSearchResultException
+     * @throws MapperException
+     *
+     * @return Location
+     */
+    public function location($location);
+
     /**
      * Add a new map.
      *
diff --git a/src/Cornford/Googlmapper/Contracts/ObjectableInterface.php b/src/Cornford/Googlmapper/Contracts/ObjectableInterface.php
index c6849f6..a1eb497 100644
--- a/src/Cornford/Googlmapper/Contracts/ObjectableInterface.php
+++ b/src/Cornford/Googlmapper/Contracts/ObjectableInterface.php
@@ -1,7 +1,5 @@
 <?php namespace Cornford\Googlmapper\Contracts;
 
-use Illuminate\View\Factory as View;
-
 interface ObjectableInterface {
 
 	/**
diff --git a/src/Cornford/Googlmapper/MapperBase.php b/src/Cornford/Googlmapper/MapperBase.php
index 963521a..a48da40 100644
--- a/src/Cornford/Googlmapper/MapperBase.php
+++ b/src/Cornford/Googlmapper/MapperBase.php
@@ -29,6 +29,8 @@ abstract class MapperBase implements MappingBaseInterface
 	const ZOOM = 8;
 	const SCROLL_WHEEL_ZOOM = true;
 
+	const FULLSCREEN_CONTROL = true;
+
 	const TILT = 90;
 
 	const UI = true;
@@ -538,6 +540,13 @@ abstract class MapperBase implements MappingBaseInterface
 	 */
 	protected $scrollWheelZoom;
 
+	/**
+	 * Map fullscreen zoom.
+	 *
+	 * @var boolean
+	 */
+	protected $fullscreenControl;
+
 	/**
 	 * Map type.
 	 *
@@ -680,6 +689,7 @@ public function __construct(View $view, array $options = [])
 		$this->setLocate(isset($options['locate']) ? $options['locate'] : self::LOCATE);
 		$this->setZoom(isset($options['zoom']) ? $options['zoom'] : self::ZOOM);
 		$this->setScrollWheelZoom(isset($options['scrollWheelZoom']) ? $options['scrollWheelZoom'] : self::SCROLL_WHEEL_ZOOM);
+		$this->setFullscreenControl(isset($options['fullscreenControl']) ? $options['fullscreenControl'] : self::FULLSCREEN_CONTROL);
 		$this->setType(isset($options['type']) ? $options['type'] : self::TYPE_ROADMAP);
 		$this->setTilt(isset($options['tilt']) ? $options['tilt'] : self::TILT);
 		$this->setUi(isset($options['ui']) ? $options['ui'] : self::UI);
@@ -1143,6 +1153,34 @@ public function getScrollWheelZoom()
 		return $this->scrollWheelZoom;
 	}
 
+	/**
+	 * Set map fullscreen control.
+	 *
+	 * @param boolean $value
+	 *
+	 * @throws MapperArgumentException
+	 *
+	 * @return void
+	 */
+	public function setFullscreenControl($value)
+	{
+		if (!is_bool($value)) {
+			throw new MapperArgumentException('Fullscreen control must be a boolean.');
+		}
+
+		$this->fullscreenControl = $value;
+	}
+
+	/**
+	 * Get map fullscreen control.
+	 *
+	 * @return boolean
+	 */
+	public function getFullscreenControl()
+	{
+		return $this->fullscreenControl;
+	}
+
 	/**
 	 * Set map type.
 	 *
@@ -1254,6 +1292,7 @@ public function getAnimation()
 	{
 		return $this->animation;
 	}
+
 	/**
 	 * Set cluster status.
 	 *
@@ -1460,6 +1499,7 @@ protected function getOptions()
 			'locate' => $this->getLocate(),
 			'zoom' => $this->getZoom(),
 			'scrollWheelZoom' => $this->getScrollWheelZoom(),
+			'fullscreenControl' => $this->getFullscreenControl(),
 			'type' => $this->getType(),
 			'tilt' => $this->getTilt(),
 			'ui' => $this->getUi(),
diff --git a/src/config/config.php b/src/config/config.php
index e89bf0b..49721dc 100644
--- a/src/config/config.php
+++ b/src/config/config.php
@@ -105,6 +105,16 @@
     */
     'scrollWheelZoom' => true,
 
+    /*
+    |--------------------------------------------------------------------------
+    | Fullscreen Control
+    |--------------------------------------------------------------------------
+    |
+    | Set if fullscreen control should be displayed by Googlmapper.
+    |
+    */
+    'fullscreenControl' => true,
+
     /*
     |--------------------------------------------------------------------------
     | Map Type
diff --git a/src/views/map.blade.php b/src/views/map.blade.php
index 1fbd61b..bacd9d2 100644
--- a/src/views/map.blade.php
+++ b/src/views/map.blade.php
@@ -15,7 +15,8 @@ function initialize_{!! $id !!}() {
 			@endif
 			mapTypeId: google.maps.MapTypeId.{!! $options['type'] !!},
 			disableDefaultUI: @if (!$options['ui']) true @else false @endif,
-			scrollwheel: @if ($options['scrollWheelZoom']) true @else false @endif
+			scrollwheel: @if ($options['scrollWheelZoom']) true @else false @endif,
+			fullscreenControl: @if ($options['fullscreenControl']) true @else false @endif,
 		};
 
 		var map_{!! $id !!} = new google.maps.Map(document.getElementById('map-canvas-{!! $id !!}'), mapOptions_{!! $id !!});