地址标准化优化
This commit is contained in:
+16
-13
@@ -206,10 +206,10 @@ public class AddressParserServiceImpl implements AddressParserService {
|
||||
}
|
||||
}
|
||||
if(StringUtils.isBlank(matchedBuilding.getProvince())){
|
||||
matchedBuilding.setProvince(aliyunBo.getProv());
|
||||
matchedBuilding.setProvince(formatProvince(aliyunBo.getProv()));
|
||||
}
|
||||
if(StringUtils.isBlank(matchedBuilding.getCity())){
|
||||
matchedBuilding.setCity(aliyunBo.getCity());
|
||||
matchedBuilding.setCity(RegionData.formatCity(aliyunBo.getCity()));
|
||||
}
|
||||
matchedBuilding.setStreet(aliyunBo.getRoad());
|
||||
matchedBuilding.setStreetno(aliyunBo.getRoadno());
|
||||
@@ -219,7 +219,7 @@ public class AddressParserServiceImpl implements AddressParserService {
|
||||
addr.setDevelopmentZone(aliyunBo.getDevzone());
|
||||
}
|
||||
if(StringUtils.isBlank(addr.getDistrict())){
|
||||
addr.setDistrict(aliyunBo.getDistrict());
|
||||
addr.setDistrict(RegionData.formatRegion(aliyunBo.getDistrict()));
|
||||
}
|
||||
if(StringUtils.isBlank(addr.getTownship())){
|
||||
addr.setTownship(aliyunBo.getTown());
|
||||
@@ -236,6 +236,16 @@ public class AddressParserServiceImpl implements AddressParserService {
|
||||
matchedBuilding.setSearchAddress(addr);
|
||||
}
|
||||
|
||||
String formatProvince(String province){
|
||||
Map<String, List<String>> provinceData = ProvinceData.getAllProvince();
|
||||
for (String name : provinceData.keySet()) {
|
||||
if(province.contains(name)){
|
||||
return name;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
Building findMatchedBuilding(Address addr,BuildingType buildingType, MetaDataType metaDataType){
|
||||
|
||||
AddressScoreResult scoreResult = findMatchedMetaData(addr, buildingType, metaDataType);
|
||||
@@ -916,15 +926,13 @@ public class AddressParserServiceImpl implements AddressParserService {
|
||||
if(StringUtils.isNotBlank(address.getStreet())){
|
||||
formattedAddressBuilder.append(address.getStreet());
|
||||
}
|
||||
if("上海".equals(address.getCity()) && StringUtils.isNotBlank(address.getStreet()) && !address.getStreet().endsWith("弄")){
|
||||
if(StringUtils.isNotBlank(address.getStreetNumber())){
|
||||
formattedAddressBuilder.append(address.getStreetNumber());
|
||||
}
|
||||
if(StringUtils.isNotBlank(address.getStreet()) && StringUtils.isNotBlank(address.getStreetNumber())){
|
||||
formattedAddressBuilder.append(address.getStreetNumber());
|
||||
}
|
||||
if(StringUtils.isBlank(address.getStreet()) && StringUtils.isNotBlank(building.getAddress())){
|
||||
formattedAddressBuilder.append(building.getAddress());
|
||||
}
|
||||
if(StringUtils.isNotBlank(building.getSuggestName()) && building.getSuggestName().equals(address.getOrgKeywords())){
|
||||
if(StringUtils.isNotBlank(building.getSuggestName())){
|
||||
formattedAddressBuilder.append(building.getSuggestName());
|
||||
}
|
||||
if(StringUtils.isBlank(building.getSuggestName())){
|
||||
@@ -934,11 +942,6 @@ public class AddressParserServiceImpl implements AddressParserService {
|
||||
formattedAddressBuilder.append(address.getOrgKeywords());
|
||||
}
|
||||
}
|
||||
if("上海".equals(address.getCity()) && StringUtils.isNotBlank(address.getStreet()) && address.getStreet().endsWith("弄")){
|
||||
if(StringUtils.isNotBlank(address.getStreetNumber())){
|
||||
formattedAddressBuilder.append(address.getStreetNumber());
|
||||
}
|
||||
}
|
||||
if(StringUtils.isNotBlank(address.getOrgBuildingNumber())){
|
||||
if(StringUtils.isNotBlank(address.getStreet()) && address.getStreet().endsWith("弄")
|
||||
&& StringUtils.isNotBlank(address.getStreetNumber())
|
||||
|
||||
Reference in New Issue
Block a user