various cleanup and fixups to arc.GreatCircle ctor change

PatchesMaps · Feb 11, 2014 · 39cd82f · 39cd82f
1 parent e4a9619
commit 39cd82f
Show file tree

Hide file tree

Showing 15 changed files with 41 additions and 2,771 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+.DS_store
+node_modules
diff --git a/.npmignore b/.npmignore
@@ -0,0 +1,3 @@
+example
+node_modules
+index.html
diff --git a/arc.js b/arc.js
@@ -80,7 +80,12 @@ Arc.prototype.wkt = function() {
  *
  */
 var GreatCircle = function(start,end,properties) {
-
+    if (!start || start.x === undefined || start.y === undefined) {
+        throw new Error("GreatCircle constructor expects two args: start and end objects with x and y properties");
+    }
+    if (!end || end.x === undefined || end.y === undefined) {
+        throw new Error("GreatCircle constructor expects two args: start and end objects with x and y properties");
+    }
     this.start = new Coord(start.x,start.y);
     this.end = new Coord(end.x,end.y);
     this.properties = properties || {};

diff --git a/bezier.geojson b/bezier.geojson
diff --git a/bezier.html b/bezier.html
diff --git a/bezier.js b/bezier.js
diff --git a/bezier.py b/bezier.py
diff --git a/sphericalmercator.js → example/bezier/sphericalmercator.js b/sphericalmercator.js → example/bezier/sphericalmercator.js
diff --git a/example/csv2arc.js b/example/csv2arc.js
@@ -71,8 +71,8 @@ csv_lines.forEach(function(row,idx) {
     var end_y = parseFloat(coords[3].trim());    // second latitude
 
     // now create special arc Coordinate objects from the start and end pairs
-    var start = new arc.Coord(start_x, start_y);
-    var end = new arc.Coord(end_x, end_y);
+    var start = {x: start_x, y: start_y};
+    var end = {x: end_x, y: end_y};
 
 
     /* handle properties (csv attributes) second */

diff --git a/example/round.js b/example/round.js
@@ -3,7 +3,7 @@
 var fs = require('fs'),
     arc = require('../arc');
 
-var geojson = JSON.parse(fs.readFileSync('tracks.geojson', 'utf-8'));
+var geojson = JSON.parse(fs.readFileSync(__dirname + '/tracks.geojson', 'utf-8'));
 
 var tolerance = 1;
 
@@ -17,8 +17,8 @@ for (var i = 0; i < geojson.features.length; i++) {
                 Math.abs(a[1] - b[1]));
             if (dist > tolerance) {
                 var gc = new arc.GreatCircle(
-                    new arc.Coord(a[0], a[1]),
-                    new arc.Coord(b[0], b[1]));
+                    { x: a[0], y: a[1] },
+                    { x: b[0], y: b[1] });
                 var line = gc.Arc(10);
                 geojson.features[i].geometry.coordinates[j].arc = line.coords;
             }
@@ -35,4 +35,4 @@ for (var i = 0; i < geojson.features.length; i++) {
     }
 }
 
-fs.writeFileSync('tracks_round.geojson', JSON.stringify(geojson));
+console.log(JSON.stringify(geojson));