cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Treat notes as map objects

Browse source
This commit is contained in:
Anton Khorev 2022-10-04 15:40:25 +03:00
parent fdcd5d6b80
commit ec34d22039
2 changed files with 60 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

32
app/assets/javascripts/index/note.js
View file

@ -1,7 +1,6 @@
OSM.Note = function (map) {
var content = $("#sidebar_content"),
page = {},
halo, currentNote;
page = {};
var noteIcons = {
"new": L.icon({
@ -70,29 +69,15 @@ OSM.Note = function (map) {
content.find("textarea").val("").trigger("input");
var data = $(".details").data(),
latLng = L.latLng(data.coordinates.split(","));
var data = $(".details").data();
if (!halo || !map.hasLayer(halo)) {
halo = L.circleMarker(latLng, {
weight: 2.5,
radius: 20,
fillOpacity: 0.5,
color: "#FF6200"
});
map.addLayer(halo);
}
if (currentNote && map.hasLayer(currentNote)) map.removeLayer(currentNote);
currentNote = L.marker(latLng, {
icon: noteIcons[data.status],
opacity: 1,
interactive: true
map.addObject({
type: "note",
id: parseInt(id, 10),
latLng: L.latLng(data.coordinates.split(",")),
icon: noteIcons[data.status]
});
map.addLayer(currentNote);
if (callback) callback();
}
@ -108,8 +93,7 @@ OSM.Note = function (map) {
}
page.unload = function () {
if (map.hasLayer(halo)) map.removeLayer(halo);
if (map.hasLayer(currentNote)) map.removeLayer(currentNote);
map.removeObject();
};
return page;

82
app/assets/javascripts/leaflet.map.js
View file

@ -242,42 +242,64 @@ L.OSM.Map = L.Map.extend({
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;
if (object.type === "note") {
this._objectLoader = {
abort: function () {}
};
this._object = object;
this._objectLayer = L.featureGroup().addTo(this);
L.circleMarker(object.latLng, haloStyle).addTo(this._objectLayer);
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;
map._objectLayer = new L.OSM.DataLayer(null, {
styles: {
node: objectStyle,
way: objectStyle,
area: objectStyle,
changeset: changesetStyle
}
} else {
return false;
}
};
});
map._objectLayer.addData(xml);
map._objectLayer.addTo(map);
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 (callback) callback(map._objectLayer.getBounds());
}
});
map._objectLayer.addData(xml);
map._objectLayer.addTo(map);
if (callback) callback(map._objectLayer.getBounds());
}
});
}
},
removeObject: function () {