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_rail > ./dump/db_rail.sql
+mariadb-dump -h "" -u "root" -p --databases FACT_rail > ./dump/db_rail.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_maps.sh

@@ -36,8 +36,8 @@ END {
 osmium cat temp/station_europe-filtered.osm -o temp/station_europe-filtered.osm.pbf
 osmium export temp/station_europe-filtered.osm.pbf -o temp/station_europe.geojson --overwrite
 # load in DB
-ogr2ogr -f MySQL MySQL:FACT_rail,host=plazablanca.nilu.no,user=root,password=impadminPSWD! ./temp/station_europe.geojson -nln eu_stations -update -overwrite -lco engine=Aria -t_srs EPSG:4326
-ogr2ogr -f MySQL MySQL:FACT_rail,host=plazablanca.nilu.no,user=root,password=impadminPSWD! ./temp/line_europe.geojson -nln eu_lines -update -overwrite -lco engine=Aria -t_srs EPSG:4326
+ogr2ogr -f MySQL MySQL:FACT_rail,host=,user=root,password= ./temp/station_europe.geojson -nln eu_stations -update -overwrite -lco engine=Aria -t_srs EPSG:4326
+ogr2ogr -f MySQL MySQL:FACT_rail,host=,user=root,password= ./temp/line_europe.geojson -nln eu_lines -update -overwrite -lco engine=Aria -t_srs EPSG:4326
 #clean
 rm temp/*.*
 
@@ -73,7 +73,7 @@ END {
 osmium cat temp/station_na-filtered.osm -o temp/station_na-filtered.pbf
 osmium export temp/station_na-filtered.pbf -o temp/station_north-america.geojson --overwrite
 # load in DB
-ogr2ogr -f MySQL MySQL:FACT_rail,host=plazablanca.nilu.no,user=root,password=impadminPSWD! ./temp/station_north-america.geojson -nln na_stations -update -overwrite -lco engine=Aria -t_srs EPSG:4326
-ogr2ogr -f MySQL MySQL:FACT_rail,host=plazablanca.nilu.no,user=root,password=impadminPSWD! ./temp/line_north-america.geojson -nln na_lines -update -overwrite -lco engine=Aria -t_srs EPSG:4326
+ogr2ogr -f MySQL MySQL:FACT_rail,host=,user=root,password= ./temp/station_north-america.geojson -nln na_stations -update -overwrite -lco engine=Aria -t_srs EPSG:4326
+ogr2ogr -f MySQL MySQL:FACT_rail,host=,user=root,password= ./temp/line_north-america.geojson -nln na_lines -update -overwrite -lco engine=Aria -t_srs EPSG:4326
 #clean up
 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