summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xmakecolumns.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/makecolumns.sh b/makecolumns.sh
index 0854b32..0eaf954 100755
--- a/makecolumns.sh
+++ b/makecolumns.sh
@@ -109,7 +109,7 @@ handle_format_version_1() {
109 mv 14_unknown 10_Postleitzahl 109 mv 14_unknown 10_Postleitzahl
110 110
111 printf "Normalizing zusaetze ... " 111 printf "Normalizing zusaetze ... "
112 lam 04_Namenszusatz 05_Adresszusatz | tr '\t' ' ' | sed -E s/' +'/' '/g > 04_Zusaetze 112 paste 04_Namenszusatz 05_Adresszusatz | tr '\t' ' ' | sed -E s/' +'/' '/g > 04_Zusaetze
113 printf "done.\n" 113 printf "done.\n"
114 114
115 tidy_streetnames 07_Strasse 115 tidy_streetnames 07_Strasse
@@ -156,7 +156,7 @@ handle_format_version_2() {
156 rm 03_unknown 04_unknown 156 rm 03_unknown 04_unknown
157 157
158 printf "Normalizing zusaetze ... " 158 printf "Normalizing zusaetze ... "
159 lam 04_Namenszusatz 05_Adresszusatz | tr '\t' ' ' | sed -E s/' +'/' '/g > 04_Zusaetze 159 paste 04_Namenszusatz 05_Adresszusatz | tr '\t' ' ' | sed -E s/' +'/' '/g > 04_Zusaetze
160 printf "done.\n" 160 printf "done.\n"
161 161
162 tidy_streetnames 07_Strasse 162 tidy_streetnames 07_Strasse
@@ -245,7 +245,7 @@ handle_format_version_3() {
245 printf "done.\n" 245 printf "done.\n"
246 246
247 printf "Normalizing zusaetze ... " 247 printf "Normalizing zusaetze ... "
248 lam 04_Namenszusatz 05_Adresszusatz | tr '\t' ' ' | sed -E -e 's/ +/ /g' -e 's/^ +//g' -e 's/ +$//g' > 04_Zusaetze 248 paste 04_Namenszusatz 05_Adresszusatz | tr '\t' ' ' | sed -E -e 's/ +/ /g' -e 's/^ +//g' -e 's/ +$//g' > 04_Zusaetze
249 printf "done.\n" 249 printf "done.\n"
250 250
251 # If street names come in an extra file, extract 251 # If street names come in an extra file, extract
@@ -278,7 +278,7 @@ handle_format_version_3() {
278 printf "Looking up geo coordinates for each phonebook entry ... " 278 printf "Looking up geo coordinates for each phonebook entry ... "
279 tr '\0' '\n' < 90_Geokoordinaten_hnr_raw | tr ';' '\t' | cut -f "1,2,3,4,6,7" | tr '\n' '\0' > 90_Geokoordinaten_hnr 279 tr '\0' '\n' < 90_Geokoordinaten_hnr_raw | tr ';' '\t' | cut -f "1,2,3,4,6,7" | tr '\n' '\0' > 90_Geokoordinaten_hnr
280 rm 90_Geokoordinaten_hnr_raw 280 rm 90_Geokoordinaten_hnr_raw
281 lam 10_Postleitzahl -s $'\t' 11_Ort -s $'\t' 07_Strasse -s $'\t' 08_Hausnummer | map_coords 90_Geokoordinaten_hnr | convert_coords > 16_Koordinaten 281 paste 10_Postleitzahl 11_Ort 07_Strasse 08_Hausnummer | map_coords 90_Geokoordinaten_hnr | convert_coords > 16_Koordinaten
282 printf "done.\n" 282 printf "done.\n"
283 fi 283 fi
284} 284}
@@ -349,7 +349,7 @@ handle_format_version_4() {
349 cat file_* > 90_Geokoordinaten_hnr 349 cat file_* > 90_Geokoordinaten_hnr
350 printf "done.\n" 350 printf "done.\n"
351 printf "Looking up geo coordinates for each phonebook entry ... " 351 printf "Looking up geo coordinates for each phonebook entry ... "
352 lam 10_Postleitzahl -s $'\t' 07_Strasse -s $'\t' 08_Hausnummer | map_coords 90_Geokoordinaten_hnr | convert_coords > 16_Koordinaten 352 paste 10_Postleitzahl 07_Strasse 08_Hausnummer | map_coords 90_Geokoordinaten_hnr | convert_coords > 16_Koordinaten
353 printf "done.\n" 353 printf "done.\n"
354 elif [ -f $1/zip-streets-geo.tl ]; then 354 elif [ -f $1/zip-streets-geo.tl ]; then
355 printf "Extracting geo coordinates (precision: street) ... " 355 printf "Extracting geo coordinates (precision: street) ... "
@@ -357,7 +357,7 @@ handle_format_version_4() {
357 cat file_* > 91_Geokoordinaten_str 357 cat file_* > 91_Geokoordinaten_str
358 printf "done.\n" 358 printf "done.\n"
359 printf "Looking up geo coordinates for each phonebook entry ... " 359 printf "Looking up geo coordinates for each phonebook entry ... "
360 lam 10_Postleitzahl -s $'\t' 07_Strasse | map_coords 91_Geokoordinaten_str | convert_coords > 16_Koordinaten 360 paste 10_Postleitzahl 07_Strasse | map_coords 91_Geokoordinaten_str | convert_coords > 16_Koordinaten
361 printf "done.\n" 361 printf "done.\n"
362 fi 362 fi
363 rm file_* 363 rm file_*