diff --git a/src/mapcrafter_exporter/exporter.py b/src/mapcrafter_exporter/exporter.py index 33202f9..6e60da6 100644 --- a/src/mapcrafter_exporter/exporter.py +++ b/src/mapcrafter_exporter/exporter.py @@ -38,10 +38,24 @@ def get_list_entry(lst, name): return dings return None +def get_mapcrafter_world_name(name): + names = { + "Overworld": "verden", + "Nether": "underverden", + "The End": "enden", + } + + if name in names: + return names[name] + + raise ValueError(f"Unknown world name: {name}") + + def convert_data_to_mapcrafter_structure() -> list: result = [] for world_name, world_marker_sets in WORLDS.items(): + mapc_world_name = get_mapcrafter_world_name(world_name) for marker_set in world_marker_sets: # https://mapcrafter.readthedocs.io/en/latest/markers.html#manually-specifying-markers id = marker_set.name.lower().replace(" ", "-") @@ -55,11 +69,11 @@ def convert_data_to_mapcrafter_structure() -> list: } result.append(result_entry) - result_entry["markers"][world_name] = [] + result_entry["markers"][mapc_world_name] = [] for marker in marker_set.markers: if isinstance(marker, Point): - result_entry["markers"][world_name].append( - {"pos": [marker.x, marker.y, marker.z], "title": marker.name} + result_entry["markers"][mapc_world_name].append( + {"pos": [marker.x, marker.z, marker.y], "title": marker.name} ) elif isinstance(marker, Track): diff --git a/src/mapcrafter_exporter/markers-template.js b/src/mapcrafter_exporter/markers-template.js index 24d6930..b38978d 100644 --- a/src/mapcrafter_exporter/markers-template.js +++ b/src/mapcrafter_exporter/markers-template.js @@ -1,4 +1,4 @@ -const MAPCRAFTER_MARKERS = [ +var MAPCRAFTER_MARKERS = [ "@EXPORTED_MARKERS@", { // @@ -56,5 +56,12 @@ const MAPCRAFTER_MARKERS = [ objekter.push(linjer); return L.layerGroup(objekter); }, + "markers" : { + "verden" : [ + { + "color" : "yellow", + }, + ], + }, }, ];