2 files changed, 22 insertions, 8 deletions

diff --git a/alias b/alias
index c0ff84f..9943884 100644
--- a/alias
+++ b/alias
@@ -1,5 +1,5 @@
 SETTING_DIR="$HOME/git/settings"
-OSM_USER_PASSWD=$(cat $HOME/git/settings/token/osm)
+OSM_USER_PASSWD=$(cat $HOME/git/settings/tokens/osm)
 
 # settings
 alias al='vim ~/.bash_aliases && source ~/.bash_aliases'
@@ -212,20 +212,25 @@ typebrook='git@github.com:typebrook'
 
 
 # osm
-osm='https://api.openstreetmap.org/api/0.6/'
+osm='https://api.openstreetmap.org/api/0.6'
 osm.get() {
     curl -X GET $osm/$1/$2
 }
 osm.query() {
     osmium tags-filter $1 $2 --output-format=osm --omit-referenced
 }
+osm.extract() {
+    echo "<osm version=\"0.6\">"
+    sed -nr "/^ *<$1 id=\"$2\".*/,/^ *<\/$1>/p" -
+    echo "</osm>"
+}
 osm.update() {
     # remove original tag&value
     sed "/<tag k=\"$1\"/d" - | \
     # insert new tag&value
     sed -r "/<(node|way|relation)/a \ \ \ \ <tag k=\"$1\" v=\"$2\"\/>"
 }
-osm.changeset.update() {
+osm.changeset.add() {
     element=$(cat -)
     header=$(echo $element | grep -E "<(node|way|relation)\s")
     ele_type=$(echo $header | sed -r 's/.*<(node|way|relation).*$/\1/')
@@ -233,10 +238,14 @@ osm.changeset.update() {
 
     echo $element | \
     sed -r "s/^( *<(node|way|relation).*version[^ ]+ )(.*)$/\1changeset=\"$1\">/" | \
-    curl -X PUT -u $OSM_USER_PASSWD -i -T - https://api.openstreetmap.org/api/0.6/$ele_type/$id
+    curl -X PUT -u $OSM_USER_PASSWD -i -T - $osm/$ele_type/$id
+}
+osm.changeset.update() {
+    echo "<osm><changeset><tag k=\"comment\" v=\"$2\"/></changeset></osm>" | \
+    curl -X PUT -u $OSM_USER_PASSWD -i -T - $osm/changeset/$1
 }
 osm.changeset.close() {
-    curl -X PUT -u $OSM_USER_PASSWD -i https://api.openstreetmap.org/api/0.6/changeset/$1/close
+    curl -X PUT -u $OSM_USER_PASSWD -i $osm/changeset/$1/close
 }
 osm.pbf.update() {
     osmium fileinfo $1 | \
@@ -244,7 +253,8 @@ osm.pbf.update() {
     cut -d'=' -f2 | \
     sed 's/$/+1/' | bc | \
     sed -r 's/(.{1})(.{3})/00\1\/\2/' | \
-    xargs -I {} curl -O http://download.geofabrik.de/asia/taiwan-updates/000/'{}'.osc.gz
+    xargs -I {} curl -o diff.osc.gz http://download.geofabrik.de/asia/taiwan-updates/000/'{}'.osc.gz && \
+    osmium apply-changes $1 diff.osc.gz --output output.osm.pbf --output-header=osmosis_replication_sequence_number=2422 --overwrite
 }
 
 # misc
diff --git a/scripts/changeset b/scripts/changeset
index d3dee3d..6138d7e 100755
--- a/scripts/changeset
+++ b/scripts/changeset
@@ -1,6 +1,7 @@
 #! /bin/bash
 
-OSM_USER_PASSWD=$(cat ~/git/settings/token/osm)
+OSM_USER_PASSWD=$(cat ~/git/settings/tokens/osm)
+
 #server=https://master.apis.dev.openstreetmap.org
 server=https://api.openstreetmap.org
 comment="change is_in format"
@@ -26,5 +27,8 @@ info="<osm>
      "
 
 echo $info |\
-curl -u $OSM_USER_PASSWD -i --upload-file - $server/api/0.6/changeset/create
+curl -u $OSM_USER_PASSWD -i --upload-file - $server/api/0.6/changeset/create |\
+tee /dev/tty |\
+tail -1 |\
+xsel -ib