make working hours, weekdays configurable by impl ntg

broker/job.go

@@ -4,7 +4,7 @@ import (
 	"encoding/base64"
 	"fmt"
 	"local/truckstop/config"
-	"local/truckstop/logtr"
+	"local/truckstop/zip"
 	"strings"
 	"time"
 )
@@ -86,9 +86,17 @@ func (j Job) FormatMultilineText() string {
 	}
 	out := ""
 	clients := config.Clients(j.Pickup.Date)
+	useZip := config.Get().Brokers.UseZips
+	zipRadius := config.Get().Brokers.RadiusMiles
+	jobZip := zip.FromCityState(j.Pickup.City, j.Pickup.State)
 	for k := range clients {
-		logtr.Debugf("job multiline: %+v contains %s then use %v", clients[k].States, j.Pickup.State, k)
-		if strings.Contains(fmt.Sprint(clients[k].States), j.Pickup.State) {
+		should := strings.Contains(fmt.Sprint(clients[k].States), j.Pickup.State)
+		if useZip {
+			for _, z := range clients[k].Zips {
+				should = should || zip.Get(z).MilesTo(jobZip) <= zipRadius
+			}
+		}
+		if should {
 			if len(out) > 0 {
 				out += "\n"
 			}

broker/ntgvision.go

@@ -9,6 +9,7 @@ import (
 	"io/ioutil"
 	"local/truckstop/config"
 	"local/truckstop/logtr"
+	"local/truckstop/zip"
 	"net/http"
 	"time"
 )
@@ -188,10 +189,75 @@ func (ntg NTGVision) searchJob(id int64) (ntgVisionJobInfo, error) {
 }
 
 func (ntg NTGVision) SearchZips(zips []string) ([]Job, error) {
-	return nil, errors.New("not impl: ntg search zips")
+	radius := config.Get().Brokers.RadiusMiles
+	statesm := map[string]struct{}{}
+	for _, z := range zips {
+		somestates := zip.GetStatesWithin(zip.Get(z), radius)
+		for _, state := range somestates {
+			statesm[state] = struct{}{}
+		}
+	}
+	states := make([]config.State, 0, len(statesm))
+	for state := range statesm {
+		states = append(states, config.State(state))
+	}
+	if len(states) == 0 {
+		return nil, fmt.Errorf("failed to map zipcodes %+v to any states", zips)
+	}
+	jobs, err := ntg.SearchStates(states)
+	if err != nil {
+		return nil, err
+	}
+	for i := len(jobs) - 1; i >= 0; i-- {
+		ok := false
+		for _, z := range zips {
+			ok = ok || zip.Get(z).MilesTo(zip.FromCityState(jobs[i].Pickup.City, jobs[i].Pickup.State)) <= radius
+		}
+		if !ok {
+			jobs[i], jobs[len(jobs)-1] = jobs[len(jobs)-1], jobs[i]
+			jobs = jobs[:len(jobs)-1]
+		}
+	}
+	return jobs, nil
+}
+
+func (ntg NTGVision) workingHours(now time.Time) bool {
+	// TODO assert M-F 9-4 EST
+	now = now.In(time.FixedZone("EST", -5*60*60))
+	working := config.Get().Brokers.NTG.Working
+	logtr.Debugf("ntg.workingHours: now=%s, weekday=%v, hour=%v (ok=%+v)", now.String(), now.Weekday(), now.Hour(), working)
+	if ok := func() bool {
+		for _, hr := range working.Hours {
+			if now.Hour() == hr {
+				return true
+			}
+		}
+		return false
+	}(); !ok {
+		return false
+	}
+	if ok := func() bool {
+		for _, weekday := range working.Weekdays {
+			if now.Weekday() == time.Weekday(weekday) {
+				return true
+			}
+		}
+		return false
+	}(); !ok {
+		return false
+	}
+	return true
 }
 
 func (ntg NTGVision) SearchStates(states []config.State) ([]Job, error) {
+	if !ntg.workingHours(time.Now()) {
+		lastNtgB, _ := config.Get().DB().Get("ntg_last_search_states")
+		var jobs []Job
+		json.Unmarshal(lastNtgB, &jobs)
+		logtr.Verbosef("ntg.SearchStates: outside of working hours so returning ntg_last_search_states: %+v", jobs)
+		return jobs, nil
+	}
+
 	rc, err := ntg.searcher.searchStates(states)
 	if err != nil {
 		return nil, err
@@ -207,12 +273,22 @@ func (ntg NTGVision) SearchStates(states []config.State) ([]Job, error) {
 
 	var ntgjobs []ntgVisionJob
 	err = json.Unmarshal(b, &ntgjobs)
+	if err != nil {
+		return nil, err
+	}
 
 	jobs := make([]Job, len(ntgjobs))
 	for i := range jobs {
 		jobs[i] = ntgjobs[i].Job()
 	}
-	return jobs, err
+
+	jobsB, err := json.Marshal(jobs)
+	if err == nil {
+		config.Get().DB().Set("ntg_last_search_states", jobsB)
+		logtr.Verbosef("ntg.SearchStates: in working hours so setting ntg_last_search_states: %+v", jobs)
+	}
+
+	return jobs, nil
 }
 
 func getNTGTokenKey() string {
@@ -304,7 +380,7 @@ func (ntg NTGVision) _searchStates(states []config.State) (io.ReadCloser, error)
 		request2, _ := ntg.newRequest(states)
 		requestb, _ := ioutil.ReadAll(request2.Body)
 		logtr.Debugf("ntg auth bad status: url=%s, status=%v, body=%s, headers=%+v, request=%+v, requestb=%s", request.URL.String(), resp.StatusCode, b, resp.Header, request2, requestb)
-		if resp.StatusCode > 400 && resp.StatusCode < 404 {
+		if resp.StatusCode > 400 && resp.StatusCode < 404 || resp.StatusCode == 417 { // TODO wtf is 417 for
 			logtr.Debugf("ntg auth bad status: err no auth")
 			return nil, ErrNoAuth
 		}

broker/ntgvision_test.go

@@ -0,0 +1,22 @@
+package broker
+
+import (
+	"local/truckstop/config"
+	"os"
+	"testing"
+	"time"
+)
+
+func TestWorkingHoursNTG(t *testing.T) {
+	os.Setenv("CONFIG", "../config.json")
+	if err := config.Refresh(nil); err != nil {
+		t.Fatal(err)
+	}
+	ntg := NTGVision{}
+	if !ntg.workingHours(time.Date(2022, 1, 27, 12, 0, 0, 0, time.FixedZone("MST", -7*60*60))) {
+		t.Fatal("noon MST not ok")
+	}
+	if ntg.workingHours(time.Date(2022, 1, 27, 23, 0, 0, 0, time.FixedZone("MST", -7*60*60))) {
+		t.Fatal("midnight MST ok")
+	}
+}

config.json

@@ -1,7 +1,7 @@
 {
    "Log": {
       "Path": "/tmp/truckstop.log",
-      "Level": "debug",
+      "Level": "DEB",
       "SOSMatrix": {
          "ReceiveEnabled": true,
          "Mock": false,
@@ -49,7 +49,9 @@
             "NC"
          ],
          "Zips": [
-            "27006"
+            "27006",
+            "73044",
+            "84058"
          ],
          "IDs": {
             "Matrix": "@bel:m.bltrucks.top"
@@ -75,21 +77,25 @@
    "Once": false,
    "Brokers": {
       "UseZips": true,
-		"RadiusMiles": 100,
+      "RadiusMiles": 200,
+      "NTG": {
+         "Working": {
+            "Hours": [6, 7, 8, 9, 10, 11, 12, 13, 14, 15],
+            "Weekdays": [1, 2, 3, 4, 5]
+         },
+         "Enabled": false,
+         "JobInfo": true,
+         "Mock": true,
+         "LoadPageURIFormat": "https://ntgvision.com/LoadDetails?loadId=%d",
+         "LoadPageAPIURIFormat": "https://ntgvision.com/api/v1/load/LoadDetails?loadId=%d",
+         "Username": "noeasyrunstrucking@gmail.com",
+         "Password": "thumper12345"
+      },
       "FastExact": {
          "Enabled": true,
          "Mock": true,
          "Username": "birdman",
          "Password": "166647"
-      },
-      "NTG": {
-         "Enabled": false,
-         "JobInfo": true,
-         "Mock": true,
-         "LoadPageURIFormat": "https://ntgvision.com/LoadDetails?loadId=%d",
-         "LoadPageAPIURIFormat": "https://ntgvision.com/api/v1/load/LoadDetails?loadId==%d",
-         "Username": "noeasyrunstrucking@gmail.com",
-         "Password": "thumper12345"
       }
    }
 }

config.main_test.json

@@ -83,11 +83,15 @@
          "Password": "p"
       },
       "NTG": {
+         "Working": {
+            "Hours": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23],
+            "Weekdays": [0, 1, 2, 3, 4, 5, 6]
+         },
          "Enabled": true,
          "JobInfo": true,
          "Mock": true,
          "LoadPageURIFormat": "https://ntgvision.com/LoadDetails?loadId=%d",
-         "LoadPageAPIURIFormat": "https://ntgvision.com/api/v1/load/LoadDetails?loadId==%d",
+         "LoadPageAPIURIFormat": "https://ntgvision.com/api/v1/load/LoadDetails?loadId=%d",
          "Username": "noeasyrunstrucking@gmail.com",
          "Password": "thumper1234"
       }

config/config.go

@@ -67,6 +67,10 @@ type Config struct {
 		UseZips     bool
 		RadiusMiles int
 		NTG         struct {
+			Working struct {
+				Hours    []int
+				Weekdays []int
+			}
 			Enabled              bool
 			JobInfo              bool
 			Mock                 bool

main.go

@@ -13,12 +13,14 @@ import (
 	"net/url"
 	"regexp"
 	"sort"
+	"strconv"
 	"strings"
 	"sync"
 	"time"
 )
 
 var stateFinder = regexp.MustCompile(`[A-Za-z]+`)
+var zipFinder = regexp.MustCompile(`[0-9]{5}[0-9]*`)
 
 func main() {
 	if err := _main(); err != nil {
@@ -62,15 +64,15 @@ func _main() error {
 }
 
 func matrixrecv() error {
-	logtr.Debugf("checking matrix...")
-	defer logtr.Debugf("/checking matrix...")
+	logtr.Verbosef("checking matrix...")
+	defer logtr.Verbosef("/checking matrix...")
 	sender := message.NewMatrix()
 	messages, err := sender.Receive()
 	if err != nil {
 		return err
 	}
 	func() {
-		logtr.Debugf("looking for help")
+		logtr.Verbosef("looking for help")
 		printed := false
 		for _, msg := range messages {
 			if !strings.HasPrefix(msg.Content, "!help") {
@@ -81,7 +83,11 @@ func matrixrecv() error {
 			if !printed {
 				if _, err := db.Get(key); err == storage.ErrNotFound {
 					logtr.Debugf("sending help")
-					help := fmt.Sprintf("commands:\n...`!help`   print this help\n...`!state nc NC nC Nc`   set states for self\n...`!available 2022-12-31`   set date self is available for work\n\nrun a command for someone else: `!state ga @caleb`")
+					locationHelp := "`!state nc NC nC Nc`   set states for self"
+					if config.Get().Brokers.UseZips {
+						locationHelp = "...`!zip 27006 84058` to set zip codes for self\n...`!radius 100` to set miles radius to 100, 200, or 300"
+					}
+					help := fmt.Sprintf("commands:\n...`!help`   print this help\n%s\n\nrun a command for someone else: `!zip 2022-12-31 @caleb`", locationHelp)
 					if err := sender.Send(help); err != nil {
 						logtr.Errorf("failed to send help: %v", err)
 					} else {
@@ -99,7 +105,31 @@ func matrixrecv() error {
 		}
 	}()
 	func() {
-		logtr.Debugf("looking for states")
+		logtr.Verbosef("looking for zips")
+		db := config.Get().DB()
+		zips := map[string]map[string]struct{}{}
+		for _, msg := range messages {
+			key := fmt.Sprintf("zips_%d", msg.Timestamp.Unix())
+			if !strings.HasPrefix(msg.Content, "!zip") {
+				continue
+			}
+			if _, ok := zips[msg.Sender]; ok {
+				continue
+			}
+			if _, err := db.Get(key); err == storage.ErrNotFound {
+				zips[msg.Sender] = map[string]struct{}{}
+				for _, zip := range parseOutZips([]byte(msg.Content)) {
+					zips[msg.Sender][zip] = struct{}{}
+				}
+			}
+			if err := db.Set(key, []byte{'k'}); err != nil {
+				logtr.Errorf("failed to mark state gathered @%s: %v", key, err)
+			}
+		}
+		setNewZips(zips)
+	}()
+	func() {
+		logtr.Verbosef("looking for states")
 		db := config.Get().DB()
 		states := map[string]map[config.State]struct{}{}
 		for _, msg := range messages {
@@ -123,7 +153,32 @@ func matrixrecv() error {
 		setNewStates(states)
 	}()
 	func() {
-		logtr.Debugf("looking for pauses")
+		logtr.Verbosef("looking for radius")
+		db := config.Get().DB()
+		var radius *int
+		for _, msg := range messages {
+			key := fmt.Sprintf("radius_%d", msg.Timestamp.Unix())
+			if !strings.HasPrefix(msg.Content, "!radius ") {
+				continue
+			}
+			if _, err := db.Get(key); err == storage.ErrNotFound {
+				cmd := msg.Content
+				for strings.HasPrefix(cmd, "!radius ") {
+					cmd = strings.TrimPrefix(cmd, "!radius ")
+				}
+				n, err := strconv.Atoi(strings.TrimSpace(cmd))
+				if err == nil {
+					radius = &n
+				}
+			}
+			if err := db.Set(key, []byte{'k'}); err != nil {
+				logtr.Errorf("failed to mark radius gathered @%s: %v", key, err)
+			}
+		}
+		setNewRadius(radius)
+	}()
+	func() {
+		logtr.Verbosef("looking for pauses")
 		db := config.Get().DB()
 		pauses := map[string]time.Time{}
 		for _, msg := range messages {
@@ -154,6 +209,33 @@ func matrixrecv() error {
 	return nil
 }
 
+func setNewRadius(radius *int) {
+	if radius == nil {
+		return
+	}
+	sender := message.NewMatrix()
+	logtr.Debugf("set new radius: %d", *radius)
+	acceptable := map[int]struct{}{
+		100: struct{}{},
+		200: struct{}{},
+		300: struct{}{},
+	}
+	if _, ok := acceptable[*radius]; !ok {
+		sender.Send(fmt.Sprintf("radius of %v is not among acceptable %+v", *radius, acceptable))
+		logtr.Debugf("bad radius, not setting: %d", *radius)
+		return
+	}
+	conf := *config.Get()
+	if conf.Brokers.RadiusMiles == *radius {
+		logtr.Debugf("noop radius, not setting: %d", *radius)
+		return
+	}
+	conf.Brokers.RadiusMiles = *radius
+	logtr.Infof("updating config new pauses: %+v", conf)
+	config.Set(conf)
+	sender.Send(fmt.Sprintf("now using radius of %d mi for zip code search", *radius))
+}
+
 func setNewPauses(pauses map[string]time.Time) {
 	if len(pauses) == 0 {
 		return
@@ -182,6 +264,41 @@ func setNewPauses(pauses map[string]time.Time) {
 	}
 }
 
+func setNewZips(zips map[string]map[string]struct{}) {
+	if len(zips) == 0 {
+		return
+	}
+	conf := *config.Get()
+	changed := map[string][]string{}
+	for client, clientZips := range zips {
+		newzips := []string{}
+		for k := range clientZips {
+			newzips = append(newzips, k)
+		}
+		sort.Slice(newzips, func(i, j int) bool {
+			return newzips[i] < newzips[j]
+		})
+		clientconf := conf.Clients[client]
+		if fmt.Sprint(newzips) == fmt.Sprint(clientconf.Zips) {
+			message.NewMatrix().Send(fmt.Sprintf("%s: still searching for %+v", client, newzips))
+			continue
+		}
+		clientconf.Zips = newzips
+		conf.Clients[client] = clientconf
+		changed[client] = newzips
+	}
+	if len(changed) == 0 {
+		return
+	}
+	logtr.Infof("updating config new zips: %+v", conf)
+	config.Set(conf)
+	for client, zips := range changed {
+		if err := sendNewZips(client, zips); err != nil {
+			logtr.Errorf("failed to send new zips %s/%+v: %v", client, zips, err)
+		}
+	}
+}
+
 func setNewStates(states map[string]map[config.State]struct{}) {
 	if len(states) == 0 {
 		return
@@ -217,6 +334,18 @@ func setNewStates(states map[string]map[config.State]struct{}) {
 	}
 }
 
+func parseOutZips(b []byte) []string {
+	var zips []string
+	candidates := zipFinder.FindAll(b, -1)
+	for _, candidate := range candidates {
+		if len(candidate) != 5 {
+			continue
+		}
+		zips = append(zips, string(candidate))
+	}
+	return zips
+}
+
 func parseOutStates(b []byte) []config.State {
 	var states []config.State
 	var state config.State
@@ -313,11 +442,39 @@ func once() error {
 }
 
 func getJobs() ([]broker.Job, error) {
+	if config.Get().Brokers.UseZips {
+		return getJobsZips()
+	}
 	return getJobsStates()
 }
 
+func getJobsZips() ([]broker.Job, error) {
+	zips := config.AllZips()
+	jobs := []broker.Job{}
+	for _, broker := range getBrokers() {
+		somejobs, err := broker.SearchZips(zips)
+		if err != nil {
+			return nil, err
+		}
+		jobs = append(jobs, somejobs...)
+	}
+	return jobs, nil
+}
+
 func getJobsStates() ([]broker.Job, error) {
 	states := config.AllStates()
+	jobs := []broker.Job{}
+	for _, broker := range getBrokers() {
+		somejobs, err := broker.SearchStates(states)
+		if err != nil {
+			return nil, err
+		}
+		jobs = append(jobs, somejobs...)
+	}
+	return jobs, nil
+}
+
+func getBrokers() []broker.Broker {
 	brokers := []broker.Broker{}
 	if config.Get().Brokers.NTG.Enabled {
 		logtr.Debugf("NTG enabled")
@@ -327,16 +484,7 @@ func getJobsStates() ([]broker.Job, error) {
 		logtr.Debugf("FastExact enabled")
 		brokers = append(brokers, broker.NewFastExact())
 	}
-	logtr.Debugf("brokers=%+v", brokers)
-	jobs := []broker.Job{}
-	for _, broker := range brokers {
-		somejobs, err := broker.SearchStates(states)
-		if err != nil {
-			return nil, err
-		}
-		jobs = append(jobs, somejobs...)
-	}
-	return jobs, nil
+	return brokers
 }
 
 type recordedJob struct {
@@ -521,9 +669,14 @@ func sendJob(job broker.Job) (bool, error) {
 	return true, nil
 }
 
+func sendNewZips(client string, zips []string) error {
+	sender := message.NewMatrix()
+	return sender.Send(fmt.Sprintf("%s: now searching for loads from zip codes: %+v", client, zips))
+}
+
 func sendNewStates(client string, states []config.State) error {
 	sender := message.NewMatrix()
-	return sender.Send(fmt.Sprintf("%s: now searching for loads from: %+v", client, states))
+	return sender.Send(fmt.Sprintf("%s: now searching for loads from states: %+v", client, states))
 }
 
 func sendNewPause(client string, pause time.Time) error {

message/matrix.go

@@ -84,7 +84,7 @@ func (m *Matrix) Receive() ([]Message, error) {
 	if err != nil {
 		return nil, err
 	}
-	logtr.Debugf("%s => {Start:%s End:%v};; %v, (%d)", m.Continuation(), result.Start, result.End, err, len(result.Chunk))
+	logtr.Verbosef("%s => {Start:%s End:%v};; %v, (%d)", m.Continuation(), result.Start, result.End, err, len(result.Chunk))
 	m.continuation = result.End
 	for _, event := range result.Chunk {
 		logtr.Verbosef("matrix event: %+v", event)
@@ -100,7 +100,7 @@ func (m *Matrix) Receive() ([]Message, error) {
 		}
 	}
 	clientChange := regexp.MustCompile("@[a-z]+$")
-	logtr.Debugf("rewriting messages based on @abc")
+	logtr.Verbosef("rewriting messages based on @abc")
 	for i := range messages {
 		if found := clientChange.FindString(messages[i].Content); found != "" {
 			messages[i].Content = strings.TrimSpace(strings.ReplaceAll(messages[i].Content, found, ""))
@@ -114,7 +114,7 @@ func (m *Matrix) Receive() ([]Message, error) {
 		}
 		messages[i].Content = strings.TrimSpace(messages[i].Content)
 	}
-	logtr.Debugf("rewriting messages based on ! CoMmAnD ...")
+	logtr.Verbosef("rewriting messages based on ! CoMmAnD ...")
 	for i := range messages {
 		if strings.HasPrefix(messages[i].Content, "!") {
 			messages[i].Content = "!" + strings.TrimSpace(messages[i].Content[1:])
@@ -231,7 +231,7 @@ func (m Matrix) SendImageTracked(uri string) (string, error) {
 	}
 	publicURI := mediaUpload.ContentURI
 	resp, err := c.SendImage(m.room, "img", publicURI)
-	logtr.Debugf("sent image %s => %s: %+v", uri, publicURI, resp)
+	logtr.Verbosef("sent image %s => %s: %+v", uri, publicURI, resp)
 	return resp.EventID, err
 }
 

todo.yaml

@@ -1,7 +1,4 @@
 todo:
-- fast exact does not use ID in UID because they spammy
-- from states to zip codes w/ range
-- modify old items once no longer available; drop stale jobs good candidate but requires new matrix interaction
 - more than NTG; blue one
 - !states emits current state
 - test each !command callbacks to matrix
@@ -14,7 +11,11 @@ todo:
   subtasks:
   - banlist criteria like vendors, brokers, metadata
 - set up copy for caleb, broc
+- move from main() and make more functions
 done:
+- modify old items once no longer available; drop stale jobs good candidate but requires new matrix interaction
+- from states to zip codes w/ range
+- fast exact does not use ID in UID because they spammy
 - fast exact is dumb or...?
 - try search ntg by autoinc?
 - TEST. Just like, refactor and test to shit.

zip/zip.go

@@ -0,0 +1,112 @@
+package zip
+
+import (
+	_ "embed"
+	"local/truckstop/logtr"
+	"math"
+	"strconv"
+	"strings"
+)
+
+//go:embed testdata/simplemaps_uszips_basicv1.79/uszips.csv
+var csv string
+
+type Zip struct {
+	Lat   float64
+	Lng   float64
+	City  string
+	State string
+}
+
+var zips map[string]Zip
+
+func init() {
+	if len(zips) > 0 {
+		return
+	}
+	zips = map[string]Zip{}
+	trim := func(s string) string {
+		return strings.Trim(s, `"`)
+	}
+	for _, line := range strings.Split(csv, "\n")[1:] {
+		strs := strings.Split(line, ",")
+		if len(strs) < 5 {
+			continue
+		}
+		zip := trim(strs[0])
+		lat, _ := strconv.ParseFloat(trim(strs[1]), 32)
+		lng, _ := strconv.ParseFloat(trim(strs[2]), 32)
+		city := trim(alphafy(strs[3]))
+		state := strings.ToUpper(trim(strs[4]))
+		zips[zip] = Zip{
+			Lat:   lat,
+			Lng:   lng,
+			City:  city,
+			State: state,
+		}
+	}
+	logtr.Infof("loaded %d zip codes", len(zips))
+}
+
+func alphafy(s string) string {
+	bs := make([]byte, 0, len(s)+1)
+	for i := range s {
+		if (s[i] < 'a' || s[i] > 'z') && (s[i] < 'A' || s[i] > 'Z') {
+		} else {
+			bs = append(bs, s[i])
+		}
+	}
+	return strings.ToLower(string(bs))
+}
+
+func (zip Zip) MilesTo(other Zip) int {
+	// c**2 = a**2 + b**2
+	// 69.2 mi per lat
+	// 60.0 mi per lng
+	return int(math.Sqrt(
+		math.Pow(69.2*(math.Abs(zip.Lat)-math.Abs(other.Lat)), 2) +
+			math.Pow(60.0*(math.Abs(zip.Lng)-math.Abs(other.Lng)), 2),
+	))
+}
+
+func Get(zip string) Zip {
+	if z, ok := zips[zip]; ok {
+		return z
+	}
+	zipAsI, err := strconv.Atoi(strings.Split(zip, "-")[0])
+	if err != nil {
+		return Zip{}
+	}
+	for i := 0; i < 5; i++ {
+		j := i - 2
+		if z2, ok := zips[strconv.Itoa(zipAsI+j)]; ok {
+			return z2
+		}
+	}
+	return Zip{}
+}
+
+func GetStatesWithin(zip Zip, miles int) []string {
+	states := map[string]struct{}{}
+	for _, other := range zips {
+		if zip.MilesTo(other) <= miles {
+			states[other.State] = struct{}{}
+		}
+	}
+	result := []string{}
+	for state := range states {
+		result = append(result, state)
+	}
+	return result
+}
+
+func FromCityState(city, state string) Zip {
+	city = alphafy(city)
+	state = strings.ToUpper(state)
+	for _, z := range zips {
+		if z.City == city && z.State == state {
+			return z
+		}
+	}
+	return Zip{}
+}

zip/zip_test.go

@@ -0,0 +1,28 @@
+package zip
+
+import (
+	"fmt"
+	"sort"
+	"testing"
+)
+
+func TestZip(t *testing.T) {
+	_ = true
+	zip27006 := Get("27006")
+	zip84059 := Get("84059")
+	t.Logf("27006 = %+v", zip27006)
+	t.Logf("84059 = %+v", zip84059)
+	if zip27006.MilesTo(zip84059) < 1800 {
+		t.Error("failed to compute miles from advance to ut")
+	}
+	sorted := func(s []string) []string {
+		sort.Strings(s)
+		return s
+	}
+	if got := GetStatesWithin(Get("27006"), 100); fmt.Sprint(sorted(got)) != fmt.Sprint(sorted([]string{"NC", "SC", "TN", "VA"})) {
+		t.Error(got)
+	}
+	if got := FromCityState("ADVANCE", "nc"); got != zip27006 {
+		t.Error(got)
+	}
+}