update geometryAnalysis doc and example

xilanhuaweidapao · xilanhuaweidapao · commit 21c98169c3a2 · 2024-04-30T11:16:48.000+08:00
diff --git a/examples/leaflet/ugc_computeGeodesicArea.html b/examples/leaflet/ugc_computeGeodesicArea.html
@@ -93,7 +93,7 @@ <h5 class="panel-title text-center">计算经纬度面积</h5>
         clearPopup();
         var geometryAnalysis = new L.supermap.GeometryAnalysis();
         var area;
-        area = geometryAnalysis.computeGeodesicArea(polygon, 4326);
+        area = geometryAnalysis.computeGeodesicArea(polygon);
         marker.bindPopup('面积为: ' + area).openPopup();
       }
 
diff --git a/examples/leaflet/ugc_pointPositon.html b/examples/leaflet/ugc_pointPositon.html
@@ -191,15 +191,13 @@ <h5 class="panel-title text-center">点线关系</h5>
             }
           };
           const result = geometryAnalysis[positonFun](px, py, line);
-          if (result.find) {
-            pointResults.push({
-              geometry: {
-                type: 'Point',
-                coordinates: result.values
-              },
-              type: 'Feature'
-            });
-          }
+          pointResults.push({
+            geometry: {
+              type: 'Point',
+              coordinates: result
+            },
+            type: 'Feature'
+          });
         } else {
           pointLists.forEach((point) => {
             const [px, py] = point.geometry.coordinates;
diff --git a/examples/mapboxgl/ugc_computeGeodesicArea.html b/examples/mapboxgl/ugc_computeGeodesicArea.html
@@ -105,7 +105,7 @@ <h5 class="panel-title text-center">计算经纬度面积</h5>
         clearPopup();
         var geometryAnalysis = new mapboxgl.supermap.GeometryAnalysis();
         var area;
-        area = geometryAnalysis.computeGeodesicArea(polygon, 4326);
+        area = geometryAnalysis.computeGeodesicArea(polygon);
         popup = new mapboxgl.Popup()
           .setLngLat([121, 31])
           .setHTML('面积为: ' + area)
diff --git a/examples/mapboxgl/ugc_pointPositon.html b/examples/mapboxgl/ugc_pointPositon.html
@@ -161,16 +161,7 @@ <h5 class="panel-title text-center">点线关系</h5>
             for (let j = i + 1; j < pointLists.length; j++) {
               const [px1, py1] = pointLists[i].geometry.coordinates;
               const [px2, py2] = pointLists[j].geometry.coordinates;
-              const booleanResult = geometryAnalysis['isOnSameSide'](
-                px1,
-                py1,
-                px2,
-                py2,
-                spx,
-                spy,
-                epx,
-                epy
-              );
+              const booleanResult = geometryAnalysis['isOnSameSide'](px1, py1, px2, py2, spx, spy, epx, epy);
               if (booleanResult) {
                 pointResults.push(pointLists[i], pointLists[j]);
               }
@@ -203,18 +194,23 @@ <h5 class="panel-title text-center">点线关系</h5>
             }
           };
           const result = geometryAnalysis[positonFun](px, py, line);
-          if (result.find) {
-            addLayer('nearestPoint', 'circle', [{
-            type: 'Feature',
-            geometry: {
-              type: 'Point',
-              coordinates: result.values
+          addLayer(
+            'nearestPoint',
+            'circle',
+            [
+              {
+                type: 'Feature',
+                geometry: {
+                  type: 'Point',
+                  coordinates: result
+                }
+              }
+            ],
+            {
+              'circle-radius': 6,
+              'circle-color': 'green'
             }
-          }], {
-            'circle-radius': 6,
-            'circle-color': 'green'
-          });
-          }
+          );
         } else {
           pointLists.forEach((point) => {
             const [px, py] = point.geometry.coordinates;
diff --git a/examples/maplibregl/ugc_computeGeodesicArea.html b/examples/maplibregl/ugc_computeGeodesicArea.html
@@ -105,7 +105,7 @@ <h5 class="panel-title text-center">计算经纬度面积</h5>
         clearPopup();
         var geometryAnalysis = new maplibregl.supermap.GeometryAnalysis();
         var area;
-        area = geometryAnalysis.computeGeodesicArea(polygon, 4326);
+        area = geometryAnalysis.computeGeodesicArea(polygon);
         popup = new maplibregl.Popup()
           .setLngLat([121, 31])
           .setHTML('面积为: ' + area)
diff --git a/examples/maplibregl/ugc_pointPositon.html b/examples/maplibregl/ugc_pointPositon.html
@@ -203,18 +203,16 @@ <h5 class="panel-title text-center">点线关系</h5>
             }
           };
           const result = geometryAnalysis[positonFun](px, py, line);
-          if (result.find) {
             addLayer('nearestPoint', 'circle', [{
             type: 'Feature',
             geometry: {
               type: 'Point',
-              coordinates: result.values
+              coordinates: result
             }
           }], {
             'circle-radius': 6,
             'circle-color': 'green'
           });
-          }
         } else {
           pointLists.forEach((point) => {
             const [px, py] = point.geometry.coordinates;
diff --git a/examples/openlayers/ugc_computeGeodesicArea.html b/examples/openlayers/ugc_computeGeodesicArea.html
@@ -152,7 +152,7 @@ <h5 class="panel-title text-center">计算经纬度面积</h5>
       function search() {
         var geometryAnalysis = new ol.supermap.GeometryAnalysis();
         var area;
-        area = geometryAnalysis.computeGeodesicArea(polygon, 4326);
+        area = geometryAnalysis.computeGeodesicArea(polygon);
         var innerHTML = '面积为: ' + area;
         content.innerHTML = innerHTML;
         overlay.setPosition([121, 31]);
diff --git a/examples/openlayers/ugc_pointPositon.html b/examples/openlayers/ugc_pointPositon.html
@@ -172,15 +172,13 @@ <h5 class="panel-title text-center">点线关系</h5>
             }
           };
           const result = geometryAnalysis[positonFun](px, py, line);
-          if (result.find) {
-            pointResults.push({
-              geometry: {
-                type: 'Point',
-                coordinates: result.values
-              },
-              type: 'Feature'
-            });
-          }
+          pointResults.push({
+            geometry: {
+              type: 'Point',
+              coordinates: result
+            },
+            type: 'Feature'
+          });
         } else {
           pointLists.forEach((point) => {
             const [px, py] = point.geometry.coordinates;
diff --git a/src/common/util/GeometryAnalysis.js b/src/common/util/GeometryAnalysis.js
diff --git a/src/common/util/index.js b/src/common/util/index.js
diff --git a/test/common/util/GeometryAnalysisSpec.js b/test/common/util/GeometryAnalysisSpec.js
diff --git a/test/test-main-common.js b/test/test-main-common.js

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ <h5 class="panel-title text-center">计算经纬度面积</h5>`
`93`	`93`	`clearPopup();`
`94`	`94`	`var geometryAnalysis = new L.supermap.GeometryAnalysis();`
`95`	`95`	`var area;`
`96`		`- area = geometryAnalysis.computeGeodesicArea(polygon, 4326);`
	`96`	`+ area = geometryAnalysis.computeGeodesicArea(polygon);`
`97`	`97`	`marker.bindPopup('面积为: ' + area).openPopup();`
`98`	`98`	`}`
`99`	`99`