Skip to content

Commit

Permalink
Suddivided into DataSource Layer and MainLayer.
Browse files Browse the repository at this point in the history 
Correct bugs with the fetch of js files.
Added some features.
  • Loading branch information
Stefano authored and Stefano committed Mar 14, 2010
1 parent cfff8b2 commit 052bd64
Show file tree
Hide file tree
Showing 20 changed files with 1,222 additions and 861 deletions.
54 changes: 26 additions & 28 deletions src/data/latlon.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,52 +10,50 @@ Mid('104.128.30.8','104.128.30.7');
Mid('77.87.50.66','77.87.50.81');
Mid('77.87.50.82','77.87.50.67');
Node('77.87.48.35',52.863804,12.553408,0,'0.0.0.0','StefanoGSoC');
Node('77.87.50.72',52.546024,13.314249,0,'0.0.0.0','FhGrbaussen');
Node('77.87.50.72',52.546024,13.314249,1,'0.0.0.0','FhGrbaussen');
Node('77.87.50.70',52.516031,13.314318,0,'0.0.0.0','wrap-roof');
Node('77.87.50.125',52.592260,13.327054,0,'0.0.0.0','tu-fokus');
Node('77.87.50.71',52.576024,13.314549,0,'0.0.0.0','FhGrbmittig');
Node('104.128.30.21',52.525982,13.314444,0,'0.0.0.0','relet');
Node('77.87.50.121',52.544476,13.352702,0,'0.0.0.0','tfh-test');
Node('77.87.50.66',52.525986,13.314315,0,'0.0.0.0','fokus-3009');
Node('77.87.50.82',52.525986,13.314317,0,'0.0.0.0','hertz');
Node('104.128.30.22',52.525923,13.314374,0,'0.0.0.0','104-128-30-22');
Node('104.128.30.23',52.533921,13.314374,0,'0.0.0.0','Prova1');
Node('77.87.50.82',52.525986,13.314317,1,'0.0.0.0','hertz');
Node('104.128.30.21',52.525923,13.314374,0,'0.0.0.0','PincoPallino');
Node('104.128.30.8',52.533921,13.314374,1,'77.87.50.121','Prova1');
Node('104.128.30.24',52.545525,13.314374,0,'0.0.0.0','Prova2');
Node('104.128.30.25',52.55925,13.324374,0,'0.0.0.0','Prova3');
Node('104.128.30.26',52.521925,13.374374,0,'0.0.0.0','Prova4');

