glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fixed realtime bug where couldn't populate filters because it was missing a new mapper model that just added something

Browse source
This commit is contained in:
Connor Turland 2014-09-30 18:13:49 -04:00
parent 81f31ea10e
commit eccc433627
1 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
app/assets/javascripts/src/Metamaps.js
View file

@ -1972,23 +1972,31 @@ Metamaps.Realtime = {
var socket = self.socket; var socket = self.socket;
if (Metamaps.Active.Map && self.status) { if (Metamaps.Active.Map && self.status) {
data.mapperid = Metamaps.Active.Mapper.id;
data.mapid = Metamaps.Active.Map.id; data.mapid = Metamaps.Active.Map.id;
socket.emit('newTopic', data); socket.emit('newTopic', data);
} }
}, },
newTopic: function (data) { newTopic: function (data) {
var topic, mapping, cancel; var topic, mapping, mapper, mapperCallback, cancel;
function test() { function test() {
if (topic && mapping) { if (topic && mapping && mapper) {
Metamaps.Topic.renderTopic(mapping, topic, false, false); Metamaps.Topic.renderTopic(mapping, topic, false, false);
} }
else if (!cancel) { else if (!cancel) {
setTimeout(test, 10); setTimeout(test, 10);
} }
} }
test();
mapper = Metamaps.Mappers.get(data.mapperid);
if (mapper === undefined) {
mapperCallback = function (m) {
Metamaps.Mappers.add(m);
mapper = m;
};
Metamaps.Mapper.get(data.mapperid, mapperCallback);
}
$.ajax({ $.ajax({
url: "/topics/" + data.topicid + ".json", url: "/topics/" + data.topicid + ".json",
success: function (response) { success: function (response) {
@ -2009,6 +2017,8 @@ Metamaps.Realtime = {
cancel = true; cancel = true;
} }
}); });
test();
}, },
// removeTopic // removeTopic
sendRemoveTopic: function (data) { sendRemoveTopic: function (data) {
@ -2029,6 +2039,7 @@ Metamaps.Realtime = {
var socket = self.socket; var socket = self.socket;
if (Metamaps.Active.Map && self.status) { if (Metamaps.Active.Map && self.status) {
data.mapperid = Metamaps.Active.Mapper.id;
data.mapid = Metamaps.Active.Map.id; data.mapid = Metamaps.Active.Map.id;
socket.emit('newSynapse', data); socket.emit('newSynapse', data);
} }
@ -2037,7 +2048,7 @@ Metamaps.Realtime = {
var topic1, topic2, node1, node2, synapse, mapping, cancel; var topic1, topic2, node1, node2, synapse, mapping, cancel;
function test() { function test() {
if (synapse && mapping) { if (synapse && mapping && mapper) {
topic1 = synapse.getTopic1(); topic1 = synapse.getTopic1();
node1 = topic1.get('node'); node1 = topic1.get('node');
topic2 = synapse.getTopic2(); topic2 = synapse.getTopic2();
@ -2049,8 +2060,15 @@ Metamaps.Realtime = {
setTimeout(test, 10); setTimeout(test, 10);
} }
} }
test();
mapper = Metamaps.Mappers.get(data.mapperid);
if (mapper === undefined) {
mapperCallback = function (m) {
Metamaps.Mappers.add(m);
mapper = m;
};
Metamaps.Mapper.get(data.mapperid, mapperCallback);
}
$.ajax({ $.ajax({
url: "/synapses/" + data.synapseid + ".json", url: "/synapses/" + data.synapseid + ".json",
success: function (response) { success: function (response) {
@ -2071,6 +2089,7 @@ Metamaps.Realtime = {
cancel = true; cancel = true;
} }
}); });
test();
}, },
// removeSynapse // removeSynapse
sendRemoveSynapse: function (data) { sendRemoveSynapse: function (data) {