Support map loading under https

Issue CRM-16294.  Replace http://openlayers/api/OpenLayers.js with
CDNjs, to allow loading maps when civicrm is used with https.  Switch
the default tile layer from openstreetmaps.org to MapQuest open tiles,
which supports https.

diff --git a/templates/CRM/Contact/Form/Task/Map/OpenStreetMaps.tpl b/templates/CRM/Contact/Form/Task/Map/OpenStreetMaps.tpl
index ff5f568cdedd485bfe3ba86d839dc151cdd1943b..d2599f48e35b1e78928c1add7839b4fdac528755 100644 (file)
--- a/templates/CRM/Contact/Form/Task/Map/OpenStreetMaps.tpl
+++ b/templates/CRM/Contact/Form/Task/Map/OpenStreetMaps.tpl
@@ -32,7 +32,7 @@
 {/if}
 {assign var=defaultZoom value=12}
 {literal}
-<script src="http://openlayers.org/api/OpenLayers.js" type="text/javascript"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/openlayers/2.13.1/OpenLayers.js" type="text/javascript"></script>
 <script type="text/javascript">
     var popup = new Popup();
 
@@ -69,7 +69,14 @@
 
     function initMap() {
         var map = new OpenLayers.Map("osm_map");
-        map.addLayer(new OpenLayers.Layer.OSM());
+        map.addLayer(new OpenLayers.Layer.OSM("MapQuest OSM", [
+            "https://otile1-s.mqcdn.com/tiles/1.0.0/map/${z}/${x}/${y}.jpg",
+            "https://otile2-s.mqcdn.com/tiles/1.0.0/map/${z}/${x}/${y}.jpg",
+            "https://otile3-s.mqcdn.com/tiles/1.0.0/map/${z}/${x}/${y}.jpg",
+            "https://otile4-s.mqcdn.com/tiles/1.0.0/map/${z}/${x}/${y}.jpg",
+        ], {
+            attribution: "<p>Tiles Courtesy of <a href='http://www.mapquest.com/' target='_blank'>MapQuest</a>. Data &copy; <a href='http://www.openstreetmap.org/' target='_blank'>OpenStreetMap</a> contributors.</p>"
+        }));
 
         var lonLat = new OpenLayers.LonLat(
             {/literal}{$center.lng}{literal},