Node('77.87.48.78',52.55925,13.324374,0,'0.0.0.0','Prova3');
Node('104.128.30.51',52.521925,13.374374,0,'0.0.0.0','Prova4');
Link('77.87.50.121','104.128.30.8',1.000,1.000,1.000);
PLink('104.128.30.22','104.128.30.21',1.000,0.408,2.452,52.525982,13.314444,0,52.525925,13.314374,0);
Link('104.128.30.51','104.128.30.21',1.000,0.420,2.383);
PLink('104.128.30.21','104.128.30.22',0.431,1.000,2.318,52.525925,13.314374,0,52.525982,13.314444,0);
Link('104.128.30.51','104.128.30.22',0.851,0.918,1.281);
PLink('77.87.50.66','104.128.30.22',0.655,0.929,1.643,52.525925,13.314374,0,52.525986,13.314315,0);
Link('104.128.30.51','104.128.30.21',0.851,0.918,1.281);
Link('77.87.48.78','77.87.48.35',0.165,0.596,10.186);
Link('104.128.30.21','104.128.30.51',0.420,1.000,2.383);
Link('104.128.30.22','104.128.30.51',0.910,0.839,1.310);
PLink('104.128.30.22','77.87.50.66',0.933,0.675,1.588,52.525986,13.314315,0,52.525925,13.314374,0);
PLink('77.87.50.70','77.87.50.66',0.984,1.000,1.016,52.525986,13.314315,0,52.526031,13.314318,0);
PLink('77.87.50.71','77.87.50.66',1.000,1.000,1.000,52.525986,13.314315,0,52.526024,13.314249,0);
PLink('77.87.50.72','77.87.50.66',1.000,1.000,1.000,52.525986,13.314315,0,52.526024,13.314249,0);
Link('104.128.30.21','104.128.30.51',0.910,0.839,1.310);
Link('77.87.48.78','77.87.50.66',1.000,1.000,1.000);
PLink('77.87.50.82','77.87.50.66',1.000,1.000,1.000,52.525986,13.314315,0,52.525986,13.314317,0);
PLink('77.87.50.66','77.87.50.72',1.000,1.000,1.000,52.526024,13.314249,0,52.525986,13.314315,0);
PLink('77.87.50.70','77.87.50.72',0.984,1.000,1.016,52.526024,13.314249,0,52.526031,13.314318,0);
PLink('77.87.50.71','77.87.50.72',1.000,1.000,1.000,52.526024,13.314249,0,52.526024,13.314249,0);
Link('77.87.48.78','77.87.50.72',1.000,1.000,1.000);
PLink('77.87.50.82','77.87.50.72',1.000,1.000,1.000,52.526024,13.314249,0,52.525986,13.314317,0);
PLink('77.87.50.125','77.87.50.72',0.973,0.969,1.062,52.526024,13.314249,0,52.512260,13.327054,0);
Link('77.87.48.35','77.87.48.78',0.596,0.945,1.775);
Link('77.87.50.66','77.87.48.78',1.000,1.000,1.000);
Link('77.87.50.70','77.87.48.78',1.000,1.000,1.000);
Link('77.87.50.71','77.87.48.78',1.000,1.000,1.000);
Link('77.87.50.72','77.87.48.78',1.000,1.000,1.000);
Link('77.87.50.82','77.87.48.78',1.000,1.000,1.000);
PLink('77.87.50.66','77.87.50.82',1.000,1.000,1.000,52.525986,13.314317,0,52.525986,13.314315,0);
PLink('77.87.50.70','77.87.50.82',0.988,1.000,1.012,52.525986,13.314317,0,52.526031,13.314318,0);
PLink('77.87.50.71','77.87.50.82',1.000,1.000,1.000,52.525986,13.314317,0,52.526024,13.314249,0);
PLink('77.87.50.72','77.87.50.82',1.000,1.000,1.000,52.525986,13.314317,0,52.526024,13.314249,0);
Link('104.128.30.21','104.128.30.21',1.000,0.408,2.452);
Link('77.87.50.66','104.128.30.21',0.655,0.929,1.643);
Link('104.128.30.21','104.128.30.21',0.431,1.000,2.318);
Link('77.87.50.66','77.87.50.82',1.000,1.000,1.000);
Link('77.87.50.70','77.87.50.82',0.988,1.000,1.012);
Link('77.87.50.71','77.87.50.82',1.000,1.000,1.000);
Link('77.87.50.72','77.87.50.82',1.000,1.000,1.000);
Link('77.87.50.82','77.87.50.72',1.000,1.000,1.000);
Link('77.87.50.125','77.87.50.72',0.973,0.969,1.062);
Link('77.87.50.82','77.87.50.66',1.000,1.000,1.000);
Link('77.87.50.66','77.87.50.72',1.000,1.000,1.000);
Link('77.87.50.70','77.87.50.72',0.984,1.000,1.016);
Link('77.87.50.71','77.87.50.72',1.000,1.000,1.000);
Link('104.128.30.21','77.87.50.66',0.933,0.675,1.588);
Link('77.87.50.70','77.87.50.66',0.984,1.000,1.016);
Link('77.87.50.71','77.87.50.66',1.000,1.000,1.000);
Link('77.87.50.72','77.87.50.66',1.000,1.000,1.000);
Link('77.87.48.78','77.87.50.82',1.000,1.000,1.000);
Link('104.128.30.8','77.87.50.121',1.000,1.000,1.000);
PLink('77.87.50.71','77.87.50.121',0.922,0.937,1.158,52.544476,13.352702,0,52.526024,13.314249,0);
PLink('77.87.50.72','77.87.50.125',0.969,0.976,1.057,52.512260,13.327054,0,52.526024,13.314249,0);

2 changes: 1 addition & 1 deletion src/data/log.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
XML Broken. Not Valid.
Problem with loading components in MainLayer.java: e.getmessage()
6 changes: 1 addition & 5 deletions src/freimapgsoc/DataSource.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,6 @@ public interface DataSource {
/** Initialize this data source with its configuration parameters. **/
public HashMap<String, Object> read_conf(HashMap<String, Object> configuration);

public String getId();

public String getCurrentID();

/** Initialize this data source with path file. **/
//public void init(String path);
/** @return A Vector of Nodes to be displayed. */
Expand Down Expand Up @@ -98,7 +94,7 @@ public interface DataSource {

public MapNode getNodeByIp(String ip);

public Vector<Link> getLinks(long time);
public Vector<Link> getLinks();

/** @param dsl A DataSourceListener listening on events from this DataSource */
public Vector<Link> getLinksFromSource(String id);
Expand Down
Loading

0 comments on commit 052bd64

Please sign in to comment.