From 0238fdc9201941bc22d2d382efb3ce4e7f716fd7 Mon Sep 17 00:00:00 2001
From: Zottacko WallyMan <44207278+zottacko@users.noreply.github.com>
Date: Wed, 18 Jan 2023 15:54:16 -0600
Subject: [PATCH 1/8] Fixed JSON parsing on highmaps.add_map_data
On the content.html file a $.parseJSON(); call was missing when adding custom GeoJSON map.
---
highcharts/highmaps/templates/content.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/highcharts/highmaps/templates/content.html b/highcharts/highmaps/templates/content.html
index f0f6a95..bf7361a 100644
--- a/highcharts/highmaps/templates/content.html
+++ b/highcharts/highmaps/templates/content.html
@@ -26,7 +26,7 @@
var option = {{chart.option}};
{% if chart.mapdata_flag %}
- var geojson = {{chart.mapdata}}
+ var geojson = $.parseJSON({{chart.mapdata}});
{% endif %}
var data = {{chart.data}};
From c0f816eeb4b4b13ce1d08cbd0d86dcd5d50bb78f Mon Sep 17 00:00:00 2001
From: Zottacko WallyMan <44207278+zottacko@users.noreply.github.com>
Date: Wed, 18 Jan 2023 15:59:50 -0600
Subject: [PATCH 2/8] Updated Highmaps Headers
Updated JSsource list to Highmaps 9 links since many of the previous versions doesn't seem to work properly.
Also removed 'https://www.highcharts.com/highslide/highslide.css' from CSSsource since it's not available anymore.
---
highcharts/highmaps/highmaps.py | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/highcharts/highmaps/highmaps.py b/highcharts/highmaps/highmaps.py
index 0d73afc..8066342 100644
--- a/highcharts/highmaps/highmaps.py
+++ b/highcharts/highmaps/highmaps.py
@@ -66,17 +66,15 @@ def __init__(self, **kwargs):
# Set Javascript src
self.JSsource = [
'https://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js',
- 'https://code.highcharts.com/maps/6/highmaps.js',
- 'https://code.highcharts.com/6/highcharts.js',
- 'https://code.highcharts.com/maps/6/modules/map.js',
- 'https://code.highcharts.com/maps/6/modules/data.js',
- 'https://code.highcharts.com/maps/6/modules/exporting.js'
+ 'https://code.highcharts.com/maps/9/highmaps.js',
+ 'https://code.highcharts.com/9/highcharts.js',
+ 'https://code.highcharts.com/maps/9/modules/map.js',
+ 'https://code.highcharts.com/maps/9/modules/data.js',
+ 'https://code.highcharts.com/maps/9/modules/exporting.js'
]
# set CSS src
- self.CSSsource = [
- 'https://www.highcharts.com/highslide/highslide.css',
- ]
+ self.CSSsource = []
# Set data
self.data = []
self.data_temp = []
From 8a55687e7b9adb6cce1718c07016f7dfd2c88a31 Mon Sep 17 00:00:00 2001
From: Zottacko WallyMan <44207278+zottacko@users.noreply.github.com>
Date: Wed, 18 Jan 2023 16:02:49 -0600
Subject: [PATCH 3/8] Cleared CSSsource on highcharts.py
Removed 'https://www.highcharts.com/highslide/highslide.css' from CSSsource since it's not available anymore.
---
highcharts/highcharts/highcharts.py | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/highcharts/highcharts/highcharts.py b/highcharts/highcharts/highcharts.py
index 59e093e..7247bf3 100644
--- a/highcharts/highcharts/highcharts.py
+++ b/highcharts/highcharts/highcharts.py
@@ -75,10 +75,7 @@ def __init__(self, **kwargs):
]
# set CSS src
- self.CSSsource = [
- 'https://www.highcharts.com/highslide/highslide.css',
-
- ]
+ self.CSSsource = []
self.offline = kwargs.get("offline", False)
From 43eb08767299b9124fc3d45b7e3d3b08fa7865c1 Mon Sep 17 00:00:00 2001
From: Zottacko WallyMan <44207278+zottacko@users.noreply.github.com>
Date: Wed, 18 Jan 2023 16:03:59 -0600
Subject: [PATCH 4/8] Cleared CSSsource on highstock.py
Removed 'https://www.highcharts.com/highslide/highslide.css' from CSSsource since it's not available anymore.
---
highcharts/highstock/highstock.py | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/highcharts/highstock/highstock.py b/highcharts/highstock/highstock.py
index ef8610d..942f2c8 100644
--- a/highcharts/highstock/highstock.py
+++ b/highcharts/highstock/highstock.py
@@ -68,10 +68,7 @@ def __init__(self, **kwargs):
]
# set CSS src
- self.CSSsource = [
- 'https://www.highcharts.com/highslide/highslide.css',
-
- ]
+ self.CSSsource = []
# set data
self.data = []
self.data_temp = []
From bb43cdecdc874fb98a01edae17db85ec216c894c Mon Sep 17 00:00:00 2001
From: Zottacko WallyMan <44207278+zottacko@users.noreply.github.com>
Date: Thu, 23 Feb 2023 18:41:43 -0600
Subject: [PATCH 5/8] Update highmaps.py
added highcharts specification for drilldown
---
highcharts/highmaps/highmaps.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/highcharts/highmaps/highmaps.py b/highcharts/highmaps/highmaps.py
index 8066342..538f329 100644
--- a/highcharts/highmaps/highmaps.py
+++ b/highcharts/highmaps/highmaps.py
@@ -378,7 +378,7 @@ def buildhtmlheader(self):
#Highcharts lib/ needs to make sure it's up to date
if self.drilldown_flag:
- self.add_JSsource('https://code.highcharts.com/maps/modules/drilldown.js')
+ self.add_JSsource('https://code.highcharts.com/maps/modules/9/drilldown.js')
self.header_css = [
'' % h for h in self.CSSsource
From 6318673f3543bef1a33097cfdbdc878fb9ffd063 Mon Sep 17 00:00:00 2001
From: Zottacko WallyMan <44207278+zottacko@users.noreply.github.com>
Date: Thu, 23 Feb 2023 18:43:30 -0600
Subject: [PATCH 6/8] Added highcharts specification
Added highcherts version 9 for drilldown
---
highcharts/highcharts/highcharts.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/highcharts/highcharts/highcharts.py b/highcharts/highcharts/highcharts.py
index 7247bf3..a858dfb 100644
--- a/highcharts/highcharts/highcharts.py
+++ b/highcharts/highcharts/highcharts.py
@@ -337,7 +337,7 @@ def buildhtmlheader(self):
"""generate HTML header content"""
if self.drilldown_flag:
- self.add_JSsource('http://code.highcharts.com/modules/drilldown.js')
+ self.add_JSsource('http://code.highcharts.com/modules/9/drilldown.js')
From d325e2f4c12c9bf23d52f369df9e66a0c82cd53c Mon Sep 17 00:00:00 2001
From: Zottacko WallyMan <44207278+zottacko@users.noreply.github.com>
Date: Thu, 23 Feb 2023 18:47:44 -0600
Subject: [PATCH 7/8] Drilldown version 9
---
highcharts/highcharts/highcharts.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/highcharts/highcharts/highcharts.py b/highcharts/highcharts/highcharts.py
index a858dfb..f3a9fd1 100644
--- a/highcharts/highcharts/highcharts.py
+++ b/highcharts/highcharts/highcharts.py
@@ -337,7 +337,7 @@ def buildhtmlheader(self):
"""generate HTML header content"""
if self.drilldown_flag:
- self.add_JSsource('http://code.highcharts.com/modules/9/drilldown.js')
+ self.add_JSsource('https://code.highcharts.com/9/modules/drilldown.js')
From 8002ef9bdb4e2357ec2f14f18fde15850a41ee29 Mon Sep 17 00:00:00 2001
From: Zottacko WallyMan <44207278+zottacko@users.noreply.github.com>
Date: Thu, 23 Feb 2023 18:48:43 -0600
Subject: [PATCH 8/8] Drilldown version 9
---
highcharts/highmaps/highmaps.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/highcharts/highmaps/highmaps.py b/highcharts/highmaps/highmaps.py
index 538f329..75bdee0 100644
--- a/highcharts/highmaps/highmaps.py
+++ b/highcharts/highmaps/highmaps.py
@@ -378,7 +378,7 @@ def buildhtmlheader(self):
#Highcharts lib/ needs to make sure it's up to date
if self.drilldown_flag:
- self.add_JSsource('https://code.highcharts.com/maps/modules/9/drilldown.js')
+ self.add_JSsource('https://code.highcharts.com/maps/9/modules/drilldown.js')
self.header_css = [
'' % h for h in self.CSSsource