parts/server.py

@@ -212,8 +212,7 @@ def query(filter_dummy, query):
     return json.dumps(l)
 
 @app.route(baseURL+'/map/<containerID>')
-@app.route(baseURL+'/map/<containerID>/<annotate>')
+def getMap(containerID):
-def getMap(containerID, annotate=None):
     s = 'select map, overlay from containers where id = :id;'
     r = db_engine.execute(text(s), id=containerID)
     l = []
@@ -234,13 +233,6 @@ def getMap(containerID, annotate=None):
     #     width, height = pointer.size
     #     pointerLayer.paste(pointer, (x - int(width/2), y-int(height/2)))
     mapimage = Image.alpha_composite(mapImage, overlayImage)
-    if annotate=='a':
-        try:
-            annotationName = mapFile.split('.')[0] + '-annotated.' + mapFile.split('.')[1]
-            annotationImage = Image.open('maps/' + annotationName).convert("RGBA")
-            mapimage = Image.alpha_composite(mapimage, annotationImage)
-        except FileNotFoundError:
-            pass
     return serveImage(mapimage)
 
 

parts/static/script.js

@@ -23,11 +23,6 @@ function init_edit(partID) {
 	$('input[name=notes-input]').show();
 	$('table#details tr#notes td p').hide();
 
-	// make map have names of containers for this one click
-	if (!$('img#map').attr('src').endsWith('/a')){
-		$('img#map').attr('src', $('img#map').attr('src') + '/a')
-	}
-	
 	// var newButton = '<div class="round-button-left"><a href="#" onclick="save(' + partID + ')"><i class="fa fa-check" aria-hidden="true"></i></a></div>';
 	// $('.round-button-left').replaceWith(newButton);
 	$('#edit-button').html('<i class="fa fa-check" aria-hidden="true"></i>');
@@ -46,11 +41,7 @@ function new_entry() {
 	init_edit(-1);
 	overlay_in();
 	container_onchange();
-	
+
-	// make map have names of containers for this one click
-	if (!$('img#map').attr('src').endsWith('/a')){
-		$('img#map').attr('src', $('img#map').attr('src') + '/a')
-	}
 }
 
 function end_edit() {
@@ -84,7 +75,7 @@ function end_edit() {
 }
 
 function save(partID) {
-	if (!$('#location-dropdown').val() || $('#location-dropdown').val()== -1 ) {
+	if (!$('#location-dropdown').val() || ($'#location-dropdown').val()== -1 ) {
 		alert('Please select a location.');
 		return;
 	}