Skip to content

Commit e207c2b

Browse files
committed
update osmosis
1 parent 794166c commit e207c2b

File tree

90 files changed

+342
-295
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+342
-295
lines changed
Lines changed: 229 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -1,94 +1,244 @@
11
#!/bin/sh
22

3-
# Config files can define several variables used throughout this script.
4-
# JAVACMD - The java command to launch osmosis.
5-
# JAVACMD_OPTIONS - The options to append to the java command, typically used to modify jvm settings such as max memory.
6-
# OSMOSIS_OPTIONS - The options to apply to all osmosis invocations, typically used to add plugins or make quiet operation the default.
7-
8-
if [ -f /etc/osmosis ] ; then
9-
. /etc/osmosis
10-
fi
3+
#
4+
# Copyright © 2015-2021 the original authors.
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# https://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
18+
19+
##############################################################################
20+
#
21+
# osmosis start up script for POSIX generated by Gradle.
22+
#
23+
# Important for running:
24+
#
25+
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
26+
# noncompliant, but you have some other compliant shell such as ksh or
27+
# bash, then to run this script, type that shell name before the whole
28+
# command line, like:
29+
#
30+
# ksh osmosis
31+
#
32+
# Busybox and similar reduced shells will NOT work, because this script
33+
# requires all of these POSIX shell features:
34+
# * functions;
35+
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
36+
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
37+
# * compound commands having a testable exit status, especially «case»;
38+
# * various built-in commands including «command», «set», and «ulimit».
39+
#
40+
# Important for patching:
41+
#
42+
# (2) This script targets any POSIX shell, so it avoids extensions provided
43+
# by Bash, Ksh, etc; in particular arrays are avoided.
44+
#
45+
# The "traditional" practice of packing multiple parameters into a
46+
# space-separated string is a well documented source of bugs and security
47+
# problems, so this is (mostly) avoided, by progressively accumulating
48+
# options in "$@", and eventually passing that to Java.
49+
#
50+
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
51+
# and OSMOSIS_OPTS) rely on word-splitting, this is performed explicitly;
52+
# see the in-line comments for details.
53+
#
54+
# There are tweaks for specific operating systems such as AIX, CygWin,
55+
# Darwin, MinGW, and NonStop.
56+
#
57+
# (3) This script is generated from the Groovy template
58+
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
59+
# within the Gradle project.
60+
#
61+
# You can find Gradle at https://github.com/gradle/gradle/.
62+
#
63+
##############################################################################
64+
65+
# Attempt to set APP_HOME
66+
67+
# Resolve links: $0 may be a link
68+
app_path=$0
69+
70+
# Need this for daisy-chained symlinks.
71+
while
72+
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
73+
[ -h "$app_path" ]
74+
do
75+
ls=$( ls -ld "$app_path" )
76+
link=${ls#*' -> '}
77+
case $link in #(
78+
/*) app_path=$link ;; #(
79+
*) app_path=$APP_HOME$link ;;
80+
esac
81+
done
1182

12-
if [ -f "$HOME/.osmosis" ] ; then
13-
. "$HOME/.osmosis"
83+
# This is normally unused
84+
# shellcheck disable=SC2034
85+
APP_BASE_NAME=${0##*/}
86+
APP_HOME=$( cd "${APP_HOME:-./}.." && pwd -P ) || exit
87+
88+
# Use the maximum available, or set MAX_FD != -1 to use that value.
89+
MAX_FD=maximum
90+
91+
warn () {
92+
echo "$*"
93+
} >&2
94+
95+
die () {
96+
echo
97+
echo "$*"
98+
echo
99+
exit 1
100+
} >&2
101+
102+
# OS specific support (must be 'true' or 'false').
103+
cygwin=false
104+
msys=false
105+
darwin=false
106+
nonstop=false
107+
case "$( uname )" in #(
108+
CYGWIN* ) cygwin=true ;; #(
109+
Darwin* ) darwin=true ;; #(
110+
MSYS* | MINGW* ) msys=true ;; #(
111+
NONSTOP* ) nonstop=true ;;
112+
esac
113+
114+
CLASSPATH=$APP_HOME/lib/osmosis-0.49.2.jar:$APP_HOME/lib/osmosis-extract-0.49.2.jar:$APP_HOME/lib/osmosis-apidb-0.49.2.jar:$APP_HOME/lib/osmosis-areafilter-0.49.2.jar:$APP_HOME/lib/osmosis-dataset-0.49.2.jar:$APP_HOME/lib/osmosis-pbf-0.49.2.jar:$APP_HOME/lib/osmosis-pbf2-0.49.2.jar:$APP_HOME/lib/osmosis-pgsimple-0.49.2.jar:$APP_HOME/lib/osmosis-pgsnapshot-0.49.2.jar:$APP_HOME/lib/osmosis-replication-0.49.2.jar:$APP_HOME/lib/osmosis-set-0.49.2.jar:$APP_HOME/lib/osmosis-tagfilter-0.49.2.jar:$APP_HOME/lib/osmosis-tagtransform-0.49.2.jar:$APP_HOME/lib/osmosis-xml-0.49.2.jar:$APP_HOME/lib/osmosis-core-0.49.2.jar:$APP_HOME/lib/commons-dbcp-1.4.jar:$APP_HOME/lib/spring-jdbc-5.3.30.jar:$APP_HOME/lib/postgis-jdbc-2021.1.0.jar:$APP_HOME/lib/osmosis-hstore-jdbc-0.49.2.jar:$APP_HOME/lib/postgresql-42.6.0.jar:$APP_HOME/lib/jpf-1.5.jar:$APP_HOME/lib/osmpbf-1.5.0.jar:$APP_HOME/lib/mysql-connector-j-8.0.33.jar:$APP_HOME/lib/protobuf-java-3.25.0.jar:$APP_HOME/lib/guava-32.1.3-jre.jar:$APP_HOME/lib/commons-io-2.15.0.jar:$APP_HOME/lib/commons-csv-1.10.0.jar:$APP_HOME/lib/commons-codec-1.16.0.jar:$APP_HOME/lib/commons-compress-1.24.0.jar:$APP_HOME/lib/commons-pool-1.5.4.jar:$APP_HOME/lib/spring-tx-5.3.30.jar:$APP_HOME/lib/spring-beans-5.3.30.jar:$APP_HOME/lib/spring-core-5.3.30.jar:$APP_HOME/lib/checker-qual-3.37.0.jar:$APP_HOME/lib/commons-logging-1.0.4.jar:$APP_HOME/lib/failureaccess-1.0.1.jar:$APP_HOME/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar:$APP_HOME/lib/jsr305-3.0.2.jar:$APP_HOME/lib/error_prone_annotations-2.21.1.jar:$APP_HOME/lib/postgis-geometry-2021.1.0.jar:$APP_HOME/lib/slf4j-api-1.7.32.jar:$APP_HOME/lib/spring-jcl-5.3.30.jar
115+
116+
117+
# Determine the Java command to use to start the JVM.
118+
if [ -n "$JAVA_HOME" ] ; then
119+
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
120+
# IBM's JDK on AIX uses strange locations for the executables
121+
JAVACMD=$JAVA_HOME/jre/sh/java
122+
else
123+
JAVACMD=$JAVA_HOME/bin/java
124+
fi
125+
if [ ! -x "$JAVACMD" ] ; then
126+
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
127+
128+
Please set the JAVA_HOME variable in your environment to match the
129+
location of your Java installation."
130+
fi
131+
else
132+
JAVACMD=java
133+
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
134+
135+
Please set the JAVA_HOME variable in your environment to match the
136+
location of your Java installation."
14137
fi
15138

