having name label directly coming from svg_text controller

2 files changed, 2 insertions, 10 deletions

diff --git a/lib/d2/bin/d2_svg_processor.py b/lib/d2/bin/d2_svg_processor.py
index 9c8cd70..b5bb2aa 100644
--- a/lib/d2/bin/d2_svg_processor.py
+++ b/lib/d2/bin/d2_svg_processor.py
@@ -318,7 +318,6 @@ class CreateStructureSVG(object):
 class PopulateTables(object):
 
     OUTPUT_NTWK_ID_FILENAME = 'ntwk_id.svg'
-    OUTPUT_NAME_LABEL_FILENAME = 'name_label.svg'
     OUTPUT_JSON_FILENAME = 'ntwk_number_data.json'
     TABLES = [u'forge', u'label_coordinate', u'plot']
 
@@ -801,14 +800,7 @@ class PopulateTables(object):
         with open(output_json_filepath, 'wb') as output_json_fileobj:
             output_json_fileobj.write(json.dumps(ntwk_number_data))
 
-        output_name_label_filepath = os.path.join(
-                             args.output_directory,
-                             args.project + '_' + \
-                             self.OUTPUT_NAME_LABEL_FILENAME)
-        with open(output_name_label_filepath, 'wb') as \
-                                 output_name_label_fileobj:
-            output_name_label_fileobj.write(self._get_name_label_svg())
-
+        self._get_name_label_svg()
 
 class Util(object):
 
diff --git a/templates/index.html b/templates/index.html
index 86d1bac..1085451 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -60,7 +60,7 @@
 
    var name_label = new OpenLayers.Layer.ScalableInlineXhtml(
         "Name Labels",
-        "/static/svgs/d2_name_label.svg",
+        "/svg_text/{{plots[0].map.id}}",
         ext,
         size,
         {isBaseLayer: false}