update

2 files changed, 16 insertions, 43 deletions

diff --git a/scripts/changeset b/scripts/changeset
deleted file mode 100755
index 6138d7e..0000000
--- a/scripts/changeset
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/bash
-
-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"
-
-for i in "$@"
-do
-case $i in
-    -s)
-    lon_col=0; lat_col=1
-    shift;;
-
-    *)
-    csv=$i
-    shift;;
-esac
-done
-
-info="<osm>
-        <changeset> 
-          <tag k='comment' v='$comment'/> 
-        </changeset> 
-      </osm> 
-     "
-
-echo $info |\
-curl -u $OSM_USER_PASSWD -i --upload-file - $server/api/0.6/changeset/create |\
-tee /dev/tty |\
-tail -1 |\
-xsel -ib
-
diff --git a/utils/osm.utils.sh b/utils/osm.utils.sh
index 7716e41..a742fe9 100644
--- a/utils/osm.utils.sh
+++ b/utils/osm.utils.sh
@@ -4,8 +4,8 @@ osm.utils.edit() {
     vim $FILENAME && source $FILENAME
 }
 
-#SERVER=https://master.apis.dev.openstreetmap.org
-SERVER=https://api.openstreetmap.org
+SERVER=https://master.apis.dev.openstreetmap.org
+#SERVER=https://api.openstreetmap.org
 OSM_API=$SERVER/api/0.6
 OSM_USER_PASSWD=$(cat $HOME/git/settings/tokens/osm)
 
@@ -25,12 +25,18 @@ osm.get.ids() {
     sed -nr 's/.*<(node|way|relation) id=\"([^"]+)\".*/\1 \2/p'
 }
 osm.upload() {
-    CHANGESET_ID=$(osm.changeset.create)
-
     cat - > /tmp/osm
-    source <(osm.get.ids < /tmp/osm |\
-             sed 's#.*#osm.extract \0 < /tmp/osm#g' |\
-             sed "s/.*/\0 \| osm.changeset.add $CHANGESET_ID/g")
+    echo still
+    osm.changeset.create
+    #CHANGESET_ID=$(osm.changeset.create)
+
+    #osm.get.ids < /tmp/osm |\
+    #sed 's#.*#osm.extract \0 < /tmp/osm#g' |\
+    #sed "s/.*/\0 \| osm.changeset.add $CHANGESET_ID/g" |\
+    #while read
+    #do
+    #    echo $CHANGESET
+    #done
 }
 # query osm-related file with .osm format output
 osm.file.query() {
@@ -61,9 +67,10 @@ osm.changeset.create() {
          "
 
     echo $info |\
-    curl -u $OSM_USER_PASSWD -i --upload-file - $SERVER/api/0.6/changeset/create |\
+    curl -u $OSM_USER_PASSWD -i --upload-file - $OSM_API/changeset/create |\
     tee /dev/tty |\
-    tail -1
+    tail -1 |\
+    xsel -ib
 }
 # add a new element into changeset
 osm.changeset.add() {