Merge branch 'new-branch-with-fixed-history' into 'main'

New branch with fixed history

See merge request !1

inputs/dump_and_drop.sh

 echo "*** Dump database:"
 mkdir -p ./dump
-mariadb-dump -h "plazablanca.nilu.no" -u "root" -pimpadminPSWD! --databases FACT_ports > ./dump/db_ports.sql
+mariadb-dump -h "" -u "root" -p --databases FACT_ports > ./dump/db_ports.sql
 
 echo "*** Drop database:"
-mariadb -h "plazablanca.nilu.no" -u "root" -pimpadminPSWD!  < inputs/sql/drop_db.sql
+mariadb -h "" -u "root" -p  < inputs/sql/drop_db.sql

inputs/load_table_data.sh

@@ -9,7 +9,7 @@ do
   wget -O ./temp/temp_Q2.tsv -N "https://ec.europa.eu/eurostat/api/dissemination/sdmx/3.0/data/dataflow/ESTAT/mar_go_qm/1.0?&c[tra_cov]=TOTAL&c[direct]=TOTAL&c[time_period]=${y}-Q2&format=tsv"
   wget -O ./temp/temp_Q3.tsv -N "https://ec.europa.eu/eurostat/api/dissemination/sdmx/3.0/data/dataflow/ESTAT/mar_go_qm/1.0?&c[tra_cov]=TOTAL&c[direct]=TOTAL&c[time_period]=${y}-Q3&format=tsv"
   wget -O ./temp/temp_Q4.tsv -N "https://ec.europa.eu/eurostat/api/dissemination/sdmx/3.0/data/dataflow/ESTAT/mar_go_qm/1.0?&c[tra_cov]=TOTAL&c[direct]=TOTAL&c[time_period]=${y}-Q4&format=tsv"
-  mariadb -h "plazablanca.nilu.no" -u "root" -pimpadminPSWD! -e " \
+  mariadb -h "" -u "root" -p -e " \
   CREATE TEMPORARY TABLE FACT_ports.staging_1 (Row varchar(50) NOT NULL, Value INT, Year INT); \
   LOAD DATA LOCAL INFILE \"temp/temp_Q1.tsv\" INTO TABLE FACT_ports.staging_1 FIELDS TERMINATED BY '\t' LINES TERMINATED BY '\n' IGNORE 1 LINES (@col1, @col2) SET Row=@col1, Value=@col2, Year=${y}; \
   DELETE from FACT_ports.staging_1 where length(row) < 29; \

inputs/load_vector_data.sh

@@ -7,13 +7,13 @@ echo "*** Downloading and loading EU grid 1km." # expected number of records in
 mkdir -p ./temp
 wget -N 'https://ec.europa.eu/eurostat/cache/GISCO/geodatafiles/PORT_2009_SH.zip' -P ./temp
 unzip -d ./temp/ ./temp/PORT_2009_SH.zip
-ogr2ogr -f MySQL MySQL:FACT_ports,host=plazablanca.nilu.no,user=root,password=impadminPSWD! ./temp/PORT_2009_SH/shape/data/PORT_PT_2009.shp -nln eu_ports_2009_geo -update -overwrite -lco engine=Aria -t_srs EPSG:4326
+ogr2ogr -f MySQL MySQL:FACT_ports,host=,user=root,password= ./temp/PORT_2009_SH/shape/data/PORT_PT_2009.shp -nln eu_ports_2009_geo -update -overwrite -lco engine=Aria -t_srs EPSG:4326
 rm -r ./temp
 # 2013
 mkdir -p ./temp
 wget -N 'https://ec.europa.eu/eurostat/cache/GISCO/geodatafiles/PORT_2013_SH.zip' -P ./temp
 unzip -d ./temp/ ./temp/PORT_2013_SH.zip
-ogr2ogr -f MySQL MySQL:FACT_ports,host=plazablanca.nilu.no,user=root,password=impadminPSWD! ./temp/PORT_2013_SH/Data/PORT_PT_2013.shp -nln eu_ports_2013_geo -update -overwrite -lco engine=Aria -t_srs EPSG:4326
+ogr2ogr -f MySQL MySQL:FACT_ports,host=,user=root,password= ./temp/PORT_2013_SH/Data/PORT_PT_2013.shp -nln eu_ports_2013_geo -update -overwrite -lco engine=Aria -t_srs EPSG:4326
 rm -r ./temp
 
 
@@ -21,5 +21,5 @@ rm -r ./temp
 mkdir -p ./temp
 wget -N 'https://opendata.arcgis.com/api/v3/datasets/e3b6065cce144be8a13a59e03c4195fe_1/downloads/data?format=shp&spatialRefId=4326&where=1%3D1' -O ./temp/Principal_Port.zip
 unzip -d ./temp/ ./temp/Principal_Port.zip
-ogr2ogr -f MySQL MySQL:FACT_ports,host=plazablanca.nilu.no,user=root,password=impadminPSWD! ./temp/Principal_Port.shp -nln us_ports_geo -update -overwrite -lco engine=Aria -t_srs EPSG:4326
+ogr2ogr -f MySQL MySQL:FACT_ports,host=,user=root,password= ./temp/Principal_Port.shp -nln us_ports_geo -update -overwrite -lco engine=Aria -t_srs EPSG:4326
 rm -r ./temp

inputs/setup_db.sh

 echo "*** Create database:"
-mariadb -h "plazablanca.nilu.no" -u "root" -pimpadminPSWD!  < inputs/sql/create_db.sql
+mariadb -h "" -u "root" -p  < inputs/sql/create_db.sql
 echo "*** Create tables:"
-mariadb -h "plazablanca.nilu.no" -u "root" -pimpadminPSWD!  < inputs/sql/create_tables.sql
+mariadb -h "" -u "root" -p  < inputs/sql/create_tables.sql