From 7fd88dd1e3968e03d91e23ecdef5688c81259d30 Mon Sep 17 00:00:00 2001
From: fkloft <felix.kloft+github@gmail.com>
Date: Thu, 12 Feb 2015 16:06:20 +0100
Subject: [PATCH 01/14] Revert "search: draw a marker highlighting search
 results (rectangle for region, 10px circle for point)"

This reverts commit 39e4608c4e1ce8f221af2c70da3d6396cc370262.
---
 code/geosearch.js | 73 +++++++++++++++++------------------------------
 1 file changed, 26 insertions(+), 47 deletions(-)

diff --git a/code/geosearch.js b/code/geosearch.js
index 27c8b124..14d9db50 100644
--- a/code/geosearch.js
+++ b/code/geosearch.js
@@ -4,7 +4,7 @@
 window.setupGeosearch = function() {
   $('#geosearch').keypress(function(e) {
     if((e.keyCode ? e.keyCode : e.which) != 13) return;
-
+    
     var search = $(this).val();
 
     if ( window.search(search) ) return;
@@ -15,57 +15,36 @@ window.setupGeosearch = function() {
     map.locate({setView : true, maxZoom: 13});
   });
   $('#geosearch').keyup(function(){$(this).removeClass('search_not_found')});
-
-  window.searchResultLayer = L.layerGroup();
-  map.addLayer(window.searchResultLayer);
 }
 
 window.search = function(search) {
-  window.searchResultLayer.clearLayers();
-
-  var searchMarkerOptions = {color:'red', weight:3, opacity: 0.5, fill:false, dashArray:"5,5", clickable:false};
-
-
-  if (!runHooks('geoSearch', search)) {
-    return true;
-  }
-
-  if(search.split(",").length == 2) {
-    var ll = search.split(",");
-    if(!isNaN(ll[0]) && !isNaN(ll[1])) {
-      ll = [parseFloat(ll[0]), parseFloat(ll[1])];
-      if(ll[0] >= -90 && ll[0] <= 90 && ll[1] >= -180 && ll[1] <= 180) {
-        var ll = L.latLng(ll);
-        window.map.setView(ll, 17);
-
-        window.searchResultLayer.clearLayers();
-        window.searchResultLayer.addLayer(L.circleMarker(ll,searchMarkerOptions));
-
-        if(window.isSmartphone()) window.show('map');
-        return true;
-      }
-    }
-  }
-
-  $.getJSON(NOMINATIM + encodeURIComponent(search), function(data) {
-    if(!data || !data[0]) {
-      $('#geosearch').addClass('search_not_found');
+    if (!runHooks('geoSearch', search)) {
       return true;
     }
-    var b = data[0].boundingbox;
-    if(!b) return true;
-    var southWest = new L.LatLng(b[0], b[2]),
-        northEast = new L.LatLng(b[1], b[3]),
-        bounds = new L.LatLngBounds(southWest, northEast);
-
-    window.searchResultLayer.clearLayers();
-    if (southWest.equals(northEast)) {
-        window.searchResultLayer.addLayer(L.circleMarker(southWest,searchMarkerOptions));
-    } else {
-      window.searchResultLayer.addLayer(L.rectangle(bounds,searchMarkerOptions));
+    
+    if(search.split(",").length == 2) {
+      var ll = search.split(",");
+      if(!isNaN(ll[0]) && !isNaN(ll[1])) {
+        ll = [parseFloat(ll[0]), parseFloat(ll[1])];
+        if(ll[0] >= -90 && ll[0] <= 90 && ll[1] >= -180 && ll[1] <= 180) {
+          window.map.setView(L.latLng(ll[0], ll[1]), 17);
+          if(window.isSmartphone()) window.show('map');
+          return true;
+        }
+      }
     }
 
-    window.map.fitBounds(bounds, {maxZoom: 17});
-    if(window.isSmartphone()) window.show('map');
-  });
+    $.getJSON(NOMINATIM + encodeURIComponent(search), function(data) {
+      if(!data || !data[0]) {
+        $('#geosearch').addClass('search_not_found');      
+        return true;
+      }
+      var b = data[0].boundingbox;
+      if(!b) return true;
+      var southWest = new L.LatLng(b[0], b[2]),
+          northEast = new L.LatLng(b[1], b[3]),
+          bounds = new L.LatLngBounds(southWest, northEast);
+      window.map.fitBounds(bounds, {maxZoom: 17});
+      if(window.isSmartphone()) window.show('map');
+    });
 }

From 4c7b8e0e70d84f1b3ebbacf37c2c4caafc7d7a7d Mon Sep 17 00:00:00 2001
From: fkloft <felix.kloft+github@gmail.com>
Date: Thu, 12 Feb 2015 14:37:49 +0100
Subject: [PATCH 02/14] new search

---
 code/boot.js      |   2 +-
 code/geosearch.js |  50 ---------
 code/hooks.js     |   2 +-
 code/search.js    | 267 ++++++++++++++++++++++++++++++++++++++++++++++
 main.js           |   8 +-
 style.css         |  54 +++++++---
 6 files changed, 312 insertions(+), 71 deletions(-)
 delete mode 100644 code/geosearch.js
 create mode 100644 code/search.js

diff --git a/code/boot.js b/code/boot.js
index 5b1e86ce..1f75b734 100644
--- a/code/boot.js
+++ b/code/boot.js
@@ -591,7 +591,7 @@ function boot() {
   window.setupDialogs();
   window.setupMap();
   window.setupOMS();
-  window.setupGeosearch();
+  window.search.setup();
   window.setupRedeem();
   window.setupLargeImagePreview();
   window.setupSidebarToggle();
diff --git a/code/geosearch.js b/code/geosearch.js
deleted file mode 100644
index 14d9db50..00000000
--- a/code/geosearch.js
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// GEOSEARCH /////////////////////////////////////////////////////////
-
-window.setupGeosearch = function() {
-  $('#geosearch').keypress(function(e) {
-    if((e.keyCode ? e.keyCode : e.which) != 13) return;
-    
-    var search = $(this).val();
-
-    if ( window.search(search) ) return;
-
-    e.preventDefault();
-  });
-  $('#geosearchwrapper img').click(function(){
-    map.locate({setView : true, maxZoom: 13});
-  });
-  $('#geosearch').keyup(function(){$(this).removeClass('search_not_found')});
-}
-
-window.search = function(search) {
-    if (!runHooks('geoSearch', search)) {
-      return true;
-    }
-    
-    if(search.split(",").length == 2) {
-      var ll = search.split(",");
-      if(!isNaN(ll[0]) && !isNaN(ll[1])) {
-        ll = [parseFloat(ll[0]), parseFloat(ll[1])];
-        if(ll[0] >= -90 && ll[0] <= 90 && ll[1] >= -180 && ll[1] <= 180) {
-          window.map.setView(L.latLng(ll[0], ll[1]), 17);
-          if(window.isSmartphone()) window.show('map');
-          return true;
-        }
-      }
-    }
-
-    $.getJSON(NOMINATIM + encodeURIComponent(search), function(data) {
-      if(!data || !data[0]) {
-        $('#geosearch').addClass('search_not_found');      
-        return true;
-      }
-      var b = data[0].boundingbox;
-      if(!b) return true;
-      var southWest = new L.LatLng(b[0], b[2]),
-          northEast = new L.LatLng(b[1], b[3]),
-          bounds = new L.LatLngBounds(southWest, northEast);
-      window.map.fitBounds(bounds, {maxZoom: 17});
-      if(window.isSmartphone()) window.show('map');
-    });
-}
diff --git a/code/hooks.js b/code/hooks.js
index 8f05e5ff..2fd82477 100644
--- a/code/hooks.js
+++ b/code/hooks.js
@@ -59,7 +59,7 @@ window.VALID_HOOKS = [
   'portalAdded', 'linkAdded', 'fieldAdded',
   'publicChatDataAvailable', 'factionChatDataAvailable',
   'requestFinished', 'nicknameClicked',
-  'geoSearch', 'iitcLoaded',
+  'geoSearch', 'search', 'iitcLoaded',
   'portalDetailLoaded', 'paneChanged'];
 
 window.runHooks = function(event, data) {
diff --git a/code/search.js b/code/search.js
new file mode 100644
index 00000000..77645994
--- /dev/null
+++ b/code/search.js
@@ -0,0 +1,267 @@
+
+// SEARCH /////////////////////////////////////////////////////////
+
+/*
+you can implement your own result provider by listing to the search hook:
+addHook('search', function(query) {});
+
+`query` is an object with the following members:
+- `term` is the term for which the user has searched
+- `confirmed` is a boolean indicating if the user has pressed enter after searching. You should not search online or 
+  heavy processing unless the user has confirmed the search term
+- `addResult(result)` can be called to add a result to the query.
+
+`result` may have the following members (`title` is required, as well as one of `position` and `bounds`):
+- `title`: the label for this result
+- `description`: secondary information for this result
+- `position`: a L.LatLng object describing the position of this result
+- `bounds`: a L.LatLngBounds object describing the bounds of this result
+- `layer`: a 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.
+- `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).
+*/
+
+window.search = {
+  lastSearch: null,
+};
+
+window.search.Query = function(term, confirmed) {
+  this.term = term;
+  this.confirmed = confirmed;
+  this.init();
+};
+window.search.Query.prototype.init = function() {
+  this.results = [];
+
+  this.container = $('<div>');
+
+  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('No results'));
+
+  this.container.accordion({
+    collapsible: true,
+    heightStyle: 'content',
+  });
+
+  runHooks('search', this);
+};
+window.search.Query.prototype.show = function() {
+  this.container.appendTo('#searchwrapper');
+};
+window.search.Query.prototype.hide = function() {
+  this.container.remove();
+  this.removeSelectedResult();
+};
+window.search.Query.prototype.addResult = function(result) {
+  if(this.results.length == 0) {
+    // remove 'No results'
+    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))
+    .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;
+      }
+    });
+
+  $('<a>')
+    .text(result.title)
+    .appendTo(item);
+
+  if(result.description) {
+    item
+      .append($('<br>'))
+      .append($('<em>')
+        .text(result.description));
+  }
+
+};
+window.search.Query.prototype.onResultSelected = function(result, ev) {
+  this.removeSelectedResult();
+  this.selectedResult = result;
+
+  if(result.onSelected) {
+    if(result.onSelected(result, ev)) return;
+  }
+
+  if(ev.type == 'dblclick') {
+    if(result.position) {
+      map.setView(result.position, 17);
+    } else if(result.bounds) {
+      map.fitBounds(result.bounds, {maxZoom: 17});
+    }
+  } else { // ev.type != 'dblclick'
+    if(result.bounds) {
+      map.fitBounds(result.bounds, {maxZoom: 17});
+    } else if(result.position) {
+      map.setView(result.position);
+    }
+  }
+
+  if(result.layer !== null && !result.layer) {
+    result.layer = L.layerGroup();
+
+    if(result.position) {
+      var markerTemplate = '@@INCLUDESTRING:images/marker-icon.svg.template@@';
+      L.marker(result.position, {
+        icon:  L.divIcon({
+          iconSize: new L.Point(25, 41),
+          iconAnchor: new L.Point(12, 41),
+          html: markerTemplate.replace(/%COLOR%/g, "red"),
+          className: 'leaflet-iitc-search-result-icon',
+        }),
+        title: result.title,
+      }).addTo(result.layer);
+    }
+
+    if(result.bounds) {
+      L.rectangle(result.bounds, {
+        title: result.title,
+        clickable: false,
+        color: 'red',
+        fill: false,
+      }).addTo(result.layer);
+    }
+  }
+
+  if(result.layer)
+    map.addLayer(result.layer);
+
+  if(window.isSmartphone()) window.show('map');
+}
+window.search.Query.prototype.removeSelectedResult = function() {
+  if(this.selectedResult) {
+    if(this.selectedResult.layer) map.removeLayer(this.selectedResult.layer);
+    if(this.selectedResult.onRemove) this.selectedResult.onRemove(this.selectedResult);
+  }
+}
+
+window.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;
+
+  // don't make the same query again
+  if(window.search.lastSearch
+  && window.search.lastSearch.confirmed == confirmed
+  && window.search.lastSearch.term == term)
+    return;
+
+  if(window.search.lastSearch) window.search.lastSearch.hide();
+
+  // clear results
+  if(term == "") return;
+
+  $("#search").tooltip().tooltip("close");
+
+  window.search.lastSearch = new window.search.Query(term, confirmed);
+  window.search.lastSearch.show();
+};
+
+window.search.setup = function() {
+  $('#search')
+    .keypress(function(e) {
+      if((e.keyCode ? e.keyCode : e.which) != 13) return;
+      e.preventDefault();
+
+      var term = $(this).val();
+
+      clearTimeout(window.search.timer);
+      window.search.doSearch(term, true);
+    })
+    .on('keyup keypress change paste', function(e) {
+      clearTimeout(window.search.timer);
+      window.search.timer = setTimeout(function() {
+        var term = $(this).val();
+        window.search.doSearch(term, false);
+      }.bind(this), 500);
+    });
+  $('#buttongeolocation').click(function(){
+    map.locate({setView : true, maxZoom: 13});
+  });
+};
+
+addHook('search', function(query) {
+  var term = query.term.toLowerCase();
+  $.each(portals, function(guid, portal) {
+    if(portal.options.data.title.toLowerCase().indexOf(term) !== -1) {
+      query.addResult({
+        title: portal.options.data.title,
+        position: portal.getLatLng(),
+      });
+    }
+  });
+});
+
+// TODO: recognize 50°31'03.8"N 7°59'05.3"E and similar formats
+addHook('search', function(query) {
+  if(query.term.split(",").length == 2) {
+    var ll = query.term.split(",");
+    if(!isNaN(ll[0]) && !isNaN(ll[1])) {
+      query.addResult({
+        title: query.term,
+        position: L.latLng(parseFloat(ll[0]), parseFloat(ll[1])),
+      });
+    }
+  }
+});
+
+addHook('search', function(query) {
+  if(!query.confirmed) return;
+
+  $.getJSON(NOMINATIM + encodeURIComponent(query.term), function(data) {
+    data.forEach(function(item) {
+      var result = {
+        title: item.display_name,
+        description: 'Type: ' + item.type,
+        position: L.latLng(parseFloat(item.lat), parseFloat(item.lon)),
+      };
+
+      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);
+    });
+  });
+});
+
diff --git a/main.js b/main.js
index c53691ea..94de6556 100644
--- a/main.js
+++ b/main.js
@@ -91,9 +91,9 @@ document.getElementsByTagName('body')[0].innerHTML = ''
   + '  <div id="sidebar" style="display: none">'
   + '    <div id="playerstat">t</div>'
   + '    <div id="gamestat">&nbsp;loading global control stats</div>'
