Skip to content

Commit

Permalink
Fixed man page
Browse files Browse the repository at this point in the history
  • Loading branch information
sembruk committed Dec 12, 2016
1 parent 3c6cdb5 commit ac53e56
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 25 deletions.
20 changes: 3 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ See [**Downloads**](https://github.com/sembruk/osm2xmap/releases) or build from
```bash
git clone https://github.com/sembruk/osm2xmap.git
cd osm2xmap
make
make && make install
```

## Dependencies
Expand All @@ -34,24 +34,10 @@ You can also use [JOSM](https://josm.openstreetmap.de/) editor for download data
Convert downloaded file with the following command

```bash
./osm2xmap map.osm
osm2xmap map.osm
```

For more options see `./osm2xmap --help`:

```bash
./osm2xmap --help
Usage:
./osm2xmap [options] [file]
file - input OSM filename ('in.osm' as default);
Options:
-o filename - output XMAP filename ('out.xmap' as default);
-s filename - symbol set XMAP or OMAP filename ('ISOM_15000.xmap' as default)
(see /usr/share/openorienteering-mapper/symbol\ sets/);
-r filename - YAML rules filename ('ISOM_rules.yaml' as default);
-V or --version - print software version;
--help or -h - this usage.
```
For more options see `osm2xmap --help`.

You can open and edit resulting file in [OpenOrienteering Mapper](http://www.openorienteering.org/apps/mapper/) v0.6.6 or newer.

Expand Down
32 changes: 25 additions & 7 deletions doc/man/osm2xmap.1
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,39 @@ rules by YAML rules file.
.B osm2xmap
.RI [options] " [file]"


.SH OPTIONS

.HP
file \- input OSM filename ('in.osm' as default);
.HP
\fB\-o\fR filename \- output XMAP filename ('out.xmap' as default);
\fB\-o\fR filename

Set output XMAP filename ('out.xmap' as default).

.TP
\fB\-s\fR filename \- symbol set XMAP or OMAP filename ('ISOM_15000.xmap' as default)
(see /usr/share/openorienteering\-mapper/symbol\e sets/);
\fB\-s\fR filename

Set symbol set XMAP or OMAP filename ('ISOM_15000.xmap' as default).

.HP
\fB\-r\fR filename

Set YAML rules filename ('ISOM_rules.yaml' as default).

.HP
\fB\-r\fR filename \- YAML rules filename ('ISOM_rules.yaml' as default);
\fB-n\fR, \fB\-\-no\-empty\-objects\fR

Don`t convert objects without symbol.

.HP
\fB\-V\fR or \fB\-\-version\fR \- print software version;
\fB\-V\fR, \fB\-\-version\fR

Print software version.

.HP
\fB\-\-help\fR or \fB\-h\fR \- this usage.
\fB\-h\fR, \fB\-\-help\fR

Show usage.

.SH AUTHOR
This manual page was written by Semyon Yakimov <[email protected]>.
Expand Down
1 change: 0 additions & 1 deletion src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,6 @@ void printUsage(const char* programName) {
info(" Options:");
info(" -o filename output XMAP filename ('"+defaultOutXmapFileName+"' as default);");
info(" -s filename symbol set XMAP or OMAP filename ('"+defaultSymbolFileName+"' as default)");
info(" (see /usr/share/openorienteering-mapper/symbol\\ sets/);");
info(" -r filename YAML rules filename ('"+defaultRulesFileName+"' as default);");
info(" -n, --no-empty-objects");
info(" don`t convert objects without symbol;");
Expand Down

0 comments on commit ac53e56

Please sign in to comment.