Delete mappings

main.py → __init__.py

@@ -5,13 +5,14 @@
 app = Flask(__name__)
 app.config['SQLALCHEMY_DATABASE_URI'] = 'postgresql://postgres:test@localhost/immp'
 app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = True;
+app.config['MAX_CONTENT_LENGTH'] = 100 * 1024 * 1024  # 100MB limit
 db = SQLAlchemy(app)
 
 # Database schema
 class Maps(db.Model):
 	id = db.Column(db.Integer(), primary_key=True)
 	url = db.Column(db.String(512), unique=True)
-	csv = db.Column(db.String())
+	csv = db.Column(db.Text())
 	mapping = db.Column(db.String())
 
 	def __init__(self, url):
@@ -41,10 +42,10 @@ def postmap():
 	return redirect('/map/id='+str(map.id))
 
 
-@app.route('/postcsv')
+@app.route('/postcsv', methods=['POST'])
 def postcsv():
-	id = request.args.get('mapID', 0, type=int)
-	csv = request.args.get('csv')
+	id = request.json['mapID']
+	csv = request.json['csv']
 	map = Maps.query.filter_by(id=id).first()
 	map.csv = csv
 	db.session.commit()

static/js/create_map.js

@@ -1,21 +1,56 @@
 // createMode indicates if we are or are not in create mode
 var createMode = false;
-var x;
-var y;
+var deleteMode = false;
+
+/** Coordinates of last point clicked on image. */
+var x, y;
+
+/** data store for tagged features/rows */
 var ids = [];
 
-function mapData(x, y, id){
+function insertAndMapData(x, y, id){
+    $('#cancelTag').hide();
     console.log("Mapping id: " + id + " to coordinates " + x + "," + y);
     if (id == " " || x == null){
         console.log("Invalid ID");
+        alert("ID is not valid.");
+        return;
+    }
+    if(ids[id]){
+        console.log("Data already mapped");
         return;
     }
     ids[id] = x + "," + y; // adds to ID array
+    mapData(x,y,id);
+}
+
+//////
+/*var a = jQuery('<area/>', { 'shape': "circle", 'id': id, 'data-name': "1,all", 'coords': x + "," + y + ",10", 'href': "#" });
+
+var a = $('<area />', {
+    'shape': 'circle',
+    'id': '1',
+    'da'
+})
+a['shape'] = 'circle';
+a['id'] = '1';
+a['data-name'] = '1,all';
+a['coords'] = '191,81,10';
+a['href'] = '#';
+$(".mapper-map").append(a);
+*/
+
+//////
+
+function mapData(x,y,id){
     var mapHTML = "<area shape=\"circle\" ";
     mapHTML += "id=\"" + id + "\" ";
     mapHTML += "data-name=\"" + id + ",all\" ";
     mapHTML += "coords=\"" + x + "," + y + ",10\" href=\"#\">";
     $(".mapper-map").append(mapHTML);
+
+    if(!deleteMode)
+        $('#tagged' + id).show();
 
     map = $('#mapper');
     map.mapster('unbind')
@@ -26,28 +61,62 @@ function mapData(x, y, id){
                 .mapster('set', true, 'all')
                 .mapster('set_options', single_opts);
         }
-    }).bind('mouseout', function () {
-        if (!inArea) {
-            map.mapster('set', false, 'all');
-        }
     });
 }
 
+function unmapData(id){
+    var mapHTML;
+    console.log("Delete tag for id: " + id + " from coords " + ids[id]);
+    if (id === ""){
+        console.log("Invalid ID");
+        return;
+    }
+
+    $('#deleteTag' + id).hide();
+
+    delete ids[id];
+
+    $(".mapper-map").empty(); //clear html ?
+
+    map = $('#mapper');
+    map.mapster('unbind')
+
+    for (var row in ids){
+        console.log(row + " " + ids[row]);
+        if(ids[row]){
+            var coords = ids[row].split(',');
+            console.log(coords[0] + "," + coords[1]);
+            mapData(coords[0],coords[1],row);
+        }
+    }
+}
+
+
+/**
+ * gets called from map.html document ready function if
+ * data already exists for map
+ */
 function build_mappings(mappingsString){
     var maps = mappingsString.split('\n');
     for(var i = 0; i < maps.length - 1; i++){
         to_map = maps[i].split(',');
-        mapData(to_map[1],to_map[2],to_map[0]);
+        insertAndMapData(to_map[1],to_map[2],to_map[0]);
     }
-
 }
 
+/**
+ * onClick handler which is attached to the rows after clicking on image
+ * 
+ * 
+ */
 function dataClick(id){
-    if(createMode){
-        mapData(x,y,id);
+    if (createMode) {
+        insertAndMapData(x,y,id);
     }
     createMode = false;
+
+    // use toggle class, elements same as line 120 in csv.js @ 1111c0a373f706c7a6e0d8aa46d3a06258ea7a27
     $('.unlinked').removeClass("unlinked");
     $('.linked').removeClass("linked");
     $('.greyOut').removeClass("greyOut");
-}
+}