-  + '    <div id="geosearchwrapper">'
-  + '      <input id="geosearch" placeholder="Search location…" type="text" accesskey="f" title="Search for a place [f]"/>'
-  + '      <img src="@@INCLUDEIMAGE:images/current-location.png@@"/ title="Current Location">'
+  + '    <div id="searchwrapper">'
+  + '      <img src="@@INCLUDEIMAGE:images/current-location.png@@"/ title="Current Location" id="buttongeolocation">'
+  + '      <input id="search" placeholder="Search location…" type="search" accesskey="f" title="Search for a place [f]"/>'
   + '    </div>'
   + '    <div id="portaldetails"></div>'
   + '    <input id="redeem" placeholder="Redeem code…" type="text"/>'
@@ -167,7 +167,7 @@ window.PORTAL_RADIUS_ENLARGE_MOBILE = 5;
 
 window.DEFAULT_PORTAL_IMG = '//commondatastorage.googleapis.com/ingress.com/img/default-portal-image.png';
 //window.NOMINATIM = '//nominatim.openstreetmap.org/search?format=json&limit=1&q=';
-window.NOMINATIM = '//open.mapquestapi.com/nominatim/v1/search.php?format=json&limit=1&q=';
+window.NOMINATIM = '//open.mapquestapi.com/nominatim/v1/search.php?format=json&q=';
 
 // INGRESS CONSTANTS /////////////////////////////////////////////////
 // http://decodeingress.me/2012/11/18/ingress-portal-levels-and-link-range/
