【fix】修复GeoJSON转化不对的bug review by zhurch

songyumeng · songyumeng · commit 04d876ebefdd · 2018-12-04T23:38:00.000+08:00
diff --git a/src/common/commontypes/geometry/Collection.js b/src/common/commontypes/geometry/Collection.js
@@ -40,7 +40,7 @@ export class Collection extends Geometry {
             this.addComponents(components);
         }
         this.CLASS_NAME = "SuperMap.Geometry.Collection";
-        this.type = "Collection";
+        this.geometryType = "Collection";
     }
 
     /**
diff --git a/src/common/commontypes/geometry/Curve.js b/src/common/commontypes/geometry/Curve.js
@@ -26,7 +26,7 @@ export class Curve extends MultiPoint {
          */
         this.componentTypes = ["SuperMap.Geometry.Point", "SuperMap.PointWithMeasure"];
         this.CLASS_NAME = "SuperMap.Geometry.Curve";
-        this.type = "Curve";
+        this.geometryType = "Curve";
         
     }
 
diff --git a/src/common/commontypes/geometry/GeoText.js b/src/common/commontypes/geometry/GeoText.js
@@ -53,7 +53,7 @@ export class GeoText extends Geometry {
         };
         this.element = document.createElement('span');
         this.CLASS_NAME = "SuperMap.Geometry.GeoText";
-        this.type = "GeoText";
+        this.geometryType = "GeoText";
     }
 
     /**
diff --git a/src/common/commontypes/geometry/LineString.js b/src/common/commontypes/geometry/LineString.js
@@ -24,7 +24,7 @@ export class LineString extends Curve {
     constructor(points) {
         super(points);
         this.CLASS_NAME = "SuperMap.Geometry.LineString";
-        this.type = "LineString";
+        this.geometryType = "LineString";
     }
 
     /**
diff --git a/src/common/commontypes/geometry/LinearRing.js b/src/common/commontypes/geometry/LinearRing.js
@@ -31,7 +31,7 @@ export class LinearRing extends LineString {
          */
         this.componentTypes = ["SuperMap.Geometry.Point"];
         this.CLASS_NAME = "SuperMap.Geometry.LinearRing";
-        this.type = "LinearRing";
+        this.geometryType = "LinearRing";
     }
 
     /**
diff --git a/src/common/commontypes/geometry/MultiLineString.js b/src/common/commontypes/geometry/MultiLineString.js
@@ -32,7 +32,7 @@ export class MultiLineString extends Collection {
          */
         this.componentTypes = ["SuperMap.Geometry.LineString"];
         this.CLASS_NAME = "SuperMap.Geometry.MultiLineString";
-        this.type = "MultiLineString";
+        this.geometryType = "MultiLineString";
     }
 
 
diff --git a/src/common/commontypes/geometry/MultiPoint.js b/src/common/commontypes/geometry/MultiPoint.js
@@ -27,7 +27,7 @@ export class MultiPoint extends Collection {
          */
         this.componentTypes = ["SuperMap.Geometry.Point"];
         this.CLASS_NAME = "SuperMap.Geometry.MultiPoint";
-        this.type = "MultiPoint";
+        this.geometryType = "MultiPoint";
     }
 
     /**
diff --git a/src/common/commontypes/geometry/MultiPolygon.js b/src/common/commontypes/geometry/MultiPolygon.js
@@ -34,7 +34,7 @@ export class MultiPolygon extends Collection {
          */
         this.componentTypes = ["SuperMap.Geometry.Polygon"];
         this.CLASS_NAME = "SuperMap.Geometry.MultiPolygon";
-        this.type = "MultiPolygon";
+        this.geometryType = "MultiPolygon";
     }
 
 
diff --git a/src/common/commontypes/geometry/Point.js b/src/common/commontypes/geometry/Point.js
@@ -47,7 +47,7 @@ export class Point extends Geometry {
          */
         this.type = type || "Point";
         this.CLASS_NAME = "SuperMap.Geometry.Point";
-        this.type = "Point";
+        this.geometryType = "Point";
     }
 
     /**
diff --git a/src/common/commontypes/geometry/Polygon.js b/src/common/commontypes/geometry/Polygon.js
@@ -34,7 +34,7 @@ export class Polygon extends Collection {
          */
         this.componentTypes = ["SuperMap.Geometry.LinearRing"];
         this.CLASS_NAME = "SuperMap.Geometry.Polygon";
