添加围栏,限制匹配小区区域
This commit is contained in:
+13
-8
@@ -898,7 +898,7 @@ public class AddressParserServiceImpl implements AddressParserService {
|
||||
if(name.length() == 2 && (name.equals(address.getOrgAddress()) || name.equals(address.getEffectiveAddress()))){
|
||||
keywordScore = Math.max(keywordScore, namePriority);
|
||||
}else if(name.length() > 3 && (address.getOrgAddrePinYin().contains(namePinYin) || enhanceContains(address.getOrgAddress(), name))){
|
||||
double similar = AddressParserUtil.getSimilarityRatio(name, address.getEffectiveAddress());
|
||||
double similar = AddressParserUtil.getSimilarityRatio(name, address.getOrgAddress());
|
||||
if(similar == 1){
|
||||
keywordScore = Math.max(similar, keywordScore) * namePriority * 1.0001;
|
||||
}else if(similar > 0.1){
|
||||
@@ -910,23 +910,28 @@ public class AddressParserServiceImpl implements AddressParserService {
|
||||
|
||||
double matchLevelScore = 0;
|
||||
double similarityScore = 0;
|
||||
if(metaData.getId().equals(address.getPolygonSeaweedId())){
|
||||
if (standardAddressScore > 0 && keywordScore > 0) {
|
||||
matchLevelScore = 0.9;
|
||||
similarityScore = 0.05;
|
||||
}else if (standardAddressScore > 0 && keywordScore > 0) {
|
||||
matchLevelScore = 0.8;
|
||||
similarityScore = Math.max(standardAddressScore, keywordScore) * SIMILARITY_RATE;
|
||||
} else if (standardAddressScore > 0) {
|
||||
matchLevelScore = 0.7;
|
||||
matchLevelScore = 0.8;
|
||||
similarityScore = standardAddressScore * SIMILARITY_RATE;
|
||||
}else if(metaData.getId().equals(address.getPolygonSeaweedId())){
|
||||
matchLevelScore = 0.7;
|
||||
similarityScore = 0.05;
|
||||
} else if(keywordScore > 0 && streetScore > 0){
|
||||
matchLevelScore = 0.6;
|
||||
similarityScore = Math.max(streetScore, keywordScore * 0.8) * SIMILARITY_RATE;
|
||||
} else if (keywordScore > 0) {
|
||||
matchLevelScore = 0.6;
|
||||
matchLevelScore = 0.5;
|
||||
similarityScore = keywordScore * SIMILARITY_RATE;
|
||||
} else if (fuzzyKeywordsScore > 0) {
|
||||
matchLevelScore = 0.4;
|
||||
if(address.hasCoordinate() && metaData.getLng() != null && GeoUtils.calculateDistance(address.getLng(), address.getLat(),
|
||||
metaData.getLng(), metaData.getLat()) < 100){
|
||||
matchLevelScore = 0.6;
|
||||
}else{
|
||||
matchLevelScore = 0.4;
|
||||
}
|
||||
similarityScore = fuzzyKeywordsScore * SIMILARITY_RATE;
|
||||
}
|
||||
if (similarityScore > 0) {
|
||||
|
||||
+10
-7
@@ -25,13 +25,16 @@ public class GeoProcessor extends AbstractAddressProcessor {
|
||||
|
||||
@Override
|
||||
public RepeatStatus process(Address address) {
|
||||
logger.info("Geo Start");
|
||||
if (address.hasCoordinate()) {
|
||||
return RepeatStatus.NEXT;
|
||||
}
|
||||
String addr = address.getEffectiveAddress();
|
||||
if(addr == null || addr.length() < 3){
|
||||
addr = address.getOrgAddress();
|
||||
}
|
||||
HttpRequest request = new HttpRequest();
|
||||
Map<String, String> params = new HashMap<String, String>();
|
||||
params.put("address", address.getOrgAddress());
|
||||
params.put("address", addr);
|
||||
params.put("key", KEY);
|
||||
params.put("city", address.getCity());
|
||||
params.put("output", "json");
|
||||
@@ -52,11 +55,11 @@ public class GeoProcessor extends AbstractAddressProcessor {
|
||||
}
|
||||
if(POI_LEVELS.contains(json.getString("level"))){
|
||||
//对于门牌号级别的POI,formatted_address中包含|代表是推测出来的路号,重庆市巴南区凤林路|808号,|号楼
|
||||
// if("门牌号".equals(json.getString("level"))){
|
||||
// if(!(json.get("number") instanceof JSONArray) && json.getString("formatted_address").contains("|" + json.getString("number"))){
|
||||
// return RepeatStatus.NEXT;
|
||||
// }
|
||||
// }
|
||||
if("门牌号".equals(json.getString("level"))){
|
||||
if(!(json.get("number") instanceof JSONArray) && json.getString("formatted_address").contains("|" + json.getString("number"))){
|
||||
return RepeatStatus.NEXT;
|
||||
}
|
||||
}
|
||||
String location = json.getString("location");
|
||||
address.setLng(Double.valueOf(location.split(",")[0]));
|
||||
address.setLat(Double.valueOf(location.split(",")[1]));
|
||||
|
||||
+2
-4
@@ -42,12 +42,10 @@ public class TooltipProcessor extends AbstractAddressProcessor {
|
||||
if(matchFirst(AddressParserPatterns.STREET, tooltip) != null){
|
||||
address.setTooltip(tooltip);
|
||||
address.setStreet(getStreet(tooltip));
|
||||
} else if(containsDistrictName(tooltip)){
|
||||
address.setTooltip(tooltip);
|
||||
} else if(RegionData.isRegion(address.getCity(), tooltip)){
|
||||
}else if(RegionData.isRegion(address.getCity(), tooltip)){
|
||||
address.setSuggestDistrict(tooltip);
|
||||
}else{
|
||||
address.addNosie(tooltip);
|
||||
address.setTooltip(tooltip);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user