[feature] Add support for GeoJSON #116

closes #116
openwisp · Aug 10, 2022 · 2f62118 · 2f62118
1 parent 1606d69
commit 2f62118
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 4 deletions.
diff --git a/src/js/netjsongraph.config.js b/src/js/netjsongraph.config.js
@@ -139,6 +139,16 @@ const NetJSONGraphDefaultConfig = {
       },
     },
   ],
+  geoOptions: {
+    style: {
+      fillColor: "#d94f34",
+      color: "#d94f34",
+      weight: 2,
+      opacity: 1,
+      fillOpacity: 0.3,
+      radius: 10,
+    },
+  },
   nodeCategories: [],
   linkCategories: [],
 

diff --git a/src/js/netjsongraph.core.js b/src/js/netjsongraph.core.js
@@ -8,11 +8,13 @@ class NetJSONGraph {
    * @param {string} JSONParam    The NetJSON file param
    * @param {Object} config
    */
-  constructor(JSONParam) {
+  constructor(JSONParam, GeoJSONParam) {
     this.utils = new NetJSONGraphUpdate();
 
     this.config = {...NetJSONGraphDefaultConfig};
 
+    this.GeoJSONParam = GeoJSONParam;
+
     this.JSONParam = this.utils.isArray(JSONParam) ? JSONParam : [JSONParam];
   }
 
@@ -62,7 +64,11 @@ class NetJSONGraph {
     this.event.once("onLoad", this.config.onLoad.bind(this));
 
     this.utils
-      .JSONParamParse(JSONParam)
+      .JSONParamParse(this.GeoJSONParam)
+      .then((data) => {
+        this.geoData = data;
+        return this.utils.JSONParamParse(JSONParam);
+      })
       .then((JSONData) => {
         this.config.prepareData.call(this, JSONData);
         this.data = JSONData;

diff --git a/src/js/netjsongraph.js b/src/js/netjsongraph.js
@@ -14,15 +14,16 @@ class NetJSONGraph {
    * @param {string} JSONParam    The NetJSON file param
    * @param {Object} config
    */
-  constructor(JSONParam, config) {
+
+  constructor(JSONParam, config, GeoJSONParam = {}) {
     if (config && config.render === "map") {
       config.render = NetJSONGraphRender.prototype.mapRender;
     } else if (!config || !config.render || config.render === "graph") {
       config = config || {};
       config.render = NetJSONGraphRender.prototype.graphRender;
     }
 
-    const graph = new NetJSONGraphCore(JSONParam);
+    let graph = new NetJSONGraphCore(JSONParam, GeoJSONParam);
 
     Object.setPrototypeOf(NetJSONGraphRender.prototype, graph.utils);
     graph.gui = new NetJSONGraphGUI(graph);

diff --git a/src/js/netjsongraph.render.js b/src/js/netjsongraph.render.js
@@ -322,6 +322,14 @@ class NetJSONGraphRender {
     // eslint-disable-next-line no-underscore-dangle
     self.leaflet._zoomAnimated = false;
 
+    if (Object.keys(self.geoData).length) {
+      L.geoJSON(self.geoData, {
+        ...self.config.geoOptions,
+        pointToLayer: (feature, latlng) =>
+          L.circleMarker(latlng, self.config.geoOptions.style),
+      }).addTo(self.leaflet);
+    }
+
     self.event.emit("onLoad");
     self.event.emit("onReady");
     self.event.emit("renderArray");