Dyomedea
/
wp-gpx-maps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Switched to HTTPS where possible

This commit is contained in:
bastianonm 2017-06-22 07:27:49 +00:00
parent 117800dcd3
commit c43ff87721
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
WP-GPX-Maps.js
View File

@ -2,7 +2,7 @@
Plugin Name: WP-GPX-Maps Plugin Name: WP-GPX-Maps
Plugin URI: http://www.devfarm.it/ Plugin URI: http://www.devfarm.it/
Description: Draws a gpx track with altitude graph Description: Draws a gpx track with altitude graph
Version: 1.3.14 Version: 1.3.15
Author: Bastianon Massimo Author: Bastianon Massimo
Author URI: http://www.pedemontanadelgrappa.it/ Author URI: http://www.pedemontanadelgrappa.it/
*/ */
@ -188,7 +188,7 @@ Author URI: http://www.pedemontanadelgrappa.it/
map.mapTypes.set("OSM1", new google.maps.ImageMapType({ map.mapTypes.set("OSM1", new google.maps.ImageMapType({
getTileUrl: function(coord, zoom) { getTileUrl: function(coord, zoom) {
return "http://tile.openstreetmap.org/" + zoom + "/" + coord.x + "/" + coord.y + ".png"; return "https://tile.openstreetmap.org/" + zoom + "/" + coord.x + "/" + coord.y + ".png";
}, },
tileSize: new google.maps.Size(256, 256), tileSize: new google.maps.Size(256, 256),
name: "OSM", name: "OSM",
@ -199,7 +199,7 @@ Author URI: http://www.pedemontanadelgrappa.it/
map.mapTypes.set("OSM2", new google.maps.ImageMapType({ map.mapTypes.set("OSM2", new google.maps.ImageMapType({
getTileUrl: function(coord, zoom) { getTileUrl: function(coord, zoom) {
if (hasThunderforestApiKey) if (hasThunderforestApiKey)
return "http://a.tile.thunderforest.com/cycle/" + zoom + "/" + coord.x + "/" + coord.y + ".png?apikey=" + ThunderforestApiKey; return "https://a.tile.thunderforest.com/cycle/" + zoom + "/" + coord.x + "/" + coord.y + ".png?apikey=" + ThunderforestApiKey;
else else
return "http://a.tile.opencyclemap.org/cycle/" + zoom + "/" + coord.x + "/" + coord.y + ".png"; return "http://a.tile.opencyclemap.org/cycle/" + zoom + "/" + coord.x + "/" + coord.y + ".png";
}, },
@ -212,7 +212,7 @@ Author URI: http://www.pedemontanadelgrappa.it/
map.mapTypes.set("OSM4", new google.maps.ImageMapType({ map.mapTypes.set("OSM4", new google.maps.ImageMapType({
getTileUrl: function(coord, zoom) { getTileUrl: function(coord, zoom) {
if (hasThunderforestApiKey) if (hasThunderforestApiKey)
return "http://a.tile.thunderforest.com/transport/" + zoom + "/" + coord.x + "/" + coord.y + ".png?apikey=" + ThunderforestApiKey; return "https://a.tile.thunderforest.com/transport/" + zoom + "/" + coord.x + "/" + coord.y + ".png?apikey=" + ThunderforestApiKey;
else else
return "http://a.tile2.opencyclemap.org/transport/" + zoom + "/" + coord.x + "/" + coord.y + ".png"; return "http://a.tile2.opencyclemap.org/transport/" + zoom + "/" + coord.x + "/" + coord.y + ".png";
}, },
@ -225,7 +225,7 @@ Author URI: http://www.pedemontanadelgrappa.it/
map.mapTypes.set("OSM5", new google.maps.ImageMapType({ map.mapTypes.set("OSM5", new google.maps.ImageMapType({
getTileUrl: function(coord, zoom) { getTileUrl: function(coord, zoom) {
if (hasThunderforestApiKey) if (hasThunderforestApiKey)
return "http://a.tile.thunderforest.com/landscape/" + zoom + "/" + coord.x + "/" + coord.y + ".png?apikey=" + ThunderforestApiKey; return "https://a.tile.thunderforest.com/landscape/" + zoom + "/" + coord.x + "/" + coord.y + ".png?apikey=" + ThunderforestApiKey;
else else
return "http://a.tile3.opencyclemap.org/landscape/" + zoom + "/" + coord.x + "/" + coord.y + ".png"; return "http://a.tile3.opencyclemap.org/landscape/" + zoom + "/" + coord.x + "/" + coord.y + ".png";
}, },
@ -237,7 +237,7 @@ Author URI: http://www.pedemontanadelgrappa.it/
map.mapTypes.set("OSM6", new google.maps.ImageMapType({ map.mapTypes.set("OSM6", new google.maps.ImageMapType({
getTileUrl: function(coord, zoom) { getTileUrl: function(coord, zoom) {
return "http://tile2.maptoolkit.net/terrain/" + zoom + "/" + coord.x + "/" + coord.y + ".png"; return "https://tile2.maptoolkit.net/terrain/" + zoom + "/" + coord.x + "/" + coord.y + ".png";
}, },
tileSize: new google.maps.Size(256, 256), tileSize: new google.maps.Size(256, 256),
name: "MTK-Terr", name: "MTK-Terr",
@ -362,12 +362,12 @@ Author URI: http://www.pedemontanadelgrappa.it/
if (!jQuery.isEmptyObject(waypoints)) if (!jQuery.isEmptyObject(waypoints))
{ {
var image = new google.maps.MarkerImage('http://maps.google.com/mapfiles/ms/micons/flag.png', var image = new google.maps.MarkerImage('https://maps.google.com/mapfiles/ms/micons/flag.png',
new google.maps.Size(32, 32), new google.maps.Size(32, 32),
new google.maps.Point(0,0), new google.maps.Point(0,0),
new google.maps.Point(16, 32) new google.maps.Point(16, 32)
); );
var shadow = new google.maps.MarkerImage('http://maps.google.com/mapfiles/ms/micons/flag.shadow.png', var shadow = new google.maps.MarkerImage('https://maps.google.com/mapfiles/ms/micons/flag.shadow.png',
new google.maps.Size(59, 32), new google.maps.Size(59, 32),
new google.maps.Point(0,0), new google.maps.Point(0,0),
new google.maps.Point(16, 32) new google.maps.Point(16, 32)
@ -613,7 +613,7 @@ Author URI: http://www.pedemontanadelgrappa.it/
if (currentIcon == '') if (currentIcon == '')
{ {
currentIcon = "http://maps.google.com/mapfiles/kml/pal4/icon25.png"; currentIcon = "https://maps.google.com/mapfiles/kml/pal4/icon25.png";
} }
var current = new google.maps.MarkerImage(currentIcon, var current = new google.maps.MarkerImage(currentIcon,

8
readme.txt
View File

@ -4,8 +4,8 @@ Contributors: bastianonm, Stephan Klein, Michel Selerin
Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=8VHWLRW6JBTML Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=8VHWLRW6JBTML
Tags: maps, gpx, gps, graph, chart, google maps, track, garmin, image, nextgen-gallery, nextgen, exif, OpenStreetMap, OpenCycleMap, Hike&Bike, heart rate, heartrate, cadence Tags: maps, gpx, gps, graph, chart, google maps, track, garmin, image, nextgen-gallery, nextgen, exif, OpenStreetMap, OpenCycleMap, Hike&Bike, heart rate, heartrate, cadence
Requires at least: 2.0.0 Requires at least: 2.0.0
Tested up to: 4.7.2 Tested up to: 4.8
Stable tag: 1.3.14 Stable tag: 1.3.15
Draws a gpx track with altitude graph. You can also display your nextgen gallery images in the map. Draws a gpx track with altitude graph. You can also display your nextgen gallery images in the map.
@ -154,8 +154,10 @@ Yes!
1. Altitude & Speed & Hearth rate 1. Altitude & Speed & Hearth rate
== Changelog == == Changelog ==
= 1.3.15 =
* Switched to HTTPS where possible (thanks to delitestudio)
= 1.3.14 = = 1.3.14 =
* Added Thunderforest Api Key on settings (OpenCycleMap) * Added Thunderforest Api Key on settings: for OpenCycleMap
= 1.3.13 = = 1.3.13 =
* Added google maps api key on settings * Added google maps api key on settings
* Removed parameter 'sensor' on google maps js * Removed parameter 'sensor' on google maps js

4
wp-gpx-maps.php
View File

@ -3,7 +3,7 @@
Plugin Name: WP-GPX-Maps Plugin Name: WP-GPX-Maps
Plugin URI: http://www.devfarm.it/ Plugin URI: http://www.devfarm.it/
Description: Draws a GPX track with altitude chart Description: Draws a GPX track with altitude chart
Version: 1.3.14 Version: 1.3.15
Author: Bastianon Massimo Author: Bastianon Massimo
Author URI: http://www.pedemontanadelgrappa.it/ Author URI: http://www.pedemontanadelgrappa.it/
*/ */
@ -51,7 +51,7 @@ function enqueue_WP_GPX_Maps_scripts()
wp_enqueue_script( 'jquery' ); if ($wpgpxmaps_googlemapsv3_apikey) { wp_enqueue_script( 'googlemaps', '//maps.googleapis.com/maps/api/js?key='.$wpgpxmaps_googlemapsv3_apikey, null, null); } else { wp_enqueue_script( 'googlemaps', '//maps.googleapis.com/maps/api/js', null, null); } wp_enqueue_script( 'jquery' ); if ($wpgpxmaps_googlemapsv3_apikey) { wp_enqueue_script( 'googlemaps', '//maps.googleapis.com/maps/api/js?key='.$wpgpxmaps_googlemapsv3_apikey, null, null); } else { wp_enqueue_script( 'googlemaps', '//maps.googleapis.com/maps/api/js', null, null); }
wp_enqueue_script( 'highcharts', "//code.highcharts.com/3.0.10/highcharts.js", array('jquery'), "3.0.10", true); wp_enqueue_script( 'highcharts', "//code.highcharts.com/3.0.10/highcharts.js", array('jquery'), "3.0.10", true);
wp_enqueue_script( 'WP-GPX-Maps', plugins_url('/WP-GPX-Maps.js', __FILE__), array('jquery','googlemaps','highcharts'), "1.3.14"); wp_enqueue_script( 'WP-GPX-Maps', plugins_url('/WP-GPX-Maps.js', __FILE__), array('jquery','googlemaps','highcharts'), "1.3.15");
} }
function print_WP_GPX_Maps_styles() function print_WP_GPX_Maps_styles()