History of faa_routes
The changes to the source code of this entry in the repository, newest first, each with the differences it made to the entry's files. They are also listed on GitLab.
[entries] Add the date when each entry was added, and remove icon_hash beff7c9
The dates are those of the commits that first added the entries' files (2020-08-11 for the entries of the initial commit); renamed entries keep the date of their first name. Changed: none
diff --git a/entries/faa_routes/__init__.py b/entries/faa_routes/__init__.py
index d70283f..aebd91b 100644
--- a/entries/faa_routes/__init__.py
+++ b/entries/faa_routes/__init__.py
@@ -27,7 +27,7 @@ The network has the following properties:
tags = ['Transportation', 'Airport', 'Unweighted']
url = 'https://web.archive.org/web/20180916202441/http://research.mssm.edu/maayan/datasets/qualitative_networks.shtml'
citation = [('United States Federal Aviation Administration, "Air traffic control system command center."', 'http://www.fly.faa.gov/ (2010)')]
-icon_hash = '57f2e1248cf714f319c3912e'
+date_added = '2020-08-11'
upstream_license = None
# The Ma'ayan Laboratory site is gone; the file is obtained from the Internet
# Archive.
[entries] Prefix the properties in the descriptions with (Node), (Edge) or (Graph) bc3dbbd
The lists of properties at the end of the descriptions marked edge properties with "Edge" but left node properties unmarked, or grouped them in "Nodes: `a`, ...; `b`, ..." items, so the kind of a property was often unclear. Every item now starts with (Node), (Edge) or (Graph), followed by the property names, a colon and the explanation, one item per property or group of properties; qualifications (kinds of nodes, networks) follow the names in parentheses. Properties that were only named got a short explanation, and a few items that named the wrong kind of property were corrected.
diff --git a/entries/faa_routes/__init__.py b/entries/faa_routes/__init__.py
index 68fc1ab..d70283f 100644
--- a/entries/faa_routes/__init__.py
+++ b/entries/faa_routes/__init__.py
@@ -23,7 +23,7 @@ description = """A network of air traffic control routes in the United States, c
The network has the following properties:
-- Nodes: `name`, the code of the route element (as used in the FAA database)."""
+- (Node) `name`: the code of the route element (as used in the FAA database)."""
tags = ['Transportation', 'Airport', 'Unweighted']
url = 'https://web.archive.org/web/20180916202441/http://research.mssm.edu/maayan/datasets/qualitative_networks.shtml'
citation = [('United States Federal Aviation Administration, "Air traffic control system command center."', 'http://www.fly.faa.gov/ (2010)')]
[entries] Remove unneeded code from the entries 2c69f19
Unneeded "global files" statements, unused imports and variables, f-strings without placeholders, duplicate keys in foodweb_little_rock (keeping the order and the values used), and the second definition of get_lines() in twitter_higgs. Nothing changes in the networks or descriptions. Changed: none
diff --git a/entries/faa_routes/__init__.py b/entries/faa_routes/__init__.py
index 16363d6..68fc1ab 100644
--- a/entries/faa_routes/__init__.py
+++ b/entries/faa_routes/__init__.py
@@ -42,7 +42,6 @@ def fetch_upstream(force=False):
@coerce_props()
@annotate()
def parse(alts=None):
- global files
name = __name__.split(".")[-1]
for fname, alt, fmt in files:
if alts is not None and alt not in alts:
[entries] Move KONECT-derived entries to their original sources 45943ea
The entries now download the data from where KONECT obtained them (live or via the Wayback Machine), gaining the metadata KONECT dropped (names, identifiers, timestamps, attributes), with descriptions and citations rewritten from the original sources: - Ma'ayan lab collection: faa_routes, foodweb_little_rock (taxon names were assigned to the wrong nodes), interactome_pdz, interactome_figeys, interactome_stelzl, interactome_vidal - Pajek collection and primary sources: word_assoc (from the Edinburgh Associative Thesaurus; KONECT dropped all counts >= 10), foldoc, new_guinea_tribes - bitriad: elite, ceo_club (adds the CEO KONECT's copy lacked) - Lovro Subelj: cora, euroroad (adds isolated cities and parallel roads) - SNAP: elec (all votes, with elections and nominators) - Zenodo: wiki_talk (user ids and roles) - MPI-SWS: flickr_growth, facebook_wall (edges now point from poster to wall owner, as documented), wikipedia_growth (full timestamps) - Other sources: prosper, jester, reactome (the 2014 release KONECT used), unicodelang (CLDR 27), wordnet (WordNet 3.1), chicago_road (TNTP ChicagoRegional)
diff --git a/entries/faa_routes/__init__.py b/entries/faa_routes/__init__.py
index 50f2821..16363d6 100644
--- a/entries/faa_routes/__init__.py
+++ b/entries/faa_routes/__init__.py
@@ -19,14 +19,20 @@
from .. import *
title = "FAA Preferred Routes (2010)"
-description = """A network of air traffic routes, from the FAA (Federal Aviation Administration) National Flight Data Center (NFDC) preferred routes database (www.fly.faa.gov). Date of extraction is prior to 2010. Nodes represent airports or service centers, and a directed edge is the preferred route between airport i and airport j.[^icon]
-[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
+description = """A network of air traffic control routes in the United States, constructed by the Ma'ayan Laboratory (Mount Sinai School of Medicine) from the Preferred Routes Database of the National Flight Data Center (NFDC) of the Federal Aviation Administration (FAA), which lists the routes recommended for flights between airports. Each preferred route is a string of route elements, and a directed edge joins each element to the next one in a route string. Nodes are these elements, identified by their codes: airports, navigational aids and fixes, airways (e.g. Victor airways such as V162 and jet routes such as J10) and named standard terminal arrival routes (suffix `_STAR`) and departure procedures (suffix `_DP`). The network was distributed in the laboratory's SIG flat file format, and was extracted from the database at an undocumented date before 2010; the FAA database is updated regularly, and its current version differs from this network.
+
+The network has the following properties:
+
+- Nodes: `name`, the code of the route element (as used in the FAA database)."""
tags = ['Transportation', 'Airport', 'Unweighted']
-url = 'http://konect.cc/networks/maayan-faa'
+url = 'https://web.archive.org/web/20180916202441/http://research.mssm.edu/maayan/datasets/qualitative_networks.shtml'
citation = [('United States Federal Aviation Administration, "Air traffic control system command center."', 'http://www.fly.faa.gov/ (2010)')]
icon_hash = '57f2e1248cf714f319c3912e'
-upstream_prefix = 'http://konect.cc/files'
-files = [('download.tsv.maayan-faa.tar.bz2', None, 'konect')]
+upstream_license = None
+# The Ma'ayan Laboratory site is gone; the file is obtained from the Internet
+# Archive.
+upstream_prefix = 'https://web.archive.org/web/20150912005304id_/http://research.mssm.edu:80/maayan/datasets'
+files = [('faa.sig', None, 'sig')]
def fetch_upstream(force=False):
return fetch_upstream_files(__name__.split(".")[-1], upstream_prefix, files,
@@ -38,12 +44,24 @@ def fetch_upstream(force=False):
def parse(alts=None):
global files
name = __name__.split(".")[-1]
- for fnames, alt, fmt in files:
+ for fname, alt, fmt in files:
if alts is not None and alt not in alts:
continue
- if isinstance(fnames, str):
- fnames = [fnames]
- with ExitStack() as stack:
- fs = [stack.enter_context(open_upstream_file(name, fn, "rb")) for fn in fnames]
- g = parse_graph(fs, fmt, directed=True)
+ # SIG flat file: 13 space-separated columns per line, of which only
+ # the first (source) and sixth (target) are not empty ("NA") here.
+ g = Graph(directed=True)
+ vs = {}
+ edges = []
+ with open_upstream_file(name, fname, "rb") as f:
+ for line in f.read().decode("utf-8").splitlines():
+ row = line.split()
+ if len(row) == 0:
+ continue
+ edges.append([vs.setdefault(row[0], len(vs)),
+ vs.setdefault(row[5], len(vs))])
+ g.add_vertex(len(vs))
+ g.vp.name = g.new_vp("string")
+ for k, v in vs.items():
+ g.vp.name[v] = k
+ g.add_edge_list(edges)
yield alt, g
Update copyright information 73a4f0d
diff --git a/entries/faa_routes/__init__.py b/entries/faa_routes/__init__.py
index 109aa64..50f2821 100644
--- a/entries/faa_routes/__init__.py
+++ b/entries/faa_routes/__init__.py
@@ -1,7 +1,7 @@
#! /usr/bin/env python
# -*- coding: utf-8 -*-
#
-# Copyright (C) 2020-2024 Tiago de Paula Peixoto <tiago@skewed.de>
+# Copyright (C) 2020-2026 Tiago de Paula Peixoto <tiago@skewed.de>
#
# This program is free software: you can redistribute it and/or modify it under
# the terms of the GNU Affero General Public License as published by the Free
Update copyright information 3d288ea
diff --git a/entries/faa_routes/__init__.py b/entries/faa_routes/__init__.py
index 573381d..109aa64 100644
--- a/entries/faa_routes/__init__.py
+++ b/entries/faa_routes/__init__.py
@@ -1,7 +1,7 @@
#! /usr/bin/env python
# -*- coding: utf-8 -*-
#
-# Copyright (C) 2020-2023 Tiago de Paula Peixoto <tiago@skewed.de>
+# Copyright (C) 2020-2024 Tiago de Paula Peixoto <tiago@skewed.de>
#
# This program is free software: you can redistribute it and/or modify it under
# the terms of the GNU Affero General Public License as published by the Free
Update copyright information 8d005ae
diff --git a/entries/faa_routes/__init__.py b/entries/faa_routes/__init__.py
index f3cc3d1..573381d 100644
--- a/entries/faa_routes/__init__.py
+++ b/entries/faa_routes/__init__.py
@@ -1,7 +1,7 @@
#! /usr/bin/env python
# -*- coding: utf-8 -*-
#
-# Copyright (C) 2021 Tiago de Paula Peixoto <tiago@skewed.de>
+# Copyright (C) 2020-2023 Tiago de Paula Peixoto <tiago@skewed.de>
#
# This program is free software: you can redistribute it and/or modify it under
# the terms of the GNU Affero General Public License as published by the Free
Update copyright info db2efcc
diff --git a/entries/faa_routes/__init__.py b/entries/faa_routes/__init__.py
index 077e4b7..f3cc3d1 100644
--- a/entries/faa_routes/__init__.py
+++ b/entries/faa_routes/__init__.py
@@ -1,7 +1,7 @@
#! /usr/bin/env python
# -*- coding: utf-8 -*-
#
-# Copyright (C) 2020 Tiago de Paula Peixoto <tiago@skewed.de>
+# Copyright (C) 2021 Tiago de Paula Peixoto <tiago@skewed.de>
#
# This program is free software: you can redistribute it and/or modify it under
# the terms of the GNU Affero General Public License as published by the Free
Un-orphan KONECT datasets 894eba5
KONECT has been brought back from the dead for the time being.
diff --git a/entries/faa_routes/__init__.py b/entries/faa_routes/__init__.py
index 1cdc15a..077e4b7 100644
--- a/entries/faa_routes/__init__.py
+++ b/entries/faa_routes/__init__.py
@@ -26,7 +26,6 @@ url = 'http://konect.cc/networks/maayan-faa'
citation = [('United States Federal Aviation Administration, "Air traffic control system command center."', 'http://www.fly.faa.gov/ (2010)')]
icon_hash = '57f2e1248cf714f319c3912e'
upstream_prefix = 'http://konect.cc/files'
-orphan = True
files = [('download.tsv.maayan-faa.tar.bz2', None, 'konect')]
def fetch_upstream(force=False):
Update citations to use DOIs e878874
diff --git a/entries/faa_routes/__init__.py b/entries/faa_routes/__init__.py
index 97ba5f6..1cdc15a 100644
--- a/entries/faa_routes/__init__.py
+++ b/entries/faa_routes/__init__.py
@@ -23,7 +23,7 @@ description = """A network of air traffic routes, from the FAA (Federal Aviation
[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
tags = ['Transportation', 'Airport', 'Unweighted']
url = 'http://konect.cc/networks/maayan-faa'
-citation = [('United States Federal Aviation Administration, "Air traffic control system command center." http://www.fly.faa.gov/ (2010).', 'http://konect.cc/networks/maayan-faa')]
+citation = [('United States Federal Aviation Administration, "Air traffic control system command center."', 'http://www.fly.faa.gov/ (2010)')]
icon_hash = '57f2e1248cf714f319c3912e'
upstream_prefix = 'http://konect.cc/files'
orphan = True
Add support for 'orphan' datasets and tag konect entries e330b80
diff --git a/entries/faa_routes/__init__.py b/entries/faa_routes/__init__.py
index b31f5a6..97ba5f6 100644
--- a/entries/faa_routes/__init__.py
+++ b/entries/faa_routes/__init__.py
@@ -26,6 +26,7 @@ url = 'http://konect.cc/networks/maayan-faa'
citation = [('United States Federal Aviation Administration, "Air traffic control system command center." http://www.fly.faa.gov/ (2010).', 'http://konect.cc/networks/maayan-faa')]
icon_hash = '57f2e1248cf714f319c3912e'
upstream_prefix = 'http://konect.cc/files'
+orphan = True
files = [('download.tsv.maayan-faa.tar.bz2', None, 'konect')]
def fetch_upstream(force=False):
Change license from GPLv3 to AGPLv3 d754be5
diff --git a/entries/faa_routes/__init__.py b/entries/faa_routes/__init__.py
index 13c6ca1..b31f5a6 100644
--- a/entries/faa_routes/__init__.py
+++ b/entries/faa_routes/__init__.py
@@ -3,18 +3,18 @@
#
# Copyright (C) 2020 Tiago de Paula Peixoto <tiago@skewed.de>
#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# This program is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option) any
+# later version.
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
+# details.
#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# You should have received a copy of the GNU Affero General Public License along
+# with this program. If not, see <http://www.gnu.org/licenses/>.
from .. import *
Add explicit attribution to descriptions obtained from ICON 1645314
diff --git a/entries/faa_routes/__init__.py b/entries/faa_routes/__init__.py
index 1cf2d49..13c6ca1 100644
--- a/entries/faa_routes/__init__.py
+++ b/entries/faa_routes/__init__.py
@@ -19,7 +19,8 @@
from .. import *
title = "FAA Preferred Routes (2010)"
-description = "A network of air traffic routes, from the FAA (Federal Aviation Administration) National Flight Data Center (NFDC) preferred routes database (www.fly.faa.gov). Date of extraction is prior to 2010. Nodes represent airports or service centers, and a directed edge is the preferred route between airport i and airport j."
+description = """A network of air traffic routes, from the FAA (Federal Aviation Administration) National Flight Data Center (NFDC) preferred routes database (www.fly.faa.gov). Date of extraction is prior to 2010. Nodes represent airports or service centers, and a directed edge is the preferred route between airport i and airport j.[^icon]
+[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
tags = ['Transportation', 'Airport', 'Unweighted']
url = 'http://konect.cc/networks/maayan-faa'
citation = [('United States Federal Aviation Administration, "Air traffic control system command center." http://www.fly.faa.gov/ (2010).', 'http://konect.cc/networks/maayan-faa')]
Initial commit cc85872
diff --git a/entries/faa_routes/__init__.py b/entries/faa_routes/__init__.py
new file mode 100644
index 0000000..1cf2d49
--- /dev/null
+++ b/entries/faa_routes/__init__.py
@@ -0,0 +1,48 @@
+#! /usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2020 Tiago de Paula Peixoto <tiago@skewed.de>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+from .. import *
+
+title = "FAA Preferred Routes (2010)"
+description = "A network of air traffic routes, from the FAA (Federal Aviation Administration) National Flight Data Center (NFDC) preferred routes database (www.fly.faa.gov). Date of extraction is prior to 2010. Nodes represent airports or service centers, and a directed edge is the preferred route between airport i and airport j."
+tags = ['Transportation', 'Airport', 'Unweighted']
+url = 'http://konect.cc/networks/maayan-faa'
+citation = [('United States Federal Aviation Administration, "Air traffic control system command center." http://www.fly.faa.gov/ (2010).', 'http://konect.cc/networks/maayan-faa')]
+icon_hash = '57f2e1248cf714f319c3912e'
+upstream_prefix = 'http://konect.cc/files'
+files = [('download.tsv.maayan-faa.tar.bz2', None, 'konect')]
+
+def fetch_upstream(force=False):
+ return fetch_upstream_files(__name__.split(".")[-1], upstream_prefix, files,
+ force)
+
+@cache_network()
+@coerce_props()
+@annotate()
+def parse(alts=None):
+ global files
+ name = __name__.split(".")[-1]
+ for fnames, alt, fmt in files:
+ if alts is not None and alt not in alts:
+ continue
+ if isinstance(fnames, str):
+ fnames = [fnames]
+ with ExitStack() as stack:
+ fs = [stack.enter_context(open_upstream_file(name, fn, "rb")) for fn in fnames]
+ g = parse_graph(fs, fmt, directed=True)
+ yield alt, g