From 0795c8e0ae89642a3cda4f9f52db55dd19f26c31 Mon Sep 17 00:00:00 2001
From: Alexander Danilov <git@modos189.ru>
Date: Fri, 1 Nov 2024 16:41:13 +0500
Subject: [PATCH 01/70] Rewrite window.search.Query as an ES6 class And moving
 the initialization from init to the constructor.

---
 core/code/search.js | 411 ++++++++++++++++++++++----------------------
 1 file changed, 205 insertions(+), 206 deletions(-)

diff --git a/core/code/search.js b/core/code/search.js
index 275351531..3975cfeb0 100644
--- a/core/code/search.js
+++ b/core/code/search.js
@@ -36,245 +36,244 @@ window.search = {
  * @memberof window.search
  * @class
  * @name window.search.Query
- * @param {string} term - The search term.
- * @param {boolean} confirmed - Indicates if the search is confirmed (e.g., by pressing Enter).
- */
-window.search.Query = function (term, confirmed) {
-  this.term = term;
-  this.confirmed = confirmed;
-  this.init();
-};
-
-/**
- * Initializes the search query, setting up the DOM elements and triggering the 'search' hook.
- *
- * @function
  */
-window.search.Query.prototype.init = function () {
-  this.results = [];
-
-  this.container = $('<div>').addClass('searchquery');
-
-  this.header = $('<h3>')
-    .text(
-      this.confirmed
-        ? this.term
-        : (this.term.length > 16 ? this.term.substr(0, 8) + '…' + this.term.substr(this.term.length - 8, 8) : this.term) + ' (Return to load more)'
-    )
-    .appendTo(this.container);
-
-  this.list = $('<ul>')
-    .appendTo(this.container)
-    .append($('<li>').text(this.confirmed ? 'No local results, searching online...' : 'No local results.'));
-
-  this.container.accordion({
-    collapsible: true,
-    heightStyle: 'content',
-  });
-
-  window.runHooks('search', this);
-};
-
-/**
- * Displays the search query results in the search wrapper.
- *
- * @function
- */
-window.search.Query.prototype.show = function () {
-  this.container.appendTo('#searchwrapper');
-};
+class Query {
+  /**
+   * Initializes the search query, setting up the DOM elements and triggering the 'search' hook.
+   *
+   * @function
+   * @param {string} term - The search term.
+   * @param {boolean} confirmed - Indicates if the search is confirmed (e.g., by pressing Enter).
+   */
+  constructor(term, confirmed) {
+    this.term = term;
+    this.confirmed = confirmed;
+    this.results = [];
+    this.container = $('<div>').addClass('searchquery');
+
+    this.header = $('<h3>')
+      .text(
+        this.confirmed
+          ? this.term
+          : (this.term.length > 16 ? this.term.substr(0, 8) + '…' + this.term.substr(this.term.length - 8, 8) : this.term) + ' (Return to load more)'
+      )
+      .appendTo(this.container);
+
+    this.list = $('<ul>')
+      .appendTo(this.container)
+      .append($('<li>').text(this.confirmed ? 'No local results, searching online...' : 'No local results.'));
+
+    this.container.accordion({
+      collapsible: true,
+      heightStyle: 'content',
+    });
 
-/**
- * Hides the search query results and cleans up.
- *
- * @function
- */
-window.search.Query.prototype.hide = function () {
-  this.container.remove();
-  this.removeSelectedResult();
-  this.removeHoverResult();
-};
+    window.runHooks('search', this);
+  }
 
-/**
- * Adds a search result to this query.
- *
- * @function
- * @param {Object} result - The search result object to add.
- */
-window.search.Query.prototype.addResult = function (result) {
-  if (this.results.length === 0) {
-    // remove 'No results'
-    this.list.empty();
+  /**
+   * Displays the search query results in the search wrapper.
+   *
+   * @function
+   */
+  show() {
+    this.container.appendTo('#searchwrapper');
   }
 
-  this.results.push(result);
-  var item = $('<li>')
-    .appendTo(this.list)
-    .attr('tabindex', '0')
-    .on(
-      'click dblclick',
-      function (ev) {
-        this.onResultSelected(result, ev);
-      }.bind(this)
-    )
-    .on(
-      'mouseover',
-      function (ev) {
-        this.onResultHoverStart(result, ev);
-      }.bind(this)
-    )
-    .on(
-      'mouseout',
-      function (ev) {
-        this.onResultHoverEnd(result, ev);
-      }.bind(this)
-    )
-    .keypress(function (ev) {
-      if ((ev.keyCode || ev.charCode || ev.which) === 32) {
-        ev.preventDefault();
-        ev.type = 'click';
-        $(this).trigger(ev);
-        return;
-      }
-      if ((ev.keyCode || ev.charCode || ev.which) === 13) {
-        ev.preventDefault();
-        ev.type = 'dblclick';
-        $(this).trigger(ev);
-        return;
-      }
-    });
+  /**
+   * Hides the search query results and cleans up.
+   *
+   * @function
+   */
+  hide() {
+    this.container.remove();
+    this.removeSelectedResult();
+    this.removeHoverResult();
+  }
 
-  var link = $('<a>').append(result.title).appendTo(item);
+  /**
+   * Adds a search result to this query.
+   *
+   * @function
+   * @param {Object} result - The search result object to add.
+   */
+  addResult(result) {
+    if (this.results.length === 0) {
+      // remove 'No results'
+      this.list.empty();
+    }
 
-  if (result.icon) {
-    link.css('background-image', 'url("' + result.icon + '")');
-    item.css('list-style', 'none');
-  }
+    this.results.push(result);
+    var item = $('<li>')
+      .appendTo(this.list)
+      .attr('tabindex', '0')
+      .on(
+        'click dblclick',
+        function (ev) {
+          this.onResultSelected(result, ev);
+        }.bind(this)
+      )
+      .on(
+        'mouseover',
+        function (ev) {
+          this.onResultHoverStart(result, ev);
+        }.bind(this)
+      )
+      .on(
+        'mouseout',
+        function (ev) {
+          this.onResultHoverEnd(result, ev);
+        }.bind(this)
+      )
+      .keypress(function (ev) {
+        if ((ev.keyCode || ev.charCode || ev.which) === 32) {
+          ev.preventDefault();
+          ev.type = 'click';
+          $(this).trigger(ev);
+          return;
+        }
+        if ((ev.keyCode || ev.charCode || ev.which) === 13) {
+          ev.preventDefault();
+          ev.type = 'dblclick';
+          $(this).trigger(ev);
+          return;
+        }
+      });
 
-  if (result.description) {
-    item.append($('<br>')).append($('<em>').append(result.description));
-  }
-};
+    var link = $('<a>').append(result.title).appendTo(item);
 
-/**
- * Creates and returns a layer for the given search result, which could be markers or shapes on the map.
- *
- * @function
- * @param {Object} result - The search result object.
- * @returns {L.Layer} The layer created for this result.
- */
-window.search.Query.prototype.resultLayer = function (result) {
-  if (result.layer !== null && !result.layer) {
-    result.layer = L.layerGroup();
-
-    if (result.position) {
-      L.marker(result.position, {
-        icon: L.divIcon.coloredSvg('red'),
-        title: result.title,
-      }).addTo(result.layer);
+    if (result.icon) {
+      link.css('background-image', 'url("' + result.icon + '")');
+      item.css('list-style', 'none');
     }
 
-    if (result.bounds) {
-      L.rectangle(result.bounds, {
-        title: result.title,
-        interactive: false,
-        color: 'red',
-        fill: false,
-      }).addTo(result.layer);
+    if (result.description) {
+      item.append($('<br>')).append($('<em>').append(result.description));
     }
   }
-  return result.layer;
-};
 
-/**
- * Handles the selection of a search result, including map view adjustments and layer management.
- *
- * @function
- * @param {Object} result - The selected search result object.
- * @param {Event} ev - The event associated with the selection.
- */
-window.search.Query.prototype.onResultSelected = function (result, ev) {
-  this.removeHoverResult();
-  this.removeSelectedResult();
-  this.selectedResult = result;
+  /**
+   * Creates and returns a layer for the given search result, which could be markers or shapes on the map.
+   *
+   * @function
+   * @param {Object} result - The search result object.
+   * @returns {L.Layer} The layer created for this result.
+   */
+  resultLayer(result) {
+    if (result.layer !== null && !result.layer) {
+      result.layer = L.layerGroup();
+
+      if (result.position) {
+        L.marker(result.position, {
+          icon: L.divIcon.coloredSvg('red'),
+          title: result.title,
+        }).addTo(result.layer);
+      }
 
-  if (result.onSelected) {
-    if (result.onSelected(result, ev)) return;
+      if (result.bounds) {
+        L.rectangle(result.bounds, {
+          title: result.title,
+          interactive: false,
+          color: 'red',
+          fill: false,
+        }).addTo(result.layer);
+      }
+    }
+    return result.layer;
   }
 
-  if (ev.type === 'dblclick') {
-    if (result.position) {
-      window.map.setView(result.position, window.DEFAULT_ZOOM);
-    } else if (result.bounds) {
-      window.map.fitBounds(result.bounds, { maxZoom: window.DEFAULT_ZOOM });
+  /**
+   * Handles the selection of a search result, including map view adjustments and layer management.
+   *
+   * @function
+   * @param {Object} result - The selected search result object.
+   * @param {Event} ev - The event associated with the selection.
+   */
+  onResultSelected(result, ev) {
+    this.removeHoverResult();
+    this.removeSelectedResult();
+    this.selectedResult = result;
+
+    if (result.onSelected) {
+      if (result.onSelected(result, ev)) return;
     }
-  } else {
-    // ev.type != 'dblclick'
-    if (result.bounds) {
-      window.map.fitBounds(result.bounds, { maxZoom: window.DEFAULT_ZOOM });
-    } else if (result.position) {
-      window.map.setView(result.position);
+
+    if (ev.type === 'dblclick') {
+      if (result.position) {
+        window.map.setView(result.position, window.DEFAULT_ZOOM);
+      } else if (result.bounds) {
+        window.map.fitBounds(result.bounds, { maxZoom: window.DEFAULT_ZOOM });
+      }
+    } else {
+      // ev.type != 'dblclick'
+      if (result.bounds) {
+        window.map.fitBounds(result.bounds, { maxZoom: window.DEFAULT_ZOOM });
+      } else if (result.position) {
+        window.map.setView(result.position);
+      }
     }
-  }
 
-  result.layer = this.resultLayer(result);
+    result.layer = this.resultLayer(result);
 
-  if (result.layer) window.map.addLayer(result.layer);
+    if (result.layer) window.map.addLayer(result.layer);
 
-  if (window.isSmartphone()) window.show('map');
-};
+    if (window.isSmartphone()) window.show('map');
+  }
 
-/**
- * Removes the currently selected search result from the map and performs cleanup.
- *
- * @function
- */
-window.search.Query.prototype.removeSelectedResult = function () {
-  if (this.selectedResult) {
-    if (this.selectedResult.layer) window.map.removeLayer(this.selectedResult.layer);
-    if (this.selectedResult.onRemove) this.selectedResult.onRemove(this.selectedResult);
+  /**
+   * Removes the currently selected search result from the map and performs cleanup.
+   *
+   * @function
+   */
+  removeSelectedResult() {
+    if (this.selectedResult) {
+      if (this.selectedResult.layer) window.map.removeLayer(this.selectedResult.layer);
+      if (this.selectedResult.onRemove) this.selectedResult.onRemove(this.selectedResult);
+    }
   }
-};
 
-/**
- * Handles the start of a hover over a search result. Adds the layer for the result to the map if not already selected.
- *
- * @function
- * @param {Object} result - The search result object being hovered over.
- */
-window.search.Query.prototype.onResultHoverStart = function (result) {
-  this.removeHoverResult();
-  this.hoverResult = result;
+  /**
+   * Handles the start of a hover over a search result. Adds the layer for the result to the map if not already selected.
+   *
+   * @function
+   * @param {Object} result - The search result object being hovered over.
+   */
+  onResultHoverStart(result) {
+    this.removeHoverResult();
+    this.hoverResult = result;
 
-  if (result === this.selectedResult) return;
+    if (result === this.selectedResult) return;
 
-  result.layer = this.resultLayer(result);
+    result.layer = this.resultLayer(result);
 
-  if (result.layer) window.map.addLayer(result.layer);
-};
+    if (result.layer) window.map.addLayer(result.layer);
+  }
 
-/**
- * Removes the hover result layer from the map unless it's the selected result.
- *
- * @function
- */
-window.search.Query.prototype.removeHoverResult = function () {
-  if (this.hoverResult !== this.selectedResult) {
-    if (this.hoverResult) {
-      if (this.hoverResult.layer) {
-        window.map.removeLayer(this.hoverResult.layer);
+  /**
+   * Removes the hover result layer from the map unless it's the selected result.
+   *
+   * @function
+   */
+  removeHoverResult() {
+    if (this.hoverResult !== this.selectedResult) {
+      if (this.hoverResult) {
+        if (this.hoverResult.layer) {
+          window.map.removeLayer(this.hoverResult.layer);
+        }
       }
     }
+    this.hoverResult = null;
   }
-  this.hoverResult = null;
-};
 
-/**
- * Handles the end of a hover over a search result. Removes the hover result layer from the map.
- */
-window.search.Query.prototype.onResultHoverEnd = function () {
-  this.removeHoverResult();
-};
+  /**
+   * Handles the end of a hover over a search result. Removes the hover result layer from the map.
+   */
+  onResultHoverEnd() {
+    this.removeHoverResult();
+  }
+}
+
+window.search.Query = Query;
 
 /**
  * Initiates a search with the specified term and confirmation status.

From 7971c99ba8456cfab84febc7a8f15eaef47e88f3 Mon Sep 17 00:00:00 2001
From: Alexander Danilov <git@modos189.ru>
Date: Fri, 1 Nov 2024 17:51:45 +0500
Subject: [PATCH 02/70] Splitting search.Query into separate functions

---
 core/code/search.js | 123 ++++++++++++++++++--------------------------
 1 file changed, 49 insertions(+), 74 deletions(-)

diff --git a/core/code/search.js b/core/code/search.js
index 3975cfeb0..23855b117 100644
--- a/core/code/search.js
+++ b/core/code/search.js
@@ -49,28 +49,32 @@ class Query {
     this.term = term;
     this.confirmed = confirmed;
     this.results = [];
-    this.container = $('<div>').addClass('searchquery');
-
-    this.header = $('<h3>')
-      .text(
-        this.confirmed
-          ? this.term
-          : (this.term.length > 16 ? this.term.substr(0, 8) + '…' + this.term.substr(this.term.length - 8, 8) : this.term) + ' (Return to load more)'
-      )
-      .appendTo(this.container);
-
-    this.list = $('<ul>')
-      .appendTo(this.container)
-      .append($('<li>').text(this.confirmed ? 'No local results, searching online...' : 'No local results.'));
-
-    this.container.accordion({
-      collapsible: true,
-      heightStyle: 'content',
-    });
+    this.container = this.createContainer();
+    this.header = this.createHeader();
+    this.list = this.createList();
 
     window.runHooks('search', this);
   }
 
+  createContainer() {
+    const container = $('<div>').addClass('searchquery');
+    container.accordion({ collapsible: true, heightStyle: 'content' });
+    return container;
+  }
+
+  createHeader() {
+    const headerText = this.confirmed
+      ? this.term
+      : `${this.term.length > 16 ? this.term.substr(0, 8) + '…' + this.term.substr(this.term.length - 8, 8) : this.term} (Return to load more)`;
+    return $('<h3>').text(headerText).appendTo(this.container);
+  }
+
+  createList() {
+    const list = $('<ul>').appendTo(this.container);
+    list.append($('<li>').text(this.confirmed ? 'No local results, searching online...' : 'No local results.'));
+    return list;
+  }
+
   /**
    * Displays the search query results in the search wrapper.
    *
@@ -98,57 +102,36 @@ class Query {
    * @param {Object} result - The search result object to add.
    */
   addResult(result) {
-    if (this.results.length === 0) {
-      // remove 'No results'
-      this.list.empty();
-    }
-
+    if (this.results.length === 0) this.list.empty();
     this.results.push(result);
-    var item = $('<li>')
-      .appendTo(this.list)
-      .attr('tabindex', '0')
-      .on(
-        'click dblclick',
-        function (ev) {
-          this.onResultSelected(result, ev);
-        }.bind(this)
-      )
-      .on(
-        'mouseover',
-        function (ev) {
-          this.onResultHoverStart(result, ev);
-        }.bind(this)
-      )
-      .on(
-        'mouseout',
-        function (ev) {
-          this.onResultHoverEnd(result, ev);
-        }.bind(this)
-      )
-      .keypress(function (ev) {
-        if ((ev.keyCode || ev.charCode || ev.which) === 32) {
-          ev.preventDefault();
-          ev.type = 'click';
-          $(this).trigger(ev);
-          return;
-        }
-        if ((ev.keyCode || ev.charCode || ev.which) === 13) {
-          ev.preventDefault();
-          ev.type = 'dblclick';
-          $(this).trigger(ev);
-          return;
-        }
-      });
 
-    var link = $('<a>').append(result.title).appendTo(item);
+    const item = this.createListItem(result);
+    this.list.append(item);
+  }
+
+  createListItem(result) {
+    const item = $('<li>').attr('tabindex', '0');
+    const link = $('<a>').text(result.title).appendTo(item);
 
     if (result.icon) {
-      link.css('background-image', 'url("' + result.icon + '")');
+      link.css('background-image', `url("${result.icon}")`);
       item.css('list-style', 'none');
     }
 
-    if (result.description) {
-      item.append($('<br>')).append($('<em>').append(result.description));
+    item.on('click dblclick', (ev) => this.onResultSelected(result, ev));
+    item.on('mouseover', (ev) => this.onResultHoverStart(result, ev));
+    item.on('mouseout', (ev) => this.onResultHoverEnd(result, ev));
+    item.keypress((ev) => this.handleKeyPress(ev, result));
+
+    if (result.description) item.append($('<br>')).append($('<em>').append(result.description));
+    return item;
+  }
+
+  handleKeyPress(ev, result) {
+    if (ev.key === ' ' || ev.key === 'Enter') {
+      ev.preventDefault();
+      const type = ev.key === ' ' ? 'click' : 'dblclick';
+      this.onResultSelected(result, { ...ev, type });
     }
   }
 
@@ -160,7 +143,7 @@ class Query {
    * @returns {L.Layer} The layer created for this result.
    */
   resultLayer(result) {
-    if (result.layer !== null && !result.layer) {
+    if (!result.layer) {
       result.layer = L.layerGroup();
 
       if (result.position) {
@@ -194,9 +177,7 @@ class Query {
     this.removeSelectedResult();
     this.selectedResult = result;
 
-    if (result.onSelected) {
-      if (result.onSelected(result, ev)) return;
-    }
+    if (result.onSelected && result.onSelected(result, ev)) return;
 
     if (ev.type === 'dblclick') {
       if (result.position) {
@@ -205,7 +186,6 @@ class Query {
         window.map.fitBounds(result.bounds, { maxZoom: window.DEFAULT_ZOOM });
       }
     } else {
-      // ev.type != 'dblclick'
       if (result.bounds) {
         window.map.fitBounds(result.bounds, { maxZoom: window.DEFAULT_ZOOM });
       } else if (result.position) {
@@ -216,7 +196,6 @@ class Query {
     result.layer = this.resultLayer(result);
 
     if (result.layer) window.map.addLayer(result.layer);
-
     if (window.isSmartphone()) window.show('map');
   }
 
@@ -255,12 +234,8 @@ class Query {
    * @function
    */
   removeHoverResult() {
-    if (this.hoverResult !== this.selectedResult) {
-      if (this.hoverResult) {
-        if (this.hoverResult.layer) {
-          window.map.removeLayer(this.hoverResult.layer);
-        }
-      }
+    if (this.hoverResult && this.hoverResult.layer && this.hoverResult !== this.selectedResult) {
+      window.map.removeLayer(this.hoverResult.layer);
     }
     this.hoverResult = null;
   }

From e8831dc82bb716cd1bba8b6eea89c88deb973462 Mon Sep 17 00:00:00 2001
From: Alexander Danilov <git@modos189.ru>
Date: Fri, 1 Nov 2024 22:05:23 +0500
Subject: [PATCH 03/70] Search UI in a separate class

---
 core/code/search.js | 92 +++++++++++++++++++++++++++------------------
 1 file changed, 56 insertions(+), 36 deletions(-)

diff --git a/core/code/search.js b/core/code/search.js
index 23855b117..f30af02de 100644
--- a/core/code/search.js
+++ b/core/code/search.js
@@ -30,30 +30,13 @@ window.search = {
   lastSearch: null,
 };
 
-/**
- * Represents a search query.
- *
- * @memberof window.search
- * @class
- * @name window.search.Query
- */
-class Query {
-  /**
-   * Initializes the search query, setting up the DOM elements and triggering the 'search' hook.
-   *
-   * @function
-   * @param {string} term - The search term.
-   * @param {boolean} confirmed - Indicates if the search is confirmed (e.g., by pressing Enter).
-   */
+class UI {
   constructor(term, confirmed) {
     this.term = term;
     this.confirmed = confirmed;
-    this.results = [];
     this.container = this.createContainer();
     this.header = this.createHeader();
     this.list = this.createList();
-
-    window.runHooks('search', this);
   }
 
   createContainer() {
@@ -75,13 +58,63 @@ class Query {
     return list;
   }
 
+  createListItem(result) {
+    const item = $('<li>').attr('tabindex', '0');
+    const link = $('<a>').text(result.title).appendTo(item);
+
+    if (result.icon) {
+      link.css('background-image', `url("${result.icon}")`);
+      item.css('list-style', 'none');
+    }
+
+    if (result.description) item.append($('<br>')).append($('<em>').append(result.description));
+    return item;
+  }
+
+  renderIn(selector) {
+    this.container.appendTo(selector);
+  }
+
+  remove() {
+    this.container.remove();
+  }
+
+  clearList() {
+    this.list.empty();
+  }
+}
+
+/**
+ * Represents a search query.
+ *
+ * @memberof window.search
+ * @class
+ * @name window.search.Query
+ */
+class Query {
+  /**
+   * Initializes the search query, setting up the DOM elements and triggering the 'search' hook.
+   *
+   * @function
+   * @param {string} term - The search term.
+   * @param {boolean} confirmed - Indicates if the search is confirmed (e.g., by pressing Enter).
+   */
+  constructor(term, confirmed) {
+    this.term = term;
+    this.confirmed = confirmed;
+    this.results = [];
+    this.ui = new UI(term, confirmed);
+
+    window.runHooks('search', this);
+  }
+
   /**
    * Displays the search query results in the search wrapper.
    *
    * @function
    */
   show() {
-    this.container.appendTo('#searchwrapper');
+    this.ui.renderIn('#searchwrapper');
   }
 
   /**
@@ -90,7 +123,7 @@ class Query {
    * @function
    */
   hide() {
-    this.container.remove();
+    this.ui.remove();
     this.removeSelectedResult();
     this.removeHoverResult();
   }
@@ -102,29 +135,16 @@ class Query {
    * @param {Object} result - The search result object to add.
    */
   addResult(result) {
-    if (this.results.length === 0) this.list.empty();
+    if (this.results.length === 0) this.ui.clearList();
     this.results.push(result);
 
-    const item = this.createListItem(result);
-    this.list.append(item);
-  }
-
-  createListItem(result) {
-    const item = $('<li>').attr('tabindex', '0');
-    const link = $('<a>').text(result.title).appendTo(item);
-
-    if (result.icon) {
-      link.css('background-image', `url("${result.icon}")`);
-      item.css('list-style', 'none');
-    }
-
+    const item = this.ui.createListItem(result);
     item.on('click dblclick', (ev) => this.onResultSelected(result, ev));
     item.on('mouseover', (ev) => this.onResultHoverStart(result, ev));
     item.on('mouseout', (ev) => this.onResultHoverEnd(result, ev));
     item.keypress((ev) => this.handleKeyPress(ev, result));
 
-    if (result.description) item.append($('<br>')).append($('<em>').append(result.description));
-    return item;
+    this.ui.list.append(item);
   }
 
   handleKeyPress(ev, result) {

From 7c08c691389d72a456cd4ab145491c3ad769b720 Mon Sep 17 00:00:00 2001
From: Alexander Danilov <git@modos189.ru>
Date: Fri, 1 Nov 2024 22:27:45 +0500
Subject: [PATCH 04/70] Moved event handling for search result interactions
 from the UI class to the Query class for clearer separation of logic and
 presentation

---
 core/code/search.js | 86 +++++++++++++++++++++++++++++++++------------
 1 file changed, 64 insertions(+), 22 deletions(-)

diff --git a/core/code/search.js b/core/code/search.js
index f30af02de..fe607bd7c 100644
--- a/core/code/search.js
+++ b/core/code/search.js
@@ -58,6 +58,25 @@ class UI {
     return list;
   }
 
+  /**
+   * Renders the list of results.
+   * @param {Array} results - Array of result objects to display.
+   * @param {Function} onResultInteraction - Callback for interaction events.
+   */
+  renderResults(results, onResultInteraction) {
+    this.clearList();
+
+    if (results.length === 0) {
+      this.list.append($('<li>').text('No results found.'));
+    } else {
+      results.forEach((result) => {
+        const item = this.createListItem(result);
+        item.on('click dblclick mouseover mouseout', (ev) => onResultInteraction(result, ev));
+        this.list.append(item);
+      });
+    }
+  }
+
   createListItem(result) {
     const item = $('<li>').attr('tabindex', '0');
     const link = $('<a>').text(result.title).appendTo(item);
@@ -129,22 +148,14 @@ class Query {
   }
 
   /**
-   * Adds a search result to this query.
+   * Adds a search result to this query and re-renders the list.
    *
    * @function
    * @param {Object} result - The search result object to add.
    */
   addResult(result) {
-    if (this.results.length === 0) this.ui.clearList();
     this.results.push(result);
-
-    const item = this.ui.createListItem(result);
-    item.on('click dblclick', (ev) => this.onResultSelected(result, ev));
-    item.on('mouseover', (ev) => this.onResultHoverStart(result, ev));
-    item.on('mouseout', (ev) => this.onResultHoverEnd(result, ev));
-    item.keypress((ev) => this.handleKeyPress(ev, result));
-
-    this.ui.list.append(item);
+    this.renderResults();
   }
 
   handleKeyPress(ev, result) {
@@ -155,6 +166,36 @@ class Query {
     }
   }
 
+  /**
+   * Passes results to UI for rendering and sets up interactions.
+   */
+  renderResults() {
+    this.ui.renderResults(this.results, (result, event) => this.handleResultInteraction(result, event));
+  }
+
+  /**
+   * Manages interactions with search results, such as selection and hover.
+   * @param {Object} result - The search result object.
+   * @param {Event} event - The event associated with the interaction.
+   */
+  handleResultInteraction(result, event) {
+    switch (event.type) {
+      case 'click':
+      case 'dblclick':
+        this.onResultSelected(result, event);
+        break;
+      case 'mouseover':
+        this.onResultHoverStart(result);
+        break;
+      case 'mouseout':
+        this.onResultHoverEnd();
+        break;
+      case 'keypress':
+        this.handleKeyPress(event, result);
+        break;
+    }
+  }
+
   /**
    * Creates and returns a layer for the given search result, which could be markers or shapes on the map.
    *
@@ -190,26 +231,27 @@ class Query {
    *
    * @function
    * @param {Object} result - The selected search result object.
-   * @param {Event} ev - The event associated with the selection.
+   * @param {Event} event - The event associated with the selection.
    */
-  onResultSelected(result, ev) {
+  onResultSelected(result, event) {
     this.removeHoverResult();
     this.removeSelectedResult();
     this.selectedResult = result;
 
-    if (result.onSelected && result.onSelected(result, ev)) return;
+    if (result.onSelected && result.onSelected(result, event)) return;
 
-    if (ev.type === 'dblclick') {
-      if (result.position) {
-        window.map.setView(result.position, window.DEFAULT_ZOOM);
-      } else if (result.bounds) {
-        window.map.fitBounds(result.bounds, { maxZoom: window.DEFAULT_ZOOM });
+    const { position, bounds } = result;
+    if (event.type === 'dblclick') {
+      if (position) {
+        window.map.setView(position, window.DEFAULT_ZOOM);
+      } else if (bounds) {
+        window.map.fitBounds(bounds, { maxZoom: window.DEFAULT_ZOOM });
       }
     } else {
-      if (result.bounds) {
-        window.map.fitBounds(result.bounds, { maxZoom: window.DEFAULT_ZOOM });
-      } else if (result.position) {
-        window.map.setView(result.position);
+      if (bounds) {
+        window.map.fitBounds(bounds, { maxZoom: window.DEFAULT_ZOOM });
+      } else if (position) {
+        window.map.setView(position);
       }
     }
 

From 4e080800200612a05712aadf11972ea81a2df5e9 Mon Sep 17 00:00:00 2001
From: Alexander Danilov <git@modos189.ru>
Date: Fri, 1 Nov 2024 22:55:40 +0500
Subject: [PATCH 05/70] Moving window.search to IITC.search namespace with
 backward compatibility

---
 core/code/search.js | 73 +++++++++++++++++++++++++--------------------
 1 file changed, 40 insertions(+), 33 deletions(-)

diff --git a/core/code/search.js b/core/code/search.js
index fe607bd7c..73ae540c0 100644
--- a/core/code/search.js
+++ b/core/code/search.js
@@ -1,4 +1,4 @@
-/* global L -- eslint */
+/* global IITC, L -- eslint */
 
 /**
  * Provides functionality for the search system within the application.
@@ -26,7 +26,7 @@
  *   (because another result has been selected or the search was cancelled by the user).
  *  @namespace window.search
  */
-window.search = {
+IITC.search = {
   lastSearch: null,
 };
 
@@ -310,7 +310,8 @@ class Query {
   }
 }
 
-window.search.Query = Query;
+IITC.search.Query = Query;
+IITC.search.UI = UI;
 
 /**
  * Initiates a search with the specified term and confirmation status.
@@ -319,20 +320,20 @@ window.search.Query = Query;
  * @param {string} term - The search term.
  * @param {boolean} confirmed - Indicates if the search term is confirmed.
  */
-window.search.doSearch = function (term, confirmed) {
+IITC.search.doSearch = function (term, confirmed) {
   term = term.trim();
 
   // minimum 3 characters for automatic search
   if (term.length < 3 && !confirmed) return;
 
   // don't clear last confirmed search
-  if (window.search.lastSearch && window.search.lastSearch.confirmed && !confirmed) return;
+  if (IITC.search.lastSearch && IITC.search.lastSearch.confirmed && !confirmed) return;
 
   // don't make the same query again
-  if (window.search.lastSearch && window.search.lastSearch.confirmed === confirmed && window.search.lastSearch.term === term) return;
+  if (IITC.search.lastSearch && IITC.search.lastSearch.confirmed === confirmed && IITC.search.lastSearch.term === term) return;
 
-  if (window.search.lastSearch) window.search.lastSearch.hide();
-  window.search.lastSearch = null;
+  if (IITC.search.lastSearch) IITC.search.lastSearch.hide();
+  IITC.search.lastSearch = null;
 
   // clear results
   if (term === '') return;
@@ -341,8 +342,8 @@ window.search.doSearch = function (term, confirmed) {
 
   $('.ui-tooltip').remove();
 
-  window.search.lastSearch = new window.search.Query(term, confirmed);
-  window.search.lastSearch.show();
+  IITC.search.lastSearch = new IITC.search.Query(term, confirmed);
+  IITC.search.lastSearch.show();
 };
 
 /**
@@ -350,30 +351,25 @@ window.search.doSearch = function (term, confirmed) {
  *
  * @function window.search.setup
  */
-window.search.setup = function () {
+IITC.search.setup = function () {
   $('#search')
     .keypress(function (e) {
       if ((e.keyCode ? e.keyCode : e.which) !== 13) return;
       e.preventDefault();
 
-      var term = $(this).val();
+      const term = $(this).val();
 
-      clearTimeout(window.search.timer);
-      window.search.doSearch(term, true);
+      clearTimeout(IITC.search.timer);
+      IITC.search.doSearch(term, true);
     })
     .on('keyup keypress change paste', function () {
-      clearTimeout(window.search.timer);
-      window.search.timer = setTimeout(
-        function () {
-          var term = $(this).val();
-          window.search.doSearch(term, false);
-        }.bind(this),
-        500
-      );
+      clearTimeout(IITC.search.timer);
+      IITC.search.timer = setTimeout(() => {
+        const term = $(this).val();
+        IITC.search.doSearch(term, false);
+      }, 500);
     });
-  $('#buttongeolocation').click(function () {
-    window.map.locate({ setView: true, maxZoom: 13 });
-  });
+  $('#buttongeolocation').click(() => window.map.locate({ setView: true, maxZoom: 13 }));
 };
 
 /**
@@ -384,16 +380,16 @@ window.search.setup = function () {
  * @param {Object} data - The data for the search result. This includes information such as title, team, level, health, etc.
  * @param {string} guid - GUID if the portal.
  */
-window.search.addSearchResult = function (query, data, guid) {
-  var team = window.teamStringToId(data.team);
-  var color = team === window.TEAM_NONE ? '#CCC' : window.COLORS[team];
-  var latLng = L.latLng(data.latE6 / 1e6, data.lngE6 / 1e6);
+IITC.search.addSearchResult = function (query, data, guid) {
+  const team = window.teamStringToId(data.team);
+  const color = team === window.TEAM_NONE ? '#CCC' : window.COLORS[team];
+  const latLng = L.latLng(data.latE6 / 1e6, data.lngE6 / 1e6);
   query.addResult({
     title: data.title,
-    description: window.TEAM_SHORTNAMES[team] + ', L' + data.level + ', ' + data.health + '%, ' + data.resCount + ' Resonators',
+    description: `${window.TEAM_SHORTNAMES[team]}, L${data.level}, ${data.health}%, ${data.resCount} Resonators`,
     position: latLng,
-    icon: 'data:image/svg+xml;base64,' + btoa('@include_string:images/icon-portal.svg@'.replace(/%COLOR%/g, color)),
-    onSelected: function (result, event) {
+    icon: `data:image/svg+xml;base64,${btoa('@include_string:images/icon-portal.svg@'.replace(/%COLOR%/g, color))}`,
+    onSelected(result, event) {
       if (event.type === 'dblclick') {
         window.zoomToAndShowPortal(guid, latLng);
       } else if (window.portals[guid]) {
@@ -404,11 +400,22 @@ window.search.addSearchResult = function (query, data, guid) {
       } else {
         window.selectPortalByLatLng(latLng);
       }
-      return true; // prevent default behavior
+      return true;
     },
   });
 };
 
+// Redirect all window.search access to IITC.search
+Object.defineProperty(window, 'search', {
+  get() {
+    return IITC.search;
+  },
+  set(value) {
+    IITC.search = value;
+  },
+  configurable: true,
+});
+
 // search for portals
 window.addHook('search', function (query) {
   var term = query.term.toLowerCase();

From 0daf8eb569bae9e124507fd951657af5c72157b9 Mon Sep 17 00:00:00 2001
From: Alexander Danilov <git@modos189.ru>
Date: Sat, 2 Nov 2024 15:05:07 +0500
Subject: [PATCH 06/70] Moving functions that respond to the "search" hook to a
 separate file

---
 core/code/search.js       | 147 -------------------------------
 core/code/search_hooks.js | 178 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 178 insertions(+), 147 deletions(-)
 create mode 100644 core/code/search_hooks.js

diff --git a/core/code/search.js b/core/code/search.js
index 73ae540c0..2e4241b05 100644
--- a/core/code/search.js
+++ b/core/code/search.js
@@ -415,150 +415,3 @@ Object.defineProperty(window, 'search', {
   },
   configurable: true,
 });
-
-// search for portals
-window.addHook('search', function (query) {
-  var term = query.term.toLowerCase();
-
-  $.each(window.portals, function (guid, portal) {
-    var data = portal.options.data;
-    if (!data.title) return;
-
-    if (data.title.toLowerCase().indexOf(term) !== -1) {
-      window.search.addSearchResult(query, data, guid);
-    }
-  });
-});
-
-// search for locations
-// TODO: recognize 50°31'03.8"N 7°59'05.3"E and similar formats
-window.addHook('search', function (query) {
-  var locations = query.term.replaceAll(/%2C/gi, ',').match(/[+-]?\d+\.\d+, ?[+-]?\d+\.\d+/g);
-  var added = {};
-  if (!locations) return;
-  locations.forEach(function (location) {
-    var pair = location.split(',').map(function (s) {
-      return parseFloat(s.trim()).toFixed(6);
-    });
-    var ll = pair.join(',');
-    var latlng = L.latLng(
-      pair.map(function (s) {
-        return parseFloat(s);
-      })
-    );
-    if (added[ll]) return;
-    added[ll] = true;
-
-    query.addResult({
-      title: ll,
-      description: 'geo coordinates',
-      position: latlng,
-      onSelected: function (result) {
-        for (var guid in window.portals) {
-          var p = window.portals[guid].getLatLng();
-          if (p.lat.toFixed(6) + ',' + p.lng.toFixed(6) === ll) {
-            window.renderPortalDetails(guid);
-            return;
-          }
-        }
-
-        window.urlPortalLL = [result.position.lat, result.position.lng];
-      },
-    });
-  });
-});
-
-// search on OpenStreetMap
-window.addHook('search', function (query) {
-  if (!query.confirmed) return;
-
-  // Viewbox search orders results so they're closer to the viewbox
-  var mapBounds = window.map.getBounds();
-  var viewbox =
-    '&viewbox=' + mapBounds.getSouthWest().lng + ',' + mapBounds.getSouthWest().lat + ',' + mapBounds.getNorthEast().lng + ',' + mapBounds.getNorthEast().lat;
-
-  var resultCount = 0;
-  var resultMap = {};
-  function onQueryResult(isViewboxResult, data) {
-    resultCount += data.length;
-    if (isViewboxResult) {
-      // Search for things outside the viewbox
-      $.getJSON(window.NOMINATIM + encodeURIComponent(query.term) + viewbox, onQueryResult.bind(null, false));
-      if (resultCount === 0) {
-        return;
-      }
-    } else {
-      if (resultCount === 0) {
-        query.addResult({
-          title: 'No results on OpenStreetMap',
-          icon: '//www.openstreetmap.org/favicon.ico',
-          onSelected: function () {
-            return true;
-          },
-        });
-        return;
-      }
-    }
-
-    data.forEach(function (item) {
-      if (resultMap[item.place_id]) {
-        return;
-      } // duplicate
-      resultMap[item.place_id] = true;
-
-      var result = {
-        title: item.display_name,
-        description: 'Type: ' + item.type,
-        position: L.latLng(parseFloat(item.lat), parseFloat(item.lon)),
-        icon: item.icon,
-      };
-
-      if (item.geojson) {
-        result.layer = L.geoJson(item.geojson, {
-          interactive: false,
-          color: 'red',
-          opacity: 0.7,
-          weight: 2,
-          fill: false,
-          pointToLayer: function (featureData, latLng) {
-            return L.marker(latLng, {
-              icon: L.divIcon.coloredSvg('red'),
-              title: item.display_name,
-            });
-          },
-        });
-      }
-
-      var b = item.boundingbox;
-      if (b) {
-        var southWest = new L.LatLng(b[0], b[2]),
-          northEast = new L.LatLng(b[1], b[3]);
-        result.bounds = new L.LatLngBounds(southWest, northEast);
-      }
-
-      query.addResult(result);
-    });
-  }
-
-  // Bounded search allows amenity-only searches (e.g. "amenity=toilet") via special phrases
-  // http://wiki.openstreetmap.org/wiki/Nominatim/Special_Phrases/EN
-  var bounded = '&bounded=1';
-
-  $.getJSON(window.NOMINATIM + encodeURIComponent(query.term) + viewbox + bounded, onQueryResult.bind(null, true));
-});
-
-// search on guid
-window.addHook('search', function (query) {
-  const guid_re = /[0-9a-f]{32}\.[0-9a-f]{2}/;
-  const res = query.term.match(guid_re);
-  if (res) {
-    const guid = res[0];
-    const data = window.portalDetail.get(guid);
-    if (data) window.search.addSearchResult(query, data, guid);
-    else {
-      window.portalDetail.request(guid).then(function (data) {
-        window.search.addSearchResult(query, data, guid);
-      });
-    }
-  }
-});
diff --git a/core/code/search_hooks.js b/core/code/search_hooks.js
new file mode 100644
index 000000000..1d3c2a0fc
--- /dev/null
+++ b/core/code/search_hooks.js
@@ -0,0 +1,178 @@
+/* global L -- eslint */
+
+/**
+ * Handles search-related hooks for the IITC.search module, adding various search result types.
+ *
+ * These functions supply default search results to the IITC search system by responding to `search` hooks with
+ * data for portals, geographic coordinates, OpenStreetMap locations, and portal GUIDs.
+ *
+ * @namespace hooks
+ * @memberof IITC.search
+ */
+
+/**
+ * Searches for portals by matching the query term against portal titles and adds matched results.
+ *
+ * @param {Object} query - The search query object.
+ * @fires hook#search
+ */
+window.addHook('search', function (query) {
+  var term = query.term.toLowerCase();
+
+  $.each(window.portals, function (guid, portal) {
+    var data = portal.options.data;
+    if (!data.title) return;
+
+    if (data.title.toLowerCase().indexOf(term) !== -1) {
+      window.search.addSearchResult(query, data, guid);
+    }
+  });
+});
+
+/**
+ * Searches for geographical coordinates formatted as latitude, longitude and adds the results.
+ * TODO: recognize 50°31'03.8"N 7°59'05.3"E and similar formats
+ *
+ * @param {Object} query - The search query object.
+ * @fires hook#search
+ */
+window.addHook('search', function (query) {
+  var locations = query.term.replaceAll(/%2C/gi, ',').match(/[+-]?\d+\.\d+, ?[+-]?\d+\.\d+/g);
+  var added = {};
+  if (!locations) return;
+  locations.forEach(function (location) {
+    var pair = location.split(',').map(function (s) {
+      return parseFloat(s.trim()).toFixed(6);
+    });
+    var ll = pair.join(',');
+    var latlng = L.latLng(
+      pair.map(function (s) {
+        return parseFloat(s);
+      })
+    );
+    if (added[ll]) return;
+    added[ll] = true;
+
+    query.addResult({
+      title: ll,
+      description: 'geo coordinates',
+      position: latlng,
+      onSelected: function (result) {
+        for (var guid in window.portals) {
+          var p = window.portals[guid].getLatLng();
+          if (p.lat.toFixed(6) + ',' + p.lng.toFixed(6) === ll) {
+            window.renderPortalDetails(guid);
+            return;
+          }
+        }
+
+        window.urlPortalLL = [result.position.lat, result.position.lng];
+      },
+    });
+  });
+});
+
+/**
+ * Searches for results on OpenStreetMap based on the query term, considering map view boundaries.
+ *
+ * @param {Object} query - The search query object.
+ * @fires hook#search
+ */
+window.addHook('search', function (query) {
+  if (!query.confirmed) return;
+
+  // Viewbox search orders results so they're closer to the viewbox
+  var mapBounds = window.map.getBounds();
+  var viewbox =
+    '&viewbox=' + mapBounds.getSouthWest().lng + ',' + mapBounds.getSouthWest().lat + ',' + mapBounds.getNorthEast().lng + ',' + mapBounds.getNorthEast().lat;
+
+  var resultCount = 0;
+  var resultMap = {};
+  function onQueryResult(isViewboxResult, data) {
+    resultCount += data.length;
+    if (isViewboxResult) {
+      // Search for things outside the viewbox
+      $.getJSON(window.NOMINATIM + encodeURIComponent(query.term) + viewbox, onQueryResult.bind(null, false));
+      if (resultCount === 0) {
+        return;
+      }
+    } else {
+      if (resultCount === 0) {
+        query.addResult({
+          title: 'No results on OpenStreetMap',
+          icon: '//www.openstreetmap.org/favicon.ico',
+          onSelected: function () {
+            return true;
+          },
+        });
+        return;
+      }
+    }
+
+    data.forEach(function (item) {
+      if (resultMap[item.place_id]) {
+        return;
+      } // duplicate
+      resultMap[item.place_id] = true;
+
+      var result = {
+        title: item.display_name,
+        description: 'Type: ' + item.type,
+        position: L.latLng(parseFloat(item.lat), parseFloat(item.lon)),
+        icon: item.icon,
+      };
+
+      if (item.geojson) {
+        result.layer = L.geoJson(item.geojson, {
+          interactive: false,
+          color: 'red',
+          opacity: 0.7,
+          weight: 2,
+          fill: false,
+          pointToLayer: function (featureData, latLng) {
+            return L.marker(latLng, {
+              icon: L.divIcon.coloredSvg('red'),
+              title: item.display_name,
+            });
+          },
+        });
+      }
+
+      var b = item.boundingbox;
+      if (b) {
+        var southWest = new L.LatLng(b[0], b[2]),
+          northEast = new L.LatLng(b[1], b[3]);
+        result.bounds = new L.LatLngBounds(southWest, northEast);
+      }
+
+      query.addResult(result);
+    });
+  }
+
+  // Bounded search allows amenity-only searches (e.g. "amenity=toilet") via special phrases
+  // http://wiki.openstreetmap.org/wiki/Nominatim/Special_Phrases/EN
+  var bounded = '&bounded=1';
+
+  $.getJSON(window.NOMINATIM + encodeURIComponent(query.term) + viewbox + bounded, onQueryResult.bind(null, true));
+});
+
+/**
+ * Searches by GUID in the query term.
+ *
+ * @param {Object} query - The search query object.
+ * @fires hook#search
+ */
+window.addHook('search', function (query) {
+  const guid_re = /[0-9a-f]{32}\.[0-9a-f]{2}/;
+  const res = query.term.match(guid_re);
+  if (res) {
+    const guid = res[0];
+    const data = window.portalDetail.get(guid);
+    if (data) window.search.addSearchResult(query, data, guid);
+    else {
+      window.portalDetail.request(guid).then(function (data) {
+        window.search.addSearchResult(query, data, guid);
+      });
+    }
+  }
+});

From 78d7a5bf9329473d0bc0fb5cbf59352f842d76f2 Mon Sep 17 00:00:00 2001
From: Alexander Danilov <git@modos189.ru>
Date: Sat, 2 Nov 2024 16:14:11 +0500
Subject: [PATCH 07/70] Moving IITC.search.Query to a separate file
 `search_query.js`

---
 core/code/search.js       | 208 -----------------------------------
 core/code/search_query.js | 226 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 226 insertions(+), 208 deletions(-)
 create mode 100644 core/code/search_query.js

diff --git a/core/code/search.js b/core/code/search.js
index 2e4241b05..cec65778a 100644
--- a/core/code/search.js
+++ b/core/code/search.js
@@ -103,214 +103,6 @@ class UI {
   }
 }
 
-/**
- * Represents a search query.
- *
- * @memberof window.search
- * @class
- * @name window.search.Query
- */
-class Query {
-  /**
-   * Initializes the search query, setting up the DOM elements and triggering the 'search' hook.
-   *
-   * @function
-   * @param {string} term - The search term.
-   * @param {boolean} confirmed - Indicates if the search is confirmed (e.g., by pressing Enter).
-   */
-  constructor(term, confirmed) {
-    this.term = term;
-    this.confirmed = confirmed;
-    this.results = [];
-    this.ui = new UI(term, confirmed);
-
-    window.runHooks('search', this);
-  }
-
-  /**
-   * Displays the search query results in the search wrapper.
-   *
-   * @function
-   */
-  show() {
-    this.ui.renderIn('#searchwrapper');
-  }
-
-  /**
-   * Hides the search query results and cleans up.
-   *
-   * @function
-   */
-  hide() {
-    this.ui.remove();
-    this.removeSelectedResult();
-    this.removeHoverResult();
-  }
-
-  /**
-   * Adds a search result to this query and re-renders the list.
-   *
-   * @function
-   * @param {Object} result - The search result object to add.
-   */
-  addResult(result) {
-    this.results.push(result);
-    this.renderResults();
-  }
-
-  handleKeyPress(ev, result) {
-    if (ev.key === ' ' || ev.key === 'Enter') {
-      ev.preventDefault();
-      const type = ev.key === ' ' ? 'click' : 'dblclick';
-      this.onResultSelected(result, { ...ev, type });
-    }
-  }
-
-  /**
-   * Passes results to UI for rendering and sets up interactions.
-   */
-  renderResults() {
-    this.ui.renderResults(this.results, (result, event) => this.handleResultInteraction(result, event));
-  }
-
-  /**
-   * Manages interactions with search results, such as selection and hover.
-   * @param {Object} result - The search result object.
-   * @param {Event} event - The event associated with the interaction.
-   */
-  handleResultInteraction(result, event) {
-    switch (event.type) {
-      case 'click':
-      case 'dblclick':
-        this.onResultSelected(result, event);
-        break;
-      case 'mouseover':
-        this.onResultHoverStart(result);
-        break;
-      case 'mouseout':
-        this.onResultHoverEnd();
-        break;
-      case 'keypress':
-        this.handleKeyPress(event, result);
-        break;
-    }
-  }
-
-  /**
-   * Creates and returns a layer for the given search result, which could be markers or shapes on the map.
-   *
-   * @function
-   * @param {Object} result - The search result object.
-   * @returns {L.Layer} The layer created for this result.
-   */
-  resultLayer(result) {
-    if (!result.layer) {
-      result.layer = L.layerGroup();
-
-      if (result.position) {
-        L.marker(result.position, {
-          icon: L.divIcon.coloredSvg('red'),
-          title: result.title,
-        }).addTo(result.layer);
-      }
-
-      if (result.bounds) {
-        L.rectangle(result.bounds, {
-          title: result.title,
-          interactive: false,
-          color: 'red',
-          fill: false,
-        }).addTo(result.layer);
-      }
-    }
-    return result.layer;
-  }
-
-  /**
-   * Handles the selection of a search result, including map view adjustments and layer management.
-   *
-   * @function
-   * @param {Object} result - The selected search result object.
-   * @param {Event} event - The event associated with the selection.
-   */
-  onResultSelected(result, event) {
-    this.removeHoverResult();
-    this.removeSelectedResult();
-    this.selectedResult = result;
-
-    if (result.onSelected && result.onSelected(result, event)) return;
-
-    const { position, bounds } = result;
-    if (event.type === 'dblclick') {
-      if (position) {
-        window.map.setView(position, window.DEFAULT_ZOOM);
-      } else if (bounds) {
-        window.map.fitBounds(bounds, { maxZoom: window.DEFAULT_ZOOM });
-      }
-    } else {
-      if (bounds) {
-        window.map.fitBounds(bounds, { maxZoom: window.DEFAULT_ZOOM });
-      } else if (position) {
-        window.map.setView(position);
-      }
-    }
-
-    result.layer = this.resultLayer(result);
-
-    if (result.layer) window.map.addLayer(result.layer);
-    if (window.isSmartphone()) window.show('map');
-  }
-
-  /**
-   * Removes the currently selected search result from the map and performs cleanup.
-   *
-   * @function
-   */
-  removeSelectedResult() {
-    if (this.selectedResult) {
-      if (this.selectedResult.layer) window.map.removeLayer(this.selectedResult.layer);
-      if (this.selectedResult.onRemove) this.selectedResult.onRemove(this.selectedResult);
-    }
-  }
-
-  /**
-   * Handles the start of a hover over a search result. Adds the layer for the result to the map if not already selected.
-   *
-   * @function
-   * @param {Object} result - The search result object being hovered over.
-   */
-  onResultHoverStart(result) {
-    this.removeHoverResult();
-    this.hoverResult = result;
-
-    if (result === this.selectedResult) return;
-
-    result.layer = this.resultLayer(result);
-
-    if (result.layer) window.map.addLayer(result.layer);
-  }
-
-  /**
-   * Removes the hover result layer from the map unless it's the selected result.
-   *
-   * @function
-   */
-  removeHoverResult() {
-    if (this.hoverResult && this.hoverResult.layer && this.hoverResult !== this.selectedResult) {
-      window.map.removeLayer(this.hoverResult.layer);
-    }
-    this.hoverResult = null;
-  }
-
-  /**
-   * Handles the end of a hover over a search result. Removes the hover result layer from the map.
-   */
-  onResultHoverEnd() {
-    this.removeHoverResult();
-  }
-}
-
-IITC.search.Query = Query;
 IITC.search.UI = UI;
 
 /**
diff --git a/core/code/search_query.js b/core/code/search_query.js
new file mode 100644
index 000000000..8a42030ae
--- /dev/null
+++ b/core/code/search_query.js
@@ -0,0 +1,226 @@
+/* global IITC, L -- eslint */
+
+/**
+ * Represents a search query within the IITC search module, managing query state, results, and UI rendering.
+ *
+ * This class provides functionality to handle search operations such as displaying and interacting with results,
+ * including selection, hover actions, and map adjustments. Hooks for custom search actions are triggered when
+ * a new search query is initialized.
+ *
+ * @memberof IITC.search
+ * @class
+ */
+class Query {
+  /**
+   * Initializes the search query, setting up UI elements and triggering the 'search' hook.
+   *
+   * @constructor
+   * @param {string} term - The search term.
+   * @param {boolean} confirmed - Indicates if the search is confirmed (e.g., by pressing Enter).
+   */
+  constructor(term, confirmed) {
+    this.term = term;
+    this.confirmed = confirmed;
+    this.results = [];
+    this.ui = new IITC.search.UI(term, confirmed);
+
+    window.runHooks('search', this);
+  }
+
+  /**
+   * Displays the search query results in the specified UI container.
+   *
+   * @memberof IITC.search.Query
+   */
+  show() {
+    this.ui.renderIn('#searchwrapper');
+  }
+
+  /**
+   * Hides and removes the current search results, clearing selection and hover states.
+   *
+   * @memberof IITC.search.Query
+   */
+  hide() {
+    this.ui.remove();
+    this.removeSelectedResult();
+    this.removeHoverResult();
+  }
+
+  /**
+   * Adds a search result to the query and triggers re-rendering of the results list.
+   *
+   * @memberof IITC.search.Query
+   * @param {Object} result - The search result to add, including title, position, and interactions.
+   */
+  addResult(result) {
+    this.results.push(result);
+    this.renderResults();
+  }
+
+  /**
+   * Handles keyboard interactions for selecting a result with Enter or Space keys.
+   *
+   * @memberof IITC.search.Query
+   * @param {Event} ev - The keyboard event.
+   * @param {Object} result - The result being interacted with.
+   */
+  handleKeyPress(ev, result) {
+    if (ev.key === ' ' || ev.key === 'Enter') {
+      ev.preventDefault();
+      const type = ev.key === ' ' ? 'click' : 'dblclick';
+      this.onResultSelected(result, { ...ev, type });
+    }
+  }
+
+  /**
+   * Renders all search results through the UI class and sets up event handling for each result.
+   *
+   * @memberof IITC.search.Query
+   */
+  renderResults() {
+    this.ui.renderResults(this.results, (result, event) => this.handleResultInteraction(result, event));
+  }
+
+  /**
+   * Manages interactions with search results, such as clicks, hovers, and keyboard events.
+   *
+   * @memberof IITC.search.Query
+   * @param {Object} result - The result being interacted with.
+   * @param {Event} event - The event associated with the interaction.
+   */
+  handleResultInteraction(result, event) {
+    switch (event.type) {
+      case 'click':
+      case 'dblclick':
+        this.onResultSelected(result, event);
+        break;
+      case 'mouseover':
+        this.onResultHoverStart(result);
+        break;
+      case 'mouseout':
+        this.onResultHoverEnd();
+        break;
+      case 'keypress':
+        this.handleKeyPress(event, result);
+        break;
+    }
+  }
+
+  /**
+   * Creates and returns a map layer for the given search result, which could include markers or shapes.
+   *
+   * @memberof IITC.search.Query
+   * @param {Object} result - The search result object.
+   * @returns {L.Layer} - The generated layer for the result.
+   */
+  resultLayer(result) {
+    if (!result.layer) {
+      result.layer = L.layerGroup();
+
+      if (result.position) {
+        L.marker(result.position, {
+          icon: L.divIcon.coloredSvg('red'),
+          title: result.title,
+        }).addTo(result.layer);
+      }
+
+      if (result.bounds) {
+        L.rectangle(result.bounds, {
+          title: result.title,
+          interactive: false,
+          color: 'red',
+          fill: false,
+        }).addTo(result.layer);
+      }
+    }
+    return result.layer;
+  }
+
+  /**
+   * Handles the selection of a search result, adjusting the map view and adding its layer to the map.
+   *
+   * @memberof IITC.search.Query
+   * @param {Object} result - The selected search result object.
+   * @param {Event} event - The event associated with the selection.
+   */
+  onResultSelected(result, event) {
+    this.removeHoverResult();
+    this.removeSelectedResult();
+    this.selectedResult = result;
+
+    if (result.onSelected && result.onSelected(result, event)) return;
+
+    const { position, bounds } = result;
+    if (event.type === 'dblclick') {
+      if (position) {
+        window.map.setView(position, window.DEFAULT_ZOOM);
+      } else if (bounds) {
+        window.map.fitBounds(bounds, { maxZoom: window.DEFAULT_ZOOM });
+      }
+    } else {
+      if (bounds) {
+        window.map.fitBounds(bounds, { maxZoom: window.DEFAULT_ZOOM });
+      } else if (position) {
+        window.map.setView(position);
+      }
+    }
+
+    result.layer = this.resultLayer(result);
+
+    if (result.layer) window.map.addLayer(result.layer);
+    if (window.isSmartphone()) window.show('map');
+  }
+
+  /**
+   * Removes the currently selected search result from the map and performs necessary cleanup.
+   *
+   * @memberof IITC.search.Query
+   */
+  removeSelectedResult() {
+    if (this.selectedResult) {
+      if (this.selectedResult.layer) window.map.removeLayer(this.selectedResult.layer);
+      if (this.selectedResult.onRemove) this.selectedResult.onRemove(this.selectedResult);
+    }
+  }
+
+  /**
+   * Starts a hover interaction on a search result, displaying its layer on the map.
+   *
+   * @memberof IITC.search.Query
+   * @param {Object} result - The result being hovered over.
+   */
+  onResultHoverStart(result) {
+    this.removeHoverResult();
+    this.hoverResult = result;
+
+    if (result === this.selectedResult) return;
+
+    result.layer = this.resultLayer(result);
+
+    if (result.layer) window.map.addLayer(result.layer);
+  }
+
+  /**
+   * Ends a hover interaction by removing the hover layer from the map if it is not selected.
+   *
+   * @memberof IITC.search.Query
+   */
+  removeHoverResult() {
+    if (this.hoverResult && this.hoverResult.layer && this.hoverResult !== this.selectedResult) {
+      window.map.removeLayer(this.hoverResult.layer);
+    }
+    this.hoverResult = null;
+  }
+
+  /**
+   * Handles the end of a hover event, removing the hover layer from the map.
+   *
+   * @memberof IITC.search.Query
+   */
+  onResultHoverEnd() {
+    this.removeHoverResult();
+  }
+}
+
+IITC.search.Query = Query;

From 96413b912a4f5d6cd2def46cbf5f7b910713b149 Mon Sep 17 00:00:00 2001
From: Alexander Danilov <git@modos189.ru>
Date: Sat, 2 Nov 2024 16:35:51 +0500
Subject: [PATCH 08/70] Rename IITC.search.UI to IITC.search.QueryResultsView
 and moving to a separate file `search_query_results_view.js`

---
 core/code/search.js                    |  75 --------------
 core/code/search_query.js              |  12 +--
 core/code/search_query_results_view.js | 132 +++++++++++++++++++++++++
 3 files changed, 138 insertions(+), 81 deletions(-)
 create mode 100644 core/code/search_query_results_view.js

diff --git a/core/code/search.js b/core/code/search.js
index cec65778a..4c6904a2d 100644
--- a/core/code/search.js
+++ b/core/code/search.js
@@ -30,81 +30,6 @@ IITC.search = {
   lastSearch: null,
 };
 
-class UI {
-  constructor(term, confirmed) {
-    this.term = term;
-    this.confirmed = confirmed;
-    this.container = this.createContainer();
-    this.header = this.createHeader();
-    this.list = this.createList();
-  }
-
-  createContainer() {
-    const container = $('<div>').addClass('searchquery');
-    container.accordion({ collapsible: true, heightStyle: 'content' });
-    return container;
-  }
-
-  createHeader() {
-    const headerText = this.confirmed
-      ? this.term
-      : `${this.term.length > 16 ? this.term.substr(0, 8) + '…' + this.term.substr(this.term.length - 8, 8) : this.term} (Return to load more)`;
-    return $('<h3>').text(headerText).appendTo(this.container);
-  }
-
-  createList() {
-    const list = $('<ul>').appendTo(this.container);
-    list.append($('<li>').text(this.confirmed ? 'No local results, searching online...' : 'No local results.'));
-    return list;
-  }
-
-  /**
-   * Renders the list of results.
-   * @param {Array} results - Array of result objects to display.
-   * @param {Function} onResultInteraction - Callback for interaction events.
-   */
-  renderResults(results, onResultInteraction) {
-    this.clearList();
-
-    if (results.length === 0) {
-      this.list.append($('<li>').text('No results found.'));
-    } else {
-      results.forEach((result) => {
-        const item = this.createListItem(result);
-        item.on('click dblclick mouseover mouseout', (ev) => onResultInteraction(result, ev));
-        this.list.append(item);
-      });
-    }
-  }
-
-  createListItem(result) {
-    const item = $('<li>').attr('tabindex', '0');
-    const link = $('<a>').text(result.title).appendTo(item);
-
-    if (result.icon) {
-      link.css('background-image', `url("${result.icon}")`);
-      item.css('list-style', 'none');
-    }
-
-    if (result.description) item.append($('<br>')).append($('<em>').append(result.description));
-    return item;
-  }
-
-  renderIn(selector) {
-    this.container.appendTo(selector);
-  }
-
-  remove() {
-    this.container.remove();
-  }
-
-  clearList() {
-    this.list.empty();
-  }
-}
-
-IITC.search.UI = UI;
-
 /**
  * Initiates a search with the specified term and confirmation status.
  *
diff --git a/core/code/search_query.js b/core/code/search_query.js
index 8a42030ae..1f365d472 100644
--- a/core/code/search_query.js
+++ b/core/code/search_query.js
@@ -22,18 +22,18 @@ class Query {
     this.term = term;
     this.confirmed = confirmed;
     this.results = [];
-    this.ui = new IITC.search.UI(term, confirmed);
+    this.resultsView = new IITC.search.QueryResultsView(term, confirmed);
 
     window.runHooks('search', this);
   }
 
   /**
-   * Displays the search query results in the specified UI container.
+   * Displays the search query results in the specified resultsView container.
    *
    * @memberof IITC.search.Query
    */
   show() {
-    this.ui.renderIn('#searchwrapper');
+    this.resultsView.renderIn('#searchwrapper');
   }
 
   /**
@@ -42,7 +42,7 @@ class Query {
    * @memberof IITC.search.Query
    */
   hide() {
-    this.ui.remove();
+    this.resultsView.remove();
     this.removeSelectedResult();
     this.removeHoverResult();
   }
@@ -74,12 +74,12 @@ class Query {
   }
 
   /**
-   * Renders all search results through the UI class and sets up event handling for each result.
+   * Renders all search results through the resultsView class and sets up event handling for each result.
    *
    * @memberof IITC.search.Query
    */
   renderResults() {
-    this.ui.renderResults(this.results, (result, event) => this.handleResultInteraction(result, event));
+    this.resultsView.renderResults(this.results, (result, event) => this.handleResultInteraction(result, event));
   }
 
   /**
diff --git a/core/code/search_query_results_view.js b/core/code/search_query_results_view.js
new file mode 100644
index 000000000..55f657aa6
--- /dev/null
+++ b/core/code/search_query_results_view.js
@@ -0,0 +1,132 @@
+/* global IITC -- eslint */
+
+/**
+ * Represents the view for displaying search query results in the IITC search module.
+ *
+ * @memberof IITC.search
+ * @class
+ */
+class QueryResultsView {
+  /**
+   * Initializes the query results view, setting up the display elements for the search term.
+   *
+   * @constructor
+   * @param {string} term - The search term.
+   * @param {boolean} confirmed - Indicates if the search is confirmed (e.g., by pressing Enter).
+   */
+  constructor(term, confirmed) {
+    this.term = term;
+    this.confirmed = confirmed;
+    this.container = this.createContainer();
+    this.header = this.createHeader();
+    this.list = this.createList();
+  }
+
+  /**
+   * Creates and returns the main container element for the query results.
+   *
+   * @memberof IITC.search.QueryResultsView
+   * @returns {jQuery} - The jQuery container element for the results.
+   */
+  createContainer() {
+    const container = $('<div>').addClass('searchquery');
+    container.accordion({ collapsible: true, heightStyle: 'content' });
+    return container;
+  }
+
+  /**
+   * Creates and appends a header to the container based on the search term.
+   *
+   * @memberof IITC.search.QueryResultsView
+   * @returns {jQuery} - The jQuery header element displaying the search term or a loading message.
+   */
+  createHeader() {
+    const headerText = this.confirmed
+      ? this.term
+      : `${this.term.length > 16 ? this.term.substr(0, 8) + '…' + this.term.substr(this.term.length - 8, 8) : this.term} (Return to load more)`;
+    return $('<h3>').text(headerText).appendTo(this.container);
+  }
+
+  /**
+   * Creates and appends an initial list element to display the search results.
+   *
+   * @memberof IITC.search.QueryResultsView
+   * @returns {jQuery} - The jQuery list element for displaying the results.
+   */
+  createList() {
+    const list = $('<ul>').appendTo(this.container);
+    list.append($('<li>').text(this.confirmed ? 'No local results, searching online...' : 'No local results.'));
+    return list;
+  }
+
+  /**
+   * Renders the search results within the list container and sets up event interactions.
+   *
+   * @memberof IITC.search.QueryResultsView
+   * @param {Array<Object>} results - An array of search result objects to display.
+   * @param {Function} - onResultInteraction - A callback function for handling interaction events on results.
+   */
+  renderResults(results, onResultInteraction) {
+    this.clearList();
+
+    if (results.length === 0) {
+      this.list.append($('<li>').text('No results found.'));
+    } else {
+      results.forEach((result) => {
+        const item = this.createListItem(result);
+        item.on('click dblclick mouseover mouseout', (ev) => onResultInteraction(result, ev));
+        this.list.append(item);
+      });
+    }
+  }
+
+  /**
+   * Creates and returns a list item for an individual search result.
+   *
+   * @memberof IITC.search.QueryResultsView
+   * @param {Object} result - The search result object with properties such as title, description, and icon.
+   * @returns {jQuery} - The jQuery list item element representing the search result.
+   */
+  createListItem(result) {
+    const item = $('<li>').attr('tabindex', '0');
+    const link = $('<a>').text(result.title).appendTo(item);
+
+    if (result.icon) {
+      link.css('background-image', `url("${result.icon}")`);
+      item.css('list-style', 'none');
+    }
+
+    if (result.description) item.append($('<br>')).append($('<em>').append(result.description));
+    return item;
+  }
+
+  /**
+   * Appends the results container to a specified selector on the page.
+   *
+   * @memberof IITC.search.QueryResultsView
+   * @param {string} selector - The selector string for the target container.
+   */
+  renderIn(selector) {
+    this.container.appendTo(selector);
+  }
+
+  /**
+   * Removes the results container from the page.
+   *
+   * @memberof IITC.search.QueryResultsView
+   */
+  remove() {
+    this.container.remove();
+  }
+
+  /**
+   * Clears all items from the results list.
+   *
+   * @memberof IITC.search.QueryResultsView
+   */
+  clearList() {
+    this.list.empty();
+  }
+}
+
+IITC.search.QueryResultsView = QueryResultsView;

From 3e62361eacfabdce65c00e2eb8be09431c431ea0 Mon Sep 17 00:00:00 2001
From: Alexander Danilov <git@modos189.ru>
Date: Sat, 2 Nov 2024 20:37:21 +0500
Subject: [PATCH 09/70] Refactoring of IITC.search

---
 core/code/search.js | 77 +++++++++++++++++++++++++++------------------
 1 file changed, 46 insertions(+), 31 deletions(-)

diff --git a/core/code/search.js b/core/code/search.js
index 4c6904a2d..0991b9dce 100644
--- a/core/code/search.js
+++ b/core/code/search.js
@@ -24,7 +24,8 @@
  *   May return `true` to prevent the map from being repositioned. You may reposition the map yourself or do other work.
  * - `onRemove(result)`: A handler to be called when the result is removed from the map
  *   (because another result has been selected or the search was cancelled by the user).
- *  @namespace window.search
+ *  @namespace IITC.search
+ *  @memberof IITC
  */
 IITC.search = {
   lastSearch: null,
@@ -33,66 +34,76 @@ IITC.search = {
 /**
  * Initiates a search with the specified term and confirmation status.
  *
- * @function window.search.doSearch
+ * @function IITC.search.doSearch
  * @param {string} term - The search term.
  * @param {boolean} confirmed - Indicates if the search term is confirmed.
  */
 IITC.search.doSearch = function (term, confirmed) {
-  term = term.trim();
+  const searchTerm = term.trim();
 
-  // minimum 3 characters for automatic search
-  if (term.length < 3 && !confirmed) return;
+  // Minimum 3 characters for automatic search
+  if (searchTerm.length < 3 && !confirmed) return;
 
-  // don't clear last confirmed search
-  if (IITC.search.lastSearch && IITC.search.lastSearch.confirmed && !confirmed) return;
+  // Avoid clearing last confirmed search
+  const lastSearch = IITC.search.lastSearch;
+  if (lastSearch?.confirmed && !confirmed) return;
 
-  // don't make the same query again
-  if (IITC.search.lastSearch && IITC.search.lastSearch.confirmed === confirmed && IITC.search.lastSearch.term === term) return;
+  // Prevent repeat of identical query
+  if (lastSearch?.confirmed === confirmed && lastSearch.term === searchTerm) return;
 
-  if (IITC.search.lastSearch) IITC.search.lastSearch.hide();
+  if (lastSearch) lastSearch.hide();
   IITC.search.lastSearch = null;
 
-  // clear results
-  if (term === '') return;
+  if (searchTerm === '') return;
 
   if (window.useAppPanes()) window.show('info');
 
-  $('.ui-tooltip').remove();
+  document.querySelectorAll('.ui-tooltip').forEach((tooltip) => tooltip.remove());
 
-  IITC.search.lastSearch = new IITC.search.Query(term, confirmed);
+  IITC.search.lastSearch = new IITC.search.Query(searchTerm, confirmed);
   IITC.search.lastSearch.show();
 };
 
 /**
  * Sets up the search input field and button functionality.
  *
- * @function window.search.setup
+ * @function IITC.search.setup
  */
 IITC.search.setup = function () {
-  $('#search')
-    .keypress(function (e) {
-      if ((e.keyCode ? e.keyCode : e.which) !== 13) return;
-      e.preventDefault();
+  const searchInput = document.querySelector('#search');
+  const geoLocationButton = document.querySelector('#buttongeolocation');
+  let searchTimer;
 
-      const term = $(this).val();
+  if (searchInput) {
+    searchInput.addEventListener('keydown', (e) => {
+      if (e.key !== 'Enter') return;
+      e.preventDefault();
 
-      clearTimeout(IITC.search.timer);
+      const term = searchInput.value.trim();
+      clearTimeout(searchTimer);
       IITC.search.doSearch(term, true);
-    })
-    .on('keyup keypress change paste', function () {
-      clearTimeout(IITC.search.timer);
-      IITC.search.timer = setTimeout(() => {
-        const term = $(this).val();
+    });
+
+    searchInput.addEventListener('input', () => {
+      clearTimeout(searchTimer);
+      searchTimer = setTimeout(() => {
+        const term = searchInput.value.trim();
         IITC.search.doSearch(term, false);
-      }, 500);
+      }, 100);
     });
-  $('#buttongeolocation').click(() => window.map.locate({ setView: true, maxZoom: 13 }));
+  }
+
+  if (geoLocationButton) {
+    geoLocationButton.addEventListener('click', () => {
+      window.map.locate({ setView: true, maxZoom: 13 });
+    });
+  }
 };
 
 /**
  * Adds a search result for a portal to the search query results.
  *
- * @function window.search.addSearchResult
+ * @function IITC.search.addSearchResult
  * @param {Object} query - The search query object to which the result will be added.
  * @param {Object} data - The data for the search result. This includes information such as title, team, level, health, etc.
  * @param {string} guid - GUID if the portal.
@@ -101,17 +112,21 @@ IITC.search.addSearchResult = function (query, data, guid) {
   const team = window.teamStringToId(data.team);
   const color = team === window.TEAM_NONE ? '#CCC' : window.COLORS[team];
   const latLng = L.latLng(data.latE6 / 1e6, data.lngE6 / 1e6);
+
   query.addResult({
     title: data.title,
     description: `${window.TEAM_SHORTNAMES[team]}, L${data.level}, ${data.health}%, ${data.resCount} Resonators`,
     position: latLng,
     icon: `data:image/svg+xml;base64,${btoa('@include_string:images/icon-portal.svg@'.replace(/%COLOR%/g, color))}`,
+
     onSelected(result, event) {
+      const { position } = result;
+
       if (event.type === 'dblclick') {
         window.zoomToAndShowPortal(guid, latLng);
       } else if (window.portals[guid]) {
-        if (!window.map.getBounds().contains(result.position)) {
-          window.map.setView(result.position);
+        if (!window.map.getBounds().contains(position)) {
+          window.map.setView(position);
         }
         window.renderPortalDetails(guid);
       } else {

From 81333186a990b47105ac64a94b8c1e5842d271e8 Mon Sep 17 00:00:00 2001
From: Alexander Danilov <git@modos189.ru>
Date: Sun, 3 Nov 2024 11:46:15 +0500
Subject: [PATCH 10/70] Refactoring of IITC.search.QueryResultsView

---
 core/code/search_query_results_view.js | 84 ++++++++++++++++++--------
 1 file changed, 60 insertions(+), 24 deletions(-)

diff --git a/core/code/search_query_results_view.js b/core/code/search_query_results_view.js
index 55f657aa6..7072a9fbf 100644
--- a/core/code/search_query_results_view.js
+++ b/core/code/search_query_results_view.js
@@ -26,11 +26,11 @@ class QueryResultsView {
    * Creates and returns the main container element for the query results.
    *
    * @memberof IITC.search.QueryResultsView
-   * @returns {jQuery} - The jQuery container element for the results.
+   * @returns {HTMLElement} - The container element for the results.
    */
   createContainer() {
-    const container = $('<div>').addClass('searchquery');
-    container.accordion({ collapsible: true, heightStyle: 'content' });
+    const container = document.createElement('div');
+    container.classList.add('searchquery');
     return container;
   }
 
@@ -38,24 +38,41 @@ class QueryResultsView {
    * Creates and appends a header to the container based on the search term.
    *
    * @memberof IITC.search.QueryResultsView
-   * @returns {jQuery} - The jQuery header element displaying the search term or a loading message.
+   * @returns {HTMLElement} - The header element displaying the search term or a loading message.
    */
   createHeader() {
-    const headerText = this.confirmed
-      ? this.term
-      : `${this.term.length > 16 ? this.term.substr(0, 8) + '…' + this.term.substr(this.term.length - 8, 8) : this.term} (Return to load more)`;
-    return $('<h3>').text(headerText).appendTo(this.container);
+    const header = document.createElement('h3');
+    let headerText;
+
+    if (this.confirmed) {
+      headerText = this.term;
+    } else {
+      if (this.term.length > 16) {
+        const start = this.term.slice(0, 8);
+        const end = this.term.slice(-8);
+        headerText = `${start}…${end} (Return to load more)`;
+      } else {
+        headerText = `${this.term} (Return to load more)`;
+      }
+    }
+
+    header.textContent = headerText;
+    this.container.appendChild(header);
+    return header;
   }
 
   /**
    * Creates and appends an initial list element to display the search results.
    *
    * @memberof IITC.search.QueryResultsView
-   * @returns {jQuery} - The jQuery list element for displaying the results.
+   * @returns {HTMLElement} - The list element for displaying the results.
    */
   createList() {
-    const list = $('<ul>').appendTo(this.container);
-    list.append($('<li>').text(this.confirmed ? 'No local results, searching online...' : 'No local results.'));
+    const list = document.createElement('ul');
+    const initialItem = document.createElement('li');
+    initialItem.textContent = this.confirmed ? 'No local results, searching online...' : 'No local results.';
+    list.appendChild(initialItem);
+    this.container.appendChild(list);
     return list;
   }
 
@@ -64,18 +81,23 @@ class QueryResultsView {
    *
    * @memberof IITC.search.QueryResultsView
    * @param {Array<Object>} results - An array of search result objects to display.
-   * @param {Function} - onResultInteraction - A callback function for handling interaction events on results.
+   * @param {Function} onResultInteraction - A callback function for handling interaction events on results.
    */
   renderResults(results, onResultInteraction) {
     this.clearList();
 
     if (results.length === 0) {
-      this.list.append($('<li>').text('No results found.'));
+      const noResultsItem = document.createElement('li');
+      noResultsItem.textContent = 'No results found.';
+      this.list.appendChild(noResultsItem);
     } else {
       results.forEach((result) => {
         const item = this.createListItem(result);
-        item.on('click dblclick mouseover mouseout', (ev) => onResultInteraction(result, ev));
-        this.list.append(item);
+        item.addEventListener('click', (ev) => onResultInteraction(result, ev));
+        item.addEventListener('dblclick', (ev) => onResultInteraction(result, ev));
+        item.addEventListener('mouseover', (ev) => onResultInteraction(result, ev));
+        item.addEventListener('mouseout', (ev) => onResultInteraction(result, ev));
+        this.list.appendChild(item);
       });
     }
   }
@@ -85,18 +107,29 @@ class QueryResultsView {
    *
    * @memberof IITC.search.QueryResultsView
    * @param {Object} result - The search result object with properties such as title, description, and icon.
-   * @returns {jQuery} - The jQuery list item element representing the search result.
+   * @returns {HTMLElement} - The list item element representing the search result.
    */
   createListItem(result) {
-    const item = $('<li>').attr('tabindex', '0');
-    const link = $('<a>').text(result.title).appendTo(item);
+    const item = document.createElement('li');
+    item.tabIndex = 0;
+
+    const link = document.createElement('a');
+    link.innerHTML = result.title;
 
     if (result.icon) {
-      link.css('background-image', `url("${result.icon}")`);
-      item.css('list-style', 'none');
+      link.style.backgroundImage = `url("${result.icon}")`;
+      item.style.listStyle = 'none';
+    }
+
+    item.appendChild(link);
+
+    if (result.description) {
+      const description = document.createElement('em');
+      description.innerHTML = result.description;
+      item.appendChild(document.createElement('br'));
+      item.appendChild(description);
     }
 
-    if (result.description) item.append($('<br>')).append($('<em>').append(result.description));
     return item;
   }
 
@@ -107,7 +140,8 @@ class QueryResultsView {
    * @param {string} selector - The selector string for the target container.
    */
   renderIn(selector) {
-    this.container.appendTo(selector);
+    const target = document.querySelector(selector);
+    if (target) target.appendChild(this.container);
   }
 
   /**
@@ -116,7 +150,9 @@ class QueryResultsView {
    * @memberof IITC.search.QueryResultsView
    */
   remove() {
-    this.container.remove();
+    if (this.container.parentNode) {
+      this.container.parentNode.removeChild(this.container);
+    }
   }
 
   /**
@@ -125,7 +161,7 @@ class QueryResultsView {
    * @memberof IITC.search.QueryResultsView
    */
   clearList() {
-    this.list.empty();
+    this.list.innerHTML = '';
   }
 }
 

From a617cfa19376613212b01359e4bde65cf44ef08b Mon Sep 17 00:00:00 2001
From: Alexander Danilov <git@modos189.ru>
Date: Sun, 3 Nov 2024 12:06:57 +0500
Subject: [PATCH 11/70] The geolocation button is always placed in the search
 field

---
 core/style.css                 | 3 +--
 core/total-conversion-build.js | 6 ++++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/core/style.css b/core/style.css
index cc0199265..32d8713b7 100644
--- a/core/style.css
+++ b/core/style.css
@@ -569,11 +569,10 @@ input[type="search"], input[type="url"] {
 #buttongeolocation {
   position: absolute;
   right: 0;
-  bottom: 0;
   margin: 0;
   border: 0 none transparent;
   padding: 0 2px 0 0;
-  height: 100%;
+  height: 24px;
   background-color: transparent;
 }
 #buttongeolocation:focus {
diff --git a/core/total-conversion-build.js b/core/total-conversion-build.js
index 2138b4971..f023d610c 100644
--- a/core/total-conversion-build.js
+++ b/core/total-conversion-build.js
@@ -169,10 +169,12 @@ document.body.innerHTML =
   '    <div id="playerstat">t</div>' +
   '    <div id="gamestat">&nbsp;loading global control stats</div>' +
   '    <div id="searchwrapper">' +
-  '      <button title="Current location" id="buttongeolocation"><img src="' +
+  '      <div id="searchbox">' +
+  '        <button title="Current location" id="buttongeolocation"><img src="' +
   '@include_img:images/current-location.png@' +
   '" alt="Current location"/></button>' +
-  '      <input id="search" placeholder="Search location…" type="search" accesskey="f" title="Search for a place [f]"/>' +
+  '        <input id="search" placeholder="Search location…" type="search" accesskey="f" title="Search for a place [f]"/>' +
+  '      </div>' +
   '    </div>' +
   '    <div id="portaldetails"></div>' +
   '    <input id="redeem" placeholder="Redeem code…" type="text"/>' +

From d18dc82f0c467ab8cb0a7197295e45a94a9f4bfa Mon Sep 17 00:00:00 2001
From: Alexander Danilov <git@modos189.ru>
Date: Sun, 3 Nov 2024 13:32:42 +0500
Subject: [PATCH 12/70] Added an accordion to expand and collapse search
 results without jQuery

---
 core/code/search_query_results_view.js | 12 +++++++++
 core/style.css                         | 35 +++++++++++++++-----------
 2 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/core/code/search_query_results_view.js b/core/code/search_query_results_view.js
index 7072a9fbf..cadec8d20 100644
--- a/core/code/search_query_results_view.js
+++ b/core/code/search_query_results_view.js
@@ -20,6 +20,7 @@ class QueryResultsView {
     this.container = this.createContainer();
     this.header = this.createHeader();
     this.list = this.createList();
+    this.setupAccordion();
   }
 
   /**
@@ -76,6 +77,17 @@ class QueryResultsView {
     return list;
   }
 
+  /**
+   * Sets up the accordion functionality for expanding and collapsing results.
+   *
+   * @memberof IITC.search.QueryResultsView
+   */
+  setupAccordion() {
+    this.header.addEventListener('click', () => {
+      this.container.classList.toggle('collapsed');
+    });
+  }
+
   /**
    * Renders the search results within the list container and sets up event interactions.
    *
diff --git a/core/style.css b/core/style.css
index 32d8713b7..141a3f47a 100644
--- a/core/style.css
+++ b/core/style.css
@@ -581,35 +581,40 @@ input[type="search"], input[type="url"] {
 #buttongeolocation img {
   vertical-align: middle;
 }
+.searchquery {
+  max-height: 25em;
+  overflow-y: auto;
+}
 #searchwrapper h3 {
+  padding: 0 0 0 25px;
+  position: relative;
   font-size: 1em;
   height: auto;
   cursor: pointer;
 }
-.searchquery {
-  max-height: 25em;
-  overflow-y: auto;
-}
-#searchwrapper .ui-accordion-header::before {
-  font-size: 18px;
+#searchwrapper h3::before {
+  position: absolute;
+  left: 5px;
+  font-size: 14px;
   margin-right: 2px;
   font-weight: normal;
-  line-height: 1em;
-  content: "⊞";
-}
-#searchwrapper .ui-accordion-header-active::before {
-  content: "⊟";
+  content: "▲";
+  transition: transform 0.3s ease;
 }
-#searchwrapper .ui-accordion-content {
-  margin: 0;
-  overflow: hidden;
+#searchwrapper .searchquery.collapsed h3::before {
+  transform: rotate(180deg);
 }
 #searchwrapper ul {
-  padding-left: 14px;
+  max-height: 100%;
+  padding-left: 16px;
+  overflow: hidden;
 }
 #searchwrapper li {
   cursor: pointer;
 }
+#searchwrapper .searchquery.collapsed ul {
+  max-height: 0;
+}
 #searchwrapper li a {
   margin-left: -14px;
   padding-left: 14px;

From d1540d70558b88f9dbc446cb8b47271aa3519107 Mon Sep 17 00:00:00 2001
From: Alexander Danilov <git@modos189.ru>
Date: Sun, 3 Nov 2024 13:34:54 +0500
Subject: [PATCH 13/70] Updated current geolocation icon, added search icon
 next to the search field

---
 core/images/current-location.png | Bin 1267 -> 0 bytes
 core/images/icon-my-location.svg |   1 +
 core/images/icon-search.svg      |   1 +
 core/style.css                   |  21 +++++++++++++++------
 core/total-conversion-build.js   |   5 ++++-
 5 files changed, 21 insertions(+), 7 deletions(-)
 delete mode 100644 core/images/current-location.png
 create mode 100644 core/images/icon-my-location.svg
 create mode 100644 core/images/icon-search.svg

diff --git a/core/images/current-location.png b/core/images/current-location.png
deleted file mode 100644
index 9a3215d81fdb2be2196ece0acf17d6f28d76f954..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1267
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE;=WQl7;NpOBzNqJ&XDuZK6ep0G}
zXKrG8YEWuoN@d~6R2v2cW|hp4h>{3jAFJg2T)jk)8oi3#0-$aN1{?c|g2d$P)DnfH
z)bz|eTc!8A_bVx6rr0WloBA5~7C5J7WO`H;r3P2|g(O#HCtIc{+1n}DR9FEG$W1Lt
zRH(?!$t$+1uvG$^YXxM3g!Ppaz)DK8ZIvL7itr6kaLzAERWQ{v&`mZlGgL4$(K9qL
zur#sMQ7|$vG|)FR(l;>IH8ij?HMcS_RDc2{plwAdX;wilZcw{`JX@uVl9B=|ef{$C
za=mh6z5JqdeM3u2OML?)eIp}XpbFjM%Dj@q3f;V7Wta&rsl~}fnFS@8`FRQ;6BCp2
zOG|8(fG&l2A-4c-Y+f-mn1BJMUy)d#Z>VPg@)As;uP=V3xw&xF#U(+h2=`(&xHzP;
zAXPsowK%`DC>a=WY04n03ap%qQWHz^i$e1Ab6}wukda@KU!0L&px_*As%NO+o0y!L
z2ND76@b$Iw%quQQ%u7!7bg@+enxU7OnPO#VW^8I{;%e$>;%a1Q=xS(T>}crb=<Md|
z<m7DT;^+j^>yn>bnwy$e0@Is<&})WMFDNnO765H_NiE7OOHFYr%Fk5*d)g`!w_A*H
zng`XJg4-=7IQ8lS9itD5TBN9k2?5g&hzU=)Kn^_Vr{)3Edl4{UPnLcw#K6D^3_Zt?
zid$<!PX``05Se0fr;xLdy~N>?<0Z$UkEVsJja+YJ-g>`auqs%=P~PAzAbKD;O@6bP
z*@6SJZ%Rg2MXkSge%mT7<0RvQVFu!Nc)mp)^ehl4iJbP;>@G*7Vuk1%w-Y?q%06hm
z+U2*5<M1)=In9-hnh_Jv+g`J|*PMTNN#6;npf3s@tUDica=hO#?U1{ux$`00iMb5<
z%g#=|KQknxEkIJ+bEcx)s+{CUZ!{tvTb7<!R%dGdaoXkFZG1}?zN*ogJ*9Vf#W~rd
z@6N{LotHW-aQM3*`)}_>`ss6jrY9c~opQ6|b68SF;D`Awy7Th?E4+#NeP`iC-Ym_|
zRHxgSvh!q?wQY+pY~0n<BEyu}-WERfb!SdrDD&^>Lg&u~Zry&x>$v>7`4i@!J5ijp
z?nI`euzF2tC*Omnc%@32_YT_}j(_2>_4q!cnDeaL*5e1OcclG`O{|_(uG*UTgIgmr
e?%NyZ21W+4hS;Z-m)<#miXl%|KbLh*2~7a<*1^sI

diff --git a/core/images/icon-my-location.svg b/core/images/icon-my-location.svg
new file mode 100644
index 000000000..7b4569514
--- /dev/null
+++ b/core/images/icon-my-location.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#BBBBBB"><path d="M440-42v-80q-125-14-214.5-103.5T122-440H42v-80h80q14-125 103.5-214.5T440-838v-80h80v80q125 14 214.5 103.5T838-520h80v80h-80q-14 125-103.5 214.5T520-122v80h-80Zm40-158q116 0 198-82t82-198q0-116-82-198t-198-82q-116 0-198 82t-82 198q0 116 82 198t198 82Zm0-120q-66 0-113-47t-47-113q0-66 47-113t113-47q66 0 113 47t47 113q0 66-47 113t-113 47Zm0-80q33 0 56.5-23.5T560-480q0-33-23.5-56.5T480-560q-33 0-56.5 23.5T400-480q0 33 23.5 56.5T480-400Zm0-80Z"/></svg>
\ No newline at end of file
diff --git a/core/images/icon-search.svg b/core/images/icon-search.svg
new file mode 100644
index 000000000..0eebe5d59
--- /dev/null
+++ b/core/images/icon-search.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#BBBBBB"><path d="M784-120 532-372q-30 24-69 38t-83 14q-109 0-184.5-75.5T120-580q0-109 75.5-184.5T380-840q109 0 184.5 75.5T640-580q0 44-14 83t-38 69l252 252-56 56ZM380-400q75 0 127.5-52.5T560-580q0-75-52.5-127.5T380-760q-75 0-127.5 52.5T200-580q0 75 52.5 127.5T380-400Z"/></svg>
\ No newline at end of file
diff --git a/core/style.css b/core/style.css
index 141a3f47a..1b68cb090 100644
--- a/core/style.css
+++ b/core/style.css
@@ -564,23 +564,32 @@ input[type="search"], input[type="url"] {
 }
 #search {
   width: 100%;
+  padding-left: 24px;
   padding-right: 24px;
 }
-#buttongeolocation {
+#searchicon, #buttongeolocation {
+  display: flex;
+  align-items: center;
   position: absolute;
-  right: 0;
   margin: 0;
   border: 0 none transparent;
-  padding: 0 2px 0 0;
+  padding: 0 2px;
   height: 24px;
   background-color: transparent;
 }
+#searchicon img, #buttongeolocation img {
+  height: 20px;
+}
+#searchicon {
+  left: 0;
+}
+#buttongeolocation {
+  right: 0;
+  cursor: pointer;
+}
 #buttongeolocation:focus {
   outline: 1px dotted #ffce00;
 }
-#buttongeolocation img {
-  vertical-align: middle;
-}
 .searchquery {
   max-height: 25em;
   overflow-y: auto;
diff --git a/core/total-conversion-build.js b/core/total-conversion-build.js
index f023d610c..0caa9a3f3 100644
--- a/core/total-conversion-build.js
+++ b/core/total-conversion-build.js
@@ -170,8 +170,11 @@ document.body.innerHTML =
   '    <div id="gamestat">&nbsp;loading global control stats</div>' +
   '    <div id="searchwrapper">' +
   '      <div id="searchbox">' +
+  '        <div id="searchicon"><img src="' +
+  '@include_img:images/icon-search.svg@' +
+  '" alt="Search"/></div>' +
   '        <button title="Current location" id="buttongeolocation"><img src="' +
-  '@include_img:images/current-location.png@' +
+  '@include_img:images/icon-my-location.svg@' +
   '" alt="Current location"/></button>' +
   '        <input id="search" placeholder="Search location…" type="search" accesskey="f" title="Search for a place [f]"/>' +
   '      </div>' +

From 20d30e49626b763f91378098858f83e3f7f8eeea Mon Sep 17 00:00:00 2001
From: Alexander Danilov <git@modos189.ru>
Date: Sun, 3 Nov 2024 14:09:15 +0500
Subject: [PATCH 14/70] Added an icon to cancel a search

---
 core/code/search.js              | 22 ++++++++++++++++++++++
 core/images/icon-close-small.svg |  1 +
 core/style.css                   | 20 +++++++++++++++++---
 core/total-conversion-build.js   |  3 +++
 4 files changed, 43 insertions(+), 3 deletions(-)
 create mode 100644 core/images/icon-close-small.svg

diff --git a/core/code/search.js b/core/code/search.js
index 0991b9dce..8faf31b7b 100644
--- a/core/code/search.js
+++ b/core/code/search.js
@@ -40,6 +40,11 @@ IITC.search = {
  */
 IITC.search.doSearch = function (term, confirmed) {
   const searchTerm = term.trim();
+  const searchCancelButton = document.querySelector('#searchcancel');
+
+  if (searchCancelButton) {
+    searchCancelButton.classList.toggle('visible', searchTerm.length > 0);
+  }
 
   // Minimum 3 characters for automatic search
   if (searchTerm.length < 3 && !confirmed) return;
@@ -71,6 +76,7 @@ IITC.search.doSearch = function (term, confirmed) {
  */
 IITC.search.setup = function () {
   const searchInput = document.querySelector('#search');
+  const searchCancelButton = document.querySelector('#searchcancel');
   const geoLocationButton = document.querySelector('#buttongeolocation');
   let searchTimer;
 
@@ -93,6 +99,22 @@ IITC.search.setup = function () {
     });
   }
 
+  if (searchCancelButton) {
+    searchCancelButton.classList.remove('visible');
+
+    searchCancelButton.addEventListener('click', () => {
+      if (searchInput) {
+        searchInput.value = '';
+        searchInput.focus();
+        searchCancelButton.classList.remove('visible');
+
+        // Clear the current search
+        clearTimeout(searchTimer);
+        IITC.search.doSearch('', true);
+      }
+    });
+  }
+
   if (geoLocationButton) {
     geoLocationButton.addEventListener('click', () => {
       window.map.locate({ setView: true, maxZoom: 13 });
diff --git a/core/images/icon-close-small.svg b/core/images/icon-close-small.svg
new file mode 100644
index 000000000..20c1239e5
--- /dev/null
+++ b/core/images/icon-close-small.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#BBBBBB"><path d="m336-280-56-56 144-144-144-143 56-56 144 144 143-144 56 56-144 143 144 144-56 56-143-144-144 144Z"/></svg>
\ No newline at end of file
diff --git a/core/style.css b/core/style.css
index 1b68cb090..77cbcf33a 100644
--- a/core/style.css
+++ b/core/style.css
@@ -565,9 +565,12 @@ input[type="search"], input[type="url"] {
 #search {
   width: 100%;
   padding-left: 24px;
-  padding-right: 24px;
+  padding-right: 36px;
 }
-#searchicon, #buttongeolocation {
+#search::-webkit-search-cancel-button {
+  -webkit-appearance: none;
+}
+#searchicon, #searchcancel, #buttongeolocation {
   display: flex;
   align-items: center;
   position: absolute;
@@ -577,12 +580,23 @@ input[type="search"], input[type="url"] {
   height: 24px;
   background-color: transparent;
 }
-#searchicon img, #buttongeolocation img {
+#searchicon img, #searchcancel img, #buttongeolocation img {
   height: 20px;
 }
 #searchicon {
   left: 0;
 }
+#searchcancel {
+  right: 24px;
+  cursor: pointer;
+  opacity: 0;
+  pointer-events: none;
+  transition: opacity 0.3s ease;
+}
+#searchcancel.visible {
+  opacity: 1;
+  pointer-events: auto;
+}
 #buttongeolocation {
   right: 0;
   cursor: pointer;
diff --git a/core/total-conversion-build.js b/core/total-conversion-build.js
index 0caa9a3f3..3ec91d522 100644
--- a/core/total-conversion-build.js
+++ b/core/total-conversion-build.js
@@ -173,6 +173,9 @@ document.body.innerHTML =
   '        <div id="searchicon"><img src="' +
   '@include_img:images/icon-search.svg@' +
   '" alt="Search"/></div>' +
+  '        <div id="searchcancel"><img src="' +
+  '@include_img:images/icon-close-small.svg@' +
+  '" alt="Cancel search"/></div>' +
   '        <button title="Current location" id="buttongeolocation"><img src="' +
   '@include_img:images/icon-my-location.svg@' +
   '" alt="Current location"/></button>' +

From f15662f41d7ed30643ca251ca0b81383cf7cb2d2 Mon Sep 17 00:00:00 2001
From: Alexander Danilov <git@modos189.ru>
Date: Sun, 3 Nov 2024 16:14:19 +0500
Subject: [PATCH 15/70] Move IITC.search.addSearchResult to
 IITC.search.Query.addPortalResult

---
 core/code/search.js       | 44 +++++++--------------------------------
 core/code/search_query.js | 37 ++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 37 deletions(-)

diff --git a/core/code/search.js b/core/code/search.js
index 8faf31b7b..3dcb55a07 100644
--- a/core/code/search.js
+++ b/core/code/search.js
@@ -122,43 +122,6 @@ IITC.search.setup = function () {
   }
 };
 
-/**
- * Adds a search result for a portal to the search query results.
- *
- * @function IITC.search.addSearchResult
- * @param {Object} query - The search query object to which the result will be added.
- * @param {Object} data - The data for the search result. This includes information such as title, team, level, health, etc.
- * @param {string} guid - GUID if the portal.
- */
-IITC.search.addSearchResult = function (query, data, guid) {
-  const team = window.teamStringToId(data.team);
-  const color = team === window.TEAM_NONE ? '#CCC' : window.COLORS[team];
-  const latLng = L.latLng(data.latE6 / 1e6, data.lngE6 / 1e6);
-
-  query.addResult({
-    title: data.title,
-    description: `${window.TEAM_SHORTNAMES[team]}, L${data.level}, ${data.health}%, ${data.resCount} Resonators`,
-    position: latLng,
-    icon: `data:image/svg+xml;base64,${btoa('@include_string:images/icon-portal.svg@'.replace(/%COLOR%/g, color))}`,
-
-    onSelected(result, event) {
-      const { position } = result;
-
-      if (event.type === 'dblclick') {
-        window.zoomToAndShowPortal(guid, latLng);
-      } else if (window.portals[guid]) {
-        if (!window.map.getBounds().contains(position)) {
-          window.map.setView(position);
-        }
-        window.renderPortalDetails(guid);
-      } else {
-        window.selectPortalByLatLng(latLng);
-      }
-      return true;
-    },
-  });
-};
-
 // Redirect all window.search access to IITC.search
 Object.defineProperty(window, 'search', {
   get() {
@@ -169,3 +132,10 @@ Object.defineProperty(window, 'search', {
   },
   configurable: true,
 });
+
+/*
+ * @deprecated - use query.addPortalResult
+ */
+window.search.addSearchResult = function (query, data, guid) {
+  query.addPortalResult(data, guid);
+};
diff --git a/core/code/search_query.js b/core/code/search_query.js
index 1f365d472..f55221dad 100644
--- a/core/code/search_query.js
+++ b/core/code/search_query.js
@@ -58,6 +58,43 @@ class Query {
     this.renderResults();
   }
 
+  /**
+   * Adds a search result for a portal to the search query results.
+   *
+   * @memberof IITC.search.Query
+   * @function addPortalResult
+   * @param {Object} data - The portal data for the search result. This includes information such as title, team, level, health, etc.
+   * @param {string} guid - GUID if the portal.
+   */
+  addPortalResult(data, guid) {
+    const team = window.teamStringToId(data.team);
+    const color = team === window.TEAM_NONE ? '#CCC' : window.COLORS[team];
+    const latLng = L.latLng(data.latE6 / 1e6, data.lngE6 / 1e6);
+
+    this.addResult({
+      title: data.title,
+      description: `${window.TEAM_SHORTNAMES[team]}, L${data.level}, ${data.health}%, ${data.resCount} Resonators`,
+      position: latLng,
+      icon: `data:image/svg+xml;base64,${btoa('@include_string:images/icon-portal.svg@'.replace(/%COLOR%/g, color))}`,
+
+      onSelected(result, event) {
+        const { position } = result;
+
+        if (event.type === 'dblclick') {
+          window.zoomToAndShowPortal(guid, latLng);
+        } else if (window.portals[guid]) {
+          if (!window.map.getBounds().contains(position)) {
+            window.map.setView(position);
+          }
+          window.renderPortalDetails(guid);
+        } else {
+          window.selectPortalByLatLng(latLng);
+        }
+        return true;
+      },
+    });
+  }
+
   /**
    * Handles keyboard interactions for selecting a result with Enter or Space keys.
    *

From e94928063e021d653e307349b53f188b128d866a Mon Sep 17 00:00:00 2001
From: Alexander Danilov <git@modos189.ru>
Date: Sun, 3 Nov 2024 16:14:49 +0500
Subject: [PATCH 16/70] Update jsdoc for search

---
 core/code/search.js                    | 38 +++++++++++-----------
 core/code/search_query.js              | 45 +++++++++++++++++++++++++-
 core/code/search_query_results_view.js |  9 ++++++
 core/total-conversion-build.js         |  4 +++
 4 files changed, 77 insertions(+), 19 deletions(-)

diff --git a/core/code/search.js b/core/code/search.js
index 3dcb55a07..a75769e7c 100644
--- a/core/code/search.js
+++ b/core/code/search.js
@@ -1,4 +1,4 @@
-/* global IITC, L -- eslint */
+/* global IITC -- eslint */
 
 /**
  * Provides functionality for the search system within the application.
@@ -6,27 +6,29 @@
  * You can implement your own result provider by listening to the search hook:
  * ```window.addHook('search', function(query) {});```.
  *
- * The `query` object has the following members:
- * - `term`: The term for which the user has searched.
- * - `confirmed`: A boolean indicating if the user has pressed enter after searching.
- *   You should not search online or do heavy processing unless the user has confirmed the search term.
- * - `addResult(result)`: A method to add a result to the query.
+ * @example
+ * // Adding a search result
+ * window.addHook('search', function(query) {
+ *   query.addResult({
+ *     title: 'My Result',
+ *     position: L.latLng(0, 0)
+ *   });
+ * });
  *
- * The `result` object can have the following members (`title` is required, as well as one of `position` and `bounds`):
- * - `title`: The label for this result. Will be interpreted as HTML, so make sure to escape properly.
- * - `description`: Secondary information for this result. Will be interpreted as HTML, so make sure to escape properly.
- * - `position`: A L.LatLng object describing the position of this result.
- * - `bounds`: A L.LatLngBounds object describing the bounds of this result.
- * - `layer`: An ILayer to be added to the map when the user selects this search result.
- *   Will be generated if not set. Set to `null` to prevent the result from being added to the map.
- * - `icon`: A URL to an icon to display in the result list. Should be 12x12 pixels.
- * - `onSelected(result, event)`: A handler to be called when the result is selected.
- *   May return `true` to prevent the map from being repositioned. You may reposition the map yourself or do other work.
- * - `onRemove(result)`: A handler to be called when the result is removed from the map
- *   (because another result has been selected or the search was cancelled by the user).
  *  @namespace IITC.search
  *  @memberof IITC
  */
+
+/**
+ * @memberOf IITC.search
+ * @typedef {Object} SearchQuery
+ * @property {string} term - The term for which the user has searched.
+ * @property {boolean} confirmed - Indicates if the user has pressed enter after searching.
+ *           You should not search online or do heavy processing unless the user has confirmed the search term.
+ * @property {IITC.search.Query.addResult} addResult - Method to add a result to the query.
+ * @property {IITC.search.Query.addPortalResult} addPortalResult - Method to add a portal to the query.
+ */
+
 IITC.search = {
   lastSearch: null,
 };
diff --git a/core/code/search_query.js b/core/code/search_query.js
index f55221dad..ff76214d2 100644
--- a/core/code/search_query.js
+++ b/core/code/search_query.js
@@ -1,5 +1,36 @@
 /* global IITC, L -- eslint */
 
+/**
+ * @memberOf IITC.search.Query
+ * @typedef {Object} SearchResult
+ * @property {string} title - The label for this result (HTML-formatted).
+ * @property {string} [description] - Secondary information for this result (HTML-formatted).
+ * @property {L.LatLng} [position] - Position of this result.
+ * @property {L.LatLngBounds} [bounds] - Bounds of this result.
+ * @property {L.Layer|null} [layer] - Layer to be added to the map on result selection.
+ * @property {string} [icon] - URL to a 12x12px icon for the result list.
+ * @property {IITC.search.Query.onSelectedCallback} [onSelected] - Handler called when result is selected.
+ *           May return `true` to prevent the map from being repositioned.
+ *           You may reposition the map yourself or do other work.
+ * @property {IITC.search.Query.onRemoveCallback} [onRemove] - Handler called when result is removed from map.
+ *           (because another result has been selected or the search was cancelled by the user).
+ */
+
+/**
+ * @memberOf IITC.search.Query
+ * @callback onSelectedCallback
+ * @param {IITC.search.Query.SearchResult} result - The selected search result.
+ * @param {Event} event - The event that triggered the selection.
+ * @returns {boolean} - Returns true to prevent map repositioning.
+ */
+
+/**
+ * @memberOf IITC.search.Query
+ * @callback onRemoveCallback
+ * @param {IITC.search.Query.SearchResult} result - The search result that is being removed.
+ * @returns {void} - No return value.
+ */
+
 /**
  * Represents a search query within the IITC search module, managing query state, results, and UI rendering.
  *
@@ -31,6 +62,7 @@ class Query {
    * Displays the search query results in the specified resultsView container.
    *
    * @memberof IITC.search.Query
+   * @function show
    */
   show() {
     this.resultsView.renderIn('#searchwrapper');
@@ -40,6 +72,7 @@ class Query {
    * Hides and removes the current search results, clearing selection and hover states.
    *
    * @memberof IITC.search.Query
+   * @function show
    */
   hide() {
     this.resultsView.remove();
@@ -51,7 +84,8 @@ class Query {
    * Adds a search result to the query and triggers re-rendering of the results list.
    *
    * @memberof IITC.search.Query
-   * @param {Object} result - The search result to add, including title, position, and interactions.
+   * @function addResult
+   * @param {IITC.search.Query.SearchResult} result - The search result to add, including title, position, and interactions.
    */
   addResult(result) {
     this.results.push(result);
@@ -99,6 +133,7 @@ class Query {
    * Handles keyboard interactions for selecting a result with Enter or Space keys.
    *
    * @memberof IITC.search.Query
+   * @function handleKeyPress
    * @param {Event} ev - The keyboard event.
    * @param {Object} result - The result being interacted with.
    */
@@ -114,6 +149,7 @@ class Query {
    * Renders all search results through the resultsView class and sets up event handling for each result.
    *
    * @memberof IITC.search.Query
+   * @function renderResults
    */
   renderResults() {
     this.resultsView.renderResults(this.results, (result, event) => this.handleResultInteraction(result, event));
@@ -123,6 +159,7 @@ class Query {
    * Manages interactions with search results, such as clicks, hovers, and keyboard events.
    *
    * @memberof IITC.search.Query
+   * @function handleResultInteraction
    * @param {Object} result - The result being interacted with.
    * @param {Event} event - The event associated with the interaction.
    */
@@ -148,6 +185,7 @@ class Query {
    * Creates and returns a map layer for the given search result, which could include markers or shapes.
    *
    * @memberof IITC.search.Query
+   * @function resultLayer
    * @param {Object} result - The search result object.
    * @returns {L.Layer} - The generated layer for the result.
    */
@@ -178,6 +216,7 @@ class Query {
    * Handles the selection of a search result, adjusting the map view and adding its layer to the map.
    *
    * @memberof IITC.search.Query
+   * @function onResultSelected
    * @param {Object} result - The selected search result object.
    * @param {Event} event - The event associated with the selection.
    */
@@ -213,6 +252,7 @@ class Query {
    * Removes the currently selected search result from the map and performs necessary cleanup.
    *
    * @memberof IITC.search.Query
+   * @function removeSelectedResult
    */
   removeSelectedResult() {
     if (this.selectedResult) {
@@ -225,6 +265,7 @@ class Query {
    * Starts a hover interaction on a search result, displaying its layer on the map.
    *
    * @memberof IITC.search.Query
+   * @function onResultHoverStart
    * @param {Object} result - The result being hovered over.
    */
   onResultHoverStart(result) {
@@ -242,6 +283,7 @@ class Query {
    * Ends a hover interaction by removing the hover layer from the map if it is not selected.
    *
    * @memberof IITC.search.Query
+   * @function removeHoverResult
    */
   removeHoverResult() {
     if (this.hoverResult && this.hoverResult.layer && this.hoverResult !== this.selectedResult) {
@@ -254,6 +296,7 @@ class Query {
    * Handles the end of a hover event, removing the hover layer from the map.
    *
    * @memberof IITC.search.Query
+   * @function onResultHoverEnd
    */
   onResultHoverEnd() {
     this.removeHoverResult();
diff --git a/core/code/search_query_results_view.js b/core/code/search_query_results_view.js
index cadec8d20..2017492c0 100644
--- a/core/code/search_query_results_view.js
+++ b/core/code/search_query_results_view.js
@@ -27,6 +27,7 @@ class QueryResultsView {
    * Creates and returns the main container element for the query results.
    *
    * @memberof IITC.search.QueryResultsView
+   * @function createContainer
    * @returns {HTMLElement} - The container element for the results.
    */
   createContainer() {
@@ -39,6 +40,7 @@ class QueryResultsView {
    * Creates and appends a header to the container based on the search term.
    *
    * @memberof IITC.search.QueryResultsView
+   * @function createHeader
    * @returns {HTMLElement} - The header element displaying the search term or a loading message.
    */
   createHeader() {
@@ -66,6 +68,7 @@ class QueryResultsView {
    * Creates and appends an initial list element to display the search results.
    *
    * @memberof IITC.search.QueryResultsView
+   * @function createList
    * @returns {HTMLElement} - The list element for displaying the results.
    */
   createList() {
@@ -81,6 +84,7 @@ class QueryResultsView {
    * Sets up the accordion functionality for expanding and collapsing results.
    *
    * @memberof IITC.search.QueryResultsView
+   * @function setupAccordion
    */
   setupAccordion() {
     this.header.addEventListener('click', () => {
@@ -92,6 +96,7 @@ class QueryResultsView {
    * Renders the search results within the list container and sets up event interactions.
    *
    * @memberof IITC.search.QueryResultsView
+   * @function renderResults
    * @param {Array<Object>} results - An array of search result objects to display.
    * @param {Function} onResultInteraction - A callback function for handling interaction events on results.
    */
@@ -118,6 +123,7 @@ class QueryResultsView {
    * Creates and returns a list item for an individual search result.
    *
    * @memberof IITC.search.QueryResultsView
+   * @function createListItem
    * @param {Object} result - The search result object with properties such as title, description, and icon.
    * @returns {HTMLElement} - The list item element representing the search result.
    */
@@ -149,6 +155,7 @@ class QueryResultsView {
    * Appends the results container to a specified selector on the page.
    *
    * @memberof IITC.search.QueryResultsView
+   * @function renderIn
    * @param {string} selector - The selector string for the target container.
    */
   renderIn(selector) {
@@ -160,6 +167,7 @@ class QueryResultsView {
    * Removes the results container from the page.
    *
    * @memberof IITC.search.QueryResultsView
+   * @function remove
    */
   remove() {
     if (this.container.parentNode) {
@@ -171,6 +179,7 @@ class QueryResultsView {
    * Clears all items from the results list.
    *
    * @memberof IITC.search.QueryResultsView
+   * @function clearList
    */
   clearList() {
     this.list.innerHTML = '';
diff --git a/core/total-conversion-build.js b/core/total-conversion-build.js
index 3ec91d522..0473e7ddd 100644
--- a/core/total-conversion-build.js
+++ b/core/total-conversion-build.js
@@ -6,6 +6,10 @@
 
 /* global plugin_info, PLAYER -- eslint */
 
+/**
+ * @namespace IITC
+ */
+
 // create IITC scope
 const IITC = {};
 window.IITC = IITC;

From 7d49165d16a4427758e3b078887f08056e34c254 Mon Sep 17 00:00:00 2001
From: Alexander Danilov <git@modos189.ru>
Date: Sun, 3 Nov 2024 17:22:53 +0500
Subject: [PATCH 17/70] Refactoring of search_hooks.js

---
 core/code/search_hooks.js | 196 +++++++++++++++++++-------------------
 1 file changed, 98 insertions(+), 98 deletions(-)

diff --git a/core/code/search_hooks.js b/core/code/search_hooks.js
index 1d3c2a0fc..68862db7a 100644
--- a/core/code/search_hooks.js
+++ b/core/code/search_hooks.js
@@ -16,17 +16,17 @@
  * @param {Object} query - The search query object.
  * @fires hook#search
  */
-window.addHook('search', function (query) {
-  var term = query.term.toLowerCase();
+window.addHook('search', (query) => {
+  const term = query.term.toLowerCase();
 
-  $.each(window.portals, function (guid, portal) {
-    var data = portal.options.data;
-    if (!data.title) return;
+  for (const [guid, portal] of Object.entries(window.portals)) {
+    const data = portal.options.data;
+    if (!data.title) continue;
 
-    if (data.title.toLowerCase().indexOf(term) !== -1) {
+    if (data.title.toLowerCase().includes(term)) {
       window.search.addSearchResult(query, data, guid);
     }
-  });
+  }
 });
 
 /**
@@ -36,31 +36,28 @@ window.addHook('search', function (query) {
  * @param {Object} query - The search query object.
  * @fires hook#search
  */
-window.addHook('search', function (query) {
-  var locations = query.term.replaceAll(/%2C/gi, ',').match(/[+-]?\d+\.\d+, ?[+-]?\d+\.\d+/g);
-  var added = {};
+window.addHook('search', (query) => {
+  const locations = query.term.replace(/%2C/gi, ',').match(/[+-]?\d+\.\d+, ?[+-]?\d+\.\d+/g);
+  const added = new Set();
+
   if (!locations) return;
-  locations.forEach(function (location) {
-    var pair = location.split(',').map(function (s) {
-      return parseFloat(s.trim()).toFixed(6);
-    });
-    var ll = pair.join(',');
-    var latlng = L.latLng(
-      pair.map(function (s) {
-        return parseFloat(s);
-      })
-    );
-    if (added[ll]) return;
-    added[ll] = true;
+
+  locations.forEach((location) => {
+    const pair = location.split(',').map((s) => parseFloat(s.trim()).toFixed(6));
+    const ll = pair.join(',');
+    const latlng = L.latLng(pair.map(parseFloat));
+
+    if (added.has(ll)) return;
+    added.add(ll);
 
     query.addResult({
       title: ll,
       description: 'geo coordinates',
       position: latlng,
-      onSelected: function (result) {
-        for (var guid in window.portals) {
-          var p = window.portals[guid].getLatLng();
-          if (p.lat.toFixed(6) + ',' + p.lng.toFixed(6) === ll) {
+      onSelected: (result) => {
+        for (const [guid, portal] of Object.entries(window.portals)) {
+          const p = portal.getLatLng();
+          if (`${p.lat.toFixed(6)},${p.lng.toFixed(6)}` === ll) {
             window.renderPortalDetails(guid);
             return;
           }
@@ -78,82 +75,79 @@ window.addHook('search', function (query) {
  * @param {Object} query - The search query object.
  * @fires hook#search
  */
-window.addHook('search', function (query) {
+window.addHook('search', async (query) => {
   if (!query.confirmed) return;
 
-  // Viewbox search orders results so they're closer to the viewbox
-  var mapBounds = window.map.getBounds();
-  var viewbox =
-    '&viewbox=' + mapBounds.getSouthWest().lng + ',' + mapBounds.getSouthWest().lat + ',' + mapBounds.getNorthEast().lng + ',' + mapBounds.getNorthEast().lat;
-
-  var resultCount = 0;
-  var resultMap = {};
-  function onQueryResult(isViewboxResult, data) {
-    resultCount += data.length;
-    if (isViewboxResult) {
-      // Search for things outside the viewbox
-      $.getJSON(window.NOMINATIM + encodeURIComponent(query.term) + viewbox, onQueryResult.bind(null, false));
-      if (resultCount === 0) {
+  const mapBounds = window.map.getBounds();
+  const viewbox = `&viewbox=${mapBounds.getSouthWest().lng},${mapBounds.getSouthWest().lat},${mapBounds.getNorthEast().lng},${mapBounds.getNorthEast().lat}`;
+  // Bounded search allows amenity-only searches (e.g. "amenity=toilet") via special phrases
+  // https://wiki.openstreetmap.org/wiki/Nominatim/Special_Phrases/EN
+  const bounded = '&bounded=1';
+
+  const resultMap = new Set();
+  let resultCount = 0;
+
+  async function fetchResults(isViewboxResult) {
+    try {
+      const response = await fetch(`${window.NOMINATIM}${encodeURIComponent(query.term)}${isViewboxResult ? viewbox + bounded : viewbox}`);
+      const data = await response.json();
+
+      if (isViewboxResult && data.length === 0) {
+        // If no results found within the viewbox, try a broader search
+        await fetchResults(false);
         return;
-      }
-    } else {
-      if (resultCount === 0) {
+      } else if (!isViewboxResult && resultCount === 0 && data.length === 0) {
+        // If no results at all
         query.addResult({
           title: 'No results on OpenStreetMap',
           icon: '//www.openstreetmap.org/favicon.ico',
-          onSelected: function () {
-            return true;
-          },
+          onSelected: () => true,
         });
         return;
       }
-    }
 
-    data.forEach(function (item) {
-      if (resultMap[item.place_id]) {
-        return;
-      } // duplicate
-      resultMap[item.place_id] = true;
-
-      var result = {
-        title: item.display_name,
-        description: 'Type: ' + item.type,
-        position: L.latLng(parseFloat(item.lat), parseFloat(item.lon)),
-        icon: item.icon,
-      };
-
-      if (item.geojson) {
-        result.layer = L.geoJson(item.geojson, {
-          interactive: false,
-          color: 'red',
-          opacity: 0.7,
-          weight: 2,
-          fill: false,
-          pointToLayer: function (featureData, latLng) {
-            return L.marker(latLng, {
-              icon: L.divIcon.coloredSvg('red'),
-              title: item.display_name,
-            });
-          },
-        });
-      }
+      resultCount += data.length;
+
+      data.forEach((item) => {
+        if (resultMap.has(item.place_id)) return; // duplicate
+        resultMap.add(item.place_id);
+
+        const result = {
+          title: item.display_name,
+          description: `Type: ${item.type}`,
+          position: L.latLng(parseFloat(item.lat), parseFloat(item.lon)),
+          icon: item.icon,
+        };
+
+        if (item.geojson) {
+          result.layer = L.geoJson(item.geojson, {
+            interactive: false,
+            color: 'red',
+            opacity: 0.7,
+            weight: 2,
+            fill: false,
+            pointToLayer: (featureData, latLng) =>
+              L.marker(latLng, {
+                icon: L.divIcon.coloredSvg('red'),
+                title: item.display_name,
+              }),
+          });
+        }
 
-      var b = item.boundingbox;
-      if (b) {
-        var southWest = new L.LatLng(b[0], b[2]),
-          northEast = new L.LatLng(b[1], b[3]);
-        result.bounds = new L.LatLngBounds(southWest, northEast);
-      }
+        if (item.boundingbox) {
+          const [south, north, west, east] = item.boundingbox;
+          result.bounds = new L.LatLngBounds(L.latLng(parseFloat(south), parseFloat(west)), L.latLng(parseFloat(north), parseFloat(east)));
+        }
 
-      query.addResult(result);
-    });
+        query.addResult(result);
+      });
+    } catch (error) {
+      console.error('Error fetching OSM data:', error);
+    }
   }
 
-  // Bounded search allows amenity-only searches (e.g. "amenity=toilet") via special phrases
-  // http://wiki.openstreetmap.org/wiki/Nominatim/Special_Phrases/EN
-  var bounded = '&bounded=1';
-
-  $.getJSON(window.NOMINATIM + encodeURIComponent(query.term) + viewbox + bounded, onQueryResult.bind(null, true));
+  // Start with viewbox-bounded search
+  await fetchResults(true);
 });
 
 /**
@@ -162,17 +156,23 @@ window.addHook('search', function (query) {
  * @param {Object} query - The search query object.
  * @fires hook#search
  */
-window.addHook('search', function (query) {
-  const guid_re = /[0-9a-f]{32}\.[0-9a-f]{2}/;
-  const res = query.term.match(guid_re);
-  if (res) {
-    const guid = res[0];
+window.addHook('search', async (query) => {
+  const guidRegex = /[0-9a-f]{32}\.[0-9a-f]{2}/;
+  const match = query.term.match(guidRegex);
+
+  if (match) {
+    const guid = match[0];
     const data = window.portalDetail.get(guid);
-    if (data) window.search.addSearchResult(query, data, guid);
-    else {
-      window.portalDetail.request(guid).then(function (data) {
-        window.search.addSearchResult(query, data, guid);
-      });
+
+    if (data) {
+      window.search.addSearchResult(query, data, guid);
+    } else {
+      try {
+        const fetchedData = await window.portalDetail.request(guid);
+        window.search.addSearchResult(query, fetchedData, guid);
+      } catch (error) {
+        console.error('Error fetching portal details:', error);
+      }
     }
   }
 });

From ba248b081f5aa3e9fb2d24f7e4c6bb4c8ed59177 Mon Sep 17 00:00:00 2001
From: Alexander Danilov <git@modos189.ru>
Date: Sun, 3 Nov 2024 20:04:25 +0500
Subject: [PATCH 18/70] =?UTF-8?q?Search=20supports=20input=20in=20both=20d?=
 =?UTF-8?q?ecimal=20format=20(e.g.,=2051.5074,=20-0.1278)=20and=20DMS=20fo?=
 =?UTF-8?q?rmat=20(e.g.,=2050=C2=B031'03.8"N=207=C2=B059'05.3"E)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/code/search_hooks.js | 50 ++++++++++++++++++++++++++++-----------
 1 file changed, 36 insertions(+), 14 deletions(-)

diff --git a/core/code/search_hooks.js b/core/code/search_hooks.js
index 68862db7a..4bd97342b 100644
--- a/core/code/search_hooks.js
+++ b/core/code/search_hooks.js
@@ -31,41 +31,63 @@ window.addHook('search', (query) => {
 
 /**
  * Searches for geographical coordinates formatted as latitude, longitude and adds the results.
- * TODO: recognize 50°31'03.8"N 7°59'05.3"E and similar formats
+ * Supports both decimal format (e.g., 51.5074, -0.1278) and DMS format (e.g., 50°31'03.8"N 7°59'05.3"E).
  *
  * @param {Object} query - The search query object.
  * @fires hook#search
  */
 window.addHook('search', (query) => {
-  const locations = query.term.replace(/%2C/gi, ',').match(/[+-]?\d+\.\d+, ?[+-]?\d+\.\d+/g);
   const added = new Set();
 
-  if (!locations) return;
+  // Regular expression for decimal coordinates
+  const decimalRegex = /[+-]?\d+\.\d+, ?[+-]?\d+\.\d+/g;
+  // Regular expression for DMS coordinates
+  const dmsRegex = /(\d{1,3})°(\d{1,2})'(\d{1,2}(?:\.\d+)?)?"\s*([NS]),?\s*(\d{1,3})°(\d{1,2})'(\d{1,2}(?:\.\d+)?)?"\s*([EW])/g;
 
-  locations.forEach((location) => {
-    const pair = location.split(',').map((s) => parseFloat(s.trim()).toFixed(6));
-    const ll = pair.join(',');
-    const latlng = L.latLng(pair.map(parseFloat));
+  // Convert DMS to decimal format
+  const parseDMS = (deg, min, sec, dir) => {
+    const decimal = parseFloat(deg) + parseFloat(min) / 60 + parseFloat(sec) / 3600;
+    return dir === 'S' || dir === 'W' ? -decimal : decimal;
+  };
 
-    if (added.has(ll)) return;
-    added.add(ll);
+  // Universal function for adding search result
+  const addResult = (lat, lng) => {
+    const latLngString = `${lat.toFixed(6)},${lng.toFixed(6)}`;
+    if (added.has(latLngString)) return;
+    added.add(latLngString);
 
     query.addResult({
-      title: ll,
+      title: latLngString,
       description: 'geo coordinates',
-      position: latlng,
+      position: L.latLng(lat, lng),
       onSelected: (result) => {
         for (const [guid, portal] of Object.entries(window.portals)) {
-          const p = portal.getLatLng();
-          if (`${p.lat.toFixed(6)},${p.lng.toFixed(6)}` === ll) {
+          const { lat: pLat, lng: pLng } = portal.getLatLng();
+          if (`${pLat.toFixed(6)},${pLng.toFixed(6)}` === latLngString) {
             window.renderPortalDetails(guid);
             return;
           }
         }
-
         window.urlPortalLL = [result.position.lat, result.position.lng];
       },
     });
+  };
+
+  // Search and process decimal coordinates
+  const decimalMatches = query.term.replace(/%2C/gi, ',').match(decimalRegex);
+  if (decimalMatches) {
+    decimalMatches.forEach((location) => {
+      const [lat, lng] = location.split(',').map(Number);
+      addResult(lat, lng);
+    });
+  }
+
+  // Search and process DMS coordinates
+  const dmsMatches = Array.from(query.term.matchAll(dmsRegex));
+  dmsMatches.forEach((match) => {
+    const lat = parseDMS(match[1], match[2], match[3], match[4]);
+    const lng = parseDMS(match[5], match[6], match[7], match[8]);
+    addResult(lat, lng);
   });
 });
 

From ee5a5f35619c4abcbd30e6d0df9ac73c510b50c6 Mon Sep 17 00:00:00 2001
From: Alexander Danilov <git@modos189.ru>
Date: Mon, 4 Nov 2024 12:57:37 +0500
Subject: [PATCH 19/70] Methods of the search class that are not explicitly
 intended to be used are declared as private

---
 core/code/search_query.js              | 11 +++++++++++
 core/code/search_query_results_view.js |  7 +++++++
 2 files changed, 18 insertions(+)

diff --git a/core/code/search_query.js b/core/code/search_query.js
index ff76214d2..0bbc7a586 100644
--- a/core/code/search_query.js
+++ b/core/code/search_query.js
@@ -63,6 +63,7 @@ class Query {
    *
    * @memberof IITC.search.Query
    * @function show
+   * @private
    */
   show() {
     this.resultsView.renderIn('#searchwrapper');
@@ -73,6 +74,7 @@ class Query {
    *
    * @memberof IITC.search.Query
    * @function show
+   * @private
    */
   hide() {
     this.resultsView.remove();
@@ -136,6 +138,7 @@ class Query {
    * @function handleKeyPress
    * @param {Event} ev - The keyboard event.
    * @param {Object} result - The result being interacted with.
+   * @private
    */
   handleKeyPress(ev, result) {
     if (ev.key === ' ' || ev.key === 'Enter') {
@@ -150,6 +153,7 @@ class Query {
    *
    * @memberof IITC.search.Query
    * @function renderResults
+   * @private
    */
   renderResults() {
     this.resultsView.renderResults(this.results, (result, event) => this.handleResultInteraction(result, event));
@@ -162,6 +166,7 @@ class Query {
    * @function handleResultInteraction
    * @param {Object} result - The result being interacted with.
    * @param {Event} event - The event associated with the interaction.
+   * @private
    */
   handleResultInteraction(result, event) {
     switch (event.type) {
@@ -188,6 +193,7 @@ class Query {
    * @function resultLayer
    * @param {Object} result - The search result object.
    * @returns {L.Layer} - The generated layer for the result.
+   * @private
    */
   resultLayer(result) {
     if (!result.layer) {
@@ -219,6 +225,7 @@ class Query {
    * @function onResultSelected
    * @param {Object} result - The selected search result object.
    * @param {Event} event - The event associated with the selection.
+   * @private
    */
   onResultSelected(result, event) {
     this.removeHoverResult();
@@ -253,6 +260,7 @@ class Query {
    *
    * @memberof IITC.search.Query
    * @function removeSelectedResult
+   * @private
    */
   removeSelectedResult() {
     if (this.selectedResult) {
@@ -267,6 +275,7 @@ class Query {
    * @memberof IITC.search.Query
    * @function onResultHoverStart
    * @param {Object} result - The result being hovered over.
+   * @private
    */
   onResultHoverStart(result) {
     this.removeHoverResult();
@@ -284,6 +293,7 @@ class Query {
    *
    * @memberof IITC.search.Query
    * @function removeHoverResult
+   * @private
    */
   removeHoverResult() {
     if (this.hoverResult && this.hoverResult.layer && this.hoverResult !== this.selectedResult) {
@@ -297,6 +307,7 @@ class Query {
    *
    * @memberof IITC.search.Query
    * @function onResultHoverEnd
+   * @private
    */
   onResultHoverEnd() {
     this.removeHoverResult();
diff --git a/core/code/search_query_results_view.js b/core/code/search_query_results_view.js
index 2017492c0..d63785ee9 100644
--- a/core/code/search_query_results_view.js
+++ b/core/code/search_query_results_view.js
@@ -29,6 +29,7 @@ class QueryResultsView {
    * @memberof IITC.search.QueryResultsView
    * @function createContainer
    * @returns {HTMLElement} - The container element for the results.
+   * @private
    */
   createContainer() {
     const container = document.createElement('div');
@@ -42,6 +43,7 @@ class QueryResultsView {
    * @memberof IITC.search.QueryResultsView
    * @function createHeader
    * @returns {HTMLElement} - The header element displaying the search term or a loading message.
+   * @private
    */
   createHeader() {
     const header = document.createElement('h3');
@@ -70,6 +72,7 @@ class QueryResultsView {
    * @memberof IITC.search.QueryResultsView
    * @function createList
    * @returns {HTMLElement} - The list element for displaying the results.
+   * @private
    */
   createList() {
     const list = document.createElement('ul');
@@ -85,6 +88,7 @@ class QueryResultsView {
    *
    * @memberof IITC.search.QueryResultsView
    * @function setupAccordion
+   * @private
    */
   setupAccordion() {
     this.header.addEventListener('click', () => {
@@ -126,6 +130,7 @@ class QueryResultsView {
    * @function createListItem
    * @param {Object} result - The search result object with properties such as title, description, and icon.
    * @returns {HTMLElement} - The list item element representing the search result.
+   * @private
    */
   createListItem(result) {
     const item = document.createElement('li');
@@ -168,6 +173,7 @@ class QueryResultsView {
    *
    * @memberof IITC.search.QueryResultsView
    * @function remove
+   * @private
    */
   remove() {
     if (this.container.parentNode) {
@@ -180,6 +186,7 @@ class QueryResultsView {
    *
    * @memberof IITC.search.QueryResultsView
    * @function clearList
+   * @private
    */
   clearList() {
     this.list.innerHTML = '';

From d382e37773a11cc6a18154a48abd83ed5b8139f1 Mon Sep 17 00:00:00 2001
From: Alexander Danilov <git@modos189.ru>
Date: Mon, 4 Nov 2024 13:57:09 +0500
Subject: [PATCH 20/70] Fix for keyboard selection of search results

---
 core/code/search_query.js              | 2 +-
 core/code/search_query_results_view.js | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/code/search_query.js b/core/code/search_query.js
index 0bbc7a586..d68a7bfd9 100644
--- a/core/code/search_query.js
+++ b/core/code/search_query.js
@@ -180,7 +180,7 @@ class Query {
       case 'mouseout':
         this.onResultHoverEnd();
         break;
-      case 'keypress':
+      case 'keydown':
         this.handleKeyPress(event, result);
         break;
     }
diff --git a/core/code/search_query_results_view.js b/core/code/search_query_results_view.js
index d63785ee9..0b06351d7 100644
--- a/core/code/search_query_results_view.js
+++ b/core/code/search_query_results_view.js
@@ -118,6 +118,7 @@ class QueryResultsView {
         item.addEventListener('dblclick', (ev) => onResultInteraction(result, ev));
         item.addEventListener('mouseover', (ev) => onResultInteraction(result, ev));
         item.addEventListener('mouseout', (ev) => onResultInteraction(result, ev));
+        item.addEventListener('keydown', (ev) => onResultInteraction(result, ev));
         this.list.appendChild(item);
       });
     }

From 44c0d2024b44ffb7b16aef7f569656199b287d6b Mon Sep 17 00:00:00 2001
From: Alexander Danilov <git@modos189.ru>
Date: Mon, 4 Nov 2024 13:58:07 +0500
Subject: [PATCH 21/70] Tests for IITC.search.Query

---
 test/search_query.spec.js | 176 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 176 insertions(+)
 create mode 100644 test/search_query.spec.js

diff --git a/test/search_query.spec.js b/test/search_query.spec.js
new file mode 100644
index 000000000..a7305283a
--- /dev/null
+++ b/test/search_query.spec.js
@@ -0,0 +1,176 @@
+import { describe, it, beforeEach } from 'mocha';
+import { expect } from 'chai';
+
+/* global IITC, L */
+/* eslint-disable no-unused-expressions */
+
+if (!globalThis.window) globalThis.window = {};
+if (!globalThis.L) globalThis.L = {};
+if (!globalThis.IITC) globalThis.IITC = {};
+if (!globalThis.IITC.search) globalThis.IITC.search = {};
+globalThis.IITC.search.Query = {};
+import('../core/code/search_query.js');
+
+describe('IITC.search.Query', () => {
+  let query;
+  let fakeMap;
+
+  beforeEach(() => {
+    // Mock objects and methods
+    fakeMap = {
+      addTo: () => {},
+      addLayer: () => {},
+    };
+
+    globalThis.window = {
+      ...globalThis.window,
+      ...{
+        map: fakeMap,
+        runHooks: () => {},
+        isSmartphone: () => false,
+        TEAM_SHORTNAMES: { NEUTRAL: 'NEU', ENLIGHTENED: 'ENL' },
+        COLORS: { NEUTRAL: '#CCC', ENLIGHTENED: '#008000' },
+        teamStringToId: (team) => (team === 'ENLIGHTENED' ? 'ENLIGHTENED' : 'NEUTRAL'),
+      },
+    };
+
+    globalThis.L = {
+      ...globalThis.L,
+      ...{
+        LatLng: class {},
+        latLng: (lat, lng) => new L.LatLng(lat, lng),
+        layerGroup: () => fakeMap,
+        marker: () => fakeMap,
+        divIcon: {
+          coloredSvg: () => {},
+        },
+      },
+    };
+
+    globalThis.IITC.search.QueryResultsView = class {
+      constructor(term, confirmed) {
+        this.term = term;
+        this.confirmed = confirmed;
+      }
+      renderResults() {}
+    };
+
+    query = new IITC.search.Query('test', true);
+  });
+
+  // Test for initialization
+  it('should initialize with an empty results array', () => {
+    expect(query.results).to.be.an('array').that.is.empty;
+  });
+
+  // Test for the addResult method
+  it('should add a result to the results array with addResult', () => {
+    const mockResult = { title: 'Test Result', position: new L.LatLng(0, 0) };
+
+    query.addResult(mockResult);
+
+    expect(query.results).to.have.lengthOf(1);
+    expect(query.results[0]).to.deep.equal(mockResult);
+
+    let renderCalled = false;
+    query.renderResults = () => {
+      renderCalled = true;
+    };
+    query.addResult(mockResult);
+    expect(renderCalled).to.be.true;
+  });
+
+  // Test for the addPortalResult method
+  it('should add a portal result to the results array with addPortalResult', () => {
+    const portalData = {
+      title: 'Test Portal',
+      team: 'ENLIGHTENED',
+      level: 8,
+      health: 100,
+      resCount: 8,
+      latE6: 50000000,
+      lngE6: 100000000,
+    };
+
+    query.addPortalResult(portalData, 'abc123');
+
+    expect(query.results).to.have.lengthOf(1);
+    const addedResult = query.results[0];
+
+    expect(addedResult.title).to.equal('Test Portal');
+    expect(addedResult.description).to.contain('ENL');
+    expect(addedResult.description).to.contain('L8');
+    expect(addedResult.description).to.contain('100%');
+    expect(addedResult.description).to.contain('8 Resonators');
+    expect(addedResult.icon).to.be.a('string').that.contains('data:image/svg+xml;base64');
+  });
+
+  // Test for hover interaction handling
+  it('should start hover interaction and add layer to map', () => {
+    const mockResult = { title: 'Hover Result', layer: null, position: new L.LatLng(0, 0) };
+    let layerAdded = false;
+
+    fakeMap.addLayer = () => {
+      layerAdded = true;
+    };
+    query.onResultHoverStart(mockResult);
+
+    expect(layerAdded).to.be.true;
+  });
+
+  it('should handle Space key press for selecting a result', () => {
+    let eventHandled = false;
+    const mockEvent = { key: ' ', preventDefault: () => {} };
+    const result = { title: 'Test Result' };
+
+    query.onResultSelected = () => {
+      eventHandled = true;
+    };
+
+    query.handleKeyPress(mockEvent, result);
+    expect(eventHandled).to.be.true;
+  });
+
+  it('should remove hover interaction layer from map', () => {
+    const mockResult = { layer: fakeMap };
+    let layerRemoved = false;
+
+    query.hoverResult = mockResult;
+    fakeMap.removeLayer = () => {
+      layerRemoved = true;
+    };
+
+    query.removeHoverResult();
+    expect(layerRemoved).to.be.true;
+  });
+
+  // Test for selecting a result
+  it('should select a result and adjust the map view', () => {
+    const mockResult = {
+      title: 'Selected Result',
+      position: new L.LatLng(0, 0),
+      onSelected: () => false,
+    };
+    let viewSet = false;
+
+    fakeMap.setView = () => {
+      viewSet = true;
+    };
+    query.onResultSelected(mockResult, { type: 'click' });
+
+    expect(viewSet).to.be.true;
+    expect(query.selectedResult).to.equal(mockResult);
+  });
+
+  it('should prevent map repositioning if onSelected returns true', () => {
+    const mockResult = { title: 'Selected Result', onSelected: () => true };
+    let viewSet = false;
+
+    fakeMap.setView = () => {
+      viewSet = true;
+    };
+    query.onResultSelected(mockResult, { type: 'click' });
+
+    expect(viewSet).to.be.false;
+  });
+});

From 8cbfbfd6c9c8407fec16084a81e66abf771d50db Mon Sep 17 00:00:00 2001
From: Alexander Danilov <git@modos189.ru>
Date: Mon, 11 Nov 2024 22:03:10 +0500
Subject: [PATCH 22/70] Move `window.teamStringToId` to
 `IITC.utils.teamStringToId` The `window.getTeam` function is marked as
 deprecated

---
 core/code/_deprecated.js | 15 ++++++++++++++-
 core/code/entity_info.js | 34 ----------------------------------
 core/code/utils.js       | 18 ++++++++++++++++++
 3 files changed, 32 insertions(+), 35 deletions(-)
 delete mode 100644 core/code/entity_info.js

diff --git a/core/code/_deprecated.js b/core/code/_deprecated.js
index 2304ef78e..4f85f0c50 100644
--- a/core/code/_deprecated.js
+++ b/core/code/_deprecated.js
@@ -1,4 +1,4 @@
-/* global L -- eslint */
+/* global IITC, L -- eslint */
 
 /**
  * @file This file contains functions that are not use by IITC itself
@@ -174,3 +174,16 @@ window.findPortalLatLng = function (guid) {
 window.androidCopy = function () {
   return true; // i.e. execute other actions
 };
+
+/**
+ * Given the entity detail data, returns the team the entity belongs to.
+ * Uses TEAM_* enum values.
+ *
+ * @deprecated
+ * @function getTeam
+ * @param {Object} details - The details hash of an entity.
+ * @returns {number} The team ID the entity belongs to.
+ */
+window.getTeam = function (details) {
+  return IITC.utils.teamStringToId(details.team);
+};
diff --git a/core/code/entity_info.js b/core/code/entity_info.js
deleted file mode 100644
index 60023798f..000000000
--- a/core/code/entity_info.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/* exported setup --eslint */
-
-/**
- * Entity Details Tools
- * Functions to extract useful data from entity details, such as portals, links, and fields.
- * @module entity_info
- */
-
-/**
- * Given the entity detail data, returns the team the entity belongs to.
- * Uses TEAM_* enum values.
- *
- * @function getTeam
- * @param {Object} details - The details hash of an entity.
- * @returns {number} The team ID the entity belongs to.
- */
-window.getTeam = function (details) {
-  return window.teamStringToId(details.team);
-};
-
-/**
- * Converts a team string to a team ID.
- *
- * @function teamStringToId
- * @param {string} teamStr - The team string to convert.
- * @returns {number} The team ID corresponding to the team string.
- */
-window.teamStringToId = function (teamStr) {
-  var teamIndex = window.TEAM_CODENAMES.indexOf(teamStr);
-  if (teamIndex >= 0) return teamIndex;
-  teamIndex = window.TEAM_CODES.indexOf(teamStr);
-  if (teamIndex >= 0) return teamIndex;
-  return window.TEAM_NONE;
-};
diff --git a/core/code/utils.js b/core/code/utils.js
index 311a065a3..d2f10ad44 100644
--- a/core/code/utils.js
+++ b/core/code/utils.js
@@ -472,6 +472,22 @@ const isPointInPolygon = (polygon, point) => {
   return !!inside;
 };
 
+/**
+ * Converts a team string to a team ID.
+ *
+ * @memberof IITC.utils
+ * @function teamStringToId
+ * @param {string} teamStr - The team string to convert.
+ * @returns {number} The team ID corresponding to the team string.
+ */
+const teamStringToId = function (teamStr) {
+  var teamIndex = window.TEAM_CODENAMES.indexOf(teamStr);
+  if (teamIndex >= 0) return teamIndex;
+  teamIndex = window.TEAM_CODES.indexOf(teamStr);
+  if (teamIndex >= 0) return teamIndex;
+  return window.TEAM_NONE;
+};
+
 IITC.utils = {
   getURLParam,
   getCookie,
@@ -497,6 +513,7 @@ IITC.utils = {
   clampLatLng,
   clampLatLngBounds,
   isPointInPolygon,
+  teamStringToId,
 };
 
 // Map of legacy function names to their new names (or the same name if not renamed)
@@ -524,6 +541,7 @@ const legacyFunctionMappings = {
   clampLatLng: 'clampLatLng',
   clampLatLngBounds: 'clampLatLngBounds',
   pnpoly: 'isPointInPolygon',
+  teamStringToId: 'teamStringToId',
 };
 
 // Set up synchronization between `window` and `IITC.utils` with new names

From 82fddfb7305947336839b1d64c1b9f8c037610ca Mon Sep 17 00:00:00 2001
From: Alexander Danilov <git@modos189.ru>
Date: Mon, 11 Nov 2024 22:07:42 +0500
Subject: [PATCH 23/70] Refactoring of `IITC.utils.teamStringToId`

---
 core/code/utils.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/core/code/utils.js b/core/code/utils.js
index d2f10ad44..0ad0cef05 100644
--- a/core/code/utils.js
+++ b/core/code/utils.js
@@ -480,11 +480,13 @@ const isPointInPolygon = (polygon, point) => {
  * @param {string} teamStr - The team string to convert.
  * @returns {number} The team ID corresponding to the team string.
  */
-const teamStringToId = function (teamStr) {
-  var teamIndex = window.TEAM_CODENAMES.indexOf(teamStr);
-  if (teamIndex >= 0) return teamIndex;
-  teamIndex = window.TEAM_CODES.indexOf(teamStr);
-  if (teamIndex >= 0) return teamIndex;
+const teamStringToId = (teamStr) => {
+  if (window.TEAM_CODENAMES.includes(teamStr)) {
+    return window.TEAM_CODENAMES.indexOf(teamStr);
+  }
+  if (window.TEAM_CODES.includes(teamStr)) {
+    return window.TEAM_CODES.indexOf(teamStr);
+  }
   return window.TEAM_NONE;
 };
 

From 74afad885482b9feaf14f47bd8a51b920bb58949 Mon Sep 17 00:00:00 2001
From: Alexander Danilov <git@modos189.ru>
Date: Mon, 11 Nov 2024 22:20:00 +0500
Subject: [PATCH 24/70] Tests for `IITC.utils.teamStringToId`

---
 test/utils.spec.js | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/test/utils.spec.js b/test/utils.spec.js
index 278462ec0..31b31b14d 100644
--- a/test/utils.spec.js
+++ b/test/utils.spec.js
@@ -1,4 +1,4 @@
-import { describe, it, beforeEach } from 'mocha';
+import { describe, it, before, beforeEach } from 'mocha';
 import { expect } from 'chai';
 
 /* global IITC */
@@ -667,3 +667,32 @@ describe('IITC.utils.clamp', () => {
     expect(result).to.equal(-5);
   });
 });
+
+describe('IITC.utils.teamStringToId', () => {
+  before(() => {
+    window.TEAM_CODENAMES = ['NEUTRAL', 'RESISTANCE', 'ENLIGHTENED', 'MACHINA'];
+    window.TEAM_CODES = ['N', 'R', 'E', 'M'];
+    window.TEAM_NONE = -1;
+  });
+
+  it('should return the correct ID for a valid team name in TEAM_CODENAMES', () => {
+    expect(IITC.utils.teamStringToId('NEUTRAL')).to.equal(0);
+    expect(IITC.utils.teamStringToId('RESISTANCE')).to.equal(1);
+    expect(IITC.utils.teamStringToId('ENLIGHTENED')).to.equal(2);
+    expect(IITC.utils.teamStringToId('MACHINA')).to.equal(3);
+  });
+
+  it('should return the correct ID for a valid team code in TEAM_CODES', () => {
+    expect(IITC.utils.teamStringToId('N')).to.equal(0);
+    expect(IITC.utils.teamStringToId('R')).to.equal(1);
+    expect(IITC.utils.teamStringToId('E')).to.equal(2);
+    expect(IITC.utils.teamStringToId('M')).to.equal(3);
+  });
+
+  it('should return TEAM_NONE for an invalid team name or code', () => {
+    expect(IITC.utils.teamStringToId('ALIENS')).to.equal(window.TEAM_NONE);
+    expect(IITC.utils.teamStringToId('X')).to.equal(window.TEAM_NONE);
+    expect(IITC.utils.teamStringToId('')).to.equal(window.TEAM_NONE);
+    expect(IITC.utils.teamStringToId(null)).to.equal(window.TEAM_NONE);
+  });
+});

From 6d50badbfa3a4c76f9aec46a2f0ced105cdcc3b1 Mon Sep 17 00:00:00 2001
From: Alexander Danilov <git@modos189.ru>
Date: Thu, 14 Nov 2024 16:44:54 +0500
Subject: [PATCH 25/70] Merge teamStringToId and getTeam into
 IITC.utils.getTeamId

---
 core/code/_deprecated.js |  2 +-
 core/code/utils.js       | 16 +++++---
 test/utils.spec.js       | 86 ++++++++++++++++++++++++++++++++--------
 3 files changed, 80 insertions(+), 24 deletions(-)

diff --git a/core/code/_deprecated.js b/core/code/_deprecated.js
index 4f85f0c50..218e9c196 100644
--- a/core/code/_deprecated.js
+++ b/core/code/_deprecated.js
@@ -185,5 +185,5 @@ window.androidCopy = function () {
  * @returns {number} The team ID the entity belongs to.
  */
 window.getTeam = function (details) {
-  return IITC.utils.teamStringToId(details.team);
+  return IITC.utils.getTeamId(details.team);
 };
diff --git a/core/code/utils.js b/core/code/utils.js
index 0ad0cef05..4e61d76dc 100644
--- a/core/code/utils.js
+++ b/core/code/utils.js
@@ -473,14 +473,18 @@ const isPointInPolygon = (polygon, point) => {
 };
 
 /**
- * Converts a team string to a team ID.
+ * Converts a team string or object to a team ID.
+ * Accepts either team string directly (e.g. "RESISTANCE", "R") or an object with team property.
+ * Returns TEAM_NONE if no match found.
  *
  * @memberof IITC.utils
- * @function teamStringToId
- * @param {string} teamStr - The team string to convert.
+ * @function getTeamId
+ * @param {(Object|string)} input - Input to convert to team ID
+ * @param {string} [input.team] - Team string when input is an object
  * @returns {number} The team ID corresponding to the team string.
  */
-const teamStringToId = (teamStr) => {
+const getTeamId = (input) => {
+  const teamStr = typeof input === 'string' ? input : input?.team;
   if (window.TEAM_CODENAMES.includes(teamStr)) {
     return window.TEAM_CODENAMES.indexOf(teamStr);
   }
@@ -515,7 +519,7 @@ IITC.utils = {
   clampLatLng,
   clampLatLngBounds,
   isPointInPolygon,
-  teamStringToId,
+  getTeamId,
 };
 
 // Map of legacy function names to their new names (or the same name if not renamed)
@@ -543,7 +547,7 @@ const legacyFunctionMappings = {
   clampLatLng: 'clampLatLng',
   clampLatLngBounds: 'clampLatLngBounds',
   pnpoly: 'isPointInPolygon',
-  teamStringToId: 'teamStringToId',
+  teamStringToId: 'getTeamId',
 };
 
 // Set up synchronization between `window` and `IITC.utils` with new names
diff --git a/test/utils.spec.js b/test/utils.spec.js
index 31b31b14d..f42962169 100644
--- a/test/utils.spec.js
+++ b/test/utils.spec.js
@@ -668,31 +668,83 @@ describe('IITC.utils.clamp', () => {
   });
 });
 
-describe('IITC.utils.teamStringToId', () => {
+describe('IITC.utils.getTeamId', () => {
   before(() => {
     window.TEAM_CODENAMES = ['NEUTRAL', 'RESISTANCE', 'ENLIGHTENED', 'MACHINA'];
     window.TEAM_CODES = ['N', 'R', 'E', 'M'];
-    window.TEAM_NONE = -1;
+    window.TEAM_NONE = 0;
   });
 
-  it('should return the correct ID for a valid team name in TEAM_CODENAMES', () => {
-    expect(IITC.utils.teamStringToId('NEUTRAL')).to.equal(0);
-    expect(IITC.utils.teamStringToId('RESISTANCE')).to.equal(1);
-    expect(IITC.utils.teamStringToId('ENLIGHTENED')).to.equal(2);
-    expect(IITC.utils.teamStringToId('MACHINA')).to.equal(3);
+  describe('string input', () => {
+    it('should return correct ID for valid team names from TEAM_CODENAMES', () => {
+      expect(IITC.utils.getTeamId('NEUTRAL')).to.equal(0);
+      expect(IITC.utils.getTeamId('RESISTANCE')).to.equal(1);
+      expect(IITC.utils.getTeamId('ENLIGHTENED')).to.equal(2);
+      expect(IITC.utils.getTeamId('MACHINA')).to.equal(3);
+    });
+
+    it('should return correct ID for valid team codes from TEAM_CODES', () => {
+      expect(IITC.utils.getTeamId('N')).to.equal(0);
+      expect(IITC.utils.getTeamId('R')).to.equal(1);
+      expect(IITC.utils.getTeamId('E')).to.equal(2);
+      expect(IITC.utils.getTeamId('M')).to.equal(3);
+    });
+
+    it('should be case sensitive', () => {
+      expect(IITC.utils.getTeamId('resistance')).to.equal(window.TEAM_NONE);
+      expect(IITC.utils.getTeamId('Resistance')).to.equal(window.TEAM_NONE);
+      expect(IITC.utils.getTeamId('r')).to.equal(window.TEAM_NONE);
+    });
+
+    it('should return TEAM_NONE for invalid team names or codes', () => {
+      expect(IITC.utils.getTeamId('ALIENS')).to.equal(window.TEAM_NONE);
+      expect(IITC.utils.getTeamId('X')).to.equal(window.TEAM_NONE);
+      expect(IITC.utils.getTeamId('')).to.equal(window.TEAM_NONE);
+    });
   });
 
-  it('should return the correct ID for a valid team code in TEAM_CODES', () => {
-    expect(IITC.utils.teamStringToId('N')).to.equal(0);
-    expect(IITC.utils.teamStringToId('R')).to.equal(1);
-    expect(IITC.utils.teamStringToId('E')).to.equal(2);
-    expect(IITC.utils.teamStringToId('M')).to.equal(3);
+  describe('object input', () => {
+    it('should return correct ID for objects with valid team names', () => {
+      expect(IITC.utils.getTeamId({ team: 'NEUTRAL' })).to.equal(0);
+      expect(IITC.utils.getTeamId({ team: 'RESISTANCE' })).to.equal(1);
+      expect(IITC.utils.getTeamId({ team: 'ENLIGHTENED' })).to.equal(2);
+      expect(IITC.utils.getTeamId({ team: 'MACHINA' })).to.equal(3);
+    });
+
+    it('should return correct ID for objects with valid team codes', () => {
+      expect(IITC.utils.getTeamId({ team: 'N' })).to.equal(0);
+      expect(IITC.utils.getTeamId({ team: 'R' })).to.equal(1);
+      expect(IITC.utils.getTeamId({ team: 'E' })).to.equal(2);
+      expect(IITC.utils.getTeamId({ team: 'M' })).to.equal(3);
+    });
+
+    it('should return TEAM_NONE for objects with invalid team property values', () => {
+      expect(IITC.utils.getTeamId({ team: 'ALIENS' })).to.equal(window.TEAM_NONE);
+      expect(IITC.utils.getTeamId({ team: 'X' })).to.equal(window.TEAM_NONE);
+      expect(IITC.utils.getTeamId({ team: '' })).to.equal(window.TEAM_NONE);
+    });
   });
 
-  it('should return TEAM_NONE for an invalid team name or code', () => {
-    expect(IITC.utils.teamStringToId('ALIENS')).to.equal(window.TEAM_NONE);
-    expect(IITC.utils.teamStringToId('X')).to.equal(window.TEAM_NONE);
-    expect(IITC.utils.teamStringToId('')).to.equal(window.TEAM_NONE);
-    expect(IITC.utils.teamStringToId(null)).to.equal(window.TEAM_NONE);
+  describe('error handling', () => {
+    it('should return TEAM_NONE for null/undefined input', () => {
+      expect(IITC.utils.getTeamId(null)).to.equal(window.TEAM_NONE);
+      expect(IITC.utils.getTeamId(undefined)).to.equal(window.TEAM_NONE);
+    });
+
+    it('should return TEAM_NONE for objects without team property', () => {
+      expect(IITC.utils.getTeamId({})).to.equal(window.TEAM_NONE);
+      expect(IITC.utils.getTeamId({ notTeam: 'RESISTANCE' })).to.equal(window.TEAM_NONE);
+    });
+
+    it('should return TEAM_NONE for objects with null/undefined team property', () => {
+      expect(IITC.utils.getTeamId({ team: null })).to.equal(window.TEAM_NONE);
+      expect(IITC.utils.getTeamId({ team: undefined })).to.equal(window.TEAM_NONE);
+    });
+
+    it('should return TEAM_NONE for non-string/non-object inputs', () => {
+      expect(IITC.utils.getTeamId(123)).to.equal(window.TEAM_NONE);
+      expect(IITC.utils.getTeamId(true)).to.equal(window.TEAM_NONE);
+      expect(IITC.utils.getTeamId([])).to.equal(window.TEAM_NONE);
+    });
   });
 });

From aef532bdb8c84d9989a2120acb673a1d65b23474 Mon Sep 17 00:00:00 2001
From: LeJeu <64744459+le-jeu@users.noreply.github.com>
Date: Sat, 6 Feb 2021 16:59:49 +0100
Subject: [PATCH 26/70] update portal marker instead of delete/create

---
 core/code/map_data_render.js | 80 +++++++++++++++++++++---------------
 1 file changed, 46 insertions(+), 34 deletions(-)

diff --git a/core/code/map_data_render.js b/core/code/map_data_render.js
index 62a5f79ba..8cc5d54c7 100644
--- a/core/code/map_data_render.js
+++ b/core/code/map_data_render.js
@@ -364,7 +364,9 @@ window.Render.prototype.createPortalEntity = function (ent, details) {
   var data = window.decodeArray.portal(ent[2], details);
 
   // check if entity already exists
-  if (ent[0] in window.portals) {
+  const oldPortal = ent[0] in window.portals;
+
+  if (oldPortal) {
     // yes. now check to see if the entity data we have is newer than that in place
     var p = window.portals[ent[0]];
 
@@ -375,18 +377,14 @@ window.Render.prototype.createPortalEntity = function (ent, details) {
 
     // the data we have is newer. many data changes require re-rendering of the portal
     // (e.g. level changed, so size is different, or stats changed so highlighter is different)
-    // so to keep things simple we'll always re-create the entity in this case
 
     // remember the old details, for the callback
-
     previousData = p.options.data;
 
     // preserve history
     if (!data.history) {
       data.history = previousData.history;
     }
-
-    this.deletePortalEntity(ent[0]);
   }
 
   var portalLevel = parseInt(data.level) || 0;
@@ -407,47 +405,61 @@ window.Render.prototype.createPortalEntity = function (ent, details) {
 
   window.pushPortalGuidPositionCache(ent[0], data.latE6, data.lngE6);
 
-  var marker = window.createMarker(latlng, dataOptions);
-
-  function handler_portal_click(e) {
-    window.renderPortalDetails(e.target.options.guid);
-  }
-  function handler_portal_dblclick(e) {
-    window.renderPortalDetails(e.target.options.guid);
-    window.map.setView(e.target.getLatLng(), window.DEFAULT_ZOOM);
-  }
-  function handler_portal_contextmenu(e) {
-    window.renderPortalDetails(e.target.options.guid);
-    if (window.isSmartphone()) {
-      window.show('info');
-    } else if (!$('#scrollwrapper').is(':visible')) {
-      $('#sidebartoggle').click();
-    }
-  }
-
-  marker.on('click', handler_portal_click);
-  marker.on('dblclick', handler_portal_dblclick);
-  marker.on('contextmenu', handler_portal_contextmenu);
-
-  window.runHooks('portalAdded', { portal: marker, previousData: previousData });
-
-  window.portals[ent[0]] = marker;
-
   // check for URL links to portal, and select it if this is the one
-  if (window.urlPortalLL && window.urlPortalLL[0] === marker.getLatLng().lat && window.urlPortalLL[1] === marker.getLatLng().lng) {
+  if (window.urlPortalLL && window.urlPortalLL[0] === latlng.lat && window.urlPortalLL[1] === latlng.lng) {
     // URL-passed portal found via pll parameter - set the guid-based parameter
-    log.log('urlPortalLL ' + window.urlPortalLL[0] + ',' + window.urlPortalLL[1] + ' matches portal GUID ' + ent[0]);
+    log.log('urlPortalLL ' + window.urlPortalLL[0] + ',' + urlPortalLL[1] + ' matches portal GUID ' + ent[0]);
 
     window.urlPortal = ent[0];
     window.urlPortalLL = undefined; // clear the URL parameter so it's not matched again
   }
   if (window.urlPortal === ent[0]) {
     // URL-passed portal found via guid parameter - set it as the selected portal
-    log.log('urlPortal GUID ' + window.urlPortal + ' found - selecting...');
+    log.log('urlPortal GUID ' + urlPortal + ' found - selecting...');
     window.selectedPortal = ent[0];
     window.urlPortal = undefined; // clear the URL parameter so it's not matched again
   }
 
+  let marker = undefined;
+  if (oldPortal) {
+    // update marker style/highlight and layer
+    marker = window.portals[ent[0]];
+    // remove portal from its faction/level specific layer
+    this.removePortalFromMapLayer(marker);
+
+    $.extend(marker.options, dataOptions);
+
+    setMarkerStyle(marker, ent[0] === selectedPortal);
+
+    window.runHooks('portalAdded', {portal: marker, previousData: previousData});
+  } else {
+    marker = createMarker(latlng, dataOptions);
+
+    function handler_portal_click(e) {
+      window.renderPortalDetails(e.target.options.guid);
+    }
+    function handler_portal_dblclick(e) {
+      window.renderPortalDetails(e.target.options.guid);
+      window.map.setView(e.target.getLatLng(), window.DEFAULT_ZOOM);
+    }
+    function handler_portal_contextmenu(e) {
+      window.renderPortalDetails(e.target.options.guid);
+      if (window.isSmartphone()) {
+        window.show('info');
+      } else if (!$('#scrollwrapper').is(':visible')) {
+        $('#sidebartoggle').click();
+      }
+    }
+
+    marker.on('click', handler_portal_click);
+    marker.on('dblclick', handler_portal_dblclick);
+    marker.on('contextmenu', handler_portal_contextmenu);
+
+    window.runHooks('portalAdded', { portal: marker });
+
+    window.portals[ent[0]] = marker;
+  }
+
   // (re-)select the portal, to refresh the sidebar on any changes
   if (ent[0] === window.selectedPortal) {
     log.log('portal guid ' + ent[0] + ' is the selected portal - re-rendering portal details');

From 71003a0a8ba435080010650239d4479296cc6e0b Mon Sep 17 00:00:00 2001
From: LeJeu <64744459+le-jeu@users.noreply.github.com>
Date: Sat, 6 Feb 2021 23:49:15 +0100
Subject: [PATCH 27/70] add PortalMarker class

---
 core/code/portal_marker.js | 60 +++++++++++++++++++++++---------------
 1 file changed, 36 insertions(+), 24 deletions(-)

diff --git a/core/code/portal_marker.js b/core/code/portal_marker.js
index 0ad3f5192..5b431418d 100644
--- a/core/code/portal_marker.js
+++ b/core/code/portal_marker.js
@@ -5,6 +5,36 @@
  * @module portal_marker
  */
 
+L.PortalMarker = L.CircleMarker.extend({
+  options: {},
+
+  initialize: function(latlng, data) {
+    var styleOptions = window.getMarkerStyleOptions(data);
+    var options = L.extend({}, data, styleOptions, { interactive: true });
+
+    L.CircleMarker.prototype.initialize.call(this, latlng, options);
+
+    highlightPortal(this)
+  },
+  updateData: function(data) {
+    var styleOptions = window.getMarkerStyleOptions(data);
+    var options = L.extend({}, data, styleOptions, { interactive: true });
+    L.setOptions(this, options);
+
+    this.setStyle(styleOptions);
+  },
+  select: function (selected) {
+    var styleOptions = window.getMarkerStyleOptions(this.options);
+    this.setStyle(styleOptions);
+
+    highlightPortal(this);
+
+    if (selected) {
+      this.setStyle ({color: COLOR_SELECTED_PORTAL});
+    }
+  },
+});
+
 /**
  * Calculates the scale of portal markers based on the current zoom level of the map.
  *
@@ -25,17 +55,9 @@ window.portalMarkerScale = function () {
  * @param {Object} data - The IITC-specific entity data to be stored in the marker options.
  * @returns {L.circleMarker} A Leaflet circle marker representing the portal.
  */
-window.createMarker = function (latlng, data) {
-  var styleOptions = window.getMarkerStyleOptions(data);
-
-  var options = L.extend({}, data, styleOptions, { interactive: true });
-
-  var marker = L.circleMarker(latlng, options);
-
-  window.highlightPortal(marker);
-
-  return marker;
-};
+window.createMarker = function(latlng, data) {
+  return new L.PortalMarker(latlng, data);
+}
 
 /**
  * Sets the style of a portal marker, including options for when the portal is selected.
@@ -44,19 +66,9 @@ window.createMarker = function (latlng, data) {
  * @param {L.circleMarker} marker - The portal marker whose style will be set.
  * @param {boolean} selected - Indicates if the portal is selected.
  */
-window.setMarkerStyle = function (marker, selected) {
-  var styleOptions = window.getMarkerStyleOptions(marker.options);
-
-  marker.setStyle(styleOptions);
-
-  // FIXME? it's inefficient to set the marker style (above), then do it again inside the highlighter
-  // the highlighter API would need to be changed for this to be improved though. will it be too slow?
-  window.highlightPortal(marker);
-
-  if (selected) {
-    marker.setStyle({ color: window.COLOR_SELECTED_PORTAL });
-  }
-};
+window.setMarkerStyle = function(marker, selected) {
+  marker.select(selected);
+}
 
 /**
  * Determines the style options for a portal marker based on its details.

From c615f660cd56164ec54adcab3ca1d1ad463d3ef2 Mon Sep 17 00:00:00 2001
From: LeJeu <64744459+le-jeu@users.noreply.github.com>
Date: Sun, 7 Feb 2021 00:58:01 +0100
Subject: [PATCH 28/70] small factor

---
 core/code/portal_marker.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/code/portal_marker.js b/core/code/portal_marker.js
index 5b431418d..2e65d3525 100644
--- a/core/code/portal_marker.js
+++ b/core/code/portal_marker.js
@@ -14,7 +14,7 @@ L.PortalMarker = L.CircleMarker.extend({
 
     L.CircleMarker.prototype.initialize.call(this, latlng, options);
 
-    highlightPortal(this)
+    highlightPortal(this);
   },
   updateData: function(data) {
     var styleOptions = window.getMarkerStyleOptions(data);
@@ -22,8 +22,9 @@ L.PortalMarker = L.CircleMarker.extend({
     L.setOptions(this, options);
 
     this.setStyle(styleOptions);
+    thighlightPortal(this);
   },
-  select: function (selected) {
+  reset: function (selected) {
     var styleOptions = window.getMarkerStyleOptions(this.options);
     this.setStyle(styleOptions);
 
@@ -67,7 +68,7 @@ window.createMarker = function(latlng, data) {
  * @param {boolean} selected - Indicates if the portal is selected.
  */
 window.setMarkerStyle = function(marker, selected) {
-  marker.select(selected);
+  marker.reset(selected);
 }
 
 /**

From 5e930a2154a4a2d9c1c382eda017ea611418ecd2 Mon Sep 17 00:00:00 2001
From: LeJeu <64744459+le-jeu@users.noreply.github.com>
Date: Sun, 7 Feb 2021 01:31:00 +0100
Subject: [PATCH 29/70] handle style inside portal class

---
 core/code/map_data_render.js |  4 +--
 core/code/portal_marker.js   | 68 +++++++++++++++++++++++++++++-------
 2 files changed, 57 insertions(+), 15 deletions(-)

diff --git a/core/code/map_data_render.js b/core/code/map_data_render.js
index 8cc5d54c7..87d5353bb 100644
--- a/core/code/map_data_render.js
+++ b/core/code/map_data_render.js
@@ -427,9 +427,7 @@ window.Render.prototype.createPortalEntity = function (ent, details) {
     // remove portal from its faction/level specific layer
     this.removePortalFromMapLayer(marker);
 
-    $.extend(marker.options, dataOptions);
-
-    setMarkerStyle(marker, ent[0] === selectedPortal);
+    marker.updateData(dataOptions, ent[0] === selectedPortal);
 
     window.runHooks('portalAdded', {portal: marker, previousData: previousData});
   } else {
diff --git a/core/code/portal_marker.js b/core/code/portal_marker.js
index 2e65d3525..e2a8675ff 100644
--- a/core/code/portal_marker.js
+++ b/core/code/portal_marker.js
@@ -5,27 +5,38 @@
  * @module portal_marker
  */
 
+var portalBaseStyle = {
+  stroke: true,
+  opacity: 1,
+  fill: true,
+  fillOpacity: 0.5,
+  interactive: true,
+};
+
 L.PortalMarker = L.CircleMarker.extend({
-  options: {},
+  options: {
+    guid: null,
+    level: 0,
+    team: 0,
+    timestamp: 0,
+    data: null,
+    ent: null, // LEGACY - TO BE REMOVED AT SOME POINT! use .guid, .timestamp and .data instead
+  },
 
   initialize: function(latlng, data) {
-    var styleOptions = window.getMarkerStyleOptions(data);
-    var options = L.extend({}, data, styleOptions, { interactive: true });
-
-    L.CircleMarker.prototype.initialize.call(this, latlng, options);
+    L.CircleMarker.prototype.initialize.call(this, latlng, data);
 
+    var styleOptions = this._style();
+    this.setStyle(styleOptions);
     highlightPortal(this);
   },
-  updateData: function(data) {
-    var styleOptions = window.getMarkerStyleOptions(data);
-    var options = L.extend({}, data, styleOptions, { interactive: true });
-    L.setOptions(this, options);
+  updateData: function(data, selected) {
+    L.setOptions(this, data);
 
-    this.setStyle(styleOptions);
-    thighlightPortal(this);
+    this.reset(selected);
   },
   reset: function (selected) {
-    var styleOptions = window.getMarkerStyleOptions(this.options);
+    var styleOptions = this._style();
     this.setStyle(styleOptions);
 
     highlightPortal(this);
@@ -34,6 +45,39 @@ L.PortalMarker = L.CircleMarker.extend({
       this.setStyle ({color: COLOR_SELECTED_PORTAL});
     }
   },
+  _style: function () {
+    var dashArray = null;
+    // dashed outline for placeholder portals
+    if (this.options.team != TEAM_NONE && this.options.level==0) dashArray = '1,2';
+
+    return L.extend(this._scale(), portalBaseStyle, {
+      color: COLORS[this.options.team],
+      fillColor: COLORS[this.options.team],
+      dashArray: dashArray
+    });
+  },
+  _scale: function () {
+    var scale = window.portalMarkerScale();
+
+    //   portal level      0  1  2  3  4  5  6  7  8
+    var LEVEL_TO_WEIGHT = [2, 2, 2, 2, 2, 3, 3, 4, 4];
+    var LEVEL_TO_RADIUS = [7, 7, 7, 7, 8, 8, 9,10,11];
+
+    var level = Math.floor(this.options.level||0);
+
+    var lvlWeight = LEVEL_TO_WEIGHT[level] * Math.sqrt(scale);
+    var lvlRadius = LEVEL_TO_RADIUS[level] * scale;
+
+    // thinner outline for placeholder portals
+    if (this.options.team != TEAM_NONE && level==0) {
+      lvlWeight = 1;
+    }
+
+    return {
+      radius: lvlRadius,
+      weight: lvlWeight,
+    };
+  },
 });
 
 /**

From 4b57fa082c5253679135718e12889c14907c314a Mon Sep 17 00:00:00 2001
From: LeJeu <64744459+le-jeu@users.noreply.github.com>
Date: Wed, 10 Feb 2021 14:24:27 +0100
Subject: [PATCH 30/70] test if portal has details

---
 core/code/portal_marker.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/code/portal_marker.js b/core/code/portal_marker.js
index e2a8675ff..f9b101684 100644
--- a/core/code/portal_marker.js
+++ b/core/code/portal_marker.js
@@ -35,6 +35,9 @@ L.PortalMarker = L.CircleMarker.extend({
 
     this.reset(selected);
   },
+  hasDetails: function () {
+    return !!this.options.data.mods
+  },
   reset: function (selected) {
     var styleOptions = this._style();
     this.setStyle(styleOptions);

From eb46b7a2f8dfe29c5666e09743b1f9234b4b39d4 Mon Sep 17 00:00:00 2001
From: LeJeu <64744459+le-jeu@users.noreply.github.com>
Date: Wed, 10 Feb 2021 14:25:11 +0100
Subject: [PATCH 31/70] use portal entity marker to get details

---
 core/code/map_data_render.js  | 12 +++++++++---
 core/code/map_data_request.js |  8 --------
 core/code/portal_detail.js    | 11 +++++------
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/core/code/map_data_render.js b/core/code/map_data_render.js
index 87d5353bb..b3ab67adc 100644
--- a/core/code/map_data_render.js
+++ b/core/code/map_data_render.js
@@ -370,11 +370,15 @@ window.Render.prototype.createPortalEntity = function (ent, details) {
     // yes. now check to see if the entity data we have is newer than that in place
     var p = window.portals[ent[0]];
 
-    if (!data.history || p.options.data.history === data.history)
-      if (p.options.timestamp >= ent[1]) {
-        return; // this data is identical or older - abort processing
+    if (!data.history || p.options.data.history === data.history) {
+      if (p.options.timestamp > ent[1]) {
+        return p; // this data is older - abort processing
       }
 
+      if (p.options.timestamp == ent[1] && p.hasDetails()) // this data is identical - abort processing
+        return p;
+    }
+
     // the data we have is newer. many data changes require re-rendering of the portal
     // (e.g. level changed, so size is different, or stats changed so highlighter is different)
 
@@ -468,6 +472,8 @@ window.Render.prototype.createPortalEntity = function (ent, details) {
 
   // TODO? postpone adding to the map layer
   this.addPortalToMapLayer(marker);
+
+  return marker;
 };
 
 /**
diff --git a/core/code/map_data_request.js b/core/code/map_data_request.js
index 1402c4235..91a1073c1 100644
--- a/core/code/map_data_request.js
+++ b/core/code/map_data_request.js
@@ -65,14 +65,6 @@ window.MapDataRequest = function () {
 
   // ensure we have some initial map status
   this.setStatus('startup', undefined, -1);
-
-  // add a portalDetailLoaded hook, so we can use the extended details to update portals on the map
-  var _this = this;
-  window.addHook('portalDetailLoaded', function (data) {
-    if (data.success) {
-      _this.render.createPortalEntity(data.ent, 'detailed');
-    }
-  });
 };
 
 /**
diff --git a/core/code/portal_detail.js b/core/code/portal_detail.js
index 39f25db6e..2730ea514 100644
--- a/core/code/portal_detail.js
+++ b/core/code/portal_detail.js
@@ -60,12 +60,11 @@ var handleResponse = function (deferred, guid, data, success) {
   }
 
   if (success) {
-    var dict = window.decodeArray.portal(data.result, 'detailed');
-
     // entity format, as used in map data
-    var ent = [guid, dict.timestamp, data.result];
+    var ent = [guid, data.result[13], data.result];
+    var portal = window.mapDataRequest.render.createPortalEntity(ent, 'detailed');
 
-    cache.store(guid, dict);
+    cache.store(guid, portal.options.data);
 
     // FIXME..? better way of handling sidebar refreshing...
 
@@ -73,8 +72,8 @@ var handleResponse = function (deferred, guid, data, success) {
       window.renderPortalDetails(guid);
     }
 
-    deferred.resolve(dict);
-    window.runHooks('portalDetailLoaded', { guid: guid, success: success, details: dict, ent: ent });
+    deferred.resolve(portal.options.data);
+    window.runHooks('portalDetailLoaded', { guid: guid, success: success, details: portal.options.data, ent: ent });
   } else {
     if (data && data.error === 'RETRY') {
       // server asked us to try again

From 5a7e40ee3c97106f1e885c16e2b4a0e785d940c9 Mon Sep 17 00:00:00 2001
From: LeJeu <64744459+le-jeu@users.noreply.github.com>
Date: Wed, 10 Feb 2021 14:55:01 +0100
Subject: [PATCH 32/70] add details getter

---
 core/code/portal_marker.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/code/portal_marker.js b/core/code/portal_marker.js
index f9b101684..abb16e8a5 100644
--- a/core/code/portal_marker.js
+++ b/core/code/portal_marker.js
@@ -35,7 +35,10 @@ L.PortalMarker = L.CircleMarker.extend({
 
     this.reset(selected);
   },
-  hasDetails: function () {
+  getDetails: function () {
+    return this.options.data;
+  },
+  hasFullDetails: function () {
     return !!this.options.data.mods
   },
   reset: function (selected) {

From 5d558e1db089a4f8d02857345f1798375d17ebbd Mon Sep 17 00:00:00 2001
From: LeJeu <64744459+le-jeu@users.noreply.github.com>
Date: Wed, 10 Feb 2021 19:04:51 +0100
Subject: [PATCH 33/70] merge data/details in a single object

keep parsed level/team in seperate fields and back compability
---
 core/code/map_data_render.js | 51 +++++++++++++++-------------------
 core/code/portal_marker.js   | 54 +++++++++++++++++++++---------------
 2 files changed, 54 insertions(+), 51 deletions(-)

diff --git a/core/code/map_data_render.js b/core/code/map_data_render.js
index b3ab67adc..cdabfac85 100644
--- a/core/code/map_data_render.js
+++ b/core/code/map_data_render.js
@@ -362,20 +362,21 @@ window.Render.prototype.createPortalEntity = function (ent, details) {
   var previousData = undefined;
 
   var data = window.decodeArray.portal(ent[2], details);
+  var guid = ent[0];
 
   // check if entity already exists
-  const oldPortal = ent[0] in window.portals;
+  const oldPortal = guid in window.portals;
 
   if (oldPortal) {
     // yes. now check to see if the entity data we have is newer than that in place
-    var p = window.portals[ent[0]];
+    var p = window.portals[guid];
 
     if (!data.history || p.options.data.history === data.history) {
       if (p.options.timestamp > ent[1]) {
         return p; // this data is older - abort processing
       }
 
-      if (p.options.timestamp == ent[1] && p.hasDetails()) // this data is identical - abort processing
+      if (p.options.timestamp == ent[1] && p.hasFullDetails()) // this data is identical - abort processing
         return p;
     }
 
@@ -383,7 +384,7 @@ window.Render.prototype.createPortalEntity = function (ent, details) {
     // (e.g. level changed, so size is different, or stats changed so highlighter is different)
 
     // remember the old details, for the callback
-    previousData = p.options.data;
+    previousData = p.getDetails();
 
     // preserve history
     if (!data.history) {
@@ -391,51 +392,45 @@ window.Render.prototype.createPortalEntity = function (ent, details) {
     }
   }
 
-  var portalLevel = parseInt(data.level) || 0;
-  var team = window.teamStringToId(data.team);
-  // the data returns unclaimed portals as level 1 - but IITC wants them treated as level 0
-  if (team === window.TEAM_NONE) portalLevel = 0;
+  // add missing fields
+  data.guid = guid;
+  if (!data.timestamp)
+    data.timestamp = ent[1];
 
-  var latlng = L.latLng(data.latE6 / 1e6, data.lngE6 / 1e6);
+  // LEGACY - TO BE REMOVED AT SOME POINT! use .guid, .timestamp and .data instead
+  data.ent = ent;
 
-  var dataOptions = {
-    level: portalLevel,
-    team: team,
-    ent: ent, // LEGACY - TO BE REMOVED AT SOME POINT! use .guid, .timestamp and .data instead
-    guid: ent[0],
-    timestamp: ent[1],
-    data: data,
-  };
+  var latlng = L.latLng(data.latE6 / 1e6, data.lngE6 / 1e6);
 
-  window.pushPortalGuidPositionCache(ent[0], data.latE6, data.lngE6);
+  window.pushPortalGuidPositionCache(data.guid, data.latE6, data.lngE6);
 
   // check for URL links to portal, and select it if this is the one
   if (window.urlPortalLL && window.urlPortalLL[0] === latlng.lat && window.urlPortalLL[1] === latlng.lng) {
     // URL-passed portal found via pll parameter - set the guid-based parameter
-    log.log('urlPortalLL ' + window.urlPortalLL[0] + ',' + urlPortalLL[1] + ' matches portal GUID ' + ent[0]);
+    log.log('urlPortalLL ' + window.urlPortalLL[0] + ',' + urlPortalLL[1] + ' matches portal GUID ' + data.guid);
 
-    window.urlPortal = ent[0];
+    window.urlPortal = data.guid;
     window.urlPortalLL = undefined; // clear the URL parameter so it's not matched again
   }
-  if (window.urlPortal === ent[0]) {
+  if (window.urlPortal === data.guid) {
     // URL-passed portal found via guid parameter - set it as the selected portal
     log.log('urlPortal GUID ' + urlPortal + ' found - selecting...');
-    window.selectedPortal = ent[0];
+    window.selectedPortal = data.guid;
     window.urlPortal = undefined; // clear the URL parameter so it's not matched again
   }
 
   let marker = undefined;
   if (oldPortal) {
     // update marker style/highlight and layer
-    marker = window.portals[ent[0]];
+    marker = window.portals[data.guid];
     // remove portal from its faction/level specific layer
     this.removePortalFromMapLayer(marker);
 
-    marker.updateData(dataOptions, ent[0] === selectedPortal);
+    marker.updateDetails(data);
 
     window.runHooks('portalAdded', {portal: marker, previousData: previousData});
   } else {
-    marker = createMarker(latlng, dataOptions);
+    marker = createMarker(latlng, data);
 
     function handler_portal_click(e) {
       window.renderPortalDetails(e.target.options.guid);
@@ -459,12 +454,12 @@ window.Render.prototype.createPortalEntity = function (ent, details) {
 
     window.runHooks('portalAdded', { portal: marker });
 
-    window.portals[ent[0]] = marker;
+    window.portals[data.guid] = marker;
   }
 
   // (re-)select the portal, to refresh the sidebar on any changes
-  if (ent[0] === window.selectedPortal) {
-    log.log('portal guid ' + ent[0] + ' is the selected portal - re-rendering portal details');
+  if (data.guid === window.selectedPortal) {
+    log.log('portal guid ' + data.guid + ' is the selected portal - re-rendering portal details');
     window.renderPortalDetails(window.selectedPortal);
   }
 
diff --git a/core/code/portal_marker.js b/core/code/portal_marker.js
index abb16e8a5..c87578906 100644
--- a/core/code/portal_marker.js
+++ b/core/code/portal_marker.js
@@ -14,32 +14,40 @@ var portalBaseStyle = {
 };
 
 L.PortalMarker = L.CircleMarker.extend({
-  options: {
-    guid: null,
-    level: 0,
-    team: 0,
-    timestamp: 0,
-    data: null,
-    ent: null, // LEGACY - TO BE REMOVED AT SOME POINT! use .guid, .timestamp and .data instead
-  },
+  options: {},
 
   initialize: function(latlng, data) {
-    L.CircleMarker.prototype.initialize.call(this, latlng, data);
-
-    var styleOptions = this._style();
-    this.setStyle(styleOptions);
-    highlightPortal(this);
+    L.CircleMarker.prototype.initialize.call(this, latlng);
+    this.updateDetails(data);
   },
-  updateData: function(data, selected) {
-    L.setOptions(this, data);
+  updateDetails: function(details) {
+    // xxx: handle permanent data
+    this._details = details;
+
+    this._level = parseInt(details.level) || 0;
+    this._team = window.teamStringToId(details.team);
+
+    // the data returns unclaimed portals as level 1 - but IITC wants them treated as level 0
+    if (this._team === TEAM_NONE) this._level = 0;
+
+    // compatibility
+    var dataOptions = {
+      guid: this._details.guid,
+      level: this._level,
+      team: this._team,
+      ent: this._details.ent, // LEGACY - TO BE REMOVED AT SOME POINT! use .guid, .timestamp and .data instead
+      timestamp: this._details.timestamp,
+      data: this._details
+    };
+    L.setOptions(this, dataOptions);
 
-    this.reset(selected);
+    this.reset();
   },
   getDetails: function () {
-    return this.options.data;
+    return this._details;
   },
   hasFullDetails: function () {
-    return !!this.options.data.mods
+    return !!this._details.mods
   },
   reset: function (selected) {
     var styleOptions = this._style();
@@ -54,11 +62,11 @@ L.PortalMarker = L.CircleMarker.extend({
   _style: function () {
     var dashArray = null;
     // dashed outline for placeholder portals
-    if (this.options.team != TEAM_NONE && this.options.level==0) dashArray = '1,2';
+    if (this._team !== TEAM_NONE && this._level === 0) dashArray = '1,2';
 
     return L.extend(this._scale(), portalBaseStyle, {
-      color: COLORS[this.options.team],
-      fillColor: COLORS[this.options.team],
+      color: COLORS[this._team],
+      fillColor: COLORS[this._team],
       dashArray: dashArray
     });
   },
@@ -69,13 +77,13 @@ L.PortalMarker = L.CircleMarker.extend({
     var LEVEL_TO_WEIGHT = [2, 2, 2, 2, 2, 3, 3, 4, 4];
     var LEVEL_TO_RADIUS = [7, 7, 7, 7, 8, 8, 9,10,11];
 
-    var level = Math.floor(this.options.level||0);
+    var level = Math.floor(this._level || 0);
 
     var lvlWeight = LEVEL_TO_WEIGHT[level] * Math.sqrt(scale);
     var lvlRadius = LEVEL_TO_RADIUS[level] * scale;
 
     // thinner outline for placeholder portals
-    if (this.options.team != TEAM_NONE && level==0) {
+    if (this._team !== TEAM_NONE && level === 0) {
       lvlWeight = 1;
     }
 

From 49309512dd0d61721a873840790f30a10e954611 Mon Sep 17 00:00:00 2001
From: LeJeu <64744459+le-jeu@users.noreply.github.com>
Date: Wed, 10 Feb 2021 19:11:30 +0100
Subject: [PATCH 34/70] move portal marker hook

---
 core/code/map_data_render.js | 20 --------------------
 core/code/portal_marker.js   | 21 +++++++++++++++++++++
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/core/code/map_data_render.js b/core/code/map_data_render.js
index cdabfac85..835229068 100644
--- a/core/code/map_data_render.js
+++ b/core/code/map_data_render.js
@@ -432,26 +432,6 @@ window.Render.prototype.createPortalEntity = function (ent, details) {
   } else {
     marker = createMarker(latlng, data);
 
-    function handler_portal_click(e) {
-      window.renderPortalDetails(e.target.options.guid);
-    }
-    function handler_portal_dblclick(e) {
-      window.renderPortalDetails(e.target.options.guid);
-      window.map.setView(e.target.getLatLng(), window.DEFAULT_ZOOM);
-    }
-    function handler_portal_contextmenu(e) {
-      window.renderPortalDetails(e.target.options.guid);
-      if (window.isSmartphone()) {
-        window.show('info');
-      } else if (!$('#scrollwrapper').is(':visible')) {
-        $('#sidebartoggle').click();
-      }
-    }
-
-    marker.on('click', handler_portal_click);
-    marker.on('dblclick', handler_portal_dblclick);
-    marker.on('contextmenu', handler_portal_contextmenu);
-
     window.runHooks('portalAdded', { portal: marker });
 
     window.portals[data.guid] = marker;
diff --git a/core/code/portal_marker.js b/core/code/portal_marker.js
index c87578906..fa951b627 100644
--- a/core/code/portal_marker.js
+++ b/core/code/portal_marker.js
@@ -13,12 +13,33 @@ var portalBaseStyle = {
   interactive: true,
 };
 
+// portal hooks
+function handler_portal_click (e) {
+  window.renderPortalDetails(e.target.options.guid);
+}
+function handler_portal_dblclick (e) {
+  window.renderPortalDetails(e.target.options.guid);
+  window.map.setView(e.target.getLatLng(), DEFAULT_ZOOM);
+}
+function handler_portal_contextmenu (e) {
+  window.renderPortalDetails(e.target.options.guid);
+  if (window.isSmartphone()) {
+    window.show('info');
+  } else if (!$('#scrollwrapper').is(':visible')) {
+    $('#sidebartoggle').click();
+  }
+}
+
 L.PortalMarker = L.CircleMarker.extend({
   options: {},
 
   initialize: function(latlng, data) {
     L.CircleMarker.prototype.initialize.call(this, latlng);
     this.updateDetails(data);
+
+    this.on('click', handler_portal_click);
+    this.on('dblclick', handler_portal_dblclick);
+    this.on('contextmenu', handler_portal_contextmenu);
   },
   updateDetails: function(details) {
     // xxx: handle permanent data

From 253ea8bf096334b54f154807668f73340bf39316 Mon Sep 17 00:00:00 2001
From: LeJeu <64744459+le-jeu@users.noreply.github.com>
Date: Wed, 10 Feb 2021 19:23:35 +0100
Subject: [PATCH 35/70] marker store selected

---
 core/code/portal_marker.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/code/portal_marker.js b/core/code/portal_marker.js
index fa951b627..9019c9802 100644
--- a/core/code/portal_marker.js
+++ b/core/code/portal_marker.js
@@ -76,9 +76,13 @@ L.PortalMarker = L.CircleMarker.extend({
 
     highlightPortal(this);
 
-    if (selected) {
+    if (selected === false)
+      this._selected = false;
+    else
+      this._selected = this._selected || selected;
+
+    if (this._selected)
       this.setStyle ({color: COLOR_SELECTED_PORTAL});
-    }
   },
   _style: function () {
     var dashArray = null;

From 7d5ca542dcb2a3d71611730fb5d4b06b48721d65 Mon Sep 17 00:00:00 2001
From: LeJeu <64744459+le-jeu@users.noreply.github.com>
Date: Fri, 12 Feb 2021 23:35:30 +0100
Subject: [PATCH 36/70] handle portal location edit

---
 core/code/portal_marker.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/code/portal_marker.js b/core/code/portal_marker.js
index 9019c9802..587243200 100644
--- a/core/code/portal_marker.js
+++ b/core/code/portal_marker.js
@@ -42,6 +42,10 @@ L.PortalMarker = L.CircleMarker.extend({
     this.on('contextmenu', handler_portal_contextmenu);
   },
   updateDetails: function(details) {
+    // portal has been moved
+    if (this._details.latE6 !== details.latE6 || this._details.lngE6 !== details.lngE6)
+      this.setLatLng(L.latLng(details.latE6/1E6, details.lngE6/1E6));
+
     // xxx: handle permanent data
     this._details = details;
 

From fa3dddd66914537b9db748bec480bbb4cfd9d225 Mon Sep 17 00:00:00 2001
From: LeJeu <64744459+le-jeu@users.noreply.github.com>
Date: Sat, 13 Feb 2021 01:12:24 +0100
Subject: [PATCH 37/70] move renderPortalDetails call to marker mechanism

---
 core/code/map_data_render.js       | 11 +----------
 core/code/portal_detail.js         |  6 ------
 core/code/portal_detail_display.js |  2 +-
 core/code/portal_marker.js         | 30 ++++++++++++++++++++++++------
 4 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/core/code/map_data_render.js b/core/code/map_data_render.js
index 835229068..8025970db 100644
--- a/core/code/map_data_render.js
+++ b/core/code/map_data_render.js
@@ -208,10 +208,7 @@ window.Render.prototype.endRenderPass = function () {
   // reorder portals to be after links/fields
   this.bringPortalsToFront();
 
-  // re-select the selected portal, to re-render the side-bar. ensures that any data calculated from the map data is up to date
-  if (window.selectedPortal) {
-    window.renderPortalDetails(window.selectedPortal);
-  }
+  this.isRendering = false;
 };
 
 /**
@@ -437,12 +434,6 @@ window.Render.prototype.createPortalEntity = function (ent, details) {
     window.portals[data.guid] = marker;
   }
 
-  // (re-)select the portal, to refresh the sidebar on any changes
-  if (data.guid === window.selectedPortal) {
-    log.log('portal guid ' + data.guid + ' is the selected portal - re-rendering portal details');
-    window.renderPortalDetails(window.selectedPortal);
-  }
-
   window.ornaments.addPortal(marker);
 
   // TODO? postpone adding to the map layer
diff --git a/core/code/portal_detail.js b/core/code/portal_detail.js
index 2730ea514..14db523d1 100644
--- a/core/code/portal_detail.js
+++ b/core/code/portal_detail.js
@@ -66,12 +66,6 @@ var handleResponse = function (deferred, guid, data, success) {
 
     cache.store(guid, portal.options.data);
 
-    // FIXME..? better way of handling sidebar refreshing...
-
-    if (guid === window.selectedPortal) {
-      window.renderPortalDetails(guid);
-    }
-
     deferred.resolve(portal.options.data);
     window.runHooks('portalDetailLoaded', { guid: guid, success: success, details: portal.options.data, ent: ent });
   } else {
diff --git a/core/code/portal_detail_display.js b/core/code/portal_detail_display.js
index d58662943..aa5df288f 100644
--- a/core/code/portal_detail_display.js
+++ b/core/code/portal_detail_display.js
@@ -96,7 +96,7 @@ window.renderPortalDetails = function (guid) {
 
   var portal = window.portals[guid];
   var data = portal.options.data;
-  var details = window.portalDetail.get(guid);
+  var details = portal.hasFullDetails() ? portal.getDetails() : null;
   var historyDetails = window.getPortalHistoryDetails(data);
 
   // details and data can get out of sync. if we have details, construct a matching 'data'
diff --git a/core/code/portal_marker.js b/core/code/portal_marker.js
index 587243200..11102b3df 100644
--- a/core/code/portal_marker.js
+++ b/core/code/portal_marker.js
@@ -15,14 +15,14 @@ var portalBaseStyle = {
 
 // portal hooks
 function handler_portal_click (e) {
-  window.renderPortalDetails(e.target.options.guid);
+  e.target.select(true);
 }
 function handler_portal_dblclick (e) {
-  window.renderPortalDetails(e.target.options.guid);
+  e.target.select(true);
   window.map.setView(e.target.getLatLng(), DEFAULT_ZOOM);
 }
 function handler_portal_contextmenu (e) {
-  window.renderPortalDetails(e.target.options.guid);
+  e.target.select(true);
   if (window.isSmartphone()) {
     window.show('info');
   } else if (!$('#scrollwrapper').is(':visible')) {
@@ -43,8 +43,9 @@ L.PortalMarker = L.CircleMarker.extend({
   },
   updateDetails: function(details) {
     // portal has been moved
-    if (this._details.latE6 !== details.latE6 || this._details.lngE6 !== details.lngE6)
-      this.setLatLng(L.latLng(details.latE6/1E6, details.lngE6/1E6));
+    if (this.details)
+      if (this._details.latE6 !== details.latE6 || this._details.lngE6 !== details.lngE6)
+        this.setLatLng(L.latLng(details.latE6/1E6, details.lngE6/1E6));
 
     // xxx: handle permanent data
     this._details = details;
@@ -66,14 +67,31 @@ L.PortalMarker = L.CircleMarker.extend({
     };
     L.setOptions(this, dataOptions);
 
+    if (this._selected) {
+      this.renderDetails();
+    }
+
     this.reset();
   },
+  renderDetails() {
+    if (!this._rendering) {
+      this._rendering = true;
+      renderPortalDetails(this._details.guid);
+      this._rendering = false;
+    }
+  },
   getDetails: function () {
     return this._details;
   },
   hasFullDetails: function () {
     return !!this._details.mods
   },
+  select: function (selected) {
+    if (selected) {
+      this.renderDetails();
+    }
+    return this.reset(selected);
+  },
   reset: function (selected) {
     var styleOptions = this._style();
     this.setStyle(styleOptions);
@@ -155,7 +173,7 @@ window.createMarker = function(latlng, data) {
  * @param {boolean} selected - Indicates if the portal is selected.
  */
 window.setMarkerStyle = function(marker, selected) {
-  marker.reset(selected);
+  marker.select(selected);
 }
 
 /**

From 6ceab8ff6a548af491b1d9a204c7764d10e820b2 Mon Sep 17 00:00:00 2001
From: LeJeu <64744459+le-jeu@users.noreply.github.com>
Date: Sun, 14 Feb 2021 16:05:43 +0100
Subject: [PATCH 38/70] implement new portal data check in marker

---
 core/code/map_data_render.js | 33 ++++++++++----------------
 core/code/portal_marker.js   | 45 +++++++++++++++++++++++++++++++++---
 2 files changed, 54 insertions(+), 24 deletions(-)

diff --git a/core/code/map_data_render.js b/core/code/map_data_render.js
index 8025970db..992a180f2 100644
--- a/core/code/map_data_render.js
+++ b/core/code/map_data_render.js
@@ -361,6 +361,14 @@ window.Render.prototype.createPortalEntity = function (ent, details) {
   var data = window.decodeArray.portal(ent[2], details);
   var guid = ent[0];
 
+  // add missing fields
+  data.guid = guid;
+  if (!data.timestamp)
+    data.timestamp = ent[1];
+
+  // LEGACY - TO BE REMOVED AT SOME POINT! use .guid, .timestamp and .data instead
+  data.ent = ent;
+
   // check if entity already exists
   const oldPortal = guid in window.portals;
 
@@ -368,35 +376,18 @@ window.Render.prototype.createPortalEntity = function (ent, details) {
     // yes. now check to see if the entity data we have is newer than that in place
     var p = window.portals[guid];
 
-    if (!data.history || p.options.data.history === data.history) {
-      if (p.options.timestamp > ent[1]) {
-        return p; // this data is older - abort processing
-      }
-
-      if (p.options.timestamp == ent[1] && p.hasFullDetails()) // this data is identical - abort processing
-        return p;
+    if (!p.willUpdate(data)) {
+      // this data doesn't bring new detail - abort processing
+      return p;
     }
 
     // the data we have is newer. many data changes require re-rendering of the portal
     // (e.g. level changed, so size is different, or stats changed so highlighter is different)
 
     // remember the old details, for the callback
-    previousData = p.getDetails();
-
-    // preserve history
-    if (!data.history) {
-      data.history = previousData.history;
-    }
+    previousData = $.extend(true, {}, p.getDetails());
   }
 
-  // add missing fields
-  data.guid = guid;
-  if (!data.timestamp)
-    data.timestamp = ent[1];
-
-  // LEGACY - TO BE REMOVED AT SOME POINT! use .guid, .timestamp and .data instead
-  data.ent = ent;
-
   var latlng = L.latLng(data.latE6 / 1e6, data.lngE6 / 1e6);
 
   window.pushPortalGuidPositionCache(data.guid, data.latE6, data.lngE6);
diff --git a/core/code/portal_marker.js b/core/code/portal_marker.js
index 11102b3df..de712beaf 100644
--- a/core/code/portal_marker.js
+++ b/core/code/portal_marker.js
@@ -41,14 +41,53 @@ L.PortalMarker = L.CircleMarker.extend({
     this.on('dblclick', handler_portal_dblclick);
     this.on('contextmenu', handler_portal_contextmenu);
   },
+  willUpdate: function (details) {
+    // portal location edit
+    if (this._details.latE6 !== details.latE6 || this._details.lngE6 !== details.lngE6)
+      return true;
+    // new data
+    if (this._details.timestamp < details.timestamp)
+      return true;
+    // even if we get history that was missing ? is it even possible ?
+    if (this._details.timestamp > details.timestamp)
+      return false;
+
+    // get new history
+    if (details.history) {
+      if (!this._details.history)
+        return true;
+      if (this._details.history._raw !== details.history._raw)
+        return true;
+    }
+
+    // get details portal data
+    if (!this._details.mods && details.mods)
+      return true;
+
+    // does portal picture/name/location modfication update the timestamp ?
+    return false;
+  },
   updateDetails: function(details) {
     // portal has been moved
-    if (this.details)
+    if (this._details) {
       if (this._details.latE6 !== details.latE6 || this._details.lngE6 !== details.lngE6)
         this.setLatLng(L.latLng(details.latE6/1E6, details.lngE6/1E6));
 
-    // xxx: handle permanent data
-    this._details = details;
+      // we got more details
+      if (this._details.timestamp == details.timestamp) {
+        var localThis = this;
+        ["mods", "resonators", "owner", "artifactDetail", "history"].forEach(function (prop) {
+          if (details[prop]) localThis._details[prop] = details[prop];
+        });
+        // LEGACY - TO BE REMOVED AT SOME POINT! use .guid, .timestamp and .data instead
+        this._details.ent = details.ent;
+      } else {
+        // permanent data (history only)
+        if (!details.history) details.history = this._details.history;
+
+        this._details = details;
+      }
+    } else this._details = details;
 
     this._level = parseInt(details.level) || 0;
     this._team = window.teamStringToId(details.team);

From 71f2b37e40fd0db9e836c69c43cf734ceaa9e53f Mon Sep 17 00:00:00 2001
From: LeJeu <64744459+le-jeu@users.noreply.github.com>
Date: Sun, 14 Feb 2021 19:30:57 +0100
Subject: [PATCH 39/70] set marker style once

apply/adapt set(Marker)Style PR #251 by johnd0e

commit 6201837d94c87345d80086503b3623127276adca
---
 core/code/portal_marker.js | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/core/code/portal_marker.js b/core/code/portal_marker.js
index de712beaf..e23c5b650 100644
--- a/core/code/portal_marker.js
+++ b/core/code/portal_marker.js
@@ -125,6 +125,22 @@ L.PortalMarker = L.CircleMarker.extend({
   hasFullDetails: function () {
     return !!this._details.mods
   },
+  setStyle: function (style) { // stub for highlighters
+    L.Util.setOptions(this, style);
+    return this;
+  },
+  setMarkerStyle: function (style) {
+    var styleOptions = L.Util.extend(this._style(), style);
+    L.Util.setOptions(this, styleOptions);
+
+    L.Util.setOptions(this, highlightPortal(this));
+
+    var selected = L.extend(
+      { radius: this.options.radius },
+      this._selected && { color: COLOR_SELECTED_PORTAL }
+    );
+    return L.CircleMarker.prototype.setStyle.call(this, selected);
+  },
   select: function (selected) {
     if (selected) {
       this.renderDetails();
@@ -132,18 +148,12 @@ L.PortalMarker = L.CircleMarker.extend({
     return this.reset(selected);
   },
   reset: function (selected) {
-    var styleOptions = this._style();
-    this.setStyle(styleOptions);
-
-    highlightPortal(this);
-
     if (selected === false)
       this._selected = false;
     else
       this._selected = this._selected || selected;
 
-    if (this._selected)
-      this.setStyle ({color: COLOR_SELECTED_PORTAL});
+    return this.setMarkerStyle();
   },
   _style: function () {
     var dashArray = null;

From a0ee641f5677c247f6c2159e08fda61801f2a691 Mon Sep 17 00:00:00 2001
From: LeJeu <64744459+le-jeu@users.noreply.github.com>
Date: Sun, 14 Feb 2021 19:52:52 +0100
Subject: [PATCH 40/70] highlighter may return the applied style

---
 core/code/portal_highlighter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/code/portal_highlighter.js b/core/code/portal_highlighter.js
index a55b1b138..c40f6c8bb 100644
--- a/core/code/portal_highlighter.js
+++ b/core/code/portal_highlighter.js
@@ -113,7 +113,7 @@ window.changePortalHighlights = function (name) {
  */
 window.highlightPortal = function (p) {
   if (window._highlighters !== null && window._highlighters[window._current_highlighter] !== undefined) {
-    window._highlighters[window._current_highlighter].highlight({ portal: p });
+    return window._highlighters[window._current_highlighter].highlight({ portal: p });
   }
 };
 

From e796f81e3af4286e3acb08cee53852a2ef9c100a Mon Sep 17 00:00:00 2001
From: LeJeu <64744459+le-jeu@users.noreply.github.com>
Date: Tue, 16 Feb 2021 22:22:26 +0100
Subject: [PATCH 41/70] add event name to portalSelected hook

---
 core/code/portal_detail_display.js | 18 ++++++------------
 core/code/portal_marker.js         | 27 +++++++++++++++------------
 2 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/core/code/portal_detail_display.js b/core/code/portal_detail_display.js
index aa5df288f..90dee369f 100644
--- a/core/code/portal_detail_display.js
+++ b/core/code/portal_detail_display.js
@@ -70,8 +70,8 @@ window.renderPortalUrl = function (lat, lng, title, guid) {
  * @function renderPortalDetails
  * @param {string|null} guid - The globally unique identifier of the portal to display details for.
  */
-window.renderPortalDetails = function (guid) {
-  window.selectPortal(window.portals[guid] ? guid : null);
+window.renderPortalDetails = function (guid, dontSelect) {
+  if (!dontSelect) window.selectPortal(window.portals[guid] ? guid : null, 'renderPortalDetails');
   if ($('#sidebar').is(':visible')) {
     window.resetScrollOnNewPortal();
     window.renderPortalDetails.lastVisible = guid;
@@ -337,7 +337,7 @@ window.setPortalIndicators = function (p) {
  * @param {string} guid - The GUID of the portal to select.
  * @returns {boolean} True if the same portal is re-selected (just an update), false if a different portal is selected.
  */
-window.selectPortal = function (guid) {
+window.selectPortal = function (guid, event) {
   var update = window.selectedPortal === guid;
   var oldPortalGuid = window.selectedPortal;
   window.selectedPortal = guid;
@@ -346,20 +346,14 @@ window.selectPortal = function (guid) {
   var newPortal = window.portals[guid];
 
   // Restore style of unselected portal
-  if (!update && oldPortal) window.setMarkerStyle(oldPortal, false);
+  if (!update && oldPortal) oldPortal.setSelected(false);
 
   // Change style of selected portal
-  if (newPortal) {
-    window.setMarkerStyle(newPortal, true);
-
-    if (window.map.hasLayer(newPortal)) {
-      newPortal.bringToFront();
-    }
-  }
+  if(newPortal) newPortal.setSelected(true);
 
   window.setPortalIndicators(newPortal);
 
-  window.runHooks('portalSelected', { selectedPortalGuid: guid, unselectedPortalGuid: oldPortalGuid });
+  window.runHooks('portalSelected', { selectedPortalGuid: guid, unselectedPortalGuid: oldPortalGuid, event: event });
   return update;
 };
 
diff --git a/core/code/portal_marker.js b/core/code/portal_marker.js
index e23c5b650..efa33f881 100644
--- a/core/code/portal_marker.js
+++ b/core/code/portal_marker.js
@@ -15,14 +15,17 @@ var portalBaseStyle = {
 
 // portal hooks
 function handler_portal_click (e) {
-  e.target.select(true);
+  window.selectPortal(e.target.options.guid, e.type);
+  window.renderPortalDetails(e.target.options.guid, true)
 }
 function handler_portal_dblclick (e) {
-  e.target.select(true);
+  window.selectPortal(e.target.options.guid, e.type);
+  window.renderPortalDetails(e.target.options.guid, true)
   window.map.setView(e.target.getLatLng(), DEFAULT_ZOOM);
 }
 function handler_portal_contextmenu (e) {
-  e.target.select(true);
+  window.selectPortal(e.target.options.guid, e.type);
+  window.renderPortalDetails(e.target.options.guid, true)
   if (window.isSmartphone()) {
     window.show('info');
   } else if (!$('#scrollwrapper').is(':visible')) {
@@ -107,15 +110,15 @@ L.PortalMarker = L.CircleMarker.extend({
     L.setOptions(this, dataOptions);
 
     if (this._selected) {
-      this.renderDetails();
+      this._renderDetails();
     }
 
     this.reset();
   },
-  renderDetails() {
+  _renderDetails() {
     if (!this._rendering) {
       this._rendering = true;
-      renderPortalDetails(this._details.guid);
+      renderPortalDetails(this._details.guid, true);
       this._rendering = false;
     }
   },
@@ -141,10 +144,7 @@ L.PortalMarker = L.CircleMarker.extend({
     );
     return L.CircleMarker.prototype.setStyle.call(this, selected);
   },
-  select: function (selected) {
-    if (selected) {
-      this.renderDetails();
-    }
+  setSelected: function (selected) {
     return this.reset(selected);
   },
   reset: function (selected) {
@@ -153,7 +153,10 @@ L.PortalMarker = L.CircleMarker.extend({
     else
       this._selected = this._selected || selected;
 
-    return this.setMarkerStyle();
+    this.setMarkerStyle();
+
+    if (this._selected && window.map.hasLayer(this))
+      this.bringToFront();
   },
   _style: function () {
     var dashArray = null;
@@ -222,7 +225,7 @@ window.createMarker = function(latlng, data) {
  * @param {boolean} selected - Indicates if the portal is selected.
  */
 window.setMarkerStyle = function(marker, selected) {
-  marker.select(selected);
+  marker.setSelected(selected);
 }
 
 /**

From a4711127fdb013a3729a5847023c73ccd0b925ee Mon Sep 17 00:00:00 2001
From: LeJeu <64744459+le-jeu@users.noreply.github.com>
Date: Tue, 16 Feb 2021 22:33:47 +0100
Subject: [PATCH 42/70] remove portalMarker.reset

---
 core/code/portal_marker.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/core/code/portal_marker.js b/core/code/portal_marker.js
index efa33f881..aa383a878 100644
--- a/core/code/portal_marker.js
+++ b/core/code/portal_marker.js
@@ -113,7 +113,7 @@ L.PortalMarker = L.CircleMarker.extend({
       this._renderDetails();
     }
 
-    this.reset();
+    this.setSelected();
   },
   _renderDetails() {
     if (!this._rendering) {
@@ -145,9 +145,6 @@ L.PortalMarker = L.CircleMarker.extend({
     return L.CircleMarker.prototype.setStyle.call(this, selected);
   },
   setSelected: function (selected) {
-    return this.reset(selected);
-  },
-  reset: function (selected) {
     if (selected === false)
       this._selected = false;
     else

From 685e3d3021d8c16f20b755f443ad896deaefd30f Mon Sep 17 00:00:00 2001
From: LeJeu <64744459+le-jeu@users.noreply.github.com>
Date: Tue, 16 Feb 2021 23:05:07 +0100
Subject: [PATCH 43/70] render portal base on portal marker details

---
 core/code/portal_detail_display.js | 40 ++++++++++++++----------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/core/code/portal_detail_display.js b/core/code/portal_detail_display.js
index 90dee369f..6a3aa4aa1 100644
--- a/core/code/portal_detail_display.js
+++ b/core/code/portal_detail_display.js
@@ -95,34 +95,29 @@ window.renderPortalDetails = function (guid, dontSelect) {
   }
 
   var portal = window.portals[guid];
-  var data = portal.options.data;
-  var details = portal.hasFullDetails() ? portal.getDetails() : null;
-  var historyDetails = window.getPortalHistoryDetails(data);
+  var details = portal.getDetails();
+  var hasFullDetails = portal.hasFullDetails();
+  var historyDetails = window.getPortalHistoryDetails(details);
 
-  // details and data can get out of sync. if we have details, construct a matching 'data'
-  if (details) {
-    data = window.getPortalSummaryData(details);
-  }
-
-  var modDetails = details ? '<div class="mods">' + window.getModDetails(details) + '</div>' : '';
-  var miscDetails = details ? window.getPortalMiscDetails(guid, details) : '';
-  var resoDetails = details ? window.getResonatorDetails(details) : '';
+  var modDetails = hasFullDetails ? '<div class="mods">' + window.getModDetails(details) + '</div>' : '';
+  var miscDetails = hasFullDetails ? window.getPortalMiscDetails(guid, details) : '';
+  var resoDetails = hasFullDetails ? window.getResonatorDetails(details) : '';
 
   // TODO? other status details...
-  var statusDetails = details ? '' : '<div id="portalStatus">Loading details...</div>';
+  var statusDetails = hasFullDetails ? '' : '<div id="portalStatus">Loading details...</div>';
 
-  var img = window.fixPortalImageUrl(details ? details.image : data.image);
-  var title = (details && details.title) || (data && data.title) || 'null';
+  var img = window.fixPortalImageUrl(details.image);
+  var title = details.title || 'null';
 
-  var lat = data.latE6 / 1e6;
-  var lng = data.lngE6 / 1e6;
+  var lat = details.latE6 / 1e6;
+  var lng = details.lngE6 / 1e6;
 
   var imgTitle = title + '\n\nClick to show full image.';
 
   // portal level. start with basic data - then extend with fractional info in tooltip if available
-  var levelInt = window.teamStringToId(data.team) === window.TEAM_NONE ? 0 : data.level;
+  var levelInt = portal.options.level;
   var levelDetails = levelInt;
-  if (details) {
+  if (hasFullDetails) {
     levelDetails = window.getPortalLevel(details);
     if (levelDetails !== 8) {
       if (levelDetails === Math.ceil(levelDetails)) levelDetails += '\n8';
@@ -136,7 +131,7 @@ window.renderPortalDetails = function (guid, dontSelect) {
 
   $('#portaldetails')
     .html('') // to ensure it's clear
-    .attr('class', window.TEAM_TO_CSS[window.teamStringToId(data.team)])
+    .attr('class', window.TEAM_TO_CSS[window.teamStringToId(details.team)])
     .append(
       $('<h3>', { class: 'title' })
         .text(title)
@@ -147,7 +142,7 @@ window.renderPortalDetails = function (guid, dontSelect) {
               style: 'float: left',
             })
             .click(function () {
-              window.zoomToAndShowPortal(guid, [data.latE6 / 1e6, data.lngE6 / 1e6]);
+              window.zoomToAndShowPortal(guid, [details.latE6 / 1e6, details.lngE6 / 1e6]);
               if (window.isSmartphone()) {
                 window.show('map');
               }
@@ -187,9 +182,12 @@ window.renderPortalDetails = function (guid, dontSelect) {
 
   window.renderPortalUrl(lat, lng, title, guid);
 
+  // compatibility
+  var data = hasFullDetails ? getPortalSummaryData(details) : details;
+
   // only run the hooks when we have a portalDetails object - most plugins rely on the extended data
   // TODO? another hook to call always, for any plugins that can work with less data?
-  if (details) {
+  if (hasFullDetails) {
     window.runHooks('portalDetailsUpdated', { guid: guid, portal: portal, portalDetails: details, portalData: data });
   }
 };

From 42e19190b4761797a2dff9945696eccc4acf958c Mon Sep 17 00:00:00 2001
From: LeJeu <64744459+le-jeu@users.noreply.github.com>
Date: Tue, 16 Feb 2021 23:06:12 +0100
Subject: [PATCH 44/70] add portal health function

---
 core/code/portal_info.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/core/code/portal_info.js b/core/code/portal_info.js
index 6cd62b16b..436ee0665 100644
--- a/core/code/portal_info.js
+++ b/core/code/portal_info.js
@@ -59,6 +59,13 @@ window.getCurrentPortalEnergy = function (d) {
   return nrg;
 };
 
+window.getPortalHealth = function(d) {
+  var max = getTotalPortalEnergy(d);
+  var cur = getCurrentPortalEnergy(d);
+
+  return max>0 ? Math.floor(cur/max*100) : 0;
+}
+
 /**
  * Calculates the range of a portal for creating links. The range depends on portal level and any installed Link Amps.
  *
@@ -68,7 +75,7 @@ window.getCurrentPortalEnergy = function (d) {
  *                   total range after applying the boost (`range`),
  *                   and a boolean indicating if the portal is linkable (`isLinkable`).
  */
-window.getPortalRange = function (d) {
+window.getPortalRange = function(d) {
   // formula by the great gals and guys at
   // http://decodeingress.me/2012/11/18/ingress-portal-levels-and-link-range/
   var range = {

From 334521e0fcc5d948d894802a71d69588b50c9d45 Mon Sep 17 00:00:00 2001
From: LeJeu <64744459+le-jeu@users.noreply.github.com>
Date: Tue, 16 Feb 2021 23:11:55 +0100
Subject: [PATCH 45/70] use portal detail cache on new portal entities

---
 core/code/map_data_render.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/core/code/map_data_render.js b/core/code/map_data_render.js
index 992a180f2..6b83f4e0b 100644
--- a/core/code/map_data_render.js
+++ b/core/code/map_data_render.js
@@ -420,6 +420,13 @@ window.Render.prototype.createPortalEntity = function (ent, details) {
   } else {
     marker = createMarker(latlng, data);
 
+    // in case of incomplete data while having fresh details in cache, update the portal with those details
+    if (portalDetail.isFresh(guid)) {
+      var oldDetails = portalDetail.get(guid);
+      if (marker.willUpdate(oldDetails))
+        marker.updateDetails(oldDetails);
+    }
+
     window.runHooks('portalAdded', { portal: marker });
 
     window.portals[data.guid] = marker;

From d00ca7ea37de082c891d5d22541b3df9fd2144d0 Mon Sep 17 00:00:00 2001
From: LeJeu <64744459+le-jeu@users.noreply.github.com>
Date: Wed, 17 Feb 2021 00:32:41 +0100
Subject: [PATCH 46/70] remove obsolete data from portal details cache

avoid missing details when getEntities replies that the portal has changed
while portal details is still fresh (3min) in cache
---
 core/code/map_data_render.js | 5 ++++-
 core/code/portal_detail.js   | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/core/code/map_data_render.js b/core/code/map_data_render.js
index 6b83f4e0b..bc9061b35 100644
--- a/core/code/map_data_render.js
+++ b/core/code/map_data_render.js
@@ -423,7 +423,10 @@ window.Render.prototype.createPortalEntity = function (ent, details) {
     // in case of incomplete data while having fresh details in cache, update the portal with those details
     if (portalDetail.isFresh(guid)) {
       var oldDetails = portalDetail.get(guid);
-      if (marker.willUpdate(oldDetails))
+      if (data.timestamp > oldDetails.timestamp) {
+        // data is more recent than the cached details so we remove them from the cache
+        portalDetail.remove(guid);
+      } else if (marker.willUpdate(oldDetails))
         marker.updateDetails(oldDetails);
     }
 
diff --git a/core/code/portal_detail.js b/core/code/portal_detail.js
index 14db523d1..f9eabe80e 100644
--- a/core/code/portal_detail.js
+++ b/core/code/portal_detail.js
@@ -54,6 +54,10 @@ window.portalDetail.isFresh = function (guid) {
   return cache.isFresh(guid);
 };
 
+window.portalDetail.remove = function(guid) {
+  return cache.remove(guid);
+};
+
 var handleResponse = function (deferred, guid, data, success) {
   if (!data || data.error || !data.result) {
     success = false;

From 1b0a2b4b63d423d4e851dcb8626f402f6c49d67f Mon Sep 17 00:00:00 2001
From: LeJeu <64744459+le-jeu@users.noreply.github.com>
Date: Tue, 16 Feb 2021 23:40:25 +0100
Subject: [PATCH 47/70] placeholder: use timestamp from link/field

---
 core/code/map_data_render.js | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/core/code/map_data_render.js b/core/code/map_data_render.js
index bc9061b35..d06b40e74 100644
--- a/core/code/map_data_render.js
+++ b/core/code/map_data_render.js
@@ -302,6 +302,7 @@ window.Render.prototype.deleteFieldEntity = function (guid) {
  * @param {number} latE6 - The latitude of the portal in E6 format.
  * @param {number} lngE6 - The longitude of the portal in E6 format.
  * @param {string} team - The team faction of the portal.
+ * @param {number} [timestamp=0] - Timestamp of the portal data. Defaults to 0 to allow newer data sources to override
  * @param {number} [timestamp] - The timestamp of the portal data.
  */
 window.Render.prototype.createPlaceholderPortalEntity = function (guid, latE6, lngE6, team, timestamp) {
@@ -316,7 +317,7 @@ window.Render.prototype.createPlaceholderPortalEntity = function (guid, latE6, l
 
   var ent = [
     guid, // ent[0] = guid
-    -1, // ent[1] = timestamp - zero will mean any other source of portal data will have a higher timestamp
+    timestamp, // ent[1] = timestamp
     // ent[2] = an array with the entity data
     [
       'p', // 0 - a portal
@@ -326,23 +327,8 @@ window.Render.prototype.createPlaceholderPortalEntity = function (guid, latE6, l
     ],
   ];
 
-  // placeholder portals don't have a useful timestamp value - so the standard code that checks for updated
-  // portal details doesn't apply
-  // so, check that the basic details are valid and delete the existing portal if out of date
-  var portalMoved = false;
-  if (guid in window.portals) {
-    var p = window.portals[guid];
-    portalMoved = latE6 !== p.options.data.latE6 || lngE6 !== p.options.data.lngE6;
-    if (team !== p.options.data.team && p.options.timestamp < timestamp) {
-      // team - delete existing portal
-      this.deletePortalEntity(guid);
-    }
-  }
-
-  if (!portalMoved) {
-    this.createPortalEntity(ent, 'core'); // placeholder
-  }
-};
+  this.createPortalEntity(ent, 'core'); // placeholder
+}
 
 /**
  * Creates a portal entity from the provided game entity data.

From 64fc59182499b0e994c5b412ea96f5cefbc64a69 Mon Sep 17 00:00:00 2001
From: LeJeu <64744459+le-jeu@users.noreply.github.com>
Date: Wed, 17 Feb 2021 14:16:45 +0100
Subject: [PATCH 48/70] portalmarker: init select state

---
 core/code/portal_marker.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/code/portal_marker.js b/core/code/portal_marker.js
index aa383a878..6b9720793 100644
--- a/core/code/portal_marker.js
+++ b/core/code/portal_marker.js
@@ -38,6 +38,7 @@ L.PortalMarker = L.CircleMarker.extend({
 
   initialize: function(latlng, data) {
     L.CircleMarker.prototype.initialize.call(this, latlng);
+    this._selected = data.guid === selectedPortal;
     this.updateDetails(data);
 
     this.on('click', handler_portal_click);

From b565376d768045c97dfc876dbcea9624baa1677e Mon Sep 17 00:00:00 2001
From: LeJeu <64744459+le-jeu@users.noreply.github.com>
Date: Wed, 17 Feb 2021 14:27:55 +0100
Subject: [PATCH 49/70] render details on new selected portal entity

---
 core/code/map_data_render.js | 3 +++
 core/code/portal_marker.js   | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/code/map_data_render.js b/core/code/map_data_render.js
index d06b40e74..40934f276 100644
--- a/core/code/map_data_render.js
+++ b/core/code/map_data_render.js
@@ -419,6 +419,9 @@ window.Render.prototype.createPortalEntity = function (ent, details) {
     window.runHooks('portalAdded', { portal: marker });
 
     window.portals[data.guid] = marker;
+
+    if (selectedPortal === data.guid)
+      marker.renderDetails();
   }
 
   window.ornaments.addPortal(marker);
diff --git a/core/code/portal_marker.js b/core/code/portal_marker.js
index 6b9720793..4988f070e 100644
--- a/core/code/portal_marker.js
+++ b/core/code/portal_marker.js
@@ -111,12 +111,12 @@ L.PortalMarker = L.CircleMarker.extend({
     L.setOptions(this, dataOptions);
 
     if (this._selected) {
-      this._renderDetails();
+      this.renderDetails();
     }
 
     this.setSelected();
   },
-  _renderDetails() {
+  renderDetails() {
     if (!this._rendering) {
       this._rendering = true;
       renderPortalDetails(this._details.guid, true);

From 2e8728c71d23c77fa46b2e3b069a7deb07ec6cee Mon Sep 17 00:00:00 2001
From: LeJeu <64744459+le-jeu@users.noreply.github.com>
Date: Wed, 17 Feb 2021 19:04:00 +0100
Subject: [PATCH 50/70] fix: use this._details

---
 core/code/portal_marker.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/code/portal_marker.js b/core/code/portal_marker.js
index 4988f070e..a6fcec5ae 100644
--- a/core/code/portal_marker.js
+++ b/core/code/portal_marker.js
@@ -93,8 +93,8 @@ L.PortalMarker = L.CircleMarker.extend({
       }
     } else this._details = details;
 
-    this._level = parseInt(details.level) || 0;
-    this._team = window.teamStringToId(details.team);
+    this._level = parseInt(this._details.level) || 0;
+    this._team = window.teamStringToId(this._details.team);
 
     // the data returns unclaimed portals as level 1 - but IITC wants them treated as level 0
     if (this._team === TEAM_NONE) this._level = 0;

From 9c1e6ad377267bfeda36dfab86a7f25899f278ae Mon Sep 17 00:00:00 2001
From: LeJeu <64744459+le-jeu@users.noreply.github.com>
Date: Wed, 17 Feb 2021 19:05:25 +0100
Subject: [PATCH 51/70] better placeholder handling

---
 core/code/portal_marker.js | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/core/code/portal_marker.js b/core/code/portal_marker.js
index a6fcec5ae..f50825a01 100644
--- a/core/code/portal_marker.js
+++ b/core/code/portal_marker.js
@@ -49,9 +49,20 @@ L.PortalMarker = L.CircleMarker.extend({
     // portal location edit
     if (this._details.latE6 !== details.latE6 || this._details.lngE6 !== details.lngE6)
       return true;
+    // placeholder
+    if (details.level === undefined) {
+      // if team differs and corresponding link/field is more recent
+      if (this._details.timestamp < details.timestamp && this._details.team !== details.team)
+        return true;
+      // in any other case
+      return false;
+    }
     // new data
     if (this._details.timestamp < details.timestamp)
       return true;
+    // current marker is a placeholder, and details is real data
+    if (this.isPlaceholder())
+      return true;
     // even if we get history that was missing ? is it even possible ?
     if (this._details.timestamp > details.timestamp)
       return false;
@@ -72,13 +83,23 @@ L.PortalMarker = L.CircleMarker.extend({
     return false;
   },
   updateDetails: function(details) {
-    // portal has been moved
     if (this._details) {
+      // portal has been moved
       if (this._details.latE6 !== details.latE6 || this._details.lngE6 !== details.lngE6)
         this.setLatLng(L.latLng(details.latE6/1E6, details.lngE6/1E6));
 
-      // we got more details
-      if (this._details.timestamp == details.timestamp) {
+      // core data from a placeholder
+      if (details.level === undefined) {
+        // if team has changed
+        if (this._details.timestamp < details.timestamp && this._details.team !== details.team) {
+          // keep history, title, image
+          details.title = this._details.title;
+          details.image = this._details.image;
+          details.history = this._details.history;
+          this._details = details;
+        }
+      } else if (this._details.timestamp == details.timestamp) {
+        // we got more details
         var localThis = this;
         ["mods", "resonators", "owner", "artifactDetail", "history"].forEach(function (prop) {
           if (details[prop]) localThis._details[prop] = details[prop];
@@ -126,6 +147,9 @@ L.PortalMarker = L.CircleMarker.extend({
   getDetails: function () {
     return this._details;
   },
+  isPlaceholder: function () {
+    return this._details.level === undefined;
+  },
   hasFullDetails: function () {
     return !!this._details.mods
   },

From 1aff25436c03093c08aa090ea35872d42f1bb64c Mon Sep 17 00:00:00 2001
From: LeJeu <64744459+le-jeu@users.noreply.github.com>
Date: Fri, 19 Feb 2021 18:27:23 +0100
Subject: [PATCH 52/70] render details: select if forced or not selected

---
 core/code/portal_detail_display.js |  5 +++--
 core/code/portal_marker.js         | 10 +++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/core/code/portal_detail_display.js b/core/code/portal_detail_display.js
index 6a3aa4aa1..ff1735709 100644
--- a/core/code/portal_detail_display.js
+++ b/core/code/portal_detail_display.js
@@ -70,8 +70,9 @@ window.renderPortalUrl = function (lat, lng, title, guid) {
  * @function renderPortalDetails
  * @param {string|null} guid - The globally unique identifier of the portal to display details for.
  */
-window.renderPortalDetails = function (guid, dontSelect) {
-  if (!dontSelect) window.selectPortal(window.portals[guid] ? guid : null, 'renderPortalDetails');
+window.renderPortalDetails = function(guid, forceSelect) {
+  if (forceSelect || window.selectedPortal !== guid)
+    window.selectPortal(window.portals[guid] ? guid : null, 'renderPortalDetails');
   if ($('#sidebar').is(':visible')) {
     window.resetScrollOnNewPortal();
     window.renderPortalDetails.lastVisible = guid;
diff --git a/core/code/portal_marker.js b/core/code/portal_marker.js
index f50825a01..314db5278 100644
--- a/core/code/portal_marker.js
+++ b/core/code/portal_marker.js
@@ -16,16 +16,16 @@ var portalBaseStyle = {
 // portal hooks
 function handler_portal_click (e) {
   window.selectPortal(e.target.options.guid, e.type);
-  window.renderPortalDetails(e.target.options.guid, true)
+  window.renderPortalDetails(e.target.options.guid)
 }
 function handler_portal_dblclick (e) {
   window.selectPortal(e.target.options.guid, e.type);
-  window.renderPortalDetails(e.target.options.guid, true)
+  window.renderPortalDetails(e.target.options.guid)
   window.map.setView(e.target.getLatLng(), DEFAULT_ZOOM);
 }
 function handler_portal_contextmenu (e) {
   window.selectPortal(e.target.options.guid, e.type);
-  window.renderPortalDetails(e.target.options.guid, true)
+  window.renderPortalDetails(e.target.options.guid)
   if (window.isSmartphone()) {
     window.show('info');
   } else if (!$('#scrollwrapper').is(':visible')) {
@@ -61,7 +61,7 @@ L.PortalMarker = L.CircleMarker.extend({
     if (this._details.timestamp < details.timestamp)
       return true;
     // current marker is a placeholder, and details is real data
-    if (this.isPlaceholder())
+    if (this.isPlaceholder() && this._details.team === details.team)
       return true;
     // even if we get history that was missing ? is it even possible ?
     if (this._details.timestamp > details.timestamp)
@@ -140,7 +140,7 @@ L.PortalMarker = L.CircleMarker.extend({
   renderDetails() {
     if (!this._rendering) {
       this._rendering = true;
-      renderPortalDetails(this._details.guid, true);
+      renderPortalDetails(this._details.guid);
       this._rendering = false;
     }
   },

From cbb97a15c4d82fa8cc20b3b3390431725232f5d7 Mon Sep 17 00:00:00 2001
From: LeJeu <64744459+le-jeu@users.noreply.github.com>
Date: Mon, 22 Feb 2021 21:11:42 +0100
Subject: [PATCH 53/70] handle missing history

---
 core/code/portal_marker.js | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/core/code/portal_marker.js b/core/code/portal_marker.js
index 314db5278..4ba3d64ff 100644
--- a/core/code/portal_marker.js
+++ b/core/code/portal_marker.js
@@ -101,9 +101,21 @@ L.PortalMarker = L.CircleMarker.extend({
       } else if (this._details.timestamp == details.timestamp) {
         // we got more details
         var localThis = this;
-        ["mods", "resonators", "owner", "artifactDetail", "history"].forEach(function (prop) {
+        ["mods", "resonators", "owner", "artifactDetail"].forEach(function (prop) {
           if (details[prop]) localThis._details[prop] = details[prop];
         });
+        // smarter update for history (cause it's missing sometimes)
+        if (details.history) {
+          if (!this._details.history) this._details.history = details.history;
+          else {
+            if (this._details.history._raw & details.history._raw != this._details.history._raw)
+              log.warn("new portal data has lost some history");
+            this._details.history._raw |= details.history._raw;
+            ['visited', 'captured', 'scoutControlled'].forEach(function (prop) {
+              localThis._details.history[prop] ||= details.history[prop];
+            });
+          }
+        }
         // LEGACY - TO BE REMOVED AT SOME POINT! use .guid, .timestamp and .data instead
         this._details.ent = details.ent;
       } else {

From a955536c18691393f0b7c50086eb8489f937fd78 Mon Sep 17 00:00:00 2001
From: LeJeu <64744459+le-jeu@users.noreply.github.com>
Date: Tue, 23 Feb 2021 23:12:23 +0100
Subject: [PATCH 54/70] dont recreate markers when outside view

---
 core/code/map_data_render.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/core/code/map_data_render.js b/core/code/map_data_render.js
index 40934f276..4ce9edca7 100644
--- a/core/code/map_data_render.js
+++ b/core/code/map_data_render.js
@@ -46,7 +46,9 @@ window.Render.prototype.clearPortalsOutsideBounds = function (bounds) {
     var p = window.portals[guid];
     // clear portals outside visible bounds - unless it's the selected portal, or it's relevant to artifacts
     if (!bounds.contains(p.getLatLng()) && guid !== window.selectedPortal && !window.artifact.isInterestingPortal(guid)) {
-      this.deletePortalEntity(guid);
+      // remove the marker as a layer first
+      // deletion will be done at endRenderPass
+      p.remove();
     }
   }
 };
@@ -364,6 +366,9 @@ window.Render.prototype.createPortalEntity = function (ent, details) {
 
     if (!p.willUpdate(data)) {
       // this data doesn't bring new detail - abort processing
+      // re-add the portal to the relevant layer (does nothing if already in the correct layer)
+      // useful for portals outside the view
+      this.addPortalToMapLayer(p);
       return p;
     }
 
@@ -397,8 +402,6 @@ window.Render.prototype.createPortalEntity = function (ent, details) {
   if (oldPortal) {
     // update marker style/highlight and layer
     marker = window.portals[data.guid];
-    // remove portal from its faction/level specific layer
-    this.removePortalFromMapLayer(marker);
 
     marker.updateDetails(data);
 

From 7ff93ecdf4861049366e22514c8964bb7bed36fb Mon Sep 17 00:00:00 2001
From: LeJeu <64744459+le-jeu@users.noreply.github.com>
Date: Thu, 6 May 2021 23:13:10 +0200
Subject: [PATCH 55/70] marker: update all data available

---
 core/code/portal_marker.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/code/portal_marker.js b/core/code/portal_marker.js
index 4ba3d64ff..b796169ec 100644
--- a/core/code/portal_marker.js
+++ b/core/code/portal_marker.js
@@ -99,9 +99,9 @@ L.PortalMarker = L.CircleMarker.extend({
           this._details = details;
         }
       } else if (this._details.timestamp == details.timestamp) {
-        // we got more details
+        // we got more details (core/summary -> summary/detailed/extended)
         var localThis = this;
-        ["mods", "resonators", "owner", "artifactDetail"].forEach(function (prop) {
+        ["level", "health", "resCount", "image", "title", "ornaments", "mission", "mission50plus", "artifactBrief", "mods", "resonators", "owner", "artifactDetail"].forEach(function (prop) {
           if (details[prop]) localThis._details[prop] = details[prop];
         });
         // smarter update for history (cause it's missing sometimes)

From 16cce2ecb6a662d0f0b3d3a801f923bd175a4a1a Mon Sep 17 00:00:00 2001
From: LeJeu <64744459+le-jeu@users.noreply.github.com>
Date: Sun, 23 May 2021 00:04:44 +0200
Subject: [PATCH 56/70] portal edits change the timestamp

photo/title
---
 core/code/portal_marker.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/code/portal_marker.js b/core/code/portal_marker.js
index b796169ec..bbfbfd81e 100644
--- a/core/code/portal_marker.js
+++ b/core/code/portal_marker.js
@@ -79,7 +79,6 @@ L.PortalMarker = L.CircleMarker.extend({
     if (!this._details.mods && details.mods)
       return true;
 
-    // does portal picture/name/location modfication update the timestamp ?
     return false;
   },
   updateDetails: function(details) {

From 5f86ba6b284cf6b28adb18610fa13c3c6e2ea26b Mon Sep 17 00:00:00 2001
From: LeJeu <64744459+le-jeu@users.noreply.github.com>
Date: Mon, 5 Jul 2021 16:00:43 +0200
Subject: [PATCH 57/70] apply to all placeholders

---
 core/code/portal_marker.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/code/portal_marker.js b/core/code/portal_marker.js
index bbfbfd81e..63a56e508 100644
--- a/core/code/portal_marker.js
+++ b/core/code/portal_marker.js
@@ -194,7 +194,7 @@ L.PortalMarker = L.CircleMarker.extend({
   _style: function () {
     var dashArray = null;
     // dashed outline for placeholder portals
-    if (this._team !== TEAM_NONE && this._level === 0) dashArray = '1,2';
+    if (this.isPlaceholder()) dashArray = '1,2';
 
     return L.extend(this._scale(), portalBaseStyle, {
       color: COLORS[this._team],
@@ -215,7 +215,7 @@ L.PortalMarker = L.CircleMarker.extend({
     var lvlRadius = LEVEL_TO_RADIUS[level] * scale;
 
     // thinner outline for placeholder portals
-    if (this._team !== TEAM_NONE && level === 0) {
+    if (this.isPlaceholder()) {
       lvlWeight = 1;
     }
 

From fe6b0e338e90db2dc51b0f87363d034bb248051e Mon Sep 17 00:00:00 2001
From: LeJeu <64744459+le-jeu@users.noreply.github.com>
Date: Mon, 5 Jul 2021 16:55:14 +0200
Subject: [PATCH 58/70] move portal style as statics of L.PortalMarker

---
 core/code/portal_marker.js | 68 ++++++++++++++++++++++----------------
 1 file changed, 40 insertions(+), 28 deletions(-)

diff --git a/core/code/portal_marker.js b/core/code/portal_marker.js
index 63a56e508..18206b28d 100644
--- a/core/code/portal_marker.js
+++ b/core/code/portal_marker.js
@@ -36,6 +36,25 @@ function handler_portal_contextmenu (e) {
 L.PortalMarker = L.CircleMarker.extend({
   options: {},
 
+  statics: {
+    // base style
+    portalBaseStyle: {
+      stroke: true,
+      opacity: 1,
+      fill: true,
+      fillOpacity: 0.5,
+      interactive: true,
+    },
+    // placeholder style
+    placeholderStyle: {
+      dashArray: '1,2',
+      weight: 1,
+    },
+    // portal level   0  1  2  3  4  5  6  7  8
+    LEVEL_TO_WEIGHT: [2, 2, 2, 2, 2, 3, 3, 4, 4],
+    LEVEL_TO_RADIUS: [7, 7, 7, 7, 8, 8, 9, 10, 11],
+  },
+
   initialize: function(latlng, data) {
     L.CircleMarker.prototype.initialize.call(this, latlng);
     this._selected = data.guid === selectedPortal;
@@ -194,9 +213,9 @@ L.PortalMarker = L.CircleMarker.extend({
   _style: function () {
     var dashArray = null;
     // dashed outline for placeholder portals
-    if (this.isPlaceholder()) dashArray = '1,2';
+    if (this.isPlaceholder()) dashArray = L.PortalMarker.placeholderStyle.dashArray;
 
-    return L.extend(this._scale(), portalBaseStyle, {
+    return L.extend(this._scale(), L.PortalMarker.portalBaseStyle, {
       color: COLORS[this._team],
       fillColor: COLORS[this._team],
       dashArray: dashArray
@@ -205,18 +224,14 @@ L.PortalMarker = L.CircleMarker.extend({
   _scale: function () {
     var scale = window.portalMarkerScale();
 
-    //   portal level      0  1  2  3  4  5  6  7  8
-    var LEVEL_TO_WEIGHT = [2, 2, 2, 2, 2, 3, 3, 4, 4];
-    var LEVEL_TO_RADIUS = [7, 7, 7, 7, 8, 8, 9,10,11];
-
     var level = Math.floor(this._level || 0);
 
-    var lvlWeight = LEVEL_TO_WEIGHT[level] * Math.sqrt(scale);
-    var lvlRadius = LEVEL_TO_RADIUS[level] * scale;
+    var lvlWeight = L.PortalMarker.LEVEL_TO_WEIGHT[level] * Math.sqrt(scale);
+    var lvlRadius = L.PortalMarker.LEVEL_TO_RADIUS[level] * scale;
 
     // thinner outline for placeholder portals
     if (this.isPlaceholder()) {
-      lvlWeight = 1;
+      lvlWeight = L.PortalMarker.placeholderStyle.weight;
     }
 
     return {
@@ -271,33 +286,30 @@ window.setMarkerStyle = function(marker, selected) {
 window.getMarkerStyleOptions = function (details) {
   var scale = window.portalMarkerScale();
 
-  //   portal level      0  1  2  3  4  5  6  7  8
-  var LEVEL_TO_WEIGHT = [2, 2, 2, 2, 2, 3, 3, 4, 4];
-  var LEVEL_TO_RADIUS = [7, 7, 7, 7, 8, 8, 9, 10, 11];
-
   var level = Math.floor(details.level || 0);
 
-  var lvlWeight = LEVEL_TO_WEIGHT[level] * Math.sqrt(scale);
-  var lvlRadius = LEVEL_TO_RADIUS[level] * scale;
+  var lvlWeight = L.PortalMarker.LEVEL_TO_WEIGHT[level] * Math.sqrt(scale);
+  var lvlRadius = L.PortalMarker.LEVEL_TO_RADIUS[level] * scale;
 
   var dashArray = null;
   // thinner and dashed outline for placeholder portals
   if (details.team !== window.TEAM_NONE && level === 0) {
-    lvlWeight = 1;
-    dashArray = '1,2';
+    lvlWeight = L.PortalMarker.placeholderStyle.weight;
+    dashArray = L.PortalMarker.placeholderStyle.dashArray;
   }
 
-  var options = {
-    radius: lvlRadius,
-    stroke: true,
-    color: window.COLORS[details.team],
-    weight: lvlWeight,
-    opacity: 1,
-    fill: true,
-    fillColor: window.COLORS[details.team],
-    fillOpacity: 0.5,
-    dashArray: dashArray,
-  };
+  var options = L.extend(
+    {
+      radius: lvlRadius,
+      weight: lvlWeight,
+    },
+    L.PortalMarker.portalBaseStyle,
+    {
+      color: window.COLORS[details.team],
+      fillColor: window.COLORS[details.team],
+      dashArray: dashArray,
+    }
+  );
 
   return options;
 };

From 78b9a112b799b94aefe64d9808499355b1708b46 Mon Sep 17 00:00:00 2001
From: LeJeu <64744459+le-jeu@users.noreply.github.com>
Date: Tue, 6 Jul 2021 11:21:22 +0200
Subject: [PATCH 59/70] portal location edit changes the timestamp

---
 core/code/portal_marker.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/core/code/portal_marker.js b/core/code/portal_marker.js
index 18206b28d..d578ff330 100644
--- a/core/code/portal_marker.js
+++ b/core/code/portal_marker.js
@@ -65,10 +65,7 @@ L.PortalMarker = L.CircleMarker.extend({
     this.on('contextmenu', handler_portal_contextmenu);
   },
   willUpdate: function (details) {
-    // portal location edit
-    if (this._details.latE6 !== details.latE6 || this._details.lngE6 !== details.lngE6)
-      return true;
-    // placeholder
+    // details are from a placeholder
     if (details.level === undefined) {
       // if team differs and corresponding link/field is more recent
       if (this._details.timestamp < details.timestamp && this._details.team !== details.team)

From db2415968ec4cd6e2e499256388b778e3bee0451 Mon Sep 17 00:00:00 2001
From: LeJeu <64744459+le-jeu@users.noreply.github.com>
Date: Mon, 7 Jun 2021 11:30:45 +0200
Subject: [PATCH 60/70] add comment #1

---
 core/code/portal_marker.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/core/code/portal_marker.js b/core/code/portal_marker.js
index d578ff330..647e91a85 100644
--- a/core/code/portal_marker.js
+++ b/core/code/portal_marker.js
@@ -73,7 +73,11 @@ L.PortalMarker = L.CircleMarker.extend({
       // in any other case
       return false;
     }
-    // new data
+    // more recent timestamp, this occurs when the data has changed because of:
+    //  - resonator deploy/upgrade
+    //  - mod deploy
+    //  - recharge/damage/decay
+    //  - portal edit (title, location, portal main picture)
     if (this._details.timestamp < details.timestamp)
       return true;
     // current marker is a placeholder, and details is real data
@@ -83,6 +87,8 @@ L.PortalMarker = L.CircleMarker.extend({
     if (this._details.timestamp > details.timestamp)
       return false;
 
+    // this._details.timestamp === details.timestamp
+
     // get new history
     if (details.history) {
       if (!this._details.history)

From f314b48b38e09b241e0a896b802f7e9ecad0e0c9 Mon Sep 17 00:00:00 2001
From: LeJeu <64744459+le-jeu@users.noreply.github.com>
Date: Mon, 7 Jun 2021 15:14:24 +0200
Subject: [PATCH 61/70] placeholder: don't use use timestamp from field

use only the link timestamp for reliable timestamp
---
 core/code/map_data_render.js | 2 +-
 core/code/portal_marker.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/code/map_data_render.js b/core/code/map_data_render.js
index 4ce9edca7..330164535 100644
--- a/core/code/map_data_render.js
+++ b/core/code/map_data_render.js
@@ -457,7 +457,7 @@ window.Render.prototype.createFieldEntity = function (ent) {
   // create placeholder portals for field corners. we already do links, but there are the odd case where this is useful
   for (var i = 0; i < 3; i++) {
     var p = data.points[i];
-    this.createPlaceholderPortalEntity(p.guid, p.latE6, p.lngE6, data.team, data.timestamp);
+    this.createPlaceholderPortalEntity(p.guid, p.latE6, p.lngE6, data.team, 0);
   }
 
   // check if entity already exists
diff --git a/core/code/portal_marker.js b/core/code/portal_marker.js
index 647e91a85..59ade0bd5 100644
--- a/core/code/portal_marker.js
+++ b/core/code/portal_marker.js
@@ -67,7 +67,7 @@ L.PortalMarker = L.CircleMarker.extend({
   willUpdate: function (details) {
     // details are from a placeholder
     if (details.level === undefined) {
-      // if team differs and corresponding link/field is more recent
+      // if team differs and corresponding link is more recent (ignore field)
       if (this._details.timestamp < details.timestamp && this._details.team !== details.team)
         return true;
       // in any other case

From 8f82f4f83a14253af27b99c9e379856ee312b7af Mon Sep 17 00:00:00 2001
From: LeJeu <64744459+le-jeu@users.noreply.github.com>
Date: Sat, 8 Jan 2022 14:57:01 +0100
Subject: [PATCH 62/70] lint

---
 core/code/map_data_render.js       |  25 +++--
 core/code/portal_detail.js         |   2 +-
 core/code/portal_detail_display.js |  16 ++-
 core/code/portal_info.js           |  20 ++--
 core/code/portal_marker.js         | 157 +++++++++++++++++------------
 5 files changed, 135 insertions(+), 85 deletions(-)

diff --git a/core/code/map_data_render.js b/core/code/map_data_render.js
index 330164535..fc1c423d9 100644
--- a/core/code/map_data_render.js
+++ b/core/code/map_data_render.js
@@ -330,7 +330,7 @@ window.Render.prototype.createPlaceholderPortalEntity = function (guid, latE6, l
   ];
 
   this.createPortalEntity(ent, 'core'); // placeholder
-}
+};
 
 /**
  * Creates a portal entity from the provided game entity data.
@@ -351,8 +351,9 @@ window.Render.prototype.createPortalEntity = function (ent, details) {
 
   // add missing fields
   data.guid = guid;
-  if (!data.timestamp)
+  if (!data.timestamp) {
     data.timestamp = ent[1];
+  }
 
   // LEGACY - TO BE REMOVED AT SOME POINT! use .guid, .timestamp and .data instead
   data.ent = ent;
@@ -386,14 +387,14 @@ window.Render.prototype.createPortalEntity = function (ent, details) {
   // check for URL links to portal, and select it if this is the one
   if (window.urlPortalLL && window.urlPortalLL[0] === latlng.lat && window.urlPortalLL[1] === latlng.lng) {
     // URL-passed portal found via pll parameter - set the guid-based parameter
-    log.log('urlPortalLL ' + window.urlPortalLL[0] + ',' + urlPortalLL[1] + ' matches portal GUID ' + data.guid);
+    log.log('urlPortalLL ' + window.urlPortalLL[0] + ',' + window.urlPortalLL[1] + ' matches portal GUID ' + data.guid);
 
     window.urlPortal = data.guid;
     window.urlPortalLL = undefined; // clear the URL parameter so it's not matched again
   }
   if (window.urlPortal === data.guid) {
     // URL-passed portal found via guid parameter - set it as the selected portal
-    log.log('urlPortal GUID ' + urlPortal + ' found - selecting...');
+    log.log('urlPortal GUID ' + window.urlPortal + ' found - selecting...');
     window.selectedPortal = data.guid;
     window.urlPortal = undefined; // clear the URL parameter so it's not matched again
   }
@@ -405,26 +406,28 @@ window.Render.prototype.createPortalEntity = function (ent, details) {
 
     marker.updateDetails(data);
 
-    window.runHooks('portalAdded', {portal: marker, previousData: previousData});
+    window.runHooks('portalAdded', { portal: marker, previousData: previousData });
   } else {
-    marker = createMarker(latlng, data);
+    marker = window.createMarker(latlng, data);
 
     // in case of incomplete data while having fresh details in cache, update the portal with those details
-    if (portalDetail.isFresh(guid)) {
-      var oldDetails = portalDetail.get(guid);
+    if (window.portalDetail.isFresh(guid)) {
+      var oldDetails = window.portalDetail.get(guid);
       if (data.timestamp > oldDetails.timestamp) {
         // data is more recent than the cached details so we remove them from the cache
-        portalDetail.remove(guid);
-      } else if (marker.willUpdate(oldDetails))
+        window.portalDetail.remove(guid);
+      } else if (marker.willUpdate(oldDetails)) {
         marker.updateDetails(oldDetails);
+      }
     }
 
     window.runHooks('portalAdded', { portal: marker });
 
     window.portals[data.guid] = marker;
 
-    if (selectedPortal === data.guid)
+    if (window.selectedPortal === data.guid) {
       marker.renderDetails();
+    }
   }
 
   window.ornaments.addPortal(marker);
diff --git a/core/code/portal_detail.js b/core/code/portal_detail.js
index f9eabe80e..aa38386ef 100644
--- a/core/code/portal_detail.js
+++ b/core/code/portal_detail.js
@@ -54,7 +54,7 @@ window.portalDetail.isFresh = function (guid) {
   return cache.isFresh(guid);
 };
 
-window.portalDetail.remove = function(guid) {
+window.portalDetail.remove = function (guid) {
   return cache.remove(guid);
 };
 
diff --git a/core/code/portal_detail_display.js b/core/code/portal_detail_display.js
index ff1735709..9c2489b7e 100644
--- a/core/code/portal_detail_display.js
+++ b/core/code/portal_detail_display.js
@@ -69,10 +69,12 @@ window.renderPortalUrl = function (lat, lng, title, guid) {
  *
  * @function renderPortalDetails
  * @param {string|null} guid - The globally unique identifier of the portal to display details for.
+ * @param {boolean} [forceSelect=false] - If true, forces the portal to be selected even if it's already the current portal.
  */
-window.renderPortalDetails = function(guid, forceSelect) {
-  if (forceSelect || window.selectedPortal !== guid)
+window.renderPortalDetails = function (guid, forceSelect) {
+  if (forceSelect || window.selectedPortal !== guid) {
     window.selectPortal(window.portals[guid] ? guid : null, 'renderPortalDetails');
+  }
   if ($('#sidebar').is(':visible')) {
     window.resetScrollOnNewPortal();
     window.renderPortalDetails.lastVisible = guid;
@@ -184,7 +186,7 @@ window.renderPortalDetails = function(guid, forceSelect) {
   window.renderPortalUrl(lat, lng, title, guid);
 
   // compatibility
-  var data = hasFullDetails ? getPortalSummaryData(details) : details;
+  var data = hasFullDetails ? window.getPortalSummaryData(details) : details;
 
   // only run the hooks when we have a portalDetails object - most plugins rely on the extended data
   // TODO? another hook to call always, for any plugins that can work with less data?
@@ -348,11 +350,15 @@ window.selectPortal = function (guid, event) {
   if (!update && oldPortal) oldPortal.setSelected(false);
 
   // Change style of selected portal
-  if(newPortal) newPortal.setSelected(true);
+  if (newPortal) newPortal.setSelected(true);
 
   window.setPortalIndicators(newPortal);
 
-  window.runHooks('portalSelected', { selectedPortalGuid: guid, unselectedPortalGuid: oldPortalGuid, event: event });
+  window.runHooks('portalSelected', {
+    selectedPortalGuid: guid,
+    unselectedPortalGuid: oldPortalGuid,
+    event: event,
+  });
   return update;
 };
 
diff --git a/core/code/portal_info.js b/core/code/portal_info.js
index 436ee0665..9a210901f 100644
--- a/core/code/portal_info.js
+++ b/core/code/portal_info.js
@@ -59,12 +59,20 @@ window.getCurrentPortalEnergy = function (d) {
   return nrg;
 };
 
-window.getPortalHealth = function(d) {
-  var max = getTotalPortalEnergy(d);
-  var cur = getCurrentPortalEnergy(d);
+/**
+ * Calculates the health percentage of a portal based on its current and total energy.
+ *
+ * @function getPortalHealth
+ * @param {Object} d - The portal detail object containing resonator information.
+ * @returns {number} The portal health as a percentage (0-100).
+ *                   Returns 0 if the portal has no total energy.
+ */
+window.getPortalHealth = function (d) {
+  var max = window.getTotalPortalEnergy(d);
+  var cur = window.getCurrentPortalEnergy(d);
 
-  return max>0 ? Math.floor(cur/max*100) : 0;
-}
+  return max > 0 ? Math.floor((cur / max) * 100) : 0;
+};
 
 /**
  * Calculates the range of a portal for creating links. The range depends on portal level and any installed Link Amps.
@@ -75,7 +83,7 @@ window.getPortalHealth = function(d) {
  *                   total range after applying the boost (`range`),
  *                   and a boolean indicating if the portal is linkable (`isLinkable`).
  */
-window.getPortalRange = function(d) {
+window.getPortalRange = function (d) {
   // formula by the great gals and guys at
   // http://decodeingress.me/2012/11/18/ingress-portal-levels-and-link-range/
   var range = {
diff --git a/core/code/portal_marker.js b/core/code/portal_marker.js
index 59ade0bd5..e00bf597f 100644
--- a/core/code/portal_marker.js
+++ b/core/code/portal_marker.js
@@ -1,31 +1,25 @@
-/* global L -- eslint */
+/* global L, log -- eslint */
 
 /**
  * @file This file contains the code related to creating and updating portal markers on the map.
  * @module portal_marker
  */
 
-var portalBaseStyle = {
-  stroke: true,
-  opacity: 1,
-  fill: true,
-  fillOpacity: 0.5,
-  interactive: true,
-};
-
 // portal hooks
-function handler_portal_click (e) {
+function handler_portal_click(e) {
   window.selectPortal(e.target.options.guid, e.type);
-  window.renderPortalDetails(e.target.options.guid)
+  window.renderPortalDetails(e.target.options.guid);
 }
-function handler_portal_dblclick (e) {
+
+function handler_portal_dblclick(e) {
   window.selectPortal(e.target.options.guid, e.type);
-  window.renderPortalDetails(e.target.options.guid)
-  window.map.setView(e.target.getLatLng(), DEFAULT_ZOOM);
+  window.renderPortalDetails(e.target.options.guid);
+  window.map.setView(e.target.getLatLng(), window.DEFAULT_ZOOM);
 }
-function handler_portal_contextmenu (e) {
+
+function handler_portal_contextmenu(e) {
   window.selectPortal(e.target.options.guid, e.type);
-  window.renderPortalDetails(e.target.options.guid)
+  window.renderPortalDetails(e.target.options.guid);
   if (window.isSmartphone()) {
     window.show('info');
   } else if (!$('#scrollwrapper').is(':visible')) {
@@ -55,59 +49,65 @@ L.PortalMarker = L.CircleMarker.extend({
     LEVEL_TO_RADIUS: [7, 7, 7, 7, 8, 8, 9, 10, 11],
   },
 
-  initialize: function(latlng, data) {
+  initialize: function (latlng, data) {
     L.CircleMarker.prototype.initialize.call(this, latlng);
-    this._selected = data.guid === selectedPortal;
+    this._selected = data.guid === window.selectedPortal;
     this.updateDetails(data);
 
     this.on('click', handler_portal_click);
     this.on('dblclick', handler_portal_dblclick);
     this.on('contextmenu', handler_portal_contextmenu);
   },
+
   willUpdate: function (details) {
     // details are from a placeholder
     if (details.level === undefined) {
       // if team differs and corresponding link is more recent (ignore field)
-      if (this._details.timestamp < details.timestamp && this._details.team !== details.team)
-        return true;
-      // in any other case
-      return false;
+      return this._details.timestamp < details.timestamp && this._details.team !== details.team;
     }
     // more recent timestamp, this occurs when the data has changed because of:
     //  - resonator deploy/upgrade
     //  - mod deploy
     //  - recharge/damage/decay
     //  - portal edit (title, location, portal main picture)
-    if (this._details.timestamp < details.timestamp)
+    if (this._details.timestamp < details.timestamp) {
       return true;
+    }
     // current marker is a placeholder, and details is real data
-    if (this.isPlaceholder() && this._details.team === details.team)
+    if (this.isPlaceholder() && this._details.team === details.team) {
       return true;
+    }
     // even if we get history that was missing ? is it even possible ?
-    if (this._details.timestamp > details.timestamp)
+    if (this._details.timestamp > details.timestamp) {
       return false;
+    }
 
     // this._details.timestamp === details.timestamp
 
     // get new history
     if (details.history) {
-      if (!this._details.history)
+      if (!this._details.history) {
         return true;
-      if (this._details.history._raw !== details.history._raw)
+      }
+      if (this._details.history._raw !== details.history._raw) {
         return true;
+      }
     }
 
     // get details portal data
-    if (!this._details.mods && details.mods)
+    if (!this._details.mods && details.mods) {
       return true;
+    }
 
     return false;
   },
-  updateDetails: function(details) {
+
+  updateDetails: function (details) {
     if (this._details) {
       // portal has been moved
-      if (this._details.latE6 !== details.latE6 || this._details.lngE6 !== details.lngE6)
-        this.setLatLng(L.latLng(details.latE6/1E6, details.lngE6/1E6));
+      if (this._details.latE6 !== details.latE6 || this._details.lngE6 !== details.lngE6) {
+        this.setLatLng(L.latLng(details.latE6 / 1e6, details.lngE6 / 1e6));
+      }
 
       // core data from a placeholder
       if (details.level === undefined) {
@@ -119,18 +119,34 @@ L.PortalMarker = L.CircleMarker.extend({
           details.history = this._details.history;
           this._details = details;
         }
-      } else if (this._details.timestamp == details.timestamp) {
+      } else if (this._details.timestamp === details.timestamp) {
         // we got more details (core/summary -> summary/detailed/extended)
         var localThis = this;
-        ["level", "health", "resCount", "image", "title", "ornaments", "mission", "mission50plus", "artifactBrief", "mods", "resonators", "owner", "artifactDetail"].forEach(function (prop) {
+        [
+          'level',
+          'health',
+          'resCount',
+          'image',
+          'title',
+          'ornaments',
+          'mission',
+          'mission50plus',
+          'artifactBrief',
+          'mods',
+          'resonators',
+          'owner',
+          'artifactDetail',
+        ].forEach(function (prop) {
           if (details[prop]) localThis._details[prop] = details[prop];
         });
         // smarter update for history (cause it's missing sometimes)
         if (details.history) {
-          if (!this._details.history) this._details.history = details.history;
-          else {
-            if (this._details.history._raw & details.history._raw != this._details.history._raw)
-              log.warn("new portal data has lost some history");
+          if (!this._details.history) {
+            this._details.history = details.history;
+          } else {
+            if (this._details.history._raw && details.history._raw !== this._details.history._raw) {
+              log.warn('new portal data has lost some history');
+            }
             this._details.history._raw |= details.history._raw;
             ['visited', 'captured', 'scoutControlled'].forEach(function (prop) {
               localThis._details.history[prop] ||= details.history[prop];
@@ -141,17 +157,23 @@ L.PortalMarker = L.CircleMarker.extend({
         this._details.ent = details.ent;
       } else {
         // permanent data (history only)
-        if (!details.history) details.history = this._details.history;
+        if (!details.history) {
+          details.history = this._details.history;
+        }
 
         this._details = details;
       }
-    } else this._details = details;
+    } else {
+      this._details = details;
+    }
 
     this._level = parseInt(this._details.level) || 0;
     this._team = window.teamStringToId(this._details.team);
 
     // the data returns unclaimed portals as level 1 - but IITC wants them treated as level 0
-    if (this._team === TEAM_NONE) this._level = 0;
+    if (this._team === window.TEAM_NONE) {
+      this._level = 0;
+    }
 
     // compatibility
     var dataOptions = {
@@ -160,7 +182,7 @@ L.PortalMarker = L.CircleMarker.extend({
       team: this._team,
       ent: this._details.ent, // LEGACY - TO BE REMOVED AT SOME POINT! use .guid, .timestamp and .data instead
       timestamp: this._details.timestamp,
-      data: this._details
+      data: this._details,
     };
     L.setOptions(this, dataOptions);
 
@@ -170,60 +192,71 @@ L.PortalMarker = L.CircleMarker.extend({
 
     this.setSelected();
   },
+
   renderDetails() {
     if (!this._rendering) {
       this._rendering = true;
-      renderPortalDetails(this._details.guid);
+      window.renderPortalDetails(this._details.guid);
       this._rendering = false;
     }
   },
+
   getDetails: function () {
     return this._details;
   },
+
   isPlaceholder: function () {
     return this._details.level === undefined;
   },
+
   hasFullDetails: function () {
-    return !!this._details.mods
+    return !!this._details.mods;
   },
-  setStyle: function (style) { // stub for highlighters
+
+  setStyle: function (style) {
+    // stub for highlighters
     L.Util.setOptions(this, style);
     return this;
   },
+
   setMarkerStyle: function (style) {
     var styleOptions = L.Util.extend(this._style(), style);
     L.Util.setOptions(this, styleOptions);
 
-    L.Util.setOptions(this, highlightPortal(this));
+    L.Util.setOptions(this, window.highlightPortal(this));
 
-    var selected = L.extend(
-      { radius: this.options.radius },
-      this._selected && { color: COLOR_SELECTED_PORTAL }
-    );
+    var selected = L.extend({ radius: this.options.radius }, this._selected && { color: window.COLOR_SELECTED_PORTAL });
     return L.CircleMarker.prototype.setStyle.call(this, selected);
   },
+
   setSelected: function (selected) {
-    if (selected === false)
+    if (selected === false) {
       this._selected = false;
-    else
+    } else {
       this._selected = this._selected || selected;
+    }
 
     this.setMarkerStyle();
 
-    if (this._selected && window.map.hasLayer(this))
+    if (this._selected && window.map.hasLayer(this)) {
       this.bringToFront();
+    }
   },
+
   _style: function () {
     var dashArray = null;
     // dashed outline for placeholder portals
-    if (this.isPlaceholder()) dashArray = L.PortalMarker.placeholderStyle.dashArray;
+    if (this.isPlaceholder()) {
+      dashArray = L.PortalMarker.placeholderStyle.dashArray;
+    }
 
     return L.extend(this._scale(), L.PortalMarker.portalBaseStyle, {
-      color: COLORS[this._team],
-      fillColor: COLORS[this._team],
-      dashArray: dashArray
+      color: window.COLORS[this._team],
+      fillColor: window.COLORS[this._team],
+      dashArray: dashArray,
     });
   },
+
   _scale: function () {
     var scale = window.portalMarkerScale();
 
@@ -262,22 +295,22 @@ window.portalMarkerScale = function () {
  * @function createMarker
  * @param {L.LatLng} latlng - The latitude and longitude where the marker will be placed.
  * @param {Object} data - The IITC-specific entity data to be stored in the marker options.
- * @returns {L.circleMarker} A Leaflet circle marker representing the portal.
+ * @returns {L.PortalMarker} A Leaflet circle marker representing the portal.
  */
-window.createMarker = function(latlng, data) {
+window.createMarker = function (latlng, data) {
   return new L.PortalMarker(latlng, data);
-}
+};
 
 /**
  * Sets the style of a portal marker, including options for when the portal is selected.
  *
  * @function setMarkerStyle
- * @param {L.circleMarker} marker - The portal marker whose style will be set.
+ * @param {L.PortalMarker} marker - The portal marker whose style will be set.
  * @param {boolean} selected - Indicates if the portal is selected.
  */
-window.setMarkerStyle = function(marker, selected) {
+window.setMarkerStyle = function (marker, selected) {
   marker.setSelected(selected);
-}
+};
 
 /**
  * Determines the style options for a portal marker based on its details.

From da84f53a01b1ab3f906b930745f454f1b3a4769f Mon Sep 17 00:00:00 2001
From: LeJeu <64744459+le-jeu@users.noreply.github.com>
Date: Tue, 19 Nov 2024 14:39:16 +0100
Subject: [PATCH 63/70] use new IITC.utils API

---
 core/code/portal_marker.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/code/portal_marker.js b/core/code/portal_marker.js
index e00bf597f..4a2abf4d9 100644
--- a/core/code/portal_marker.js
+++ b/core/code/portal_marker.js
@@ -1,4 +1,4 @@
-/* global L, log -- eslint */
+/* global IITC, L, log -- eslint */
 
 /**
  * @file This file contains the code related to creating and updating portal markers on the map.
@@ -168,7 +168,7 @@ L.PortalMarker = L.CircleMarker.extend({
     }
 
     this._level = parseInt(this._details.level) || 0;
-    this._team = window.teamStringToId(this._details.team);
+    this._team = IITC.utils.getTeamId(this._details.team);
 
     // the data returns unclaimed portals as level 1 - but IITC wants them treated as level 0
     if (this._team === window.TEAM_NONE) {

From 29feb50c0a50801f094aae3429670992d934cad0 Mon Sep 17 00:00:00 2001
From: Alexander Danilov <git@modos189.ru>
Date: Sat, 23 Nov 2024 17:45:53 +0500
Subject: [PATCH 64/70] Positioning Leaflet elements using CSS Grid

---
 core/smartphone.css            |  5 -----
 core/style.css                 | 29 +++++++++++++++++++++++++++++
 core/total-conversion-build.js |  4 ++--
 3 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/core/smartphone.css b/core/smartphone.css
index 3092b9ea4..7de1583a5 100644
--- a/core/smartphone.css
+++ b/core/smartphone.css
@@ -125,11 +125,6 @@ body {
   margin-left: 4px;
 }
 
-.leaflet-top .leaflet-control {
-  margin-top: 5px !important;
-  margin-left: 5px !important;
-}
-
 #searchwrapper .ui-accordion-header {
   padding: 0.3em 0;
 }
diff --git a/core/style.css b/core/style.css
index 77cbcf33a..d003674e8 100644
--- a/core/style.css
+++ b/core/style.css
@@ -161,6 +161,35 @@ a:hover {
   margin-left: 720px;
 }
 
+/* leaflet controls */
+.leaflet-left, .leaflet-right {
+  display: grid;
+  grid-gap: 10px;
+  justify-items: baseline;
+}
+
+.leaflet-right {
+  justify-items: end;
+}
+
+.leaflet-left .leaflet-control,
+.leaflet-right .leaflet-control {
+  margin: 0;
+}
+
+.leaflet-top {
+  top: 10px;
+}
+.leaflet-right {
+  right: 10px;
+}
+.leaflet-bottom {
+  bottom: 10px;
+}
+.leaflet-left {
+  left: 10px;
+}
+
 .help {
   cursor: help;
 }
diff --git a/core/total-conversion-build.js b/core/total-conversion-build.js
index 0473e7ddd..21276538c 100644
--- a/core/total-conversion-build.js
+++ b/core/total-conversion-build.js
@@ -143,13 +143,13 @@ document.head.innerHTML =
   '<title>Ingress Intel Map</title>' +
   '<link rel="shortcut icon" href="/img/favicon.ico" />' +
   '<style>' +
-  '@include_string:style.css@' +
+  '@include_css:external/jquery-ui-1.12.1-resizable.css@' +
   '</style>' +
   '<style>' +
   '@include_css:external/leaflet.css@' +
   '</style>' +
   '<style>' +
-  '@include_css:external/jquery-ui-1.12.1-resizable.css@' +
+  '@include_string:style.css@' +
   '</style>' +
   // note: smartphone.css injection moved into code/smartphone.js
   '<link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Roboto:100,100italic,300,300italic,400,400italic,500,500italic,700,700italic&subset=latin,cyrillic-ext,greek-ext,greek,vietnamese,latin-ext,cyrillic"/>';

From f352e42a9542c4dbb6ab0e7cb2501ddff8c53479 Mon Sep 17 00:00:00 2001
From: Alexander Danilov <git@modos189.ru>
Date: Sat, 23 Nov 2024 17:47:11 +0500
Subject: [PATCH 65/70] Fixing controls styles in CSS Grid view

---
 core/code/portal_highlighter.js |  4 +---
 core/style.css                  | 11 ++++++++---
 plugins/pan-control.css         | 17 +++++++++++++++++
 plugins/pan-control.js          | 23 ++---------------------
 plugins/zoom-slider.css         |  5 +++++
 plugins/zoom-slider.js          |  7 +------
 6 files changed, 34 insertions(+), 33 deletions(-)
 create mode 100644 plugins/pan-control.css
 create mode 100644 plugins/zoom-slider.css

diff --git a/core/code/portal_highlighter.js b/core/code/portal_highlighter.js
index a55b1b138..1b2b9c5d4 100644
--- a/core/code/portal_highlighter.js
+++ b/core/code/portal_highlighter.js
@@ -61,12 +61,10 @@ window.updatePortalHighlighterControl = function () {
 
   if (window._highlighters !== null) {
     if ($('#portal_highlight_select').length === 0) {
-      $('body').append("<select id='portal_highlight_select'></select>");
+      $('.leaflet-top.leaflet-left').first().append("<select id='portal_highlight_select' class='leaflet-control'></select>");
       $('#portal_highlight_select').change(function () {
         window.changePortalHighlights($(this).val());
       });
-      $('.leaflet-top.leaflet-left').css('padding-top', '20px');
-      $('.leaflet-control-scale-line').css('margin-top', '25px');
     }
     $('#portal_highlight_select').html('');
     $('#portal_highlight_select').append($('<option>').attr('value', window._no_highlighter).text(window._no_highlighter));
diff --git a/core/style.css b/core/style.css
index d003674e8..082774488 100644
--- a/core/style.css
+++ b/core/style.css
@@ -1250,16 +1250,21 @@ td + td {
 }
 
 #portal_highlight_select {
-  position: absolute;
-  top:5px;
-  left:10px;
   z-index: 2500;
   font-size:11px;
   background-color:#0E3C46;
   color:#ffce00;
+  order: -100;
+}
 
+.leaflet-control-scale {
+  order: -90;
 }
 
+.leaflet-bar {
+  border: 2px solid rgba(0, 0, 0, 0.2);
+  box-shadow: none;
+}
 
 
 .portal_details th, .portal_details td {
diff --git a/plugins/pan-control.css b/plugins/pan-control.css
new file mode 100644
index 000000000..702cddeac
--- /dev/null
+++ b/plugins/pan-control.css
@@ -0,0 +1,17 @@
+.leaflet-left.has-leaflet-pan-control .leaflet-bar {
+	left: 24.5px;
+}
+
+.leaflet-touch .leaflet-left.has-leaflet-pan-control .leaflet-bar {
+  left: 34px
+}
+
+.leaflet-control-pan {
+    order: -50;
+}
+
+.leaflet-control-pan div {
+  border: 2px solid rgba(0, 0, 0, 0.2);
+  box-shadow: none;
+  border-radius: 4px;
+}
diff --git a/plugins/pan-control.js b/plugins/pan-control.js
index 2ffb0681e..55b770f78 100644
--- a/plugins/pan-control.js
+++ b/plugins/pan-control.js
@@ -40,28 +40,8 @@ function setup() {
   if (!panControl.options.position) {
     // default: 'topleft'
     // to be above all controls
-    $('.leaflet-top.leaflet-left .leaflet-control').first().before(panControl.control.getContainer());
+    $('.leaflet-top.leaflet-left').first().append(panControl.control.getContainer());
   }
-
-  // L.Control.Pan.css tries to align zoom control with the pan control, but the result sucks
-  // so here is our attempt to make it better
-  // (adapted from https://github.com/kartena/Leaflet.Pancontrol/pull/20)
-  $('<style>')
-    .html(
-      '\
-    .leaflet-left.has-leaflet-pan-control .leaflet-control-zoom,\
-    .leaflet-left.has-leaflet-pan-control .leaflet-control-zoomslider { left: unset; }\
-    .leaflet-left.has-leaflet-pan-control .leaflet-control-scale { left: -24.5px; }\
-    .leaflet-left.has-leaflet-pan-control { left: 24.5px; }\
-    .leaflet-left .leaflet-control-pan { left: -24.5px; }\
-    .leaflet-control-pan { width: 75px; height: 75px; }\
-    .leaflet-touch .leaflet-left.has-leaflet-pan-control { left: 26px; }\
-    .leaflet-touch .leaflet-left .leaflet-control-pan { left: -26px; }\
-    .leaflet-touch .leaflet-control-pan { width: 86px; height: 114px; }\
-    .leaflet-touch .leaflet-left .leaflet-control-pan { margin-left: 10px; }\
-  '
-    )
-    .appendTo('head');
 }
 setup.priority = 'low';
 
@@ -71,6 +51,7 @@ function loadLeafletPancontrol() {
     // eslint-disable-next-line
     '@include_raw:external/L.Control.Pan.js@';
     $('<style>').html('@include_css:external/L.Control.Pan.css@').appendTo('head');
+    $('<style>').html('@include_css:pan-control.css@').appendTo('head');
   } catch (e) {
     console.error('L.Control.Pan.js loading failed');
     throw e;
diff --git a/plugins/zoom-slider.css b/plugins/zoom-slider.css
new file mode 100644
index 000000000..08f367372
--- /dev/null
+++ b/plugins/zoom-slider.css
@@ -0,0 +1,5 @@
+.leaflet-container .leaflet-control-zoomslider {
+    margin-left: 0;
+    margin-top: 0;
+    order: -40;
+}
diff --git a/plugins/zoom-slider.js b/plugins/zoom-slider.js
index a1572e51b..7a79846d3 100644
--- a/plugins/zoom-slider.js
+++ b/plugins/zoom-slider.js
@@ -42,12 +42,6 @@ function setup() {
     map.zoomControl.remove();
   }
   zoomSlider.control = L.control.zoomslider(zoomSlider.options).addTo(map);
-
-  // L.Control.Zoomslider.css defines non-standard border for `.leaflet-control-zoomslider`
-  // which makes zoomslider not aligning with other leaflet controls
-  // Here we are trying to unset it (make the same as general `.leaflet-control`)
-  // (adapted from https://github.com/kartena/Leaflet.zoomslider/pull/74)
-  $('<style>').html('.leaflet-touch .leaflet-control-zoomslider { border: 2px solid rgba(0,0,0,0.2) }').appendTo('head');
 }
 
 function loadLeafletZoomslider() {
@@ -56,6 +50,7 @@ function loadLeafletZoomslider() {
     // eslint-disable-next-line
     '@include_raw:external/L.Control.Zoomslider.js@';
     $('<style>').html('@include_string:external/L.Control.Zoomslider.css@').appendTo('head');
+    $('<style>').html('@include_string:zoom-slider.css@').appendTo('head');
   } catch (e) {
     console.error('L.Control.Zoomslider.js loading failed');
     throw e;

From d96295075f8377eb97364ae69ed50a482e31f814 Mon Sep 17 00:00:00 2001
From: Alexander Danilov <git@modos189.ru>
Date: Sat, 23 Nov 2024 20:49:55 +0500
Subject: [PATCH 66/70] GoogleMutant library update to v0.14.1

---
 core/external/Leaflet.GoogleMutant.js | 159 +++++++++++---------------
 1 file changed, 68 insertions(+), 91 deletions(-)

diff --git a/core/external/Leaflet.GoogleMutant.js b/core/external/Leaflet.GoogleMutant.js
index a6c86a20f..ac2acec77 100644
--- a/core/external/Leaflet.GoogleMutant.js
+++ b/core/external/Leaflet.GoogleMutant.js
@@ -376,17 +376,9 @@
 	// 🍂extends GridLayer
 	L.GridLayer.GoogleMutant = L.GridLayer.extend({
 		options: {
-			minZoom: 0,
 			maxZoom: 21, // can be 23, but ugly if more than maxNativeZoom
-			tileSize: 256,
-			subdomains: "abc",
-			errorTileUrl: "",
-			attribution: "", // The mutant container will add its own attribution anyways.
-			opacity: 1,
-			continuousWorld: false,
-			noWrap: false,
 			// 🍂option type: String = 'roadmap'
-			// Google's map type. Valid values are 'roadmap', 'satellite' or 'terrain'. 'hybrid' is not really supported.
+			// Google's map type. Valid values are 'roadmap', 'satellite', 'terrain' or 'hybrid'.
 			type: "roadmap",
 			maxNativeZoom: 21,
 		},
@@ -404,7 +396,7 @@
 		},
 
 		onAdd: function (map) {
-			var this$1 = this;
+			var this$1$1 = this;
 
 			L.GridLayer.prototype.onAdd.call(this, map);
 			this._initMutantContainer();
@@ -420,18 +412,18 @@
 			}
 
 			waitForAPI(function () {
-				if (!this$1._map) {
+				if (!this$1$1._map) {
 					return;
 				}
-				this$1._initMutant();
+				this$1$1._initMutant();
 
 				//handle layer being added to a map for which there are no Google tiles at the given zoom
-				google.maps.event.addListenerOnce(this$1._mutant, "idle", function () {
-					if (!this$1._map) {
+				google.maps.event.addListenerOnce(this$1$1._mutant, "idle", function () {
+					if (!this$1$1._map) {
 						return;
 					}
-					this$1._checkZoomLevels();
-					this$1._mutantIsReady = true;
+					this$1$1._checkZoomLevels();
+					this$1$1._mutantIsReady = true;
 				});
 			});
 		},
@@ -457,14 +449,14 @@
 		// currently following values supported: 'TrafficLayer', 'TransitLayer', 'BicyclingLayer'.
 		// `options`: see https://developers.google.com/maps/documentation/javascript/reference/map
 		addGoogleLayer: function (googleLayerName, options) {
-			var this$1 = this;
+			var this$1$1 = this;
 
 			if (!this._subLayers) { this._subLayers = {}; }
 			this.whenReady(function () {
 				var Constructor = google.maps[googleLayerName];
 				var googleLayer = new Constructor(options);
-				googleLayer.setMap(this$1._mutant);
-				this$1._subLayers[googleLayerName] = googleLayer;
+				googleLayer.setMap(this$1$1._mutant);
+				this$1$1._subLayers[googleLayerName] = googleLayer;
 			});
 			return this;
 		},
@@ -472,13 +464,13 @@
 		// 🍂method removeGoogleLayer(name: String): this
 		// Removes layer with the given name from the google Map instance.
 		removeGoogleLayer: function (googleLayerName) {
-			var this$1 = this;
+			var this$1$1 = this;
 
 			this.whenReady(function () {
-				var googleLayer = this$1._subLayers && this$1._subLayers[googleLayerName];
+				var googleLayer = this$1$1._subLayers && this$1$1._subLayers[googleLayerName];
 				if (googleLayer) {
 					googleLayer.setMap(null);
-					delete this$1._subLayers[googleLayerName];
+					delete this$1$1._subLayers[googleLayerName];
 				}
 			});
 			return this;
@@ -491,8 +483,8 @@
 					"leaflet-google-mutant leaflet-top leaflet-left"
 				);
 				this._mutantContainer.id = "_MutantContainer_" + L.Util.stamp(this._mutantContainer);
-				this._mutantContainer.style.zIndex = 800; //leaflet map pane at 400, controls at 1000
 				this._mutantContainer.style.pointerEvents = "none";
+				this._mutantContainer.style.visibility = "hidden";
 
 				L.DomEvent.off(this._mutantContainer);
 			}
@@ -514,13 +506,11 @@
 		},
 
 		_initMutant: function () {
-			var this$1 = this;
-
 			if (this._mutant) {
 				return;
 			}
 
-			var map = new google.maps.Map(this._mutantContainer, {
+			var options = {
 				center: { lat: 0, lng: 0 },
 				zoom: 0,
 				tilt: 0,
@@ -530,25 +520,24 @@
 				draggable: false,
 				disableDoubleClickZoom: true,
 				scrollwheel: false,
-				streetViewControl: false,
-				styles: this.options.styles || {},
+				styles: this.options.styles || [],
 				backgroundColor: "transparent",
-			});
+			};
+			if (this.options.mapId != null) {
+				options.mapId = this.options.mapId;
+			}
+			var map = new google.maps.Map(this._mutantContainer, options);
 
 			this._mutant = map;
 
-			google.maps.event.addListenerOnce(map, "idle", function () {
-				var nodes = this$1._mutantContainer.querySelectorAll("a");
-				for (var i = 0; i < nodes.length; ++i) {
-					nodes[i].style.pointerEvents = "auto";
-				}
-			});
-
 			this._update();
 
 			// 🍂event spawned
 			// Fired when the mutant has been created.
 			this.fire("spawned", { mapObject: map });
+
+			this._waitControls();
+			this.once('controls_ready', this._setupAttribution);
 		},
 
 		_attachObserver: function _attachObserver(node) {
@@ -562,6 +551,46 @@
 			Array.prototype.forEach.call(node.querySelectorAll("img"), this._boundOnMutatedImage);
 		},
 
+		_waitControls: function () {
+			var this$1$1 = this;
+
+			var id = setInterval(function () {
+				var layoutManager = this$1$1._mutant.__gm.layoutManager;
+				if (!layoutManager) { return; }
+				clearInterval(id);
+				var positions;
+				// iterate through obfuscated key names to find positions set (atm: layoutManager.o)
+				Object.keys(layoutManager).forEach(function(key) {
+					var el = layoutManager[key];
+					if (el.get) {
+						if (el.get(1) instanceof Node) {
+							positions = el;
+						}
+					}
+				});
+				// 🍂event controls_ready
+				// Fired when controls positions get available (passed in `positions` property).
+				this$1$1.fire("controls_ready", { positions: positions });
+			}, 50);
+		},
+
+		_setupAttribution: function (ev) {
+			if (!this._map) {
+				return;
+			}
+			// https://developers.google.com/maps/documentation/javascript/reference/control#ControlPosition
+			var pos = google.maps.ControlPosition;
+			var ctr = this._attributionContainer = ev.positions.get(pos.BOTTOM_RIGHT);
+			L.DomUtil.addClass(ctr, "leaflet-control leaflet-control-attribution");
+			L.DomEvent.disableClickPropagation(ctr);
+			ctr.style.height = "14px";
+			this._map._controlCorners.bottomright.appendChild(ctr);
+
+			this._logoContainer = ev.positions.get(pos.BOTTOM_LEFT);
+			this._logoContainer.style.pointerEvents = "auto";
+			this._map._controlCorners.bottomleft.appendChild(this._logoContainer);
+		},
+
 		_onMutations: function _onMutations(mutations) {
 			for (var i = 0; i < mutations.length; ++i) {
 				var mutation = mutations[i];
@@ -575,51 +604,6 @@
 							node.querySelectorAll("img"),
 							this._boundOnMutatedImage
 						);
-
-						// Check for, and remove, the "Google Maps can't load correctly" div.
-						// You *are* loading correctly, you dumbwit.
-						if (node.style.backgroundColor === "white") {
-							L.DomUtil.remove(node);
-						}
-
-						// Check for, and remove, the "For development purposes only" divs on the aerial/hybrid tiles.
-						if (node.textContent.indexOf("For development purposes only") === 0) {
-							L.DomUtil.remove(node);
-						}
-
-						// Check for, and remove, the "Sorry, we have no imagery here"
-						// empty <div>s. The [style*="text-align: center"] selector
-						// avoids matching the attribution notice.
-						// This empty div doesn't have a reference to the tile
-						// coordinates, so it's not possible to mark the tile as
-						// failed.
-						Array.prototype.forEach.call(
-							node.querySelectorAll('div[draggable=false][style*="text-align: center"]'),
-							L.DomUtil.remove
-						);
-
-						// Move Google attributions to leaflet's bottom-right control container
-						if (
-							node.querySelectorAll(".gmnoprint").length > 0 ||
-							node.querySelectorAll('a[title="Click to see this area on Google Maps"]')
-								.length > 0
-						) {
-							var ctr = (this._attributionContainer = L.DomUtil.create(
-								"div",
-								"leaflet-control leaflet-control-attribution"
-							));
-							L.DomEvent.disableClickPropagation(ctr);
-							ctr.style.height = "14px";
-							ctr.style.background = "none";
-							this._map._controlCorners.bottomright.appendChild(ctr);
-							ctr.appendChild(node);
-						}
-
-						// Move Google logo to leaflet's bottom-left control container
-						if (node.style.zIndex == 1000000) {
-							this._map._controlCorners.bottomleft.appendChild(node);
-							this._logoContainer = node;
-						}
 					}
 				}
 			}
@@ -628,14 +612,10 @@
 		// Only images which 'src' attrib match this will be considered for moving around.
 		// Looks like some kind of string-based protobuf, maybe??
 		// Only the roads (and terrain, and vector-based stuff) match this pattern
-		_roadRegexp: /!1i(\d+)!2i(\d+)!3i(\d+)!/,
+		_roadRegexp: /!1i(\d+)!2i(\d+)!3i(\d+|VinaFnapurmBegrtn)!/,
 
 		// On the other hand, raster imagery matches this other pattern
-		_satRegexp: /x=(\d+)&y=(\d+)&z=(\d+)/,
-
-		// On small viewports, when zooming in/out, a static image is requested
-		// This will not be moved around, just removed from the DOM.
-		_staticRegExp: /StaticMapService\.GetMapImage/,
+		_satRegexp: /x=(\d+)&y=(\d+)&z=(\d+|VinaFnapurmBegrtn)/,
 
 		_onMutatedImage: function _onMutatedImage(imgNode) {
 			var coords;
@@ -668,7 +648,6 @@
 			if (coords) {
 				var tileKey = this._tileCoordsToKey(coords);
 				imgNode.style.position = "absolute";
-				imgNode.style.visibility = "hidden";
 
 				var key = tileKey + "/" + sublayer;
 				// Cache img so it can also be used in subsequent tile requests
@@ -679,8 +658,6 @@
 					this._tileCallbacks[key].forEach(function (callback) { return callback(imgNode); });
 					delete this._tileCallbacks[key];
 				}
-			} else if (imgNode.src.match(this._staticRegExp)) {
-				imgNode.style.visibility = "hidden";
 			}
 		},
 
@@ -793,5 +770,5 @@
 		return new L.GridLayer.GoogleMutant(options);
 	};
 
-}());
+})();
 //# sourceMappingURL=Leaflet.GoogleMutant.js.map

From a7b724434387ceb46c800f8cb9ea687362da5287 Mon Sep 17 00:00:00 2001
From: Alexander Danilov <git@modos189.ru>
Date: Sat, 23 Nov 2024 20:55:02 +0500
Subject: [PATCH 67/70] Use Leaflet's native attribution control for Google
 Maps layer

---
 core/code/map.js | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/core/code/map.js b/core/code/map.js
index a18443d76..c79baef8a 100644
--- a/core/code/map.js
+++ b/core/code/map.js
@@ -316,6 +316,32 @@ window.setupMap = function () {
 
   map.attributionControl.setPrefix('');
 
+  /**
+   * Override default Google Maps attribution to use Leaflet's native attribution control
+   * instead of creating separate DOM elements. Extracts text content from Google's
+   * attribution container and adds it to Leaflet's control.
+   */
+  L.GridLayer.GoogleMutant.prototype._setupAttribution = function (ev) {
+    if (!this._map?.attributionControl) {
+      return;
+    }
+    // eslint-disable-next-line
+    const pos = google.maps.ControlPosition;
+    const container = ev.positions.get(pos.BOTTOM_RIGHT);
+    const attribution = container?.querySelector('span')?.textContent;
+    if (attribution) {
+      this._attributionText = attribution; // Сохраняем текст атрибуции
+      this._map.attributionControl.addAttribution(attribution);
+    }
+  };
+  const originalGoogleMutantOnRemove = L.GridLayer.GoogleMutant.prototype.onRemove;
+  L.GridLayer.GoogleMutant.prototype.onRemove = function (map) {
+    originalGoogleMutantOnRemove.call(this, map);
+    if (this._attributionText && map.attributionControl) {
+      map.attributionControl.removeAttribution(this._attributionText);
+    }
+  };
+
   window.map = map;
 
   map.on('moveend', function () {

From 9d4c2122238cc3a5e91e6a5e00a586c714a9f6e9 Mon Sep 17 00:00:00 2001
From: Alexander Danilov <git@modos189.ru>
Date: Sat, 23 Nov 2024 21:22:17 +0500
Subject: [PATCH 68/70] Always position scale bar in bottom right corner

---
 plugins/scale-bar.js | 34 ++++++++++++----------------------
 1 file changed, 12 insertions(+), 22 deletions(-)

diff --git a/plugins/scale-bar.js b/plugins/scale-bar.js
index 269adb470..e67f5c51d 100644
--- a/plugins/scale-bar.js
+++ b/plugins/scale-bar.js
@@ -29,30 +29,20 @@ window.plugin.scaleBar = scaleBar;
 // Before you ask: yes, I explicitely turned off imperial units. Imperial units
 // are worse than Internet Explorer 6 whirring fans combined. Upgrade to the metric
 // system already.
-scaleBar.options = { imperial: false };
-
-scaleBar.mobileOptions = { position: 'bottomright', maxWidth: 100 };
-
-scaleBar.desktopOptions = { position: 'topleft', maxWidth: 200 };
-
-function moveToEdge(ctrl) {
-  var $el = $(ctrl.getContainer());
-  var $corner = $el.parent();
-  var pos = ctrl.getPosition();
-  if (pos.indexOf('top') !== -1) {
-    $corner.prepend($el);
-  } else if (pos.indexOf('bottom') !== -1) {
-    $corner.append($el);
-    $corner.find('.leaflet-control-attribution').appendTo($corner); // make sure that attribution control is on very bottom
-  }
-}
+scaleBar.options = {
+  imperial: false,
+  position: 'bottomright',
+};
 
 function setup() {
-  var options = L.extend({}, window.isSmartphone() ? scaleBar.mobileOptions : scaleBar.desktopOptions, scaleBar.options);
+  var options = L.extend(
+    {},
+    {
+      maxWidth: window.isSmartphone() ? 100 : 200,
+    },
+    scaleBar.options
+  );
+
   scaleBar.control = L.control.scale(options).addTo(window.map);
-  // wait other controls to initialize (should be initialized last)
-  setTimeout(function () {
-    moveToEdge(scaleBar.control);
-  });
 }
 setup.priority = 'low';

From 49856e28c51f2fd3ec19cdf97291753526717539 Mon Sep 17 00:00:00 2001
From: Sandro Tosi <morph@debian.org>
Date: Mon, 25 Nov 2024 02:55:36 -0500
Subject: [PATCH 69/70] feat: layers: add a 20m range around portals, to aid
 Wayfarer submissions

Currently submitting a new portals that's closer than 20 meters to an existing
one, will not make it appear on the map even if accepted.

In order to facilitate the submission of new portals, let's draw a 20m range
around portals, making the un-shaded area available for new submissions.
---
 plugins/wayfarer-range.js | 88 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 88 insertions(+)
 create mode 100644 plugins/wayfarer-range.js

diff --git a/plugins/wayfarer-range.js b/plugins/wayfarer-range.js
new file mode 100644
index 000000000..2c6c1fa0a
--- /dev/null
+++ b/plugins/wayfarer-range.js
@@ -0,0 +1,88 @@
+// @author         morph
+// @name           Wayfarer portal submission range
+// @category       Layer
+// @version        0.1.0
+// @description    Add a 20m range around portals, to aid Wayfarer portals submissions
+
+/* exported setup, changelog --eslint */
+/* global L -- eslint */
+
+var changelog = [
+  {
+    version: '0.1.0',
+    changes: ['Initial release (code heavily based on zaprange)'],
+  },
+];
+
+// use own namespace for plugin
+window.plugin.wayfarerrange = function () {};
+window.plugin.wayfarerrange.wayfarerLayers = {};
+window.plugin.wayfarerrange.MIN_MAP_ZOOM = 16;
+
+window.plugin.wayfarerrange.portalAdded = function (data) {
+  data.portal.on('add', function () {
+    window.plugin.wayfarerrange.draw(this.options.guid, this.options.team);
+  });
+
+  data.portal.on('remove', function () {
+    window.plugin.wayfarerrange.remove(this.options.guid, this.options.team);
+  });
+};
+
+window.plugin.wayfarerrange.remove = function (guid) {
+  var previousLayer = window.plugin.wayfarerrange.wayfarerLayers[guid];
+  if (previousLayer) {
+    window.plugin.wayfarerrange.wayfarerCircleHolderGroup.removeLayer(previousLayer);
+    delete window.plugin.wayfarerrange.wayfarerLayers[guid];
+  }
+};
+
+window.plugin.wayfarerrange.draw = function (guid) {
+  var d = window.portals[guid];
+
+  var coo = d._latlng;
+  var latlng = new L.LatLng(coo.lat, coo.lng);
+  // https://leafletjs.com/reference.html#circle
+  var optCircle = { color: 'orange', opacity: 0.7, fillColor: 'orange', fillOpacity: 0.4, weight: 1, interactive: false, dashArray: [10, 6] };
+  // submitting a portal closer than 20m to another one, wont make it appear on the map
+  var range = 20;
+
+  var circle = new L.Circle(latlng, range, optCircle);
+
+  circle.addTo(window.plugin.wayfarerrange.wayfarerCircleHolderGroup);
+  window.plugin.wayfarerrange.wayfarerLayers[guid] = circle;
+};
+
+window.plugin.wayfarerrange.showOrHide = function () {
+  if (window.map.getZoom() >= window.plugin.wayfarerrange.MIN_MAP_ZOOM) {
+    // show the layer
+    if (!window.plugin.wayfarerrange.wayfarerLayerHolderGroup.hasLayer(window.plugin.wayfarerrange.wayfarerCircleHolderGroup)) {
+      window.plugin.wayfarerrange.wayfarerLayerHolderGroup.addLayer(window.plugin.wayfarerrange.wayfarerCircleHolderGroup);
+      $('.leaflet-control-layers-list span:contains("Wayfarer Range")').parent('label').removeClass('disabled').attr('title', '');
+    }
+  } else {
+    // hide the layer
+    if (window.plugin.wayfarerrange.wayfarerLayerHolderGroup.hasLayer(window.plugin.wayfarerrange.wayfarerCircleHolderGroup)) {
+      window.plugin.wayfarerrange.wayfarerLayerHolderGroup.removeLayer(window.plugin.wayfarerrange.wayfarerCircleHolderGroup);
+      $('.leaflet-control-layers-list span:contains("Wayfarer Range")').parent('label').addClass('disabled').attr('title', 'Zoom in to show those.');
+    }
+  }
+};
+
+var setup = function () {
+  // this layer is added to the layer chooser, to be toggled on/off
+  window.plugin.wayfarerrange.wayfarerLayerHolderGroup = new L.LayerGroup();
+
+  // this layer is added into the above layer, and removed from it when we zoom out too far
+  window.plugin.wayfarerrange.wayfarerCircleHolderGroup = new L.LayerGroup();
+
+  window.plugin.wayfarerrange.wayfarerLayerHolderGroup.addLayer(window.plugin.wayfarerrange.wayfarerCircleHolderGroup);
+
+  window.layerChooser.addOverlay(window.plugin.wayfarerrange.wayfarerLayerHolderGroup, 'Wayfarer range');
+
+  window.addHook('portalAdded', window.plugin.wayfarerrange.portalAdded);
+
+  window.map.on('zoomend', window.plugin.wayfarerrange.showOrHide);
+
+  window.plugin.wayfarerrange.showOrHide();
+};

From 9e89dc0259b6ddb29b5ad3f7fd5e1d0eb9aedd7f Mon Sep 17 00:00:00 2001
From: Alexander Danilov <git@modos189.ru>
Date: Mon, 25 Nov 2024 16:52:40 +0500
Subject: [PATCH 70/70] Disabled closing the Info panel when closing the portal
 in the mobile version

---
 core/code/portal_detail_display.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/core/code/portal_detail_display.js b/core/code/portal_detail_display.js
index d58662943..e6b8aed3b 100644
--- a/core/code/portal_detail_display.js
+++ b/core/code/portal_detail_display.js
@@ -163,9 +163,6 @@ window.renderPortalDetails = function (guid) {
         .text('X')
         .click(function () {
           window.renderPortalDetails(null);
-          if (window.isSmartphone()) {
-            window.show('map');
-          }
         }),
 
       // help cursor via ".imgpreview img"