Skip to content

Commit

Permalink
map: place search results before cache results; enabled 'link to this…
Browse files Browse the repository at this point in the history 
… page' window on opera
  • Loading branch information
following committed Mar 12, 2013
1 parent a592e04 commit ce8f0d1
Show file tree
Hide file tree
Showing 2 changed files with 76 additions and 63 deletions.
Binary file added htdocs/resource2/ocstyle/images/misc/16x16-help.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
139 changes: 76 additions & 63 deletions htdocs/templates2/ocstyle/map2.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@
* - switch current options/view to search result page
*
* KNOWN PROBLEMS:
* - InfoWindow sizing problems, (preliminarily?) solved by workaround, see adjust_infowindow()
* - InfoWindow sizing problems, solved by workaround, see adjust_infowindow()
* - not all marker tootltips are displayed in Firefox, therefore disabled
* - strange GM zoom control jumping while panning or resizing the map
* - memory leak on MSIE, closing the map page then awfully slow due to garbage collection?
* - searchlist scrollpos is not reset on new search in Firefox
*
***************************************************************************}
{* OCSTYLE *}
Expand Down Expand Up @@ -1444,12 +1445,18 @@ function download_gpx()
// PERMALINK
function showPermlinkBox_click()
{
if (window.opera)
document.getElementById('permalink_addFavorites').style.display = 'none';
else
if ((typeof window.external.AddFavorite == 'undefined') &&
(typeof window.external.addPanel == 'undefined'))
document.getElementById('permalink_addFavorites').style.display = 'none';
var addfavorites = document.getElementById('permalink_addFavorites');
try
{
if ((typeof window.external.AddFavorite == 'undefined') && // MSIE
(typeof window.external.addPanel == 'undefined')) // Mozilla
addfavorites.style.display = 'none';
}
catch(e)
{
// Opera, Safari ...
addfavorites.style.display = 'none';
}
if (moPermalinkBox.style.display == 'none')
{
Expand Down Expand Up @@ -1519,6 +1526,7 @@ function mapselectlist_clear()
moSearchList.selectedIndex = 0;
while (moSearchList.length>0)
moSearchList.options[moSearchList.length-1] = null;
moSearchList.scrollTop = 0; // does not work in firefox - why?
maSearchListCoords = new Array();
}
Expand Down Expand Up @@ -1568,6 +1576,15 @@ function mapselectlist_onclick()
}
}
function mapselectlist_onkey(e)
{
if (e.which == 13)
mapselectlist_onclick();
else if (e.which == 27)
mapselectlist_hide();
}
function searchlist_openitem(nIndex)
{
var nLat = maSearchListCoords[nIndex]['lat'];
Expand Down Expand Up @@ -1620,85 +1637,82 @@ function mapsearch_click()
else
searchpar = "namesearch&name=" + encodeURI(sSearchText) + "&lat=" + oCenterPos.lat() + "&lon=" + oCenterPos.lng() + "&resultid=" + mnResultId;
ajaxLoad(msURLMapPHP + "?mode=" + searchpar,
function(data, responseCode) {
var xml = xmlParse(data);
var caches = xml.documentElement.getElementsByTagName("cache");
// clear the result list
mapselectlist_clear();
// clear the result list
mapselectlist_clear();
if (caches.length>0)
// do search on google
moGeocoder.geocode( { 'address': sSearchText },
function(results, status)
{
if (status == google.maps.GeocoderStatus.ZERO_RESULTS)
{
// no result
}
else if (status != google.maps.GeocoderStatus.OK)
{
//TODO: translate
var oTempOption = new Option("{t escape=js}Geocaches found, nearest first:{/t}", -1);
oTempOption.style.color = "gray";
moSearchList.options[moSearchList.length] = oTempOption;
alert("Internal search error");
return;
}
for (var nCacheIndex=0; nCacheIndex<caches.length; nCacheIndex++)
{
var name = caches[nCacheIndex].getAttribute("name");
var wpoc = caches[nCacheIndex].getAttribute("wpoc");
var text = name + " (" + wpoc + ")";
var value = add_searchlist_itemcoords(0, 0, wpoc, text);
var item = new Option(" " + text, value);
item.style.marginLeft = "20px";
var nPlacemarksCount = 0;
var nPlacemarkIndex;
moSearchList.options[moSearchList.length] = item;
}
if (status == google.maps.GeocoderStatus.OK)
nPlacemarksCount = results.length;
if (nPlacemarksCount>0)
{
var oTempOption = new Option("{t escape=js}Places found via Google:{/t}", -1);
oTempOption.style.color = "gray";
moSearchList.options[moSearchList.length] = oTempOption;
if (caches.length >= 30)
for (nPlacemarkIndex=0; nPlacemarkIndex<nPlacemarksCount; nPlacemarkIndex++)
{
var item = new Option(" {/literal}{t escape=js}Some more items found...{/t}{literal}", -1);
var coord = results[nPlacemarkIndex].geometry.location;
var text = results[nPlacemarkIndex].formatted_address;
var value = add_searchlist_itemcoords(coord.lat(), coord.lng(), "", text);
var item = new Option(" " + text, value); // spaces are ignored by Chrome
item.style.marginLeft = "20px";
item.style.color = "gray";
moSearchList.options[moSearchList.length] = item;
}
}
// do search on google
moGeocoder.geocode( { 'address': sSearchText },
function(results, status)
{
if (status == google.maps.GeocoderStatus.ZERO_RESULTS)
{
// no result
}
else if (status != google.maps.GeocoderStatus.OK)
{
//TODO: translate
alert("Internal search error");
return;
}
var nPlacemarksCount = 0;
var nPlacemarkIndex;
ajaxLoad(msURLMapPHP + "?mode=" + searchpar,
function(data, responseCode) {
var xml = xmlParse(data);
var caches = xml.documentElement.getElementsByTagName("cache");
if (status == google.maps.GeocoderStatus.OK)
nPlacemarksCount = results.length;
if (nPlacemarksCount>0)
if (caches.length>0)
{
//TODO: translate
var oTempOption = new Option("{t escape=js}Places found via Google:{/t}", -1);
var oTempOption = new Option("{t escape=js}Geocaches found, nearest first:{/t}", -1);
oTempOption.style.color = "gray";
moSearchList.options[moSearchList.length] = oTempOption;
for (nPlacemarkIndex=0; nPlacemarkIndex<nPlacemarksCount; nPlacemarkIndex++)
for (var nCacheIndex=0; nCacheIndex<caches.length; nCacheIndex++)
{
var coord = results[nPlacemarkIndex].geometry.location;
var text = results[nPlacemarkIndex].formatted_address;
var value = add_searchlist_itemcoords(coord.lat(), coord.lng(), "", text);
var name = caches[nCacheIndex].getAttribute("name");
var wpoc = caches[nCacheIndex].getAttribute("wpoc");
var text = name + " (" + wpoc + ")";
var value = add_searchlist_itemcoords(0, 0, wpoc, text);
var item = new Option(" " + text, value);
item.style.marginLeft = "20px";
item.style.marginLeft = "20px";
moSearchList.options[moSearchList.length] = item;
}
if (caches.length >= 30)
{
var item = new Option(" {/literal}{t escape=js}Some more items found...{/t}{literal}", -1);
item.style.marginLeft = "20px";
item.style.color = "gray";
moSearchList.options[moSearchList.length] = item;
}
}
if (moSearchList.length==0)
{
mapselectlist_hide();
//TODO: translate
alert("'" + sSearchText + "' {/literal}{t escape=js}was not found (with the selected settings){/t}{literal}");
return;
}
Expand All @@ -1715,7 +1729,6 @@ function mapsearch_click()
else
moSearchList.size = moSearchList.length;
moSearchList.selectedIndex = 0;
mapselectlist_show();
});
});
Expand Down Expand Up @@ -2121,12 +2134,12 @@ function toggle_attribselection(bSaveCookies)
{* dropdown list for search results *}
<div class="mapselectgeocode">
<select id="mapselectlist" name="mapselectlist" class="mapselectlist{if $bFullscreen}_fullscreen{/if} mapboxshadow" onblur="mapselectlist_onblur()" onclick="mapselectlist_onclick()">
<select id="mapselectlist" name="mapselectlist" class="mapselectlist{if $bFullscreen}_fullscreen{/if} mapboxshadow" onblur="mapselectlist_onblur()" onclick="mapselectlist_onclick()" onkeydown="mapselectlist_onkey(event)" >
</select>
</div>
{* popup box for permalink *}
<div id="permalink_box" class="mappermalink mapboxframe mapboxshadow" style="display:none;">
<div id="permalink_box" class="mappermalink mapboxframe mapboxshadow" style="display:none">
<table>
<tr><td><img src="resource2/ocstyle/images/viewcache/link.png" alt="" height="16" width="16" /> {t}Link to this map view{/t}:</td><td align="right"><a href="javascript:permalinkbox_hide()"><img src="resource2/ocstyle/images/misc/close-medium.png" style="opacity:0.7" ></a></td></tr>
<tr><td><input id="permalink_text" type="text" value="" size="55"/></td></tr>
Expand Down

0 comments on commit ce8f0d1

Please sign in to comment.