From 65db6530db9a4d6bc0df93f89d9a7f2cfe69cd20 Mon Sep 17 00:00:00 2001 From: Thomas Lake Date: Fri, 16 Sep 2011 14:39:41 +0100 Subject: [PATCH 1/2] Update findSigns.py to support north direction. Closes Issue #485 --- contrib/findSigns.py | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/contrib/findSigns.py b/contrib/findSigns.py index a344c71..44dcd49 100644 --- a/contrib/findSigns.py +++ b/contrib/findSigns.py @@ -10,7 +10,14 @@ is either out-of-date or non-existant. To run, simply give a path to your world directory and the path to your output directory. For example: - python contrib/findSigns.py ../world.test/ output_dir/ + python contrib/findSigns.py ../world.test/ output_dir/ + +An optional north direction may be specified as follows: + + python contrib/findSigns.py ../world.test/ output_dir/ lower-right + +Valid options are upper-left, upper-right, lower-left and lower-right. +If no direction is specified, lower-left is assumed Once that is done, simply re-run the overviewer to generate markers.js: @@ -26,9 +33,23 @@ sys.path.append(".") from overviewer_core import nbt from pprint import pprint - +if len(sys.argv) < 3: + sys.exit("Usage: %s [north_direction]" % sys.argv[0]) + worlddir = sys.argv[1] outputdir = sys.argv[2] + +directions=["upper-left","upper-right","lower-left","lower-right"] +if len(sys.argv) < 4: + print "No north direction specified - assuming lower-left" + north_direction="lower-left" +else: + north_direction=sys.argv[3] + +if (north_direction not in directions): + print north_direction, " is not a valid direction" + sys.exit("Bad north-direction") + if os.path.exists(worlddir): print "Scanning chunks in ", worlddir else: @@ -48,7 +69,7 @@ for dirpath, dirnames, filenames in os.walk(worlddir): if matcher.match(f): print f full = os.path.join(dirpath, f) - r = nbt.load_region(full) + r = nbt.load_region(full,north_direction) chunks = r.get_chunks() for x,y in chunks: chunk = r.load_chunk(x,y).read_all() From 49b810b84b0f9caba8a754aa1b0b4e2e8e753503 Mon Sep 17 00:00:00 2001 From: Thomas Lake Date: Fri, 16 Sep 2011 15:07:04 +0100 Subject: [PATCH 2/2] Store supplied north direction in generated overviewer.dat --- contrib/findSigns.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/findSigns.py b/contrib/findSigns.py index 44dcd49..cab1617 100644 --- a/contrib/findSigns.py +++ b/contrib/findSigns.py @@ -97,5 +97,5 @@ if os.path.isfile(os.path.join(worlddir, "overviewer.dat")): pickleFile = os.path.join(outputdir,"overviewer.dat") with open(pickleFile,"wb") as f: - cPickle.dump(dict(POI=POI), f) + cPickle.dump(dict(POI=POI,north_direction=north_direction), f)