Optimize GetAddressCodeTimeline

Author: guanguans

data/address_code_timeline.go

@@ -50,18 +50,13 @@ var addressCodeTimelineProvincePluck = map[uint8]func() map[uint32][]map[string]
 	83: addressCodeTimelineTaiWan,
 }
 
-func GetAddressCodeTimeline(code uint32) ([]map[string]string, bool) {
-	if code < 110000 || code > 830000 {
-		return []map[string]string{}, false
+func GetAddressCodeTimeline(code uint32) []map[string]string {
+	f := addressCodeTimelineProvincePluck[uint8(math.Floor(float64(code)/10000))]
+	if f == nil {
+		return []map[string]string{}
 	}
 
-	f, ok := addressCodeTimelineProvincePluck[uint8(math.Floor(float64(code)/10000))]
-	if !ok {
-		return []map[string]string{}, false
-	}
-
-	timeline, ok := f()[code]
-	return timeline, ok
+	return f()[code]
 }
 
 func addressCodeTimelineBeiJing() map[uint32][]map[string]string {

generator.go

@@ -116,7 +116,7 @@ func generatorBirthdayCode(addressCode string, address string, birthday string)
 	month := datePipeHandle(datePad(substr(birthday, 4, 6), "month"), "month")
 	day := datePipeHandle(datePad(substr(birthday, 6, 8), "day"), "day")
 
-	if timeline, ok := data.GetAddressCodeTimeline(cast.ToUint32(addressCode)); ok {
+	if timeline := data.GetAddressCodeTimeline(cast.ToUint32(addressCode)); len(timeline) > 0 {
 		for _, val := range timeline {
 			if val["address"] == address {
 				if val["start_year"] != "" {

helper.go

@@ -42,8 +42,8 @@ func getAddressInfo(addressCode string, birthdayCode string, strict bool) map[st
 // 获取省市区地址码
 func getAddress(addressCode string, birthdayCode string, strict bool) string {
 	address := ""
-	timeline, ok := data.GetAddressCodeTimeline(cast.ToUint32(addressCode))
-	if !ok {
+	timeline := data.GetAddressCodeTimeline(cast.ToUint32(addressCode))
+	if len(timeline) == 0 {
 		// 修复 \d\d\d\d01、\d\d\d\d02、\d\d\d\d11 和 \d\d\d\d20 的历史遗留问题
 		// 以上四种地址码，现实身份证真实存在，但民政部历年公布的官方地址码中可能没有查询到
 		// 如：440401 450111 等