Skip to content

Consolidate location text #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Consolidate location text #14

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
118 changes: 96 additions & 22 deletions locations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package main

import (
"github.com/wk8/go-ordered-map/v2"
"unicode/utf16"

orderedmap "github.com/wk8/go-ordered-map/v2"
)

type LocationTable struct {
Expand Down Expand Up @@ -171,30 +172,68 @@ func (f *Forecast) MakeLocationTable() {
}

func (f *Forecast) MakeLocationText() {
cities := make(map[string]uint32)

for i, city := range f.LocationTable {
if city.CountryCode != f.currentCountryCode {
continue
}

f.LocationTable[i].CityTextOffset = f.GetCurrentSize()
f.LocationText = append(f.LocationText, utf16.Encode([]rune(f.GetCityName(f.cityNames[i])))...)
f.LocationText = append(f.LocationText, uint16(0))
for f.GetCurrentSize()&3 != 0 {
var found bool = false

for key, value := range cities {
if f.GetCityName(f.cityNames[i]) == key {
f.LocationTable[i].CityTextOffset = value
found = true
}
}

if !found {
f.LocationTable[i].CityTextOffset = f.GetCurrentSize()
f.LocationText = append(f.LocationText, utf16.Encode([]rune(f.GetCityName(f.cityNames[i])))...)
f.LocationText = append(f.LocationText, uint16(0))
for f.GetCurrentSize()&3 != 0 {
f.LocationText = append(f.LocationText, uint16(0))
}
cities[f.GetCityName(f.cityNames[i])] = f.LocationTable[i].CityTextOffset
}

f.LocationTable[i].RegionTextOffset = f.GetCurrentSize()
f.LocationText = append(f.LocationText, utf16.Encode([]rune(f.GetLocalizedName(f.cityNames[i].Province)))...)
f.LocationText = append(f.LocationText, uint16(0))
for f.GetCurrentSize()&3 != 0 {
found = false

for key, value := range cities {
if f.GetLocalizedName(f.cityNames[i].Province) == key {
f.LocationTable[i].RegionTextOffset = value
found = true
}
}

if !found {
f.LocationTable[i].RegionTextOffset = f.GetCurrentSize()
f.LocationText = append(f.LocationText, utf16.Encode([]rune(f.GetLocalizedName(f.cityNames[i].Province)))...)
f.LocationText = append(f.LocationText, uint16(0))
for f.GetCurrentSize()&3 != 0 {
f.LocationText = append(f.LocationText, uint16(0))
}
cities[f.GetLocalizedName(f.cityNames[i].Province)] = f.LocationTable[i].RegionTextOffset
}

found = false

for key, value := range cities {
if f.GetLocalizedName(f.currentCountryList.Name) == key {
f.LocationTable[i].CountryTextOffset = value
found = true
}
}

f.LocationTable[i].CountryTextOffset = f.GetCurrentSize()
f.LocationText = append(f.LocationText, utf16.Encode([]rune(f.GetLocalizedName(f.currentCountryList.Name)))...)
f.LocationText = append(f.LocationText, uint16(0))
for f.GetCurrentSize()&3 != 0 {
if !found {
f.LocationTable[i].CountryTextOffset = f.GetCurrentSize()
f.LocationText = append(f.LocationText, utf16.Encode([]rune(f.GetLocalizedName(f.currentCountryList.Name)))...)
f.LocationText = append(f.LocationText, uint16(0))
for f.GetCurrentSize()&3 != 0 {
f.LocationText = append(f.LocationText, uint16(0))
}
cities[f.GetLocalizedName(f.currentCountryList.Name)] = f.LocationTable[i].CountryTextOffset
}
}

Expand All @@ -204,29 +243,64 @@ func (f *Forecast) MakeLocationText() {
continue
}

f.LocationTable[i].CityTextOffset = f.GetCurrentSize()
f.LocationText = append(f.LocationText, utf16.Encode([]rune(f.GetLocalizedName(f.internationalCities[i].Name)))...)
f.LocationText = append(f.LocationText, uint16(0))
for f.GetCurrentSize()&3 != 0 {
f.LocationText = append(f.LocationText, uint16(0))
var found bool = false

for key, value := range cities {
if f.GetLocalizedName(f.internationalCities[i].Name) == key {
f.LocationTable[i].CityTextOffset = value
found = true
}
}

if f.internationalCities[i].Province.English != "" {
f.LocationTable[i].RegionTextOffset = f.GetCurrentSize()
f.LocationText = append(f.LocationText, utf16.Encode([]rune(f.GetLocalizedName(f.internationalCities[i].Province)))...)
if !found {
f.LocationTable[i].CityTextOffset = f.GetCurrentSize()
f.LocationText = append(f.LocationText, utf16.Encode([]rune(f.GetLocalizedName(f.internationalCities[i].Name)))...)
f.LocationText = append(f.LocationText, uint16(0))
for f.GetCurrentSize()&3 != 0 {
f.LocationText = append(f.LocationText, uint16(0))
}
cities[f.GetLocalizedName(f.internationalCities[i].Name)] = f.LocationTable[i].CityTextOffset
}

found = false

for key, value := range cities {
if f.GetLocalizedName(f.internationalCities[i].Province) == key {
f.LocationTable[i].RegionTextOffset = value
found = true
}
}

if !found {
if f.internationalCities[i].Province.English != "" {
f.LocationTable[i].RegionTextOffset = f.GetCurrentSize()
f.LocationText = append(f.LocationText, utf16.Encode([]rune(f.GetLocalizedName(f.internationalCities[i].Province)))...)
f.LocationText = append(f.LocationText, uint16(0))
for f.GetCurrentSize()&3 != 0 {
f.LocationText = append(f.LocationText, uint16(0))
}
cities[f.GetLocalizedName(f.internationalCities[i].Province)] = f.LocationTable[i].RegionTextOffset
}
}

found = false

for key, value := range cities {
if f.GetLocalizedName(f.internationalCities[i].Country) == key {
f.LocationTable[i].CountryTextOffset = value
found = true
break
}
}

if f.internationalCities[i].Country.English != "" {
if !found {
f.LocationTable[i].CountryTextOffset = f.GetCurrentSize()
f.LocationText = append(f.LocationText, utf16.Encode([]rune(f.GetLocalizedName(f.internationalCities[i].Country)))...)
f.LocationText = append(f.LocationText, uint16(0))
for f.GetCurrentSize()&3 != 0 {
f.LocationText = append(f.LocationText, uint16(0))
}
cities[f.GetLocalizedName(f.internationalCities[i].Country)] = f.LocationTable[i].CountryTextOffset
}
}
}