Merge branch 'dev' of github.com:typebrook/settings into dev

2 files changed, 43 insertions, 5 deletions

diff --git a/tools/osm/osm.api.changeset.commit b/tools/osm/osm.api.changeset.commit
new file mode 100755
index 0000000..356b3da
--- /dev/null
+++ b/tools/osm/osm.api.changeset.commit
@@ -0,0 +1,34 @@
+#!/bin/sh
+
+set -e
+
+OSM_API=https://api.openstreetmap.org/api/0.6
+
+read -e -p 'Type comment: ' -r comment </dev/tty
+if [ -z ${OSM_USER_PASSWD} ]; then
+  read -e -p 'Type USER:PASSWD: ' -r OSM_USER_PASSWD </dev/tty
+fi
+
+# Create Changeset
+info="<osm>
+        <changeset>
+          <tag k='comment' v='${comment}'/>
+          <tag k='created_by' v='bash script'/>
+          <tag k='bot' v='yes'/>
+        </changeset>
+      </osm>
+     "
+
+changeset_id=$(<<<"${info}" curl -u ${OSM_USER_PASSWD} --upload-file - ${OSM_API}/changeset/create | tail -1)
+
+echo >/dev/tty
+echo "changeset created, check $OSM_SERVER/changeset/${changeset_id}" >/dev/tty
+echo $changeset_id
+
+# Upload OSC file to Changeset
+sed -r "/<(node|way|relation)/ s/>/ changeset=\"${changeset_id}\">/" <$1 |\
+tee /dev/tty | \
+curl -X POST -u ${OSM_USER_PASSWD} -i -T - $OSM_API/changeset/${changeset_id}/upload
+
+# Close Changeset
+curl -X PUT -u ${OSM_USER_PASSWD} -i ${OSM_API}/changeset/${changeset_id}/close
diff --git a/tools/osm/osm.api.changeset.create b/tools/osm/osm.api.changeset.create
index ed2601a..bdbf53a 100755
--- a/tools/osm/osm.api.changeset.create
+++ b/tools/osm/osm.api.changeset.create
@@ -1,7 +1,11 @@
 #!/bin/sh
 
-echo -n "type comment: "
-read comment
+set -e
+
+read -e -p 'Type comment: ' -r comment </dev/tty
+if [ -z $OSM_USER_PASSWD ]; then
+  read -e -p 'Type USER:PASSWD: ' -r OSM_USER_PASSWD </dev/tty
+fi
 
 info="<osm>
         <changeset>
@@ -16,6 +20,6 @@ changeset_id=$(echo $info |\
                curl -u $OSM_USER_PASSWD --upload-file - $OSM_API/changeset/create |\
                tail -1)
 
-echo
-echo "changeset created, check $OSM_SERVER/changeset/$changeset_id"
-echo "$changeset_id is copied into clipboard"
+echo >/dev/tty
+echo "changeset created, check $OSM_SERVER/changeset/$changeset_id" >/dev/tty
+echo $changeset_id