fix ut

xilanhuaweidapao · xilanhuaweidapao · commit 4d1e265739ba · 2023-02-26T17:54:02.000+08:00
diff --git a/examples/leaflet/01_mapQueryBySQL_FGB.html b/examples/leaflet/01_mapQueryBySQL_FGB.html
@@ -37,8 +37,8 @@
               .queryBySQL(param, function (serviceResult) {
                 new L.supermap.FGBLayer(serviceResult.result.newResourceLocation, {
                   strategy: 'all'
-              });
-      })};
+              }).addTo(map);
+      }, 'FGB')};
     </script>
   </body>
 </html>
diff --git a/examples/leaflet/02_getFeatureBySQL_FGB.html b/examples/leaflet/02_getFeatureBySQL_FGB.html
@@ -16,47 +16,29 @@
       var map,
         resultLayer,
         baseUrl = host + '/iserver/services/map-china400/rest/maps/China',
-        url = 'http://localhost:8090/iserver/services/data-China100/rest/data';
+        url = host + "/iserver/services/data-world/rest/data";
       map = L.map('map', {
         preferCanvas: true,
         crs: L.CRS.EPSG3857,
         center: { lon: 113, lat: 39 },
         maxZoom: 18,
-        zoom: 7
+        zoom: 1
       });
       new L.supermap.TiledMapLayer(baseUrl).addTo(map);
       query();
       function query() {
         var sqlParam = new L.supermap.GetFeaturesBySQLParameters({
           queryParameter: {
-            name: 'China_Rural_pt@China',
-            attributeFilter: 'SMID < 50000'
+                name: "Countries@World",
+                attributeFilter: "SMID = 234"
           },
-          maxFeatures: 50000,
-          returnContent: false,
-          datasetNames: ['China:China_Rural_pt']
+          datasetNames: ["World:Countries"]
         });
         new L.supermap.FeatureService(url).getFeaturesBySQL(
           sqlParam,
           function (serviceResult) {
             new L.supermap.FGBLayer(serviceResult.result.newResourceLocation, {
-              style: {
-                color: 'blue',
-                weight: 5,
-                fillOpacity: 0.8
-              },
-              featureLoader: function(feature) {
-                feature.geometry.coordinates = Proj4js('EPSG:3857', 'EPSG:4326', feature.geometry.coordinates)
-                return feature;
-              },
-              pointToLayer: function (feature, latlng) {
-                return L.circleMarker(latlng, {
-                  radius: 2,
-                  fillColor: '#ff0000',
-                  weight: 1,
-                  opacity: 1
-                });
-              }
+              strategy: 'all'
             }).addTo(map);
           },
           'FGB'
diff --git a/examples/leaflet/04_bufferAnalystService_geometry_FGB.html b/examples/leaflet/04_bufferAnalystService_geometry_FGB.html
@@ -85,9 +85,6 @@
        
         bufferAnalystService.bufferAnalysis(geoBufferAnalystParams, function (serviceResult) {
           var resultLayer = new L.supermap.FGBLayer(serviceResult.result.newResourceLocation, {
-              style: {
-                color: 'red'
-              },
               strategy: 'all'
             }).addTo(map);
         }, 'FGB');
diff --git a/examples/leaflet/04_overlayAnalystService_FGB.html b/examples/leaflet/04_overlayAnalystService_FGB.html
@@ -36,9 +36,6 @@
         
         overlayAnalystService.overlayAnalysis(datasetOverlayAnalystParameters, function (serviceResult) {
           new L.supermap.FGBLayer(serviceResult.result.newResourceLocation, {
-            style: {
-              color: 'blue'
-            },
             strategy: 'all'
           }).addTo(map);
         }, 'FGB');
diff --git a/examples/leaflet/04_thiessenAnalystService_datasets_FGB.html b/examples/leaflet/04_thiessenAnalystService_datasets_FGB.html
@@ -37,10 +37,6 @@
         
         thiessenAnalystService.thiessenAnalysis(dsThiessenAnalystParameters, function (serviceResult) {
           new L.supermap.FGBLayer(serviceResult.result.newResourceLocation, {
-            style: {
-              color: 'blue',
-              weight: 2
-            },
             strategy: 'all'
           }).addTo(map);
         }, 'FGB');
diff --git a/examples/leaflet/04_thiessenAnalystService_geometry_FGB.html b/examples/leaflet/04_thiessenAnalystService_geometry_FGB.html
@@ -50,10 +50,6 @@
         thiessenAnalystService = new L.supermap.SpatialAnalystService(serviceUrl);
         thiessenAnalystService.thiessenAnalysis(gThiessenAnalystParameters, function (serviceResult) {
           new L.supermap.FGBLayer(serviceResult.result.newResourceLocation, {
-            style: {
-              color: 'blue',
-              weight: 2
-            },
             strategy: 'all'
           }).addTo(map);
         }, 'FGB')
diff --git a/examples/leaflet/fgb_all_load.html b/examples/leaflet/fgb_all_load.html
@@ -9,11 +9,11 @@
     <script type="text/javascript" src="../js/include-web.js"></script>
   </head>
   <body style="margin: 0; overflow: hidden; background: #fff; width: 100%; height: 100%; position: absolute; top: 0">
-    <div id="fgb-map" style="margin: 0 auto; width: 50%; height: 100%; position: absolute; top: 0; left: 0">
+    <div id="fgb-map" style="margin: 0 auto; width: 100%; height: 100%; position: absolute; top: 0; left: 0">
     </div>
     <script type="text/javascript" src="../../dist/leaflet/include-leaflet.js"></script>
     <script type="text/javascript">
-      var allowMaxFeatures = 20000;
+      var allowMaxFeatures = 100000;
       var host = window.isLocal ? window.server : 'https://iserver.supermap.io';
       var map,
         FGBMap,
@@ -23,9 +23,9 @@
       FGBMap = L.map('fgb-map', {
         preferCanvas: true,
         crs: L.CRS.EPSG4326,
-        center: { lon: 113, lat: 39 },
+        center: { lon: 107, lat: 37 },
         maxZoom: 18,
-        zoom: 3
+        zoom: 4
       });
       new L.supermap.TiledMapLayer(baseUrl).addTo(FGBMap);
       var sqlParam = new L.supermap.GetFeaturesBySQLParameters({
diff --git a/examples/leaflet/fgb_extent_load.html b/examples/leaflet/fgb_extent_load.html
@@ -9,7 +9,7 @@
     <script type="text/javascript" src="../js/include-web.js"></script>
   </head>
   <body style="margin: 0; overflow: hidden; background: #fff; width: 100%; height: 100%; position: absolute; top: 0">
-    <div id="fgb-map" style="margin: 0 auto; width: 50%; height: 100%; position: absolute; top: 0; left: 0">
+    <div id="fgb-map" style="margin: 0 auto; width: 100%; height: 100%; position: absolute; top: 0; left: 0">
     </div>
     <script type="text/javascript" include="FGB" src="../../dist/leaflet/include-leaflet.js"></script>
     <script type="text/javascript">
diff --git a/examples/mapboxgl/fgb_all_load.html b/examples/mapboxgl/fgb_all_load.html
@@ -24,7 +24,7 @@
     </style>
   </head>
   <body>
-    <div id="map-fgb">
+    <div id="map">
     </div>
     <script>
       var attribution =
@@ -55,18 +55,18 @@
             }
           ]
         },
-        center: [106.143, 40.236],
+        center: [107, 37],
         zoom: 8
       };
 
