Skip to content

support json output directly from Nominatim dump, without database #954

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.

Sign up for GitHub

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

support json output directly from Nominatim dump, without database #954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 9 additions & 6 deletions src/main/java/de/komoot/photon/App.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,16 +124,19 @@ private static void startJsonDump(CommandLineArgs args) {
final var dbProps = args.getDatabaseProperties();

try {
final var connector = new NominatimImporter(args.getHost(), args.getPort(), args.getDatabase(), args.getUser(), args.getPassword(), dbProps);
dbProps.setImportDate(connector.getLastImportDate());

final String filename = args.getJsonDump();
final JsonDumper jsonDumper = new JsonDumper(filename, dbProps);
jsonDumper.writeHeader(connector.loadCountryNames(dbProps.getLanguages()));

final var importThread = new ImportThread(jsonDumper);

try {
importFromDatabase(args, importThread, dbProps);
if (args.getImportFile() == null) {
final var connector = new NominatimImporter(args.getHost(), args.getPort(), args.getDatabase(), args.getUser(), args.getPassword(), dbProps);
dbProps.setImportDate(connector.getLastImportDate());
jsonDumper.writeHeader(connector.loadCountryNames(dbProps.getLanguages()));
importFromDatabase(args, importThread, dbProps);
} else {
importFromFile(args, importThread);
}
} finally {
importThread.finish();
}
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/de/komoot/photon/json/JsonDumper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,8 @@ public void writeNominatimDocument(PhotonDoc doc) throws IOException {
writer.writeStringField(DumpFields.PLACE_OBJECT_TYPE, doc.getOsmType());
writer.writeNumberField(DumpFields.PLACE_OBJECT_ID, doc.getOsmId());

final var addressType = doc.getAddressType();
writer.writeStringField(Constants.OBJECT_TYPE, addressType == null ? "other" : addressType.getName());
writer.writeStringField(DumpFields.PLACE_OSM_KEY, doc.getTagKey());
writer.writeStringField(DumpFields.PLACE_OSM_VALUE, doc.getTagValue());
writer.writeObjectField(DumpFields.PLACE_CATEGORIES,doc.getCategories());
Expand Down
Loading