fix reaggregation of municipal v1 data from districts, fix work or study in districts and municipalities (#170)

Author: e-kotov

inst/extdata/sql-queries/v1-nt-municipios-clean-csv-view-en.sql

@@ -1,6 +1,6 @@
 -- Create the relationships view from the relaciones_distrito_mitma.csv
 CREATE OR REPLACE VIEW relations_districts_municipalities AS 
-SELECT 
+SELECT DISTINCT
     distrito_mitma, 
     municipio_mitma 
 FROM 

inst/extdata/sql-queries/v1-nt-municipios-clean-csv-view-es.sql

@@ -1,6 +1,6 @@
 -- Create the relationships view from the relaciones_distrito_mitma.csv
 CREATE OR REPLACE VIEW relations_districts_municipalities AS 
-SELECT 
+SELECT DISTINCT
     distrito_mitma, 
     municipio_mitma 
 FROM 

inst/extdata/sql-queries/v1-od-distritos-clean-csv-view-en.sql

@@ -15,12 +15,12 @@ CREATE OR REPLACE VIEW od_csv_clean AS SELECT
     CAST(CASE actividad_origen
         WHEN 'casa' THEN 'home'
         WHEN 'otros' THEN 'other'
-        WHEN 'trabajo_estudio' THEN 'work_or_study'
+        WHEN 'trabajo' THEN 'work_or_study'
         END AS ACTIV_ENUM) AS activity_origin,
     CAST(CASE actividad_destino
         WHEN 'casa' THEN 'home'
         WHEN 'otros' THEN 'other'
-        WHEN 'trabajo_estudio' THEN 'work_or_study'
+        WHEN 'trabajo' THEN 'work_or_study'
         END AS ACTIV_ENUM) AS activity_destination,
     CAST(residencia AS INE_PROV_CODE_ENUM) AS residence_province_ine_code,
     CAST (CASE residencia

inst/extdata/sql-queries/v1-od-distritos-clean-csv-view-es.sql

@@ -4,14 +4,10 @@ CREATE OR REPLACE VIEW od_csv_clean AS SELECT
     CAST(origen AS ZONES_ENUM) AS origen,
     CAST(destino AS ZONES_ENUM) AS destino,
     CAST(CASE actividad_origen
-        WHEN 'casa' THEN 'home'
-        WHEN 'otros' THEN 'other'
-        WHEN 'trabajo_estudio' THEN 'work_or_study'
+        WHEN 'trabajo' THEN 'trabajo_estudio'
         END AS ACTIV_ENUM) AS actividad_origen,
     CAST(CASE actividad_destino
-        WHEN 'casa' THEN 'home'
-        WHEN 'otros' THEN 'other'
-        WHEN 'trabajo_estudio' THEN 'work_or_study'
+        WHEN 'trabajo' THEN 'trabajo_estudio'
         END AS ACTIV_ENUM) AS actividad_destino,
     CAST(distancia AS DISTANCE_ENUM) AS distancia,
     CAST(residencia AS INE_PROV_CODE_ENUM) AS residencia,

inst/extdata/sql-queries/v1-od-municipios-clean-csv-view-en.sql

@@ -1,6 +1,6 @@
 -- Create the relationships view from the relaciones_distrito_mitma.csv
 CREATE OR REPLACE VIEW relations_districts_municipalities AS 
-SELECT 
+SELECT DISTINCT
     distrito_mitma, 
     municipio_mitma 
 FROM 
@@ -17,17 +17,18 @@ FROM
 CREATE OR REPLACE VIEW od_csv_clean AS 
 SELECT
     d.fecha AS date,
+    d.periodo AS hour,
     CAST(m1.municipio_mitma AS ZONES_ENUM) AS id_origin,
     CAST(m2.municipio_mitma AS ZONES_ENUM) AS id_destination,
     CAST(CASE d.actividad_origen
         WHEN 'casa' THEN 'home'
         WHEN 'otros' THEN 'other'
-        WHEN 'trabajo_estudio' THEN 'work_or_study'
+        WHEN 'trabajo' THEN 'work_or_study'
         END AS ACTIV_ENUM) AS activity_origin,
     CAST(CASE d.actividad_destino
         WHEN 'casa' THEN 'home'
         WHEN 'otros' THEN 'other'
-        WHEN 'trabajo_estudio' THEN 'work_or_study'
+        WHEN 'trabajo' THEN 'work_or_study'
         END AS ACTIV_ENUM) AS activity_destination,
     CAST(d.residencia AS INE_PROV_CODE_ENUM) AS residence_province_ine_code,
     CAST(CASE d.residencia
@@ -84,7 +85,6 @@ SELECT
         WHEN '51' THEN 'Ceuta'
         WHEN '52' THEN 'Melilla'
         END AS INE_PROV_NAME_ENUM) AS residence_province_name,
-    d.periodo AS hour,
     CAST(d.distancia AS DISTANCE_ENUM) AS distance,
     SUM(d.viajes) AS n_trips,
     SUM(d.viajes_km) AS trips_total_length_km,

inst/extdata/sql-queries/v1-od-municipios-clean-csv-view-es.sql

@@ -1,6 +1,6 @@
 -- Create the relationships view from the relaciones_distrito_mitma.csv
 CREATE OR REPLACE VIEW relations_districts_municipalities AS 
-SELECT
+SELECT DISTINCT
     distrito_mitma, 
     municipio_mitma 
 FROM 
@@ -20,14 +20,10 @@ SELECT
     CAST(m1.municipio_mitma AS ZONES_ENUM) AS origen,
     CAST(m2.municipio_mitma AS ZONES_ENUM) AS destino,
     CAST(CASE d.actividad_origen
-        WHEN 'casa' THEN 'home'
-        WHEN 'otros' THEN 'other'
-        WHEN 'trabajo_estudio' THEN 'work_or_study'
+        WHEN 'trabajo' THEN 'trabajo_estudio'
         END AS ACTIV_ENUM) AS actividad_origen,
     CAST(CASE d.actividad_destino
-        WHEN 'casa' THEN 'home'
-        WHEN 'otros' THEN 'other'
-        WHEN 'trabajo_estudio' THEN 'work_or_study'
+        WHEN 'trabajo' THEN 'trabajo_estudio'
         END AS ACTIV_ENUM) AS actividad_destino,
     CAST(d.residencia AS INE_PROV_CODE_ENUM) AS residencia,
     CAST(CASE d.residencia