From fa2cf1ae10b3481e2fbc50672d3ec89622dd8c85 Mon Sep 17 00:00:00 2001 From: Shiv Shankar Maurya Date: Wed, 2 Aug 2017 21:37:04 +0530 Subject: [PATCH 1/2] SSL patch on map widgets --- ssl.patch | 77 +++++++++++++++++++++++++ ui/src/app/widget/lib/google-map.js | 8 +-- ui/src/app/widget/lib/openstreet-map.js | 12 ++-- 3 files changed, 87 insertions(+), 10 deletions(-) create mode 100644 ssl.patch diff --git a/ssl.patch b/ssl.patch new file mode 100644 index 0000000000..6d0816fb96 --- /dev/null +++ b/ssl.patch @@ -0,0 +1,77 @@ +diff --git a/ui/src/app/widget/lib/google-map.js b/ui/src/app/widget/lib/google-map.js +index c3d294e..4b0ea2f 100644 +--- a/ui/src/app/widget/lib/google-map.js ++++ b/ui/src/app/widget/lib/google-map.js +@@ -152,7 +152,7 @@ export default class TbGoogleMap { + /* eslint-disable no-undef */ + updateMarkerColor(marker, color) { + var pinColor = color.substr(1); +- var pinImage = new google.maps.MarkerImage("http://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|" + pinColor, ++ var pinImage = new google.maps.MarkerImage("https://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|" + pinColor, + new google.maps.Size(21, 34), + new google.maps.Point(0,0), + new google.maps.Point(10, 34)); +@@ -191,11 +191,11 @@ export default class TbGoogleMap { + createMarker(location, settings, onClickListener, markerArgs) { + var height = 34; + var pinColor = settings.color.substr(1); +- var pinImage = new google.maps.MarkerImage("http://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|" + pinColor, ++ var pinImage = new google.maps.MarkerImage("https://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|" + pinColor, + new google.maps.Size(21, 34), + new google.maps.Point(0,0), + new google.maps.Point(10, 34)); +- var pinShadow = new google.maps.MarkerImage("http://chart.apis.google.com/chart?chst=d_map_pin_shadow", ++ var pinShadow = new google.maps.MarkerImage("https://chart.apis.google.com/chart?chst=d_map_pin_shadow", + new google.maps.Size(40, 37), + new google.maps.Point(0, 0), + new google.maps.Point(12, 35)); +@@ -350,4 +350,4 @@ export default class TbGoogleMap { + return this.tooltips; + } + +-} +\ No newline at end of file ++} +diff --git a/ui/src/app/widget/lib/openstreet-map.js b/ui/src/app/widget/lib/openstreet-map.js +index e6f10de..3a911ce 100644 +--- a/ui/src/app/widget/lib/openstreet-map.js ++++ b/ui/src/app/widget/lib/openstreet-map.js +@@ -28,8 +28,8 @@ export default class TbOpenStreetMap { + + this.map = L.map($containerElement[0]).setView([0, 0], this.defaultZoomLevel || 8); + +- L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', { +- attribution: '© OpenStreetMap contributors' ++ L.tileLayer('https://{s}.tile.osm.org/{z}/{x}/{y}.png', { ++ attribution: '© OpenStreetMap contributors' + }).addTo(this.map); + + if (initCallback) { +@@ -51,11 +51,11 @@ export default class TbOpenStreetMap { + updateMarkerColor(marker, color) { + var pinColor = color.substr(1); + var icon = L.icon({ +- iconUrl: 'http://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|' + pinColor, ++ iconUrl: 'https://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|' + pinColor, + iconSize: [21, 34], + iconAnchor: [10, 34], + popupAnchor: [0, -34], +- shadowUrl: 'http://chart.apis.google.com/chart?chst=d_map_pin_shadow', ++ shadowUrl: 'https://chart.apis.google.com/chart?chst=d_map_pin_shadow', + shadowSize: [40, 37], + shadowAnchor: [12, 35] + }); +@@ -96,11 +96,11 @@ export default class TbOpenStreetMap { + var height = 34; + var pinColor = settings.color.substr(1); + var icon = L.icon({ +- iconUrl: 'http://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|' + pinColor, ++ iconUrl: 'https://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|' + pinColor, + iconSize: [21, 34], + iconAnchor: [10, 34], + popupAnchor: [0, -34], +- shadowUrl: 'http://chart.apis.google.com/chart?chst=d_map_pin_shadow', ++ shadowUrl: 'https://chart.apis.google.com/chart?chst=d_map_pin_shadow', + shadowSize: [40, 37], + shadowAnchor: [12, 35] + }); diff --git a/ui/src/app/widget/lib/google-map.js b/ui/src/app/widget/lib/google-map.js index c3d294e5a1..4b0ea2fd17 100644 --- a/ui/src/app/widget/lib/google-map.js +++ b/ui/src/app/widget/lib/google-map.js @@ -152,7 +152,7 @@ export default class TbGoogleMap { /* eslint-disable no-undef */ updateMarkerColor(marker, color) { var pinColor = color.substr(1); - var pinImage = new google.maps.MarkerImage("http://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|" + pinColor, + var pinImage = new google.maps.MarkerImage("https://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|" + pinColor, new google.maps.Size(21, 34), new google.maps.Point(0,0), new google.maps.Point(10, 34)); @@ -191,11 +191,11 @@ export default class TbGoogleMap { createMarker(location, settings, onClickListener, markerArgs) { var height = 34; var pinColor = settings.color.substr(1); - var pinImage = new google.maps.MarkerImage("http://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|" + pinColor, + var pinImage = new google.maps.MarkerImage("https://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|" + pinColor, new google.maps.Size(21, 34), new google.maps.Point(0,0), new google.maps.Point(10, 34)); - var pinShadow = new google.maps.MarkerImage("http://chart.apis.google.com/chart?chst=d_map_pin_shadow", + var pinShadow = new google.maps.MarkerImage("https://chart.apis.google.com/chart?chst=d_map_pin_shadow", new google.maps.Size(40, 37), new google.maps.Point(0, 0), new google.maps.Point(12, 35)); @@ -350,4 +350,4 @@ export default class TbGoogleMap { return this.tooltips; } -} \ No newline at end of file +} diff --git a/ui/src/app/widget/lib/openstreet-map.js b/ui/src/app/widget/lib/openstreet-map.js index e6f10de15f..3a911ced95 100644 --- a/ui/src/app/widget/lib/openstreet-map.js +++ b/ui/src/app/widget/lib/openstreet-map.js @@ -28,8 +28,8 @@ export default class TbOpenStreetMap { this.map = L.map($containerElement[0]).setView([0, 0], this.defaultZoomLevel || 8); - L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', { - attribution: '© OpenStreetMap contributors' + L.tileLayer('https://{s}.tile.osm.org/{z}/{x}/{y}.png', { + attribution: '© OpenStreetMap contributors' }).addTo(this.map); if (initCallback) { @@ -51,11 +51,11 @@ export default class TbOpenStreetMap { updateMarkerColor(marker, color) { var pinColor = color.substr(1); var icon = L.icon({ - iconUrl: 'http://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|' + pinColor, + iconUrl: 'https://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|' + pinColor, iconSize: [21, 34], iconAnchor: [10, 34], popupAnchor: [0, -34], - shadowUrl: 'http://chart.apis.google.com/chart?chst=d_map_pin_shadow', + shadowUrl: 'https://chart.apis.google.com/chart?chst=d_map_pin_shadow', shadowSize: [40, 37], shadowAnchor: [12, 35] }); @@ -96,11 +96,11 @@ export default class TbOpenStreetMap { var height = 34; var pinColor = settings.color.substr(1); var icon = L.icon({ - iconUrl: 'http://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|' + pinColor, + iconUrl: 'https://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|' + pinColor, iconSize: [21, 34], iconAnchor: [10, 34], popupAnchor: [0, -34], - shadowUrl: 'http://chart.apis.google.com/chart?chst=d_map_pin_shadow', + shadowUrl: 'https://chart.apis.google.com/chart?chst=d_map_pin_shadow', shadowSize: [40, 37], shadowAnchor: [12, 35] }); From 3ed8d0e9c3a10bca091997e6da1c428346babb2c Mon Sep 17 00:00:00 2001 From: ssmaurya Date: Wed, 2 Aug 2017 21:40:18 +0530 Subject: [PATCH 2/2] Delete ssl.patch --- ssl.patch | 77 ------------------------------------------------------- 1 file changed, 77 deletions(-) delete mode 100644 ssl.patch diff --git a/ssl.patch b/ssl.patch deleted file mode 100644 index 6d0816fb96..0000000000 --- a/ssl.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff --git a/ui/src/app/widget/lib/google-map.js b/ui/src/app/widget/lib/google-map.js -index c3d294e..4b0ea2f 100644 ---- a/ui/src/app/widget/lib/google-map.js -+++ b/ui/src/app/widget/lib/google-map.js -@@ -152,7 +152,7 @@ export default class TbGoogleMap { - /* eslint-disable no-undef */ - updateMarkerColor(marker, color) { - var pinColor = color.substr(1); -- var pinImage = new google.maps.MarkerImage("http://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|" + pinColor, -+ var pinImage = new google.maps.MarkerImage("https://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|" + pinColor, - new google.maps.Size(21, 34), - new google.maps.Point(0,0), - new google.maps.Point(10, 34)); -@@ -191,11 +191,11 @@ export default class TbGoogleMap { - createMarker(location, settings, onClickListener, markerArgs) { - var height = 34; - var pinColor = settings.color.substr(1); -- var pinImage = new google.maps.MarkerImage("http://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|" + pinColor, -+ var pinImage = new google.maps.MarkerImage("https://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|" + pinColor, - new google.maps.Size(21, 34), - new google.maps.Point(0,0), - new google.maps.Point(10, 34)); -- var pinShadow = new google.maps.MarkerImage("http://chart.apis.google.com/chart?chst=d_map_pin_shadow", -+ var pinShadow = new google.maps.MarkerImage("https://chart.apis.google.com/chart?chst=d_map_pin_shadow", - new google.maps.Size(40, 37), - new google.maps.Point(0, 0), - new google.maps.Point(12, 35)); -@@ -350,4 +350,4 @@ export default class TbGoogleMap { - return this.tooltips; - } - --} -\ No newline at end of file -+} -diff --git a/ui/src/app/widget/lib/openstreet-map.js b/ui/src/app/widget/lib/openstreet-map.js -index e6f10de..3a911ce 100644 ---- a/ui/src/app/widget/lib/openstreet-map.js -+++ b/ui/src/app/widget/lib/openstreet-map.js -@@ -28,8 +28,8 @@ export default class TbOpenStreetMap { - - this.map = L.map($containerElement[0]).setView([0, 0], this.defaultZoomLevel || 8); - -- L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', { -- attribution: '© OpenStreetMap contributors' -+ L.tileLayer('https://{s}.tile.osm.org/{z}/{x}/{y}.png', { -+ attribution: '© OpenStreetMap contributors' - }).addTo(this.map); - - if (initCallback) { -@@ -51,11 +51,11 @@ export default class TbOpenStreetMap { - updateMarkerColor(marker, color) { - var pinColor = color.substr(1); - var icon = L.icon({ -- iconUrl: 'http://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|' + pinColor, -+ iconUrl: 'https://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|' + pinColor, - iconSize: [21, 34], - iconAnchor: [10, 34], - popupAnchor: [0, -34], -- shadowUrl: 'http://chart.apis.google.com/chart?chst=d_map_pin_shadow', -+ shadowUrl: 'https://chart.apis.google.com/chart?chst=d_map_pin_shadow', - shadowSize: [40, 37], - shadowAnchor: [12, 35] - }); -@@ -96,11 +96,11 @@ export default class TbOpenStreetMap { - var height = 34; - var pinColor = settings.color.substr(1); - var icon = L.icon({ -- iconUrl: 'http://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|' + pinColor, -+ iconUrl: 'https://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|' + pinColor, - iconSize: [21, 34], - iconAnchor: [10, 34], - popupAnchor: [0, -34], -- shadowUrl: 'http://chart.apis.google.com/chart?chst=d_map_pin_shadow', -+ shadowUrl: 'https://chart.apis.google.com/chart?chst=d_map_pin_shadow', - shadowSize: [40, 37], - shadowAnchor: [12, 35] - });