Updated XML and JSON parser

Author: mmd-osm

leaflet-osm.js

@@ -141,9 +141,9 @@ L.OSM.DataLayer = L.FeatureGroup.extend({
     }
   },
 
-  buildFeatures: function (data, format = "application/xml") {
+  buildFeatures: function (data) {
 
-    const parser = (format === "application/json") ? L.OSM.JSONParser : L.OSM.XMLParser;
+    const parser = (data.version) ? L.OSM.JSONParser : L.OSM.XMLParser;
 
     var features = parser.getChangesets(data),
         nodes = parser.getNodes(data),
@@ -322,6 +322,7 @@ L.OSM.XMLParser = {
   },
 
   getTags: function (xml) {
+
     var result = {};
 
     var tags = xml.getElementsByTagName("tag");
@@ -337,16 +338,17 @@ L.OSM.JSONParser = {
   getChangesets: function (json) {
     var result = [];
 
-    var nodes = json.elements.filter(d => d.type === "changeset");
-    for (var i = 0; i < nodes.length; i++) {
-      var node = nodes[i], id = node["id"];
+    var changesets = json.changeset ? [json.changeset] : [];
+
+    for (var i = 0; i < changesets.length; i++) {
+      var cs = changesets[i];
       result.push({
-        id: id,
+        id: cs["id"].toString(),
         type: "changeset",
         latLngBounds: L.latLngBounds(
-          [node["min_lat"], node["min_lon"]],
-          [node["max_lat"], node["max_lon"]]),
-        tags: this.getTags(node)
+          [cs["min_lat"], cs["min_lon"]],
+          [cs["max_lat"], cs["max_lon"]]),
+        tags: this.getTags(cs)
       });
     }
 
@@ -356,12 +358,12 @@ L.OSM.JSONParser = {
   getNodes: function (json) {
     var result = {};
 
-    var nodes = json.elements.filter(d => d.type === "node");
+    var nodes = json.elements?.filter(d => d.type === "node") || [];
     for (var i = 0; i < nodes.length; i++) {
       var node = nodes[i], id = node["id"];
 
       result[id] = {
-        id: id,
+        id: id.toString(),
         type: "node",
         latLng: L.latLng(node["lat"],
                          node["lon"],
@@ -376,12 +378,12 @@ L.OSM.JSONParser = {
   getWays: function (json, nodes) {
     var result = [];
 
-    var ways = json.elements.filter(d => d.type === "way");
+    var ways = json.elements?.filter(d => d.type === "way") || [];
     for (var i = 0; i < ways.length; i++) {
       var way = ways[i], nds = way.nodes;
 
       var way_object = {
-        id: way["id"],
+        id: way["id"].toString(),
         type: "way",
         nodes: new Array(nds.length),
         tags: this.getTags(way)
@@ -400,12 +402,12 @@ L.OSM.JSONParser = {
   getRelations: function (json, nodes, ways) {
     var result = [];
 
-    var rels = json.elements.filter(d => d.type === "relation");
+    var rels = json.elements?.filter(d => d.type === "relation") || [];
     for (var i = 0; i < rels.length; i++) {
       var rel = rels[i], members = rel["members"];
 
       var rel_object = {
-        id: rel["id"],
+        id: rel["id"].toString(),
         type: "relation",
         members: new Array(members.length),
         tags: this.getTags(rel)