maps: networkProvider -> networkProviders

#79
Open-Telecoms-Data · Jan 13, 2023 · cb84013 · cb84013
1 parent 16a7d6d
commit cb84013
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 5 deletions.
diff --git a/cove_ofds/process.py b/cove_ofds/process.py
@@ -238,7 +238,7 @@ class ConvertJSONIntoGeoJSON(ProcessDataTask):
         "/features/properties/network/name": "Network",
         "/features/properties/phase/name": "Phase",
         "/features/properties/physicalInfrastructureProvider/name": "Physical Infrastructure Provider",
-        "/features/properties/networkProvider/name": "Network Provider",
+        "/features/properties/networkProviders/name": "Network Providers",
         "/features/properties/technologies": "Technologies",
         "/features/properties/status": "Status",
         "/features/properties/type": "Type",
@@ -250,7 +250,7 @@ class ConvertJSONIntoGeoJSON(ProcessDataTask):
         "/features/properties/network/name": "Network",
         "/features/properties/phase/name": "Phase",
         "/features/properties/physicalInfrastructureProvider/name": "Physical Infrastructure Provider",
-        "/features/properties/networkProvider/name": "Network Provider",
+        "/features/properties/networkProviders/name": "Network Providers",
         "/features/properties/supplier/name": "Supplier",
         "/features/properties/transmissionMedium": "Transmission Medium",
         "/features/properties/status": "Status",

diff --git a/cove_ofds/templates/cove_ofds/explore.html b/cove_ofds/templates/cove_ofds/explore.html
@@ -386,10 +386,19 @@ <h4 class="panel-title">
       };
 
       function generatePopup(layer) {
+        let networkProvidersNames =  []
+        if (layer?.feature?.properties?.networkProviders) {
+          for(np of layer.feature.properties.networkProviders) {
+            if (np?.name) {
+              networkProvidersNames.push(np.name)
+            }
+          }
+        }
+        networkProvidersNames.sort()
         return `
           <p><strong>Name:</strong> ${layer?.feature?.properties?.name || 'Unknown'}</p>
           <p><strong>Network:</strong> ${layer?.feature?.properties?.network?.name || 'Unknown'}</p>
-          <p><strong>Network provider:</strong> ${layer?.feature?.properties?.networkProvider?.name || 'Unknown'}</p>
+          <p><strong>Network provider:</strong> ${networkProvidersNames.join(", ") || 'Unknown'}</p>
           <p><strong>Physical infrastructure provider:</strong> ${layer?.feature?.properties?.physicalInfrastructureProvider?.name || 'Unknown'}</p>
           <p><strong>Phase:</strong> ${layer?.feature?.properties?.phase?.name || 'Unknown'}</p>
         `;
@@ -454,7 +463,16 @@ <h4 class="panel-title">
 
       function getFeatureName(feature, field) {
         let fieldOptions = getJsonFromDict(feature);
-        if (feature?.properties[field]?.name !== undefined) {
+        if (field == 'networkProviders' && feature?.properties[field]) {
+          let names =  []
+          for(np of feature.properties[field]) {
+            if (np?.name) {
+              names.push(np.name)
+            }
+          }
+          names.sort()
+          return names.join(', ')
+        } else if (feature?.properties[field]?.name !== undefined) {
           return feature.properties[field].name
         } else if ((feature?.properties[field] !== undefined)) {
           return `${fieldOptions[field]}: ${feature?.properties[field] || 'no data'}`
@@ -471,7 +489,16 @@ <h4 class="panel-title">
       let spanLegend = {}
 
       function getFeatureID(feature, field) {
-        if (feature?.properties[field]?.id !== undefined) {
+        if (field == 'networkProviders' && feature?.properties[field]) {
+          let names =  []
+          for(np of feature.properties[field]) {
+            if (np?.name) {
+              names.push(np.name)
+            }
+          }
+          names.sort()
+          return names.join(', ')
+        } else if (feature?.properties[field]?.id !== undefined) {
           return feature.properties[field].id
         } else if ((feature?.properties[field] !== undefined)) {
           return feature.properties[field]