locode-db: override collisions with file

Add file override.csv, add logic to override longitude and latitude in record if it already exists and made the paths to be processed in order, so that the override file would be the last one.

Signed-off-by: Andrey Butusov <andrey@nspcc.io>

Makefile

@@ -41,7 +41,10 @@ generate: unlocode in/airports.dat in/countries.dat in/continents.geojson $(LOCO
 	--airports in/airports.dat \
 	--continents in/continents.geojson \
 	--countries in/countries.dat \
-	--in in/$(UNLOCODEPREFIX)\ UNLOCODE\ CodeListPart1.csv,in/$(UNLOCODEPREFIX)\ UNLOCODE\ CodeListPart2.csv,in/$(UNLOCODEPREFIX)\ UNLOCODE\ CodeListPart3.csv \
+	--in in/$(UNLOCODEPREFIX)\ UNLOCODE\ CodeListPart1.csv \
+	--in in/$(UNLOCODEPREFIX)\ UNLOCODE\ CodeListPart2.csv \
+	--in in/$(UNLOCODEPREFIX)\ UNLOCODE\ CodeListPart3.csv \
+	--in override.csv \
 	--subdiv in/$(UNLOCODEPREFIX)\ SubdivisionCodes.csv \
 	--out $(LOCODEDB)
 

internal/parsers/db/put.go

@@ -26,7 +26,7 @@ func (db *CsvDB) Put(data []Data) error {
 	newRecordsLocode := make([][]string, 0, len(data))
 	newRecordsCountry := make([][]string, 0, 300)
 
-	uniqueKeys := make(map[string]struct{}, len(data))
+	uniqueKeys := make(map[string]int, len(data))
 	uniqueKeysCountry := make(map[string]struct{}, 300)
 
 	for _, row := range data {
@@ -36,12 +36,14 @@ func (db *CsvDB) Put(data []Data) error {
 		// Calculate a unique index for each key
 		keyString := key.CountryCode().String() + key.LocationCode().String()
 
-		if _, exists := uniqueKeys[keyString]; exists {
-			continue // Skip duplicates
+		if index, exists := uniqueKeys[keyString]; exists {
+			newRecordsLocode[index][5] = strconv.FormatFloat(float64(rec.Point.Latitude), 'f', -1, 32)
+			newRecordsLocode[index][6] = strconv.FormatFloat(float64(rec.Point.Longitude), 'f', -1, 32)
+			continue
 		}
 
 		// Mark the index as seen
-		uniqueKeys[keyString] = struct{}{}
+		uniqueKeys[keyString] = len(newRecordsLocode)
 
 		newRecord := []string{
 			keyString,

internal/parsers/table/csv/table.go

@@ -68,7 +68,7 @@ func New(prm Prm, opts ...Option) *Table {
 	}
 
 	return &Table{
-		paths:      append(o.extraPaths, prm.Path),
+		paths:      append([]string{prm.Path}, o.extraPaths...),
 		mode:       o.mode,
 		subDivPath: prm.SubDivPath,
 	}