Permalink
Browse files

Merge pull request #1908 from krischer/fdsn-default-to-http

Default the fdsnws mappings to HTTP
  • Loading branch information...
megies committed Sep 29, 2017
2 parents 9a419d0 + 1e9e26b commit cc8b426799fa3bc58d869f663b0347f35016f73b
Showing with 3 additions and 4 deletions.
  1. +0 −1 CHANGELOG.txt
  2. +3 −3 obspy/clients/fdsn/header.py
@@ -64,7 +64,6 @@ master: (doi: 10.5281/zenodo.165135)
the more general `FDSNException`.
* Fixing cross implementation of bulk waveform and station requests (see
#1685).
* Updating some endpoint mappings to use HTTPS. (See #1690, #1665, #1048)
* Adding mappings for the TEXNET (see #1852) and the ICGC (see #1902)
services.
- obspy.imaging:
@@ -43,7 +43,7 @@ class FDSNNoDataException(FDSNException):
"ETH": "http://eida.ethz.ch",
"EMSC": "http://www.seismicportal.eu",
"GEONET": "http://service.geonet.org.nz",
"GFZ": "https://geofon.gfz-potsdam.de",
"GFZ": "http://geofon.gfz-potsdam.de",
"ICGC": "http://ws.icgc.cat",
"INGV": "http://webservices.rm.ingv.it",
"IPGP": "http://eida.ipgp.fr",
@@ -57,9 +57,9 @@ class FDSNNoDataException(FDSNException):
"ODC": "http://www.orfeus-eu.org",
"ORFEUS": "http://www.orfeus-eu.org",
"RESIF": "http://ws.resif.fr",
"SCEDC": "https://service.scedc.caltech.edu",
"SCEDC": "http://service.scedc.caltech.edu",
"TEXNET": "http://rtserve.beg.utexas.edu",
"USGS": "https://earthquake.usgs.gov",
"USGS": "http://earthquake.usgs.gov",
"USP": "http://sismo.iag.usp.br"}
FDSNWS = ("dataselect", "event", "station")

0 comments on commit cc8b426

Please sign in to comment.