fix Elasticsearch服务示例提示不正确

zhurc · zhurc · commit 4c40c69ff740 · 2017-06-15T15:47:48.000+08:00
diff --git a/examples/leaflet/timeFlow.html b/examples/leaflet/timeFlow.html
@@ -15,6 +15,10 @@
         .form-group label {
             width: 90px;
         }
+
+        .tips {
+            z-index: 1000;
+        }
     </style>
 </head>
 <body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%;position: absolute;top: 0;">
@@ -40,7 +44,8 @@
         liveDataSet,//渲染用实时点数据集
         trackDataSet,//渲染用历史轨迹线数据集
         planeStyles,
-        planeLabels,
+        planeLabels,//航班信息提示框集合
+        geoFenceLabels,//地理围栏信息提示框集合
         geoFenceLayer,
         dataUrl = "192.168.13.192:9200";
 
@@ -57,7 +62,7 @@
         initMap();
         liveESService = new SuperMap.ElasticSearchService(dataUrl, {
             change: renderLive,
-            outOfGeoFence: outOfGeoFence
+            outOfGeoFence: renderOutOfGeoFenceLabel
         });
         trackESService = new SuperMap.ElasticSearchService(dataUrl, {
             change: renderTrack
@@ -275,14 +280,26 @@
         }
     }
 
-    //超出地理围栏执行的回调操作
-    function outOfGeoFence(data) {
-        var source = data.hits.hits[0]._source;
-        var latLng = L.latLng(source.y, source.x);
-        var content = "<div style='color:red'>航班" + source.ident + "超出围栏</div>";
-        L.popup().setLatLng(latLng).setContent(content).openOn(map).addTo(map);
+    //更新地理围栏提示框
+    function renderOutOfGeoFenceLabel(data) {
+        geoFenceLabels = geoFenceLabels || {};
+        var content = data.hits.hits[0]._source;
+        var latlng = L.latLng(content.y, content.x);
+        var labelContent = "<div style='color:red'>航班" + content.ident + "超出地理围栏</div>";
+        if (!geoFenceLabels[content.ident]) {
+            geoFenceLabels[content.ident] = L.popup({
+                closeOnClick: false,
+                autoPan: false,
+                maxWidth: 180,
+                className: "tips",
+                offset: L.point(0, -1)
+            }).setContent(labelContent).setLatLng(latlng).addTo(map);
+        } else {
+            geoFenceLabels[content.ident].setLatLng(latlng).setContent(labelContent).openOn(map);
+        }
     }
 
+
     //点击开始之后配置地理围栏
     function setGeoFence() {
         var geoFence = getGeoFence();
@@ -525,8 +542,8 @@
             map.removeLayer(liveRenderer);
             liveRenderer = null;
         }
-        if(liveDataSet){
-            liveDataSet=null;
+        if (liveDataSet) {
+            liveDataSet = null;
         }
         if (planeLabels) {
             for (var item in planeLabels) {
