feiman
diff --git a/‎dist/iclient9-leaflet.js‎
Lines changed: 265 additions & 262 deletions b/‎dist/iclient9-leaflet.js‎
Lines changed: 265 additions & 262 deletions
diff --git a/‎dist/iclient9-leaflet.min.js‎
Lines changed: 1 addition & 1 deletion b/‎dist/iclient9-leaflet.min.js‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎dist/iclient9-mapboxgl.js‎
Lines changed: 256 additions & 253 deletions b/‎dist/iclient9-mapboxgl.js‎
Lines changed: 256 additions & 253 deletions
diff --git a/‎dist/iclient9-mapboxgl.min.js‎
Lines changed: 1 addition & 1 deletion b/‎dist/iclient9-mapboxgl.min.js‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎dist/iclient9-openlayers.js‎
Lines changed: 256 additions & 253 deletions b/‎dist/iclient9-openlayers.js‎
Lines changed: 256 additions & 253 deletions
diff --git a/‎dist/iclient9-openlayers.min.js‎
Lines changed: 1 addition & 1 deletion b/‎dist/iclient9-openlayers.min.js‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎examples/locales/en-US/resources.js‎
Lines changed: 0 additions & 1 deletion b/‎examples/locales/en-US/resources.js‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎examples/mapboxgl/config.js‎
Lines changed: 3 additions & 3 deletions b/‎examples/mapboxgl/config.js‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎…amples/mapboxgl/mvtVectorTile_UGCV5.html‎ ‎…les/mapboxgl/mvtVectorTile_precache.html‎examples/mapboxgl/mvtVectorTile_UGCV5.html renamed to examples/mapboxgl/mvtVectorTile_precache.html b/‎…amples/mapboxgl/mvtVectorTile_UGCV5.html‎ ‎…les/mapboxgl/mvtVectorTile_precache.html‎examples/mapboxgl/mvtVectorTile_UGCV5.html renamed to examples/mapboxgl/mvtVectorTile_precache.html
diff --git a/‎src/common/iServer/SurfaceAnalystParametersSetting.js‎
Lines changed: 7 additions & 3 deletions b/‎src/common/iServer/SurfaceAnalystParametersSetting.js‎
Lines changed: 7 additions & 3 deletions
@@ -1103,7 +1103,6 @@ window.resources = {
         "text_esmode_history": "historical display",
         "text_esmode": "display mode",
 
-		"btn_grid": "栅格图",
         "btn_overlayAnalyst": "Start analysis",
         "btn_terrainCurvatureCalculation": "Start calculation",
         "btn_mathExpression": "Start calculation",
 
@@ -355,10 +355,10 @@ var exampleConfig = {
                         fileName: "mvtVectorTile_changeStyle"
                     },
                     {
-                        name: "UGCV5(MVT)",
-                        name_en: "UGCV5(MVT)",
+                        name: "预缓存(MVT)",
+                        name_en: "precache(MVT)",
                         thumbnail: "mvt_UGCV5.png",
-                        fileName: "mvtVectorTile_UGCV5"
+                        fileName: "mvtVectorTile_precache"
                     }
                 ]
             },
 
@@ -10,6 +10,9 @@ import {
 import {
     ServerGeometry
 } from './ServerGeometry';
+import {
+    Geometry
+} from '../commontypes/Geometry';
 
 /**
  * @class SuperMap.SurfaceAnalystParametersSetting
@@ -123,10 +126,11 @@ export class SurfaceAnalystParametersSetting {
             json += "," + "'expectedZValues':" + Util.toJSON(this.expectedZValues);
         }
         if (this.clipRegion != null) {
-            var serverGeometry = ServerGeometry.fromGeometry(this.clipRegion);
-            if (serverGeometry) {
-                json += ",'clipRegion':" + Util.toJSON(serverGeometry);
+            var serverGeometry = this.clipRegion;
+            if (this.clipRegion instanceof Geometry && this.clipRegion.components) {
+                serverGeometry = ServerGeometry.fromGeometry(this.clipRegion)
             }
+            json += ",'clipRegion':" + Util.toJSON(serverGeometry);
         }
         return "{" + json + "}";
     }
Original file line number	Diff line number	Diff line change
`@@ -355,10 +355,10 @@ var exampleConfig = {`
`355`	`355`	`fileName: "mvtVectorTile_changeStyle"`
`356`	`356`	`},`
`357`	`357`	`{`
`358`		`- name: "UGCV5(MVT)",`
`359`		`- name_en: "UGCV5(MVT)",`
	`358`	`+ name: "预缓存(MVT)",`
	`359`	`+ name_en: "precache(MVT)",`
`360`	`360`	`thumbnail: "mvt_UGCV5.png",`
`361`		`- fileName: "mvtVectorTile_UGCV5"`
	`361`	`+ fileName: "mvtVectorTile_precache"`
`362`	`362`	`}`
`363`	`363`	`]`
`364`	`364`	`},`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,9 @@ import {`
`10`	`10`	`import {`
`11`	`11`	`ServerGeometry`
`12`	`12`	`} from './ServerGeometry';`
	`13`	`+import {`
	`14`	`+ Geometry`
	`15`	`+} from '../commontypes/Geometry';`
`13`	`16`
`14`	`17`	`/**`
`15`	`18`	`* @class SuperMap.SurfaceAnalystParametersSetting`
`@@ -123,10 +126,11 @@ export class SurfaceAnalystParametersSetting {`
`123`	`126`	`json += "," + "'expectedZValues':" + Util.toJSON(this.expectedZValues);`
`124`	`127`	`}`
`125`	`128`	`if (this.clipRegion != null) {`
`126`		`- var serverGeometry = ServerGeometry.fromGeometry(this.clipRegion);`
`127`		`- if (serverGeometry) {`
`128`		`- json += ",'clipRegion':" + Util.toJSON(serverGeometry);`
	`129`	`+ var serverGeometry = this.clipRegion;`
	`130`	`+ if (this.clipRegion instanceof Geometry && this.clipRegion.components) {`
	`131`	`+ serverGeometry = ServerGeometry.fromGeometry(this.clipRegion)`
`129`	`132`	`}`
	`133`	`+ json += ",'clipRegion':" + Util.toJSON(serverGeometry);`
`130`	`134`	`}`
`131`	`135`	`return "{" + json + "}";`
`132`	`136`	`}`