16-
if [ -z "$JAVACMD" ] ; then
17-
# No JAVACMD provided in osmosis config files, therefore default to java
18-
JAVACMD=java
139+
# Increase the maximum file descriptors if we can.
140+
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
141+
case $MAX_FD in #(
142+
max*)
143+
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
144+
# shellcheck disable=SC3045
145+
MAX_FD=$( ulimit -H -n ) ||
146+
warn "Could not query maximum file descriptor limit"
147+
esac
148+
case $MAX_FD in #(
149+
'' | soft) :;; #(
150+
*)
151+
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
152+
# shellcheck disable=SC3045
153+
ulimit -n "$MAX_FD" ||
154+
warn "Could not set maximum file descriptor limit to $MAX_FD"
155+
esac
19156
fi
20157

21-
## resolve links - $0 may be a link to application
22-
PRG="$0"
23-
24-
# if started without absolute path, but from PATH environment
25-
if [ ! -s "$PRG" ] ; then
26-
PRG=`which $PRG`
158+
# Collect all arguments for the java command, stacking in reverse order:
159+
# * args from the command line
160+
# * the main class name
161+
# * -classpath
162+
# * -D...appname settings
163+
# * --module-path (only if needed)
164+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and OSMOSIS_OPTS environment variables.
165+
166+
# For Cygwin or MSYS, switch paths to Windows format before running java
167+
if "$cygwin" || "$msys" ; then
168+
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
169+
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
170+
171+
JAVACMD=$( cygpath --unix "$JAVACMD" )
172+
173+
# Now convert the arguments - kludge to limit ourselves to /bin/sh
174+
for arg do
175+
if
176+
case $arg in #(
177+
-*) false ;; # don't mess with options #(
178+
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
179+
[ -e "$t" ] ;; #(
180+
*) false ;;
181+
esac
182+
then
183+
arg=$( cygpath --path --ignore --mixed "$arg" )
184+
fi
185+
# Roll the args list around exactly as many times as the number of
186+
# args, so each arg winds up back in the position where it started, but
187+
# possibly modified.
188+
#
189+
# NB: a `for` loop captures its iteration list before it begins, so
190+
# changing the positional parameters here affects neither the number of
191+
# iterations, nor the values presented in `arg`.
192+
shift # remove old arg
193+
set -- "$@" "$arg" # push replacement arg
194+
done
27195
fi
28196

