Commit 1f3c68d0d8dcddce8ce6c083da909f8619496b05

Authored by Andrew Shvayka
Committed by GitHub
2 parents c0a88497 3ed8d0e9

Merge pull request #230 from ssmaurya/master

Map widgets SSL issues #228
... ... @@ -152,7 +152,7 @@ export default class TbGoogleMap {
152 152 /* eslint-disable no-undef */
153 153 updateMarkerColor(marker, color) {
154 154 var pinColor = color.substr(1);
155   - var pinImage = new google.maps.MarkerImage("http://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|" + pinColor,
  155 + var pinImage = new google.maps.MarkerImage("https://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|" + pinColor,
156 156 new google.maps.Size(21, 34),
157 157 new google.maps.Point(0,0),
158 158 new google.maps.Point(10, 34));
... ... @@ -191,11 +191,11 @@ export default class TbGoogleMap {
191 191 createMarker(location, settings, onClickListener, markerArgs) {
192 192 var height = 34;
193 193 var pinColor = settings.color.substr(1);
194   - var pinImage = new google.maps.MarkerImage("http://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|" + pinColor,
  194 + var pinImage = new google.maps.MarkerImage("https://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|" + pinColor,
195 195 new google.maps.Size(21, 34),
196 196 new google.maps.Point(0,0),
197 197 new google.maps.Point(10, 34));
198   - var pinShadow = new google.maps.MarkerImage("http://chart.apis.google.com/chart?chst=d_map_pin_shadow",
  198 + var pinShadow = new google.maps.MarkerImage("https://chart.apis.google.com/chart?chst=d_map_pin_shadow",
199 199 new google.maps.Size(40, 37),
200 200 new google.maps.Point(0, 0),
201 201 new google.maps.Point(12, 35));
... ... @@ -350,4 +350,4 @@ export default class TbGoogleMap {
350 350 return this.tooltips;
351 351 }
352 352
353   -}
\ No newline at end of file
  353 +}
... ...
... ... @@ -28,8 +28,8 @@ export default class TbOpenStreetMap {
28 28
29 29 this.map = L.map($containerElement[0]).setView([0, 0], this.defaultZoomLevel || 8);
30 30
31   - L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
32   - attribution: '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
  31 + L.tileLayer('https://{s}.tile.osm.org/{z}/{x}/{y}.png', {
  32 + attribution: '&copy; <a href="https://osm.org/copyright">OpenStreetMap</a> contributors'
33 33 }).addTo(this.map);
34 34
35 35 if (initCallback) {
... ... @@ -51,11 +51,11 @@ export default class TbOpenStreetMap {
51 51 updateMarkerColor(marker, color) {
52 52 var pinColor = color.substr(1);
53 53 var icon = L.icon({
54   - iconUrl: 'http://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|' + pinColor,
  54 + iconUrl: 'https://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|' + pinColor,
55 55 iconSize: [21, 34],
56 56 iconAnchor: [10, 34],
57 57 popupAnchor: [0, -34],
58   - shadowUrl: 'http://chart.apis.google.com/chart?chst=d_map_pin_shadow',
  58 + shadowUrl: 'https://chart.apis.google.com/chart?chst=d_map_pin_shadow',
59 59 shadowSize: [40, 37],
60 60 shadowAnchor: [12, 35]
61 61 });
... ... @@ -96,11 +96,11 @@ export default class TbOpenStreetMap {
96 96 var height = 34;
97 97 var pinColor = settings.color.substr(1);
98 98 var icon = L.icon({
99   - iconUrl: 'http://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|' + pinColor,
  99 + iconUrl: 'https://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|' + pinColor,
100 100 iconSize: [21, 34],
101 101 iconAnchor: [10, 34],
102 102 popupAnchor: [0, -34],
103   - shadowUrl: 'http://chart.apis.google.com/chart?chst=d_map_pin_shadow',
  103 + shadowUrl: 'https://chart.apis.google.com/chart?chst=d_map_pin_shadow',
104 104 shadowSize: [40, 37],
105 105 shadowAnchor: [12, 35]
106 106 });
... ...