added child node layer which is hidden by default to circuit viewer t…

…o slightly increase performance for extremely large circuits
dpinney · Feb 27, 2024 · a8ede68 · a8ede68
1 parent 05c8dcc
commit a8ede68
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/omf/static/geoJsonMap/v3/leafletLayer.js b/omf/static/geoJsonMap/v3/leafletLayer.js
@@ -16,6 +16,7 @@ class LeafletLayer { // implements ObserverInterface
     static map;
     static nodeLayers = L.featureGroup();
     static parentChildLineLayers = L.featureGroup();
+    static childNodeLayers = L.featureGroup();
 
     /**
      * @param {Feature} observable - an ObservableInterface instance
@@ -89,7 +90,11 @@ class LeafletLayer { // implements ObserverInterface
         layer.remove();
         // - Need to explicitly remove the underlying layer from its LayerGroup
         if (observable.isNode()) {
-            LeafletLayer.nodeLayers.removeLayer(this.#layer);
+            if (observable.isChild()) {
+                LeafletLayer.childNodeLayers.removeLayer(this.#layer);
+            } else {
+                LeafletLayer.nodeLayers.removeLayer(this.#layer);
+            }
         } else if (observable.isLine()) {
             if (observable.isParentChildLine()) {
                 LeafletLayer.parentChildLineLayers.removeLayer(this.#layer);
@@ -172,7 +177,11 @@ class LeafletLayer { // implements ObserverInterface
         }
         const ll = new LeafletLayer(observable, controller);
         if (observable.isNode()) {
-            LeafletLayer.nodeLayers.addLayer(ll.getLayer());
+            if (observable.isChild()) {
+                LeafletLayer.childNodeLayers.addLayer(ll.getLayer());
+            } else {
+                LeafletLayer.nodeLayers.addLayer(ll.getLayer());
+            }
         } else if (observable.isLine()) {
             if (observable.isParentChildLine()) {
                 LeafletLayer.parentChildLineLayers.addLayer(ll.getLayer());

diff --git a/omf/static/geoJsonMap/v3/main.js b/omf/static/geoJsonMap/v3/main.js
@@ -67,6 +67,7 @@ function main() {
     };
     const overlayMaps = {
         'Nodes': LeafletLayer.nodeLayers,
+        'Child Nodes': LeafletLayer.childNodeLayers,
         'Lines': LeafletLayer.lineLayers,
         'Parent-Child Lines': LeafletLayer.parentChildLineLayers,
     }
@@ -75,7 +76,7 @@ function main() {
         // - This zoom level sensibly displays all circuits to start, even the ones with weird one-off players that skew where the center is
         zoom: 14,
         // - Provide the layers that the map should start with
-        layers: [esri_satellite_layer, LeafletLayer.nodeLayers, LeafletLayer.lineLayers, LeafletLayer.parentChildLineLayers],
+        layers: [esri_satellite_layer, LeafletLayer.nodeLayers, LeafletLayer.lineLayers],
         // - Better performance for large datasets
         renderer: L.canvas()
     });