ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #491 from probins/kmlname

Browse Source 
KML createPlacemark should use attributes.name
This commit is contained in:
ahocevar
2012-05-28 04:58:58 -07:00
parent 0accbb77a7 082a1f38f4
commit 5c42aa6fce
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/OpenLayers/Format/KML.js
View File

@@ -1210,8 +1210,8 @@ OpenLayers.Format.KML = OpenLayers.Class(OpenLayers.Format.XML, {
createPlacemarkXML: function(feature) { createPlacemarkXML: function(feature) {
// Placemark name // Placemark name
var placemarkName = this.createElementNS(this.kmlns, "name"); var placemarkName = this.createElementNS(this.kmlns, "name");
var name = feature.style && feature.style.label ? feature.style.label : var label = (feature.style && feature.style.label) ? feature.style.label : feature.id;
feature.attributes.name || feature.id; var name = feature.attributes.name || label;
placemarkName.appendChild(this.createTextNode(name)); placemarkName.appendChild(this.createTextNode(name));
// Placemark description // Placemark description

6
tests/Format/KML.html
View File

@@ -236,13 +236,13 @@
var f = new OpenLayers.Format.KML(); var f = new OpenLayers.Format.KML();
t.eq(f.read(f.write(feature))[0].attributes.name, feature.id, "placemark name from feature.id"); t.eq(f.read(f.write(feature))[0].attributes.name, feature.id, "placemark name from feature.id");
feature.attributes.name = "placemark name from attributes.name";
t.eq(f.read(f.write(feature))[0].attributes.name, feature.attributes.name, "placemark name from attributes.name");
feature.style = { feature.style = {
label: "placemark name from style.label" label: "placemark name from style.label"
}; };
t.eq(f.read(f.write(feature))[0].attributes.name, feature.style.label, "placemark name from style.label"); t.eq(f.read(f.write(feature))[0].attributes.name, feature.style.label, "placemark name from style.label");
feature.attributes.name = "placemark name from attributes.name";
t.eq(f.read(f.write(feature))[0].attributes.name, feature.attributes.name, "placemark name from attributes.name");
} }
function test_Format_KML_linestring_projected(t) { function test_Format_KML_linestring_projected(t) {
t.plan(1); t.plan(1);