Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support for multiple network providers #79

Closed
duncandewhurst opened this issue Jan 9, 2023 · 6 comments
Closed

Support for multiple network providers #79

duncandewhurst opened this issue Jan 9, 2023 · 6 comments

Comments

@duncandewhurst
Copy link
Contributor

Open-Telecoms-Data/open-fibre-data-standard#234 makes the following changes to the schema:

  • Replace Node.networkProvider (an OrganisationReference object) with Node.networkProviders (an array of OrganisationReference objects)
  • Replace Span.networkProvider (an OrganisationReference object) with Span.networkProviders (an array of OrganisationReference objects)

The map visualisation needs updating for the equivalent changes to the GeoJSON publication format:

  • nodes.geojson: features/properties/networkProvider (object) -> features/properties/networkProviders (array)
  • spans.geojson: features/properties/networkProvider (object) -> features/properties/networkProviders (array)

Open-Telecoms-Data/open-fibre-data-standard#210 describes a few options for handling multiple network providers in the map visualisation. I think that we want to go with the first option: Categorise according to the set of network providers, e.g.

  • [{"name": "Org A"}]: Red
  • [{"name": "Org B"}]: Blue
  • [{"name": "Org A"}, {"name": "Org B"}]: Green
  • [{"name": "Org B"}, {"name": "Org A"}]: Green

The changes are not yet released, but you can use the schema and example files from 0.2-dev for development and testing.

@ghost
Copy link

ghost commented Jan 12, 2023

Changes are now released as 0.2

ghost pushed a commit that referenced this issue Jan 12, 2023
@ghost
Copy link

ghost commented Jan 12, 2023

Ok I have a WIP.

#82 applies to it, but that applied before so ....

Here's some test data:


{
  "networks": [
    {
      "id": "a096d627-72e1-4f9b-b129-951b1737bff4",
      "name": "Ghana Fibre Network",
      "nodes": [
        {
          "id": "1",
          "name": "Edinburgh",
          "networkProviders": [
            { "id": "1" }
          ],
          "location": { "type": "Point", "coordinates": [  -3.1883, 55.9533 ] }
        },
        {
          "id": "2",
          "name": "Glasgow",
          "networkProviders": [
            { "id": "2" }
          ],
          "location": { "type": "Point", "coordinates": [ -4.2518, 55.8642 ] }
        },
        {
          "id": "3",
          "name": "Aberdeen",
          "networkProviders": [
            { "id": "2" }, { "id": "1"}
          ],
          "location": { "type": "Point", "coordinates": [ -2.0938, 57.1499 ] }
        },
        {
          "id": "4",
          "name": "Stirling",
          "networkProviders": [
            { "id": "1" }, { "id": "2" }
          ],
          "location": { "type": "Point", "coordinates": [ -3.9369, 56.1165 ] }
        }
      ],
      "organisations": [
        { "id": "1", "name": "One" },
        { "id": "2", "name": "Two" }
      ],
      "links": [
        {
          "rel": "describedby",
          "href": "https://raw.githubusercontent.com/Open-Telecoms-Data/open-fibre-data-standard/0__2__0/schema/network-schema.json"
        }
      ]
    }
  ]
}

@duncandewhurst
Copy link
Contributor Author

Tested on http://openfibrecove-2023-01-12.dokkudev2.ods.mobi/data/60abb6f6-147a-4050-bab5-8620c7b60a97 and looks good!

Reminder that this will need doing for spans, too.

@ghost
Copy link

ghost commented Jan 13, 2023

Reminder that this will need doing for spans, too.

Should already been done, just haven't made the test data yet

ghost pushed a commit that referenced this issue Jan 13, 2023
@ghost
Copy link

ghost commented Jan 13, 2023

Wasn't changed in popups - now done.

@duncandewhurst can you test and if happy give that PR to @Bjwebb ?

Data:




{
  "networks": [
    {
      "id": "a096d627-72e1-4f9b-b129-951b1737bff4",
      "name": "Ghana Fibre Network",
      "nodes": [
        {
          "id": "1",
          "name": "Edinburgh",
          "networkProviders": [
            { "id": "1" }
          ],
          "location": { "type": "Point", "coordinates": [  -3.1883, 55.9533 ] }
        },
        {
          "id": "2",
          "name": "Glasgow",
          "networkProviders": [
            { "id": "2" }
          ],
          "location": { "type": "Point", "coordinates": [ -4.2518, 55.8642 ] }
        },
        {
          "id": "3",
          "name": "Aberdeen",
          "networkProviders": [
            { "id": "2" }, { "id": "1"}
          ],
          "location": { "type": "Point", "coordinates": [ -2.0938, 57.1499 ] }
        },
        {
          "id": "4",
          "name": "Stirling",
          "networkProviders": [
            { "id": "1" }, { "id": "2" }
          ],
          "location": { "type": "Point", "coordinates": [ -3.9369, 56.1165 ] }
        }
      ],
      "spans": [
        {
          "id": "1",
          "start": "1",
          "end": "2",
          "route": {
            "type": "LineString",
            "coordinates": [ [  -3.1883, 55.9533 ] , [ -4.2518, 55.8642 ]  ]
          },
          "networkProviders": [
            { "id": "1" }
          ]
        },
        {
          "id": "2",
          "start": "1",
          "end": "3",
          "route": {
            "type": "LineString",
            "coordinates": [  [  -3.1883, 55.9533 ] , [ -2.0938, 57.1499 ]  ]
          },
          "networkProviders": [
            { "id": "2" }
          ]
        },
        {
          "id": "3",
          "start": "1",
          "end": "4",
          "route": {
            "type": "LineString",
            "coordinates": [  [  -3.1883, 55.9533 ] ,  [ -3.9369, 56.1165 ] ]
          },
          "networkProviders": [
            { "id": "2" }, { "id": "1"}
          ]
        },
        {
          "id": "4",
          "start": "2",
          "end": "3",
          "route": {
            "type": "LineString",
            "coordinates": [ [ -4.2518, 55.8642 ], [ -2.0938, 57.1499 ] ]
          },
          "networkProviders": [
            { "id": "1" }, { "id": "2" }
          ]
        }
      ],
      "organisations": [
        { "id": "1", "name": "One" },
        { "id": "2", "name": "Two" }
      ],
      "links": [
        {
          "rel": "describedby",
          "href": "https://raw.githubusercontent.com/Open-Telecoms-Data/open-fibre-data-standard/0__2__0/schema/network-schema.json"
        }
      ]
    }
  ]
}

@duncandewhurst
Copy link
Contributor Author

Closing as the related PR is merged and deployed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant