Download as
Browse Code »

Commit 74e3cc25456902e72b50543fc6349b714237287f

Authored by José Maria Villac Pinheiro
1 parent 72ce85fa
Exists in master and in 1 other branch Branch_8238183

V. 0.2.1 Pequenas modificações

Showing 5 changed files with 64 additions and 57 deletions   Show diff stats
app.js
  Diff comments   View file @74e3cc2
... ... @@ -6,7 +6,6 @@ var cookieParser = require('cookie-parser');
6 6 var bodyParser = require('body-parser');
7 7  
8 8 var index = require('./routes/index');
9   -var users = require('./routes/users');
10 9  
11 10 var app = express();
12 11  
... ... @@ -23,7 +22,6 @@ app.use(cookieParser());
23 22 app.use(express.static(path.join(__dirname, 'public')));
24 23  
25 24 app.use('/', index);
26   -app.use('/users', users);
27 25  
28 26 // catch 404 and forward to error handler
29 27 app.use(function(req, res, next) {
... ...
routes/index.js
  Diff comments   View file @74e3cc2
... ... @@ -2,36 +2,47 @@ var express = require("express");
2 2 var router = express.Router();
3 3 require("../services/passport");
4 4 require("../services/databases");
5   -const authRoutes = require("./authRoutes");
  5 +const keys = require("../config/keys");
6 6  
7   -authRoutes(router);
  7 +require("./authRoutes")(router);
8 8  
9 9 /* GET home page. */
10 10 router.get("/", function(req, res, next) {
11 11 res.render("index", { title: "NEXUS" });
12 12 });
13 13  
  14 +// bounding coordinates to view the map
  15 +var boundSW = [-23.6506647239914, -46.5848434588656]; // lat, long
  16 +var boundNE = [-23.5992830936269, -46.5447524538661];
  17 +
14 18 router.get("/map/:nome", function(req, res, next) {
15 19 var numeroConsumidor = require("../src/findConsumerNumber");
16 20 var coordenadas = require("../src/findCoordinatesFromConsumer");
17   - var retorno = numeroConsumidor(req.params.nome, function(numero, nome) {
18   - console.log("Terminou tudo: " + numero + " Nome: " + nome);
19   - var codigoComNome = numero + " - " + nome;
20   - var retorno = coordenadas(numero, function(x, y) {
21   - console.log("Terminou procura coordenadas x: " + x + " y: " + y);
22   - res.render("map", {
23   - codigo: numero,
24   - consumidor: codigoComNome,
25   - fator_zoom: 23,
26   - title: "NEXUS",
27   - lat: y,
28   - lng: x
  21 + var retorno = numeroConsumidor(req.params.nome, function(numero, nome, err) {
  22 + if (err === undefined) {
  23 + console.log("Terminou tudo: " + numero + " Nome: " + nome);
  24 + var codigoComNome = numero + " - " + nome;
  25 + var retorno = coordenadas(numero, function(x, y) {
  26 + console.log("Terminou procura coordenadas x: " + x + " y: " + y);
  27 + res.render("map", {
  28 + codigo: numero,
  29 + consumidor: codigoComNome,
  30 + fator_zoom: 23,
  31 + title: "NEXUS",
  32 + lat: y,
  33 + lng: x,
  34 + bndSW: boundSW,
  35 + bndNE: boundNE,
  36 + geoserverWMS: keys.geoserverWMS,
  37 + waterLayers: keys.waterLayers,
  38 + server: keys.server
  39 + });
29 40 });
30   - });
  41 + }
31 42 });
32 43 });
33 44  
34   -router.get("http://nexusbr.dyndns-ip.com:3000/ponto", function(req, res) {
  45 +router.get(keys.server + "/ponto", function(req, res) {
35 46 var coord = {};
36 47 console.log("Postou: ");
37 48 });
... ...
routes/users.js
View file @72ce85f
... ... @@ -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;
src/findConsumerNumber.js
  Diff comments   View file @74e3cc2
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 18 \ No newline at end of file
  19 +module.exports = consumerNumber;
... ...
views/map.jade
  Diff comments   View file @74e3cc2
... ... @@ -9,38 +9,41 @@ block content
9 9 input.form-control(type='text', id="nome", placeholder='Digite o nome')
10 10 .col.col-lg-1
11 11 input.btn.btn-primary(type='button', value='Procura', onclick=' relocate_home()')
  12 +
12 13 script.
13 14 function relocate_home()
14 15 {
15   - location.href = "http://nexusbr.dyndns-ip.com:3000/map/" + nome.value ;
  16 + location.href = "#{server}/map/" + nome.value;
16 17 }
17 18 br
18 19 #map
19 20  
20 21 script(type='text/javascript').
21 22 var osmUrl = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
22   - osmAttrib = '',
  23 + southWest = L.latLng(#{bndSW}),
  24 + northEast = L.latLng(#{bndNE}),
  25 + bounds = L.latLngBounds(southWest, northEast),
  26 + osmAttrib = 'NEXUS',
23 27 osm = L.tileLayer(osmUrl,
24 28 {attribution: osmAttrib}),
25   - map = L.map('map', {center: new L.LatLng(#{lat},#{lng}), zoom: #{fator_zoom}}),
26   - wmsLayer= L.tileLayer.wms("http://nexusbr.dyndns-ip.com:9080/geoserver/saocaetano/wms", {
27   - layers: 'saocaetano:quadras, saocaetano:redesAgua, saocaetano:noAgua, saocaetano:ramalAgua, saocaetano:ligacaoAgua',
  29 + map = L.map('map', {center: new L.LatLng(#{lat},#{lng}), zoom: #{fator_zoom}, maxBounds: bounds}),
  30 + wmsLayer= L.tileLayer.wms("#{geoserverWMS}", {
  31 + layers: "#{waterLayers}",
28 32 format: 'image/png',
29 33 transparent: true,
30 34 maxZoom: 23
31 35 }),
32 36 drawnItems = L.featureGroup().addTo(map);
33   -
34 37 L.control.layers({
35 38 "OSM": osm.addTo(map),
36 39 "Google": L.tileLayer('http://www.google.cn/maps/vt?lyrs=s@189&gl=cn&x={x}&y={y}&z={z}', {
37 40 attribution: 'google'
38 41 })
39 42 }, {'Ocorrências': drawnItems, 'Redes': wmsLayer}, { position: 'topright', collapsed: true }).addTo(map);
40   -
  43 +
41 44 var marker = L.marker([#{lat},#{lng}]).addTo(map);
42 45 marker.bindPopup("<b>#{codigo}</b><br>#{consumidor}").openPopup();
43   -
  46 +
44 47 var drawControl = new L.Control.Draw({
45 48 draw: {
46 49 polygon: false,
... ... @@ -91,15 +94,14 @@ block content
91 94 });
92 95  
93 96 // Object(s) edited - update popups
94   - map.on(L.Draw.Event.EDITED, function(event) {
95   - console.log ("Entrou no evento Edited");
96   - var layers = event.layers,
97   - content = null;
98   - layers.eachLayer(function(layer) {
99   - content = getPopupContent(layer);
100   - if (content !== null) {
101   - layer.setPopupContent(content);
102   - }
  97 + map.on(L.Draw.Event.EDITED, function(event) {
  98 + console.log ("Entrou no evento Edited");
  99 + var layers = event.layers,
  100 + content = null;
  101 + layers.eachLayer(function(layer) {
  102 + content = getPopupContent(layer);
  103 + if (content !== null) {
  104 + layer.setPopupContent(content);
  105 + }
  106 + });
103 107 });
104   - });
105   -
106 108 \ No newline at end of file
... ...