ambrose
/
datetime.link
mirror of https://github.com/serverwentdown/datetime.link.git
1
0
Fork 0
Code Releases Activity

Reorganise structure

main
Ambrose Chua 2020-11-07 23:36:02 +08:00
parent f61a33d681
commit 4d42d381b4
7 changed files with 77 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -1,4 +1,5 @@
datetime*
data.json
data/
templates/icon_*.svg
third-party/
data/cities*.json

34
Makefile
View File

@ -10,7 +10,7 @@ all: download-icons data build
.PHONY: clean
clean:
$(RM) -r datetime js/data.json data/ templates/icon_*.svg
$(RM) -r datetime data/cities*.json third-party/ templates/icon_*.svg
.PHONY: build
@ -25,29 +25,29 @@ test:
DATASETS = \
data/cities15000.txt \
data/admin1CodesASCII.txt \
data/countryInfo.txt
third-party/cities15000.txt \
third-party/admin1CodesASCII.txt \
third-party/countryInfo.txt
.PHONY: data
data: js/data.json
data: data/cities.json
js/data.json: $(DATASETS) scripts/data.go
data/cities.json: $(DATASETS) scripts/data.go
cd scripts && $(GO) run data.go
data/cities15000.txt:
$(MKDIR) data/
$(DOWNLOAD) data/cities15000.zip http://download.geonames.org/export/dump/cities15000.zip
$(UNZIP) data/ data/cities15000.zip
$(RM) data/cities15000.zip
third-party/cities15000.txt:
$(MKDIR) third-party/
$(DOWNLOAD) third-party/cities15000.zip http://download.geonames.org/export/dump/cities15000.zip
$(UNZIP) third-party/ third-party/cities15000.zip
$(RM) third-party/cities15000.zip
data/countryInfo.txt:
$(MKDIR) data/
$(DOWNLOAD) data/countryInfo.txt http://download.geonames.org/export/dump/countryInfo.txt
third-party/countryInfo.txt:
$(MKDIR) third-party/
$(DOWNLOAD) third-party/countryInfo.txt http://download.geonames.org/export/dump/countryInfo.txt
data/admin1CodesASCII.txt:
$(MKDIR) data/
$(DOWNLOAD) data/admin1CodesASCII.txt https://download.geonames.org/export/dump/admin1CodesASCII.txt
third-party/admin1CodesASCII.txt:
$(MKDIR) third-party/
$(DOWNLOAD) third-party/admin1CodesASCII.txt https://download.geonames.org/export/dump/admin1CodesASCII.txt
ICONS = \

0
css/styles.css → assets/css/styles.css
View File

0
js/theme.js → assets/js/theme.js
View File

40
data/types.go Normal file
View File

@ -0,0 +1,40 @@
package data
// Data is all the data needed to map cities to timezones
type Data struct {
Cities map[string]*City
}
// City represents a city that belongs inside an administrative division level 1
// and a country
type City struct {
// Ref is the ASCII name of the city
Ref string `json:"-"`
// Name is the full UTF-8 name of the city
Name string `json:"n"`
AlternateNames []string `json:"an"`
Timezone string `json:"t"`
Population uint64 `json:"p"`
Admin1 Admin1 `json:"a1"`
Country Country `json:"c"`
}
// Admin1 represents an administrative division level 1
type Admin1 struct {
// Code is the administrative division level 1 identifier, usually ISO-3166
Code string `json:"-"`
// Ref is the ASCII name of the administrative division level 1
Ref string `json:"-"`
// Name is the full UTF-8 name of the division
Name string `json:"n"`
}
// Country represents a country
type Country struct {
// CountryRef is the ISO-3166 2-letter country code
Ref string `json:"-"`
// Name is the full UTF-8 name of the country
Name string `json:"n"`
}

1
js/third-party/luxon.min.js vendored
View File

File diff suppressed because one or more lines are too long

77
scripts/data.go
View File

