[fix]知识图谱label字段大小写 review by qiw

luoxiao-supermap · luoxiao-supermap · commit 31e620d53d47 · 2023-07-07T16:08:22.000+08:00
diff --git a/src/common/overlay/KnowledgeGraph.js b/src/common/overlay/KnowledgeGraph.js
@@ -160,11 +160,11 @@ export class KnowledgeGraph {
    * @function KnowledgeGraph.dataFromGraphMap
    * @description 将iServer GraphMap数据转换成KnowledgeGraph数据。
    * @param {Object} queryResult - iServer知识图谱服务query数据。
-   * @param {Object} graphMapStyle - iServer知识图谱服务GraphMap的style属性(graphMap.styles.style)。
+   * @param {Object} graphMap - iServer知识图谱服务GraphMap数据(data.graphMap)。
    * @return {KnowledgeGraph.Data} 返回数据。
    */
-  static dataFromGraphMap(queryResult, graphMapStyle) {
-    return transformGraphMap(queryResult, graphMapStyle);
+  static dataFromGraphMap(queryResult, graphMap) {
+    return transformGraphMap(queryResult, graphMap);
   }
 
   /**
diff --git a/src/common/overlay/knowledge-graph/format.js b/src/common/overlay/knowledge-graph/format.js
@@ -1,18 +1,21 @@
 import uniqBy from 'lodash.uniqby';
 
-export function transformGraphMap(data, style) {
+export function transformGraphMap(data, graphMap) {
+  const style = graphMap && graphMap.styles && graphMap.styles.style;
+  const captionField = graphMap && graphMap.captionFields && graphMap.captionFields.captionField;
+
   const rst = { nodes: [], edges: [] };
   data.forEach((item) => {
     const pathData = item.path;
     if (pathData) {
-      const { nodes, edges } = transformPath(pathData, style);
+      const { nodes, edges } = transformPath(pathData, style, captionField);
       rst.nodes.push(...nodes);
       rst.edges.push(...edges);
     } else if (isEdge(item)) {
       const edge = edgeFromGraphMap(item, style);
       rst.edges.push(edge);
     } else {
-      const node = nodeFromGraphMap(item, style);
+      const node = nodeFromGraphMap(item, style, captionField);
       rst.nodes.push(node);
     }
   });
@@ -27,24 +30,24 @@ function isEdge(entity) {
   return entity.hasOwnProperty('start') && entity.hasOwnProperty('end');
 }
 
-function transformPath(pathData, style) {
+function transformPath(pathData, style, captionField) {
   const rst = { nodes: [], edges: [] };
   pathData.forEach((item) => {
     if (isEdge(item)) {
       const edge = edgeFromGraphMap(item, style);
       rst.edges.push(edge);
     } else {
-      const node = nodeFromGraphMap(item, style);
+      const node = nodeFromGraphMap(item, style, captionField);
       rst.nodes.push(node);
     }
   });
   return rst;
 }
 
-export function nodeFromGraphMap(entity, style) {
+export function nodeFromGraphMap(entity, style, captionField) {
   const { id, properties, lables } = entity;
   const styleData = style ? getNodeStyle(entity, style) : {};
-  const label = getNodeLabel(entity);
+  const label = getNodeLabel(entity, captionField);
   const fillColor = styleData.fillColor || '';
   const node = {
     id: id + '',
@@ -133,10 +136,20 @@ function getNodeStyle(entity, style) {
   return {};
 }
 
-function getNodeLabel(entity) {
-  const { properties } = entity;
-  const name = properties._labelfieldname;
-  return properties[name] || '';
+function getNodeLabel(entity, captionField) {
+  const { id, labels, properties } = entity;
+  if (captionField) {
+    const data = captionField instanceof Array ? captionField : [captionField];
+    for (let i = 0; i < data.length; i++) {
+      const { name, entityTypes, entityIds } = data[i];
+      const ids = JSON.parse(entityIds || '[]');
+      const types = JSON.parse(entityTypes || '[]');
+      if (ids.includes(id) || types.includes(labels[0])) {
+        return properties[name] || '';
+      }
+    }
+  }
+  return properties[properties._labelfieldname] || '';
 }
 
 function formatFontStyle(fontStyle) {
diff --git a/src/leaflet/overlay/GraphMap.js b/src/leaflet/overlay/GraphMap.js
@@ -63,7 +63,7 @@ export class GraphMap extends L.Evented {
   async createGraphMap(graphMapName, options) {
     this.knowledgeGraphService = this.createKnowledgeGraphService(this.url, options);
     const res = await this.knowledgeGraphService.getGraphMapData(graphMapName);
-    const result = KnowledgeGraph.dataFromGraphMap(res.data, res.graphMap.styles && res.graphMap.styles.style);
+    const result = KnowledgeGraph.dataFromGraphMap(res.data, res.graphMap);
     this.graph = new KnowledgeGraph(options && options.config);
     this.graph.on('beforelayout', () => {
       /**
diff --git a/src/mapboxgl/overlay/GraphMap.js b/src/mapboxgl/overlay/GraphMap.js
@@ -59,7 +59,7 @@ export class GraphMap extends mapboxgl.Evented {
   async createGraphMap(graphMapName, options) {
     this.knowledgeGraphService = this.createKnowledgeGraphService(this.url, options);
     const res = await this.knowledgeGraphService.getGraphMapData(graphMapName);
-    const result = KnowledgeGraph.dataFromGraphMap(res.data, res.graphMap.styles && res.graphMap.styles.style);
+    const result = KnowledgeGraph.dataFromGraphMap(res.data, res.graphMap);
     this.graph = new KnowledgeGraph(options && options.config);
     this.graph.on('beforelayout', () => {
       /**
diff --git a/src/maplibregl/overlay/GraphMap.js b/src/maplibregl/overlay/GraphMap.js
@@ -59,7 +59,7 @@ export class GraphMap extends maplibregl.Evented {
   async createGraphMap(graphMapName, options) {
     this.knowledgeGraphService = this.createKnowledgeGraphService(this.url, options);
     const res = await this.knowledgeGraphService.getGraphMapData(graphMapName);
-    const result = KnowledgeGraph.dataFromGraphMap(res.data, res.graphMap.styles && res.graphMap.styles.style);
+    const result = KnowledgeGraph.dataFromGraphMap(res.data, res.graphMap);
     this.graph = new KnowledgeGraph(options && options.config);
     this.graph.on('beforelayout', () => {
       /**
diff --git a/src/openlayers/overlay/GraphMap.js b/src/openlayers/overlay/GraphMap.js
@@ -61,7 +61,7 @@ export class GraphMap extends Observable {
   async createGraphMap(graphMapName, options) {
     this.knowledgeGraphService = this.createKnowledgeGraphService(this.url, options);
     const res = await this.knowledgeGraphService.getGraphMapData(graphMapName);
-    const result = KnowledgeGraph.dataFromGraphMap(res.data, res.graphMap.styles && res.graphMap.styles.style);
+    const result = KnowledgeGraph.dataFromGraphMap(res.data, res.graphMap);
     this.graph = new KnowledgeGraph(options && options.config);
     this.graph.on('beforelayout', () => {
       /**
diff --git a/test/common/overlay/KnowledgeGraphSpec.js b/test/common/overlay/KnowledgeGraphSpec.js
@@ -159,12 +159,97 @@ describe('KnowledgeGraph', () => {
         entityTypes: '["地籍子区"]'
       }
     ];
-    var data = KnowledgeGraph.dataFromGraphMap(graphData, style);
+    var data = KnowledgeGraph.dataFromGraphMap(graphData, { styles: { style } });
     expect(data.nodes).not.toBeNull();
     expect(data.edges).not.toBeNull();
     done();
   });
 
+  it('dataFromGraphMap captionField array', (done) => {
+    var graphData = [
+      {
+        path: [
+          {
+            id: 17732923532771331,
+            properties: {
+              server: '--server=E:/00testdata/知识图谱/基础地理实体/院落.udbx --dbType=UDBX --dataset=面1'
+            },
+            labels: ['面1']
+          },
+          {
+            start: 17732923532771331,
+            end: 18014398509481990,
+            id: 20547673299877890,
+            type: '邻接',
+            properties: {}
+          },
+          {
+            id: 18014398509481990,
+            properties: {
+              server: '--server=E:/00testdata/知识图谱/基础地理实体/院落.udbx --dbType=UDBX --dataset=面2'
+            },
+            labels: ['面2']
+          }
+        ]
+      },
+      {
+        id: 177329231,
+        properties: {
+          server: '--server=E:/00testdata/知识图谱/基础地理实体/院落.udbx --dbType=UDBX --dataset=面1'
+        },
+        labels: ['面1']
+      },
+      {
+        start: 177329231,
+        end: 17732923,
+        id: 20547673890,
+        type: '邻接1',
+        properties: {}
+      }
+    ];
+    var style = [
+      {
+        type: 'entity',
+        color: '#ffc454',
+        textColor: '#ffffff',
+        font: {
+          fontName: 'Microsoft Yahei UI',
+          fontSize: 13,
+          fontStyle: 0
+        },
+        size: 20,
+        entityIds: '[12,16,18,21,23,25,28,29]'
+      },
+      {
+        type: 'entity',
+        color: '#c990c0',
+        textColor: '#595959',
+        font: {
+          fontName: 'Microsoft Yahei UI',
+          fontSize: 6,
+          fontStyle: 0
+        },
+        size: 20,
+        entityTypes: '["地籍子区"]'
+      }
+    ];
+    var captionField = { entityTypes: '["面1"]', name: 'server' };
+    var data = KnowledgeGraph.dataFromGraphMap(graphData, {
+      styles: { style },
+      captionFields: { captionField: [captionField] }
+    });
+    expect(data.nodes[0].label).toBe(
+      '--server=E:/00testdata/知识图谱/基础地理实体/院落.udbx --dbType=UDBX --dataset=面1'
+    );
+    expect(data.edges).not.toBeNull();
+    var data1 = KnowledgeGraph.dataFromGraphMap(graphData, { styles: { style }, captionFields: { captionField } });
+    expect(data1.nodes[0].label).toBe(
+      '--server=E:/00testdata/知识图谱/基础地理实体/院落.udbx --dbType=UDBX --dataset=面1'
+    );
+    expect(data1.edges).not.toBeNull();
+    done();
+  });
+
   it('dataFromKnowledgeGraphQuery', (done) => {
     var graphData = [
       {
