Merge branch 'master' of https://github.com/iccaving/migovec-survey-data

tr1813 · Jan 26, 2021 · 83d2f76 · 83d2f76
2 parents bae499f + 31da2f6
commit 83d2f76
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 7 deletions.
diff --git a/docs/static/css/cmunbxo.otf b/docs/static/css/cmunbxo.otf
diff --git a/docs/static/css/cmunsi.otf b/docs/static/css/cmunsi.otf
diff --git a/docs/static/css/cmunss.otf b/docs/static/css/cmunss.otf
diff --git a/docs/static/css/cmunsx.otf b/docs/static/css/cmunsx.otf
diff --git a/docs/static/css/survey.css b/docs/static/css/survey.css
@@ -1,8 +1,33 @@
+@font-face {
+  font-family: "Computer Modern";
+  src: url("cmunss.otf");
+}
+@font-face {
+  font-family: "Computer Modern";
+  src: url("cmunsx.otf");
+  font-weight: bold;
+}
+@font-face {
+  font-family: "Computer Modern";
+  src: url("cmunsi.otf");
+  font-style: italic, oblique;
+}
+@font-face {
+  font-family: "Computer Modern";
+  src: url("cmunbxo.otf");
+  font-weight: bold;
+  font-style: italic, oblique;
+}
+
 html,
 body {
   padding: 0;
   margin: 0;
-  font-family: sans-serif;
+  font-family: "Computer Modern", sans-serif;
+}
+
+text {
+  font-family: "Computer Modern", sans-serif;
 }
 
 #svg {

diff --git a/docs/static/html/caveview.html b/docs/static/html/caveview.html
@@ -1,6 +1,7 @@
 <html>
   <head>
     <title>Cave View - Imperial College Caving Club</title>
+    <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="author" content="ICCC" />
     <meta name="theme-color" content="#2D2D2D" />

diff --git a/docs/static/html/survey.html b/docs/static/html/survey.html
@@ -13,6 +13,7 @@
     <script src="../js/inject.js"></script>
     <script src="../js/svg.js"></script>
     <link rel="stylesheet" type="text/css" href="../css/survey.css" />
+    <meta charset="UTF-8" />
   </head>
   <body>
     <div id="loading">

diff --git a/scripts/create_2d.py b/scripts/create_2d.py
@@ -66,13 +66,20 @@
 lines = []
 with open(join(tmpdir, "xvi.xvi"), "r", encoding="utf-8") as f:
     xvi_lines = f.readlines()
-    # Extract all the stationss
+    # Extract all the stations
     for line in xvi_lines:
-        match = re.search("{\s*(-?\d+\.\d+)\s*(-?\d+\.\d+)\s*(\S+)\s*}", line)
+        match = re.search("{\s*(-?\d+\.\d+)\s*(-?\d+\.\d+)\s([^@]+)@([^\s}]*)\s*}", line)
         if match:
             x = match.groups()[0]
             y = match.groups()[1]
-            station = match.groups()[2]
+            station_number = match.groups()[2]
+            namespace = match.groups()[3]
+            namespace_array = namespace.split(".")
+            print(namespace)
+            station = station_number
+            if len(namespace_array) > 1:
+                station = "{}@{}".format(station_number, ".".join(namespace_array[0:-1]))
+
             stations["{}.{}".format(x, y)] = [x, y, station]
 
     # Extract all the lines

diff --git a/scripts/create_system_stats.py b/scripts/create_system_stats.py
@@ -94,12 +94,11 @@ def get_drawn_length(survey):
             else:
                 json_data[system][projection]["percent"] = 100
     if not proj_is_drawn["plan"]:
-        need_plan.append(source.name)
+        need_plan.append(".".join(source.id))
     if not proj_is_drawn["extended"]:
-        need_extended.append(source.name)
+        need_extended.append(".".join(source.id))
 
 for system in systems:
-    print(system)
     file_path = loader.get_survey_by_id(system).file_path
     try:
         log = compile_file(survey.file_path, therion_path=args.therion_path)