29-
# need this for relative symlinks
30-
while [ -h "$PRG" ] ; do
31-
ls=`ls -ld "$PRG"`
32-
link=`expr "$ls" : '.*-> \(.*\)$'`
33-
if expr "$link" : '/.*' > /dev/null; then
34-
PRG="$link"
35-
else
36-
PRG="`dirname "$PRG"`/$link"
37-
fi
38-
done
39-
40-
if [ "x$1x" = "xx" ] || echo "$@" | grep -q -e '--help' ; then
41-
cat <<EOF
42-
osmosis
43-
44-
Example Usage
45-
46-
Import a planet file into a local PostgreSQL database.
47-
48-
osmosis --read-xml file=~/osm/planbet/planet.osm --write-apidb host="x" database="x" user="x" password="x"
49-
50-
Export a planet file from a local PostgreSQL database.
51-
52-
osmosis --read-apidb host="x" database="x" user="x" password="x" --write-xml file="planet.osm"
53-
54-
Derive a change set between two planet files.
55197

56-
osmosis --read-xml file="planet2.osm" --read-xml file="planet1.osm" --derive-change --write-xml-change file="planetdiff-1-2.osc"
198+
# Add default JVM options here. You can also use JAVA_OPTS and OSMOSIS_OPTS to pass JVM options to this script.
199+
DEFAULT_JVM_OPTS=""
57200

58-
Derive a change set between a planet file and a database.
201+
# Collect all arguments for the java command;
202+
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $OSMOSIS_OPTS can contain fragments of
203+
# shell script including quotes and variable substitutions, so put them in
204+
# double quotes to make sure that they get re-expanded; and
205+
# * put everything else in single quotes, so that it's not re-expanded.
59206

60-
osmosis --read-mysql host="x" database="x" user="x" password="x" --read-xml file="planet1.osm" --derive-change --write-xml-change file="planetdiff-1-2.osc"
207+
set -- \
208+
-classpath "$CLASSPATH" \
209+
org.openstreetmap.osmosis.core.Osmosis \
210+
"$@"
61211

62-
Apply a change set to a planet file.
63-
64-
osmosis --read-xml-change file="planetdiff-1-2.osc" --read-xml file="planet1.osm" --apply-change --write-xml file="planet2.osm"
65-
66-
Sort the contents of a planet file.
67-
68-
osmosis --read-xml file="data.osm" --sort type="TypeThenId" --write-xml file="data-sorted.osm"
69-
70-
The above examples make use of the default pipe connection feature, however a simple read and write planet file command line could be written in two ways. The first example uses default pipe connection, the second explicitly connects the two components using a pipe named "mypipe". The default pipe connection will always work so long as each task is specified in the correct order.
71-
72-
osmosis --read-xml file="planetin.osm" --write-xml file="planetout.osm"
73-
74-
osmosis --read-xml file="planetin.osm" outPipe.0="mypipe" --write-xml file="planetout.osm" inPipe.0="mypipe"
75-
76-
Full usage details are available at: http://wiki.openstreetmap.org/wiki/Osmosis/Detailed_Usage
77-
78-
EOF
79-
exit 1
212+
# Stop when "xargs" is not available.
213+
if ! command -v xargs >/dev/null 2>&1
214+
then
215+
die "xargs is not available"
80216
fi
81217

82-
# make it fully qualified
83-
saveddir=`pwd`
84-
MYAPP_HOME=`dirname "$PRG"`/..
85-
MYAPP_HOME=`cd "$MYAPP_HOME" && pwd`
86-
cd "$saveddir"
87-
88-
# Build up the classpath of required jar files via classworlds launcher.
89-
MYAPP_CLASSPATH=$MYAPP_HOME/lib/default/plexus-classworlds-*.jar
90-
91-
MAINCLASS=org.codehaus.classworlds.Launcher
92-
EXEC="$JAVACMD $JAVACMD_OPTIONS -cp $MYAPP_CLASSPATH -Dapp.home=$MYAPP_HOME -Dclassworlds.conf=$MYAPP_HOME/config/plexus.conf $MAINCLASS $OSMOSIS_OPTIONS"
93-
94-
exec $EXEC "$@"
218+
# Use "xargs" to parse quoted args.
219+
#
220+
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
221+
#
222+
# In Bash we could simply go:
223+
#
224+
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
225+
# set -- "${ARGS[@]}" "$@"
226+
#
227+
# but POSIX shell has neither arrays nor command substitution, so instead we
228+
# post-process each arg (as a line of input to sed) to backslash-escape any
229+
# character that might be a shell metacharacter, then use eval to reverse
230+
# that process (while maintaining the separation between arguments), and wrap
231+
# the whole thing up as a single "set" statement.
232+
#
233+
# This will of course break if any of these variables contains a newline or
234+
# an unmatched quote.
235+
#
236+
237+
eval "set -- $(
238+
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $OSMOSIS_OPTS" |
239+
xargs -n1 |
240+
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
241+
tr '\n' ' '
242+
)" '"$@"'
243+
244+
exec "$JAVACMD" "$@"

tools/mapGenerator/osmosis/bin/osmosis-extract-apidb-0.6

Lines changed: 0 additions & 54 deletions
This file was deleted.

0 commit comments

Comments
 (0)