Rename stuff

jazminGP · May 21, 2013 · d74bd82 · d74bd82
1 parent 816da80
commit d74bd82
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -2,18 +2,18 @@ all:	hpfeeds
 
 hpfeeds: hpfeeds_client hpfeeds_server
 
-random: random_client random_server
+random: basic_client random_server
 
-udp: hpfeeds_client udp_server
+udp: basic_client udp_server
 
 hpfeeds_client: client/coffee/* client/coffee/feeds/hpfeeds.coffee
 	coffee -cj client/js/honeymap.js client/coffee/*.coffee client/coffee/feeds/hpfeeds.coffee
 
 hpfeeds_server: server/coffee/* server/coffee/honeymap/hpfeeds.coffee
 	coffee -cj server/js/honeymap.js server/coffee/config.coffee server/coffee/http.coffee server/coffee/socketio.coffee server/coffee/honeymap/hpfeeds.coffee server/coffee/main.coffee
 
-random_client: client/coffee/* client/coffee/feeds/random_remote.coffee
-	coffee -cj client/js/honeymap.js client/coffee/*.coffee client/coffee/feeds/random_remote.coffee
+basic_client: client/coffee/* client/coffee/feeds/basic.coffee
+	coffee -cj client/js/honeymap.js client/coffee/*.coffee client/coffee/feeds/basic.coffee
 
 random_server: server/coffee/* server/coffee/honeymap/random.coffee
 	coffee -cj server/js/honeymap.js server/coffee/config.coffee server/coffee/http.coffee server/coffee/socketio.coffee server/coffee/honeymap/random.coffee server/coffee/main.coffee

diff --git a/client/coffee/feeds/random_remote.coffee → client/coffee/feeds/basic.coffee b/client/coffee/feeds/random_remote.coffee → client/coffee/feeds/basic.coffee
@@ -7,7 +7,8 @@ class Feed
   handler: (data) =>
     lat = data.lat
     lng = data.lng
-    marker = new Marker(@map, lat, lng, "random_remote")
+    eventName = data.type
+    marker = new Marker(@map, lat, lng, eventName)
     return unless marker.regionCode
     @map.addMarker(marker)
     @log.add "New event in " + marker.regionName() + " " + marker.name()
diff --git a/server/coffee/honeymap/random.coffee b/server/coffee/honeymap/random.coffee
@@ -11,6 +11,6 @@ class HoneymapServer
     randomPoint = ->
       lat = Math.random() * 180 - 90
       lng = Math.random() * 360 - 180
-      transport.broadcast("geoloc.events", { lat: lat, lng: lng })
+      transport.broadcast("geoloc.events", { lat: lat, lng: lng, type: "random_remote" })
 
     setInterval((-> setTimeout(randomPoint, Math.random() * 1000) ), 500)