add --tag_transform to set an arbitrary tag-transform file

Use the same logic as with --tag_wahoo_xml

Author: dhewg

tests/test_osm_maps.py

@@ -21,6 +21,7 @@ class TestOsmMaps(unittest.TestCase):
 
     def setUp(self):
         self.tags_to_keep = os.path.join(constants.RESOURCES_DIR, 'tags-to-keep.json')
+        self.tag_transform = os.path.join(constants.RESOURCES_DIR, 'tunnel-transform.xml')
 
 class TestOsmMapsCalculation(TestOsmMaps):
     """
@@ -193,7 +194,7 @@ def test_folder_name_many_countries(self):
         """
         o_osm_data = self.get_osm_data_instance('albania,alps,andorra,austria,azores,belarus,belgium,bosnia-herzegovina,britain-and-ireland,bulgaria,croatia,cyprus,czech-republic,dach,denmark,estonia,faroe-islands,finland,france,georgia,germany,great-britain,greece,guernsey-jersey,hungary,iceland,ireland-and-northern-ireland,isle-of-man,italy,kosovo,latvia,liechtenstein,lithuania,luxembourg,macedonia,malta,moldova,monaco,montenegro,netherlands,norway,poland,portugal,romania,serbia,slovakia,slovenia,spain,sweden,switzerland,turkey,ukraine')
 
-        o_osm_maps = OsmMaps(o_osm_data, self.tags_to_keep)
+        o_osm_maps = OsmMaps(o_osm_data, self.tags_to_keep, self.tag_transform)
         folder_name = o_osm_maps.calculate_folder_name('.map.lzma')
         folder_name_maps = o_osm_maps.calculate_folder_name('.map')
 
@@ -247,7 +248,7 @@ def test_version_and_tags_of_country_config_file(self):
         # download files marked for download to fill up map_file per country to write to config
         o_downloader.download_files_if_needed()
 
-        o_osm_maps = OsmMaps(o_osm_data, self.tags_to_keep)
+        o_osm_maps = OsmMaps(o_osm_data, self.tags_to_keep, self.tag_transform)
 
         o_osm_maps.write_country_config_file(o_input_data.country)
 

wahoomc/input.py

@@ -83,6 +83,9 @@ def process_call_of_the_tool():
     # specify the file with tags to keep when filtering
     options_args.add_argument('--tags_to_keep', default=InputData().tags_to_keep,
                               help="file with tags to keep when filtering")
+    # specify the file with tag-transform rules
+    options_args.add_argument('--tag_transform', default=InputData().tag_transform,
+                              help="file with tag-transform rules")
     # specify the file with tags to keep in the output
     options_args.add_argument('-tag', '--tag_wahoo_xml', default=InputData().tag_wahoo_xml,
                               help="file with tags to keep in the output")
@@ -120,6 +123,7 @@ def process_call_of_the_tool():
     o_input_data.force_processing = args.forceprocessing
 
     o_input_data.tags_to_keep = args.tags_to_keep
+    o_input_data.tag_transform = args.tag_transform
     o_input_data.tag_wahoo_xml = args.tag_wahoo_xml
     o_input_data.save_cruiser = args.cruiser
     o_input_data.zip_folder = args.zip
@@ -201,6 +205,7 @@ def __init__(self):
         self.use_srtm1 = False
 
         self.tags_to_keep = "tags-to-keep.json"
+        self.tag_transform = "tunnel-transform.xml"
         self.tag_wahoo_xml = "tag-wahoo-poi.xml"
         self.zip_folder = False
         self.save_cruiser = False
@@ -239,6 +244,15 @@ def is_required_input_given_or_exit(self):
         if not os.path.exists(self.tags_to_keep):
             sys.exit(f'The tags-to-keep json file was not found: \"{self.tags_to_keep}\"')
 
+        if not os.path.exists(self.tag_transform):
+            for path in get_absolute_dir_user_or_repo("", self.tag_transform):
+                if os.path.exists(path):
+                    self.tag_transform = path
+                    break
+
+        if not os.path.exists(self.tag_transform):
+            sys.exit(f'The tag-transform xml file was not found: \"{self.tag_transform}\"')
+
         if not os.path.exists(self.tag_wahoo_xml):
             for path in get_absolute_dir_user_or_repo("tag_wahoo_adjusted", self.tag_wahoo_xml):
                 if os.path.exists(path):

wahoomc/main.py

@@ -63,6 +63,7 @@ def run(run_level):
 
         log.info('# Used configuration')
         log.info('+ tags-to-keep file: %s', o_input_data.tags_to_keep)
+        log.info('+ tag-transform file: %s', o_input_data.tag_transform)
         log.info('+ map-writer tag-conf file: %s', o_input_data.tag_wahoo_xml)
 
         if o_input_data.country:
@@ -78,7 +79,7 @@ def run(run_level):
         # Download files marked for download
         o_downloader.download_files_if_needed()
 
-        o_osm_maps = OsmMaps(o_osm_data, o_input_data.tags_to_keep)
+        o_osm_maps = OsmMaps(o_osm_data, o_input_data.tags_to_keep, o_input_data.tag_transform)
 
         # Filter tags from country osm.pbf files'
         o_osm_maps.filter_tags_from_country_osm_pbf_files()

wahoomc/osm_maps_functions.py

@@ -77,9 +77,10 @@ class OsmMaps:
     # Number of workers for the Osmosis read binary fast function
     workers = '1'
 
-    def __init__(self, o_osm_data, tags_to_keep):
+    def __init__(self, o_osm_data, tags_to_keep, tag_transform):
         self.o_osm_data = o_osm_data
         self.tags_to_keep = tags_to_keep
+        self.tag_transform = tag_transform
         self.osmconvert_path = get_tooling_win_path('osmconvert')
 
         create_empty_directories(
@@ -490,8 +491,7 @@ def merge_splitted_tiles_with_land_and_sea(self, process_border_countries, conto
 
             cmd.extend(
                 ['--rx', 'file='+os.path.join(out_tile_dir, 'sea.osm'), '--s', '--m'])
-            cmd.extend(['--tag-transform', 'file=' + os.path.join(RESOURCES_DIR,
-                                                                  'tunnel-transform.xml'), '--wb', out_file_merged, 'omitmetadata=true'])
+            cmd.extend(['--tag-transform', 'file=' + self.tag_transform, '--wb', out_file_merged, 'omitmetadata=true'])
 
             run_subprocess_and_log_output(
                 cmd, f'! Error in Osmosis with tile: {tile["x"]},{tile["y"]}')