-      var mapfgb = new mapboxgl.Map({
-        container: 'map-fgb',
+      var map = new mapboxgl.Map({
+        container: 'map',
         ...mapConfig
       });
-      mapfgb.addControl(new mapboxgl.NavigationControl(), 'top-left');
-      mapfgb.addControl(new mapboxgl.supermap.LogoControl(), 'bottom-right');
+      map.addControl(new mapboxgl.NavigationControl(), 'top-left');
+      map.addControl(new mapboxgl.supermap.LogoControl(), 'bottom-right');
 
-      mapfgb.on('load', function () {
+      map.on('load', function () {
         queryFgb();
       });
 
@@ -87,7 +87,7 @@
               url: serviceResult.result.newResourceLocation,
               strategy: 'all'
             });
-            mapfgb.addLayer(FGBLayer);
+            map.addLayer(FGBLayer);
           },
           'FGB'
         );
diff --git a/examples/mapboxgl/fgb_extent_load.html b/examples/mapboxgl/fgb_extent_load.html
@@ -24,8 +24,7 @@
     </style>
   </head>
   <body>
-    <div id="map-fgb">
-      <p style="font-size: 30px; width: 300px; height: 100px; position: absolute; left: 50%; z-index: 10000;">fgb 加载</p></div>
+    <div id="map">
     </div>
     <script>
       var attribution =
@@ -35,7 +34,7 @@
       var host = window.isLocal ? window.server : 'https://iserver.supermap.io';
       var baseUrl = host + '/iserver/services/map-china400/rest/maps/China/zxyTileImage.png?z={z}&x={x}&y={y}';
       var dataUrl = 'http://localhost:8090/iserver/services/data-osm-line/rest/data';
