Merge pull request #141 from GlobalFishingWatch/develop

dev > main

Author: rdgfuentes

assets/bigquery/encounter-events.sql.j2

@@ -612,7 +612,7 @@ WITH
                 ROUND(median_distance_km,3) AS median_distance_km,
                 ROUND(median_speed_knots,3) AS median_speed_knots,
                 encountered_vessel_id,
-                CONCAT(main_vessel_class, '-', encountered_vessel_class) AS vessel_classes,
+                CONCAT(COALESCE(main_vessel_class, ''), '-', COALESCE(encountered_vessel_class, '')) AS vessel_classes,
                 ## NEW change field name from joint_authorization to potential_risk
                 potential_risk,
                 -- authorization for main and encountered vessel
@@ -630,7 +630,7 @@ WITH
         TO_JSON_STRING([
             STRUCT(
                 vessel_id AS `id`,
-                main_vessel_ssvid AS `ssvid`,
+                filter_invalid_ssvid(main_vessel_ssvid) AS `ssvid`,
                 main_vessel_shipname AS `name`,
                 vessel_point_count AS point_count,
                 main_vessel_class AS `type`,