//= require leaflet.note
//= require leaflet.share
//= require leaflet.polyline
+//= require leaflet.query
//= require index/search
//= require index/browse
//= require index/export
//= require index/history
//= require index/note
//= require index/new_note
+//= require index/directions
+//= require index/changeset
+//= require index/query
//= require router
-//= require routing
-//= require_tree ./routing_engines
-(function() {
+$(document).ready(function () {
var loaderTimeout;
OSM.loadSidebarContent = function(path, callback) {
+ map.setSidebarOverlaid(false);
+
clearTimeout(loaderTimeout);
loaderTimeout = setTimeout(function() {
// IE<10 doesn't respect Vary: X-Requested-With header, so
// prevent caching the XHR response as a full-page URL.
if (path.indexOf('?') >= 0) {
- path += '&xhr=1'
+ path += '&xhr=1';
} else {
- path += '?xhr=1'
+ path += '?xhr=1';
}
$('#sidebar_content')
}
});
};
-})();
-$(document).ready(function () {
var params = OSM.mapParams();
var map = new L.OSM.Map("map", {
sidebar: sidebar
}).addTo(map);
+ L.OSM.query({
+ position: position,
+ sidebar: sidebar
+ }).addTo(map);
+
L.control.scale()
.addTo(map);
- if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') {
- initializeNotes(map);
+ if (OSM.STATUS !== 'api_offline' && OSM.STATUS !== 'database_offline') {
+ OSM.initializeNotes(map);
if (params.layers.indexOf(map.noteLayer.options.code) >= 0) {
map.addLayer(map.noteLayer);
}
- initializeBrowse(map);
+ OSM.initializeBrowse(map);
if (params.layers.indexOf(map.dataLayer.options.code) >= 0) {
map.addLayer(map.dataLayer);
}
$.cookie("_osm_location", OSM.locationCookie(map), { expires: expiry, path: "/" });
});
- if ($.cookie('_osm_welcome') == 'hide') {
+ if ($.cookie('_osm_welcome') === 'hide') {
$('.welcome').hide();
}
map.setView([params.lat, params.lon], params.zoom);
}
- var marker = L.marker([0, 0], {icon: getUserIcon()});
+ var marker = L.marker([0, 0], {icon: OSM.getUserIcon()});
if (params.marker) {
marker.setLatLng([params.mlat, params.mlon]).addTo(map);
marker.setLatLng(center).addTo(map);
});
+ function remoteEditHandler(bbox, object) {
+ var loaded = false,
+ url = document.location.protocol === "https:" ?
+ "https://127.0.0.1:8112/load_and_zoom?" :
+ "http://127.0.0.1:8111/load_and_zoom?",
+ query = {
+ left: bbox.getWest() - 0.0001,
+ top: bbox.getNorth() + 0.0001,
+ right: bbox.getEast() + 0.0001,
+ bottom: bbox.getSouth() - 0.0001
+ };
+
+ if (object) query.select = object.type + object.id;
+
+ var iframe = $('<iframe>')
+ .hide()
+ .appendTo('body')
+ .attr("src", url + querystring.stringify(query))
+ .on('load', function() {
+ $(this).remove();
+ loaded = true;
+ });
+
+ setTimeout(function () {
+ if (!loaded) {
+ alert(I18n.t('site.index.remote_failed'));
+ iframe.remove();
+ }
+ }, 1000);
+
+ return false;
+ }
+
$("a[data-editor=remote]").click(function(e) {
var params = OSM.mapParams(this.search);
remoteEditHandler(map.getBounds(), params.object);
OSM.Index = function(map) {
var page = {};
- page.pushstate = function() {
- $("#content").addClass("overlay-sidebar");
- map.invalidateSize({pan: false})
- .panBy([-350, 0], {animate: false});
+ page.pushstate = page.popstate = function() {
+ map.setSidebarOverlaid(true);
document.title = I18n.t('layouts.project_name.title');
};
page.load = function() {
+ var params = querystring.parse(location.search.substring(1));
+ if (params.query) {
+ $("#sidebar .search_form input[name=query]").value(params.query);
+ }
if (!("autofocus" in document.createElement("input"))) {
$("#sidebar .search_form input[name=query]").focus();
}
return map.getState();
};
- page.popstate = function() {
- $("#content").addClass("overlay-sidebar");
- map.invalidateSize({pan: false});
- document.title = I18n.t('layouts.project_name.title');
- };
-
- page.unload = function() {
- map.panBy([350, 0], {animate: false});
- $("#content").removeClass("overlay-sidebar");
- map.invalidateSize({pan: false});
- };
-
return page;
};
};
function addObject(type, id, center) {
- var bounds = map.addObject({type: type, id: parseInt(id)}, function(bounds) {
- if (!window.location.hash && bounds.isValid()) {
- OSM.router.moveListenerOff();
- map.once('moveend', OSM.router.moveListenerOn);
- if (center || !map.getBounds().contains(bounds)) map.fitBounds(bounds);
+ map.addObject({type: type, id: parseInt(id)}, function(bounds) {
+ if (!window.location.hash && bounds.isValid() &&
+ (center || !map.getBounds().contains(bounds))) {
+ OSM.router.withoutMoveListener(function () {
+ map.fitBounds(bounds);
+ });
}
});
}
OSM.router = OSM.Router(map, {
"/": OSM.Index(map),
"/search": OSM.Search(map),
+ "/directions": OSM.Directions(map),
"/export": OSM.Export(map),
"/note/new": OSM.NewNote(map),
"/history/friends": history,
"/node/:id(/history)": OSM.Browse(map, 'node'),
"/way/:id(/history)": OSM.Browse(map, 'way'),
"/relation/:id(/history)": OSM.Browse(map, 'relation'),
- "/changeset/:id": OSM.Browse(map, 'changeset')
+ "/changeset/:id": OSM.Changeset(map),
+ "/query": OSM.Query(map)
});
- if (OSM.preferred_editor == "remote" && document.location.pathname == "/edit") {
+ if (OSM.preferred_editor === "remote" && document.location.pathname === "/edit") {
remoteEditHandler(map.getBounds(), params.object);
OSM.router.setCurrentPath("/");
}
$(".search_form").on("submit", function(e) {
e.preventDefault();
- if ($(".query_wrapper.routing").is(":visible")) {
- // Routing
- OSM.routing.requestRoute(true, true);
+ $("header").addClass("closed");
+ var query = $(this).find("input[name=query]").val();
+ if (query) {
+ OSM.router.route("/search?query=" + encodeURIComponent(query) + OSM.formatHash(map));
} else {
- // Search
- $("header").addClass("closed");
- var query = $(this).find("input[name=query]").val();
- if (query) {
- OSM.router.route("/search?query=" + encodeURIComponent(query) + OSM.formatHash(map));
- } else {
- OSM.router.route("/" + OSM.formatHash(map));
- }
+ OSM.router.route("/");
}
});
$(".describe_location").on("click", function(e) {
e.preventDefault();
- var precision = OSM.zoomPrecision(map.getZoom());
+ var center = map.getCenter().wrap(),
+ precision = OSM.zoomPrecision(map.getZoom());
OSM.router.route("/search?query=" + encodeURIComponent(
- map.getCenter().lat.toFixed(precision) + "," +
- map.getCenter().lng.toFixed(precision)));
- });
-
- OSM.routing = OSM.Routing(map,'OSM.routing',$('.query_wrapper.routing'));
- OSM.routing.chooseEngine('javascripts.directions.engines.osrm_car');
-
- $(".get_directions").on("click",function(e) {
- e.preventDefault();
- $(".search").hide();
- $(".routing").show();
- $(".query_wrapper.routing [name=route_from]").focus();
- $("#map").on('dragend dragover',function(e) { e.preventDefault(); });
- $("#map").on('drop',function(e) { OSM.routing.handleDrop(e); e.preventDefault(); });
- $(".routing_marker").on('dragstart',function(e) {
- e.originalEvent.dataTransfer.effectAllowed = 'move';
- e.originalEvent.dataTransfer.setData('id', this.id);
- e.originalEvent.dataTransfer.setData('offsetX', e.originalEvent.target.width/2 - (e.originalEvent.x-e.target.x));
- e.originalEvent.dataTransfer.setData('offsetY', e.originalEvent.target.height - (e.originalEvent.y-e.target.y));
- });
+ center.lat.toFixed(precision) + "," + center.lng.toFixed(precision)
+ ));
});
-
- $(".close_directions").on("click",function(e) {
- e.preventDefault();
- $(".search").show();
- $(".routing").hide();
- OSM.routing.close();
- $("#map").off('dragend drop dragover');
- $(".routing_marker").off('dragstart');
- $(".query_wrapper.search [name=query]").focus();
- });
-
});
projects / rails.git / blobdiff