Changeset 6181

Timestamp:

02/10/08 11:18:48 (1 year ago)

Author:

crschmidt

Message:

Set a FID on OSM features. Includes tests. Original patch by kleptog
(thx), r=me (Closes #1351

Files:

• trunk/openlayers/lib/OpenLayers/Format/OSM.js (modified) (2 diffs)
• trunk/openlayers/tests/Format/test_OSM.html (modified) (3 diffs)

trunk/openlayers/lib/OpenLayers/Format/OSM.js

@@ -132 +132 @@
-                ways[i].tags);
-            feat.osm_id = parseInt(ways[i].id);
+            feat.fid = "way." + feat.osm_id;
-            feat_list[i] = feat;
-        } 
@@ -157 +158 @@
-                }        
-                feat.osm_id = parseInt(node_id); 
+                feat.fid = "node." + feat.osm_id;
-                feat_list.push(feat);
-            }   

trunk/openlayers/tests/Format/test_OSM.html

@@ -27 +27 @@
-    }
-    function test_Format_OSM_node_with_tags(t) {
-4
+5
-        var f = new OpenLayers.Format.OSM();
-        var features = f.read(osm_test_data['node_with_tags']);
@@ -33 +33 @@
-        t.eq(feat.attributes, {'a':'b'}, "attributes match");
-        t.eq(feat.osm_id, 200545, "internal osm_id property set correctly");
+        t.eq(feat.fid, "node.200545", "OSM-based FID set correctly.");
-        t.eq(feat.geometry.x, -1.8166417, "lon is correct"); 
-        t.eq(feat.geometry.y, 52.5503033, "lat is correct"); 
-    }
-    function test_Format_OSM_way(t) {
-7
+8
-        var f = new OpenLayers.Format.OSM();
-        var features = f.read(osm_test_data['way']);
@@ -43 +44 @@
-        var feat = features[0];
-        t.eq(feat.osm_id, 4685537, "OSM ID set correctly.");
+        t.eq(feat.fid, "way.4685537", "OSM-based FID set correctly.");
-        t.eq(feat.geometry.CLASS_NAME, "OpenLayers.Geometry.Polygon", "returned as polygon");
-        t.eq(feat.geometry.components[0].components.length, 11, "Correct number of components");