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

Rename {get|set}FeatureId to {get|set}Id

Browse Source
This commit is contained in:
Frederic Junod
2013-09-17 12:50:56 +02:00
parent c0486f6f65
commit 764aacb568
16 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ol/parser/geojsonparser.js
View File

@@ -174,7 +174,7 @@ ol.parser.GeoJSON.prototype.parseFeature_ = function(json, opt_options) {
options = opt_options || {};
var feature = new ol.Feature(json.properties);
if (goog.isDef(json.id)) {
feature.setFeatureId(json.id);
feature.setId(json.id);
}
if (geomJson) {
var type = geomJson.type;

6
src/ol/parser/kmlparser.js
View File

@@ -128,7 +128,7 @@ ol.parser.KML = function(opt_options) {
}
var feature = new ol.Feature(container.properties);
if (!goog.isNull(id)) {
feature.setFeatureId(id);
feature.setId(id);
}
var geom = track.points[i];
if (geom) {
@@ -156,7 +156,7 @@ ol.parser.KML = function(opt_options) {
}
feature = new ol.Feature(container.properties);
if (!goog.isNull(id)) {
feature.setFeatureId(id);
feature.setId(id);
}
if (container.geometry) {
sharedVertices = undefined;
@@ -720,7 +720,7 @@ ol.parser.KML = function(opt_options) {
},
'_feature': function(feature) {
var node = this.createElementNS('Placemark');
var fid = feature.getFeatureId();
var fid = feature.getId();
if (goog.isDef(fid)) {
node.setAttribute('id', fid);
}

4
src/ol/parser/ogc/gmlparser.js
View File

@@ -320,7 +320,7 @@ ol.parser.ogc.GML = function(opt_options) {
var fid = node.getAttribute('fid') ||
this.getAttributeNS(node, this.defaultNamespaceURI, 'id');
if (!goog.isNull(fid)) {
feature.setFeatureId(fid);
feature.setId(fid);
}
obj.features.push(feature);
},
@@ -419,7 +419,7 @@ ol.parser.ogc.GML = function(opt_options) {
'_typeName': function(feature) {
var node = this.createElementNS('feature:' + this.featureType,
this.featureNS);
var fid = feature.getFeatureId();
var fid = feature.getId();
if (goog.isDef(fid)) {
this.setAttributeNS(node, this.defaultNamespaceURI, 'fid', fid);
}

2
src/ol/parser/topojsonparser.js
View File

@@ -154,7 +154,7 @@ ol.parser.TopoJSON.prototype.readFeatureFromGeometry_ = function(object, arcs,
var feature = new ol.Feature();
feature.setGeometry(geometry);
if (goog.isDef(object.id)) {
feature.setFeatureId(String(object.id));
feature.setId(String(object.id));
}
return feature;
};