@ -24,47 +24,13 @@ import (
"strings"
"github.com/hbollon/go-edlib"
"github.com/serverwentdown/datetime.link/data"
)
var regexName = regexp.MustCompile(`[^a-zA-Z1-9]+`)
// Data is all the data needed to map cities to timezones
type Data struct {
Cities map[string]*City
}
// City represents a city that belongs inside an administrative division level 1
// and a country
type City struct {
// Ref is the ASCII name of the city
Ref string `json:"-"`
// Name is the full UTF-8 name of the city
Name string `json:"n"`
AlternateNames []string `json:"an"`
Timezone string `json:"t"`
Population uint64 `json:"p"`
Admin1 Admin1 `json:"a1"`
Country Country `json:"c"`
}
// Admin1 represents an administrative division level 1
type Admin1 struct {
// Code is the administrative division level 1 identifier, usually ISO-3166
Code string `json:"-"`
// Ref is the ASCII name of the administrative division level 1
Ref string `json:"-"`
// Name is the full UTF-8 name of the division
Name string `json:"n"`
}
// Country represents a country
type Country struct {
// CountryRef is the ISO-3166 2-letter country code
Ref string `json:"-"`
// Name is the full UTF-8 name of the country
Name string `json:"n"`
func extendRef(refs ...string) string {
return strings.Join(refs, "-")
}
func normalizeName(name string) string {
@ -121,11 +87,7 @@ func limitNames(primaryName string, names []string) ([]string, error) {
return r, nil
}
func extendRef(refs ...string) string {
return strings.Join(refs, "-")
}
func readAdmin1Divisions(f string) (map[string]Admin1, error) {
func readAdmin1Divisions(f string) (map[string]data.Admin1, error) {
file, err := os.Open(f)
if err != nil {
return nil, err
@ -134,7 +96,7 @@ func readAdmin1Divisions(f string) (map[string]Admin1, error) {
r.Comma = '\t'
r.Comment = '#'
m := make(map[string]Admin1)
m := make(map[string]data.Admin1)
for {
record, err := r.Read()
if err == io.EOF {
@ -143,7 +105,7 @@ func readAdmin1Divisions(f string) (map[string]Admin1, error) {
code := record[0]
ref := normalizeName(record[2])
name := record[1]
m[code] = Admin1{
m[code] = data.Admin1{
Code: code,
Ref: ref,
Name: name,
@ -153,7 +115,7 @@ func readAdmin1Divisions(f string) (map[string]Admin1, error) {
return m, nil
}
func readCountries(f string) (map[string]Country, error) {
func readCountries(f string) (map[string]data.Country, error) {
file, err := os.Open(f)
if err != nil {
return nil, err
@ -162,7 +124,7 @@ func readCountries(f string) (map[string]Country, error) {
r.Comma = '\t'
r.Comment = '#'
m := make(map[string]Country)
m := make(map[string]data.Country)
for {
record, err := r.Read()
if err == io.EOF {
@ -170,7 +132,7 @@ func readCountries(f string) (map[string]Country, error) {
}
ref := record[0]
name := record[4]
m[ref] = Country{
m[ref] = data.Country{
Ref: ref,
Name: name,
}
@ -178,7 +140,7 @@ func readCountries(f string) (map[string]Country, error) {
return m, nil
}
func readCities(f string, countries map[string]Country, admin1s map[string]Admin1) (map[string]*City, error) {
func readCities(f string, countries map[string]data.Country, admin1s map[string]data.Admin1) (map[string]*data.City, error) {
file, err := os.Open(f)
if err != nil {
return nil, err
@ -187,7 +149,7 @@ func readCities(f string, countries map[string]Country, admin1s map[string]Admin
r.Comma = '\t'
r.Comment = '#'
m := make(map[string]*City)
m := make(map[string]*data.City)
for {
record, err := r.Read()
if err == io.EOF {
@ -217,7 +179,7 @@ func readCities(f string, countries map[string]Country, admin1s map[string]Admin
eref = extendRef(ref, country.Ref)
}
c := &City{
c := &data.City{
Ref: ref,
Name: name,
AlternateNames: alternateNames,
@ -241,31 +203,26 @@ func readCities(f string, countries map[string]Country, admin1s map[string]Admin
}
func main() {
admin1s, err := readAdmin1Divisions("../data/admin1CodesASCII.txt")
admin1s, err := readAdmin1Divisions("../third-party/admin1CodesASCII.txt")
if err != nil {
log.Fatalf("Reading administrative divisions level 1 failed")
}
countries, err := readCountries("../data/countryInfo.txt")
countries, err := readCountries("../third-party/countryInfo.txt")
if err != nil {
log.Fatalf("Reading countries failed")
}
cities, err := readCities("../data/cities15000.txt", countries, admin1s)
cities, err := readCities("../third-party/cities15000.txt", countries, admin1s)
if err != nil {
log.Fatalf("Reading cities failed")
}
// Group data
data := Data{
Cities: cities,
}
// Encode JSON file
//b, err := json.MarshalIndent(data, " ", " ")
b, err := json.Marshal(data)
b, err := json.Marshal(cities)
if err != nil {
log.Fatalf("Failed to encode: %v", err)
}
// Write JSON file
err = ioutil.WriteFile("../js/data.json", b, 0644)
err = ioutil.WriteFile("../data/cities.json", b, 0644)
if err != nil {
log.Fatalf("Failed to write: %v", err)
}