implement review feedback

dbt-labs · Apr 17, 2021 · 0e151dd · 0e151dd
1 parent 0152392
commit 0e151dd
Showing 1 changed file with 20 additions and 19 deletions.
diff --git a/macros/geo/haversine_distance.sql b/macros/geo/haversine_distance.sql
@@ -10,41 +10,42 @@ The arguments should be float type.
     acos(-1) * {{degrees}} / 180
 {%- endmacro %}
 
-{% macro haversine_distance(lat1,lon1,lat2,lon2,unit='mi') -%}
+{% macro haversine_distance(lat1, lon1, lat2, lon2, unit='mi') -%}
     {{ return(adapter.dispatch('haversine_distance', packages = dbt_utils._get_utils_namespaces())(lat1,lon1,lat2,lon2,unit)) }}
 {% endmacro %}
 
-{% macro default__haversine_distance(lat1,lon1,lat2,lon2,unit) -%}
-{# vanilla macro is in miles #}
-    {% set conversion_rate = '' %}
-{% if unit == 'km' %}
-{# we multiply miles result to get it in kms #}
-    {% set conversion_rate = '* 1.60934' %}
+{% macro default__haversine_distance(lat1, lon1, lat2, lon2, unit='mi') -%}
+{%- if unit == 'mi' %}
+    {% set conversion_rate = 1 %}
+{% elif unit == 'km' %}
+    {% set conversion_rate = 1.60934 %}
+{% else %}
+    {{ exceptions.raise_compiler_error("unit input must be one of 'mi' or 'km'. Got " ~ unit) }}
 {% endif %}
 
-    2 * 3961 * asin(sqrt(pow((sin(radians(({{lat2}} - {{lat1}}) / 2))), 2) +
+    2 * 3961 * asin(sqrt(pow((sin(radians(({{ lat2 }} - {{ lat1 }}) / 2))), 2) +
     cos(radians({{lat1}})) * cos(radians({{lat2}})) *
-    pow((sin(radians(({{lon2}} - {{lon1}}) / 2))), 2))) {{conversion_rate}}
+    pow((sin(radians(({{ lon2 }} - {{ lon1 }}) / 2))), 2))) * {{ conversion_rate }}
 
 {%- endmacro %}
 
 
 
-{% macro bigquery__haversine_distance(lat1,lon1,lat2,lon2,unit) -%}
+{% macro bigquery__haversine_distance(lat1, lon1, lat2, lon2, unit='mi') -%}
 {% set radians_lat1 = dbt_utils.degrees_to_radians(lat1) %}
 {% set radians_lat2 = dbt_utils.degrees_to_radians(lat2) %}
 {% set radians_lon1 = dbt_utils.degrees_to_radians(lon1) %}
 {% set radians_lon2 = dbt_utils.degrees_to_radians(lon2) %}
-{# vanilla macro is in miles #}
-    {% set conversion_rate = '' %}
-{% if unit == 'km' %}
-{# we multiply miles result to get it in kms #}
-    {% set conversion_rate = '* 1.60934' %}
+{%- if unit == 'mi' %}
+    {% set conversion_rate = 1 %}
+{% elif unit == 'km' %}
+    {% set conversion_rate = 1.60934 %}
+{% else %}
+    {{ exceptions.raise_compiler_error("unit input must be one of 'mi' or 'km'. Got " ~ unit) }}
 {% endif %}
-
-    2 * 3961 * asin(sqrt(pow(sin(({{radians_lat2}} - {{radians_lat1}}) / 2), 2) +
-    cos({{radians_lat1}}) * cos({{radians_lat2}}) *
-    pow(sin(({{radians_lon2}} - {{radians_lon1}}) / 2), 2))) {{conversion_rate}}
+    2 * 3961 * asin(sqrt(pow(sin(({{ radians_lat2 }} - {{ radians_lat1 }}) / 2), 2) +
+    cos({{ radians_lat1 }}) * cos({{ radians_lat2 }}) *
+    pow(sin(({{ radians_lon2 }} - {{ radians_lon1 }}) / 2), 2))) * {{ conversion_rate }}
 
 {%- endmacro %}