Skip to content

Commit

Permalink
fixing tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
yagoferrer committed May 28, 2015
1 parent ae27f58 commit b133f68
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 8 deletions.
6 changes: 3 additions & 3 deletions lib/addFeature.ts
Expand Up @@ -30,17 +30,17 @@ interface GeoJsonData {

var topojson = require('topojson');
import utils = require('./utils');
import addFilter = require('./addFilter');

class AddFeature {

addFilter;


constructor(public that) {

var addFilter = require('./addFilter')(that, 'json');
var addFilterInstance = new addFilter(that, 'json');
this.addFilter = function(filters) {
return addFilter.addFilter(filters);
return addFilterInstance.addFilter(filters);
}
}

Expand Down
7 changes: 5 additions & 2 deletions lib/removeMarker.ts
@@ -1,15 +1,18 @@
/// <reference path="typings/tsd.d.ts"/>

import findMarker = require('./findMarkerById');

class RemoveMarker {
'use strict';

findMarker;

constructor(public that) {

var findMarker = require('./findMarkerById')(that);
var findMarkerInstance = new findMarker(that);

this.findMarker = function(marker) {
return findMarker.find(marker)
return findMarkerInstance.find(marker)
};
}

Expand Down
5 changes: 3 additions & 2 deletions lib/updateMarker.ts
Expand Up @@ -3,6 +3,7 @@
import utils = require('./utils');
import config = require('./config');
import findMarker = require('./findMarkerById');
import filter = require('./filter');

class UpdateMarker {

Expand Down Expand Up @@ -127,9 +128,9 @@ class UpdateMarker {
if (type === '[object Object]') {
if (Object.keys(args).length === 1 && args.tags) {

var filter = require('./filter')(this.that, 'markers');
var filterInstance = new filter(this.that, 'markers');

result = this.bulkUpdate(filter.filter(args), preparedOptions);
result = this.bulkUpdate(filterInstance.filter(args), preparedOptions);

} else {
result = this.customUpdate(this.findMarker(args), preparedOptions);
Expand Down
2 changes: 1 addition & 1 deletion test/bootstrap.js
Expand Up @@ -11,7 +11,7 @@ global.sinon = require('sinon');

global.window = require('../test/mocks/window');
global.google = require('../test/mocks/google-maps');
global.mapTools = require('index');
global.mapTools = require('mapTools');

global.crossfilter = require('crossfilter');

0 comments on commit b133f68

Please sign in to comment.