Skip to content

Commit

Permalink
Remove spaten output format
Browse files Browse the repository at this point in the history
Unfortunately the format never went anywhere.

Fixes #176
  • Loading branch information
joto committed Dec 17, 2024
1 parent a1368e8 commit dcf753c
Show file tree
Hide file tree
Showing 8 changed files with 3 additions and 373 deletions.
1 change: 0 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,6 @@ set(OSMIUM_SOURCE_FILES
option_clean.cpp
export/export_format_json.cpp
export/export_format_pg.cpp
export/export_format_spaten.cpp
export/export_format_text.cpp
export/export_handler.cpp
extract/extract_bbox.cpp
Expand Down
4 changes: 0 additions & 4 deletions man/osmium-export.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,6 @@ files created with JOSM).
is calculated from the original ID, for ways it is twice the original ID,
for relations it is twice the original ID plus one.
If the input file has negative IDs, this can create IDs such as 'w-12'.
In spaten exports the ID is written into the @fid field. For *counter* the
value will be an integer, for *type_id* it will be a string.

-x, \--format-option=OPTION(=VALUE)
: Set an output format option. The options available depend on the output
Expand Down Expand Up @@ -317,7 +315,6 @@ The following output formats are supported:
for id and attributes. You have to create the table manually, then use the
PostgreSQL COPY command to import the data. Enable verbose output to see
the SQL commands needed to create the table and load the data.
* `spaten`: Spaten, a binary format that is suitable for large data sets.
* `text` (alias: `txt`): A simple text format with the geometry in WKT format
followed by the comma-delimited tags. This is mainly intended for debugging
at the moment. THE FORMAT MIGHT CHANGE WITHOUT NOTICE!
Expand Down Expand Up @@ -374,4 +371,3 @@ Use a config file and export into GeoJSON Text Sequence format:
* [RFC7946](https://tools.ietf.org/html/rfc7946)
* [RFC8142](https://tools.ietf.org/html/rfc8142)
* [Line delimited JSON](https://en.wikipedia.org/wiki/JSON_Streaming#Line_delimited_JSON)
* [Spaten Geo Format](https://thomas.skowron.eu/spaten/)
10 changes: 2 additions & 8 deletions src/command_export.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.

#include "export/export_format_json.hpp"
#include "export/export_format_pg.hpp"
#include "export/export_format_spaten.hpp"
#include "export/export_format_text.hpp"
#include "export/export_handler.hpp"

Expand Down Expand Up @@ -350,9 +349,8 @@ bool CommandExport::setup(const std::vector<std::string>& arguments) {
if (m_output_format != "geojson" &&
m_output_format != "geojsonseq" &&
m_output_format != "pg" &&
m_output_format != "text" &&
m_output_format != "spaten") {
throw argument_error{"Set output format with --output-format or -f to 'geojson', 'geojsonseq', 'pg', 'spaten', or 'text'."};
m_output_format != "text") {
throw argument_error{"Set output format with --output-format or -f to 'geojson', 'geojsonseq', 'pg', or 'text'."};
}

// Set defaults for output format options depending on output format
Expand Down Expand Up @@ -541,10 +539,6 @@ std::unique_ptr<ExportFormat> create_handler(const std::string& output_format,
return std::make_unique<ExportFormatText>(output_format, output_filename, overwrite, fsync, options);
}

if (output_format == "spaten") {
return std::make_unique<ExportFormatSpaten>(output_format, output_filename, overwrite, fsync, options);
}

throw argument_error{"Unknown output format"};
}

Expand Down
256 changes: 0 additions & 256 deletions src/export/export_format_spaten.cpp

This file was deleted.

Loading

0 comments on commit dcf753c

Please sign in to comment.