|
@@ -1389,8 +1389,9 @@
|
|
|
|
|
|
let encrypt_low = this_.bd_encrypt(this_.map.getBounds().southwest.lng,this_.map.getBounds().southwest.lat,this_.mapTCtype == 'Satellite')
|
|
let encrypt_low = this_.bd_encrypt(this_.map.getBounds().southwest.lng,this_.map.getBounds().southwest.lat,this_.mapTCtype == 'Satellite')
|
|
let encrypt_high = this_.bd_encrypt(this_.map.getBounds().northeast.lng,this_.map.getBounds().northeast.lat,this_.mapTCtype == 'Satellite')
|
|
let encrypt_high = this_.bd_encrypt(this_.map.getBounds().northeast.lng,this_.map.getBounds().northeast.lat,this_.mapTCtype == 'Satellite')
|
|
-
|
|
|
|
- this_.cluster.clearMarkers();
|
|
|
|
|
|
+ if(this_.cluster){
|
|
|
|
+ this_.cluster.clearMarkers();
|
|
|
|
+ }
|
|
baseApi.ajax_post(
|
|
baseApi.ajax_post(
|
|
allUrl.gisMap.mapGet,
|
|
allUrl.gisMap.mapGet,
|
|
{
|
|
{
|
|
@@ -2837,7 +2838,9 @@
|
|
this.mapDataListHC.splice(key,1)
|
|
this.mapDataListHC.splice(key,1)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- this.cluster.clearMarkers();
|
|
|
|
|
|
+ if(this.cluster){
|
|
|
|
+ this.cluster.clearMarkers();
|
|
|
|
+ }
|
|
if(this.browserLanguage == 'bd'){
|
|
if(this.browserLanguage == 'bd'){
|
|
this.mapGet('del',false,this.mapDataListHC);
|
|
this.mapGet('del',false,this.mapDataListHC);
|
|
}else{
|
|
}else{
|
|
@@ -2871,7 +2874,9 @@
|
|
this.mapDataListHC.splice(key,1)
|
|
this.mapDataListHC.splice(key,1)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- this.cluster.clearMarkers();
|
|
|
|
|
|
+ if(this.cluster){
|
|
|
|
+ this.cluster.clearMarkers();
|
|
|
|
+ }
|
|
if(this.browserLanguage == 'bd'){
|
|
if(this.browserLanguage == 'bd'){
|
|
this.mapGet('del',false,this.mapDataListHC);
|
|
this.mapGet('del',false,this.mapDataListHC);
|
|
}else{
|
|
}else{
|
|
@@ -3175,7 +3180,9 @@
|
|
d.longitude = wgs84togcj02.lng
|
|
d.longitude = wgs84togcj02.lng
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- this_.cluster.clearMarkers();
|
|
|
|
|
|
+ if(this_.cluster){
|
|
|
|
+ this_.cluster.clearMarkers();
|
|
|
|
+ }
|
|
this_.mapGet('lamp',[this_.lampLongitude,this_.lampLatitude],this_.mapDataListHC);
|
|
this_.mapGet('lamp',[this_.lampLongitude,this_.lampLatitude],this_.mapDataListHC);
|
|
this_.lampId = '-1';
|
|
this_.lampId = '-1';
|
|
this_.monitorId = '-1';
|
|
this_.monitorId = '-1';
|
|
@@ -3194,7 +3201,9 @@
|
|
}else{
|
|
}else{
|
|
$('.lamp_'+this_.lampId).css('display','block')
|
|
$('.lamp_'+this_.lampId).css('display','block')
|
|
}
|
|
}
|
|
- this_.cluster.clearMarkers();
|
|
|
|
|
|
+ if(this_.cluster){
|
|
|
|
+ this_.cluster.clearMarkers();
|
|
|
|
+ }
|
|
let gcj02towgs84 = this_.gcj02towgs84(this_.lampLongitude,this_.lampLatitude)
|
|
let gcj02towgs84 = this_.gcj02towgs84(this_.lampLongitude,this_.lampLatitude)
|
|
this_.mapGet('lamp',[gcj02towgs84.bd_lng,gcj02towgs84.bd_lat],this_.mapDataListHC);
|
|
this_.mapGet('lamp',[gcj02towgs84.bd_lng,gcj02towgs84.bd_lat],this_.mapDataListHC);
|
|
this_.lampId = '-1';
|
|
this_.lampId = '-1';
|
|
@@ -4119,7 +4128,9 @@
|
|
let encrypt_low = this_.gcj02towgs84(this_.map.getBounds().southwest.lng,this_.map.getBounds().southwest.lat)
|
|
let encrypt_low = this_.gcj02towgs84(this_.map.getBounds().southwest.lng,this_.map.getBounds().southwest.lat)
|
|
let encrypt_high = this_.gcj02towgs84(this_.map.getBounds().northeast.lng,this_.map.getBounds().northeast.lat)
|
|
let encrypt_high = this_.gcj02towgs84(this_.map.getBounds().northeast.lng,this_.map.getBounds().northeast.lat)
|
|
|
|
|
|
- this_.cluster.clearMarkers();
|
|
|
|
|
|
+ if(this_.cluster){
|
|
|
|
+ this_.cluster.clearMarkers();
|
|
|
|
+ }
|
|
baseApi.ajax_post(
|
|
baseApi.ajax_post(
|
|
allUrl.gisMap.mapGet,
|
|
allUrl.gisMap.mapGet,
|
|
{
|
|
{
|
|
@@ -4156,7 +4167,9 @@
|
|
let encrypt_low = this_.gcj02towgs84(this_.map.getBounds().southwest.lng,this_.map.getBounds().southwest.lat)
|
|
let encrypt_low = this_.gcj02towgs84(this_.map.getBounds().southwest.lng,this_.map.getBounds().southwest.lat)
|
|
let encrypt_high = this_.gcj02towgs84(this_.map.getBounds().northeast.lng,this_.map.getBounds().northeast.lat)
|
|
let encrypt_high = this_.gcj02towgs84(this_.map.getBounds().northeast.lng,this_.map.getBounds().northeast.lat)
|
|
|
|
|
|
- this_.cluster.clearMarkers();
|
|
|
|
|
|
+ if(this_.cluster){
|
|
|
|
+ this_.cluster.clearMarkers();
|
|
|
|
+ }
|
|
baseApi.ajax_post(
|
|
baseApi.ajax_post(
|
|
allUrl.gisMap.mapGet,
|
|
allUrl.gisMap.mapGet,
|
|
{
|
|
{
|
|
@@ -4399,22 +4412,23 @@
|
|
this_.lamp_editFun();
|
|
this_.lamp_editFun();
|
|
}
|
|
}
|
|
},1)
|
|
},1)
|
|
- if(this_.map.getZoom() > 16){
|
|
|
|
- this_.cluster = new AMap.MarkerClusterer(this_.map,this_.markers,{
|
|
|
|
- gridSize:52,
|
|
|
|
- minClusterSize:2,
|
|
|
|
- maxZoom:2,
|
|
|
|
- renderCluserMarker:this_._renderCluserMarker
|
|
|
|
- });
|
|
|
|
- }else{
|
|
|
|
- let number = parseInt(this_.markers.length)
|
|
|
|
- this_.cluster = new AMap.MarkerClusterer(this_.map,this_.markers,{
|
|
|
|
- gridSize:52,
|
|
|
|
- minClusterSize:2,
|
|
|
|
- maxZoom:number*100,
|
|
|
|
- renderCluserMarker:this_._renderCluserMarker
|
|
|
|
- });
|
|
|
|
- }
|
|
|
|
|
|
+ this_.map.add(this_.markers);
|
|
|
|
+ // if(this_.map.getZoom() > 16){
|
|
|
|
+ // this_.cluster = new AMap.MarkerClusterer(this_.map,this_.markers,{
|
|
|
|
+ // gridSize:52,
|
|
|
|
+ // minClusterSize:2,
|
|
|
|
+ // maxZoom:2,
|
|
|
|
+ // renderCluserMarker:this_._renderCluserMarker
|
|
|
|
+ // });
|
|
|
|
+ // }else{
|
|
|
|
+ // let number = parseInt(this_.markers.length)
|
|
|
|
+ // this_.cluster = new AMap.MarkerClusterer(this_.map,this_.markers,{
|
|
|
|
+ // gridSize:52,
|
|
|
|
+ // minClusterSize:2,
|
|
|
|
+ // maxZoom:number*100,
|
|
|
|
+ // renderCluserMarker:this_._renderCluserMarker
|
|
|
|
+ // });
|
|
|
|
+ // }
|
|
});
|
|
});
|
|
},
|
|
},
|
|
videoListGet(callback){
|
|
videoListGet(callback){
|