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

Merge pull request #4890 from fredj/kmlformat_cleanup

Browse Source 
ol.format.KML cleanup
This commit is contained in:
Frédéric Junod
2016-02-24 08:47:29 +01:00
parent 4b55175b7e d0f71bf64f
commit 9f21f1dac4
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/ol/format/kmlformat.js
View File

@@ -1,6 +1,5 @@
// FIXME http://earth.google.com/kml/1.0 namespace? // FIXME http://earth.google.com/kml/1.0 namespace?
// FIXME why does node.getAttribute return an unknown type? // FIXME why does node.getAttribute return an unknown type?
// FIXME text
// FIXME serialize arbitrary feature properties // FIXME serialize arbitrary feature properties
// FIXME don't parse style if extractStyles is false // FIXME don't parse style if extractStyles is false
@@ -318,7 +317,6 @@ ol.format.KML.ICON_ANCHOR_UNITS_MAP_ = {
* @private * @private
*/ */
ol.format.KML.createNameStyleFunction_ = function(foundStyle, name) { ol.format.KML.createNameStyleFunction_ = function(foundStyle, name) {
/** @type {?ol.style.Text} */
var textStyle = null; var textStyle = null;
var textOffset = [0, 0]; var textOffset = [0, 0];
var textAlign = 'start'; var textAlign = 'start';
@@ -378,7 +376,6 @@ ol.format.KML.createFeatureStyleFunction_ = function(style, styleUrl,
var drawName = showPointNames; var drawName = showPointNames;
/** @type {ol.style.Style|undefined} */ /** @type {ol.style.Style|undefined} */
var nameStyle; var nameStyle;
/** @type {string} */
var name = ''; var name = '';
if (drawName) { if (drawName) {
if (this.getGeometry()) { if (this.getGeometry()) {
@@ -388,7 +385,7 @@ ol.format.KML.createFeatureStyleFunction_ = function(style, styleUrl,
} }
if (drawName) { if (drawName) {
name = /** @type {string} */ (this.getProperties()['name']); name = /** @type {string} */ (this.get('name'));
drawName = drawName && name; drawName = drawName && name;
} }
@@ -1002,9 +999,7 @@ ol.format.KML.readMultiGeometry_ = function(node, objectStack) {
} }
} }
if (homogeneous) { if (homogeneous) {
/** @type {ol.geom.GeometryLayout} */
var layout; var layout;
/** @type {Array.<number>} */
var flatCoordinates; var flatCoordinates;
if (type == ol.geom.GeometryType.POINT) { if (type == ol.geom.GeometryType.POINT) {
var point = geometries[0]; var point = geometries[0];