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

Use ol.format.XSD.readBoolean in ol.format.KML

Browse Source
This commit is contained in:
Frederic Junod
2014-01-23 10:55:02 +01:00
parent cb25267341
commit 9fe5eff865
1 changed files with 4 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/format/kmlformat.js
+4 -20
View File
@@ -312,22 +312,6 @@ ol.format.KML.makeFeatureStyleFunction_ = function(style) {
}; };
/**
* @param {Node} node Node.
* @private
* @return {boolean|undefined} Boolean.
*/
ol.format.KML.readBoolean_ = function(node) {
var s = ol.xml.getAllTextContent(node, false);
var m = /^\s*(0|1)\s*$/.exec(s);
if (m) {
return m[1] == '1';
} else {
return undefined;
}
};
/** /**
* @param {Node} node Node. * @param {Node} node Node.
* @private * @private
@@ -1352,10 +1336,10 @@ ol.format.KML.PLACEMARK_PARSERS_ = ol.xml.makeParsersNS(
'address': ol.xml.makeObjectPropertySetter(ol.format.XSD.readString), 'address': ol.xml.makeObjectPropertySetter(ol.format.XSD.readString),
'description': ol.xml.makeObjectPropertySetter(ol.format.XSD.readString), 'description': ol.xml.makeObjectPropertySetter(ol.format.XSD.readString),
'name': ol.xml.makeObjectPropertySetter(ol.format.XSD.readString), 'name': ol.xml.makeObjectPropertySetter(ol.format.XSD.readString),
'open': ol.xml.makeObjectPropertySetter(ol.format.KML.readBoolean_), 'open': ol.xml.makeObjectPropertySetter(ol.format.XSD.readBoolean),
'phoneNumber': ol.xml.makeObjectPropertySetter(ol.format.XSD.readString), 'phoneNumber': ol.xml.makeObjectPropertySetter(ol.format.XSD.readString),
'styleUrl': ol.xml.makeObjectPropertySetter(ol.format.KML.readURI_), 'styleUrl': ol.xml.makeObjectPropertySetter(ol.format.KML.readURI_),
'visibility': ol.xml.makeObjectPropertySetter(ol.format.KML.readBoolean_) 'visibility': ol.xml.makeObjectPropertySetter(ol.format.XSD.readBoolean)
}, ol.xml.makeParsersNS( }, ol.xml.makeParsersNS(
ol.format.KML.GX_NAMESPACE_URIS_, { ol.format.KML.GX_NAMESPACE_URIS_, {
'MultiTrack': ol.xml.makeObjectPropertySetter( 'MultiTrack': ol.xml.makeObjectPropertySetter(
@@ -1374,8 +1358,8 @@ ol.format.KML.PLACEMARK_PARSERS_ = ol.xml.makeParsersNS(
ol.format.KML.POLY_STYLE_PARSERS_ = ol.xml.makeParsersNS( ol.format.KML.POLY_STYLE_PARSERS_ = ol.xml.makeParsersNS(
ol.format.KML.NAMESPACE_URIS_, { ol.format.KML.NAMESPACE_URIS_, {
'color': ol.xml.makeObjectPropertySetter(ol.format.KML.readColor_), 'color': ol.xml.makeObjectPropertySetter(ol.format.KML.readColor_),
'fill': ol.xml.makeObjectPropertySetter(ol.format.KML.readBoolean_), 'fill': ol.xml.makeObjectPropertySetter(ol.format.XSD.readBoolean),
'outline': ol.xml.makeObjectPropertySetter(ol.format.KML.readBoolean_) 'outline': ol.xml.makeObjectPropertySetter(ol.format.XSD.readBoolean)
}); });