Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-23 02:49:27 +01:00
Code Issues Projects Releases Wiki Activity

Geography: Always prefer IANA timezones over UTC offsets

Browse Source 
Even if the UTC offsets are given on a more specific entity,
they are usually worthless to us (eg. DST).
This commit is contained in:
Valentin Lorentz 2021-11-11 19:07:31 +01:00
parent 76b9d6f0ce
commit d2091e8f71
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/Geography/test.py
View File

@ -180,6 +180,12 @@ class GeographyWikidataTestCase(SupyTestCase):
utils.time.iana_timezone("America/New_York"), utils.time.iana_timezone("America/New_York"),
) )
self.assertEqual(
# Paris, France
wikidata.timezone_from_uri("http://www.wikidata.org/entity/Q90"),
utils.time.iana_timezone("Europe/Paris"),
)
@skipIf(not network, "Network test") @skipIf(not network, "Network test")
def testParentQualifiedIgnorePreferred(self): def testParentQualifiedIgnorePreferred(self):
# The queried object does not have a TZ property, # The queried object does not have a TZ property,

25
plugins/Geography/wikidata.py
View File

@ -79,6 +79,9 @@ SELECT ?item ?itemLabel ?rank ?endtime ?appliestopart ?utcoffset ?tzid (MIN(?are
# Get the area, will be used to order by specificity # Get the area, will be used to order by specificity
OPTIONAL { ?statementsubject wdt:P2046 ?area. } OPTIONAL { ?statementsubject wdt:P2046 ?area. }
# Require that ?timezone be an instance of...
?timezone (wdt:P31/wdt:P279*) <$tztype>.
{ {
# Get either an IANA timezone ID... # Get either an IANA timezone ID...
?timezone wdt:P6687 ?tzid. ?timezone wdt:P6687 ?tzid.
@ -130,15 +133,19 @@ def _query_sparql(query):
def timezone_from_uri(location_uri): def timezone_from_uri(location_uri):
"""Returns a :class:datetime.tzinfo object, given a Wikidata Q-ID. """Returns a :class:datetime.tzinfo object, given a Wikidata Q-ID.
eg. ``"Q60"`` for New York City.""" eg. ``"Q60"`` for New York City."""
data = _query_sparql(TIMEZONE_QUERY.substitute(subject=location_uri)) for tztype in [
results = data["results"]["bindings"] "http://www.wikidata.org/entity/Q17272692", # IANA timezones first
for result in results: "http://www.wikidata.org/entity/Q12143", # any timezone as a fallback
if "tzid" in result: ]:
return utils.time.iana_timezone(result["tzid"]["value"]) data = _query_sparql(TIMEZONE_QUERY.substitute(subject=location_uri, tztype=tztype))
else: results = data["results"]["bindings"]
assert "utcoffset" in result for result in results:
utc_offset = float(result["utcoffset"]["value"]) if "tzid" in result:
return datetime.timezone(datetime.timedelta(hours=utc_offset)) return utils.time.iana_timezone(result["tzid"]["value"])
else:
assert "utcoffset" in result
utc_offset = float(result["utcoffset"]["value"])
return datetime.timezone(datetime.timedelta(hours=utc_offset))
return None return None