Fixed broken ResultGoogleMapAjax module.

config/vufind/config.ini

@@ -723,6 +723,11 @@ authors         = Wikipedia
 ; "google"
 ;recordMap = google
 
+; If you set recordMap = google, then Google requires that you obtain an API key.
+; For more information on obtaining an API key, see:
+; https://developers.google.com/maps/documentation/javascript/get-api-key#key
+;googleMapApiKey = "your-key-here"
+
 ; This section controls the behavior of the cover generator when makeDynamicCovers
 ; above is non-false.
 [DynamicCovers]

module/VuFind/config/module.config.php

@@ -421,6 +421,7 @@ $config = [
                     'europeanaresults' => 'VuFind\Recommend\Factory::getEuropeanaResults',
                     'expandfacets' => 'VuFind\Recommend\Factory::getExpandFacets',
                     'favoritefacets' => 'VuFind\Recommend\Factory::getFavoriteFacets',
+                    'resultgooglemapajax' => 'VuFind\Recommend\Factory::getResultGoogleMapAjax',
                     'sidefacets' => 'VuFind\Recommend\Factory::getSideFacets',
                     'randomrecommend' => 'VuFind\Recommend\Factory::getRandomRecommend',
                     'summonbestbets' => 'VuFind\Recommend\Factory::getSummonBestBets',
@@ -442,7 +443,6 @@ $config = [
                     'openlibrarysubjectsdeferred' => 'VuFind\Recommend\OpenLibrarySubjectsDeferred',
                     'pubdatevisajax' => 'VuFind\Recommend\PubDateVisAjax',
                     'removefilters' => 'VuFind\Recommend\RemoveFilters',
-                    'resultgooglemapajax' => 'VuFind\Recommend\ResultGoogleMapAjax',
                     'spellingsuggestions' => 'VuFind\Recommend\SpellingSuggestions',
                     'summonbestbetsdeferred' => 'VuFind\Recommend\SummonBestBetsDeferred',
                     'summondatabasesdeferred' => 'VuFind\Recommend\SummonDatabasesDeferred',

module/VuFind/src/VuFind/Recommend/Factory.php

@@ -197,6 +197,21 @@ class Factory
         );
     }
 
+    /**
+     * Factory for ResultGoogleMapAjax Recommendations.
+     *
+     * @param ServiceManager $sm Service manager.
+     *
+     * @return ResultGoogleMapAjax
+     */
+    public static function getResultGoogleMapAjax(ServiceManager $sm)
+    {
+        $config = $sm->getServiceLocator()->get('VuFind\Config')->get('config');
+        $key = isset($config->Content->googleMapApiKey)
+            ? $config->Content->googleMapApiKey : null;
+        return new ResultGoogleMapAjax($key);
+    }
+
     /**
      * Factory for SideFacets module.
      *

module/VuFind/src/VuFind/Recommend/ResultGoogleMapAjax.php

@@ -50,6 +50,23 @@ class ResultGoogleMapAjax implements RecommendInterface
      */
     protected $searchObject;
 
+    /**
+     * GoogleMapAPI key from config.ini.
+     *
+     * @var string
+     */
+    protected $googleMapApiKey;
+
+    /**
+     * Constructor
+     *
+     * @param string $key API key
+     */
+    public function __construct($key)
+    {
+        $this->googleMapApiKey = $key;
+    }
+
     /**
      * Store the configuration of the recommendation module.
      *
@@ -93,6 +110,16 @@ class ResultGoogleMapAjax implements RecommendInterface
         $this->searchObject = $results;
     }
 
+    /**
+     * Get the Google Maps API key.
+     *
+     * @return string
+     */
+    public function getGoogleMapApiKey()
+    {
+        return $this->googleMapApiKey;
+    }
+
     /**
      * Get search parameters
      *

themes/bootstrap3/templates/Recommend/ResultGoogleMapAjax.phtml

 <?
   $searchParams = $this->recommend->getSearchParams();
 
-  $this->headScript()->appendFile('https://maps.googleapis.com/maps/api/js?v=3.8&sensor=false&language='.$this->layout()->userLang);
+  $this->headScript()->appendFile('https://maps.googleapis.com/maps/api/js?key=' . urlencode($this->recommend->getGoogleMapApiKey()) . '&sensor=false&language='.$this->layout()->userLang);
   $this->headScript()->appendFile('vendor/markerclusterer.min.js');
 ?>
 <script type="text/javascript">
@@ -44,7 +44,7 @@ ClusterIcon.prototype.onAdd = function () {
   this.div_ = document.createElement("div");
   this.div_.className = "clusterDiv";
   if (this.visible_) {
-    this.removeClass('hidden');
+    $(this).removeClass('hidden');
   }
 
   this.getPanes().overlayMouseTarget.appendChild(this.div_);
@@ -86,7 +86,7 @@ ClusterIcon.prototype.onAdd = function () {
  * @type {string}
  * @constant
  */
-MarkerClusterer.IMAGE_PATH = "https://google-maps-utility-library-v3.googlecode.com/svn/trunk/markerclustererplus/images/m";
+MarkerClusterer.IMAGE_PATH = "https://raw.githubusercontent.com/googlemaps/js-marker-clusterer/gh-pages/images/m";
 
 var markers;
 var mc;
@@ -116,20 +116,25 @@ var infowindow = new google.maps.InfoWindow({maxWidth: 480, minWidth: 480});
       };
       map = new google.maps.Map(document.getElementById("map_canvas"),
           myOptions);
-      //mc = new MarkerClusterer(map);
-      showMarkers();
+
+      var useGmm = document.getElementById('usegmm');
+      google.maps.event.addDomListener(useGmm, 'click', refreshMap);
+
       var checkbx = document.getElementById("useCluster");
       var wrap = document.getElementById("mapWrap");
       wrap.style.display = "block";
       checkbx.style.display = "block";
+
+      showMarkers();
     });
   }
   function showMarkers(){
+    markers = [];
+
     deleteOverlays();
-    if(mc != null) {
+    if (mc) {
       mc.clearMarkers();
     }
-    markers = [];
 
     for (var i = 0; i<markersData.length; i++){
       var disTitle = markersData[i].title;
@@ -159,7 +164,7 @@ var infowindow = new google.maps.InfoWindow({maxWidth: 480, minWidth: 480});
       mc = new MarkerClusterer(map, markers);
     } else {
       for (var i = 0; i < markers.length; i++) {
-        map.addOverlay(markers[i]);
+        markers[i].setMap(map);
       }
     }
   }
@@ -187,6 +192,7 @@ var infowindow = new google.maps.InfoWindow({maxWidth: 480, minWidth: 480});
       }
   }
   function refreshMap() {
+    deleteOverlays();
     showMarkers();
   }
 
@@ -197,7 +203,7 @@ var infowindow = new google.maps.InfoWindow({maxWidth: 480, minWidth: 480});
   <div class="mapClusterToggle" id="useCluster">
     <div class="checkbox">
       <label for="usegmm">
-        <input type="checkbox" id="usegmm" checked="true" onclick="refreshMap();"></input>
+        <input type="checkbox" id="usegmm" checked="true"></input>
         <?=$this->transEsc('google_map_cluster_points') ?>
       </label>
     </div>