Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Problem: issues with rendering wiki md-files #70

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -338,17 +338,17 @@ limitations under the License.
_The following dependencies are linked only dynamically in the Java source of Barefoot. They can be resolved usually automatically with Maven. For details, see [NOTICE.txt](NOTICE.txt)._

* ESRI Geometry API, 1.1, Apache-2.0 ([https://github.com/Esri/geometry-api-java](https://github.com/Esri/geometry-api-java))
* Java, JSON 20090211 (see below)
* Jackson, 1.9.12, Apache-2.0 ([https://github.com/FasterXML/jackson-core](https://github.com/FasterXML/jackson-core))
* Java, JSON 20090211 (see below)
* Jackson, 1.9.12, Apache-2.0 ([https://github.com/FasterXML/jackson-core](https://github.com/FasterXML/jackson-core))
* GeographicLib-Java, 1.46, MIT License ([http://geographiclib.sourceforge.net/](http://geographiclib.sourceforge.net/))
* Java JSON, 20090211, MIT License with extra clause "The Software shall be used for Good, not Evil." ([http://www.json.org](http://www.json.org))
* PostgreSQL JDBC, 9.2-1003-jdbc4, BSD 3-Clause ([http://jdbc.postgresql.org/about/license.html](http://jdbc.postgresql.org/about/license.html))
* JUnit, 4.11, CPL-1.0 ([https://github.com/junit-team/junit](https://github.com/junit-team/junit))
* Hamcrest, 1.3, BSD 3-Clause ([https://github.com/hamcrest/JavaHamcrest](https://github.com/hamcrest/JavaHamcrest))
* Hamcrest, 1.3, BSD 3-Clause ([https://github.com/hamcrest/JavaHamcrest](https://github.com/hamcrest/JavaHamcrest))
* SLF4J, 1.7.10, MIT License ([http://slf4j.org](http://slf4j.org))
* Logback, 1.0.9, LGPL-2.1 ([http://logback.qos.ch](http://logback.qos.ch/))
* SLF4J, 1.7.10 (see above)
* Logback core, 1.0.9, LGPL-2.1 ([http://logback.qos.ch](http://logback.qos.ch/))
* SLF4J, 1.7.10 (see above)
* Logback core, 1.0.9, LGPL-2.1 ([http://logback.qos.ch](http://logback.qos.ch/))
* JeroMQ, 0.3.5, LGPL-3.0 ([https://github.com/zeromq/jeromq](https://github.com/zeromq/jeromq))

#### Barefoot map
Expand All @@ -372,12 +372,12 @@ _The following dependencies are linked only dynamically in the Python source of
* NumPy 'numpy', BSD 3-Clause ([http://www.numpy.org/](http://www.numpy.org/))
* GDAL OGR 'osgeo.ogr' 1.10, MIT License ([http://trac.osgeo.org/gdal/wiki/GdalOgrInPython](http://trac.osgeo.org/gdal/wiki/GdalOgrInPython))
* Python Standard Library 2.7.3, Python License ([https://docs.python.org/2/license.html](https://docs.python.org/2/license.html))
* 'os' ([https://docs.python.org/2/library/os.html](https://docs.python.org/2/library/os.html))
* 'optparse' ([https://docs.python.org/2/library/optparse.html](https://docs.python.org/2/library/optparse.html))
* 'getpass' ([https://docs.python.org/2/library/getpass.html](https://docs.python.org/2/library/getpass.html))
* 'binascii' ([https://docs.python.org/2/library/binascii.html](https://docs.python.org/2/library/binascii.html))
* 'json' ([https://docs.python.org/2/library/json.html](https://docs.python.org/2/library/json.html))
* 'unittest' ([https://docs.python.org/2/library/unittest.html](https://docs.python.org/2/library/unittest.html))
* 'os' ([https://docs.python.org/2/library/os.html](https://docs.python.org/2/library/os.html))
* 'optparse' ([https://docs.python.org/2/library/optparse.html](https://docs.python.org/2/library/optparse.html))
* 'getpass' ([https://docs.python.org/2/library/getpass.html](https://docs.python.org/2/library/getpass.html))
* 'binascii' ([https://docs.python.org/2/library/binascii.html](https://docs.python.org/2/library/binascii.html))
* 'json' ([https://docs.python.org/2/library/json.html](https://docs.python.org/2/library/json.html))
* 'unittest' ([https://docs.python.org/2/library/unittest.html](https://docs.python.org/2/library/unittest.html))

#### Barefoot utilities

Expand Down
Binary file added misc/tudd/1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions misc/tudd/1_decoded.geojson

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions misc/tudd/1_orginal.geojson

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions misc/tudd/1_result.json

Large diffs are not rendered by default.

817 changes: 817 additions & 0 deletions misc/tudd/1_samples.json

Large diffs are not rendered by default.

Binary file added misc/tudd/2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions misc/tudd/2_decoded.geojson

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions misc/tudd/2_orginal.geojson

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions misc/tudd/2_result.json

Large diffs are not rendered by default.

684 changes: 684 additions & 0 deletions misc/tudd/2_samples.json

Large diffs are not rendered by default.

Binary file added misc/tudd/3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions misc/tudd/3_decoded.geojson

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions misc/tudd/3_orginal.geojson

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions misc/tudd/3_result.json

Large diffs are not rendered by default.

761 changes: 761 additions & 0 deletions misc/tudd/3_samples.json

Large diffs are not rendered by default.

761 changes: 761 additions & 0 deletions misc/tudd/3_samples.json.tmp

Large diffs are not rendered by default.

Binary file added misc/tudd/barefoot-bugfix-sample1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added misc/tudd/barefoot-bugfix-sample2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added misc/tudd/barefoot-bugfix-sample3-intersect.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added misc/tudd/barefoot-bugfix-sample3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added misc/tudd/barefoot_Beispiele_TU_Dresden.zip
Binary file not shown.
7 changes: 7 additions & 0 deletions misc/tudd/sachsen.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
host=localhost
port=5432
database=sachsen
table=bfmap_ways
user=osmuser
password=pass
road-types=./map/tools/road-types.json
39 changes: 39 additions & 0 deletions misc/tuwien/trace.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
lat, lng, time,
48.2805491, 16.4110448, 1403187984,
48.2802468, 16.411629, 1403187994,
48.2801251, 16.4130299, 1403188004,
48.2800455, 16.4143727, 1403188014,
48.2799683, 16.4154973, 1403188024,
48.2796712, 16.4157352, 1403188034,
48.2794168, 16.4158302, 1403188044,
48.2793761, 16.4159371, 1403188054,
48.2793385, 16.4162423, 1403188074,
48.2792753, 16.4174071, 1403188084,
48.2792105, 16.418744, 1403188094,
48.2791001, 16.4195392, 1403188104,
48.2787969, 16.4202128, 1403188114,
48.2788872, 16.4212985, 1403188124,
48.2795023, 16.4215505, 1403188134,
48.2797339, 16.4220613, 1403188144,
48.2796957, 16.4235123, 1403188154,
48.2796373, 16.42482, 1403188164,
48.2790854, 16.4245696, 1403188174,
48.2783451, 16.4239898, 1403188184,
48.2775289, 16.4232629, 1403188194,
48.2766941, 16.4225776, 1403188204,
48.275991, 16.4218388, 1403188214,
48.2761468, 16.4205997, 1403188224,
48.2763509, 16.4190553, 1403188235,
48.2764846, 16.417606, 1403188245,
48.2766317, 16.4163046, 1403188255,
48.2767482, 16.4154751, 1403188265,
48.2773926, 16.4155935, 1403188275,
48.2776679, 16.4156256, 1403188285,
48.277687, 16.4156105, 1403188295,
48.2777399, 16.415627, 1403188345,
48.2778332, 16.4156264, 1403188355,
48.2779843, 16.4157265, 1403188365,
48.2781168, 16.4157174, 1403188375,
48.2782739, 16.4157628, 1403188385,
48.2782874, 16.4157274, 1403188395,
48.2783682, 16.4156959, 1403188405,
83 changes: 41 additions & 42 deletions wiki/Home.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,42 +51,42 @@ root@acef54deeedb# bash /mnt/map/osm/import.sh <osm> <database> <user> <password
#### Docker overview
Some basic Docker commands for container administration:

- Start/stop container:
- Start/stop container:
``` bash
sudo docker start <container>
sudo docker stop <container>
```
sudo docker start <container>
sudo docker stop <container>
```

- Attach to container (for maintenance):
- Attach to container (for maintenance):
``` bash
sudo docker attach <container>
root@acef54deeedb# sudo -u postgres psql -d <database>
psql (9.3.5)
Type "help" for help.
sudo docker attach <container>
root@acef54deeedb# sudo -u postgres psql -d <database>
psql (9.3.5)
Type "help" for help.

<database>=# \q
root@acef54deeedb#
<database>=# \q
root@acef54deeedb#
```
_Note: To detach the interactive shell from a running container without stopping it, use the escape sequence Ctrl-p + Ctrl-q._

- Execute commands on container (e.g. a shell for maintenance):
- Execute commands on container (e.g. a shell for maintenance):

``` bash
sudo docker exec -it <container> /bin/bash
root@acef54deeedb# sudo -u postgres psql -d <database>
psql (9.3.5)
Type "help" for help.
sudo docker exec -it <container> /bin/bash
root@acef54deeedb# sudo -u postgres psql -d <database>
psql (9.3.5)
Type "help" for help.

<database>=# \q
root@acef54deeedb# exit
<database>=# \q
root@acef54deeedb# exit
```
_Note: Here, shell can be closed and container doesn't stop._

- List containers:
- List containers:
``` bash
$ sudo docker ps -a
CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES
acef54deeedb barefoot-map /bin/sh -c 'service 3 minutes ago Up 2 seconds 0.0.0.0:5432->5432/tcp <container>
$ sudo docker ps -a
CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES
acef54deeedb barefoot-map /bin/sh -c 'service 3 minutes ago Up 2 seconds 0.0.0.0:5432->5432/tcp <container>
```

#### Whitebox: PostgreSQL/PostGIS
Expand All @@ -112,32 +112,31 @@ psql -h <host> -p <port> -U <user> -d <database> -c "CREATE EXTENSION hstore;"
```

3. Import the OSM data.

1. Download and set up OSM database schema.
1. Download and set up OSM database schema.

``` bash
psql -h <host> -p <port> -U <user> -d <database> -f map/osm/pgsnapshot_schema_0.6.sql
psql -h <host> -p <port> -U <user> -d <database> -f map/osm/pgsnapshot_schema_0.6.sql
```

2. Import OSM extract with Osmosis.
2. Import OSM extract with Osmosis.

``` bash
osmosis --read-pbf file=<osm.pbf-file> --write-pgsql host=<host>:<port> user=<user> database=<database> password=<password>
osmosis --read-pbf file=<osm.pbf-file> --write-pgsql host=<host>:<port> user=<user> database=<database> password=<password>
```

__Note:__ It may be necessary to define a temporary directory for use by Osmosis, e.g. if Osmosis stops with error 'No space left on device'. To do so, run the following commands beforehand:
__Note:__ It may be necessary to define a temporary directory for use by Osmosis, e.g. if Osmosis stops with error 'No space left on device'. To do so, run the following commands beforehand:

``` bash
JAVACMD_OPTIONS=-Djava.io.tmpdir=<path-to-tmp-dir>
export JAVACMD_OPTIONS
``` bash
JAVACMD_OPTIONS=-Djava.io.tmpdir=<path-to-tmp-dir>
export JAVACMD_OPTIONS
```

4. Extract OSM ways in intermediate table.

Import of OSM extract can be usually run in slim mode, which creates table `<ways-table>` in a single query:

``` bash
map/tools/osm2ways --host <host> --port <port> --database <database> --table <ways-table> --user <user> --slim
map/tools/osm2ways --host <host> --port <port> --database <database> --table <ways-table> --user <user> --slim
```

If memory is not sufficiently available, normal mode should be used, which requires a prefix `<prefix>` for temporary tables, which prevents overwriting of existing tables:
Expand Down Expand Up @@ -173,39 +172,39 @@ _Note: Use this approach only if Barefoot is not available with a public Maven r

1. Checkout the respository.
``` bash
git clone https://github.com/bmwcarit/barefoot.git
cd barefoot
git clone https://github.com/bmwcarit/barefoot.git
cd barefoot
```

2. Install JAR to your local Maven repository.

_Note: Maven tests will fail if the test map server hasn't been setup as shown [here](https://github.com/bmwcarit/barefoot/wiki#test-map-server)._

``` bash
mvn install
mvn install
```
... and to skip tests (if test map server has not been set up) ...

``` bash
mvn install -DskipTests
mvn install -DskipTests
```

3. Add dependency to your Java project with Maven.

``` xml
<dependency>
<groupId>com.bmw-carit</groupId>
<artifactId>barefoot</artifactId>
<version>VERSION</version>
</dependency>
<dependency>
<groupId>com.bmw-carit</groupId>
<artifactId>barefoot</artifactId>
<version>VERSION</version>
</dependency>
```

4. Set up a map server, see [here](https://github.com/bmwcarit/barefoot/wiki#map-server), or a test map server, see [here](https://github.com/bmwcarit/barefoot/wiki#test-map-server).

#### Build Javadoc

``` bash
mvn javadoc:javadoc
mvn javadoc:javadoc
```

See [here](http://bmwcarit.github.io/barefoot/doc/index.html).
Expand Down