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

Merge remote-tracking branch 'upstream/pull/5563'

Browse source
This commit is contained in:
Tom Hughes 2025-01-28 18:44:07 +00:00
commit 09e802b86c
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/assets/javascripts/index/layers/data.js
View file

@ -93,10 +93,11 @@ OSM.initializeDataLayer = function (map) {
dataLoader = $.ajax({ dataLoader = $.ajax({
url: url, url: url,
success: function (xml) { dataType: "json",
success: function (data) {
dataLayer.clearLayers(); dataLayer.clearLayers();
var features = dataLayer.buildFeatures(xml); var features = dataLayer.buildFeatures(data);
function addFeatures() { function addFeatures() {
$("#browse_status").empty(); $("#browse_status").empty();

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

@ -312,8 +312,8 @@ L.OSM.Map = L.Map.extend({
var map = this; var map = this;
this._objectLoader = $.ajax({ this._objectLoader = $.ajax({
url: OSM.apiUrl(object), url: OSM.apiUrl(object),
dataType: "xml", dataType: "json",
success: function (xml) { success: function (data) {
map._object = object; map._object = object;
map._objectLayer = new L.OSM.DataLayer(null, { map._objectLayer = new L.OSM.DataLayer(null, {
@ -335,7 +335,7 @@ L.OSM.Map = L.Map.extend({
} }
}; };
map._objectLayer.addData(xml); map._objectLayer.addData(data);
map._objectLayer.addTo(map); map._objectLayer.addTo(map);
if (callback) callback(map._objectLayer.getBounds()); if (callback) callback(map._objectLayer.getBounds());