diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserServiceImpl.java index cba023bbd..15909a4c9 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserServiceImpl.java @@ -914,23 +914,23 @@ public class AddressParserServiceImpl implements AddressParserService { } else if (standardAddressScore > 0) { 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; + matchLevelScore = 0.7; similarityScore = Math.max(streetScore, keywordScore * 0.8) * SIMILARITY_RATE; } else if (keywordScore > 0) { - matchLevelScore = 0.5; + matchLevelScore = 0.6; similarityScore = keywordScore * SIMILARITY_RATE; } else if (fuzzyKeywordsScore > 0) { if(address.hasCoordinate() && metaData.getLng() != null && GeoUtils.calculateDistance(address.getLng(), address.getLat(), metaData.getLng(), metaData.getLat()) < 100){ - matchLevelScore = 0.6; + matchLevelScore = 0.7; }else{ matchLevelScore = 0.4; } similarityScore = fuzzyKeywordsScore * SIMILARITY_RATE; + }else if(metaData.getId().equals(address.getPolygonSeaweedId())){ + matchLevelScore = 0.4; + similarityScore = 0.05; } if (similarityScore > 0) { if(metaData.getBuildingType() != null){