-//= require jquery.simulate
+//= require qs/dist/qs
-OSM.Search = function(map) {
- $(".search_form input[name=query]").on("input", function(e) {
+OSM.Search = function (map) {
+ $(".search_form input[name=query]").on("input", function (e) {
if ($(e.target).val() === "") {
$(".describe_location").fadeIn(100);
} else {
}
});
- $(".search_form a.button.switch_link").on("click", function(e) {
+ $(".search_form a.btn.switch_link").on("click", function (e) {
e.preventDefault();
- var query = $(e.target).parent().parent().find("input[name=query]").val();
+ var query = $(this).closest("form").find("input[name=query]").val();
if (query) {
OSM.router.route("/directions?from=" + encodeURIComponent(query) + OSM.formatHash(map));
} else {
}
});
- $(".search_form").on("submit", function(e) {
+ $(".search_form").on("submit", function (e) {
e.preventDefault();
$("header").addClass("closed");
var query = $(this).find("input[name=query]").val();
}
});
- $(".describe_location").on("click", function(e) {
+ $(".describe_location").on("click", function (e) {
e.preventDefault();
- var precision = OSM.zoomPrecision(map.getZoom());
- OSM.router.route("/search?query=" + encodeURIComponent(
- map.getCenter().lat.toFixed(precision) + "," +
- map.getCenter().lng.toFixed(precision)));
+ var center = map.getCenter().wrap(),
+ precision = OSM.zoomPrecision(map.getZoom()),
+ lat = center.lat.toFixed(precision),
+ lng = center.lng.toFixed(precision);
+
+ OSM.router.route("/search?lat=" + encodeURIComponent(lat) + "&lon=" + encodeURIComponent(lng));
});
$("#sidebar_content")
.on("click", ".search_more a", clickSearchMore)
.on("click", ".search_results_entry a.set_position", clickSearchResult)
- .on("mouseover", "p.search_results_entry:has(a.set_position)", showSearchResult)
- .on("mouseout", "p.search_results_entry:has(a.set_position)", hideSearchResult)
- .on("mousedown", "p.search_results_entry:has(a.set_position)", function () {
- var moved = false;
- $(this).one("click", function (e) {
- if (!moved && !$(e.target).is('a')) {
- $(this).find("a.set_position").simulate("click", e);
- }
- }).one("mousemove", function () {
- moved = true;
- });
- });
+ .on("mouseover", "li.search_results_entry:has(a.set_position)", showSearchResult)
+ .on("mouseout", "li.search_results_entry:has(a.set_position)", hideSearchResult);
+
+ var markers = L.layerGroup().addTo(map);
function clickSearchMore(e) {
e.preventDefault();
e.stopPropagation();
- var div = $(this).parents(".search_more");
+ var div = $(this).parents(".search_more"),
+ csrf_param = $("meta[name=csrf-param]").attr("content"),
+ csrf_token = $("meta[name=csrf-token]").attr("content"),
+ params = {};
$(this).hide();
div.find(".loader").show();
- $.get($(this).attr("href"), function(data) {
- div.replaceWith(data);
+ params[csrf_param] = csrf_token;
+
+ $.ajax({
+ url: $(this).attr("href"),
+ method: "POST",
+ data: params,
+ success: function (data) {
+ div.replaceWith(data);
+ }
});
}
if (!marker) {
var data = $(this).find("a.set_position").data();
- marker = L.marker([data.lat, data.lon], {icon: getUserIcon()});
+ marker = L.marker([data.lat, data.lon], { icon: OSM.getUserIcon() });
$(this).data("marker", marker);
}
markers.addLayer(marker);
-
- $(this).closest("li").addClass("selected");
}
function hideSearchResult() {
if (marker) {
markers.removeLayer(marker);
}
-
- $(this).closest("li").removeClass("selected");
}
- function clickSearchResult(e) {
- var data = $(this).data(),
- center = L.latLng(data.lat, data.lon);
-
+ function panToSearchResult(data) {
if (data.minLon && data.minLat && data.maxLon && data.maxLat) {
map.fitBounds([[data.minLat, data.minLon], [data.maxLat, data.maxLon]]);
} else {
- map.setView(center, data.zoom);
+ map.setView([data.lat, data.lon], data.zoom);
}
+ }
+
+ function clickSearchResult(e) {
+ var data = $(this).data();
+
+ panToSearchResult(data);
// Let clicks to object browser links propagate.
if (data.type && data.id) return;
e.stopPropagation();
}
- var markers = L.layerGroup().addTo(map);
-
var page = {};
- page.pushstate = page.popstate = function(path) {
- var params = querystring.parse(path.substring(path.indexOf('?') + 1));
- $(".search_form input[name=query]").val(params.query);
+ page.pushstate = page.popstate = function (path) {
+ var params = Qs.parse(path.substring(path.indexOf("?") + 1));
+ if (params.query) {
+ $(".search_form input[name=query]").val(params.query);
+ $(".describe_location").hide();
+ } else if (params.lat && params.lon) {
+ $(".search_form input[name=query]").val(params.lat + ", " + params.lon);
+ $(".describe_location").hide();
+ }
OSM.loadSidebarContent(path, page.load);
};
- page.load = function() {
- $(".search_results_entry").each(function() {
- var entry = $(this);
+ page.load = function () {
+ $(".search_results_entry").each(function (index) {
+ var entry = $(this),
+ csrf_param = $("meta[name=csrf-param]").attr("content"),
+ csrf_token = $("meta[name=csrf-token]").attr("content"),
+ params = {
+ zoom: map.getZoom(),
+ minlon: map.getBounds().getWest(),
+ minlat: map.getBounds().getSouth(),
+ maxlon: map.getBounds().getEast(),
+ maxlat: map.getBounds().getNorth()
+ };
+ params[csrf_param] = csrf_token;
$.ajax({
url: entry.data("href"),
- method: 'GET',
- data: {
- zoom: map.getZoom(),
- minlon: map.getBounds().getWest(),
- minlat: map.getBounds().getSouth(),
- maxlon: map.getBounds().getEast(),
- maxlat: map.getBounds().getNorth()
- },
- success: function(html) {
+ method: "POST",
+ data: params,
+ success: function (html) {
entry.html(html);
+ // go to first result of first geocoder
+ if (index === 0) {
+ var firstResult = entry.find("*[data-lat][data-lon]:first").first();
+ if (firstResult.length) {
+ panToSearchResult(firstResult.data());
+ }
+ }
}
});
});
return map.getState();
};
- page.unload = function() {
+ page.unload = function () {
markers.clearLayers();
$(".search_form input[name=query]").val("");
$(".describe_location").fadeIn(100);
projects / rails.git / blobdiff