-//= require querystring
+//= require qs/dist/qs
L.extend(L.LatLngBounds.prototype, {
getSize: function () {
initialize: function (id, options) {
L.Map.prototype.initialize.call(this, id, options);
- var copyright = I18n.t("javascripts.map.copyright", { copyright_url: "/copyright" });
- var donate = I18n.t("javascripts.map.donate_link_text", { donate_url: "https://donate.openstreetmap.org" });
- var terms = I18n.t("javascripts.map.terms", { terms_url: "https://wiki.osmfoundation.org/wiki/Terms_of_Use" });
- var thunderforest = I18n.t("javascripts.map.thunderforest", { thunderforest_url: "https://www.thunderforest.com/" });
- var memomaps = I18n.t("javascripts.map.opnvkarte", { memomaps_url: "https://memomaps.de/" });
- var hotosm = I18n.t("javascripts.map.hotosm", { hotosm_url: "https://www.hotosm.org/", osmfrance_url: "https://openstreetmap.fr/" });
+ var copyright_link = $("<a>", {
+ href: "/copyright",
+ text: I18n.t("javascripts.map.openstreetmap_contributors")
+ }).prop("outerHTML");
+ var copyright = I18n.t("javascripts.map.copyright_text", { copyright_link: copyright_link });
+
+ var donate = $("<a>", {
+ "href": "https://supporting.openstreetmap.org",
+ "class": "donate-attr",
+ "text": I18n.t("javascripts.map.make_a_donation")
+ }).prop("outerHTML");
+
+ var terms = $("<a>", {
+ href: "https://wiki.osmfoundation.org/wiki/Terms_of_Use",
+ text: I18n.t("javascripts.map.website_and_api_terms")
+ }).prop("outerHTML");
+
+ var cyclosm_link = $("<a>", {
+ href: "https://www.cyclosm.org",
+ target: "_blank",
+ text: I18n.t("javascripts.map.cyclosm_name")
+ }).prop("outerHTML");
+ var osm_france_link = $("<a>", {
+ href: "https://openstreetmap.fr/",
+ target: "_blank",
+ text: I18n.t("javascripts.map.osm_france")
+ }).prop("outerHTML");
+ var cyclosm = I18n.t("javascripts.map.cyclosm_credit", { cyclosm_link: cyclosm_link, osm_france_link: osm_france_link });
+
+ var thunderforest_link = $("<a>", {
+ href: "https://www.thunderforest.com/",
+ target: "_blank",
+ text: I18n.t("javascripts.map.andy_allan")
+ }).prop("outerHTML");
+ var thunderforest = I18n.t("javascripts.map.thunderforest_credit", { thunderforest_link: thunderforest_link });
+
+ var tracestrack_link = $("<a>", {
+ href: "https://www.tracestrack.com/",
+ target: "_blank",
+ text: I18n.t("javascripts.map.tracestrack")
+ }).prop("outerHTML");
+ var tracestrack = I18n.t("javascripts.map.tracestrack_credit", { tracestrack_link: tracestrack_link });
+
+ var hotosm_link = $("<a>", {
+ href: "https://www.hotosm.org/",
+ target: "_blank",
+ text: I18n.t("javascripts.map.hotosm_name")
+ }).prop("outerHTML");
+ var hotosm = I18n.t("javascripts.map.hotosm_credit", { hotosm_link: hotosm_link, osm_france_link: osm_france_link });
this.baseLayers = [];
name: I18n.t("javascripts.map.base.standard")
}));
+ this.baseLayers.push(new L.OSM.CyclOSM({
+ attribution: copyright + ". " + cyclosm + ". " + terms,
+ code: "Y",
+ keyid: "cyclosm",
+ name: I18n.t("javascripts.map.base.cyclosm")
+ }));
+
if (OSM.THUNDERFOREST_KEY) {
this.baseLayers.push(new L.OSM.CycleMap({
attribution: copyright + ". " + thunderforest + ". " + terms,
}));
}
- this.baseLayers.push(new L.OSM.OPNVKarte({
- attribution: copyright + ". " + memomaps + ". " + terms,
- code: "O",
- keyid: "opnvkarte",
- name: I18n.t("javascripts.map.base.opnvkarte")
- }));
+ if (OSM.TRACESTRACK_KEY) {
+ this.baseLayers.push(new L.OSM.TracestrackTopo({
+ attribution: copyright + ". " + tracestrack + ". " + terms,
+ apikey: OSM.TRACESTRACK_KEY,
+ code: "P",
+ keyid: "tracestracktopo",
+ name: I18n.t("javascripts.map.base.tracestracktop_topo")
+ }));
+ }
this.baseLayers.push(new L.OSM.HOT({
attribution: copyright + ". " + hotosm + ". " + terms,
this.gpsLayer = new L.OSM.GPS({
pane: "overlayPane",
- code: "G",
- name: I18n.t("javascripts.map.base.gps")
+ code: "G"
});
this.on("layeradd", function (event) {
params.mlon = latLng.lng.toFixed(precision);
}
- var querystring = require("querystring-component"),
- url = window.location.protocol + "//" + OSM.SERVER_URL + "/",
- query = querystring.stringify(params),
+ var url = window.location.protocol + "//" + OSM.SERVER_URL + "/",
+ query = Qs.stringify(params),
hash = OSM.formatHash(this);
if (query) url += "?" + query;
params[this._object.type] = this._object.id;
}
- var querystring = require("querystring-component"),
- query = querystring.stringify(params);
+ var query = Qs.stringify(params);
if (query) {
str += "?" + query;
}
interactive: false
};
+ var haloStyle = {
+ weight: 2.5,
+ radius: 20,
+ fillOpacity: 0.5,
+ color: "#FF6200"
+ };
+
this.removeObject();
- var map = this;
- this._objectLoader = $.ajax({
- url: OSM.apiUrl(object),
- dataType: "xml",
- success: function (xml) {
- map._object = object;
-
- map._objectLayer = new L.OSM.DataLayer(null, {
- styles: {
- node: objectStyle,
- way: objectStyle,
- area: objectStyle,
- changeset: changesetStyle
- }
- });
-
- map._objectLayer.interestingNode = function (node, ways, relations) {
- if (object.type === "node") {
- return true;
- } else if (object.type === "relation") {
- for (var i = 0; i < relations.length; i++) {
- if (relations[i].members.indexOf(node) !== -1) return true;
- }
- } else {
- return false;
- }
- };
+ if (object.type === "note") {
+ this._objectLoader = {
+ abort: function () {}
+ };
- map._objectLayer.addData(xml);
- map._objectLayer.addTo(map);
+ this._object = object;
+ this._objectLayer = L.featureGroup().addTo(this);
- if (callback) callback(map._objectLayer.getBounds());
+ L.circleMarker(object.latLng, haloStyle).addTo(this._objectLayer);
+
+ if (object.icon) {
+ L.marker(object.latLng, {
+ icon: object.icon,
+ opacity: 1,
+ interactive: true
+ }).addTo(this._objectLayer);
}
- });
+
+ if (callback) callback(this._objectLayer.getBounds());
+ } else { // element or changeset handled by L.OSM.DataLayer
+ var map = this;
+ this._objectLoader = $.ajax({
+ url: OSM.apiUrl(object),
+ dataType: "xml",
+ success: function (xml) {
+ map._object = object;
+
+ map._objectLayer = new L.OSM.DataLayer(null, {
+ styles: {
+ node: objectStyle,
+ way: objectStyle,
+ area: objectStyle,
+ changeset: changesetStyle
+ }
+ });
+
+ map._objectLayer.interestingNode = function (node, ways, relations) {
+ if (object.type === "node") {
+ return true;
+ } else if (object.type === "relation") {
+ for (var i = 0; i < relations.length; i++) {
+ if (relations[i].members.indexOf(node) !== -1) return true;
+ }
+ } else {
+ return false;
+ }
+ };
+
+ map._objectLayer.addData(xml);
+ map._objectLayer.addTo(map);
+
+ if (callback) callback(map._objectLayer.getBounds());
+ }
+ });
+ }
},
removeObject: function () {
},
setSidebarOverlaid: function (overlaid) {
+ var sidebarWidth = 350;
if (overlaid && !$("#content").hasClass("overlay-sidebar")) {
$("#content").addClass("overlay-sidebar");
- this.invalidateSize({ pan: false })
- .panBy([-350, 0], { animate: false });
+ this.invalidateSize({ pan: false });
+ if ($("html").attr("dir") !== "rtl") {
+ this.panBy([-sidebarWidth, 0], { animate: false });
+ }
} else if (!overlaid && $("#content").hasClass("overlay-sidebar")) {
- this.panBy([350, 0], { animate: false });
+ if ($("html").attr("dir") !== "rtl") {
+ this.panBy([sidebarWidth, 0], { animate: false });
+ }
$("#content").removeClass("overlay-sidebar");
this.invalidateSize({ pan: false });
}
projects / rails.git / blobdiff