From 18f2cb548f29ae0df6ec8b98911fbc2aebbfc2e3 Mon Sep 17 00:00:00 2001
From: Arndt Brenschede <Arndt.Brenschede@web.de>
Date: Mon, 3 Jul 2023 08:24:42 +0200
Subject: [PATCH] changed db-tag-processing to csv-file

---
 .../src/main/java/btools/mapcreator/OsmCutter.java          | 4 ++--
 .../src/main/java/btools/mapcreator/OsmFastCutter.java      | 6 +++---
 .../src/test/java/btools/mapcreator/MapcreatorTest.java     | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/brouter-map-creator/src/main/java/btools/mapcreator/OsmCutter.java b/brouter-map-creator/src/main/java/btools/mapcreator/OsmCutter.java
index 6a935f7..26de826 100644
--- a/brouter-map-creator/src/main/java/btools/mapcreator/OsmCutter.java
+++ b/brouter-map-creator/src/main/java/btools/mapcreator/OsmCutter.java
@@ -112,8 +112,8 @@ public class OsmCutter extends MapCreatorBase {
     return "records read: " + recordCnt + " nodes=" + nodesParsed + " ways=" + waysParsed + " rels=" + relsParsed + " changesets=" + changesetsParsed;
   }
 
-  public void setJdbcUrl(String url) {
-    dbPseudoTagProvider = new DatabasePseudoTagProvider(url);
+  public void setDbTagFilename(String filename) {
+    dbPseudoTagProvider = new DatabasePseudoTagProvider(filename);
   }
 
   @Override
diff --git a/brouter-map-creator/src/main/java/btools/mapcreator/OsmFastCutter.java b/brouter-map-creator/src/main/java/btools/mapcreator/OsmFastCutter.java
index 364b3d0..cf843ca 100644
--- a/brouter-map-creator/src/main/java/btools/mapcreator/OsmFastCutter.java
+++ b/brouter-map-creator/src/main/java/btools/mapcreator/OsmFastCutter.java
@@ -13,7 +13,7 @@ public class OsmFastCutter extends MapCreatorBase {
   public static void main(String[] args) throws Exception {
     System.out.println("*** OsmFastCutter: cut an osm map in node-tiles + way-tiles");
     if (args.length != 11 && args.length != 12 && args.length != 13) {
-      String common = "java OsmFastCutter <lookup-file> <node-dir> <way-dir> <node55-dir> <way55-dir> <border-file> <out-rel-file> <out-res-file> <filter-profile> <report-profile> <check-profile> <map-file> [jdbc-url]";
+      String common = "java OsmFastCutter <lookup-file> <node-dir> <way-dir> <node55-dir> <way55-dir> <border-file> <out-rel-file> <out-res-file> <filter-profile> <report-profile> <check-profile> <map-file> [db-tag-filename]";
 
       System.out.println("usage: bzip2 -dc <map> | " + common);
       System.out.println("or   : " + common + " <inputfile> ");
@@ -37,10 +37,10 @@ public class OsmFastCutter extends MapCreatorBase {
     );
   }
 
-  public static void doCut(File lookupFile, File nodeDir, File wayDir, File node55Dir, File way55Dir, File borderFile, File relFile, File resFile, File profileAll, File profileReport, File profileCheck, File mapFile, String jdbcurl) throws Exception {
+  public static void doCut(File lookupFile, File nodeDir, File wayDir, File node55Dir, File way55Dir, File borderFile, File relFile, File resFile, File profileAll, File profileReport, File profileCheck, File mapFile, String dbTagFilename) throws Exception {
     // **** run OsmCutter ****
     OsmCutter cutter = new OsmCutter();
-    if (jdbcurl != null) cutter.setJdbcUrl(jdbcurl);
+    if (dbTagFilename != null) cutter.setDbTagFilename(dbTagFilename);
 
     // ... inject WayCutter
     cutter.wayCutter = new WayCutter();
diff --git a/brouter-map-creator/src/test/java/btools/mapcreator/MapcreatorTest.java b/brouter-map-creator/src/test/java/btools/mapcreator/MapcreatorTest.java
index 0eae595..beb4cbd 100644
--- a/brouter-map-creator/src/test/java/btools/mapcreator/MapcreatorTest.java
+++ b/brouter-map-creator/src/test/java/btools/mapcreator/MapcreatorTest.java
@@ -35,7 +35,7 @@ public class MapcreatorTest {
     File profileCheck = new File(profileDir, "softaccess.brf");
     File borderFile = new File(tmpdir, "bordernids.dat");
 
-    new OsmFastCutter().doCut(lookupFile, nodes, ways, nodes55, ways55, borderFile, relFile, resFile, profileAll, profileReport, profileCheck, mapFile, null);
+    OsmFastCutter.doCut(lookupFile, nodes, ways, nodes55, ways55, borderFile, relFile, resFile, profileAll, profileReport, profileCheck, mapFile, null);
 
 
     // run PosUnifier