Skip to content
Permalink
Browse files

map scrolling without ctrl key; remove OCM leftover; updates #1124

  • Loading branch information...
following5 committed Sep 13, 2017
1 parent 5bdaae7 commit fc8522065ee04aeac468e1c09a911ecc6b5d03f7
Showing with 6 additions and 5 deletions.
  1. +6 −5 htdocs/templates2/ocstyle/map2.tpl
@@ -343,7 +343,7 @@ function mapLoad()
if (bFullscreen && msInitSiderbarDisplay == "block")
toggle_sidebar(false);
var maptypes = ['OSM', 'OCM',
var maptypes = ['OSM',
google.maps.MapTypeId.ROADMAP, google.maps.MapTypeId.SATELLITE,
google.maps.MapTypeId.HYBRID, google.maps.MapTypeId.TERRAIN ];
var initType = google.maps.MapTypeId.ROADMAP;
@@ -355,7 +355,8 @@ function mapLoad()
zoom: mnInitZoom,
center: new google.maps.LatLng(mnInitLat, mnInitLon),
mapTypeId: initType,
backgroundColor: "#d0dccc",
backgroundColor: '#d0dccc',
gestureHandling: 'greedy',
mapTypeControl: true,
mapTypeControlOptions: { mapTypeIds: maptypes, position: google.maps.ControlPosition.TOP_RIGHT },
@@ -387,7 +388,7 @@ function mapLoad()
{/if}
{literal}
setMapType("OSM", "OpenStreetMap", "http://tile.openstreetmap.org/", 18);
setMapType("OSM", "OpenStreetMap", "https://tile.openstreetmap.org/", 18);
moInfoWindow = new google.maps.InfoWindow();
moWpInfoWindow = new google.maps.InfoWindow();
@@ -506,9 +507,9 @@ function updateCopyrights()
{
{/literal}
if (newMapType == "OCM")
copyrightDiv.innerHTML = '{t escape=js}Map data &copy; <a href="http://www.openstreetmap.org/copyright" target="_blank">OpenStreetMap</a> and <a href="http://www.thunderforest.com/opencyclemap/" target="_blank">OpenCycleMap</a> contributors{/t}';
copyrightDiv.innerHTML = '{t escape=js}Map data &copy; <a href="https://www.openstreetmap.org/copyright" target="_blank">OpenStreetMap</a> and <a href="http://www.thunderforest.com/opencyclemap/" target="_blank">OpenCycleMap</a> contributors{/t}';
else
copyrightDiv.innerHTML = '{t escape=js}Map data &copy; <a href="http://www.openstreetmap.org/copyright" target="_blank">OpenStreetMap</a> contributors{/t}';
copyrightDiv.innerHTML = '{t escape=js}Map data &copy; <a href="https://www.openstreetmap.org/copyright" target="_blank">OpenStreetMap</a> contributors{/t}';
{literal}
if (mapIcon != null) {
mapIcon.style.display = "none";

0 comments on commit fc85220

Please sign in to comment.
You can’t perform that action at this time.