From 00b136155183ae522ca458e540a8cf29bf525e74 Mon Sep 17 00:00:00 2001 From: typebrook Date: Thu, 27 Feb 2020 16:32:37 +0800 Subject: update --- scripts/osm/josm_install.sh | 8 ------ scripts/osm/osm | 17 ------------- scripts/osm/osm.api.changeset.add | 10 -------- scripts/osm/osm.api.changeset.close | 3 --- scripts/osm/osm.api.changeset.create | 21 --------------- scripts/osm/osm.api.changeset.update | 7 ----- scripts/osm/osm.api.changeset.upload | 6 ----- scripts/osm/osm.api.fetch | 6 ----- scripts/osm/osm.api.fetch.full | 5 ---- scripts/osm/osm.api.fetch.history | 6 ----- scripts/osm/osm.api.member.relation | 4 --- scripts/osm/osm.api.referenced.relation | 6 ----- scripts/osm/osm.api.referenced.way | 5 ---- scripts/osm/osm.api.upload.to | 12 --------- scripts/osm/osm.file.get | 4 --- scripts/osm/osm.file.get.full | 4 --- scripts/osm/osm.file.query | 4 --- scripts/osm/osm.goto | 3 --- scripts/osm/osm.help | 34 ------------------------- scripts/osm/osm.list.ids | 3 --- scripts/osm/osm.list.tag | 10 -------- scripts/osm/osm.list.tags | 15 ----------- scripts/osm/osm.member.relation | 8 ------ scripts/osm/osm.osc.by_member | 31 ----------------------- scripts/osm/osm.osc.by_tag | 45 --------------------------------- scripts/osm/osm.osm.remove | 9 ------- scripts/osm/osm.pbf.update | 39 ---------------------------- scripts/osm/osm.query | 3 --- scripts/osm/sequence_number.sh | 22 ---------------- 29 files changed, 350 deletions(-) delete mode 100755 scripts/osm/josm_install.sh delete mode 100644 scripts/osm/osm delete mode 100755 scripts/osm/osm.api.changeset.add delete mode 100755 scripts/osm/osm.api.changeset.close delete mode 100755 scripts/osm/osm.api.changeset.create delete mode 100755 scripts/osm/osm.api.changeset.update delete mode 100755 scripts/osm/osm.api.changeset.upload delete mode 100755 scripts/osm/osm.api.fetch delete mode 100755 scripts/osm/osm.api.fetch.full delete mode 100755 scripts/osm/osm.api.fetch.history delete mode 100755 scripts/osm/osm.api.member.relation delete mode 100755 scripts/osm/osm.api.referenced.relation delete mode 100755 scripts/osm/osm.api.referenced.way delete mode 100755 scripts/osm/osm.api.upload.to delete mode 100755 scripts/osm/osm.file.get delete mode 100755 scripts/osm/osm.file.get.full delete mode 100755 scripts/osm/osm.file.query delete mode 100755 scripts/osm/osm.goto delete mode 100755 scripts/osm/osm.help delete mode 100755 scripts/osm/osm.list.ids delete mode 100755 scripts/osm/osm.list.tag delete mode 100755 scripts/osm/osm.list.tags delete mode 100755 scripts/osm/osm.member.relation delete mode 100755 scripts/osm/osm.osc.by_member delete mode 100755 scripts/osm/osm.osc.by_tag delete mode 100755 scripts/osm/osm.osm.remove delete mode 100755 scripts/osm/osm.pbf.update delete mode 100755 scripts/osm/osm.query delete mode 100755 scripts/osm/sequence_number.sh (limited to 'scripts/osm') diff --git a/scripts/osm/josm_install.sh b/scripts/osm/josm_install.sh deleted file mode 100755 index 520875a..0000000 --- a/scripts/osm/josm_install.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -# scripts from https://josm.openstreetmap.de/wiki/Download#Webstart -echo deb https://josm.openstreetmap.de/apt $(lsb_release -sc) universe | sudo tee /etc/apt/sources.list.d/josm.list > /dev/null &&\ -wget -q https://josm.openstreetmap.de/josm-apt.key -O- | sudo apt-key add - &&\ -sudo apt-get update &&\ -sudo apt-get remove josm josm-plugins &&\ -sudo apt-get install josm diff --git a/scripts/osm/osm b/scripts/osm/osm deleted file mode 100644 index a595fb7..0000000 --- a/scripts/osm/osm +++ /dev/null @@ -1,17 +0,0 @@ -#! /bin/sh - -#export OSM_SERVER=https://master.apis.dev.openstreetmap.org -export OSM_SERVER=https://api.openstreetmap.org - -export OSM_API=$OSM_SERVER/api/0.6 -export OSM_USER_PASSWD=$(cat $SETTING_DIR/tokens/osm 2>/dev/null) - -FILENAME=$0 - -utils.osm() { - vim $FILENAME && source $FILENAME -} - -osm.api() { - curl -X GET $OSM_API/$1/$2 -} diff --git a/scripts/osm/osm.api.changeset.add b/scripts/osm/osm.api.changeset.add deleted file mode 100755 index 3e4878e..0000000 --- a/scripts/osm/osm.api.changeset.add +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -element=$(cat) -header=$(echo $element | grep -E "<(node|way|relation)\s") -ele_type=$(echo $header | sed -r 's/.*<(node|way|relation).*$/\1/') -id=$(echo $header | sed -r 's/.* id=\"([^"]+)\".*$/\1/') - -echo $element | \ -sed -r "s/^( *<(node|way|relation).*version[^ ]+ )(.*)$/\1changeset=\"$1\">/" | \ -curl -X PUT -u $OSM_USER_PASSWD -i -T - $OSM_API/$ele_type/$id diff --git a/scripts/osm/osm.api.changeset.close b/scripts/osm/osm.api.changeset.close deleted file mode 100755 index 3b016c3..0000000 --- a/scripts/osm/osm.api.changeset.close +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -curl -X PUT -u $OSM_USER_PASSWD -i $OSM_API/changeset/$1/close diff --git a/scripts/osm/osm.api.changeset.create b/scripts/osm/osm.api.changeset.create deleted file mode 100755 index ed2601a..0000000 --- a/scripts/osm/osm.api.changeset.create +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -echo -n "type comment: " -read comment - -info=" - - - - - - - " - -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" diff --git a/scripts/osm/osm.api.changeset.update b/scripts/osm/osm.api.changeset.update deleted file mode 100755 index 7b32741..0000000 --- a/scripts/osm/osm.api.changeset.update +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -echo -n 'type comment: ' -read -r comment - -echo "" | \ -curl -X PUT -u $OSM_USER_PASSWD -i -T - $OSM_API/changeset/$1 diff --git a/scripts/osm/osm.api.changeset.upload b/scripts/osm/osm.api.changeset.upload deleted file mode 100755 index 96bdff4..0000000 --- a/scripts/osm/osm.api.changeset.upload +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -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.api.fetch b/scripts/osm/osm.api.fetch deleted file mode 100755 index 8460c5f..0000000 --- a/scripts/osm/osm.api.fetch +++ /dev/null @@ -1,6 +0,0 @@ -#! /bin/sh - -# get .osm format data -curl -X GET $OSM_API/$1/$2 |\ -tee /tmp/osm &&\ -echo content of $1 $2 is copied into /tmp/osm > /dev/tty diff --git a/scripts/osm/osm.api.fetch.full b/scripts/osm/osm.api.fetch.full deleted file mode 100755 index 5ee78b8..0000000 --- a/scripts/osm/osm.api.fetch.full +++ /dev/null @@ -1,5 +0,0 @@ -#! /bin/sh - -curl -X GET $OSM_API/$1/$2/full |\ -tee /tmp/osm &&\ -echo "\n" content of $1 $2 and its members are copied into /tmp/osm > /dev/tty diff --git a/scripts/osm/osm.api.fetch.history b/scripts/osm/osm.api.fetch.history deleted file mode 100755 index bc837bd..0000000 --- a/scripts/osm/osm.api.fetch.history +++ /dev/null @@ -1,6 +0,0 @@ -#! /bin/sh - -curl -X GET $OSM_API/$1/$2/history |\ -tee /tmp/osm &&\ -echo &&\ -echo "\n" history of $1 $2 are copied into /tmp/osm > /dev/tty diff --git a/scripts/osm/osm.api.member.relation b/scripts/osm/osm.api.member.relation deleted file mode 100755 index 5addef7..0000000 --- a/scripts/osm/osm.api.member.relation +++ /dev/null @@ -1,4 +0,0 @@ -#! /bin/sh - -osm.api.referenced.relation $1 $2 |\ -osm.member.relation $1 $2 $3 diff --git a/scripts/osm/osm.api.referenced.relation b/scripts/osm/osm.api.referenced.relation deleted file mode 100755 index 2ce0631..0000000 --- a/scripts/osm/osm.api.referenced.relation +++ /dev/null @@ -1,6 +0,0 @@ -#! /bin/sh - -curl -X GET $OSM_API/$1/$2/relations |\ -tee /tmp/osm &&\ -echo &&\ -echo "\n" relations contain $1 $2 are copied into /tmp/osm > /dev/tty diff --git a/scripts/osm/osm.api.referenced.way b/scripts/osm/osm.api.referenced.way deleted file mode 100755 index 1d84238..0000000 --- a/scripts/osm/osm.api.referenced.way +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -curl -X GET $OSM_API/node/$1/ways |\ -tee /tmp/osm &&\ -echo ways contain node $1 are copied into /tmp/osm > /dev/tty diff --git a/scripts/osm/osm.api.upload.to b/scripts/osm/osm.api.upload.to deleted file mode 100755 index 3979220..0000000 --- a/scripts/osm/osm.api.upload.to +++ /dev/null @@ -1,12 +0,0 @@ -#! /bin/sh - -# allows multiple elements in osm body -tee /tmp/osm |\ -osm.list.ids |\ -sed 's#.*#osm.extract \0 < /tmp/osm#g' |\ -sed "s/.*/\0 \| osm.api.changeset.add $1/g" |\ -while read -r command -do - echo $command - source<(echo "($command &)") -done diff --git a/scripts/osm/osm.file.get b/scripts/osm/osm.file.get deleted file mode 100755 index e2b67b4..0000000 --- a/scripts/osm/osm.file.get +++ /dev/null @@ -1,4 +0,0 @@ -#! /bin/sh - -file=$1; shift -osmium getid $file $@ --output-format=osm diff --git a/scripts/osm/osm.file.get.full b/scripts/osm/osm.file.get.full deleted file mode 100755 index 50ee2f1..0000000 --- a/scripts/osm/osm.file.get.full +++ /dev/null @@ -1,4 +0,0 @@ -#! /bin/sh - -file=$1; shift -osmium getid $file $@ --output-format=osm --add-referenced diff --git a/scripts/osm/osm.file.query b/scripts/osm/osm.file.query deleted file mode 100755 index 4a01b5b..0000000 --- a/scripts/osm/osm.file.query +++ /dev/null @@ -1,4 +0,0 @@ -#! /bin/sh - -file=$1; shift -osmium tags-filter $file $@ --output-format=osm --omit-referenced diff --git a/scripts/osm/osm.goto b/scripts/osm/osm.goto deleted file mode 100755 index 25bceaa..0000000 --- a/scripts/osm/osm.goto +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -xdg-open https://www.openstreetmap.org/$1/$2 diff --git a/scripts/osm/osm.help b/scripts/osm/osm.help deleted file mode 100755 index aa3b36b..0000000 --- a/scripts/osm/osm.help +++ /dev/null @@ -1,34 +0,0 @@ -#! /bin/sh - - echo ' -COMMANDS: - osm.help - util.osm.edit - - osm.api.changeset.create create a new changeset and return its ID - osm.api.changeset.update [changeset ID] update changeset with new comment - osm.api.changeset.upload [changeset ID] [osc file] upload osc file to the given changeset - osm.api.changeset.add [changeset ID] STDIN=osm element, add it into changeset - osm.api.changeset.close [changeset ID] close the given changeset - osm.api.fetch [element type] [element ID] - osm.api.fetch.full like .fetch, but return with all referenced elements - osm.api.fetch.history [element type] [element ID] - osm.api.member.relation [element type] [element ID] [member type] get first relations reference it as member type - osm.api.referenced.relation [element type] [element ID] get all relations reference this element - osm.api.referenced.way [element type] [element ID] get all ways reference this element - osm.api.upload.to - - osm.file.cat - osm.file.get - osm.file.get.full - osm.file.query - osm.list.ids - osm.list.tag - osm.list.tags - - osm.get.id - osm.query - osm.member.relation - osm.pbf.update - osm.osm.update - ' diff --git a/scripts/osm/osm.list.ids b/scripts/osm/osm.list.ids deleted file mode 100755 index 8e5d870..0000000 --- a/scripts/osm/osm.list.ids +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh - -sed -nr 's/.*<(node|way|relation) id=\"([^"]+)\".*/\1 \2/p' diff --git a/scripts/osm/osm.list.tag b/scripts/osm/osm.list.tag deleted file mode 100755 index 76649a0..0000000 --- a/scripts/osm/osm.list.tag +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -ele_pattern="(node|way|relation)" -sed -nr "/<$ele_pattern/,/<\/$ele_pattern/ { - / /tmp/osm - -for tag in $@ -do - echo $content |\ - osm.list.tag $tag |\ - paste -d',' /tmp/osm - > /tmp/osm.new &&\ - mv /tmp/osm.new /tmp/osm -done - -cat /tmp/osm -echo "\ntag list is also copied into /tmp/osm" > /dev/tty diff --git a/scripts/osm/osm.member.relation b/scripts/osm/osm.member.relation deleted file mode 100755 index f8d4598..0000000 --- a/scripts/osm/osm.member.relation +++ /dev/null @@ -1,8 +0,0 @@ -#! /bin/sh - -sed -nr "//g') - - echo $NEW_MEMBERS - - # print matched element with new tags to .osc file - cat $1 |\ - sed -nr "/<$TYPE id=\"$ID\"/,/<\/$TYPE/ { - /<$TYPE id=\"$ID\"/ { - s/(version=\"[0-9]+\")(.*)/\1>/ - a \ \ \ \ $NEW_MEMBERS - } - p - /<\/$TYPE/ q - }" >> $1.osc -done - -# Add .osc structure for output -sed -ir '1 i - 1 i - $ a - $ a ' $1.osc diff --git a/scripts/osm/osm.osc.by_tag b/scripts/osm/osm.osc.by_tag deleted file mode 100755 index cc92c1d..0000000 --- a/scripts/osm/osm.osc.by_tag +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -# create new tags from input line, for example: -# field1 field2 field3 field4 field5 field6 field7 field8... -# [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) # field1 is type - ID=$(echo $line | cut -d ' ' -f2) # field2 is ID - - # transform key-value pair into tag format: - # - # keys without values are omitted - NEW_TAGS=$(echo $line |\ - cut -d' ' -f3- |\ - sed -r 's/([^ "]+) (\"[^"]+\")//g; s/>[^"]*$/>/') - - # get regex pattern need to removed from original osm element: - # key1|key2|key3|key4 - TAG_PATTERN=$(echo $line |\ - cut -d' ' -f3- | xargs -n2 echo |\ - cut -d' ' -f1 | paste -s -d'|') - - echo $NEW_TAGS > /dev/tty - - # print matched element with new tags to .osc file - cat $1 |\ - sed -nr "/<$TYPE id=\"$ID\"/,/<\/$TYPE/ { - /<$TYPE id=\"$ID\"/ { - s/(version=\"[0-9]+\")(.*)/\1>/ - a \ \ \ \ $NEW_TAGS - } - /> $1.osc -done - -# Add .osc structure for output -sed -ir '1 i - 1 i - $ a - $ a ' $1.osc diff --git a/scripts/osm/osm.osm.remove b/scripts/osm/osm.osm.remove deleted file mode 100755 index 83d6ea8..0000000 --- a/scripts/osm/osm.osm.remove +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -while read -r line -do - # put element type and element ID into array - array=( $(echo $line) ) - cat $1 |\ - sed -i "/<$array[1] id=\"$array[2]\"/,/<\/$array[1]>/ d" -done diff --git a/scripts/osm/osm.pbf.update b/scripts/osm/osm.pbf.update deleted file mode 100755 index cd115a7..0000000 --- a/scripts/osm/osm.pbf.update +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -GEOFABRICK_SERVER=http://download.geofabrik.de/asia/taiwan-updates -PBF_FILE=$1 - -# get latest sequence number -echo Fetching the latest sequence number -LATEST_SEQ=$(curl --silent http://download.geofabrik.de/asia/taiwan-updates/state.txt |\ - tail -1 | cut -d'=' -f2) -echo Latest sequence number is $LATEST_SEQ - -# get current sequence number -SEQ=$(osmium fileinfo $PBF_FILE |\ - grep osmosis_replication_sequence_number |\ - cut -d'=' -f2) -echo File sequence number is $SEQ - -# while server has osc file with given sequence number, -# get it and do file update -while - (( SEQ++ )) - [ $SEQ -le $LATEST_SEQ ] -do - mkdir -p changes - SEQ_PATH=$(echo $SEQ | sed -r 's/(.{1})(.{3})/00\1\/\2/') - CHANGE_URL=$GEOFABRICK_SERVER/000/$SEQ_PATH.osc.gz - echo $CHANGE_URL - curl -o changes/$SEQ.osc.gz $CHANGE_URL && \ - osmium apply-changes $PBF_FILE changes/$SEQ.osc.gz \ - --output-header=osmosis_replication_sequence_number=$SEQ \ - --overwrite \ - --output $SEQ.osm.pbf - - mv $PBF_FILE $((SEQ-1)).osm.pbf - mv $SEQ.osm.pbf $PBF_FILE -done - -echo -echo File sequence number is $((SEQ-1)), already the latest one on Geofrbrik diff --git a/scripts/osm/osm.query b/scripts/osm/osm.query deleted file mode 100755 index 8d0b9f7..0000000 --- a/scripts/osm/osm.query +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -osmium tags-filter - $@ --input-format=osm --output-format=osm --omit-referenced diff --git a/scripts/osm/sequence_number.sh b/scripts/osm/sequence_number.sh deleted file mode 100755 index eb365d0..0000000 --- a/scripts/osm/sequence_number.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -# $1 as --hour or --minute, $2 as timestamp -# return the latest sequence number - -case $1 in - # hour difference with Tue Jun 4 03:00:00 UTC 2019 - # sequence number=58940 - --hour) - echo $[($2 - 1559617200)/3600 + 58940] - ;; - - # minute difference with latest planet state file - --minute) - benchmark=benchmark - curl https://planet.openstreetmap.org/replication/minute/state > $benchmark - timeString=$(tail -1 $benchmark | tr -d 'timestamp=\\') - timestamp=$(date -d "$timeString" +%s) - seq=$(sed -n 2p $benchmark | tr -d "sequenceNumber=") - rm $benchmark - echo $[$seq - ($timestamp - $2)/60 - 1 ] -esac -- cgit v1.2.3-70-g09d2