From 6b40803adfbe1765496576f4d4cec17cdc14101a Mon Sep 17 00:00:00 2001
From: Michael Peter Christen <mc@yacy.net>
Date: Thu, 31 May 2012 00:47:52 +0200
Subject: [PATCH] - show number of results in map search interface - transfer
 view radius within query

---
 htroot/yacysearch_location.html | 21 ++++++++++++++++++---
 htroot/yacysearch_location.java |  2 --
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/htroot/yacysearch_location.html b/htroot/yacysearch_location.html
index 065f1b5b0..c500f01f1 100644
--- a/htroot/yacysearch_location.html
+++ b/htroot/yacysearch_location.html
@@ -56,6 +56,8 @@
         searchLayer_md = new OpenLayers.Layer.GeoRSS('GeoRSS', path_mdsearch + query, {'icon':marker_md});
         map.addLayer(searchLayer_md);
         #(/initsearch)#
+        
+        window.setInterval("refresh()", 1000);
     }
 
     function search() {
@@ -63,9 +65,11 @@
         if (searchLayer_md != null) searchLayer_md.destroy();
         if (searchLayer_co != null) searchLayer_co.destroy();
         var center = map.getCenter().transform(new OpenLayers.Projection("EPSG:900913"), new OpenLayers.Projection("EPSG:4326"));
-        searchLayer_co = new OpenLayers.Layer.GeoRSS('GeoRSS', path_losearch + query + '&lon=' + center.lon + '&lat=' + center.lat + '&zoom=' + map.getZoom(), {'icon':marker_co});
+        var extend = map.getExtent().transform(new OpenLayers.Projection("EPSG:900913"), new OpenLayers.Projection("EPSG:4326"));
+        var radius = Math.sqrt(extend.getWidth() * extend.getWidth() + extend.getHeight() * extend.getHeight()) / 2;
+        searchLayer_co = new OpenLayers.Layer.GeoRSS('GeoRSS', path_losearch + query + '&lon=' + center.lon + '&lat=' + center.lat + '&r=' + radius + '&z=' + map.getZoom(), {'icon':marker_co});
         map.addLayer(searchLayer_co);
-        searchLayer_md = new OpenLayers.Layer.GeoRSS('GeoRSS', path_mdsearch + query, {'icon':marker_md});
+        searchLayer_md = new OpenLayers.Layer.GeoRSS('GeoRSS', path_mdsearch + query + '&lon=' + center.lon + '&lat=' + center.lat + '&r=' + radius + '&z=' + map.getZoom(), {'icon':marker_md});
         map.addLayer(searchLayer_md);
         //map.zoomToExtent(searchLayer_co.getExtent());
         //map.panTo(searchLayer_co.getExtent().getCenterLonLat());
@@ -73,6 +77,16 @@
         //map.setCenter(searchLayer_co.getExtent().getCenterLonLat(), map.getZoomForExtent(searchLayer_co.getExtent(), true));
         //document.getElementById('apilink').setAttribute('href', 'yacysearch_location.rss?query=' + query);
     }
+    
+    function refresh() {
+      if (searchLayer_co == null || searchLayer_md == null) {
+        document.getElementById('resultline').innerHTML = "";
+      } else {
+	    var cocount = searchLayer_co.markers.length;
+        var mdcount = searchLayer_md.markers.length;
+        document.getElementById('resultline').innerHTML = mdcount + " POIs found";
+      }
+    }
   </script>
 
 </head>
@@ -98,9 +112,10 @@ To see a list of all APIs, please visit the <a href="http://www.yacy-websuche.de
   <h2>#[promoteSearchPageGreeting]#</h2>
   <div class="yacylogo"><a href="#[promoteSearchPageGreeting.homepage]#" class="yacylogo"><img src="#[promoteSearchPageGreeting.smallImage]#" alt="yacysearch" /></a></div>
   <fieldset class="yacys">
-     <input type="text" value="#(initsearch)#::#[query]##(/initsearch)#" id="query" size="42" />
+     <input type="text" value="#(initsearch)#::#[query]##(/initsearch)#" id="query" size="42" onFocus="this.select()" />
      <input type="submit" onclick="search(); return false;" value="search" onsubmit="search(); return false;" />
   </fieldset>
+  <div id="resultline"></div>
 </form><br/>
 <div id="map" style="clear:both; width:100%; height:720px"></div>
 <script type="text/javascript">
diff --git a/htroot/yacysearch_location.java b/htroot/yacysearch_location.java
index 9467e1bce..5a147fd7a 100644
--- a/htroot/yacysearch_location.java
+++ b/htroot/yacysearch_location.java
@@ -37,8 +37,6 @@ import de.anomic.server.serverSwitch;
 
 public class yacysearch_location {
 
-    private static final String space = " ";
-
     public static serverObjects respond(final RequestHeader header, final serverObjects post, final serverSwitch env) {
         final Switchboard sb = (Switchboard) env;
         final serverObjects prop = new serverObjects();