DataLayer to consume JSON format responses

diff --git a/app/assets/javascripts/index/layers/data.js b/app/assets/javascripts/index/layers/data.js
index b972adbc2dc18f91c2bf72283ca731333c3ef158..397b38ae20a91b221d3d11845f52786bd81ce3d5 100644 (file)
--- a/app/assets/javascripts/index/layers/data.js
+++ b/app/assets/javascripts/index/layers/data.js
@@ -102,10 +102,11 @@ OSM.initializeDataLayer = function (map) {
 
     dataLoader = $.ajax({
       url: url,
 
     dataLoader = $.ajax({
       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() {
           $("#browse_status").empty();
 
         function addFeatures() {
           $("#browse_status").empty();

diff --git a/app/assets/javascripts/leaflet.map.js b/app/assets/javascripts/leaflet.map.js
index 99d5a60503328074457a0921e2000428e57907a3..92c441b82bef8bd12b3f24a460fb51245f067a74 100644 (file)
--- a/app/assets/javascripts/leaflet.map.js
+++ b/app/assets/javascripts/leaflet.map.js
@@ -315,8 +315,8 @@ L.OSM.Map = L.Map.extend({
       var map = this;
       this._objectLoader = $.ajax({
         url: OSM.apiUrl(object),
       var map = this;
       this._objectLoader = $.ajax({
         url: OSM.apiUrl(object),

-        dataType: "xml",
-        success: function (xml) {
+        dataType: "json",
+        success: function (data) {

           map._object = object;
 
           map._objectLayer = new L.OSM.DataLayer(null, {
           map._object = object;
 
           map._objectLayer = new L.OSM.DataLayer(null, {


@@ -338,7 +338,7 @@ L.OSM.Map = L.Map.extend({
             }
           };
 
             }
           };
 

-          map._objectLayer.addData(xml);
+          map._objectLayer.addData(data);

           map._objectLayer.addTo(map);
 
           if (callback) callback(map._objectLayer.getBounds());
           map._objectLayer.addTo(map);
 
           if (callback) callback(map._objectLayer.getBounds());