leaflet和openlayers统一要素编辑服务支持的数据格式(GeoJSON)

zhurc · zhurc · commit d26658dcacca · 2017-06-22T17:00:34.000+08:00
diff --git a/dist/iclient9-leaflet.js b/dist/iclient9-leaflet.js
diff --git a/dist/iclient9-leaflet.min.js b/dist/iclient9-leaflet.min.js
diff --git a/dist/iclient9-openlayers.js b/dist/iclient9-openlayers.js
@@ -12260,8 +12260,8 @@ ol.supermap.FeatureService.prototype._createServerFeature = function (geoFeature
     }
     feature.fieldNames = fieldNames;
     feature.fieldValues = fieldValues;
-    if (geoJSONFeature.id) {
-        feature.id = geoJSONFeature.id;
+    if (geoFeature.getId()) {
+        feature.id = geoFeature.getId();
     }
     feature.geometry = Util.toSuperMapGeometry((new ol.format.GeoJSON()).writeFeatureObject(geoFeature));
     return feature;
@@ -19810,7 +19810,7 @@ SuperMap.EditFeaturesParameters = SuperMap.Class({
     dataSetName: null,
     /**
      * APIProperty: features
-     * {Array(Object)} 当前需要创建或者是修改的要素集。
+     * {Array<SuperMap.Feature.Vector|GeoJSON Feature>} 当前需要创建或者是修改的要素集。
      */
     features: null,
 
diff --git a/dist/iclient9-openlayers.min.js b/dist/iclient9-openlayers.min.js
diff --git a/examples/leaflet/02_editFeatures.html b/examples/leaflet/02_editFeatures.html
@@ -32,6 +32,7 @@
     function initFeature() {
         var polygon = L.polygon([[10, 100], [10, 124], [40, 124], [40, 100], [10, 100]]);
         var getFeatureParams = new SuperMap.GetFeaturesByGeometryParameters({
+            toIndex:-1,
             datasetNames: ["World:Capitals"],
             geometry: polygon
         });
diff --git a/examples/openlayers/02_editFeatures.html b/examples/openlayers/02_editFeatures.html
@@ -62,6 +62,7 @@ <h5 class='panel-title text-center'>编辑</h5></div>
         var polygon = new ol.geom.Polygon([[[118, 20], [120, 20], [120, 50], [-120, 50], [118, 20]]]);
         var featureService = new ol.supermap.FeatureService(url);
         var getFeatureParams = new SuperMap.GetFeaturesByGeometryParameters({
+            toIndex:-1,
             datasetNames: ["World:Capitals"],
             geometry: polygon,
             spatialQueryMode: "INTERSECT"
diff --git a/src/common/iServer/EditFeaturesParameters.js b/src/common/iServer/EditFeaturesParameters.js
@@ -18,7 +18,7 @@ SuperMap.EditFeaturesParameters = SuperMap.Class({
     dataSetName: null,
     /**
      * APIProperty: features
-     * {Array(Object)} 当前需要创建或者是修改的要素集。
+     * {Array<SuperMap.Feature.Vector|GeoJSON Feature>} 当前需要创建或者是修改的要素集。
      */
     features: null,
 
diff --git a/src/leaflet/services/FeatureService.js b/src/leaflet/services/FeatureService.js
@@ -198,11 +198,9 @@ var FeatureService = ServiceBase.extend({
 
     _createServerFeature: function (geoFeature) {
         var geoJSONFeature, feature = {}, fieldNames = [], fieldValues = [];
-        if (geoFeature instanceof L.Path) {
-            geoJSONFeature = geoFeature.toGeoJSON();
-        } else {
-            geoJSONFeature = geoFeature;
-        }
+
+        geoJSONFeature = geoFeature || {};
+
         for (var key in geoJSONFeature.properties) {
             fieldNames.push(key);
             fieldValues.push(geoJSONFeature.properties[key]);
diff --git a/src/openlayers/services/FeatureService.js b/src/openlayers/services/FeatureService.js
@@ -211,8 +211,8 @@ ol.supermap.FeatureService.prototype._createServerFeature = function (geoFeature
     }
     feature.fieldNames = fieldNames;
     feature.fieldValues = fieldValues;
-    if (geoJSONFeature.id) {
-        feature.id = geoJSONFeature.id;
+    if (geoFeature.getId()) {
+        feature.id = geoFeature.getId();
     }
     feature.geometry = Util.toSuperMapGeometry((new ol.format.GeoJSON()).writeFeatureObject(geoFeature));
     return feature;

Original file line number	Diff line number	Diff line change
`@@ -211,8 +211,8 @@ ol.supermap.FeatureService.prototype._createServerFeature = function (geoFeature`
`211`	`211`	`}`
`212`	`212`	`feature.fieldNames = fieldNames;`
`213`	`213`	`feature.fieldValues = fieldValues;`
`214`		`- if (geoJSONFeature.id) {`
`215`		`- feature.id = geoJSONFeature.id;`
	`214`	`+ if (geoFeature.getId()) {`
	`215`	`+ feature.id = geoFeature.getId();`
`216`	`216`	`}`
`217`	`217`	`feature.geometry = Util.toSuperMapGeometry((new ol.format.GeoJSON()).writeFeatureObject(geoFeature));`
`218`	`218`	`return feature;`