V. 0.2.1 Pequenas modificações

José Maria Villac Pinheiro
1 parent 72ce85fa
Showing 5 changed files with 64 additions and 57 deletions Show diff stats
app.js
routes/index.js
routes/users.js
src/findConsumerNumber.js
views/map.jade
@@ -6,7 +6,6 @@ var cookieParser = require(&#39;cookie-parser&#39;);
 var bodyParser = require('body-parser');
 var index = require('./routes/index');
-var users = require('./routes/users');
 var app = express();
@@ -23,7 +22,6 @@ app.use(cookieParser());
 app.use(express.static(path.join(__dirname, 'public')));
 app.use('/', index);
-app.use('/users', users);
 // catch 404 and forward to error handler
 app.use(function(req, res, next) {
@@ -2,36 +2,47 @@ var express = require(&quot;express&quot;);
 var router = express.Router();
 require("../services/passport");
 require("../services/databases");
-const authRoutes = require("./authRoutes");
+const keys = require("../config/keys");
-authRoutes(router);
+require("./authRoutes")(router);
 /* GET home page. */
 router.get("/", function(req, res, next) {
   res.render("index", { title: "NEXUS" });
 });
+// bounding coordinates to view the map
+var boundSW = [-23.6506647239914, -46.5848434588656]; // lat, long
+var boundNE = [-23.5992830936269, -46.5447524538661];
+
 router.get("/map/:nome", function(req, res, next) {
   var numeroConsumidor = require("../src/findConsumerNumber");
   var coordenadas = require("../src/findCoordinatesFromConsumer");
-  var retorno = numeroConsumidor(req.params.nome, function(numero, nome) {
-    console.log("Terminou tudo: " + numero + " Nome: " + nome);
-    var codigoComNome = numero + " - " + nome;
-    var retorno = coordenadas(numero, function(x, y) {
-      console.log("Terminou procura coordenadas x: " + x + " y: " + y);
-      res.render("map", {
-        codigo: numero,
-        consumidor: codigoComNome,
-        fator_zoom: 23,
-        title: "NEXUS",
-        lat: y,
-        lng: x
+  var retorno = numeroConsumidor(req.params.nome, function(numero, nome, err) {
+    if (err === undefined) {
+      console.log("Terminou tudo: " + numero + " Nome: " + nome);
+      var codigoComNome = numero + " - " + nome;
+      var retorno = coordenadas(numero, function(x, y) {
+        console.log("Terminou procura coordenadas x: " + x + " y: " + y);
+        res.render("map", {
+          codigo: numero,
+          consumidor: codigoComNome,
+          fator_zoom: 23,
+          title: "NEXUS",
+          lat: y,
+          lng: x,
+          bndSW: boundSW,
+          bndNE: boundNE,
+          geoserverWMS: keys.geoserverWMS,
+          waterLayers: keys.waterLayers,
+          server: keys.server
+        });
       });
-    });
+    }
   });
 });
-router.get("http://nexusbr.dyndns-ip.com:3000/ponto", function(req, res) {
+router.get(keys.server + "/ponto", function(req, res) {
   var coord = {};
   console.log("Postou: ");
 });
@@ -1,9 +0,0 @@
-var express = require("express");
-var   router = express.Router();
-
-/* GET users listing. */
-router.get("/", function(req, res, next) {
-        res.send("respond with a resource");
-});
-
-module.exports = router;
-var consumerNumber = function (nomeConsumidor, callback){
-    var qrySql = "select TOP (1) COD_DAE, COD_DAE + 9000000 as novo_cod_dae, NOME from cadastro where NOME LIKE '%" + nomeConsumidor + "%'";
-    poolMsql.request().query(qrySql, function (err, recordset) {
-        if (err) {
-            console.log("Não realizou a querie: \n" + err);
-        }
-        var numeroDoConsumidor = recordset.recordset[0].novo_cod_dae;
-        var nomeDoConsumidor = recordset.recordset[0].NOME
-        return callback(numeroDoConsumidor, nomeDoConsumidor);
-    });
+var consumerNumber = function(nomeConsumidor, callback, err) {
+  var qrySql =
+    "select TOP (1) COD_DAE, COD_DAE + 9000000 as novo_cod_dae, NOME from cadastro where NOME LIKE '%" +
+    nomeConsumidor +
+    "%'";
+  poolMsql.request().query(qrySql, function(err, recordset) {
+    if (err || recordset.recordset.length === 0) {
+      console.log("Não realizou a querie: \n" + err);
+      return callback(null, null, err);
+    } else {
+      var numeroDoConsumidor = recordset.recordset[0].novo_cod_dae;
+      var nomeDoConsumidor = recordset.recordset[0].NOME;
+      return callback(numeroDoConsumidor, nomeDoConsumidor, undefined);
+    }
+  });
 };
-module.exports = consumerNumber;
 \ No newline at end of file
+module.exports = consumerNumber;
@@ -9,38 +9,41 @@ block content
                 input.form-control(type='text', id="nome", placeholder='Digite o nome')
             .col.col-lg-1
                 input.btn.btn-primary(type='button', value='Procura', onclick=' relocate_home()')
+    
     script.
         function relocate_home()
         {
-        location.href = "http://nexusbr.dyndns-ip.com:3000/map/" + nome.value ;
+        location.href = "#{server}/map/" + nome.value;
         }
     br
     #map
     script(type='text/javascript').
         var osmUrl = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
-            osmAttrib = '',
+            southWest = L.latLng(#{bndSW}),
+            northEast = L.latLng(#{bndNE}),
+            bounds = L.latLngBounds(southWest, northEast),
+            osmAttrib = 'NEXUS',
             osm = L.tileLayer(osmUrl,  
                 {attribution: osmAttrib}),
-            map = L.map('map', {center: new L.LatLng(#{lat},#{lng}), zoom: #{fator_zoom}}),
-            wmsLayer= L.tileLayer.wms("http://nexusbr.dyndns-ip.com:9080/geoserver/saocaetano/wms", {
-                layers: 'saocaetano:quadras, saocaetano:redesAgua, saocaetano:noAgua, saocaetano:ramalAgua, saocaetano:ligacaoAgua',
+            map = L.map('map', {center: new L.LatLng(#{lat},#{lng}), zoom: #{fator_zoom}, maxBounds: bounds}),
+            wmsLayer= L.tileLayer.wms("#{geoserverWMS}", {
+                layers: "#{waterLayers}",
                 format: 'image/png',
                 transparent: true,
                 maxZoom: 23
             }),
             drawnItems = L.featureGroup().addTo(map);
-
         L.control.layers({
             "OSM": osm.addTo(map),
             "Google": L.tileLayer('http://www.google.cn/maps/vt?lyrs=s@189&gl=cn&x={x}&y={y}&z={z}', {
                 attribution: 'google'
                 })
         }, {'Ocorrências': drawnItems, 'Redes': wmsLayer}, { position: 'topright', collapsed: true }).addTo(map);
-    
+
         var marker = L.marker([#{lat},#{lng}]).addTo(map);
         marker.bindPopup("<b>#{codigo}</b><br>#{consumidor}").openPopup();
-        
+
         var drawControl = new L.Control.Draw({
             draw: {
                 polygon: false,
@@ -91,15 +94,14 @@ block content
         });
         // Object(s) edited - update popups
-        map.on(L.Draw.Event.EDITED, function(event) {
-            console.log ("Entrou no evento Edited");
-            var layers = event.layers,
-                content = null;
-            layers.eachLayer(function(layer) {
-                content = getPopupContent(layer);
-                if (content !== null) {
-                    layer.setPopupContent(content);
-                }
+            map.on(L.Draw.Event.EDITED, function(event) {
+                console.log ("Entrou no evento Edited");
+                var layers = event.layers,
+                    content = null;
+                layers.eachLayer(function(layer) {
+                    content = getPopupContent(layer);
+                    if (content !== null) {
+                        layer.setPopupContent(content);
+                    }
+                });
             });
-        });
-        
 \ No newline at end of file
	@@ -1,9 +0,0 @@	@@ -1,9 +0,0 @@
1	-var express = require("express");
2	-var router = express.Router();
3	-
4	-/* GET users listing. */
5	-router.get("/", function(req, res, next) {
6	- res.send("respond with a resource");
7	-});
8	-
9	-module.exports = router;
1	-var consumerNumber = function (nomeConsumidor, callback){
2	- var qrySql = "select TOP (1) COD_DAE, COD_DAE + 9000000 as novo_cod_dae, NOME from cadastro where NOME LIKE '%" + nomeConsumidor + "%'";
3	- poolMsql.request().query(qrySql, function (err, recordset) {
4	- if (err) {
5	- console.log("Não realizou a querie: \n" + err);
6	- }
7	- var numeroDoConsumidor = recordset.recordset[0].novo_cod_dae;
8	- var nomeDoConsumidor = recordset.recordset[0].NOME
9	- return callback(numeroDoConsumidor, nomeDoConsumidor);
10	- });	1	+var consumerNumber = function(nomeConsumidor, callback, err) {
		2	+ var qrySql =
		3	+ "select TOP (1) COD_DAE, COD_DAE + 9000000 as novo_cod_dae, NOME from cadastro where NOME LIKE '%" +
		4	+ nomeConsumidor +
		5	+ "%'";
		6	+ poolMsql.request().query(qrySql, function(err, recordset) {
		7	+ if (err \|\| recordset.recordset.length === 0) {
		8	+ console.log("Não realizou a querie: \n" + err);
		9	+ return callback(null, null, err);
		10	+ } else {
		11	+ var numeroDoConsumidor = recordset.recordset[0].novo_cod_dae;
		12	+ var nomeDoConsumidor = recordset.recordset[0].NOME;
		13	+ return callback(numeroDoConsumidor, nomeDoConsumidor, undefined);
		14	+ }
		15	+ });
11	};	16	};
12		17
13	-module.exports = consumerNumber;
14	\ No newline at end of file	18	\ No newline at end of file
		19	+module.exports = consumerNumber;