Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
move get_tooling_win_path to constants_functions
Browse files Browse the repository at this point in the history
treee111 committed Oct 1, 2022
1 parent e47b4bd commit eab0345
Showing 3 changed files with 10 additions and 10 deletions.
8 changes: 8 additions & 0 deletions wahoomc/constants_functions.py
Original file line number Diff line number Diff line change
@@ -11,6 +11,7 @@
# import custom python packages
from wahoomc import constants
from wahoomc.constants import RESOURCES_DIR
from wahoomc.constants import TOOLING_WIN_DIR

log = logging.getLogger('main-logger')

@@ -148,3 +149,10 @@ def transl_tag_value(sys_platform, separator, tag, value):
to_append = tag

return to_append


def get_tooling_win_path(path_in_tooling_win):
"""
return path to a tooling in the tooling_win directory and the given path
"""
return os.path.join(TOOLING_WIN_DIR, *path_in_tooling_win)
8 changes: 0 additions & 8 deletions wahoomc/file_directory_functions.py
Original file line number Diff line number Diff line change
@@ -14,7 +14,6 @@
import requests

# import custom python packages
from wahoomc.constants import TOOLING_WIN_DIR
from wahoomc.constants import RESOURCES_DIR

log = logging.getLogger('main-logger')
@@ -167,13 +166,6 @@ def get_filenames_of_jsons_in_folder(folder):
return json_files


def get_tooling_win_path(path_in_tooling_win):
"""
return path to a tooling in the tooling_win directory and the given path
"""
return os.path.join(TOOLING_WIN_DIR, *path_in_tooling_win)


def get_tag_wahoo_xml_path(tag_wahoo_xml):
"""
return path to tag-wahoo xml file if the file exists
4 changes: 2 additions & 2 deletions wahoomc/osm_maps_functions.py
Original file line number Diff line number Diff line change
@@ -15,10 +15,10 @@
import logging

# import custom python packages
from wahoomc.file_directory_functions import get_tooling_win_path, read_json_file, \
from wahoomc.file_directory_functions import read_json_file, \
get_folders_in_folder, get_filenames_of_jsons_in_folder, create_empty_directories, \
get_tag_wahoo_xml_path, TagWahooXmlNotFoundError
from wahoomc.constants_functions import get_path_to_static_tile_json, translate_tags_to_keep
from wahoomc.constants_functions import get_path_to_static_tile_json, translate_tags_to_keep, get_tooling_win_path

from wahoomc.constants import USER_WAHOO_MC
from wahoomc.constants import USER_OUTPUT_DIR

0 comments on commit eab0345

Please sign in to comment.