Skip to content
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

Refactor maps code #416

Merged
merged 12 commits into from
Nov 17, 2016
Merged

Refactor maps code #416

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ec32e56
Rewrite mapping code
rjmackay Nov 14, 2016
4ad0b06
Refactor post detail maps
rjmackay Nov 14, 2016
9adc78c
Rename post-location and setting map directive files
rjmackay Nov 14, 2016
e828fc8
Reinstate map clustering option
rjmackay Nov 14, 2016
56fe0ff
Refactor post location editor
rjmackay Nov 14, 2016
78fd21c
Refactor settings map directive
rjmackay Nov 14, 2016
d8e1cac
Remove leaflet directive
rjmackay Nov 14, 2016
c6d923f
Update unit tests
rjmackay Nov 15, 2016
f8cc7f6
Replace leaflet default markers with Ushahidi style marker
rjmackay Nov 17, 2016
4312795
Better test coverage
rjmackay Nov 17, 2016
15bd004
Merge branch 'webpack' into refactor-maps-code
rjmackay Nov 17, 2016
ab1e337
Fix Iconic icons in map popups
rjmackay Nov 17, 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
11 changes: 5 additions & 6 deletions app/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
require('angular');
require('angular-route');
require('leaflet');
require('leaflet.markercluster');
require('leaflet.locatecontrol/src/L.Control.Locate');
require('angular-leaflet-directive');
require('angular-resource');
require('angular-translate');
require('angular-translate-loader-static-files');
Expand Down Expand Up @@ -71,7 +67,6 @@ angular.module('app',
'pascalprecht.translate',
'ui.bootstrap.pagination',
'angular-datepicker',
'leaflet-directive',
'angular.filter',
'ng-showdown',
'ngGeolocation',
Expand Down Expand Up @@ -109,7 +104,11 @@ angular.module('app',
return require('URIjs/src/URI.js');
})
.factory('Leaflet', function () {
return window.L;
var L = require('leaflet');
// Load leaflet plugins here too
require('imports?L=leaflet!leaflet.markercluster');
require('imports?L=leaflet!leaflet.locatecontrol/src/L.Control.Locate');
return L;
})
.factory('moment', function () {
return require('moment');
Expand Down
Loading