rapid-router 5.4.1__py2.py3-none-any.whl → 7.6.8__py2.py3-none-any.whl

game/static/game/js/level_moderation.js

@@ -1,7 +1,6 @@
 /* global showPopupConfirmation */
 
 var levelID;
-var classID;
 var students;
 
 var saving = new ocargo.Saving();
@@ -57,6 +56,27 @@ jQuery.extend(jQuery.fn.dataTableExt.oSort, {
   },
 });
 
+approveLevel = function (id, callback, errorCallback) {
+  csrftoken = Cookies.get('csrftoken');
+  $.ajax({
+    url: Urls.approve_level(id),
+    type: 'POST',
+    dataType: 'json',
+    data: {csrfmiddlewaretoken: csrftoken},
+    beforeSend: function (xhr, settings) {
+      if (!csrfSafeMethod(settings.type) && !this.crossDomain) {
+        xhr.setRequestHeader("X-CSRFToken", csrftoken);
+      }
+    },
+    success: function (json) {
+      callback();
+    },
+    error: function (xhr, errmsg, err) {
+      errorCallback(xhr.status + ": " + errmsg + " " + err + " " + xhr.responseText);
+    }
+  });
+};
+
 $(document).ready(function () {
   $(".delete").click(function () {
     levelID = this.getAttribute("value");
@@ -67,6 +87,17 @@ $(document).ready(function () {
     window.location.href = Urls.play_custom_level(this.getAttribute("value"));
   });
 
+  $(".approve").click(function () {
+    levelID = this.getAttribute("value");
+    approveLevel(levelID)
+    // Waiting half a second before redirecting because otherwise the Approve button doesn't become disabled
+    setTimeout(
+        function(){
+          window.location.href = Urls.level_moderation();
+          },
+        500);
+  });
+
   $("#clear-classes").on("click", () => {
     $('[id^="id_classes_"],#select-all-classes').prop("checked", false);
   });
@@ -105,7 +136,7 @@ $(document).ready(function () {
       {
         orderable: false,
         searchable: false,
-        targets: [-1, -2], // Play and Delete columns
+        targets: [-1, -2, -3], // Play, Approve and Delete columns
       },
       {
         type: "student-with-teacher",

game/static/game/js/level_selection.js

@@ -8,30 +8,30 @@ function setupCoins() {
 
         var minScore = 20;
         var episodeToOpen;
+        var ratios = [];
         for(var j = 0; j < episode.levels.length; j++) {
             var level = episode.levels[j];
-
-            imageStr = getImageStr(level.score, level.maxScore);
-            if(imageStr !== '') {
-                $('.level_image.coin_image[value=' + level.name + ']').attr('src', imageStr);
-            }
-            else {
+            if (level.score === "None"){
                 $('.level_image.coin_image[value=' + level.name + ']').remove();
-                minScore = "None";
                 if(!episodeToOpen) {
                     episodeToOpen =  episode;
                 }
-            }
-
-            if(minScore != "None" && level.score < minScore) {
-                minScore = level.score;
+                ratios.push(-1);
+            } else {
+                var ratio = level.score / level.maxScore;
+                ratios.push(ratio);
+                imageStr = getImageStr(ratio);
+                $('.level_image.coin_image[value=' + level.name + ']').attr('src', imageStr);
             }
         }
 
-        if(minScore !== "None") {
-            $('.episode_image.coin_image[value=' + episode.id + ']').attr('src', getImageStr(minScore))
-        }
-        else {
+        if (ratios.length > 0 && !ratios.includes(-1)){
+            var sum =0;
+            ratios.forEach ((item) => sum += item);
+            var ave_ratio = sum/ratios.length;
+            img = getImageStr(ave_ratio);
+            $('.episode_image.coin_image[value=' + episode.id + ']').attr('src', img)
+        } else {
             $('.episode_image.coin_image[value=' + episode.id + ']').remove();
         }
     }
@@ -39,7 +39,7 @@ function setupCoins() {
     for(var i = 0; i < OTHER_LEVELS.length; i++) {
         var level = OTHER_LEVELS[i];
 
-        imageStr = getImageStr(level.score, level.maxScore);
+        imageStr = getImageStr(level.score / level.maxScore);
         if(imageStr !== '') {
             $('.level_image.coin_image[value=' + level.id + ']').attr('src', imageStr);
         }
@@ -52,21 +52,58 @@ function setupCoins() {
         $('#episode' + episodeToOpen.id).click();
     }
 
-    function getImageStr(score, maxScore) {
+    function getImageStr(fraction) {
         var imageStr = "/static/game/image/coins/coin_";
-        percentage = 100.0 * score / maxScore;
-        if(score == "None") {
-            return "";
-        }
-        else if(percentage >= 99.99999) {
+        if(fraction >= 0.99) {
             return imageStr + 'gold.svg';
         }
-        else if(percentage > 0.5) {
+        else if(fraction > 0.5) {
             return imageStr + 'silver.svg';
         }
-        else if(percentage >= 0.0) {
+        else if(fraction >= 0.0) {
             return imageStr + 'copper.svg';
         }
-        return '';
     }
 }
+
+document.addEventListener("DOMContentLoaded", function() {
+    const storedEpisode = localStorage.getItem('currentEpisode');
+    const allCollapsibles = document.querySelectorAll('.collapse');
+
+    // Function to close all except the given ID
+    function closeAllExcept(openId) {
+        allCollapsibles.forEach(function(collapsible) {
+            if (collapsible.id !== openId) {
+                collapsible.classList.remove('in');
+                const toggle = document.querySelector(`[data-target="#${collapsible.id}"]`);
+                toggle.classList.add('collapsed');
+                toggle.setAttribute('aria-expanded', 'false');
+            }
+        });
+    }
+
+    // Open the accordion for the stored episode
+    const accordionToOpen = storedEpisode ? document.querySelector(`#collapse-${storedEpisode}`) : null;
+    if (accordionToOpen) {
+        accordionToOpen.classList.add('in');
+        const toggle = document.querySelector(`[data-target="#${accordionToOpen.id}"]`);
+        toggle.classList.remove('collapsed');
+        toggle.setAttribute('aria-expanded', 'true');
+    } else {
+        closeAllExcept(); // Close all of no epissodes are stored
+    }
+
+    // Set up event listeners for accordion toggles
+    const accordionToggles = document.querySelectorAll('.episode-title');
+    accordionToggles.forEach(function(toggle) {
+        toggle.addEventListener('click', function() {
+            const collapseId = toggle.getAttribute('data-target').replace('#', '');
+            const isOpened = toggle.getAttribute('aria-expanded') === 'false'; // Notice the change here
+            localStorage.setItem('currentEpisode', isOpened ? collapseId.split('-')[1] : null);
+            if (isOpened) {
+                closeAllExcept(collapseId);
+            }
+        });
+    });
+
+});

game/static/game/js/loadLanguages.js

@@ -0,0 +1,21 @@
+function loadLanguage(path, langStr, callback) {
+  var xobj = new XMLHttpRequest();
+  xobj.overrideMimeType("application/javascript");
+  xobj.open('GET', path + langStr + '.js', true);
+  xobj.onreadystatechange = function () {
+    if (xobj.readyState == 4 && xobj.status == "200") {
+      eval(xobj.responseText);
+      callback();
+    } else if (xobj.status == "404") {
+      loadLanguage(path, "en", callback);
+    }
+  };
+  xobj.send(null);
+}
+
+function reloadWorkspace(workspace) {
+  var blocklyDom = Blockly.Xml.workspaceToDom(workspace);
+  workspace.clear();
+  Blockly.Xml.domToWorkspace(blocklyDom, workspace);
+  workspace.updateToolbox(BLOCKLY_XML);
+}

game/static/game/js/map.js

@@ -2,10 +2,6 @@
 
 var ocargo = ocargo || {};
 
-var forwardAngle = Math.PI;
-var leftCutoffAngle = 5 * Math.PI / 6;
-var rightCutoffAngle = 7 * Math.PI / 6;
-
 ocargo.Map = function(nodeData, origin, destinationCoordinates) {
 	this.nodeData = nodeData;
 	this.nodes = ocargo.Node.parsePathData(nodeData);
@@ -41,54 +37,128 @@ ocargo.Map.prototype.getDestinations = function() {
 ocargo.Map.prototype.isRoadForward = function(position) {
 	var previousNode = position.previousNode;
 	var currentNode = position.currentNode;
-
-	var nextNode = null;
-    var nextNodeDeviation = null;
-
-    var nodes = currentNode.connectedNodes;
-    for (var i = 0; i < nodes.length; i++) {
-        var node = nodes[i];
-        var angle = ocargo.calculateClockwiseNodeAngle(previousNode, currentNode, node);
-        var deviation = Math.abs(forwardAngle - angle);
-        if (angle >= leftCutoffAngle && angle <= rightCutoffAngle &&
-            (nextNode === null || deviation < nextNodeDeviation)) {
-            nextNode = node;
-            nextNodeDeviation = deviation;
+    var nextCoordinates = {};
+    // Moving up, down or sideways?
+    var movingHorizontally = previousNode.coordinate.x != currentNode.coordinate.x;
+
+    if (movingHorizontally) {
+        nextCoordinates.y = currentNode.coordinate.y; // y-axis isn't changing
+        var movingRight = previousNode.coordinate.x < currentNode.coordinate.x; // going left or right?
+        if (movingRight){
+            nextCoordinates.x = currentNode.coordinate.x + 1;
+            if (nextCoordinates.x > 9) { // right-most extremity
+                return null;
+            }
+        } else {  // moving left
+            nextCoordinates.x = currentNode.coordinate.x - 1
+            if (nextCoordinates.x < 0){ // left-most extremity
+                return null;
+            }
+        }
+    } else { // moving vertically
+        nextCoordinates.x = currentNode.coordinate.x;
+        var movingUpwards = previousNode.coordinate.y < currentNode.coordinate.y;
+        if (movingUpwards) {
+            nextCoordinates.y = currentNode.coordinate.y + 1;
+            if (nextCoordinates.y > 9) {
+                return null;
+            }
+        } else { // moving downwards
+            nextCoordinates.y = currentNode.coordinate.y - 1;
+            if (nextCoordinates.y < 0) {
+                return null;
+            }
+        }
+    }
+    var connected = currentNode.connectedNodes;
+    for (var i = 0; i < connected.length; i++){
+        var coordinate = connected[i].coordinate;
+        if (coordinate.x == nextCoordinates.x && coordinate.y == nextCoordinates.y){
+            return connected[i];
         }
     }
-    return nextNode;
+    return null;
 };
 
 ocargo.Map.prototype.isRoadLeft = function(position) {
 	var previousNode = position.previousNode;
 	var currentNode = position.currentNode;
 
-    var index = currentNode.connectedNodes.indexOf(previousNode) + 1;
-    var nextNode;
-    if (index === currentNode.connectedNodes.length) {
-        nextNode = currentNode.connectedNodes[0];
-    } else {
-        nextNode = currentNode.connectedNodes[index];
+    var nextCoordinates = {};
+    // Moving up, down or sideways?
+    var movingHorizontally = previousNode.coordinate.x != currentNode.coordinate.x;
+    if (movingHorizontally){
+        nextCoordinates.x = currentNode.coordinate.x;
+        var movingRight = previousNode.coordinate.x < currentNode.coordinate.x;
+        if (movingRight) {
+            nextCoordinates.y = currentNode.coordinate.y + 1;
+        } else { // moving left
+            nextCoordinates.y = currentNode.coordinate.y - 1;
+        }
+        if (nextCoordinates.y < 0 || nextCoordinates.y > 9){
+            return null;
+        }
+    } else { // moving up and down
+        nextCoordinates.y = currentNode.coordinate.y;
+        var movingUp = previousNode.coordinate.y < currentNode.coordinate.y;
+        if (movingUp) {
+            nextCoordinates.x = previousNode.coordinate.x - 1;
+        } else { // moving down
+            nextCoordinates.x = previousNode.coordinate.x + 1;
+        }
+        if (nextCoordinates.x < 0 || nextCoordinates.x > 9){
+            return null;
+        }
     }
-
-    var angle = ocargo.calculateClockwiseNodeAngle(previousNode, currentNode, nextNode);
-    return (angle > 0 && angle < leftCutoffAngle) ? nextNode : null;
+    var connected = currentNode.connectedNodes;
+    for (var i = 0; i < connected.length; i++){
+        var coordinate = connected[i].coordinate;
+        if (coordinate.x == nextCoordinates.x && coordinate.y == nextCoordinates.y){
+            return connected[i];
+        }
+    }
+    return null;
 };
 
+
 ocargo.Map.prototype.isRoadRight = function(position) {
 	var previousNode = position.previousNode;
 	var currentNode = position.currentNode;
 
-	var index = currentNode.connectedNodes.indexOf(previousNode) - 1;
-    var nextNode;
-    if (index === -1) {
-        nextNode = currentNode.connectedNodes[currentNode.connectedNodes.length - 1];
-    } else {
-        nextNode = currentNode.connectedNodes[index];
+    var nextCoordinates = {};
+    // Moving up, down or sideways?
+    var movingHorizontally = previousNode.coordinate.x != currentNode.coordinate.x;
+    if (movingHorizontally){
+        nextCoordinates.x = currentNode.coordinate.x;
+        var movingRight = previousNode.coordinate.x < currentNode.coordinate.x;
+        if (movingRight) {
+            nextCoordinates.y = currentNode.coordinate.y - 1;
+        } else { // moving left
+            nextCoordinates.y = currentNode.coordinate.y + 1;
+        }
+        if (nextCoordinates.y < 0 || nextCoordinates.y > 9){
+            return null;
+        }
+    } else { // moving up and down
+        nextCoordinates.y = currentNode.coordinate.y;
+        var movingUp = previousNode.coordinate.y < currentNode.coordinate.y;
+        if (movingUp) {
+            nextCoordinates.x = previousNode.coordinate.x + 1;
+        } else { // moving down
+            nextCoordinates.x = previousNode.coordinate.x - 1;
+        }
+        if (nextCoordinates.x < 0 || nextCoordinates.x > 9){
+            return null;
+        }
     }
-
-    var angle = ocargo.calculateClockwiseNodeAngle(previousNode, currentNode, nextNode);
-    return (angle > rightCutoffAngle && angle < 2 * Math.PI) ? nextNode : null;
+    var connected = currentNode.connectedNodes;
+    for (var i = 0; i < connected.length; i++){
+        var coordinate = connected[i].coordinate;
+        if (coordinate.x == nextCoordinates.x && coordinate.y == nextCoordinates.y){
+            return connected[i];
+        }
+    }
+    return null;
 };
 
 ocargo.Map.prototype.isDeadEnd = function(position) {

game/static/game/js/model.js

@@ -25,9 +25,6 @@ ocargo.Model = function(nodeData, origin, destinations, trafficLightData, cowDat
     // false if evaluation of conditions etc. should be hidden from user.
     // used for evaluation of event handlers before each statement.
     this.shouldObserve = true;
-
-    this.soundedHorn = {};
-    this.puffedUp = {};
 };
 
 // Resets the entire model to how it was when it was just constructed
@@ -47,23 +44,11 @@ ocargo.Model.prototype.reset = function() {
         this.cows[j].reset();
     }
 
-    // Display cow on origin node if exists
-    var node = this.map.originCurrentNode;
-    this.setCowsActive(node);
-
     this.timestamp = 0;
     this.movementTimestamp = 0;
     this.reasonForTermination  =  null;
-    this.soundedHorn = {};
-    this.puffedUp = {};
 };
 
-// Randomly chooses the cow positions, called by program.js
-ocargo.Model.prototype.chooseNewCowPositions = function() {
-    for (var j = 0; j < this.cows.length; j++) {
-        this.cows[j].chooseNewCowPositions();
-    }
-};
 
 ///////////////////////
 // Begin observation function, each tests something about the model
@@ -103,18 +88,9 @@ ocargo.Model.prototype.isDeadEnd = function() {
 };
 
 ocargo.Model.prototype.isCowCrossing = function(type) {
-    var result = false;
+    const currentNode = this.van.getPosition().currentNode;
     this.observe('cow crossing');
-    var node = this.van.getPosition().currentNode;
-    var nodes = this.getNodesAhead(node);
-    for (var i = 0 ; i < nodes.length ; i++) {
-        var cow = this.getCowForNode(nodes[i], ocargo.Cow.ACTIVE);
-        if (cow != null && cow.type == type && cow.triggerEvent) {
-            cow.triggerEvent = false;
-            result = true;
-        }
-    }
-    return result;
+    return this.getCowForNode(currentNode, [ocargo.Cow.ACTIVE, ocargo.Cow.READY]);
 };
 
 ocargo.Model.prototype.isTrafficLightRed = function() {
@@ -150,12 +126,12 @@ ocargo.Model.prototype.getPreviousCoordinate = function() {
 // true if it was a valid action or false otherwise
 
 ocargo.Model.prototype.moveVan = function(nextNode, action) {
-    //Crash?
-    let previousNodeCow = this.getCowForNode(this.van.getPosition().currentNode, ocargo.Cow.ACTIVE);
-    let collisionWithCow = previousNodeCow && nextNode !== this.van.getPosition().currentNode;
+    // Crash?
+    let checkedNode = action == "WAIT" ? this.van.getPosition().previousNode : this.van.getPosition().currentNode
+    let currentNodeHasCow = this.getCowForNode(checkedNode, [ocargo.Cow.ACTIVE, ocargo.Cow.READY]);
 
-    if (collisionWithCow) {
-        handleCrash(this, gettext('You ran into a cow! Keep in mind that cows can appear anywhere on the map.'),
+    if (currentNodeHasCow) {
+        handleCrash(this, gettext('You ran into a cow! '),
             'COLLISION_WITH_COW', 'collision with cow van move action: ');
         return false;
     }
@@ -186,11 +162,13 @@ ocargo.Model.prototype.moveVan = function(nextNode, action) {
 
         ocargo.game.sendAttempt(0);
 
+        let noFuelMessage = CHARACTER_NAME == "Electric van" ? 'Your battery ran out of charge!' : 'You ran out of fuel!'
+
         ocargo.animation.appendAnimation({
             type: 'popup',
             popupType: 'FAIL',
             failSubtype: 'OUT_OF_FUEL',
-            popupMessage: gettext('You ran out of fuel! Try to find a shorter route to the destination.'),
+            popupMessage: gettext(noFuelMessage + ' Try to find a shorter route to the destination.'),
             popupHint: ocargo.game.registerFailure(),
             description: 'no fuel popup'
         });
@@ -252,9 +230,6 @@ ocargo.Model.prototype.moveVan = function(nextNode, action) {
         return false;
     }
 
-    // Display cow on node if exists
-    this.setCowsActive(nextNode);
-
     this.van.move(nextNode);
 
     // Van movement animation
@@ -315,16 +290,6 @@ ocargo.Model.prototype.moveVan = function(nextNode, action) {
     }
 };
 
-ocargo.Model.prototype.setCowsActive = function(nextNode) {
-    var nodes = this.getNodesAhead(nextNode);
-    for (var i = 0 ; i < nodes.length ; i++){
-        var cow = this.getCowForNode(nodes[i], ocargo.Cow.READY);
-        if (cow){
-            cow.setActive(this, nodes[i]);
-        }
-    }
-};
-
 ocargo.Model.prototype.makeDelivery = function(destination) {
     // We're at a destination node and making a delivery!
     destination.visited = true;
@@ -422,62 +387,50 @@ ocargo.Model.prototype.deliver = function() {
             return false;
         }
         this.makeDelivery(destination, 'DELIVER');
+    } else {
+        ocargo.game.sendAttempt(0);
+        ocargo.animation.appendAnimation({
+            type: 'popup',
+            popupType: 'FAIL',
+            failSubtype: 'DELIVER_NON_DESTINATION',
+            popupMessage: gettext("You tried to deliver to a destination that doesn't exist."),
+            popupHint: ocargo.game.registerFailure(),
+            description: 'tried to deliver at non-destination'
+        });
+
+        ocargo.animation.appendAnimation({
+            type: 'callable',
+            functionType: 'playSound',
+            functionCall: ocargo.sound.failure,
+            description: 'failure sound'
+        });
+
+        ocargo.event.sendEvent("DeliverNonDestination", { levelName: LEVEL_NAME,
+                                                          defaultLevel: DEFAULT_LEVEL,
+                                                          workspace: ocargo.blocklyControl.serialize(),
+                                                          failures: this.failures,
+                                                          pythonWorkspace: ocargo.pythonControl.getCode()
+        });
+        this.reasonForTermination = 'DELIVER_AT_NON_DESTINATION';
+        return false;
     }
     return destination;
 };
 
 ocargo.Model.prototype.sound_horn = function() {
-    this.soundedHorn = {timestamp:this.movementTimestamp, coordinates:this.getCurrentCoordinate()};
+    const currentNode = this.van.getPosition().currentNode
     ocargo.animation.appendAnimation({
         type: 'callable',
         functionType: 'playSound',
         functionCall: ocargo.sound.sound_horn,
         description: 'van sound: sounding the horn'
     });
-
-    return true;
-};
-
-ocargo.Model.prototype.puff_up = function(){
-    if(!jQuery.isEmptyObject(this.puffedUp)){
-        return this.remain_puff_up();
-    }else{
-        this.van.puffUp();
-        this.puffedUp = {timestamp:this.movementTimestamp, coordinates:this.getCurrentCoordinate(), timeout:1};
-        ocargo.animation.appendAnimation({
-            type: 'van',
-            vanAction: 'PUFFUP',
-            fuel: this.van.getFuelPercentage(),
-            description: 'van move action: puff up'
-        });
-        return this.puff_down();
+    let cow = this.getCowForNode(currentNode, [ocargo.Cow.ACTIVE, ocargo.Cow.READY]);
+    if (cow) {
+        cow.queueLeaveAnimation(this, currentNode);
+        cow.setInactive(this, currentNode);
     }
-
-};
-
-ocargo.Model.prototype.remain_puff_up = function(){
-    this.puffedUp.coordinates = this.getCurrentCoordinate();
-    this.puffedUp.timeout++;
-
-    ocargo.animation.appendAnimation({
-        type: 'van',
-        vanAction: 'REMAINPUFFUP',
-        fuel: this.van.getFuelPercentage(),
-        description: 'van move action: remain puff up'
-    });
-
-    return true;
-};
-
-ocargo.Model.prototype.puff_down = function(){
-
-    ocargo.animation.appendAnimation({
-        type: 'van',
-        vanAction: 'PUFFDOWN',
-        fuel: this.van.getFuelPercentage(),
-        description: 'van move action: puff down'
-    });
-
+    this.moveVan(this.van.getPosition().currentNode, 'SOUND_HORN');
     return true;
 };
 
@@ -616,6 +569,7 @@ ocargo.Model.prototype.programExecutionEnded = function () {
 // A helper function which returns the traffic light associated
 // with a particular node and orientation
 ocargo.Model.prototype.getTrafficLightForNode = function(position) {
+
     for (var i = 0; i < this.trafficLights.length; i++) {
         var light = this.trafficLights[i];
         if (light.sourceNode === position.previousNode && light.controlledNode === position.currentNode) {
@@ -636,12 +590,21 @@ ocargo.Model.prototype.getDestinationForNode = function(node) {
     return null;
 };
 
-ocargo.Model.prototype.getCowForNode = function(node, status) {
+ocargo.Model.prototype.getCowForNode = function(node, state) {
     var jsonCoordinate = JSON.stringify(node.coordinate);
     for(var i = 0; i < this.cows.length; i++) {
         var cow = this.cows[i];
-        if (jsonCoordinate in cow.activeNodes && cow.activeNodes[jsonCoordinate] == status) {
-            return cow;
+        if (jsonCoordinate in cow.activeNodes) {
+            if (state === undefined){
+                return cow;
+            } else {
+                if (typeof(state) === "string") {
+                    state = [state];
+                }
+                if (state.includes(cow.activeNodes[jsonCoordinate])) {
+                    return cow;
+                }
+            }
         }
     }
     return null;
@@ -660,7 +623,6 @@ ocargo.Model.prototype.incrementTime = function() {
 
     ocargo.animation.startNewTimestamp();
 
-    this.incrementCowTime();
 };
 
 ocargo.Model.prototype.incrementTrafficLightsTime = function() {
@@ -669,19 +631,6 @@ ocargo.Model.prototype.incrementTrafficLightsTime = function() {
     }
 };
 
-ocargo.Model.prototype.incrementCowTime = function() {
-    if(this.movementTimestamp - this.puffedUp.timestamp > this.puffedUp.timeout){
-        this.puffedUp = {};
-        this.van.puffDown();
-    }
-
-    for (var i = 0; i < this.cows.length; i++) {
-        this.cows[i].incrementTime(this);
-    }
-    this.soundedHorn = {};
-
-};
-
 ocargo.Model.prototype.getNodesAhead = function(node) {
     var nodes = [];
     for (var i = 0 ; i < node.connectedNodes.length ; i++){
@@ -695,4 +644,3 @@ ocargo.Model.prototype.getNodesAhead = function(node) {
 ocargo.Model.prototype.startingPosition = function() {
     return this.map.startingPosition();
 };
-