diff --git a/config/models.js b/config/models.js index fab0b9d..ebaf723 100644 --- a/config/models.js +++ b/config/models.js @@ -32,7 +32,8 @@ const userSchema = new mongoose.Schema({ showSpeed: {type:Boolean, default:false}, showTemp: {type:Boolean, default:false}, showAlt: {type:Boolean, default:false}, - showStreetview: {type:Boolean, default:false} + showStreetview: {type:Boolean, default:false}, + marker: {type:String, default:'red'} }, last: { time: Date, diff --git a/config/routes/settings.js b/config/routes/settings.js index 97d2b99..3034836 100644 --- a/config/routes/settings.js +++ b/config/routes/settings.js @@ -140,7 +140,8 @@ router.route('/') showScale: (req.body.showScale)?true:false, showSpeed: (req.body.showSpeed)?true:false, showAlt: (req.body.showAlt)?true:false, - showStreetview: (req.body.showStreet)?true:false + showStreetview: (req.body.showStreet)?true:false, + marker: req.body.marker }; // Save user and send response diff --git a/static/img/marker/black.png b/static/img/marker/black.png new file mode 100644 index 0000000..36aafb0 Binary files /dev/null and b/static/img/marker/black.png differ diff --git a/static/img/marker/green.png b/static/img/marker/green.png new file mode 100644 index 0000000..de91fb0 Binary files /dev/null and b/static/img/marker/green.png differ diff --git a/static/img/marker/grey.png b/static/img/marker/grey.png new file mode 100644 index 0000000..1f4641d Binary files /dev/null and b/static/img/marker/grey.png differ diff --git a/static/img/marker/orange.png b/static/img/marker/orange.png new file mode 100644 index 0000000..482c53b Binary files /dev/null and b/static/img/marker/orange.png differ diff --git a/static/img/marker/purple.png b/static/img/marker/purple.png new file mode 100644 index 0000000..eac5625 Binary files /dev/null and b/static/img/marker/purple.png differ diff --git a/static/img/marker/red.png b/static/img/marker/red.png new file mode 100644 index 0000000..d3770dd Binary files /dev/null and b/static/img/marker/red.png differ diff --git a/static/img/marker/white.png b/static/img/marker/white.png new file mode 100644 index 0000000..3fa860a Binary files /dev/null and b/static/img/marker/white.png differ diff --git a/static/img/marker/yellow.png b/static/img/marker/yellow.png new file mode 100644 index 0000000..d06c4ef Binary files /dev/null and b/static/img/marker/yellow.png differ diff --git a/static/js/map.js b/static/js/map.js index 6c27c47..618b140 100644 --- a/static/js/map.js +++ b/static/js/map.js @@ -71,6 +71,7 @@ loadGoogleMapsAPI({ key:mapKey }) marker = new googlemaps.Marker({ position: { lat:mapuser.last.lat, lng:mapuser.last.lon }, title: mapuser.name, + icon: (mapuser.settings.marker)?'/static/img/marker/'+mapuser.settings.marker+'.png':'/static/img/marker/red.png', map: map, draggable: false }); diff --git a/views/settings.html b/views/settings.html index 066db1e..934f324 100644 --- a/views/settings.html +++ b/views/settings.html @@ -60,6 +60,20 @@

+
+ + +
+
@@ -89,7 +103,7 @@
- +