egovamap 0.14.6 → 0.15.4

package/egovamap/egovaBI.js

@@ -386,6 +386,7 @@ var egovaBI = function(globeMap, gisMap, mapType){
             showParts(data);
         } else {
             const layerID = queryParam.phyLayerIDs;
+            const layerName = queryParam.layerName;
             const keyField = null;
             const keyValue = null;
             const clearMap = queryParam.clearMap || true;
@@ -402,13 +403,17 @@ var egovaBI = function(globeMap, gisMap, mapType){
                     type: "simple-line",  // autocasts as new SimpleLineSymbol()
                     color: inStyle.color || "lightblue",
                     width: inStyle.width || "2px",
-                    style: inStyle.style || "solid"
+                    style: inStyle.style || "solid",
+                    cap: inStyle.cap || "round",
+                    join: inStyle.join || "round",
                 };
                 hStyle = {
                     type: "simple-line",  // autocasts as new SimpleLineSymbol()
                     color: inHStyle.color || "lightblue",
-                    width: inHStyle.width || "2px",
-                    style: inHStyle.style || "solid"
+                    width: inHStyle.width || inStyle.width || "2px",
+                    style: inHStyle.style || inStyle.style || "solid",
+                    cap: inHStyle.cap || inStyle.cap || "round",
+                    join: inHStyle.join || inStyle.join || "round",
                 };
             } else if (geomType == 3) {
                 style = {
@@ -416,17 +421,23 @@ var egovaBI = function(globeMap, gisMap, mapType){
                     color: inStyle.color || [51, 51, 204, 0.9],
                     style: inStyle.style || "solid",
                     outline: {  // autocasts as new SimpleLineSymbol()
-                        color: inStyle.outlineColor || "white",
-                        width: inStyle.outlineWidth || "1px"
+                        color: inStyle.outlineColor || "lightblue",
+                        width: inStyle.outlineWidth || "1px",
+                        style: inStyle.outlineStyle || "solid",
+                        cap: inStyle.outlineCap || "round",
+                        join: inStyle.outlineJoin || "round",
                     }
                 };
                 hStyle = {
                     type: "simple-fill",  // autocasts as new SimpleFillSymbol()
                     color: inHStyle.color || [51, 51, 204, 0.9],
-                    style: inHStyle.style || "solid",
+                    style: inHStyle.style || inStyle.style || "solid",
                     outline: {  // autocasts as new SimpleLineSymbol()
-                        color: inHStyle.outlineColor || "white",
-                        width: inHStyle.outlineWidth || "1px"
+                        color: inHStyle.outlineColor || "lightblue",
+                        width: inHStyle.outlineWidth || inStyle.outlineWidth || "1px",
+                        style: inHStyle.outlineStyle || inStyle.outlineStyle || "solid",
+                        cap: inHStyle.outlineCap || inStyle.outlineCap || "round",
+                        join: inHStyle.outlineJoin || inStyle.outlineJoin || "round",
                     }
                 };
             }
@@ -436,8 +447,11 @@ var egovaBI = function(globeMap, gisMap, mapType){
             const labelstyle = null;
             const geometry = null;
             const where = queryParam.where || "1=1";
+            const opts = {
+                layerId: layerName
+            };
 
-            let param = [layerID, keyField, keyValue, clearMap, style, hStyle, bZoom, randomColor, labelField, labelstyle, geometry, where];
+            let param = [layerID, keyField, keyValue, clearMap, style, hStyle, bZoom, randomColor, labelField, labelstyle, geometry, where, null, null, opts];
             if (globeMap) {
                 gisMap.locateFeatureByIDs(...param);
             } else if (gisMap) {
@@ -483,10 +497,10 @@ var egovaBI = function(globeMap, gisMap, mapType){
             }
         }
 
-        if(data) {
+        if (data) {
             execOperation(data);
         } else {
-            if(!options.idbSetting.usageID){return}
+            if (!options.idbSetting.usageID) { return }
 
             let storeName = !!globeMap ? "usageID" : "usage2D" + "_" + options.idbSetting.usageID;
             let queryFromGIS = () => {
@@ -496,33 +510,33 @@ var egovaBI = function(globeMap, gisMap, mapType){
                     where: filterString,
                     geometry: '',
                     outGeometry: true,
-                    options:{
-                        originalData:true
+                    options: {
+                        originalData: true
                     }
                 }
                 let queryCallback = function (featureInfos) {
                     execOperation(featureInfos);
                 }
-                if(gisMap) {
-                    gisMap.queryFeature(queryParam, queryCallback) 
+                if (gisMap) {
+                    gisMap.queryFeature(queryParam, queryCallback)
                 }
             }
 
-            if(!options.idbSetting.enabled) {
+            if (!options.idbSetting.enabled) {
                 // 直接查询
                 queryFromGIS()
             } else {
                 // 查询是否存在表
                 checkObjectStore(storeName)
-                .then(function(hasObjStore) {
-                    if(hasObjStore) {
-                        // 如果有，读取本地
-                        execOperation(); 
-                    } else {
-                        // 如果没有，查询queryFeature
-                        queryFromGIS()
-                    }
-                })
+                    .then(function (hasObjStore) {
+                        if (hasObjStore) {
+                            // 如果有，读取本地
+                            execOperation();
+                        } else {
+                            // 如果没有，查询queryFeature
+                            queryFromGIS()
+                        }
+                    })
             }
         }
     }

package/egovamap/egovagis.js

@@ -514,8 +514,14 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig,con
 		if (scene == null)
 			return;
 		// 移除监听
-		that.removeEventBind("showMultiObjectCurrentPositionClick"+tagName);
-		that.removeEventBind("showMultiObjectCurrentPositionMouseover"+tagName);
+		var clickBackName = "showMultiObjectCurrentPositionClick";
+		var mouseOverBackName = "showMultiObjectCurrentPositionMouseover";
+		if(tagName){
+			clickBackName += tagName;
+			mouseOverBackName += tagName;
+		}
+		that.removeEventBind(clickBackName);
+		that.removeEventBind(mouseOverBackName);
 		var args =[];
 		var FuncList = [];
 		for(var i = 0;i<arguments.length;i++){
@@ -526,12 +532,12 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig,con
 			 }
 		}
 		if (FuncList[0] instanceof Function) {
-			that.bindEvent("showMultiObjectCurrentPositionClick"+tagName, function(evt) {
+			that.bindEvent(clickBackName, function(evt) {
 				FuncList[0](evt.args);
 			});
 		}
 		if (FuncList[1] instanceof Function) {
-			that.bindEvent("showMultiObjectCurrentPositionMouseover"+tagName, function(evt) {
+			that.bindEvent(mouseOverBackName, function(evt) {
 				FuncList[1](evt.args);
 			});
 		}
@@ -1132,6 +1138,14 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig,con
 		return scene.fire(msgPrefix + ":getPolygonArea", {args: [geometry]},parentScene);
 	}
 
+	that.intersectGeometry = function (polygon1, polygon2) {
+		return scene.fire(msgPrefix + ":intersectGeometry", {args: [polygon1, polygon2]}, parentScene);
+	}
+
+	that.getCenterPoint = function (polygon) {
+		return scene.fire(msgPrefix + ":getCenterPoint", {args: [polygon]}, parentScene);
+	}
+
 	/* 根据PointID定位空中全景 */
 	that.mmsAirPanoLocateByID = function(pointID) {
 		if(mmsMap && mmsMap.mmsLoaded) {

package/egovamap/egovagisviewer.js

@@ -1821,6 +1821,11 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
 		};
 		that.callMap('getRegion', params, cb);
 	}
+
+    that.getMapConfig = function(key, callback){
+        that.callMap('getMapConfig', key, callback);
+    }
+
     that.init();
 }
 

package/egovamap/egovamap.js

@@ -2587,6 +2587,26 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 			return gisMap.getPolygonArea.apply(this, arguments);
 	}
 
+	/**
+	 * 计算面的相交部分
+	 */
+	that.intersectGeometry = function(polygon1, polygon2) {
+		if (scene == null)
+			return;
+		if (gisMap != null)
+			return gisMap.intersectGeometry.apply(this, arguments);
+	}
+
+	/**
+	 * 获取面的中心点
+	 */
+	that.getCenterPoint = function(polygon) {
+		if (scene == null)
+			return;
+		if (gisMap != null)
+			return gisMap.getCenterPoint.apply(this, arguments);
+	}
+
 	/* 切换地图类型 */
 	that.changeControlParam = function (type, param) {
 		if (scene == null)
@@ -3692,6 +3712,15 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 		}
 	}
 
+	//获取GIS配置
+	that.getMapConfig = function(key, callback){
+		if (scene == null)
+			return;
+		if (gisMap != null) {
+			gisMap.getMapConfig.apply(this, arguments);
+		}
+	}
+
 
 	that.initMap(containerID, callback, mapType, mapConfig);
 

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "egovamap",
-  "version": "0.14.6",
+  "version": "0.15.4",
   "description": "eUrbanGIS SDK",
   "main": "index.js",
   "scripts": {
     "version:minor": "npm version minor -m \"[A]发布 v%s\"",
     "version:patch": "npm version patch -m \"[A]发布修复版本 v%s\"",
     "pub": "npm publish --registry https://registry.npmjs.org/",
-    "postpublish": "git push && git push --tags"
+    "postpublish": "git push && git push --tags",
+    "start": "parcel test/test.html"
   },
   "author": "egova",
   "license": "MIT",
@@ -16,5 +17,8 @@
   },
   "engines": {
     "node": ">=12.13"
+  },
+  "devDependencies": {
+    "parcel": "^2.3.1"
   }
 }

package/.idea/egovamap-npm.iml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

package/.idea/misc.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptSettings">
-    <option name="languageLevel" value="ES6" />
-  </component>
-</project>

package/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/egovamap-npm.iml" filepath="$PROJECT_DIR$/.idea/egovamap-npm.iml" />
-    </modules>
-  </component>
-</project>

package/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>

package/.idea/workspace.xml

@@ -1,237 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="b9682ea7-e404-4d9e-8895-5e80bc8cafd2" name="Default" comment="" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="TRACKING_ENABLED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="FileEditorManager">
-    <leaf>
-      <file leaf-file-name="egovamap.js" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/egovamap/egovamap.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="749">
-              <caret line="1694" lean-forward="true" selection-start-line="1694" selection-end-line="1694" />
-              <folding>
-                <element signature="e#0#41#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <expand />
-      <select />
-    </treeState>
-  </component>
-  <component name="NodePackageJsonFileManager">
-    <packageJsonPaths>
-      <path value="$PROJECT_DIR$/package.json" />
-    </packageJsonPaths>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="-10" />
-    <option name="y" value="-10" />
-    <option name="width" value="1750" />
-    <option name="height" value="975" />
-  </component>
-  <component name="ProjectView">
-    <navigator proportions="" version="1">
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="egovamap-npm" type="b2602c69:ProjectViewProjectNode" />
-              <item name="egovamap-npm" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="egovamap-npm" type="b2602c69:ProjectViewProjectNode" />
-              <item name="egovamap-npm" type="462c0819:PsiDirectoryNode" />
-              <item name="egovamap" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
-      <pane id="Scope" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
-    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
-    <property name="settings.editor.selected.configurable" value="configurable.group.appearance" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration default="true" type="Application" factoryName="Application">
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-    </configuration>
-    <configuration default="true" type="JUnit" factoryName="JUnit">
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <patterns />
-    </configuration>
-    <configuration default="true" type="TestNG" factoryName="TestNG">
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="SUITE_NAME" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="GROUP_NAME" />
-      <option name="TEST_OBJECT" value="CLASS" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
-      <option name="OUTPUT_DIRECTORY" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <option name="USE_DEFAULT_REPORTERS" value="false" />
-      <option name="PROPERTIES_FILE" />
-      <properties />
-      <listeners />
-    </configuration>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="b9682ea7-e404-4d9e-8895-5e80bc8cafd2" name="Default" comment="" />
-      <created>1644908680682</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1644908680682</updated>
-      <workItem from="1644908683117" duration="211000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="211000" />
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
-    <layout>
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.5113941" side_tool="true" weight="0.36880466" />
-      <window_info anchor="bottom" id="JRebel Console" order="12" sideWeight="0.42895442" side_tool="true" weight="0.39941692" />
-      <window_info anchor="right" id="Maven Projects" order="5" visible="true" weight="0.1673774" />
-      <window_info anchor="bottom" id="Database Changes" order="10" show_stripe_button="false" />
-      <window_info anchor="bottom" id="JRebel Executor" order="11" weight="0.32944608" />
-      <window_info id="Capture Tool" order="6" />
-      <window_info id="Designer" order="2" />
-      <window_info anchor="bottom" id="Profiler" />
-      <window_info anchor="right" id="Database" order="6" />
-      <window_info id="Structure" order="1" sideWeight="0.11600928" side_tool="true" weight="0.34986594" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info id="UI Designer" order="4" />
-      <window_info anchor="bottom" id="Debug" order="4" sideWeight="0.4886059" weight="0.37026238" />
-      <window_info anchor="bottom" id="TODO" order="7" sideWeight="0.49932975" weight="0.32944608" />
-      <window_info anchor="right" id="Palette&#9;" order="8" />
-      <window_info id="Image Layers" order="7" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="bottom" id="Version Control" order="16" />
-      <window_info anchor="bottom" id="Run" order="3" sideWeight="0.56769437" weight="0.32944608" />
-      <window_info anchor="bottom" id="Terminal" order="8" sideWeight="0.49932975" weight="0.35276967" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.5571587" visible="true" weight="0.23614073" />
-      <window_info id="JRebel" order="3" sideWeight="0.4428413" side_tool="true" visible="true" weight="0.23614073" />
-      <window_info anchor="right" id="Theme Preview" order="7" />
-      <window_info id="Favorites" order="5" side_tool="true" />
-      <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
-      <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
-      <window_info anchor="bottom" id="Java Enterprise" order="18" sideWeight="0.49932975" weight="0.32944608" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="bottom" id="Problems" order="15" sideWeight="0.49932975" weight="0.32944608" />
-      <window_info anchor="bottom" id="TypeScript" order="0" />
-      <window_info anchor="bottom" id="Messages" order="14" sideWeight="0.4953083" weight="0.32944608" />
-      <window_info anchor="bottom" id="Application Servers" order="13" weight="0.32944608" />
-      <window_info anchor="bottom" id="Spring" order="17" sideWeight="0.49932975" weight="0.32944608" />
-      <window_info anchor="bottom" id="Find" order="2" weight="0.329927" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info id="Web" order="8" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="1" />
-    </layout>
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="1" />
-  </component>
-  <component name="VcsContentAnnotationSettings">
-    <option name="myLimit" value="2678400000" />
-  </component>
-  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/egovamap/egovamap.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="749">
-          <caret line="1694" lean-forward="true" selection-start-line="1694" selection-end-line="1694" />
-          <folding>
-            <element signature="e#0#41#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ProjectJDKs.UI">
-        <settings>
-          <last-edited>1.6</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>