Merge pull request #249 from IFCA-Advanced-Computing/dev/gbif_data

Dev/gbif data

Author: ferag

plugins/gbif/gbif_data.py

@@ -399,12 +399,12 @@ def geographic_percentajes(df):
     Geographic: 63.45%
     {'Geographic': 63.45, 'Coordinates': 25.6, 'Countries': 15.2, 'CoordinatesUncertainty': 18.9, 'IncorrectCoordinates': 3.75}
     """
-    __BD_BORDERS = gpd.read_file(gpd.datasets.get_path("naturalearth_lowres"))
-    # Total de ocurrencias
-    total_data = len(df)
-
-    # Porcentaje de ocurrencias con coordenadas válidas (latitud y longitud presentes)
     try:
+        __BD_BORDERS = gpd.read_file(gpd.datasets.get_path("naturalearth_lowres"))
+        # Total de ocurrencias
+        total_data = len(df)
+
+        # Porcentaje de ocurrencias con coordenadas válidas (latitud y longitud presentes)
         percentaje_coordinates = (
             len(df[df["decimalLatitude"].notnull() & df["decimalLongitude"].notnull()])
             / total_data
@@ -459,13 +459,15 @@ def geographic_percentajes(df):
         percentaje_incorrect_coordinates = 0
 
     # Porcentaje total de calidad geográfica combinando los porcentajes ponderados
-    percentaje_geographic = (
-        0.2 * percentaje_coordinates
-        + 0.1 * percentaje_countries
-        + 0.05 * percentaje_coordinates_uncertainty
-        - 0.2 * percentaje_incorrect_coordinates
-    ) / 0.35
-
+    percentaje_geographic = 0
+    try:
+        percentaje_geographic += 0.2 * percentaje_coordinates
+        percentaje_geographic += 0.1 * percentaje_countries
+        percentaje_geographic += 0.05 * percentaje_coordinates_uncertainty
+        percentaje_geographic -= 0.2 * percentaje_incorrect_coordinates
+        percentaje_geographic = percentaje_geographic / 0.35
+    except Exception as e:
+        logging.error(e)
     return {
         "Geographic": percentaje_geographic,
         "Coordinates": percentaje_coordinates,

plugins/gbif/plugin.py

@@ -376,23 +376,3 @@ def data_01(self):
         except Exception as e:
             logging.error(e)
         return (points, msg)
-
-    def data_02(self):
-        """Data test.
-
-        Technical proposal:
-
-        Parameters
-        ----------
-
-        Returns
-        -------
-        points
-            A number between 0 and 100 to indicate how well this indicator is supported
-        msg
-            Message with the results or recommendations to improve this indicator
-        """
-        # TO REDEFINE
-        points = 100
-        msg = _("I'm doing nothing")
-        return (points, msg)

web.py

@@ -300,7 +300,8 @@ def evaluator():
         logger.debug("RDA_ALL test completed")
         resultis = result.json()
         for key in resultis:
-            result = resultis[key]
+            if key != "evaluator_logs":
+                result = resultis[key]
         result_points = 0
         weight_of_tests = 0
         for key in result: