luisgulo/photoprism
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Metadata: Improve time zone estimates #914

Browse source
This commit is contained in:
Michael Mayer 2021-01-19 13:47:41 +01:00
parent 019a649c61
commit 6ee2613e90
2 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
internal/entity/photo.go
View file

@ -870,6 +870,20 @@ func (m *Photo) SetTakenAt(taken, local time.Time, zone, source string) {
m.UpdateDateFields()
}
// SetTimeZone updates the time zone.
func (m *Photo) SetTimeZone(zone, source string) {
if zone == "" {
return
}
if SrcPriority[source] < SrcPriority[m.TakenSrc] && m.TimeZone != "" {
return
}
m.TimeZone = zone
m.TakenAt = m.GetTakenAt()
}
// UpdateDateFields updates internal date fields.
func (m *Photo) UpdateDateFields() {
if m.TakenAt.IsZero() || m.TakenAt.Year() < 1000 {

12
internal/entity/photo_estimate.go
View file

@ -77,21 +77,13 @@ func (m *Photo) EstimatePlace() {
m.PlaceID = recentPhoto.PlaceID
m.PhotoCountry = recentPhoto.PhotoCountry
m.PlaceSrc = SrcEstimate
if m.TakenSrc != SrcManual {
m.TimeZone = recentPhoto.TimeZone
m.TakenAt = m.GetTakenAt()
}
m.SetTimeZone(recentPhoto.TimeZone, recentPhoto.TakenSrc)
log.Debugf("photo: approximate position of %s is %s (id %s)", m, txt.Quote(m.CountryName()), recentPhoto.PlaceID)
} else if recentPhoto.HasCountry() {
m.PhotoCountry = recentPhoto.PhotoCountry
m.PlaceSrc = SrcEstimate
if m.TakenSrc != SrcManual {
m.TimeZone = recentPhoto.TimeZone
m.TakenAt = m.GetTakenAt()
}
m.SetTimeZone(recentPhoto.TimeZone, recentPhoto.TakenSrc)
log.Debugf("photo: probable country for %s is %s", m, txt.Quote(m.CountryName()))
} else {