Skip to content

Commit 64ff3a1

Browse files
committed
Use real feed imagery for OpenSky and USGS earthquake
1 parent 273e0f5 commit 64ff3a1

2 files changed

Lines changed: 44 additions & 31 deletions

File tree

publishers/opensky/bootstrap_opensky.py

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -66,16 +66,9 @@
6666
OPENSKY_ABOUT = "https://opensky-network.org/about/about-us"
6767
OPENSKY_STATE_VECTORS_DOC = "https://openskynetwork.github.io/opensky-api/index.html#state-vectors"
6868
OPENSKY_AUTH_TOKEN_URL = "https://auth.opensky-network.org/auth/realms/opensky-network/protocol/openid-connect/token"
69-
OPENSKY_THUMBNAIL_DATA_URI = (
70-
"data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 320 200'%3E"
71-
"%3Crect width='320' height='200' fill='%230f172a'/%3E"
72-
"%3Cpath d='M42 150 C95 92 220 92 278 150' fill='none' stroke='%2338bdf8' stroke-width='4' stroke-dasharray='10 8'/%3E"
73-
"%3Cpath d='M72 132 C122 96 198 96 248 132' fill='none' stroke='%237dd3fc' stroke-width='3' stroke-dasharray='7 7'/%3E"
74-
"%3Ccircle cx='160' cy='150' r='8' fill='%23f8fafc'/%3E"
75-
"%3Cpath d='M160 52 l78 31 -64 10 -18 46 -16 -49 -58 -12z' fill='%23e0f2fe' stroke='%230ea5e9' stroke-width='3'/%3E"
76-
"%3Ctext x='160' y='178' text-anchor='middle' font-family='Arial,sans-serif' font-size='20' font-weight='700' fill='%23f8fafc'%3EOpenSky ADS-B Feed%3C/text%3E"
77-
"%3C/svg%3E"
78-
)
69+
OPENSKY_ADSB_ANTENNA_IMAGE = "https://upload.wikimedia.org/wikipedia/commons/6/68/Homemade_1090_MHz_ADS-B_dipole_antenna.jpg"
70+
OPENSKY_ADSB_ANTENNA_SOURCE = "https://commons.wikimedia.org/wiki/File:Homemade_1090_MHz_ADS-B_dipole_antenna.jpg"
71+
OPENSKY_ADSB_ANTENNA_LICENSE = "https://creativecommons.org/licenses/by-sa/3.0/"
7972

