简柏林 / thingskit · Commits

Commit fa2cf1ae10b3481e2fbc50672d3ec89622dd8c85

Authored by Shiv Shankar Maurya
1 parent c0a88497

SSL patch on map widgets

Inline Side-by-side
Showing 3 changed files with 87 additions and 10 deletions
  1 +diff --git a/ui/src/app/widget/lib/google-map.js b/ui/src/app/widget/lib/google-map.js
  2 +index c3d294e..4b0ea2f 100644
  3 +--- a/ui/src/app/widget/lib/google-map.js
  4 ++++ b/ui/src/app/widget/lib/google-map.js
  5 +@@ -152,7 +152,7 @@ export default class TbGoogleMap {
  6 + /* eslint-disable no-undef */
  7 + updateMarkerColor(marker, color) {
  8 + var pinColor = color.substr(1);
  9 +- var pinImage = new google.maps.MarkerImage("http://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|" + pinColor,
  10 ++ var pinImage = new google.maps.MarkerImage("https://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|" + pinColor,
  11 + new google.maps.Size(21, 34),
  12 + new google.maps.Point(0,0),
  13 + new google.maps.Point(10, 34));
  14 +@@ -191,11 +191,11 @@ export default class TbGoogleMap {
  15 + createMarker(location, settings, onClickListener, markerArgs) {
  16 + var height = 34;
  17 + var pinColor = settings.color.substr(1);
  18 +- var pinImage = new google.maps.MarkerImage("http://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|" + pinColor,
  19 ++ var pinImage = new google.maps.MarkerImage("https://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|" + pinColor,
  20 + new google.maps.Size(21, 34),
  21 + new google.maps.Point(0,0),
  22 + new google.maps.Point(10, 34));
  23 +- var pinShadow = new google.maps.MarkerImage("http://chart.apis.google.com/chart?chst=d_map_pin_shadow",
  24 ++ var pinShadow = new google.maps.MarkerImage("https://chart.apis.google.com/chart?chst=d_map_pin_shadow",
  25 + new google.maps.Size(40, 37),
  26 + new google.maps.Point(0, 0),
  27 + new google.maps.Point(12, 35));
  28 +@@ -350,4 +350,4 @@ export default class TbGoogleMap {
  29 + return this.tooltips;
  30 + }
  31 +
  32 +-}
  33 +\ No newline at end of file
  34 ++}
  35 +diff --git a/ui/src/app/widget/lib/openstreet-map.js b/ui/src/app/widget/lib/openstreet-map.js
  36 +index e6f10de..3a911ce 100644
  37 +--- a/ui/src/app/widget/lib/openstreet-map.js
  38 ++++ b/ui/src/app/widget/lib/openstreet-map.js
  39 +@@ -28,8 +28,8 @@ export default class TbOpenStreetMap {
  40 +
  41 + this.map = L.map($containerElement[0]).setView([0, 0], this.defaultZoomLevel || 8);
  42 +
  43 +- L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
  44 +- attribution: '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
  45 ++ L.tileLayer('https://{s}.tile.osm.org/{z}/{x}/{y}.png', {
  46 ++ attribution: '&copy; <a href="https://osm.org/copyright">OpenStreetMap</a> contributors'
  47 + }).addTo(this.map);
  48 +
  49 + if (initCallback) {
  50 +@@ -51,11 +51,11 @@ export default class TbOpenStreetMap {
  51 + updateMarkerColor(marker, color) {
  52 + var pinColor = color.substr(1);
  53 + var icon = L.icon({
  54 +- iconUrl: 'http://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|' + pinColor,
  55 ++ iconUrl: 'https://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|' + pinColor,
  56 + iconSize: [21, 34],
  57 + iconAnchor: [10, 34],
  58 + popupAnchor: [0, -34],
  59 +- shadowUrl: 'http://chart.apis.google.com/chart?chst=d_map_pin_shadow',
  60 ++ shadowUrl: 'https://chart.apis.google.com/chart?chst=d_map_pin_shadow',
  61 + shadowSize: [40, 37],
  62 + shadowAnchor: [12, 35]
  63 + });
  64 +@@ -96,11 +96,11 @@ export default class TbOpenStreetMap {
  65 + var height = 34;
  66 + var pinColor = settings.color.substr(1);
  67 + var icon = L.icon({
  68 +- iconUrl: 'http://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|' + pinColor,
  69 ++ iconUrl: 'https://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|' + pinColor,
  70 + iconSize: [21, 34],
  71 + iconAnchor: [10, 34],
  72 + popupAnchor: [0, -34],
  73 +- shadowUrl: 'http://chart.apis.google.com/chart?chst=d_map_pin_shadow',
  74 ++ shadowUrl: 'https://chart.apis.google.com/chart?chst=d_map_pin_shadow',
  75 + shadowSize: [40, 37],
  76 + shadowAnchor: [12, 35]
  77 + });
@@ -152,7 +152,7 @@ export default class TbGoogleMap { @@ -152,7 +152,7 @@ export default class TbGoogleMap {
152 /* eslint-disable no-undef */ 152 /* eslint-disable no-undef */
153 updateMarkerColor(marker, color) { 153 updateMarkerColor(marker, color) {
154 var pinColor = color.substr(1); 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 new google.maps.Size(21, 34), 156 new google.maps.Size(21, 34),
157 new google.maps.Point(0,0), 157 new google.maps.Point(0,0),
158 new google.maps.Point(10, 34)); 158 new google.maps.Point(10, 34));
@@ -191,11 +191,11 @@ export default class TbGoogleMap { @@ -191,11 +191,11 @@ export default class TbGoogleMap {
191 createMarker(location, settings, onClickListener, markerArgs) { 191 createMarker(location, settings, onClickListener, markerArgs) {
192 var height = 34; 192 var height = 34;
193 var pinColor = settings.color.substr(1); 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 new google.maps.Size(21, 34), 195 new google.maps.Size(21, 34),
196 new google.maps.Point(0,0), 196 new google.maps.Point(0,0),
197 new google.maps.Point(10, 34)); 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 new google.maps.Size(40, 37), 199 new google.maps.Size(40, 37),
200 new google.maps.Point(0, 0), 200 new google.maps.Point(0, 0),
201 new google.maps.Point(12, 35)); 201 new google.maps.Point(12, 35));
@@ -350,4 +350,4 @@ export default class TbGoogleMap { @@ -350,4 +350,4 @@ export default class TbGoogleMap {
350 return this.tooltips; 350 return this.tooltips;
351 } 351 }
352 352
353 -}  
  353 +}
@@ -28,8 +28,8 @@ export default class TbOpenStreetMap { @@ -28,8 +28,8 @@ export default class TbOpenStreetMap {
28 28
29 this.map = L.map($containerElement[0]).setView([0, 0], this.defaultZoomLevel || 8); 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 }).addTo(this.map); 33 }).addTo(this.map);
34 34
35 if (initCallback) { 35 if (initCallback) {
@@ -51,11 +51,11 @@ export default class TbOpenStreetMap { @@ -51,11 +51,11 @@ export default class TbOpenStreetMap {
51 updateMarkerColor(marker, color) { 51 updateMarkerColor(marker, color) {
52 var pinColor = color.substr(1); 52 var pinColor = color.substr(1);
53 var icon = L.icon({ 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 iconSize: [21, 34], 55 iconSize: [21, 34],
56 iconAnchor: [10, 34], 56 iconAnchor: [10, 34],
57 popupAnchor: [0, -34], 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 shadowSize: [40, 37], 59 shadowSize: [40, 37],
60 shadowAnchor: [12, 35] 60 shadowAnchor: [12, 35]
61 }); 61 });
@@ -96,11 +96,11 @@ export default class TbOpenStreetMap { @@ -96,11 +96,11 @@ export default class TbOpenStreetMap {
96 var height = 34; 96 var height = 34;
97 var pinColor = settings.color.substr(1); 97 var pinColor = settings.color.substr(1);
98 var icon = L.icon({ 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 iconSize: [21, 34], 100 iconSize: [21, 34],
101 iconAnchor: [10, 34], 101 iconAnchor: [10, 34],
102 popupAnchor: [0, -34], 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 shadowSize: [40, 37], 104 shadowSize: [40, 37],
105 shadowAnchor: [12, 35] 105 shadowAnchor: [12, 35]
106 }); 106 });