set marker style once

IITC-CE · Feb 14, 2021 · 228aa0e · 228aa0e
1 parent 4f2ddc2
commit 228aa0e
Showing 1 changed file with 20 additions and 4 deletions.
diff --git a/core/code/portal_marker.js b/core/code/portal_marker.js
@@ -25,6 +25,19 @@ function handler_portal_contextmenu (e) {
   }
 }
 
+var CompatPortalMarker = L.Class.extend({
+  initialize: function (portal) {
+    this.options = portal.options;
+    this.style = {};
+  },
+  setStyle: function (style) {
+    this.style = style;
+  },
+  getStyle: function () {
+    return this.style;
+  }
+})
+
 var PortalMarker = L.CircleMarker.extend({
   options: {},
 
@@ -127,20 +140,23 @@ var PortalMarker = L.CircleMarker.extend({
   },
   reset: function (selected) {
     var styleOptions = this._style();
-    this.setStyle(styleOptions);
 
-    this.highlight();
+    L.Util.extend(styleOptions, this.highlight())
 
     if (selected === false)
       this._selected = false;
     else
       this._selected = this._selected || selected;
 
     if (this._selected)
-      this.setStyle ({color: COLOR_SELECTED_PORTAL});
+      L.Util.extend(styleOptions, {color: COLOR_SELECTED_PORTAL});
+
+    this.setOptions(styleOptions);
   },
   highlight: function () {
-    highlightPortal(this);
+    var compatPortal = new CompatPortalMarker(this);
+    var style = highlightPortal(compatPortal);
+    return style || compatPortal.getStyle();
   },
   _style: function () {
     var dashArray = null;