From 4bea542def6e511c1b508b654d3e418de3694ad1 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 01 Jun 2018 16:26:31 +0800
Subject: [PATCH] 百度地图api 接口修改 适配
---
src/main/java/com/moral/service/impl/AreaServiceImpl.java | 9 ++++++---
src/main/webapp/js/moralmap.js | 22 +++++++++++++++-------
src/main/java/com/moral/controller/ScreenController.java | 2 --
3 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 773a1d0..5f18891 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -375,8 +375,6 @@
Account account = accountService.getAccountById(accountId);
String regionName = areaService.queryFullNameByCode(code);
if(account!=null&®ionName!=null){
- //������������
- regionName = regionName.replace(" ","");
Object sensors = sensorService.queryAll();
JSONObject params = new JSONObject();
params.put("regionCode",code);
diff --git a/src/main/java/com/moral/service/impl/AreaServiceImpl.java b/src/main/java/com/moral/service/impl/AreaServiceImpl.java
index fbf3730..1706532 100644
--- a/src/main/java/com/moral/service/impl/AreaServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/AreaServiceImpl.java
@@ -58,17 +58,20 @@
String cityCode = codeStr.substring(0,4)+"00";
City city = cityMapper.selectByPrimaryKey(Integer.valueOf(cityCode));
Area area = areaMapper.selectByPrimaryKey(code);
- fullName = province.getProvinceName()+city.getCityName()+area.getAreaName();
+ fullName = province.getProvinceName().replaceAll(" ", "")
+ +" "+city.getCityName().replaceAll(" ", "")
+ +" "+area.getAreaName().replaceAll(" ", "");
} else if(!codeStr.endsWith("0000")){
// ��������� ���������code
String provinceCode = codeStr.substring(0,2)+"0000";
Province province = provinceMapper.selectByPrimaryKey(Integer.valueOf(provinceCode));
City city = cityMapper.selectByPrimaryKey(code);
- fullName = province.getProvinceName()+city.getCityName();
+ fullName = province.getProvinceName().replaceAll(" ", "")
+ +" "+city.getCityName().replaceAll(" ", "");
} else {
// ��������� ���code
Province province = provinceMapper.selectByPrimaryKey(code);
- fullName = province.getProvinceName();
+ fullName = province.getProvinceName().replaceAll(" ", "");
}
return fullName;
}
diff --git a/src/main/webapp/js/moralmap.js b/src/main/webapp/js/moralmap.js
index c2b46ce..975ed08 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
--
Gitblit v1.8.0