⬆️ Upgrade to be compatible with SS4

_config.php

@@ -1,14 +1 @@
 <?php
-/**
- * Developed by http://www.i-lateral.com/ and loosley based on the module provided by
- * www.sunnysideup.co.nz
- *
- * @author: Nicolaas - modules [at] sunnysideup.co.nz
- * @author: Mo - morven [at] i-lateral.com
- *
-**/
-
-// Add extensions
-Object::add_extension('SiteConfig', 'GoogleMapSiteConfig');
-Object::add_extension('SiteTree', 'GoogleMapSiteTree');
-Object::add_extension('ContentController', 'GoogleMapController');

_config/config.yml

@@ -0,0 +1,12 @@
+---
+name: googlemaps
+---
+SilverStripe\Control\Controller:
+  extensions:
+    - 'ilateral\SilverStripe\GoogleMaps\Extensions\ControllerExtension'
+SilverStripe\CMS\Model\SiteTree:
+  extensions:
+    - 'ilateral\SilverStripe\GoogleMaps\Extensions\GoogleMapsExtension'
+SilverStripe\SiteConfig\SiteConfig:
+  extensions:
+    - 'ilateral\SilverStripe\GoogleMaps\Extensions\SiteConfigExtension'

_config/legacy.yml

@@ -0,0 +1,6 @@
+---
+Name: googlemapslegacy
+---
+SilverStripe\ORM\DatabaseAdmin:
+  classname_value_remapping:
+    GoogleMap: ilateral\SilverStripe\CustomMenus\Model\GoogleMap

javascript/gmap3.js → client/thirdparty/javascript/gmap3.js

@@ -1,7 +1,7 @@
 /*!
  *  GMAP3 Plugin for jQuery
- *  Version  : 7.1
- *  Date     : 2016/04/17
+ *  Version  : 7.2
+ *  Date     : 2016/12/03
  *  Author   : DEMONTE Jean-Baptiste
  *  Contact  : jbdemonte@gmail.com
  *  Web site : http://gmap3.net
@@ -89,7 +89,7 @@
   }
 
   function ready(fn) {
-    if (document.readyState != 'loading'){
+    if (document.readyState != 'loading') {
       fn();
     } else {
       document.addEventListener('DOMContentLoaded', fn);
@@ -103,7 +103,7 @@
   }
 
   // Auto-load google maps library if needed
-  (function () {
+  when(function () {
     var dfd = deferred(),
       cbName = '__gmap3',
       script;
@@ -126,8 +126,8 @@
       }
     });
 
-    return dfd.promise();
-  })().then(function () {
+    return dfd;
+  }()).then(function () {
     $.holdReady(false);
   });
 
@@ -172,11 +172,11 @@
         address: request
       };
     }
-    service('Geocoder').geocode(request, function(results, status) {
+    service('Geocoder').geocode(request, function (results, status) {
       if (status === gm.GeocoderStatus.OK) {
         dfd.resolve(results[0].geometry.location);
       } else {
-        dfd.reject();
+        dfd.reject(status);
       }
     });
     return dfd;
@@ -194,7 +194,7 @@
    * @param {StringCallback} fn - Callback function
    */
   function foreachStr(str, fn) {
-    str.split(' ').forEach(fn);
+    foreach(str.split(' '), fn);
   }
 
   /**
@@ -263,13 +263,16 @@
         if (address) {
           delete options.address;
           return geocode(address).then(function (latLng) {
-            options[key] = latLng;
-          });
+              options[key] = latLng;
+            });
         }
         options[key] = toLatLng(options[key]);
       })
       .then(function () {
         dfd.resolve(fn(options));
+      })
+      .fail(function (reason) {
+        dfd.reject(reason);
       });
     return dfd;
   }
@@ -284,9 +287,7 @@
    */
   function resolveArrayOfLatLng(options, key, fn) {
     options = dupOpts(options);
-    options[key] = (options[key] || []).map(function (item) {
-      return toLatLng(item);
-    });
+    options[key] = (options[key] || []).map(toLatLng);
     return resolved(fn(options));
   }
 
@@ -388,7 +389,7 @@
           self.draw();
         };
 
-        self.draw = function() {
+        self.draw = function () {
           var sw = fromLatLngToDivPixel(options.bounds.getSouthWest());
           var ne = fromLatLngToDivPixel(options.bounds.getNorthEast());
 
@@ -840,7 +841,7 @@
       $.each(events, function (eventName, handlers) {
         foreach(instances, function (instance) {
           var isClusterOverlay = instance instanceof ClusterOverlay;
-          var isDom = isClusterOverlay || (instance instanceof gm.OverlayView);
+          var isDom = isClusterOverlay || (instance instanceof gm.OverlayView);
           var eventListener = isDom ? instance.$.get(0) : instance;
           gm.event['add' + (isDom ? 'Dom' : '') + 'Listener' + (once ? 'Once' : '')](eventListener, eventName, function (event) {
             foreach(handlers, function (handler) {
@@ -892,7 +893,7 @@
     /**
      * Decorator to chain promise result onto the main promise chain
      * @param {Function} fn
-     * @returns {Deferred}
+     * @returns {Function}
      */
     function chainToPromise(fn) {
       return function () {
@@ -1085,6 +1086,15 @@
       }
     };
 
+    self.catch = function (fn) {
+      if (isFunction(fn)) {
+        promise = promise
+          .then(null, function (reason) {
+            return when(fn.call(context(), reason));
+          });
+      }
+    };
+
     foreachStr('on once', function (name, once) {
       self[name] = function () {
         var events = arguments[0];
@@ -1128,4 +1138,4 @@
     }
   }
 
-})(jQuery, window, document);
+})(jQuery, window, document);

composer.json

@@ -1,7 +1,7 @@
 {
-  "name": "i-lateral/silverstripe-googlemaps",
-  "description": "A module to allow embeding of google maps inside page objects",
-	"type": "silverstripe-module",
+  	"name": "i-lateral/silverstripe-googlemaps",
+  	"description": "A module to allow embeding of google maps inside page objects",
+	"type": "silverstripe-vendormodule",
 	"homepage": "http://github.com/i-lateral/silverstripe-googlemaps",
 	"keywords": ["silverstripe", "googlemaps"],
 	"license": "BSD-3-Clause",
@@ -15,12 +15,29 @@
 		"issues": "http://github.com/i-lateral/silverstripe-googlemaps/issues"
 	},
 	"require": {
-		"silverstripe/framework": ">=3.1",
-		"silverstripe/cms": ">=3.1",
-        "betterbrief/silverstripe-googlemapfield": "*",
-        "symbiote/silverstripe-gridfieldextensions": "~2.0"
+		"silverstripe/framework": "^4.0",
+		"silverstripe/cms": "^4.0",
+		"betterbrief/silverstripe-googlemapfield": "^2.0",
+        "symbiote/silverstripe-gridfieldextensions": "^3.1"
 	},
+	"require-dev": {
+		"phpunit/phpunit": "^5.7",
+		"silverstripe/vendor-plugin": "^1",
+		"squizlabs/php_codesniffer": "^3.0"
+	},
+	"autoload": {
+		"psr-4": {
+			"ilateral\\SilverStripe\\GoogleMaps\\": "src/"
+		}
+    },
 	"extra": {
-		"installer-name": "googlemaps"
-	}
+		"installer-name": "googlemaps",
+		"expose": [
+			"client/dist",
+			"client/lang",
+			"client/thirdparty"
+		]
+	},
+	"minimum-stability": "dev",
+	"prefer-stable": true
 }