Skip to content

WMS support; updated lodash to 4.16.4 #532

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
knutole wants to merge 3 commits into
base: master
Choose a base branch
from
Open

WMS support; updated lodash to 4.16.4 #532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb6255c
WMS support; updated lodash to 4.16.4
knutole Oct 11, 2016
b1c0906
sub
knutole Oct 12, 2016
a385455
Updated analytics
knutole Oct 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ module.exports = function(grunt) {

// dependencies
'public/js/lib/codemirror/mode/cartocss/jquery-2.1.1.min.js',
'public/js/lib/lodash/lodash.min.js',
'public/js/lib/lodash/lodash-4.16.4.js',
'public/js/lib/async/async.js',

// leaflet + mapbox
Expand Down Expand Up @@ -268,6 +268,7 @@ module.exports = function(grunt) {
'public/js/src/controls/control.animator.js',
'public/js/src/ext/popup.chart.js',
'public/js/src/controls/control.chart.js',
'public/js/src/controls/control.wms.js',


// Models
Expand All @@ -281,6 +282,7 @@ module.exports = function(grunt) {
'public/js/src/models/model.layer.providers.js',
'public/js/src/models/model.layer.topojson.js',
'public/js/src/models/model.layer.geojson.js',
'public/js/src/models/model.layer.wms.js',
'public/js/src/models/model.file.js',

// Analytics
Expand Down
68 changes: 51 additions & 17 deletions api/api.analytics.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,30 +11,30 @@ var Role = require('../models/role');
var Group = require('../models/group');

// utils
var _ = require('lodash');
var fs = require('fs-extra');
var gm = require('gm');
var kue = require('kue');
var fss = require("q-io/fs");
var srs = require('srs');
var zlib = require('zlib');
var uuid = require('node-uuid');
var util = require('util');
var utf8 = require("utf8");
var mime = require("mime");
var exec = require('child_process').exec;
var dive = require('dive');
var async = require('async');
var carto = require('carto');
var _ = require('lodash');
var fs = require('fs-extra');
var gm = require('gm');
var kue = require('kue');
var fss = require("q-io/fs");
var srs = require('srs');
var zlib = require('zlib');
var uuid = require('node-uuid');
var util = require('util');
var utf8 = require("utf8");
var mime = require("mime");
var exec = require('child_process').exec;
var dive = require('dive');
var async = require('async');
var carto = require('carto');
var nodeSlack = require('../tools/slack');
var crypto = require('crypto');
var fspath = require('path');
var fspath = require('path');
var request = require('request');
var ogr2ogr = require('ogr2ogr');
var nodepath = require('path');
var formidable = require('formidable');
var nodemailer = require('nodemailer');
var ua = require('universal-analytics');
var ua = require('universal-analytics');
var uploadProgress = require('node-upload-progress');
var mapnikOmnivore = require('mapnik-omnivore');

Expand All @@ -44,6 +44,40 @@ var api = module.parent.exports;
// exports
module.exports = api.analytics = {






event : function (req) {

console.log('analytics event!', req);

var data = req.data;

console.log('analytics data:', data);

},






















downloadedDataset : function (options) {
Expand Down
15 changes: 14 additions & 1 deletion api/api.layer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -879,9 +879,12 @@ module.exports = api.layer = {

layer.save(function (err, savedLayer) {
if (err) return callback(err);
console.log('savedLayer', savedLayer);

if (options.projectUuid) {
console.log('got projectUuid', options.projectUuid);
return api.layer.addToProject(layer._id, options.projectUuid, function (err) {
console.log('added to project!', err);
callback && callback(err, savedLayer);
});
}
Expand All @@ -908,7 +911,17 @@ module.exports = api.layer = {
callback && callback(err);
});
});
}
},


getWMSLayers : function (req, res) {

console.log('getWMSLayers', req.body);


res.send({wms : 'debug'});

},
};

// systemapic hack
Expand Down
5 changes: 5 additions & 0 deletions models/layer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@ var layerSchema = mongoose.Schema({
norkart : String,
google : String,
cube : String,
wms : {
source : String,
layers : [String],
meta : String,
},

postgis : {
sql : String,
Expand Down
2 changes: 1 addition & 1 deletion public
Open in desktop
Submodule public updated 32 files
+1 −1 README.md
+94 −2 css/knut.css
+16,982 −0 js/lib/lodash/lodash-4.16.4.js
+16,982 −0 js/lib/lodash/lodash.js
+0 −3 js/src/chrome/chrome.top.js
+89 −12 js/src/chrome/data/chrome.data.js
+7 −12 js/src/chrome/projects/chrome.projects.js
+7 −6 js/src/chrome/settings/chrome.settings.settingsselector.js
+136 −41 js/src/chrome/settings/styler.js
+6 −14 js/src/chrome/users/chrome.users.js
+4 −1 js/src/controls/control.animator.js
+0 −5 js/src/controls/control.baselayertoggle.js
+0 −3 js/src/controls/control.chart.js
+0 −6 js/src/controls/control.draw.js
+0 −21 js/src/controls/control.inspect.js
+0 −18 js/src/controls/control.layermenu.js
+1 −8 js/src/controls/control.legends.js
+291 −0 js/src/controls/control.wms.js
+4 −0 js/src/core/api.js
+12 −1 js/src/core/api.socket.js
+20 −14 js/src/core/app.js
+51 −2 js/src/ext/analytics.js
+5 −4 js/src/models/model.file.js
+3 −0 js/src/models/model.layer.js
+5 −7 js/src/models/model.layer.vector.js
+684 −0 js/src/models/model.layer.wms.js
+9 −5 js/src/models/model.user.js
+2 −3 js/src/panes/pane.login.js
+3 −2 js/src/panes/pane.map.js
+4 −0 js/src/panes/pane.mapsettings.js
+4 −4 js/src/panes/pane.share.js
+0 −5 js/src/panes/pane.start.js
6 changes: 6 additions & 0 deletions routes/routes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1102,6 +1102,12 @@ module.exports = function(app) {
app.post('/v2/layers/carto/custom', checkAccess, analyticsHandler, api.geo.cartoCustom, errorHandler);




// get list of wms layers
app.get('/v2/layers/wms', checkAccess, analyticsHandler, api.layer.getWMSLayers, errorHandler);


/**
* @api {post} /v2/data/download Download dataset from file
* @apiName Download dataset from file
Expand Down
6 changes: 4 additions & 2 deletions routes/socket.routes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,11 @@ module.exports = function(app) {
});

// get stats
app.io.route('user_event', function (req) {
app.io.route('analytics', function (req) {

// api.socket.userEvent(req);
api.analytics.event(req);

api.socket.userEvent(req);
});

// get stats
Expand Down
16 changes: 14 additions & 2 deletions views/app.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
<!-- @if NODE_ENV == 'DEVELOPMENT' -->

<!-- sentry.io error catching -->
<script src="https://cdn.ravenjs.com/3.7.0/raven.min.js"></script>
<!-- <script src="https://cdn.ravenjs.com/3.7.0/raven.min.js"></script> -->

<!-- D3.js -->
<script type="text/javascript" src="/js/lib/d3.js/d3.js"></script>
Expand All @@ -145,7 +145,7 @@

<!-- dep libs -->
<script type="text/javascript" src="/js/lib/codemirror/mode/cartocss/jquery-2.1.1.min.js"></script>
<script type="text/javascript" src="/js/lib/lodash/lodash.min.js"></script>
<script type="text/javascript" src="/js/lib/lodash/lodash-4.16.4.js"></script>
<script type="text/javascript" src="/js/lib/async/async.js"></script>

<!-- leaflet.js -->
Expand Down Expand Up @@ -263,6 +263,7 @@
<script type="text/javascript" src="/js/src/controls/control.animator.js"></script>
<script type="text/javascript" src="/js/src/ext/popup.chart.js"></script>
<script type="text/javascript" src="/js/src/controls/control.chart.js"></script>
<script type="text/javascript" src="/js/src/controls/control.wms.js"></script>

<!-- models -->
<script type="text/javascript" src="/js/src/models/model.js"></script>
Expand All @@ -275,6 +276,7 @@
<script type="text/javascript" src="/js/src/models/model.layer.providers.js"></script>
<script type="text/javascript" src="/js/src/models/model.layer.topojson.js"></script>
<script type="text/javascript" src="/js/src/models/model.layer.geojson.js"></script>
<script type="text/javascript" src="/js/src/models/model.layer.wms.js"></script>
<script type="text/javascript" src="/js/src/models/model.file.js"></script>

<!-- div -->
Expand Down Expand Up @@ -310,6 +312,16 @@

<!-- @endif -->

<!-- Google Analytics -->
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');

</script>
<!-- End Google Analytics -->


<script type="text/javascript">

Expand Down