diff --git a/bin/www b/bin/www index 077d2e1..de525b7 100644 --- a/bin/www +++ b/bin/www @@ -11,7 +11,7 @@ var http = require('http'); // /** // * Production verification // */ - +// var express = require("express"); // if (process.env.NODE_ENV === 'production') { // // Express will serve up production assets // // like our main.js file, or main.css file! diff --git a/views/index.jade b/views/index.jade index 3d63b9a..b1bed40 100644 --- a/views/index.jade +++ b/views/index.jade @@ -2,4 +2,11 @@ extends layout block content h1= title - p Welcome to #{title} + p Selecione aqui o link desejado: + a(href="/auth/google") Selecione aqui para logar + p + a(href="/map/paulo") Selecione aqui para acessar o mapa + p + a(href="/api/current_user") Selecione aqui para saber o usuário logado + p + a(href="/api/logout") Selecione aqui para fazer logout diff --git a/views/map.jade b/views/map.jade index 2890de3..435c77a 100644 --- a/views/map.jade +++ b/views/map.jade @@ -23,10 +23,16 @@ block content southWest = L.latLng(#{bndSW}), northEast = L.latLng(#{bndNE}), bounds = L.latLngBounds(southWest, northEast), - osmAttrib = 'NEXUS', + osmAttrib = '', osm = L.tileLayer(osmUrl, {attribution: osmAttrib}), - map = L.map('map', {center: new L.LatLng(#{lat},#{lng}), zoom: #{fator_zoom}, maxBounds: bounds}), + map = L.map('map', { + center: new L.LatLng(#{lat},#{lng}), + zoom: #{fator_zoom}, + maxBounds: bounds + }); + + map.attributionControl.setPrefix(''); wmsLayer= L.tileLayer.wms("#{geoserverWMS}", { layers: "#{waterLayers}", format: 'image/png', @@ -34,7 +40,25 @@ block content maxZoom: 23 }), drawnItems = L.featureGroup().addTo(map); - + + // places the logomark + L.Control.Watermark = L.Control.extend({ + onAdd: function(map) { + var img = L.DomUtil.create('img'); + img.src = 'https://nexusbr.com/images/logo.png'; + img.style.width = '130px'; + return img; + }, + onRemove: function(map) { + // Nothing to do here + } + }); + L.control.watermark = function(opts) { + return new L.Control.Watermark(opts); + } + L.control.watermark({ position: 'bottomright' }).addTo(map); + + // places the layer control to on and off 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}', { @@ -45,5 +69,6 @@ block content { position: 'topright', collapsed: false } ).addTo(map); + // places the marker that was found var marker = L.marker([#{lat},#{lng}]).addTo(map); marker.bindPopup("#{codigo}
#{consumidor}").openPopup(); \ No newline at end of file -- libgit2 0.21.2