consolidating

edborden · Nov 19, 2016 · abe5b42 · abe5b42
1 parent 8805113
commit abe5b42
Show file tree

Hide file tree

Showing 27 changed files with 10 additions and 225 deletions.
diff --git a/...ces/simplemap/scripts/.simulator.metadata → .address.metadata b/...ces/simplemap/scripts/.simulator.metadata → .address.metadata
diff --git a/...s/simplemap/html/.simplemap.html.metadata → .map.html.metadata b/...s/simplemap/html/.simplemap.html.metadata → .map.html.metadata
diff --git a/address b/address
@@ -0,0 +1,3 @@
+var logger = require('logger');
+logger.setLevel('DEBUG');
+logger.debug(request);
diff --git a/...geoservices/simplemap/html/simplemap.html → map.html b/...geoservices/simplemap/html/simplemap.html → map.html
@@ -33,7 +33,7 @@
 
         var onInterval = function() {
           var xhr = new XMLHttpRequest();
-		  xhr.open('GET', 'https://edborden.scriptrapps.io/modules/drone/geoservices/simplemap/scripts/simulator');
+		  xhr.open('GET', 'https://dronesmith.scriptrapps.io/modules/drone/geoservices/simplemap/scripts/simulator');
 		  xhr.send(null);
         }
 

diff --git a/modules/drone/.README.md.metadata b/modules/drone/.README.md.metadata
diff --git a/modules/drone/README.md b/modules/drone/README.md
diff --git a/modules/drone/geoservices/simplemap/.README.md.metadata b/modules/drone/geoservices/simplemap/.README.md.metadata
diff --git a/modules/drone/geoservices/simplemap/README.md b/modules/drone/geoservices/simplemap/README.md
diff --git a/modules/drone/geoservices/simplemap/test/.publisher.metadata b/modules/drone/geoservices/simplemap/test/.publisher.metadata
diff --git a/modules/firebase/.config.metadata b/modules/firebase/.config.metadata
diff --git a/modules/firebase/.firebaseclient.metadata b/modules/firebase/.firebaseclient.metadata
diff --git a/modules/firebase/.httpclient.metadata b/modules/firebase/.httpclient.metadata
diff --git a/modules/firebase/config b/modules/firebase/config
diff --git a/modules/firebase/firebaseclient b/modules/firebase/firebaseclient
diff --git a/modules/firebase/httpclient b/modules/firebase/httpclient
diff --git a/modules/firebase/test/.test.metadata b/modules/firebase/test/.test.metadata
diff --git a/modules/firebase/test/test b/modules/firebase/test/test
diff --git a/...geoservices/simplemap/.config.js.metadata → modules/geoservices/.config.js.metadata b/...geoservices/simplemap/.config.js.metadata → modules/geoservices/.config.js.metadata
diff --git a/...les/drone/geoservices/simplemap/config.js → modules/geoservices/config.js b/...les/drone/geoservices/simplemap/config.js → modules/geoservices/config.js
@@ -5,10 +5,10 @@
 var config = {
 
   // Your scriptr.io endpoint
-  url: "wss://edborden.scriptrapps.io/", // do not forget the final "/" 
+  url: "wss://dronesmith.scriptrapps.io/", // do not forget the final "/" 
 
   // Token of your scriptr.io account
-  token: "RDU0OTQ3RDJDNQ==",
+  token: "RkY4Mzk1MTc0Rg==",
 
   // Google map configuration
   map: {

diff --git a/...s/simplemap/lib/.pubsubclient.js.metadata → ...geoservices/lib/.pubsubclient.js.metadata b/...s/simplemap/lib/.pubsubclient.js.metadata → ...geoservices/lib/.pubsubclient.js.metadata
diff --git a/...geoservices/simplemap/lib/pubsubclient.js → modules/geoservices/lib/pubsubclient.js b/...geoservices/simplemap/lib/pubsubclient.js → modules/geoservices/lib/pubsubclient.js
diff --git a/...implemap/scripts/.datahandler.js.metadata → ...services/scripts/.datahandler.js.metadata b/...implemap/scripts/.datahandler.js.metadata → ...services/scripts/.datahandler.js.metadata
diff --git a/modules/geoservices/scripts/.simulator.metadata b/modules/geoservices/scripts/.simulator.metadata
@@ -0,0 +1 @@
+{"acl":{"read":"nobody","write":"nobody","execute":"anonymous"},"contentType":"application\/vnd.scriptr-javascript"}
diff --git a/...services/simplemap/scripts/datahandler.js → modules/geoservices/scripts/datahandler.js b/...services/simplemap/scripts/datahandler.js → modules/geoservices/scripts/datahandler.js
@@ -13,7 +13,7 @@ var markers = {};
  * @param {Object} [map]: google map object
  */
 function defaultCallback(obj) {
-
+  console.log(obj);
   var jsonObj = JSON.parse(obj);
   if (jsonObj instanceof Array) {
 

diff --git a/...e/geoservices/simplemap/scripts/simulator → modules/geoservices/scripts/simulator b/...e/geoservices/simplemap/scripts/simulator → modules/geoservices/scripts/simulator
diff --git a/modules/geoservices/test/.publisher.metadata b/modules/geoservices/test/.publisher.metadata
@@ -0,0 +1 @@
+{"acl":{"read":"nobody","write":"nobody","execute":"scriptr"},"contentType":"application\/vnd.scriptr-javascript"}
diff --git a/...rone/geoservices/simplemap/test/publisher → modules/geoservices/test/publisher b/...rone/geoservices/simplemap/test/publisher → modules/geoservices/test/publisher
@@ -2,4 +2,4 @@
  * Simple test script that publishes min asset data to the channel to which the simplemap component is subscribed
  * Make sure to replace the values of the id, lat and lng parameters to something that suits your own scenario
  */
-publish("map", JSON.stringify([{id:"1234", lat:40.674116, lng: -74.005976}]));
+publish("map", JSON.stringify([{id:"1234", lat:"0", lng: "0"}]));
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"acl":{"read":"nobody","write":"nobody","execute":"anonymous"},"contentType":"application\/vnd.scriptr-javascript"}