【fix】fix webmap 对接 restData 数据报错问题 review by songym

liqian7 · liqian7 · commit aa92a782b12d · 2019-03-28T18:59:10.000+08:00
diff --git a/src/mapboxgl/mapping/WebMap.js b/src/mapboxgl/mapping/WebMap.js
@@ -714,7 +714,7 @@ export class WebMap extends mapboxgl.Evented {
      */
     _addLabelLayer(layerInfo, features) {
         let labelStyle = layerInfo.labelStyle;
-        
+
         this.map.addLayer({
             "id": layerInfo.layerID + 'label',
             "type": "symbol",
@@ -731,7 +731,7 @@ export class WebMap extends mapboxgl.Evented {
             "layout": {
                 "text-field": `{${labelStyle.labelField}}`,
                 'text-size': parseFloat(labelStyle.fontSize) || 12,
-                'text-offset': labelStyle.offsetX ? [labelStyle.offsetX / 10 || 0, labelStyle.offsetY / 10 || 0] : [0,-1.5],
+                'text-offset': labelStyle.offsetX ? [labelStyle.offsetX / 10 || 0, labelStyle.offsetY / 10 || 0] : [0, -1.5],
                 'text-font': ["DIN Offc Pro Italic", "Arial Unicode MS Regular"],
                 'visibility': layerInfo.visible
             }
@@ -1715,6 +1715,7 @@ export class WebMap extends mapboxgl.Evented {
                     allFeatures[i].properties.lat = coordinate[1];
                 }
             }
+            features.properties['index'] = i + '';
             features.push(feature);
         }
         return features;

Original file line number	Diff line number	Diff line change
`@@ -714,7 +714,7 @@ export class WebMap extends mapboxgl.Evented {`
`714`	`714`	`*/`
`715`	`715`	`_addLabelLayer(layerInfo, features) {`
`716`	`716`	`let labelStyle = layerInfo.labelStyle;`
`717`		`-`
	`717`	`+`
`718`	`718`	`this.map.addLayer({`
`719`	`719`	`"id": layerInfo.layerID + 'label',`
`720`	`720`	`"type": "symbol",`
`@@ -731,7 +731,7 @@ export class WebMap extends mapboxgl.Evented {`
`731`	`731`	`"layout": {`
`732`	`732`	"text-field": `{${labelStyle.labelField}}`,
`733`	`733`	`'text-size': parseFloat(labelStyle.fontSize) \|\| 12,`
`734`		`- 'text-offset': labelStyle.offsetX ? [labelStyle.offsetX / 10 \|\| 0, labelStyle.offsetY / 10 \|\| 0] : [0,-1.5],`
	`734`	`+ 'text-offset': labelStyle.offsetX ? [labelStyle.offsetX / 10 \|\| 0, labelStyle.offsetY / 10 \|\| 0] : [0, -1.5],`
`735`	`735`	`'text-font': ["DIN Offc Pro Italic", "Arial Unicode MS Regular"],`
`736`	`736`	`'visibility': layerInfo.visible`
`737`	`737`	`}`
`@@ -1715,6 +1715,7 @@ export class WebMap extends mapboxgl.Evented {`
`1715`	`1715`	`allFeatures[i].properties.lat = coordinate[1];`
`1716`	`1716`	`}`
`1717`	`1717`	`}`
	`1718`	`+ features.properties['index'] = i + '';`
`1718`	`1719`	`features.push(feature);`
`1719`	`1720`	`}`
`1720`	`1721`	`return features;`