Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / plugins / Mapstraction / MapstractionPlugin.php

diff --git a/plugins/Mapstraction/MapstractionPlugin.php b/plugins/Mapstraction/MapstractionPlugin.php
index f51b6073097b0a4c57d494717bfef175270a3b60..91e3edac406b3ef8ac79fae0f242d846f07af230 100644 (file)
--- a/plugins/Mapstraction/MapstractionPlugin.php
+++ b/plugins/Mapstraction/MapstractionPlugin.php
@@ -46,7 +46,7 @@ if (!defined('STATUSNET')) {
  */
 class MapstractionPlugin extends Plugin
 {
-    const VERSION = STATUSNET_VERSION;
+    const VERSION = GNUSOCIAL_VERSION;
 
     /** provider name, one of:
      'cloudmade', 'google', 'microsoft', 'openlayers', 'yahoo' */
@@ -63,7 +63,7 @@ class MapstractionPlugin extends Plugin
      *
      * @return boolean event handler return
      */
-    function onRouterInitialized($m)
+    function onRouterInitialized(URLMapper $m)
     {
         $m->connect(':nickname/all/map',
                     array('action' => 'allmap'),
@@ -74,29 +74,6 @@ class MapstractionPlugin extends Plugin
         return true;
     }
 
-    /**
-     * Hook for autoloading classes
-     *
-     * This makes sure our classes get autoloaded from our directory
-     *
-     * @param string $cls name of class being used
-     *
-     * @return boolean event handler return
-     */
-    function onAutoload($cls)
-    {
-        switch ($cls)
-        {
-        case 'AllmapAction':
-        case 'UsermapAction':
-        case 'MapAction':
-            include_once INSTALLDIR.'/plugins/Mapstraction/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
-            return false;
-        default:
-            return true;
-        }
-    }
-
     /**
      * Hook for adding extra JavaScript
      *
@@ -106,7 +83,7 @@ class MapstractionPlugin extends Plugin
      *
      * @return boolean event handler return
      */
-    function onEndShowScripts($action)
+    function onEndShowScripts(Action $action)
     {
         $actionName = $action->trimmed('action');
 
@@ -125,7 +102,7 @@ class MapstractionPlugin extends Plugin
                                     urlencode($this->apikey)));
             break;
         case 'microsoft':
-            $action->script((StatusNet::isHTTPS()?'https':'http') + '://dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=6');
+            $action->script((GNUsocial::isHTTPS()?'https':'http') + '://dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=6');
             break;
         case 'openlayers':
             // Use our included stripped & minified OpenLayers.
@@ -139,20 +116,10 @@ class MapstractionPlugin extends Plugin
         default:
             return true;
         }
-
-        if ($this->provider == 'openlayers') {
-            // We have an optimized path for our default case.
-            //
-            // Note that OpenLayers.js needs to be separate, or it won't
-            // be able to find its UI images and styles.
-            $action->script($this->path('usermap-mxn-openlayers.min.js'));
-        } else {
-            $action->script(sprintf('%s?(%s)',
-                                    $this->path('js/mxn.js'),
-                                    $this->provider));
-
-            $action->script($this->path('usermap.js'));
-        }
+        $action->script(sprintf('%s?(%s)',
+                                $this->path('js/mxn.js'),
+                                $this->provider));
+        $action->script($this->path('usermap.js'));
 
         $action->inlineScript(sprintf('var _provider = "%s";', $this->provider));
 
@@ -172,7 +139,7 @@ class MapstractionPlugin extends Plugin
         return true;
     }
 
-    function onEndShowSections($action)
+    function onEndShowSections(Action $action)
     {
         $actionName = $action->trimmed('action');
         // These are the ones that have maps on 'em
@@ -202,7 +169,7 @@ class MapstractionPlugin extends Plugin
         $action->elementEnd('div');
     }
 
-    function onPluginVersion(&$versions)
+    function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Mapstraction',
                             'version' => self::VERSION,