diff --git a/codelists/closed/nodeStatus.csv b/codelists/closed/nodeStatus.csv index 1bdb4db..95b5855 100644 --- a/codelists/closed/nodeStatus.csv +++ b/codelists/closed/nodeStatus.csv @@ -2,6 +2,6 @@ Code,Title,Description proposed,Proposed,Planning for the node is at an early stage and financing for its construction is not yet finalised. planned,Planned,Planning for the node is at an advanced stage and financing for its construction is finalised. underConstruction,Under construction,Construction of the passive physical infrastructure for the node is in progress. +inactive,Inactive,"Construction of the passive network infrastructure is complete, but the node is not yet operational." operational,Operational,The active network infrastructure for at least one network provider at the node is live and carrying traffic. decommissioned,Decommissioned,The node is no longer operational. -inactive,Inactive,"Construction of the passive network infrastructure is complete, but the node is not yet operational." diff --git a/codelists/closed/spanStatus.csv b/codelists/closed/spanStatus.csv index a2826b7..ee6c652 100644 --- a/codelists/closed/spanStatus.csv +++ b/codelists/closed/spanStatus.csv @@ -1,7 +1,7 @@ Code,Title,Description -operational,Operational,The active network infrastructure for at least one network provider on the span is live and carrying traffic. -underConstruction,Under construction,Construction of the passive physical infrastructure for the span is in progress. -planned,Planned,Planning for the span is at an advanced stage and financing for its construction is finalised. -decommissioned,Decommissioned,The span is no longer operational. proposed,Proposed,Planning for the span is at an early stage and financing for its construction is not yet finalised. +planned,Planned,Planning for the span is at an advanced stage and financing for its construction is finalised. +underConstruction,Under construction,Construction of the passive physical infrastructure for the span is in progress. inactive,Inactive,"Construction of the passive network infrastructure is complete, but the span is not yet operational." +operational,Operational,The active network infrastructure for at least one network provider on the span is live and carrying traffic. +decommissioned,Decommissioned,The span is no longer operational. diff --git a/codelists/closed/transmissionMedium.csv b/codelists/closed/transmissionMedium.csv index 428b83a..1030ff3 100644 --- a/codelists/closed/transmissionMedium.csv +++ b/codelists/closed/transmissionMedium.csv @@ -1,5 +1,5 @@ Code,Title,Description +coaxial,Coaxial cable,The physical media of this span is coaxial cable. +copper,Copper wire,The physical media of this span is copper wire. fibre,Fibre optic cable,The physical media of this span is fibre optic cable. microwave,Microwave radio,The physical media of this span is microwave radio. -copper,Copper wire,The physical media of this span is copper wire. -coaxial,Coaxial cable,The physical media of this span is coaxial cable. diff --git a/codelists/open/nodeTechnologies.csv b/codelists/open/nodeTechnologies.csv index 8c1c9e4..3b9b443 100644 --- a/codelists/open/nodeTechnologies.csv +++ b/codelists/open/nodeTechnologies.csv @@ -1,3 +1,3 @@ Code,Title,Description -mpls,Multi-Protocol Label Switching,A routing technique that directs data from one node to the next based on labels rather than network addresses. ip,Internet Protocol,A network layer protocol that defines the addressing mechanism on the Internet to allow data to be transmitted. +mpls,Multi-Protocol Label Switching,A routing technique that directs data from one node to the next based on labels rather than network addresses. diff --git a/codelists/open/nodeType.csv b/codelists/open/nodeType.csv index 3e73280..67a8498 100644 --- a/codelists/open/nodeType.csv +++ b/codelists/open/nodeType.csv @@ -1,13 +1,13 @@ Code,Title,Description -dataCentre,Data centre,"A structure, or group of structures, dedicated to the centralized accommodation, interconnection and operation of information technology and network telecommunications equipment." -cableLanding,Cable landing point,The location where a submarine or other underwater cable makes landfall. -pop,Point of Presence,"A demarcation point, access point, or physical location at which two or more networks or communication devices share a connection." -tower,Tower,A ground-based or rooftop structure that supports antennas for sending or receiving radio waves. -ixp,Internet Exchange Point,"A physical point at which networks such as internet service providers, mobile operators and content delivery networks come together to connect and exchange internet traffic." +addDropSite,Add drop site,"A point at which individual digital bit streams can be added to, or dropped from, a multiplexed signal in order to redirect bit streams between network paths." +aggregationPoint,Aggregation point,A point at which multiple fibre optic cables are spliced together. Typically located between an exchange or POP and GPON splitters or end user premises. borderCrossing,Border crossing,The point at which a fibre cable crosses either an international boundary or the coastline of the operator’s country. The countries to which this node connects should be listed in `.internationalConnections`. cabinet,Cabinet,An distribution cabinet to which end users are connected by a standard phone line. -aggregationPoint,Aggregation point,A point at which multiple fibre optic cables are spliced together. Typically located between an exchange or POP and GPON splitters or end user premises. +cableLanding,Cable landing point,The location where a submarine or other underwater cable makes landfall. +dataCentre,Data centre,"A structure, or group of structures, dedicated to the centralized accommodation, interconnection and operation of information technology and network telecommunications equipment." exchange,Exchange,A telephone exchange. -substation,Substation,An electrical substation. -addDropSite,Add drop site,"A point at which individual digital bit streams can be added to, or dropped from, a multiplexed signal in order to redirect bit streams between network paths." +ixp,Internet Exchange Point,"A physical point at which networks such as internet service providers, mobile operators and content delivery networks come together to connect and exchange internet traffic." +pop,Point of Presence,"A demarcation point, access point, or physical location at which two or more networks or communication devices share a connection." repeaterSite,Repeater site,A point at which fibre optic signals are amplified or repeated. Also known as a regeneration facility. +substation,Substation,An electrical substation. +tower,Tower,A ground-based or rooftop structure that supports antennas for sending or receiving radio waves. diff --git a/codelists/open/spanTechnologies.csv b/codelists/open/spanTechnologies.csv index d503842..0f5f52d 100644 --- a/codelists/open/spanTechnologies.csv +++ b/codelists/open/spanTechnologies.csv @@ -1,5 +1,5 @@ Code,Title,Description -sdh,Synchronous Digital Hierarchy,"A standardised protocol for transferring multiple digital bit streams synchronously over optical fibre. SDH is used worldwide, with the exception of the US and Canada." dwdm,Dense Wavelength Division Multiplexing,A technology that multiplexes a number of optical carrier signals onto a single optical fibre by using different wavelengths. -tdm,Time Division Multiplexing,A technology that multiplexes a number of optical carrier signals onto a single optical fibre by using different arrival times. +sdh,Synchronous Digital Hierarchy,"A standardised protocol for transferring multiple digital bit streams synchronously over optical fibre. SDH is used worldwide, with the exception of the US and Canada." sonet,Synchronous Optical Networking,A standardised protocol for transferring multiple digital bit streams synchronously over optical fibre. SONET is used in the US and Canada. +tdm,Time Division Multiplexing,A technology that multiplexes a number of optical carrier signals onto a single optical fibre by using different arrival times. diff --git a/docs/history/changelog.md b/docs/history/changelog.md index b1e04a8..a9a121c 100644 --- a/docs/history/changelog.md +++ b/docs/history/changelog.md @@ -24,6 +24,7 @@ Iterative improvements are made outside of the release cycle. They do not involv - [#213](https://github.com/Open-Telecoms-Data/open-fibre-data-standard/pull/213) - For GeoJSON/JSON conversion, use libcoveofds now. - [#232](https://github.com/Open-Telecoms-Data/open-fibre-data-standard/pull/232) - Remove unmaintained GitHub issue admonitions. - [#273](https://github.com/Open-Telecoms-Data/open-fibre-data-standard/pull/273) - Add OFDS Convert, Validate, Explore tool (CoVE) link to the left hand navigation +- [#280](https://github.com/Open-Telecoms-Data/open-fibre-data-standard/pull/280) - Reorder codelist codes. - [#248](https://github.com/Open-Telecoms-Data/open-fibre-data-standard/pull/282) - Add comments declaring document mode to each markdown file in docs ## 0.3.0 - 2023-05-17