From 5f019c7799d4449d200b6188ef55f7ac60f4d327 Mon Sep 17 00:00:00 2001
From: Sebastian Gatscha <gatscha@trafficon.eu>
Date: Sat, 29 Aug 2020 19:00:27 +0200
Subject: [PATCH] split gilfyUtils

---
 R/glify-helpers.R                                 |  9 ++++++---
 inst/htmlwidgets/Leaflet.glify/GlifyUtils.js      | 15 +++++++++++++++
 inst/htmlwidgets/Leaflet.glify/addGlifyPoints.js  |  9 ---------
 .../htmlwidgets/Leaflet.glify/addGlifyPolygons.js |  5 -----
 .../Leaflet.glify/addGlifyPolylines.js            |  3 ---
 5 files changed, 21 insertions(+), 20 deletions(-)
 create mode 100644 inst/htmlwidgets/Leaflet.glify/GlifyUtils.js

diff --git a/R/glify-helpers.R b/R/glify-helpers.R
index 5277897..f110fd2 100644
--- a/R/glify-helpers.R
+++ b/R/glify-helpers.R
@@ -6,7 +6,8 @@ glifyDependencies = function() {
       '3.0.1',
       system.file("htmlwidgets/Leaflet.glify", package = "leafgl"),
       script = c(
-        "addGlifyPoints.js"
+        "GlifyUtils.js"
+        , "addGlifyPoints.js"
         , "addGlifyPolygons.js"
         , "addGlifyPolylines.js"
         , "glify-browser.js"
@@ -24,7 +25,8 @@ glifyDependenciesFl = function() {
       '2.2.0',
       system.file("htmlwidgets/Leaflet.glify", package = "leafgl"),
       script = c(
-        "addGlifyPoints.js"
+        "GlifyUtils.js"
+        , "addGlifyPoints.js"
         , "addGlifyPolygonsFl.js"
         , "addGlifyPolylines.js"
         , "glify.js"
@@ -41,7 +43,8 @@ glifyDependenciesSrc = function() {
       '2.2.0',
       system.file("htmlwidgets/Leaflet.glify", package = "leafgl"),
       script = c(
-        "addGlifyPointsSrc.js"
+        "GlifyUtils.js"
+        , "addGlifyPointsSrc.js"
         , "addGlifyPolygonsSrc.js"
         , "addGlifyPolylinesSrc.js"
         , "glify-browser.js"
diff --git a/inst/htmlwidgets/Leaflet.glify/GlifyUtils.js b/inst/htmlwidgets/Leaflet.glify/GlifyUtils.js
new file mode 100644
index 0000000..6c8ae4b
--- /dev/null
+++ b/inst/htmlwidgets/Leaflet.glify/GlifyUtils.js
@@ -0,0 +1,15 @@
+LeafletWidget.methods.clearGlLayers = function() {
+  this.layerManager.clearLayers("glify");
+};
+
+LeafletWidget.methods.removeGlPolygons = function(layerId) {
+  this.layerManager.removeLayer("glify", layerId);
+};
+
+LeafletWidget.methods.removeGlPolylines = function(layerId) {
+  this.layerManager.removeLayer("glify", layerId);
+};
+
+LeafletWidget.methods.removeGlPoints = function(layerId) {
+  this.layerManager.removeLayer("glify", layerId);
+};
diff --git a/inst/htmlwidgets/Leaflet.glify/addGlifyPoints.js b/inst/htmlwidgets/Leaflet.glify/addGlifyPoints.js
index 8852560..b816918 100644
--- a/inst/htmlwidgets/Leaflet.glify/addGlifyPoints.js
+++ b/inst/htmlwidgets/Leaflet.glify/addGlifyPoints.js
@@ -91,12 +91,3 @@ LeafletWidget.methods.addGlifyPoints = function(data, cols, popup, opacity, radi
 
   map.layerManager.addLayer(pointslayer.glLayer, "glify", layerId, group);
 };
-
-
-LeafletWidget.methods.removeGlPoints = function(layerId) {
-  this.layerManager.removeLayer("glify", layerId);
-};
-
-LeafletWidget.methods.clearGlLayers = function() {
-  this.layerManager.clearLayers("glify");
-};
\ No newline at end of file
diff --git a/inst/htmlwidgets/Leaflet.glify/addGlifyPolygons.js b/inst/htmlwidgets/Leaflet.glify/addGlifyPolygons.js
index 30f5302..d930370 100644
--- a/inst/htmlwidgets/Leaflet.glify/addGlifyPolygons.js
+++ b/inst/htmlwidgets/Leaflet.glify/addGlifyPolygons.js
@@ -46,8 +46,3 @@ LeafletWidget.methods.addGlifyPolygons = function(data, cols, popup, opacity, gr
 
   map.layerManager.addLayer(shapeslayer.glLayer, "glify", layerId, group);
 };
-
-
-LeafletWidget.methods.removeGlPolygons = function(layerId) {
-  this.layerManager.removeLayer("glify", layerId);
-};
\ No newline at end of file
diff --git a/inst/htmlwidgets/Leaflet.glify/addGlifyPolylines.js b/inst/htmlwidgets/Leaflet.glify/addGlifyPolylines.js
index 7a5780f..4c94af9 100644
--- a/inst/htmlwidgets/Leaflet.glify/addGlifyPolylines.js
+++ b/inst/htmlwidgets/Leaflet.glify/addGlifyPolylines.js
@@ -58,7 +58,4 @@ LeafletWidget.methods.addGlifyPolylines = function(data, cols, popup, opacity, g
 };
 
 
-LeafletWidget.methods.removeGlPolylines = function(layerId) {
-  this.layerManager.removeLayer("glify", layerId);
-};