-        this.type = "Polygon";
+        this.geometryType = "Polygon";
     }
 
     /**
diff --git a/src/common/commontypes/geometry/Rectangle.js b/src/common/commontypes/geometry/Rectangle.js
@@ -53,7 +53,7 @@ export class Rectangle extends Geometry {
         this.height = height;
 
         this.CLASS_NAME = "SuperMap.Geometry.Rectangle";
-        this.type = "Rectangle";
+        this.geometryType = "Rectangle";
     }
 
     /**
diff --git a/src/common/format/GeoJSON.js b/src/common/format/GeoJSON.js
@@ -256,11 +256,14 @@ export class GeoJSON extends JSONFormat {
                 if (geometry == null) {
                     return null;
                 }
+                if (!geometry.parts && geometry.points) {
+                    geometry.parts = [geometry.points.length];
+                }
                 var geo = new ServerGeometry(geometry).toGeometry();
                 if (!geo) {
                     return null;
                 }
-                var geometryType = geo.type;
+                var geometryType = geo.geometryType;
                 var data;
                 if (geometryType === "LinearRing") {
                     geometryType = "LineString";
@@ -295,7 +298,7 @@ export class GeoJSON extends JSONFormat {
             'point': function (point) {
                 var p = [point.x, point.y];
                 for (var name in point) {
-                    if (name !== "x" && name !== "y" && point[name] && !isNaN(point[name])) {
+                    if (name !== "x" && name !== "y" && point[name] !== null && !isNaN(point[name])) {
                         p.push(point[name]);
                     }
                 }
diff --git a/src/common/iServer/Route.js b/src/common/iServer/Route.js
@@ -106,6 +106,7 @@ export class Route extends Collection {
         }
 
         this.CLASS_NAME = "SuperMap.Route";
+        this.geometryType = "LINEM";
     }
 
     /**
diff --git a/src/common/iServer/ServerGeometry.js b/src/common/iServer/ServerGeometry.js
@@ -110,7 +110,7 @@ export class ServerGeometry {
     toGeometry() {
         var me = this,
             geoType = me.type;
-        switch (geoType) {
+        switch (geoType.toUpperCase()) {
             case GeometryType.POINT:
                 return me.toGeoPoint();
             case GeometryType.LINE:

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ export class Collection extends Geometry {`
`40`	`40`	`this.addComponents(components);`
`41`	`41`	`}`
`42`	`42`	`this.CLASS_NAME = "SuperMap.Geometry.Collection";`
`43`		`- this.type = "Collection";`
	`43`	`+ this.geometryType = "Collection";`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ export class Curve extends MultiPoint {`
`26`	`26`	`*/`
`27`	`27`	`this.componentTypes = ["SuperMap.Geometry.Point", "SuperMap.PointWithMeasure"];`
`28`	`28`	`this.CLASS_NAME = "SuperMap.Geometry.Curve";`
`29`		`- this.type = "Curve";`
	`29`	`+ this.geometryType = "Curve";`
`30`	`30`
`31`	`31`	`}`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ export class GeoText extends Geometry {`
`53`	`53`	`};`
`54`	`54`	`this.element = document.createElement('span');`
`55`	`55`	`this.CLASS_NAME = "SuperMap.Geometry.GeoText";`
`56`		`- this.type = "GeoText";`
	`56`	`+ this.geometryType = "GeoText";`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ export class LineString extends Curve {`
`24`	`24`	`constructor(points) {`
`25`	`25`	`super(points);`
`26`	`26`	`this.CLASS_NAME = "SuperMap.Geometry.LineString";`
`27`		`- this.type = "LineString";`
	`27`	`+ this.geometryType = "LineString";`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ export class LinearRing extends LineString {`
`31`	`31`	`*/`
`32`	`32`	`this.componentTypes = ["SuperMap.Geometry.Point"];`
`33`	`33`	`this.CLASS_NAME = "SuperMap.Geometry.LinearRing";`
`34`		`- this.type = "LinearRing";`
	`34`	`+ this.geometryType = "LinearRing";`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ export class MultiLineString extends Collection {`
`32`	`32`	`*/`
`33`	`33`	`this.componentTypes = ["SuperMap.Geometry.LineString"];`
`34`	`34`	`this.CLASS_NAME = "SuperMap.Geometry.MultiLineString";`
`35`		`- this.type = "MultiLineString";`
	`35`	`+ this.geometryType = "MultiLineString";`
`36`	`36`	`}`
`37`	`37`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ export class MultiPoint extends Collection {`
`27`	`27`	`*/`
`28`	`28`	`this.componentTypes = ["SuperMap.Geometry.Point"];`
`29`	`29`	`this.CLASS_NAME = "SuperMap.Geometry.MultiPoint";`
`30`		`- this.type = "MultiPoint";`
	`30`	`+ this.geometryType = "MultiPoint";`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ export class MultiPolygon extends Collection {`
`34`	`34`	`*/`
`35`	`35`	`this.componentTypes = ["SuperMap.Geometry.Polygon"];`
`36`	`36`	`this.CLASS_NAME = "SuperMap.Geometry.MultiPolygon";`
`37`		`- this.type = "MultiPolygon";`
	`37`	`+ this.geometryType = "MultiPolygon";`
`38`	`38`	`}`
`39`	`39`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ export class Point extends Geometry {`
`47`	`47`	`*/`
`48`	`48`	`this.type = type \|\| "Point";`
`49`	`49`	`this.CLASS_NAME = "SuperMap.Geometry.Point";`
`50`		`- this.type = "Point";`
	`50`	`+ this.geometryType = "Point";`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ export class Polygon extends Collection {`
`34`	`34`	`*/`
`35`	`35`	`this.componentTypes = ["SuperMap.Geometry.LinearRing"];`
`36`	`36`	`this.CLASS_NAME = "SuperMap.Geometry.Polygon";`
`37`		`- this.type = "Polygon";`
	`37`	`+ this.geometryType = "Polygon";`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`/**`