Skip to content

Commit 1930c17

Browse files
committed
Various updates
1 parent 70af9de commit 1930c17

File tree

8 files changed

+45
-33
lines changed

8 files changed

+45
-33
lines changed

_layouts/default.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<title>{{ page.title }} - osmcode</title>
77
<link rel="stylesheet" href="/css/main.css">
88
{% if page.js %}
9-
<script type="text/javascript" src="/js/jquery-1.9.1.min.js"></script>
9+
<script type="text/javascript" src="/js/jquery-3.6.0.min.js"></script>
1010
<script type="text/javascript" src="/js/osmcode.js"></script>
1111
<script type="text/javascript">//<![CDATA[
1212
{{ page.js }}

_libosmium_manual/03_building.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Before building you need to install all the [dependencies](#dependencies).
1414

1515
Libosmium uses the [CMake](https://cmake.org/) configuration system
1616
available on all major platforms. CMake will generate a configuration for a
17-
build system of your choice. On Linux and Mac OS/X this is usually GNU Make, on
17+
build system of your choice. On Linux and macOS this is usually GNU Make, on
1818
Windows Nmake or MSBuild.
1919

2020

@@ -62,7 +62,7 @@ etc.
6262
| `BUILD_TESTING` | `ON` | Build the unit tests. See chapter [Running Tests](#running-tests) for details.
6363

6464

65-
## Building on Linux and Mac OS/X
65+
## Building on Linux and macOS
6666

6767
Linux: Osmium is developed on Linux and tested best on that system. Debian
6868
Jessie (testing) and current Ubuntu systems come with everything needed for

faq.html

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ <h2 id="building">▶ Building</h2>
2323
<h3>Which operating systems are supported?</h3>
2424

2525
<p>Libosmium and other related software on this site is developed on Linux
26-
and works well there. With tiny exceptions everything also works on Mac OS/X
26+
and works well there. With tiny exceptions everything also works on macOS
2727
out of the box. Most software also works on Windows. A CMake configuration
2828
which should work on all operating systems is supplied for all projects.</p>
2929

@@ -96,9 +96,11 @@ <h3>Wait, I am confused! Is Osmium a library or a program or what?</h3>
9696

9797
<h3>I don't want to program in C++. Can I use Osmium from other languages?</h3>
9898

99-
<p>Yes. There is the <a href="/node-osmium/">Node Osmium</a> NodeJS module for
100-
Javascript developers (written by Dane Springmeyer and Jochen Topf) and the
101-
<a href="/pyosmium/">PyOsmium</a> Python module (written by Sarah Hoffmann).
99+
<p>Yes. There is the <a href="/pyosmium/">PyOsmium</a> Python module (written
100+
by Sarah Hoffmann). There is also a now unsupported <a
101+
href="/node-osmium/">Node Osmium</a> NodeJS module for Javascript developers
102+
(written by Dane Springmeyer and Jochen Topf) and
103+
102104
Not all functionality available from C++ is available through those
103105
modules and you'll take a performance hit, but they are much easier to use
104106
for the average programmer.</p>

js/jquery-3.6.0.min.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

libosmium/index.html

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ <h2>Features</h2>
1414

1515
<p>The Osmium Library has extensive support for all types of OSM entities:
1616
nodes, ways, relations, and changesets. It allows reading from and writing to
17-
OSM files in XML and PBF formats, including change files and full history
18-
files. Osmium can store OSM data in memory and on disk in various formats and
19-
using various indexes. Its easy to use <i>handler</i> interface allows you to
20-
quickly write data filtering and conversion functions. Osmium can create WKT,
21-
WKB, OGR, GEOS and GeoJSON geometries for easy conversion into many GIS
22-
formats and it can assemble multipolygons from ways and relations.</p>
17+
OSM files in XML, PBF, and several other formats, including change files and
18+
full history files. Osmium can store OSM data in memory and on disk in various
19+
formats and using various indexes. Its easy to use <i>handler</i> interface
20+
allows you to quickly write data filtering and conversion functions. Osmium can
21+
create WKT, WKB, OGR, GEOS and GeoJSON geometries for easy conversion into many
22+
GIS formats and it can assemble multipolygons from ways and relations.</p>
2323

2424

2525
<h2>Code</h2>
@@ -34,19 +34,26 @@ <h2>Documentation</h2>
3434
<a href="https://github.com/osmcode/libosmium/blob/master/README.md">README</a>.
3535
For more detailed information look at the <a href="manual.html">manual</a>.</p>
3636

37+
<p>The reference documentation contains all the details. It is available for
38+
several versions:</p>
39+
40+
<ul id="source-code-reference">
41+
<li><a target="_blank" href="https://docs.osmcode.org/libosmium/latest/">latest</a> (latest released version)</li>
42+
<li><a target="_blank" href="https://docs.osmcode.org/libosmium/master/">master</a> (development version)</li>
43+
</ul>
3744

3845
<h2>Download</h2>
3946

4047
<p>Current and past releases can be downloaded from
4148
<a href="https://github.com/osmcode/libosmium/releases">GitHub</a>.</p>
4249

43-
<p>Packages are available for several Linux distributions and OS/X:</p>
50+
<p>Packages are available for several Linux distributions and macOS:</p>
4451

4552
<ul>
46-
<li><a href="https://packages.debian.org/source/sid/libosmium">Debian</a> (including backports)</li>
53+
<li><a href="https://packages.debian.org/source/libosmium">Debian/Ubuntu</a> (including Debian backports)</li>
4754
<li><a href="https://src.fedoraproject.org/rpms/libosmium">Fedora</a></li>
4855
<li><a href="https://aur.archlinux.org/packages/libosmium/">Archlinux</a></li>
49-
<li><a href="https://formulae.brew.sh/formula/libosmium">OS/X (Homebrew)</a></li>
56+
<li><a href="https://formulae.brew.sh/formula/libosmium">macOS (Homebrew)</a></li>
5057
</ul>
5158

5259
<a href="https://repology.org/project/libosmium/versions"><img src="https://repology.org/badge/tiny-repos/libosmium.svg" alt="Packaging status"/></a>
@@ -56,10 +63,3 @@ <h2>License</h2>
5663
<p>The Osmium Library is available under the very liberal
5764
<a href="https://www.boost.org/LICENSE_1_0.txt">Boost Software License</a>.</p>
5865

59-
60-
<h2>The "Old" Osmium</h2>
61-
62-
<p>An old version of the Osmium library has been around for years, but it is
63-
now in maintainance mode, ie no new features will be added. You can find it
64-
at <a href="https://github.com/joto/osmium">github.com/joto/osmium</a>.</p>
65-

osmcoastline/index.html

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,14 @@ <h2>Download</h2>
4545
<p>Current and past releases can be downloaded from
4646
<a href="https://github.com/osmcode/osmcoastline/releases">Github</a>.</p>
4747

48-
<p>Packages are available for various Debian versions.</p>
48+
<p>Packages are available for several Linux distributions and macOS:</p>
4949

50+
<ul>
51+
<li><a href="https://packages.debian.org/source/osmcoastline">Debian/Ubuntu</a> (including backports)</li>
52+
<li><a href="https://formulae.brew.sh/formula/osmcoastline">macOS (Homebrew)</a></li>
53+
</ul>
54+
55+
<a href="https://repology.org/project/osmcoastline/versions"><img src="https://repology.org/badge/tiny-repos/osmcoastline.svg" alt="Packaging status"/></a>
5056

5157
<h2>License</h2>
5258

osmium-tool/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@ <h2>Download</h2>
5959
<p>Current and past releases can be downloaded from
6060
<a href="https://github.com/osmcode/osmium-tool/releases">GitHub</a>.</p>
6161

62-
<p>Packages are available for several Linux distributions and OS/X:</p>
62+
<p>Packages are available for several Linux distributions and macOS:</p>
6363

6464
<ul>
65-
<li><a href="https://packages.debian.org/source/sid/osmium-tool">Debian</a> (including backports)</li>
65+
<li><a href="https://packages.debian.org/source/osmium-tool">Debian/Ubuntu</a> (including backports)</li>
6666
<li><a href="https://src.fedoraproject.org/rpms/osmium-tool">Fedora</a></li>
67-
<li><a href="https://formulae.brew.sh/formula/osmium-tool">OS/X (Homebrew)</a></li>
67+
<li><a href="https://formulae.brew.sh/formula/osmium-tool">macOS (Homebrew)</a></li>
6868
</ul>
6969

7070
<a href="https://repology.org/project/osmium-tool/versions"><img src="https://repology.org/badge/tiny-repos/osmium-tool.svg" alt="Packaging status"/></a>

pyosmium/index.html

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,16 @@ <h2>Download</h2>
4141
<p>Current and past releases can be downloaded from
4242
<a href="https://github.com/osmcode/pyosmium/releases">Github</a>.</p>
4343

44+
<p>Packages are available for several Linux distributions:</p>
4445
<p>Packages are available for
45-
<a href="https://packages.debian.org/source/sid/pyosmium">Debian Sid</a>
46-
(also available in
47-
<a href="https://packages.debian.org/source/jessie-backports/pyosmium">Jessie
48-
backports</a>),
49-
<a href="https://src.fedoraproject.org/rpms/pyosmium">Fedora</a> and
50-
<a href="https://aur.archlinux.org/packages/pyosmium/">Archlinux</a>.
5146

47+
<ul>
48+
<li><a href="https://packages.debian.org/source/pyosmium">Debian/Ubuntu</a> (including Debian backports)</li>
49+
<li><a href="https://src.fedoraproject.org/rpms/pyosmium">Fedora</a></li>
50+
<li><a href="https://aur.archlinux.org/packages/pyosmium/">Archlinux</a></li>
51+
</ul>
52+
53+
<a href="https://repology.org/project/pyosmium/versions"><img src="https://repology.org/badge/tiny-repos/pyosmium.svg" alt="Packaging status"/></a>
5254

5355
<h2>License</h2>
5456

0 commit comments

Comments
 (0)