Skip to content

Commit dcf753c

Browse files
committed
Remove spaten output format
Unfortunately the format never went anywhere. Fixes #176
1 parent a1368e8 commit dcf753c

File tree

8 files changed

+3
-373
lines changed

8 files changed

+3
-373
lines changed

CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,6 @@ set(OSMIUM_SOURCE_FILES
260260
option_clean.cpp
261261
export/export_format_json.cpp
262262
export/export_format_pg.cpp
263-
export/export_format_spaten.cpp
264263
export/export_format_text.cpp
265264
export/export_handler.cpp
266265
extract/extract_bbox.cpp

man/osmium-export.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,6 @@ files created with JOSM).
108108
is calculated from the original ID, for ways it is twice the original ID,
109109
for relations it is twice the original ID plus one.
110110
If the input file has negative IDs, this can create IDs such as 'w-12'.
111-
In spaten exports the ID is written into the @fid field. For *counter* the
112-
value will be an integer, for *type_id* it will be a string.
113111

114112
-x, \--format-option=OPTION(=VALUE)
115113
: Set an output format option. The options available depend on the output
@@ -317,7 +315,6 @@ The following output formats are supported:
317315
for id and attributes. You have to create the table manually, then use the
318316
PostgreSQL COPY command to import the data. Enable verbose output to see
319317
the SQL commands needed to create the table and load the data.
320-
* `spaten`: Spaten, a binary format that is suitable for large data sets.
321318
* `text` (alias: `txt`): A simple text format with the geometry in WKT format
322319
followed by the comma-delimited tags. This is mainly intended for debugging
323320
at the moment. THE FORMAT MIGHT CHANGE WITHOUT NOTICE!
@@ -374,4 +371,3 @@ Use a config file and export into GeoJSON Text Sequence format:
374371
* [RFC7946](https://tools.ietf.org/html/rfc7946)
375372
* [RFC8142](https://tools.ietf.org/html/rfc8142)
376373
* [Line delimited JSON](https://en.wikipedia.org/wiki/JSON_Streaming#Line_delimited_JSON)
377-
* [Spaten Geo Format](https://thomas.skowron.eu/spaten/)

src/command_export.cpp

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
2727

2828
#include "export/export_format_json.hpp"
2929
#include "export/export_format_pg.hpp"
30-
#include "export/export_format_spaten.hpp"
3130
#include "export/export_format_text.hpp"
3231
#include "export/export_handler.hpp"
3332

@@ -350,9 +349,8 @@ bool CommandExport::setup(const std::vector<std::string>& arguments) {
350349
if (m_output_format != "geojson" &&
351350
m_output_format != "geojsonseq" &&
352351
m_output_format != "pg" &&
353-
m_output_format != "text" &&
354-
m_output_format != "spaten") {
355-
throw argument_error{"Set output format with --output-format or -f to 'geojson', 'geojsonseq', 'pg', 'spaten', or 'text'."};
352+
m_output_format != "text") {
353+
throw argument_error{"Set output format with --output-format or -f to 'geojson', 'geojsonseq', 'pg', or 'text'."};
356354
}
357355

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

544-
if (output_format == "spaten") {
545-
return std::make_unique<ExportFormatSpaten>(output_format, output_filename, overwrite, fsync, options);
546-
}
547-
548542
throw argument_error{"Unknown output format"};
549543
}
550544

src/export/export_format_spaten.cpp

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

0 commit comments

Comments
 (0)