update

29 files changed, 15 insertions, 1 deletions

diff --git a/scripts/load-settings.sh b/scripts/load-settings.sh
index f266a22..c6502e8 100755
--- a/scripts/load-settings.sh
+++ b/scripts/load-settings.sh
@@ -12,4 +12,5 @@ PATH=$PATH:$SETTING_DIR/scripts
 $SETTING_DIR/scripts/sync.sh
 
 # load custom functions
-source $SETTING_DIR/utils/osm
+OSM_UTIL_DIR=$SETTING_DIR/scripts/osm
+source $OSM_UTIL_DIR/osm && PATH=$PATH:$OSM_UTIL_DIR
diff --git a/scripts/osm/osm b/scripts/osm/osm
new file mode 100644
index 0000000..2d32575
--- /dev/null
+++ b/scripts/osm/osm
@@ -0,0 +1,13 @@
+#! /bin/sh
+
+#OSM_SERVER=https://master.apis.dev.openstreetmap.org
+OSM_SERVER=https://api.openstreetmap.org
+
+OSM_API=$OSM_SERVER/api/0.6
+OSM_USER_PASSWD=$(cat $SETTING_DIR/tokens/osm)
+
+FILENAME=$0
+
+util.osm.edit() {
+    vim $FILENAME && source $FILENAME
+}
diff --git a/scripts/osm/osm.api.change.create b/scripts/osm/osm.api.change.create
index 1f17334..1f17334 100644..100755
--- a/scripts/osm/osm.api.change.create
+++ b/scripts/osm/osm.api.change.create
diff --git a/scripts/osm/osm.api.changeset.add b/scripts/osm/osm.api.changeset.add
index 3e4878e..3e4878e 100644..100755
--- a/scripts/osm/osm.api.changeset.add
+++ b/scripts/osm/osm.api.changeset.add
diff --git a/scripts/osm/osm.api.changeset.close b/scripts/osm/osm.api.changeset.close
index 3b016c3..3b016c3 100644..100755
--- a/scripts/osm/osm.api.changeset.close
+++ b/scripts/osm/osm.api.changeset.close
diff --git a/scripts/osm/osm.api.changeset.update b/scripts/osm/osm.api.changeset.update
index 7b32741..7b32741 100644..100755
--- a/scripts/osm/osm.api.changeset.update
+++ b/scripts/osm/osm.api.changeset.update
diff --git a/scripts/osm/osm.api.changeset.upload b/scripts/osm/osm.api.changeset.upload
index 918a755..918a755 100644..100755
--- a/scripts/osm/osm.api.changeset.upload
+++ b/scripts/osm/osm.api.changeset.upload
diff --git a/scripts/osm/osm.api.fetch b/scripts/osm/osm.api.fetch
index 8460c5f..8460c5f 100644..100755
--- a/scripts/osm/osm.api.fetch
+++ b/scripts/osm/osm.api.fetch
diff --git a/scripts/osm/osm.api.fetch.full b/scripts/osm/osm.api.fetch.full
index 5ee78b8..5ee78b8 100644..100755
--- a/scripts/osm/osm.api.fetch.full
+++ b/scripts/osm/osm.api.fetch.full
diff --git a/scripts/osm/osm.api.fetch.history b/scripts/osm/osm.api.fetch.history
index bc837bd..bc837bd 100644..100755
--- a/scripts/osm/osm.api.fetch.history
+++ b/scripts/osm/osm.api.fetch.history
diff --git a/scripts/osm/osm.api.member.relation b/scripts/osm/osm.api.member.relation
index 5addef7..5addef7 100644..100755
--- a/scripts/osm/osm.api.member.relation
+++ b/scripts/osm/osm.api.member.relation
diff --git a/scripts/osm/osm.api.referenced.relation b/scripts/osm/osm.api.referenced.relation
index 2ce0631..2ce0631 100644..100755
--- a/scripts/osm/osm.api.referenced.relation
+++ b/scripts/osm/osm.api.referenced.relation
diff --git a/scripts/osm/osm.api.referenced.way b/scripts/osm/osm.api.referenced.way
index b62ac58..b62ac58 100644..100755
--- a/scripts/osm/osm.api.referenced.way
+++ b/scripts/osm/osm.api.referenced.way
diff --git a/scripts/osm/osm.api.upload.to b/scripts/osm/osm.api.upload.to
index 3979220..3979220 100644..100755
--- a/scripts/osm/osm.api.upload.to
+++ b/scripts/osm/osm.api.upload.to
diff --git a/scripts/osm/osm.file.get b/scripts/osm/osm.file.get
index e2b67b4..e2b67b4 100644..100755
--- a/scripts/osm/osm.file.get
+++ b/scripts/osm/osm.file.get
diff --git a/scripts/osm/osm.file.get.full b/scripts/osm/osm.file.get.full
index 50ee2f1..50ee2f1 100644..100755
--- a/scripts/osm/osm.file.get.full
+++ b/scripts/osm/osm.file.get.full
diff --git a/scripts/osm/osm.file.query b/scripts/osm/osm.file.query
index 4a01b5b..4a01b5b 100644..100755
--- a/scripts/osm/osm.file.query
+++ b/scripts/osm/osm.file.query
diff --git a/scripts/osm/osm.get.id b/scripts/osm/osm.get.id
index 93593b5..93593b5 100644..100755
--- a/scripts/osm/osm.get.id
+++ b/scripts/osm/osm.get.id
diff --git a/scripts/osm/osm.goto b/scripts/osm/osm.goto
index 7da3394..7da3394 100644..100755
--- a/scripts/osm/osm.goto
+++ b/scripts/osm/osm.goto
diff --git a/scripts/osm/osm.help b/scripts/osm/osm.help
index aa3b36b..aa3b36b 100644..100755
--- a/scripts/osm/osm.help
+++ b/scripts/osm/osm.help
diff --git a/scripts/osm/osm.list.ids b/scripts/osm/osm.list.ids
index 8e5d870..8e5d870 100644..100755
--- a/scripts/osm/osm.list.ids
+++ b/scripts/osm/osm.list.ids
diff --git a/scripts/osm/osm.list.tag b/scripts/osm/osm.list.tag
index 3d5157d..3d5157d 100644..100755
--- a/scripts/osm/osm.list.tag
+++ b/scripts/osm/osm.list.tag
diff --git a/scripts/osm/osm.list.tags b/scripts/osm/osm.list.tags
index 6fe4da4..6fe4da4 100644..100755
--- a/scripts/osm/osm.list.tags
+++ b/scripts/osm/osm.list.tags
diff --git a/scripts/osm/osm.member.relation b/scripts/osm/osm.member.relation
index f8d4598..f8d4598 100644..100755
--- a/scripts/osm/osm.member.relation
+++ b/scripts/osm/osm.member.relation
diff --git a/scripts/osm/osm.osc.create b/scripts/osm/osm.osc.create
index 61a4dfb..61a4dfb 100644..100755
--- a/scripts/osm/osm.osc.create
+++ b/scripts/osm/osm.osc.create
diff --git a/scripts/osm/osm.osm.remove b/scripts/osm/osm.osm.remove
index fbbaf0c..fbbaf0c 100644..100755
--- a/scripts/osm/osm.osm.remove
+++ b/scripts/osm/osm.osm.remove
diff --git a/scripts/osm/osm.pbf.update b/scripts/osm/osm.pbf.update
index 694ae4d..694ae4d 100644..100755
--- a/scripts/osm/osm.pbf.update
+++ b/scripts/osm/osm.pbf.update
diff --git a/scripts/osm/osm.query b/scripts/osm/osm.query
index fd48fd2..fd48fd2 100644..100755
--- a/scripts/osm/osm.query
+++ b/scripts/osm/osm.query
diff --git a/scripts/osm/osm.village.nat_ref.makefile b/scripts/osm/osm.village.nat_ref.makefile
index 3937144..3937144 100644..100755
--- a/scripts/osm/osm.village.nat_ref.makefile
+++ b/scripts/osm/osm.village.nat_ref.makefile