1 files changed, 27 insertions, 15 deletions

diff --git a/scripts/osm/osm.osc.create b/scripts/osm/osm.osc.create
index 61a4dfb..c9bdaa8 100755
--- a/scripts/osm/osm.osc.create
+++ b/scripts/osm/osm.osc.create
@@ -1,17 +1,29 @@
-    while read -r line
-    do
-        array=( $(echo $line) )
+#!/bin/bash
 
-        cat $1 |\
-        sed -nr "
-            /<$array[1] id=$array[2]/,/<\/$array[1]/ {
-            /<$array[1] id=$array[2]/ a \ \ \ \ <tag k=\"$array[3]\" v=$array[4]\/>
-            /<tag k=$array[3]/ !p
-            /<\/$array[1]/ q
-         }" >> $1.osc
-     done
+while read -r line
+do
+    TYPE=$(echo $line | cut -d ' ' -f1)
+    ID=$(echo $line | cut -d ' ' -f2)
+    NEW_TAGS=$(echo $line |\
+               cut -d' ' -f3- | xargs -n2 echo |\
+               sed -r 's/^([^ ]+) (.+)/<tag k=\"\1\" v=\"\2\"\/>/' |\
+               paste -s)
 
-    sed -ir '1 i <osmChange version="0.6" generator="bash script">
-             1 i <modify>
-             $ a </modify>
-             $ a </osmChange>' $1.osc
+    TAG_PATTERN=$(echo $line |\
+                  cut -d' ' -f3- | xargs -n2 echo |\
+                  cut -d' ' -f1 | paste -s -d'|')
+
+    echo $TAG_PATTERN > /dev/tty
+
+    cat $1 |\
+    sed -nr "/<$TYPE id=\"$ID\"/,/<\/$TYPE/ {
+             /<$TYPE id=\"$ID\"/ a \ \ \ \ $NEW_TAGS
+             /<tag k=\"($TAG_PATTERN)\"/ !p
+             /<\/$TYPE/ q
+            }" >> $1.osc
+done
+
+sed -ir '1 i <osmChange version="0.6" generator="bash script">
+         1 i <modify>
+         $ a </modify>
+         $ a </osmChange>' $1.osc