8073
# ── Contact ──────────────────────────────────────────────────────────────
8174
OPENSKY_CONTACT_ORG = "The OpenSky Network Association"
@@ -236,8 +229,8 @@ def _system_stub(config: dict) -> dict:
236229
"credit_budget_note": _daily_budget_note(config),
237230
},
238231
"image": {
239-
"href": "./metadata_enrichment_pack/assets/opensky_feed_adapter_generic.svg",
240-
"title": "Representative OpenSky feed-adapter coverage graphic",
232+
"href": OPENSKY_ADSB_ANTENNA_IMAGE,
233+
"title": "Representative 1090 MHz ADS-B antenna photograph",
241234
},
242235
"validTime": [VALID_TIME_START, ".."],
243236
},
@@ -351,12 +344,26 @@ def _system_sml(config: dict) -> dict:
351344
},
352345
{
353346
"role": "http://dbpedia.org/resource/Photograph",
354-
"name": "Representative OpenSky ADS-B Feed Thumbnail",
347+
"name": "Representative 1090 MHz ADS-B Antenna Photograph",
355348
"description": (
356-
"Original OS4CSAPI SVG thumbnail representing the OpenSky ADS-B feed adapter. "
357-
"This is not a station-specific photograph or an aircraft-specific observation."
349+
"Photograph of real 1090 MHz ADS-B antenna hardware used as the representative "
350+
"source image for the OpenSky ADS-B feed adapter. The OpenSky resource is a "
351+
"crowd-sourced receiver-network feed rather than a single station. "
352+
"Photo: Happy-marmotte, CC BY-SA 3.0, via Wikimedia Commons."
358353
),
359-
"link": {"href": OPENSKY_THUMBNAIL_DATA_URI, "type": "image/svg+xml"},
354+
"link": {"href": OPENSKY_ADSB_ANTENNA_IMAGE, "type": "image/jpeg"},
355+
},
356+
{
357+
"role": "http://dbpedia.org/resource/Web_page",
358+
"name": "Representative ADS-B Antenna Photo Source",
359+
"description": "Wikimedia Commons source page for the ADS-B antenna photograph.",
360+
"link": {"href": OPENSKY_ADSB_ANTENNA_SOURCE, "type": "text/html"},
361+
},
362+
{
363+
"role": "http://dbpedia.org/resource/Web_page",
364+
"name": "Representative ADS-B Antenna Photo License",
365+
"description": "Creative Commons Attribution-ShareAlike 3.0 license for the ADS-B antenna photograph.",
366+
"link": {"href": OPENSKY_ADSB_ANTENNA_LICENSE, "type": "text/html"},
360367
},
361368
],
362369
"characteristics": [

publishers/usgs_eq/bootstrap_usgs_eq.py

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -72,17 +72,9 @@
7272
USGS_EQ_LIFECYCLE = "https://earthquake.usgs.gov/earthquakes/feed/policy.php"
7373
USGS_EQ_EVENT_TERMS = "https://earthquake.usgs.gov/data/comcat/data-eventterms.php"
7474
USGS_EQ_FDSN_EVENT_API = "https://earthquake.usgs.gov/fdsnws/event/1/"
75-
USGS_EQ_THUMBNAIL_DATA_URI = (
76-
"data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 320 200'%3E"
77-
"%3Crect width='320' height='200' fill='%2318120f'/%3E"
78-
"%3Cpath d='M0 142 L42 142 L56 116 L70 164 L88 72 L106 152 L124 132 L142 142 L320 142' fill='none' stroke='%23f97316' stroke-width='5'/%3E"
79-
"%3Ccircle cx='92' cy='142' r='46' fill='none' stroke='%23fed7aa' stroke-width='3' opacity='.75'/%3E"
80-
"%3Ccircle cx='92' cy='142' r='78' fill='none' stroke='%23fdba74' stroke-width='2' opacity='.45'/%3E"
81-
"%3Ccircle cx='92' cy='142' r='110' fill='none' stroke='%23fb923c' stroke-width='2' opacity='.25'/%3E"
82-
"%3Ctext x='160' y='48' text-anchor='middle' font-family='Arial,sans-serif' font-size='22' font-weight='700' fill='%23fff7ed'%3EUSGS Earthquake Feed%3C/text%3E"
83-
"%3Ctext x='160' y='178' text-anchor='middle' font-family='Arial,sans-serif' font-size='14' fill='%23fed7aa'%3Eevent stream thumbnail%3C/text%3E"
84-
"%3C/svg%3E"
85-
)
75+
USGS_SEISMOMETER_IMAGE = "https://upload.wikimedia.org/wikipedia/commons/3/3d/Installing_a_temporary_seismometer.jpg"
76+
USGS_SEISMOMETER_SOURCE = "https://commons.wikimedia.org/wiki/File:Installing_a_temporary_seismometer.jpg"
77+
USGS_COPYRIGHT_POLICY = "https://www.usgs.gov/information-policies-and-instructions/copyrights-and-credits"
8678

8779
USGS_EQ_FEED_VARIANTS = {
8880
"all_hour": "All earthquakes, past hour",
@@ -239,12 +231,26 @@ def _system_sml(config: dict) -> dict:
239231
{"role": "http://dbpedia.org/resource/Web_page", "name": "FDSN Event API", "description": "Official query interface for targeted retrieval and future backfill", "link": {"href": USGS_EQ_FDSN_EVENT_API, "type": "text/html"}},
240232
{
241233
"role": "http://dbpedia.org/resource/Photograph",
242-
"name": "Representative Earthquake Feed Thumbnail",
234+
"name": "USGS Temporary Seismometer Installation Photograph",
243235
"description": (
244-
"Original OS4CSAPI SVG thumbnail representing the USGS earthquake event feed adapter. "
245-
"This is not an event-specific image."
236+
"USGS photograph of a real temporary seismometer installation used as the representative "
237+
"source image for the USGS earthquake feed adapter. The feed is event-catalog data, not "
238+
"a single station, so this image represents the seismic sensing infrastructure behind "
239+
"earthquake observations. Photo: Thomas Pratt, USGS, public domain."
246240
),
247-
"link": {"href": USGS_EQ_THUMBNAIL_DATA_URI, "type": "image/svg+xml"},
241+
"link": {"href": USGS_SEISMOMETER_IMAGE, "type": "image/jpeg"},
242+
},
243+
{
244+
"role": "http://dbpedia.org/resource/Web_page",
245+
"name": "USGS Seismometer Photo Source",
246+
"description": "Wikimedia Commons source page for the USGS temporary seismometer installation photograph.",
247+
"link": {"href": USGS_SEISMOMETER_SOURCE, "type": "text/html"},
248+
},
249+
{
250+
"role": "http://dbpedia.org/resource/Web_page",
251+
"name": "USGS Public Domain Copyright Policy",
252+
"description": "USGS copyright and credit policy covering public-domain USGS media.",
253+
"link": {"href": USGS_COPYRIGHT_POLICY, "type": "text/html"},
248254
},
249255
],
250256
"characteristics": [

0 commit comments

Comments
 (0)