From 071adf2ca6063884b095544eff17f976a258cb4d Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 25 Jun 2018 16:49:10 +0800
Subject: [PATCH] 配置大屏新增文件
---
src/main/webapp/js/moralmap.js | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/main/webapp/js/moralmap.js b/src/main/webapp/js/moralmap.js
index c2b46ce..276078c 100644
--- a/src/main/webapp/js/moralmap.js
+++ b/src/main/webapp/js/moralmap.js
@@ -54,12 +54,21 @@
style: "normal" //������������������������������
}
map.setMapStyle(mapStyle);
- var showZoom = 13;
- if(arguments.length == 2) {
- map.centerAndZoom(new BMap.Point(arguments[0], arguments[1]), showZoom);
- } else if(arguments.length == 1) {
- map.centerAndZoom(arguments[0], showZoom);
- }
+ var showZoom = 12;
+ var address = arguments[0];
+ var regoinNames = address.split(" ");
+ var cityName = regoinNames.length>1?regoinNames[1]:regoinNames[0];
+ map.setCurrentCity(cityName);
+ // ���������������������������������������,���������������������
+ // ���������������������������
+ var myGeo = new BMap.Geocoder();
+ myGeo.getPoint(address, function(point){
+ if (point) {
+ map.centerAndZoom(point, showZoom);
+ }else{
+ alert("������������������������������������!");
+ }
+ }, cityName);
//������������������
map.enableScrollWheelZoom(true);
var navigation = new BMap.NavigationControl({
@@ -182,7 +191,6 @@
isOver = true;
moralMap.setMaxBounds(bs);
} else {
- debugger;
isOver = (bs.northeastLng > _bounds.northeastLng
|| bs.northeastLat > _bounds.northeastLat
|| bs.southwestLng < _bounds.southwestLng
@@ -428,7 +436,7 @@
state = stateObj["state"];
stateName = stateObj["stateName"];
var name = e['name'];
- if(moralMap.getUtf8Length(name) > 24) {
+ if(moralMap.getUtf8Length(name) > 22) {
var stop1 = 0;
for(var stop1_i = 0, len = 0; stop1_i < name.length; stop1_i++) {
len += ((name.charCodeAt(stop1_i) & 0xff00) != 0) ? 2 : 1;
--
Gitblit v1.8.0