From f22bbf1ed606adb6140f1c8cc0b723cbb476fa82 Mon Sep 17 00:00:00 2001
From: typebrook <typebrook@gmail.com>
Date: Mon, 18 Nov 2019 13:40:36 +0800
Subject: update

---
 scripts/osm/osm                      |  2 +-
 scripts/osm/osm.api.changeset.create |  2 +-
 scripts/osm/osm.api.changeset.upload |  1 +
 scripts/osm/osm.osc.create           | 19 +++++++++++--------
 4 files changed, 14 insertions(+), 10 deletions(-)

(limited to 'scripts/osm')

diff --git a/scripts/osm/osm b/scripts/osm/osm
index f2f08f1..9fb52dd 100644
--- a/scripts/osm/osm
+++ b/scripts/osm/osm
@@ -8,6 +8,6 @@ export OSM_USER_PASSWD=$(cat $SETTING_DIR/tokens/osm)
 
 FILENAME=$0
 
-util.osm.edit() {
+util.osm() {
     vim $FILENAME && source $FILENAME
 }
diff --git a/scripts/osm/osm.api.changeset.create b/scripts/osm/osm.api.changeset.create
index 705f286..762fbdb 100755
--- a/scripts/osm/osm.api.changeset.create
+++ b/scripts/osm/osm.api.changeset.create
@@ -6,7 +6,7 @@ read comment
 info="<osm>
         <changeset>
           <tag k='comment' v='$comment'/>
-          <tag k='created_by' v='bash scripts'/>
+          <tag k='created_by' v='bash script'/>
           <tag k='bot' v='yes'/>
         </changeset>
       </osm>
diff --git a/scripts/osm/osm.api.changeset.upload b/scripts/osm/osm.api.changeset.upload
index 918a755..96bdff4 100755
--- a/scripts/osm/osm.api.changeset.upload
+++ b/scripts/osm/osm.api.changeset.upload
@@ -2,4 +2,5 @@
 
 cat $2 |\
 sed -r "/<(node|way|relation)/ s/>/ changeset=\"$1\">/" |\
+tee /dev/tty |\
 curl -X POST -u $OSM_USER_PASSWD -i -T - $OSM_API/changeset/$1/upload
diff --git a/scripts/osm/osm.osc.create b/scripts/osm/osm.osc.create
index ed34c90..93a6640 100755
--- a/scripts/osm/osm.osc.create
+++ b/scripts/osm/osm.osc.create
@@ -1,15 +1,15 @@
 #!/bin/bash
 
+# create new tags from input line, for example: 
+# [element type] [element ID] key1_added "value1" key2_added "value2" key3_removed key4_removed
+
+# key should not quoted, value must be quoted
+# And keys which need to be removed must be placed at the end
 while read -r line
 do
     TYPE=$(echo $line | cut -d ' ' -f1)
     ID=$(echo $line | cut -d ' ' -f2)
 
-    # create new tags from input line, for example: 
-    # key1_added "value1" key2_added "value2" key3_removed key4_removed
-
-    # key should not quoted, value must be quoted
-    # And keys which need to be removed must be placed at the end
     NEW_TAGS=$(echo $line |\
                cut -d' ' -f3- |\
                sed -r 's/([^ "]+) (\"[^"]+\")/<tag k=\"\1\" v=\2\/>/g; s/>[^"]*$/>/')
@@ -22,9 +22,12 @@ do
 
     cat $1 |\
     sed -nr "/<$TYPE id=\"$ID\"/,/<\/$TYPE/ {
-             /<$TYPE id=\"$ID\"/ a \ \ \ \ $NEW_TAGS
-             /<tag k=\"($TAG_PATTERN)\"/ !p
-             /<\/$TYPE/ q
+                 /<$TYPE id=\"$ID\"/ {
+                     s/(version=\"[0-9]+\")(.*)/\1>/
+                     a \ \ \ \ $NEW_TAGS
+                 }
+                 /<tag k=\"($TAG_PATTERN)\"/ !p
+                 /<\/$TYPE/ q
             }" >> $1.osc
 done
 
-- 
cgit v1.2.3-70-g09d2