-      var allowMaxFeatures = 5000;
+      var allowMaxFeatures = 20000;
       var mapConfig = {
         style: {
           version: 8,
@@ -60,14 +59,14 @@
         zoom: 3
       };
 
-      var mapfgb = new mapboxgl.Map({
-        container: 'map-fgb',
+      var map = new mapboxgl.Map({
+        container: 'map',
         ...mapConfig
       });
-      mapfgb.addControl(new mapboxgl.NavigationControl(), 'top-left');
-      mapfgb.addControl(new mapboxgl.supermap.LogoControl(), 'bottom-right');
+      map.addControl(new mapboxgl.NavigationControl(), 'top-left');
+      map.addControl(new mapboxgl.supermap.LogoControl(), 'bottom-right');
 
-      mapfgb.on('load', function () {
+      map.on('load', function () {
         queryFgb();
       });
 
@@ -87,7 +86,7 @@
             const FGBLayer = new mapboxgl.supermap.FGBLayer({
               url: serviceResult.result.newResourceLocation
             });
-            mapfgb.addLayer(FGBLayer);
+            map.addLayer(FGBLayer);
           },
           'FGB'
         );
diff --git a/examples/openlayers/04_overlayAnalystService_FGB.html b/examples/openlayers/04_overlayAnalystService_FGB.html
@@ -47,7 +47,11 @@
         new ol.supermap.SpatialAnalystService(serviceUrl).overlayAnalysis(datasetOverlayAnalystParameters, function (serviceResult) {
             const vectorSource = new ol.source.FGB({
               url: serviceResult.result.newResourceLocation,
-              strategy: ol.loadingstrategy.bbox,
+              strategy: ol.loadingstrategy.all
+            });
+
+            resultLayer = new ol.layer.Vector({
+              source: vectorSource,
               style: new ol.style.Style({
                     stroke: new ol.style.Stroke({
                         color: 'rgba(100, 100, 225, 10)',
@@ -58,10 +62,6 @@
                     })
                 })
             });
-
-            resultLayer = new ol.layer.Vector({
-              source: vectorSource
-            });
             map.addLayer(resultLayer);
         }, 'FGB');
     }
diff --git a/examples/openlayers/config.js b/examples/openlayers/config.js
@@ -86,6 +86,7 @@ var exampleConfig = {
                 {
                   name: "SQL查询 (FGB)",
                   name_en: "SQL query (FGB)",
+                  version: '11.1.0',
                   thumbnail: "ol_mapQueryBySQL.png",
                   fileName: "01_mapQueryBySQL_FGB"
               }
@@ -107,6 +108,7 @@ var exampleConfig = {
                 }, {
                   name: "SQL查询 (FGB)",
                   name_en: "SQL query (FGB)",
+                  version: '11.1.0',
                   thumbnail: "ol_getFeatureBySQL.png",
                   fileName: "02_getFeatureBySQL_FGB"
                 }, 
@@ -1053,7 +1055,7 @@ var exampleConfig = {
                 }]
             },
             FGBLayer: {
-              name: 'FGB 图层',
+              name: 'FGB',
               name_en: 'FGBLayer',
               version: '11.0.1',
               content: [
@@ -1069,7 +1071,7 @@ var exampleConfig = {
                     name_en: 'FGB Extent Load',
                     version: '11.1.0',
                     thumbnail: 'l_pixiOverlay_taxi.png',
-                    fileName: 'fgb_all_load'
+                    fileName: 'fgb_extent_load'
                   }
                 ]
             }
diff --git a/examples/openlayers/fgb_all_load.html b/examples/openlayers/fgb_all_load.html
@@ -13,21 +13,21 @@
     <div id="map" style="width: 100%; height: 100%"></div>
     <script type="text/javascript">
       // 测试数据条数设置参数
-      var maxFeatures = 10000;
+      var maxFeatures = 100000;
       // 数据服务地址
-      var dataUrl = 'http://localhost:8090/iserver/services/data-FGB-2/rest/data';
+      var dataUrl = 'http://localhost:8090/iserver/services/data-osm-line/rest/data';
       var map,
         resultLayer;
-      var dataSourceName = 'DLTB80w';
-      var dataSetsName = 'DLTB';
+        var dataSourceName = 'osm-line';
+      var dataSetsName = 'waterways';
       map = new ol.Map({
         target: 'map',
         controls: ol.control
           .defaults({ attributionOptions: { collapsed: false } })
           .extend([new ol.supermap.control.Logo()]),
         view: new ol.View({
-          center: [108.45767883056989, 22.964634692850268],
-          zoom: 11,
+          center: [107, 37],
+          zoom: 5,
           projection: 'EPSG:4326',
           multiWorld: true
         })
@@ -54,7 +54,6 @@
           sqlParam,
           function (serviceResult) {
             const vectorSource = new ol.source.FGB({
-              format: new ol.format.GeoJSON(),
               url: serviceResult.result.newResourceLocation,
               strategy: ol.loadingstrategy.all
             });
diff --git a/examples/openlayers/fgb_extent_load.html b/examples/openlayers/fgb_extent_load.html
@@ -13,23 +13,21 @@
     <div id="map" style="width: 100%; height: 100%"></div>
     <script type="text/javascript">
       // 测试数据条数设置参数
-      var maxFeatures = 10000;
+      var maxFeatures = 100000;
       // 数据服务地址
-      var dataUrl = 'http://localhost:8090/iserver/services/data-FGB-2/rest/data';
+      var dataUrl = 'http://localhost:8090/iserver/services/data-osm-line/rest/data';
       var map,
         resultLayer;
-      var dataSourceName = 'DLTB80w';
-      var dataSetsName = 'DLTB';
-      // 局部加载范围 [ minX, minY, maxX, maxY ]
-      var extent = [107, 21.5, 119, 23]
+      var dataSourceName = 'osm-line';
+      var dataSetsName = 'waterways';
       map = new ol.Map({
         target: 'map',
         controls: ol.control
           .defaults({ attributionOptions: { collapsed: false } })
           .extend([new ol.supermap.control.Logo()]),
         view: new ol.View({
-          center: [108.45767883056989, 22.964634692850268],
-          zoom: 11,
+          center: [116, 39],
+          zoom: 5,
           projection: 'EPSG:4326',
           multiWorld: true
         })
@@ -57,7 +55,6 @@
           sqlParam,
           function (serviceResult) {
             const vectorSource = new ol.source.FGB({
-              extent,
               url: serviceResult.result.newResourceLocation,
               strategy: ol.loadingstrategy.bbox
             });
diff --git a/src/common/iServer/GetFeaturesServiceBase.js b/src/common/iServer/GetFeaturesServiceBase.js
@@ -113,6 +113,9 @@ export class GetFeaturesServiceBase extends CommonServiceBase {
         me.toIndex = params.toIndex;
         me.maxFeatures = params.maxFeatures;
         me.hasGeometry = params.hasGeometry;
+        if (me.returnContent) {
+          firstPara = false;
+        }
         var isValidNumber = me.fromIndex != null && me.toIndex != null && !isNaN(me.fromIndex) && !isNaN(me.toIndex);
         if (isValidNumber && me.fromIndex >= 0 && me.toIndex >= 0 && !firstPara) {
             me.url = Util.urlAppend(me.url, `fromIndex=${me.fromIndex}&toIndex=${me.toIndex}`);
diff --git a/src/mapboxgl/overlay/FGBLayer.js b/src/mapboxgl/overlay/FGBLayer.js
@@ -37,7 +37,13 @@ const GEOMETRY_TYPE_MAP = {
   3: 'fill',
   5: 'line',
   4: 'circle',
-  6: 'fill'
+  6: 'fill',
+  'MultiPolygon': 'fill',
+  'Point': 'circle',
+  'MultiLineString': 'line',
+  'MultiPoint': 'circle',
+  'LineString': 'line',
+  'Polygon': 'fill'
 };
 
 const PAINT_MAP = {
@@ -181,6 +187,9 @@ export class FGBLayer {
       if (this.options.featureLoader && typeof this.options.featureLoader === 'function') {
         feature = this.options.featureLoader(feature);
       }
+      if (!this.layerType) {
+        this.layerType = GEOMETRY_TYPE_MAP[feature.geometry.type]
+      }
       features.features.push(feature);
     }
     return features;
diff --git a/src/openlayers/overlay/FGB.js b/src/openlayers/overlay/FGB.js
diff --git a/test/common/iServer/GetFeaturesByBoundsServiceSpec.js b/test/common/iServer/GetFeaturesByBoundsServiceSpec.js
diff --git a/test/common/iServer/GetFeaturesByBufferServiceSpec.js b/test/common/iServer/GetFeaturesByBufferServiceSpec.js
diff --git a/test/common/iServer/GetFeaturesByIDsServiceSpec.js b/test/common/iServer/GetFeaturesByIDsServiceSpec.js
diff --git a/test/common/iServer/GetFeaturesBySQLServiceSpec.js b/test/common/iServer/GetFeaturesBySQLServiceSpec.js