diff --git a/style.css b/style.css
index caabdc09..25aa33ee 100644
--- a/style.css
+++ b/style.css
@@ -485,7 +485,7 @@ h2 sup, h2 sub {
 }
 
 
-/* geosearch input, and others */
+/* search input, and others */
 input:not([type]), .input,
 input[type="text"], input[type="password"],
 input[type="number"], input[type="email"],
@@ -502,23 +502,47 @@ input[type="search"], input[type="url"] {
   box-sizing: border-box;
 }
 
-#geosearch{
-  width:272px;
-  background-color: transparent;
+#searchwrapper {
+  position: relative;
 }
-#geosearchwrapper {
-  height:25px;  
-  background-color: rgba(0, 0, 0, 0.3);
+#search {
+  width: 100%;
+  padding-right: 24px;
 }
-#geosearchwrapper img{
-  vertical-align: bottom;
-  margin-bottom: 2px;
+#buttongeolocation {
+  position: absolute;
+  top: 2px;
+  right: 2px;
   cursor: pointer;
 }
-
-.search_not_found{
-  color:red;
-  font-style: italic;
+#searchwrapper h3 {
+  font-size: 1em;
+  height: auto;
+  cursor: pointer;
+}
+#searchwrapper .ui-accordion-header::before {
+  font-size: 18px;
+  margin-right: 2px;
+  font-weight: normal;
+  line-height: 1em;
+  content: "⊞";
+}
+#searchwrapper .ui-accordion-header-active::before {
+  content: "⊟";
+}
+#searchwrapper .ui-accordion-content {
+  margin: 0;
+  overflow: hidden;
+}
+#searchwrapper ul {
+  padding-left: 14px;
+}
+#searchwrapper li {
+  cursor: pointer;
+}
+#searchwrapper li em {
+  color: #ccc;
+  font-size: 0.9em;
 }
 
 ::-webkit-input-placeholder {
@@ -546,7 +570,7 @@ h3 {
   margin:0;
   height: 23px;
   width: 100%;
-  overflow:hidden;
+  overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
   -webkit-box-sizing: border-box;

From d98737b3bad46fc18e15de68dc07ab17a0d32e15 Mon Sep 17 00:00:00 2001
From: fkloft <felix.kloft+github@gmail.com>
Date: Thu, 12 Feb 2015 15:33:17 +0100
Subject: [PATCH 03/14] add icon to search results

---
 code/search.js         | 11 ++++++++++-
 images/icon-portal.svg |  7 +++++++
 style.css              |  6 ++++++
 3 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 images/icon-portal.svg

diff --git a/code/search.js b/code/search.js
index 77645994..1f9f4438 100644
--- a/code/search.js
+++ b/code/search.js
@@ -18,6 +18,7 @@ addHook('search', function(query) {});
 - `bounds`: a L.LatLngBounds object describing the bounds of this result
 - `layer`: a 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 a icon to display in the result list. Should be 12x12.
 - `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
@@ -93,10 +94,15 @@ window.search.Query.prototype.addResult = function(result) {
       }
     });
 
-  $('<a>')
+  var 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>'))
@@ -221,9 +227,12 @@ addHook('search', function(query) {
   var term = query.term.toLowerCase();
   $.each(portals, function(guid, portal) {
     if(portal.options.data.title.toLowerCase().indexOf(term) !== -1) {
+      var team = portal.options.team;
+      var color = team==TEAM_NONE ? '#CCC' : COLORS[team];
       query.addResult({
         title: portal.options.data.title,
         position: portal.getLatLng(),
+        icon: 'data:image/svg+xml;base64,'+btoa('@@INCLUDESTRING:images/icon-portal.svg@@'.replace(/%COLOR%/g, color)),
       });
     }
   });
diff --git a/images/icon-portal.svg b/images/icon-portal.svg
new file mode 100644
index 00000000..b9918282
--- /dev/null
+++ b/images/icon-portal.svg
@@ -0,0 +1,7 @@
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" width="12" height="12" version="1.1">
+	<g style="fill:%COLOR%;stroke:none">
+		<path d="m 6,12 -2,-12  4,0 z" />
+		<path d="m 6,12 -4, -8  8,0 z" />
+		<path d="m 6,12 -6, -4 12,0 z" />
+	</g>
+</svg>
diff --git a/style.css b/style.css
index 25aa33ee..6e6d1091 100644
--- a/style.css
+++ b/style.css
@@ -540,6 +540,12 @@ input[type="search"], input[type="url"] {
 #searchwrapper li {
   cursor: pointer;
 }
+#searchwrapper li a {
+  margin-left: -14px;
+  padding-left: 14px;
+  background-position: 1px center;
+  background-repeat: no-repeat;
+}
 #searchwrapper li em {
   color: #ccc;
   font-size: 0.9em;

From 5e22ea5b72adfee91992034dc6e25944b1a03005 Mon Sep 17 00:00:00 2001
From: fkloft <felix.kloft+github@gmail.com>
Date: Thu, 12 Feb 2015 15:33:52 +0100
Subject: [PATCH 04/14] fix speech-search

---
 plugins/speech-search.user.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/speech-search.user.js b/plugins/speech-search.user.js
index 5bb63e06..c2e8c0fe 100644
--- a/plugins/speech-search.user.js
+++ b/plugins/speech-search.user.js
@@ -22,10 +22,10 @@ window.plugin.speechSearch = function() {};
 
 window.plugin.speechSearch.setup = function() {
     // Give the search input the speech attribute
-    $("#geosearch").attr("x-webkit-speech", "");
+    $("#search").attr("x-webkit-speech", "");
     // Immediately search without further input
-    $("#geosearch").bind("webkitspeechchange", function() {
-        $("#geosearch").trigger($.Event("keypress", {keyCode: 13}));
+    $("#search").bind("webkitspeechchange", function() {
+        $("#search").trigger($.Event("keypress", {keyCode: 13}));
     });
 };
 

From 6ae79ca50b7fb2ec6fe473d75c54b38bea85ec46 Mon Sep 17 00:00:00 2001
From: fkloft <felix.kloft+github@gmail.com>
Date: Thu, 12 Feb 2015 15:50:53 +0100
Subject: [PATCH 05/14] set max-height for search results

---
 code/search.js | 2 +-
 style.css      | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/search.js b/code/search.js
index 1f9f4438..34862507 100644
--- a/code/search.js
+++ b/code/search.js
@@ -37,7 +37,7 @@ window.search.Query = function(term, confirmed) {
 window.search.Query.prototype.init = function() {
   this.results = [];
 
-  this.container = $('<div>');
+  this.container = $('<div>').addClass('searchquery');
 
   this.header = $('<h3>')
     .text(this.confirmed
diff --git a/style.css b/style.css
index 6e6d1091..c187dd5c 100644
--- a/style.css
+++ b/style.css
@@ -520,6 +520,10 @@ input[type="search"], input[type="url"] {
   height: auto;
   cursor: pointer;
 }
+.searchquery {
+  max-height: 25em;
+  overflow-y: auto;
+}
 #searchwrapper .ui-accordion-header::before {
   font-size: 18px;
   margin-right: 2px;

From 6b027d15fe01de3cdf08771ea54e9af9bbd789aa Mon Sep 17 00:00:00 2001
From: fkloft <felix.kloft+github@gmail.com>
Date: Thu, 12 Feb 2015 15:51:23 +0100
Subject: [PATCH 06/14] Small fix in search logic

---
 code/search.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/search.js b/code/search.js
index 34862507..ba17a11d 100644
--- a/code/search.js
+++ b/code/search.js
@@ -190,9 +190,10 @@ window.search.doSearch = function(term, confirmed) {
     return;
 
   if(window.search.lastSearch) window.search.lastSearch.hide();
+  window.search.lastSearch = null;
 
   // clear results
-  if(term == "") return;
+  if(term == '') return;
 
   $("#search").tooltip().tooltip("close");
 

From 46a1684549424f267406d974e90d24ee51066871 Mon Sep 17 00:00:00 2001
From: fkloft <felix.kloft+github@gmail.com>
Date: Thu, 12 Feb 2015 15:51:42 +0100
Subject: [PATCH 07/14] Search for portals: select portal on click

---
 code/search.js     | 9 +++++++++
 code/utils_misc.js | 3 +++
 2 files changed, 12 insertions(+)

diff --git a/code/search.js b/code/search.js
index ba17a11d..dcc2803d 100644
--- a/code/search.js
+++ b/code/search.js
@@ -234,6 +234,15 @@ addHook('search', function(query) {
         title: portal.options.data.title,
         position: portal.getLatLng(),
         icon: 'data:image/svg+xml;base64,'+btoa('@@INCLUDESTRING:images/icon-portal.svg@@'.replace(/%COLOR%/g, color)),
+        onSelected: function(result, event) {
+          if(event.type == 'dblclick')
+            zoomToAndShowPortal(guid, portal.getLatLng());
+          else if(window.portals[guid])
+            renderPortalDetails(guid);
+          else
+            window.selectPortalByLatLng(portal.getLatLng());
+          return true; // prevent default behavior
+        },
       });
     }
   });
diff --git a/code/utils_misc.js b/code/utils_misc.js
index 0b978d28..81e5e865 100644
--- a/code/utils_misc.js
+++ b/code/utils_misc.js
@@ -273,6 +273,9 @@ window.selectPortalByLatLng = function(lat, lng) {
   if(lng === undefined && lat instanceof Array) {
     lng = lat[1];
     lat = lat[0];
+  } else if(lng === undefined && lat instanceof L.LatLng) {
+    lng = lat.lng;
+    lat = lat.lat;
   }
   for(var guid in window.portals) {
     var latlng = window.portals[guid].getLatLng();

From 5c35cda7b44d6ee06bbfd6a0186964695e629af6 Mon Sep 17 00:00:00 2001
From: fkloft <felix.kloft+github@gmail.com>
Date: Thu, 12 Feb 2015 15:53:39 +0100
Subject: [PATCH 08/14] uniform strings

---
 code/search.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/code/search.js b/code/search.js
index dcc2803d..045962dc 100644
--- a/code/search.js
+++ b/code/search.js
@@ -43,7 +43,7 @@ window.search.Query.prototype.init = function() {
     .text(this.confirmed
       ? this.term
       : ((this.term.length > 16
-        ? this.term.substr(0,8) + "…" + this.term.substr(this.term.length-8,8)
+        ? this.term.substr(0,8) + '…' + this.term.substr(this.term.length-8,8)
         : this.term)
         + ' (Return to load more)'))
     .appendTo(this.container);
@@ -76,7 +76,7 @@ window.search.Query.prototype.addResult = function(result) {
   var item = $('<li>')
     .appendTo(this.list)
     .attr('tabindex', '0')
-    .on("click dblclick", function(ev) {
+    .on('click dblclick', function(ev) {
       this.onResultSelected(result, ev);
     }.bind(this))
     .keypress(function(ev) {
@@ -142,7 +142,7 @@ window.search.Query.prototype.onResultSelected = function(result, ev) {
         icon:  L.divIcon({
           iconSize: new L.Point(25, 41),
           iconAnchor: new L.Point(12, 41),
-          html: markerTemplate.replace(/%COLOR%/g, "red"),
+          html: markerTemplate.replace(/%COLOR%/g, 'red'),
           className: 'leaflet-iitc-search-result-icon',
         }),
         title: result.title,
@@ -195,7 +195,7 @@ window.search.doSearch = function(term, confirmed) {
   // clear results
   if(term == '') return;
 
-  $("#search").tooltip().tooltip("close");
+  $('#search').tooltip().tooltip('close');
 
   window.search.lastSearch = new window.search.Query(term, confirmed);
   window.search.lastSearch.show();
@@ -250,8 +250,8 @@ addHook('search', function(query) {
 
 // TODO: recognize 50°31'03.8"N 7°59'05.3"E and similar formats
 addHook('search', function(query) {
-  if(query.term.split(",").length == 2) {
-    var ll = query.term.split(",");
+  if(query.term.split(',').length == 2) {
+    var ll = query.term.split(',');
     if(!isNaN(ll[0]) && !isNaN(ll[1])) {
       query.addResult({
         title: query.term,

From 4dd877fdb84934824701108d81e84f4685bf29d2 Mon Sep 17 00:00:00 2001
From: fkloft <felix.kloft+github@gmail.com>
Date: Thu, 12 Feb 2015 16:30:57 +0100
Subject: [PATCH 09/14] [player-tracker] Use new search

---
 plugins/player-tracker.user.js | 45 ++++++++++++++++++++++++----------
 1 file changed, 32 insertions(+), 13 deletions(-)

diff --git a/plugins/player-tracker.user.js b/plugins/player-tracker.user.js
index 496b330a..0e3193c2 100644
--- a/plugins/player-tracker.user.js
+++ b/plugins/player-tracker.user.js
@@ -27,6 +27,8 @@ window.PLAYER_TRACKER_LINE_COLOUR = '#FF00FD';
 window.plugin.playerTracker = function() {};
 
 window.plugin.playerTracker.setup = function() {
+  $('<style>').prop('type', 'text/css').html('@@INCLUDESTRING:plugins/player-tracker.css@@').appendTo('head');
+
   var iconEnlImage = '@@INCLUDEIMAGE:images/marker-green.png@@';
   var iconEnlRetImage = '@@INCLUDEIMAGE:images/marker-green-2x.png@@';
   var iconResImage = '@@INCLUDEIMAGE:images/marker-blue.png@@';
@@ -511,7 +513,7 @@ window.plugin.playerTracker.centerMapOnUser = function(nick) {
     return false;
   }
   
-  if(window.isSmartphone()) window.smartphone.mapButton.click();
+  if(window.isSmartphone()) window.show('map');
   window.map.setView(position, map.getZoom());
 }
 
@@ -522,22 +524,39 @@ window.plugin.playerTracker.onNicknameClicked = function(info) {
   }
 }
 
-window.plugin.playerTracker.onGeoSearch = function(search) {
-  if (/^@/.test(search)) {
-    plugin.playerTracker.centerMapOnUser(search.replace(/^@/, ''));
-    return false;
-  }
+window.plugin.playerTracker.onSearchResultSelected = function(result, event) {
+  if(window.isSmartphone()) window.show('map');
+
+  // if the user moved since the search was started, check if we have a new set of data
+  if(false === window.plugin.playerTracker.centerMapOnUser(result.title))
+    map.setView(result.position);
+
+  if(event.type == 'dblclick')
+    map.setZoom(17);
+
+  return true;
+};
+
+window.plugin.playerTracker.onSearch = function(query) {
+  var term = query.term.toLowerCase();
+
+  $.each(plugin.playerTracker.stored, function(nick, data) {
+    if(nick.toLowerCase().indexOf(term) === -1) return;
+
+    var event = data.events[data.events.length - 1];
+
+    query.addResult({
+      title: nick,
+      description: data.team.substr(0,3) + ', last seen ' + unixTimeToDateTimeString(event.time),
+      position: plugin.playerTracker.getLatLngFromEvent(event),
+      onSelected: window.plugin.playerTracker.onSearchResultSelected,
+    });
+  });
 }
 
 window.plugin.playerTracker.setupUserSearch = function() {
-  $('<style>').prop('type', 'text/css').html('@@INCLUDESTRING:plugins/player-tracker.css@@').appendTo('head');
-
   addHook('nicknameClicked', window.plugin.playerTracker.onNicknameClicked);
-  addHook('geoSearch', window.plugin.playerTracker.onGeoSearch);
-  
-  var geoSearch = $('#geosearch');
-  var beforeEllipsis = /(.*)…/.exec(geoSearch.attr('placeholder'))[1];
-  geoSearch.attr('placeholder', beforeEllipsis + ' or @player…');
+  addHook('search', window.plugin.playerTracker.onSearch);
 }
 
 

From 754dfc61927f1815ef3da1e87c2de62c66d6b91b Mon Sep 17 00:00:00 2001
From: fkloft <felix.kloft+github@gmail.com>
Date: Thu, 12 Feb 2015 16:38:10 +0100
Subject: [PATCH 10/14] [player-tracker] open popup when clicking on a player

---
 plugins/player-tracker.user.js | 37 ++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/plugins/player-tracker.user.js b/plugins/player-tracker.user.js
index 0e3193c2..2dc04f71 100644
--- a/plugins/player-tracker.user.js
+++ b/plugins/player-tracker.user.js
@@ -409,6 +409,8 @@ window.plugin.playerTracker.drawData = function() {
       m.on('mouseout', function() { $(this._icon).tooltip('close'); });
     }
 
+    playerData.marker = m;
+
     m.addTo(playerData.team === 'RESISTANCE' ? plugin.playerTracker.drawnTracesRes : plugin.playerTracker.drawnTracesEnl);
     window.registerMarkerForOMS(m);
 
@@ -487,34 +489,39 @@ window.plugin.playerTracker.handleData = function(data) {
   plugin.playerTracker.drawData();
 }
 
-window.plugin.playerTracker.findUserPosition = function(nick) {
+window.plugin.playerTracker.findUser = function(nick) {
   nick = nick.toLowerCase();
-  var foundPlayerData = undefined;
+  var foundPlayerData = false;
   $.each(plugin.playerTracker.stored, function(plrname, playerData) {
     if (playerData.nick.toLowerCase() === nick) {
       foundPlayerData = playerData;
       return false;
     }
   });
-  
-  if (!foundPlayerData) {
-    return false;
-  }
-  
-  var evtsLength = foundPlayerData.events.length;
-  var last = foundPlayerData.events[evtsLength-1];
+  return foundPlayerData;
+}
+
+window.plugin.playerTracker.findUserPosition = function(nick) {
+  var data = window.plugin.playerTracker.findUser(nick);
+  if (!data) return false;
+
+  var last = data.events[data.events.length - 1];
   return plugin.playerTracker.getLatLngFromEvent(last);
 }
 
 window.plugin.playerTracker.centerMapOnUser = function(nick) {
-  var position = plugin.playerTracker.findUserPosition(nick);
-  
-  if (position === false) {
-    return false;
-  }
-  
+  var data = plugin.playerTracker.findUser(nick);
+  if(!data) return false;
+
+  var last = data.events[data.events.length - 1];
+  var position = plugin.playerTracker.getLatLngFromEvent(last);
+
   if(window.isSmartphone()) window.show('map');
   window.map.setView(position, map.getZoom());
+
+  if(data.marker) {
+    window.plugin.playerTracker.onClickListener({target: data.marker});
+  }
 }
 
 window.plugin.playerTracker.onNicknameClicked = function(info) {

From 587242ff5e244918a8d20e20ee00b8a17610101d Mon Sep 17 00:00:00 2001
From: fkloft <felix.kloft+github@gmail.com>
Date: Thu, 12 Feb 2015 16:47:18 +0100
Subject: [PATCH 11/14] [iitcm] use new search

---
 mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
index 0d31eeb8..7ab609a4 100644
--- a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
+++ b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
@@ -276,7 +276,7 @@ public class IITC_Mobile extends Activity
             searchView.clearFocus();
 
             switchToPane(Pane.MAP);
-            mIitcWebView.loadUrl("javascript:search('" + query + "');");
+            mIitcWebView.loadUrl("javascript:if(window.search&&window.search.doSearch){window.search.doSearch('" + query + "',true);window.show('info')}");
             return;
         }
 

From a70bcc1df16d96a742677edddf77dbb21fd457ec Mon Sep 17 00:00:00 2001
From: fkloft <felix.kloft+github@gmail.com>
Date: Thu, 12 Feb 2015 17:11:51 +0100
Subject: [PATCH 12/14] search: add details for portals

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

diff --git a/code/search.js b/code/search.js
index 045962dc..1bf98fc1 100644
--- a/code/search.js
+++ b/code/search.js
@@ -226,12 +226,16 @@ window.search.setup = function() {
 
 addHook('search', function(query) {
   var term = query.term.toLowerCase();
+  var teams = ['NEU','RES','ENL'];
+
   $.each(portals, function(guid, portal) {
-    if(portal.options.data.title.toLowerCase().indexOf(term) !== -1) {
+    var data = portal.options.data;
+    if(data.title.toLowerCase().indexOf(term) !== -1) {
       var team = portal.options.team;
       var color = team==TEAM_NONE ? '#CCC' : COLORS[team];
       query.addResult({
-        title: portal.options.data.title,
+        title: data.title,
+        description: teams[team] + ', L' + data.level + ', ' + data.health + '%, ' + data.resCount + ' Resonators',
         position: portal.getLatLng(),
         icon: 'data:image/svg+xml;base64,'+btoa('@@INCLUDESTRING:images/icon-portal.svg@@'.replace(/%COLOR%/g, color)),
         onSelected: function(result, event) {

From 39253102600a5f4fae807340cbfff67ea0d7992f Mon Sep 17 00:00:00 2001
From: fkloft <felix.kloft+github@gmail.com>
Date: Thu, 12 Feb 2015 17:54:45 +0100
Subject: [PATCH 13/14] Highlight focused/hovered search result

---
 style.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/style.css b/style.css
index c187dd5c..a9fefa08 100644
--- a/style.css
+++ b/style.css
@@ -550,6 +550,9 @@ input[type="search"], input[type="url"] {
   background-position: 1px center;
   background-repeat: no-repeat;
 }
+#searchwrapper li:focus a, #searchwrapper li:hover a {
+  text-decoration: underline;
+}
 #searchwrapper li em {
   color: #ccc;
   font-size: 0.9em;

From b15f521bd04a2d9fd92e52f689861e9e4686512b Mon Sep 17 00:00:00 2001
From: fkloft <felix.kloft+github@gmail.com>
Date: Thu, 12 Feb 2015 17:55:29 +0100
Subject: [PATCH 14/14] [bookmarks-by-zaso] make bookmarks searchable

---
 {plugins => images}/bookmarks-img.png         | Bin
 images/icon-bookmark-map.png                  | Bin 0 -> 347 bytes
 images/icon-bookmark.png                      | Bin 0 -> 328 bytes
 ...ookmarks-css.css => bookmarks-by-zaso.css} |   2 +-
 plugins/bookmarks-by-zaso.user.js             |  52 +++++++++++++++++-
 5 files changed, 52 insertions(+), 2 deletions(-)
 rename {plugins => images}/bookmarks-img.png (100%)
 create mode 100644 images/icon-bookmark-map.png
 create mode 100644 images/icon-bookmark.png
 rename plugins/{bookmarks-css.css => bookmarks-by-zaso.css} (99%)

diff --git a/plugins/bookmarks-img.png b/images/bookmarks-img.png
similarity index 100%
rename from plugins/bookmarks-img.png
rename to images/bookmarks-img.png
diff --git a/images/icon-bookmark-map.png b/images/icon-bookmark-map.png
new file mode 100644
index 0000000000000000000000000000000000000000..b0151a7b1b425ee7c20cb4cebc1da170bb43f293
GIT binary patch
literal 347
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&kmSQK*5Dp-y;YjHK@;M7UB8!3Q
zuY)k7lg8`{prB-lYeY$Kep*R+Vo@qXd3m{BW?pu2a$-TMUVc&f>~}U&Kt(q^T^vI+
zCQiL*sMk^`!202SP2@u+F7^un5kE^#1a&fZI4urX6?1?wgl|C+C+pmE|2J<9$dGAh
zYLjjCeUrA|cSg#r%J*mYOz#Zx`sH4_VBKqp+20nc?|J>~?u#9nv(`jiUlROs2k$Hq
zlZ}cw$?^8jqIGxn%RUs~*7A1F5!3(mvB!OC@u?4oW=peFN!+z+c71rT>vg<$^v{<k
z8TFz+&3XBZ(^BI6hUxK#uC^%D`0(3quv5AFh>2OpU%bUKGu+&K?X!ueq~eZSES+-3
nr~YM-SJ{uB4_dx!e&yY_Ir5*G+OJnYKQef_`njxgN@xNAg&d2@

literal 0
HcmV?d00001

diff --git a/images/icon-bookmark.png b/images/icon-bookmark.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed32f5577320d743fd1b9f60901b8209a635cb15
GIT binary patch
literal 328
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&kmSQK*5Dp-y;YjHK@;M7UB8!3Q
zuY)k7lg8`{prB-lYeY$Kep*R+Vo@qXd3m{BW?pu2a$-TMUVc&f>~}U&Kt)GAT^vI+
zCa%4x>*vfU!15qJ-suvzf`A8)Xzt`i4I=Iq3|!3)i*_)uuXx265Yr?OknnRO3yU0U
zo4^CzCbch5Z9Qfi<dvsQntAtx&*lXgckUfIkh{hw-=qCfov`RukMNDl3L4FIUOf%I
zTOd38ke=9vo}Y&Q``qtn_mq74VtuK*n1xL^X~yA61<N15S$^29u3|&;<2F0zyEY1^
zvtGXaBjWc;cduXHRqd%^#}|3aEOhx@?wsKny=&*X>D64dHsLD&Kfkp9z#8$!ymSel
RxeL%k44$rjF6*2Ung9;<d>#M*

literal 0
HcmV?d00001

diff --git a/plugins/bookmarks-css.css b/plugins/bookmarks-by-zaso.css
similarity index 99%
rename from plugins/bookmarks-css.css
rename to plugins/bookmarks-by-zaso.css
index caf8d354..fdb2e5f3 100644
--- a/plugins/bookmarks-css.css
+++ b/plugins/bookmarks-by-zaso.css
@@ -283,7 +283,7 @@
 	cursor:pointer;
 }
 #bkmrksTrigger, .bkmrksStar span, .portal-list-bookmark span {
-	background-image:url(@@INCLUDEIMAGE:plugins/bookmarks-img.png@@);
+	background-image:url(@@INCLUDEIMAGE:images/bookmarks-img.png@@);
 }
 .bkmrksStar span{
 	display:inline-block;
diff --git a/plugins/bookmarks-by-zaso.user.js b/plugins/bookmarks-by-zaso.user.js
index dfb7f098..930a96fc 100644
--- a/plugins/bookmarks-by-zaso.user.js
+++ b/plugins/bookmarks-by-zaso.user.js
@@ -479,6 +479,55 @@
     console.log('Move Bookmarks '+type+' ID:'+idBkmrk+' from folder ID:'+oldFold+' to folder ID:'+newFold);
   }
 
+  window.plugin.bookmarks.onSearch = function(query) {
+    var term = query.term.toLowerCase();
+
+    $.each(plugin.bookmarks.bkmrksObj.maps, function(id, folder) {
+      $.each(folder.bkmrk, function(id, bookmark) {
+        if(bookmark.label.toLowerCase().indexOf(term) === -1) return;
+
+        query.addResult({
+          title: bookmark.label,
+          description: 'Map in folder "' + folder.label + '"',
+          icon: '@@INCLUDEIMAGE:images/icon-bookmark-map.png@@',
+          position: L.latLng(bookmark.latlng.split(",")),
+          zoom: bookmark.z,
+          onSelected: window.plugin.bookmarks.onSearchResultSelected,
+        });
+      });
+    });
+
+    $.each(plugin.bookmarks.bkmrksObj.portals, function(id, folder) {
+      $.each(folder.bkmrk, function(id, bookmark) {
+        if(bookmark.label.toLowerCase().indexOf(term) === -1) return;
+
+        query.addResult({
+          title: bookmark.label,
+          description: 'Bookmark in folder "' + folder.label + '"',
+          icon: '@@INCLUDEIMAGE:images/icon-bookmark.png@@',
+          position: L.latLng(bookmark.latlng.split(",")),
+          guid: bookmark.guid,
+          onSelected: window.plugin.bookmarks.onSearchResultSelected,
+        });
+      });
+    });
+  };
+
+  window.plugin.bookmarks.onSearchResultSelected = function(result, event) {
+    if(result.guid) { // portal
+      var guid = result.guid;
+      if(event.type == 'dblclick')
+        zoomToAndShowPortal(guid, result.position);
+      else if(window.portals[guid])
+        renderPortalDetails(guid);
+      else
+        window.selectPortalByLatLng(result.position);
+    } else if(result.zoom) { // map
+      map.setView(result.position, result.zoom);
+    }
+    return true; // prevent default behavior
+  };
+
 /***************************************************************************************************************************************************************/
 
   // Saved the new sort of the folders (in the localStorage)
@@ -1060,7 +1109,7 @@
 /***************************************************************************************************************************************************************/
 
   window.plugin.bookmarks.setupCSS = function() {
-    $('<style>').prop('type', 'text/css').html('@@INCLUDESTRING:plugins/bookmarks-css.css@@').appendTo('head');
+    $('<style>').prop('type', 'text/css').html('@@INCLUDESTRING:plugins/bookmarks-by-zaso.css@@').appendTo('head');
   }
 
   window.plugin.bookmarks.setupPortalsList = function() {
@@ -1219,6 +1268,7 @@
     if(window.plugin.bookmarks.statusBox['page'] === 1) { $('#bookmarksBox h5.bkmrk_portals').trigger('click'); }
 
     window.addHook('portalSelected', window.plugin.bookmarks.onPortalSelected);
+    window.addHook('search', window.plugin.bookmarks.onSearch);
 
     // Sync
     window.addHook('pluginBkmrksEdit', window.plugin.bookmarks.syncBkmrks);