Item14502: fixed sending the API to google

foswiki · Sep 25, 2017 · e7d2459 · e7d2459
1 parent acfd7fe
commit e7d2459
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/data/System/GoogleMapsPlugin.txt b/data/System/GoogleMapsPlugin.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" comment="" date="1495161447" format="1.1" reprev="4" version="6"}%
+%META:TOPICINFO{author="micha" comment="" date="1501262303" format="1.1" reprev="4" version="13"}%
 ---+!! %TOPIC%
 %FORMFIELD{"Description"}%
 
@@ -197,7 +197,7 @@ while opening up a few more possibilities.
 | =markeraddress="..."= | addresses of markers to be displayed on the map; addresses are separated by newlines <br />\
 See [[#DetailsForMarkerAddress][examples]] below. | |
 | =infowindow="..."= | content of the info window to be displayed at the marker, or at the =infowindowaddress= | |
-| _use either =address= or =center=._   ||
+| _use either =address= or =center=._   |||
 | =address="..."= | free form address to center the map on | |
 | =center="..."= | comma-separated latitude and longitude position to center the map on, e.g. =53, 9= | |
 | _use either =infowindowaddress= or =infowindowposition=._   |||
@@ -221,7 +221,6 @@ See [[#DetailsForMarkerAddress][examples]] below. | |
 | A location and a description, separated by an equal sign | White Sands Missile Range=White Sands Missile Range,The location of the Trinity test. <p />\
 <b>Note:</b> the comma introduces a new line. | <img src="%ATTACHURLPATH%/TheTrinityTestSite.jpg" alt="TheTrinityTestSite.jpg" width='233' height='133' /> |
 
-
 ---++ Further reading
 
 See 
@@ -246,15 +245,15 @@ If you are using [[Foswiki:Extensions/SecurityHeadersPlugin][SecurityHeadersPlug
 
 ---++ Change History
 
+%TABLE{columnwidths="7em" tablewidth="100%"}%
+|  25 Sep 2017: | fixed sending the API key to google |
 |  02 Sep 2016: | repackaged to contain a missing js file in the examples |
 |  21 Apr 2016: | upgraded to latest version of gmap3 |
 |  07 Nov 2013: | fixed issue mixing HTTP and HTTPS assets |
 |  06 May 2013: | implement multiple markers, all having a click event to open an infowindow |
 |  08 Feb 2013: | initial release |
 
 
-
-
 %META:FORM{name="PackageForm"}%
 %META:FIELD{name="Author" title="Author" value="Michael Daum"}%
 %META:FIELD{name="Version" title="Version" value="%25$VERSION%25"}%

diff --git a/lib/Foswiki/Plugins/GoogleMapsPlugin.pm b/lib/Foswiki/Plugins/GoogleMapsPlugin.pm
@@ -1,6 +1,6 @@
-# Plugin for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
+# Plugin for Foswiki - The Free and Open Source Wiki, https://foswiki.org/
 #
-# GoogleMapsPlugin is Copyright (C) 2013-2017 Michael Daum http://michaeldaumconsulting.com
+# GoogleMapsPlugin is Copyright (C) 2013-2017 Michael Daum https://michaeldaumconsulting.com
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -22,8 +22,8 @@ use Foswiki::Func ();
 use Foswiki::Plugins::JQueryPlugin ();
 #use Foswiki::Plugins::GoogleMapsPlugin::Core(); # NOTE: comment out for production
 
-our $VERSION = '3.10';
-our $RELEASE = '20 Jun 2017';
+our $VERSION = '3.11';
+our $RELEASE = '25 Sep 2017';
 our $SHORTDESCRIPTION = 'Google Maps for Foswiki';
 our $NO_PREFS_IN_TOPIC = 1;
 

diff --git a/lib/Foswiki/Plugins/GoogleMapsPlugin/Core.pm b/lib/Foswiki/Plugins/GoogleMapsPlugin/Core.pm
@@ -1,6 +1,6 @@
-# Plugin for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
+# Plugin for Foswiki - The Free and Open Source Wiki, https://foswiki.org/
 #
-# GoogleMapsPlugin is Copyright (C) 2013-2017 Michael Daum http://michaeldaumconsulting.com
+# GoogleMapsPlugin is Copyright (C) 2013-2017 Michael Daum https://michaeldaumconsulting.com
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -63,7 +63,7 @@ function initGoogleApi() {
   window.googleApiLoaded = true;
 }
 </script>
-<script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?language=$language&$apiKey&callback=initGoogleApi" ></script>
+<script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?language=$language$apiKey&callback=initGoogleApi" ></script>
 HERE
 
 }
@@ -154,6 +154,7 @@ sub _json {
 
   return $this->{_json};
 }
+
 sub _inlineError {
   return "<div class='foswikiAlert'>$_[0]</div>";
 }