From 8d6bf038407f4fe51857d313abef5a196837d568 Mon Sep 17 00:00:00 2001 From: odscjen Date: Tue, 16 Apr 2024 10:52:31 +0100 Subject: [PATCH 1/8] codelists: reorder codelists --- codelists/closed/nodeStatus.csv | 2 +- codelists/closed/spanStatus.csv | 8 ++++---- codelists/closed/transmissionMedium.csv | 4 ++-- codelists/open/nodeTechnologies.csv | 2 +- codelists/open/nodeType.csv | 17 +++++++++-------- codelists/open/spanTechnologies.csv | 4 ++-- examples/csv/nodes.csv | 6 +++--- examples/csv/spans.csv | 4 ++-- 8 files changed, 24 insertions(+), 23 deletions(-) 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..e878c27 100644 --- a/codelists/open/nodeType.csv +++ b/codelists/open/nodeType.csv @@ -1,13 +1,14 @@ 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/examples/csv/nodes.csv b/examples/csv/nodes.csv index 3e4c551..0e339ed 100644 --- a/examples/csv/nodes.csv +++ b/examples/csv/nodes.csv @@ -1,3 +1,3 @@ -id,nodes/0/id,nodes/0/name,nodes/0/phase/id,nodes/0/phase/name,nodes/0/status,nodes/0/location,nodes/0/address/streetAddress,nodes/0/address/locality,nodes/0/address/region,nodes/0/address/postalCode,nodes/0/address/country,nodes/0/type,nodes/0/accessPoint,nodes/0/power,nodes/0/technologies,nodes/0/physicalInfrastructureProvider/id,nodes/0/physicalInfrastructureProvider/name -a096d627-72e1-4f9b-b129-951b1737bff4,1,Accra,1,NextGen Phase 1,operational,POINT (-0.174 5.625),Boundary Rd,Shiashie,Accra,12345,GH,pop,True,True,ip,GH-RGD-CS111111111,FibreCo -a096d627-72e1-4f9b-b129-951b1737bff4,2,Kumasi,1,NextGen Phase 1,operational,POINT (-1.628 6.711),Kejetia Road,Bantama,Kumasi,00000,GH,pop,False,True,ip,GH-RGD-CS111111111,FibreCo +id,nodes/0/id,nodes/0/name,nodes/0/phase/id,nodes/0/phase/name,nodes/0/status,nodes/0/location,nodes/0/address/streetAddress,nodes/0/address/locality,nodes/0/address/region,nodes/0/address/postalCode,nodes/0/address/country,nodes/0/type,nodes/0/accessPoint,nodes/0/power,nodes/0/technologies,nodes/0/physicalInfrastructureProvider/id,nodes/0/physicalInfrastructureProvider/name,nodes/0/location/type,nodes/0/location/coordinates +a096d627-72e1-4f9b-b129-951b1737bff4,1,Accra,1,NextGen Phase 1,operational,,Boundary Rd,Shiashie,Accra,12345,GH,pop,True,True,ip,GH-RGD-CS111111111,FibreCo,Point,-0.174;5.625 +a096d627-72e1-4f9b-b129-951b1737bff4,2,Kumasi,1,NextGen Phase 1,operational,,Kejetia Road,Bantama,Kumasi,00000,GH,pop,False,True,ip,GH-RGD-CS111111111,FibreCo,Point,-1.628;6.711 diff --git a/examples/csv/spans.csv b/examples/csv/spans.csv index 775199f..1526e21 100644 --- a/examples/csv/spans.csv +++ b/examples/csv/spans.csv @@ -1,2 +1,2 @@ -id,spans/0/id,spans/0/name,spans/0/phase/id,spans/0/phase/name,spans/0/status,spans/0/readyForServiceDate,spans/0/start,spans/0/end,spans/0/directed,spans/0/route,spans/0/physicalInfrastructureProvider/id,spans/0/physicalInfrastructureProvider/name,spans/0/supplier/id,spans/0/supplier/name,spans/0/transmissionMedium,spans/0/deployment,spans/0/deploymentDetails/description,spans/0/darkFibre,spans/0/fibreType,spans/0/fibreTypeDetails/fibreSubtype,spans/0/fibreTypeDetails/description,spans/0/fibreCount,spans/0/fibreLength,spans/0/technologies,spans/0/capacity,spans/0/capacityDetails/description,spans/0/countries -a096d627-72e1-4f9b-b129-951b1737bff4,1,Accra to Kumasi,1,NextGen Phase 1,operational,2018-01-01,1,2,False,"LINESTRING (-0.173 5.626, -0.178 5.807, -0.112 5.971, -0.211 5.963, -0.321 6.17, -0.488 6.29, -0.56 6.421, -0.752 6.533, -0.867 6.607, -1.101 6.585, -1.304 6.623, -1.461 6.727, -1.628 6.713)",GH-RGD-CS111111111,FibreCo,GH-RGD-CS333333333,ProjectCo,fibre,belowGround,Buried in ducts,True,G.652,G.652.D,"CABLED STANDARD ENHANCED SINGLEMODE FIBRE ESMF, LOW WATER PEAK SINGLE MODE FIBRE G.652.D, OS2",24,276000,sdh,4.976,2xSTM-16,GH +id,spans/0/id,spans/0/name,spans/0/phase/id,spans/0/phase/name,spans/0/status,spans/0/readyForServiceDate,spans/0/start,spans/0/end,spans/0/directed,spans/0/route,spans/0/physicalInfrastructureProvider/id,spans/0/physicalInfrastructureProvider/name,spans/0/supplier/id,spans/0/supplier/name,spans/0/transmissionMedium,spans/0/deployment,spans/0/deploymentDetails/description,spans/0/darkFibre,spans/0/fibreType,spans/0/fibreTypeDetails/fibreSubtype,spans/0/fibreTypeDetails/description,spans/0/fibreCount,spans/0/fibreLength,spans/0/technologies,spans/0/capacity,spans/0/capacityDetails/description,spans/0/countries,spans/0/route/type,spans/0/route/coordinates +a096d627-72e1-4f9b-b129-951b1737bff4,1,Accra to Kumasi,1,NextGen Phase 1,operational,2018-01-01,1,2,False,,GH-RGD-CS111111111,FibreCo,GH-RGD-CS333333333,ProjectCo,fibre,belowGround,Buried in ducts,True,G.652,G.652.D,"CABLED STANDARD ENHANCED SINGLEMODE FIBRE ESMF, LOW WATER PEAK SINGLE MODE FIBRE G.652.D, OS2",24,276000,sdh,4.976,2xSTM-16,GH,LineString,"-0.173,5.626;-0.178,5.807;-0.112,5.971;-0.211,5.963;-0.321,6.17;-0.488,6.29;-0.56,6.421;-0.752,6.533;-0.867,6.607;-1.101,6.585;-1.304,6.623;-1.461,6.727;-1.628,6.713" From d108c2a60f786c4b84f47d064f54302c9f798f55 Mon Sep 17 00:00:00 2001 From: odscjen Date: Tue, 16 Apr 2024 10:55:20 +0100 Subject: [PATCH 2/8] update changelog --- docs/history/changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/history/changelog.md b/docs/history/changelog.md index 8848475..98bb164 100644 --- a/docs/history/changelog.md +++ b/docs/history/changelog.md @@ -22,6 +22,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. ## 0.3.0 - 2023-05-17 From 4df1e682d7d10df5d94587d42feea35a05734943 Mon Sep 17 00:00:00 2001 From: odscjen Date: Tue, 16 Apr 2024 11:09:43 +0100 Subject: [PATCH 3/8] nodeType.csv fix typo --- codelists/open/nodeType.csv | 1 - 1 file changed, 1 deletion(-) diff --git a/codelists/open/nodeType.csv b/codelists/open/nodeType.csv index e878c27..67a8498 100644 --- a/codelists/open/nodeType.csv +++ b/codelists/open/nodeType.csv @@ -11,4 +11,3 @@ pop,Point of Presence,"A demarcation point, access point, or physical location a 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. - From 293d0396cd6c101adf70b11b68649e2c79f16cce Mon Sep 17 00:00:00 2001 From: odscjen Date: Tue, 16 Apr 2024 12:11:06 +0100 Subject: [PATCH 4/8] revert 8d6bf038407f4fe51857d313abef5a196837d568 --- codelists/closed/nodeStatus.csv | 2 +- codelists/closed/spanStatus.csv | 8 ++++---- codelists/closed/transmissionMedium.csv | 4 ++-- codelists/open/nodeTechnologies.csv | 2 +- codelists/open/nodeType.csv | 15 ++++++++------- codelists/open/spanTechnologies.csv | 4 ++-- examples/csv/nodes.csv | 6 +++--- examples/csv/spans.csv | 4 ++-- 8 files changed, 23 insertions(+), 22 deletions(-) diff --git a/codelists/closed/nodeStatus.csv b/codelists/closed/nodeStatus.csv index 95b5855..1bdb4db 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 ee6c652..a2826b7 100644 --- a/codelists/closed/spanStatus.csv +++ b/codelists/closed/spanStatus.csv @@ -1,7 +1,7 @@ Code,Title,Description -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. +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. +inactive,Inactive,"Construction of the passive network infrastructure is complete, but the span is not yet operational." diff --git a/codelists/closed/transmissionMedium.csv b/codelists/closed/transmissionMedium.csv index 1030ff3..428b83a 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 3b9b443..8c1c9e4 100644 --- a/codelists/open/nodeTechnologies.csv +++ b/codelists/open/nodeTechnologies.csv @@ -1,3 +1,3 @@ Code,Title,Description -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. +ip,Internet Protocol,A network layer protocol that defines the addressing mechanism on the Internet to allow data to be transmitted. diff --git a/codelists/open/nodeType.csv b/codelists/open/nodeType.csv index 67a8498..2b55102 100644 --- a/codelists/open/nodeType.csv +++ b/codelists/open/nodeType.csv @@ -1,13 +1,14 @@ Code,Title,Description -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. +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." 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. -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." +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. exchange,Exchange,A telephone exchange. -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. +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." +repeaterSite,Repeater site,A point at which fibre optic signals are amplified or repeated. Also known as a regeneration facility. diff --git a/codelists/open/spanTechnologies.csv b/codelists/open/spanTechnologies.csv index 0f5f52d..d503842 100644 --- a/codelists/open/spanTechnologies.csv +++ b/codelists/open/spanTechnologies.csv @@ -1,5 +1,5 @@ Code,Title,Description -dwdm,Dense Wavelength Division Multiplexing,A technology that multiplexes a number of optical carrier signals onto a single optical fibre by using different wavelengths. 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. +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. +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. diff --git a/examples/csv/nodes.csv b/examples/csv/nodes.csv index 0e339ed..3e4c551 100644 --- a/examples/csv/nodes.csv +++ b/examples/csv/nodes.csv @@ -1,3 +1,3 @@ -id,nodes/0/id,nodes/0/name,nodes/0/phase/id,nodes/0/phase/name,nodes/0/status,nodes/0/location,nodes/0/address/streetAddress,nodes/0/address/locality,nodes/0/address/region,nodes/0/address/postalCode,nodes/0/address/country,nodes/0/type,nodes/0/accessPoint,nodes/0/power,nodes/0/technologies,nodes/0/physicalInfrastructureProvider/id,nodes/0/physicalInfrastructureProvider/name,nodes/0/location/type,nodes/0/location/coordinates -a096d627-72e1-4f9b-b129-951b1737bff4,1,Accra,1,NextGen Phase 1,operational,,Boundary Rd,Shiashie,Accra,12345,GH,pop,True,True,ip,GH-RGD-CS111111111,FibreCo,Point,-0.174;5.625 -a096d627-72e1-4f9b-b129-951b1737bff4,2,Kumasi,1,NextGen Phase 1,operational,,Kejetia Road,Bantama,Kumasi,00000,GH,pop,False,True,ip,GH-RGD-CS111111111,FibreCo,Point,-1.628;6.711 +id,nodes/0/id,nodes/0/name,nodes/0/phase/id,nodes/0/phase/name,nodes/0/status,nodes/0/location,nodes/0/address/streetAddress,nodes/0/address/locality,nodes/0/address/region,nodes/0/address/postalCode,nodes/0/address/country,nodes/0/type,nodes/0/accessPoint,nodes/0/power,nodes/0/technologies,nodes/0/physicalInfrastructureProvider/id,nodes/0/physicalInfrastructureProvider/name +a096d627-72e1-4f9b-b129-951b1737bff4,1,Accra,1,NextGen Phase 1,operational,POINT (-0.174 5.625),Boundary Rd,Shiashie,Accra,12345,GH,pop,True,True,ip,GH-RGD-CS111111111,FibreCo +a096d627-72e1-4f9b-b129-951b1737bff4,2,Kumasi,1,NextGen Phase 1,operational,POINT (-1.628 6.711),Kejetia Road,Bantama,Kumasi,00000,GH,pop,False,True,ip,GH-RGD-CS111111111,FibreCo diff --git a/examples/csv/spans.csv b/examples/csv/spans.csv index 1526e21..775199f 100644 --- a/examples/csv/spans.csv +++ b/examples/csv/spans.csv @@ -1,2 +1,2 @@ -id,spans/0/id,spans/0/name,spans/0/phase/id,spans/0/phase/name,spans/0/status,spans/0/readyForServiceDate,spans/0/start,spans/0/end,spans/0/directed,spans/0/route,spans/0/physicalInfrastructureProvider/id,spans/0/physicalInfrastructureProvider/name,spans/0/supplier/id,spans/0/supplier/name,spans/0/transmissionMedium,spans/0/deployment,spans/0/deploymentDetails/description,spans/0/darkFibre,spans/0/fibreType,spans/0/fibreTypeDetails/fibreSubtype,spans/0/fibreTypeDetails/description,spans/0/fibreCount,spans/0/fibreLength,spans/0/technologies,spans/0/capacity,spans/0/capacityDetails/description,spans/0/countries,spans/0/route/type,spans/0/route/coordinates -a096d627-72e1-4f9b-b129-951b1737bff4,1,Accra to Kumasi,1,NextGen Phase 1,operational,2018-01-01,1,2,False,,GH-RGD-CS111111111,FibreCo,GH-RGD-CS333333333,ProjectCo,fibre,belowGround,Buried in ducts,True,G.652,G.652.D,"CABLED STANDARD ENHANCED SINGLEMODE FIBRE ESMF, LOW WATER PEAK SINGLE MODE FIBRE G.652.D, OS2",24,276000,sdh,4.976,2xSTM-16,GH,LineString,"-0.173,5.626;-0.178,5.807;-0.112,5.971;-0.211,5.963;-0.321,6.17;-0.488,6.29;-0.56,6.421;-0.752,6.533;-0.867,6.607;-1.101,6.585;-1.304,6.623;-1.461,6.727;-1.628,6.713" +id,spans/0/id,spans/0/name,spans/0/phase/id,spans/0/phase/name,spans/0/status,spans/0/readyForServiceDate,spans/0/start,spans/0/end,spans/0/directed,spans/0/route,spans/0/physicalInfrastructureProvider/id,spans/0/physicalInfrastructureProvider/name,spans/0/supplier/id,spans/0/supplier/name,spans/0/transmissionMedium,spans/0/deployment,spans/0/deploymentDetails/description,spans/0/darkFibre,spans/0/fibreType,spans/0/fibreTypeDetails/fibreSubtype,spans/0/fibreTypeDetails/description,spans/0/fibreCount,spans/0/fibreLength,spans/0/technologies,spans/0/capacity,spans/0/capacityDetails/description,spans/0/countries +a096d627-72e1-4f9b-b129-951b1737bff4,1,Accra to Kumasi,1,NextGen Phase 1,operational,2018-01-01,1,2,False,"LINESTRING (-0.173 5.626, -0.178 5.807, -0.112 5.971, -0.211 5.963, -0.321 6.17, -0.488 6.29, -0.56 6.421, -0.752 6.533, -0.867 6.607, -1.101 6.585, -1.304 6.623, -1.461 6.727, -1.628 6.713)",GH-RGD-CS111111111,FibreCo,GH-RGD-CS333333333,ProjectCo,fibre,belowGround,Buried in ducts,True,G.652,G.652.D,"CABLED STANDARD ENHANCED SINGLEMODE FIBRE ESMF, LOW WATER PEAK SINGLE MODE FIBRE G.652.D, OS2",24,276000,sdh,4.976,2xSTM-16,GH From 434dafcfd2d1710361a3455b44ea0f0213d8a6c1 Mon Sep 17 00:00:00 2001 From: odscjen Date: Tue, 16 Apr 2024 12:19:07 +0100 Subject: [PATCH 5/8] reorder codelists but no example updates --- codelists/closed/nodeStatus.csv | 2 +- codelists/closed/spanStatus.csv | 6 +++--- codelists/closed/transmissionMedium.csv | 4 ++-- codelists/open/nodeTechnologies.csv | 2 +- codelists/open/nodeType.csv | 15 +++++++-------- codelists/open/spanTechnologies.csv | 4 ++-- 6 files changed, 16 insertions(+), 17 deletions(-) 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..9667c44 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. +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 2b55102..67a8498 100644 --- a/codelists/open/nodeType.csv +++ b/codelists/open/nodeType.csv @@ -1,14 +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. +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. -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." -repeaterSite,Repeater site,A point at which fibre optic signals are amplified or repeated. Also known as a regeneration facility. 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. From 98919f0c6ab0a59ea3b94d70cddfae239c1275d7 Mon Sep 17 00:00:00 2001 From: odscjen Date: Thu, 23 May 2024 14:38:41 +0100 Subject: [PATCH 6/8] docs/: add comment to md files declaring document mode --- docs/governance/index.md | 2 ++ docs/guidance/index.md | 2 ++ docs/guidance/publication.md | 2 ++ docs/guidance/use.md | 2 ++ docs/history/changelog.md | 2 ++ docs/history/index.md | 2 ++ docs/index.md | 2 ++ docs/primer/index.md | 2 ++ docs/primer/openfibredata.md | 2 ++ docs/primer/openfibredatastandard.md | 2 ++ docs/primer/scopeandkeyconcepts.md | 2 ++ docs/reference/codelists.md | 2 ++ docs/reference/identifiers.md | 2 ++ docs/reference/index.md | 2 ++ docs/reference/publication_formats/csv.md | 2 ++ docs/reference/publication_formats/geojson.md | 2 ++ docs/reference/publication_formats/index.md | 2 ++ docs/reference/publication_formats/json.md | 2 ++ docs/reference/schema.md | 2 ++ docs/support/index.md | 2 ++ 20 files changed, 40 insertions(+) diff --git a/docs/governance/index.md b/docs/governance/index.md index d396ec2..2151829 100644 --- a/docs/governance/index.md +++ b/docs/governance/index.md @@ -1,3 +1,5 @@ + + # Governance ```{admonition} 0.3.0 release diff --git a/docs/guidance/index.md b/docs/guidance/index.md index 9ce79c1..fb38de6 100644 --- a/docs/guidance/index.md +++ b/docs/guidance/index.md @@ -1,3 +1,5 @@ + + # Guidance ```{admonition} 0.3.0 release diff --git a/docs/guidance/publication.md b/docs/guidance/publication.md index ff9885f..4888d7d 100644 --- a/docs/guidance/publication.md +++ b/docs/guidance/publication.md @@ -1,3 +1,5 @@ + + # How to publish OFDS data ```{admonition} 0.3.0 release diff --git a/docs/guidance/use.md b/docs/guidance/use.md index e994345..6b90d4e 100644 --- a/docs/guidance/use.md +++ b/docs/guidance/use.md @@ -1,3 +1,5 @@ + + # How to use OFDS data ```{admonition} 0.3.0 release diff --git a/docs/history/changelog.md b/docs/history/changelog.md index 8848475..1390437 100644 --- a/docs/history/changelog.md +++ b/docs/history/changelog.md @@ -1,3 +1,5 @@ + + # Changelog ```{admonition} 0.3.0 release diff --git a/docs/history/index.md b/docs/history/index.md index ab1e2ec..45c80db 100644 --- a/docs/history/index.md +++ b/docs/history/index.md @@ -1,3 +1,5 @@ + + # History ```{admonition} 0.3.0 release diff --git a/docs/index.md b/docs/index.md index cc62411..96e3626 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,3 +1,5 @@ + + # Open Fibre Data Standard ```{admonition} 0.3.0 release diff --git a/docs/primer/index.md b/docs/primer/index.md index c74a854..a5840d0 100644 --- a/docs/primer/index.md +++ b/docs/primer/index.md @@ -1,3 +1,5 @@ + + # Primer ```{admonition} 0.3.0 release diff --git a/docs/primer/openfibredata.md b/docs/primer/openfibredata.md index 316fc9f..75adfcf 100644 --- a/docs/primer/openfibredata.md +++ b/docs/primer/openfibredata.md @@ -1,3 +1,5 @@ + + # Open fibre data ```{admonition} 0.3.0 release diff --git a/docs/primer/openfibredatastandard.md b/docs/primer/openfibredatastandard.md index 5fc8f73..d2f31ec 100644 --- a/docs/primer/openfibredatastandard.md +++ b/docs/primer/openfibredatastandard.md @@ -1,3 +1,5 @@ + + # The Open Fibre Data Standard ```{admonition} 0.3.0 release diff --git a/docs/primer/scopeandkeyconcepts.md b/docs/primer/scopeandkeyconcepts.md index ab8f493..3518636 100644 --- a/docs/primer/scopeandkeyconcepts.md +++ b/docs/primer/scopeandkeyconcepts.md @@ -1,3 +1,5 @@ + + # Scope and key concepts ```{admonition} 0.3.0 release diff --git a/docs/reference/codelists.md b/docs/reference/codelists.md index 65dbc4f..9f7b19b 100644 --- a/docs/reference/codelists.md +++ b/docs/reference/codelists.md @@ -1,3 +1,5 @@ + + # Codelists reference ```{admonition} 0.3.0 release diff --git a/docs/reference/identifiers.md b/docs/reference/identifiers.md index b2246ad..df1ef12 100644 --- a/docs/reference/identifiers.md +++ b/docs/reference/identifiers.md @@ -1,3 +1,5 @@ + + # Identifiers ```{admonition} 0.3.0 release diff --git a/docs/reference/index.md b/docs/reference/index.md index 4388ef5..78516e3 100644 --- a/docs/reference/index.md +++ b/docs/reference/index.md @@ -1,3 +1,5 @@ + + # Reference ```{admonition} 0.3.0 release diff --git a/docs/reference/publication_formats/csv.md b/docs/reference/publication_formats/csv.md index 5148bee..e993ef3 100644 --- a/docs/reference/publication_formats/csv.md +++ b/docs/reference/publication_formats/csv.md @@ -1,3 +1,5 @@ + + # CSV ```{admonition} 0.3.0 release diff --git a/docs/reference/publication_formats/geojson.md b/docs/reference/publication_formats/geojson.md index 3ebf8fd..7271aa2 100644 --- a/docs/reference/publication_formats/geojson.md +++ b/docs/reference/publication_formats/geojson.md @@ -1,3 +1,5 @@ + + # GeoJSON ```{admonition} 0.3.0 release diff --git a/docs/reference/publication_formats/index.md b/docs/reference/publication_formats/index.md index 06232c8..88b97e6 100644 --- a/docs/reference/publication_formats/index.md +++ b/docs/reference/publication_formats/index.md @@ -1,3 +1,5 @@ + + # Publication formats reference ```{admonition} 0.3.0 release diff --git a/docs/reference/publication_formats/json.md b/docs/reference/publication_formats/json.md index 51b477e..c80f6d9 100644 --- a/docs/reference/publication_formats/json.md +++ b/docs/reference/publication_formats/json.md @@ -1,3 +1,5 @@ + + # JSON ```{admonition} 0.3.0 release diff --git a/docs/reference/schema.md b/docs/reference/schema.md index 9100315..eac60ca 100644 --- a/docs/reference/schema.md +++ b/docs/reference/schema.md @@ -1,3 +1,5 @@ + + # Schema reference ```{admonition} 0.3.0 release diff --git a/docs/support/index.md b/docs/support/index.md index 40e46f4..6cd6898 100644 --- a/docs/support/index.md +++ b/docs/support/index.md @@ -1,3 +1,5 @@ + + # Getting Help ```{admonition} 0.3.0 release From fadec062e5b0968d0976c977de35815bfa3a85c2 Mon Sep 17 00:00:00 2001 From: odscjen Date: Thu, 23 May 2024 14:41:04 +0100 Subject: [PATCH 7/8] update changelog.md --- docs/history/changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/history/changelog.md b/docs/history/changelog.md index 1390437..b1e04a8 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 +- [#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 From b5072b38aa89ae8503729a3f2ff6a3c4a7996c8c Mon Sep 17 00:00:00 2001 From: odscjen Date: Tue, 18 Jun 2024 15:30:28 +0100 Subject: [PATCH 8/8] spanStatus.csv: apply review suggestions --- codelists/closed/spanStatus.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codelists/closed/spanStatus.csv b/codelists/closed/spanStatus.csv index 9667c44..ee6c652 100644 --- a/codelists/closed/spanStatus.csv +++ b/codelists/closed/spanStatus.csv @@ -1,6 +1,6 @@ Code,Title,Description -planned,Planned,Planning for the span is at an advanced stage and financing for its construction is finalised. 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.