removed slim parameter, enlarged cache

scripts/calculateProgress.sh

@@ -6,6 +6,10 @@ function printUsage() {
 	exit 1
 }
 
+min_number() {
+	    printf "%s\n" "$@" | sort -g | head -n1
+}
+
 level=$1
 
 if [ -z "$1" ]; then 
@@ -39,12 +43,14 @@ read levelTiles fileName <<< $(wc -l /tmp/files.txt)
 #echo levelTiles=$levelTiles
 
 # calculate progress
-percentageRequired=$(echo "scale=8;$previousLevelTiles / $previousLevel100" | bc)
+percentageRequired=$(echo "scale=5;$previousLevelTiles / $previousLevel100" | bc)
+#echo percentageRequired=$percentageRequired
+percentageRequired="$(min_number $percentageRequired 1)"
 #echo percentageRequired=$percentageRequired
 levelTarget=$(echo "$level100 * $percentageRequired" | bc)
 #echo levelTarget=$levelTarget
 levelCalculated=$(echo "scale=4;($levelTiles / $levelTarget)" | bc)
 #echo levelCalculated=$levelCalculated
 progress=$(echo "scale=2;($levelCalculated*100)/1" | bc)
+progress="$(min_number $progress 100)"
 echo progress=$progress%
-

scripts/generateWorldList.sh

@@ -1,2 +1,2 @@
 #!/bin/sh
-/home/osm/bin/renderpoly.py -b -180 -90 180 90  --style /home/osm/openstreetmap-carto/osm.xml -z 0 8 -x /home/osm/import/world/world.lst
+/home/osm/bin/renderpoly.py -b -180 -90 180 90  --style /home/osm/openstreetmap-carto/osm.xml -z 0 6 -x /home/osm/import/world/world.lst

scripts/initialImport.sh

@@ -1,5 +1,9 @@
-/home/osm/bin/osm2pgsql --create --slim \
+#!/bin/sh
+
+# -- slim 
+/home/osm/bin/osm2pgsql --create \
     --flat-nodes /home/osm/temp/flat_nodes.bin \
-    -C 2000 --number-processes 2 --hstore \
+    -C 3000 --number-processes 2 --hstore \
     --style /home/osm/openstreetmap-carto/openstreetmap-carto.style --multi-geometry \
+    --database gis --username osm \
     /home/osm/import/$1/$1-latest.osm.pbf

scripts/render.sh

@@ -1,2 +1,2 @@
 #!/bin/sh
-/home/osm/bin/renderpoly.py --style /home/osm/openstreetmap-carto/osm.xml --poly /home/osm/import/$1/$1.poly -z 0 16
+/home/osm/bin/renderpoly.py --style /home/osm/openstreetmap-carto/osm.xml --poly /home/osm/import/$1/$1.poly --threads 4 -z 0 16

scripts/renderWorld.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
-/home/osm/bin/renderpoly.py -b -180 -90 180 90 --style /home/osm/openstreetmap-carto/osm.xml -z 0 8
+/home/osm/bin/renderpoly.py -b -180 -90 180 90 --style /home/osm/openstreetmap-carto/osm.xml -z 0 6