From efb9c0795a4d1630c7809795f445011ecd379c91 Mon Sep 17 00:00:00 2001 From: typebrook Date: Thu, 7 Nov 2019 00:48:14 +0800 Subject: update --- alias | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'alias') 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 "" + sed -nr "/^ *<$1 id=\"$2\".*/,/^ *<\/$1>/p" - + echo "" +} osm.update() { # remove original tag&value sed "/" } -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 "" | \ + 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 -- cgit v1.2.3-70-g09d2