[chores] Minor improvements

openwisp · Aug 18, 2022 · d28bfee · d28bfee
1 parent 39a8bd5
commit d28bfee
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 11 deletions.
diff --git a/dist/netjsongraph.min.js b/dist/netjsongraph.min.js
diff --git a/src/js/netjsongraph.render.js b/src/js/netjsongraph.render.js
@@ -334,9 +334,8 @@ class NetJSONGraphRender {
     // eslint-disable-next-line no-underscore-dangle
     self.leaflet._zoomAnimated = false;
 
-    if (!self.config.geoOptions.pointToLayer) {
-      self.config.geoOptions = {
-        ...self.config.geoOptions,
+    self.config.geoOptions = self.utils.deepMergeObj(
+      {
         pointToLayer: (feature, latlng) =>
           L.circleMarker(latlng, self.config.geoOptions.style),
         onEachFeature: (feature, layer) => {
@@ -348,8 +347,9 @@ class NetJSONGraphRender {
             self.config.onClickElement.call(self, "Feature", properties);
           });
         },
-      };
-    }
+      },
+      self.config.geoOptions,
+    );
 
     if (self.type === "geojson") {
       self.leaflet.geoJSON = L.geoJSON(self.data, self.config.geoOptions).addTo(

diff --git a/src/js/netjsongraph.util.js b/src/js/netjsongraph.util.js
@@ -198,13 +198,14 @@ class NetJSONGraphUtil {
    * @return {bool}
    */
   isGeoJSON(param) {
-    if (
-      param.type &&
-      (param.type === "FeatureCollection" || param.type === "Feature")
-    ) {
+    if (param.type && param.type === "FeatureCollection") {
       return this.isObject(param) && this.isArray(param.features);
     }
 
+    if (param.type && param.type === "Feature") {
+      return this.isObject(param) && this.isArray(param.geometry);
+    }
+
     return false;
   }
 

diff --git a/test/netjsongraph.calc.test.js b/test/netjsongraph.calc.test.js
@@ -475,5 +475,11 @@ describe("Test netjsongraph function utils", () => {
     };
     expect(util.isGeoJSON(data)).toBeFalsy();
     expect(util.isNetJSON(data)).toBeFalsy();
+    data = {
+      type: "Feature",
+      properties: {},
+      geometry: [],
+    };
+    expect(util.isGeoJSON(data)).toBeTruthy();
   });
 });
diff --git a/test/netjsongraph.render.test.js b/test/netjsongraph.render.test.js
@@ -286,7 +286,7 @@ describe("Test netjsongraph properties", () => {
   });
 });
 
-describe("Test netjsongraph properties", () => {
+describe("Test netjsongraph GeoJSON properties", () => {
   const geoJSONData = {
     type: "FeatureCollection",
     features: [