Merge branch 'clean-menu'

trifectalabs · Jun 21, 2017 · 2491417 · 2491417
2 parents 1bef025 + 0e79c56
commit 2491417
Show file tree

Hide file tree

Showing 50 changed files with 989 additions and 840 deletions.
diff --git a/web/app/views/index.scala.html b/web/app/views/index.scala.html
@@ -3,8 +3,25 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <link rel="icon" type="image/png" href="favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="favicon-16x16.png" sizes="16x16">
+    <title>Road Quality</title>
+
+    <link rel="apple-touch-icon" sizes="57x57" href="/assets/favicon/apple-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="/assets/favicon/apple-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="/assets/favicon/apple-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="/assets/favicon/apple-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="/assets/favicon/apple-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="/assets/favicon/apple-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="/assets/favicon/apple-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="/assets/favicon/apple-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="/assets/favicon/apple-icon-180x180.png">
+    <link rel="icon" type="image/png" sizes="192x192"  href="/assets/favicon/android-icon-192x192.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="/assets/favicon/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="96x96" href="/assets/favicon/favicon-96x96.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="/assets/favicon/favicon-16x16.png">
+    <link rel="manifest" href="/assets/favicon/manifest.json">
+    <meta name="msapplication-TileColor" content="#ffffff">
+    <meta name="msapplication-TileImage" content="/assets/favicon/ms-icon-144x144.png">
+    <meta name="theme-color" content="#ffffff">
 
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Lato:300,400,600,700" />
     <link rel="stylesheet" href="/assets/stylesheets/main.css" />

diff --git a/web/elm-package.json b/web/elm-package.json
@@ -15,6 +15,7 @@
         "elm-lang/html": "2.0.0 <= v < 3.0.0",
         "elm-lang/http": "1.0.0 <= v < 2.0.0",
         "elm-lang/navigation": "2.1.0 <= v < 3.0.0",
+        "elm-lang/svg": "2.0.0 <= v < 3.0.0",
         "evancz/url-parser": "2.0.1 <= v < 3.0.0",
         "lukewestby/elm-http-builder": "5.1.0 <= v < 6.0.0",
         "mdgriffith/elm-style-animation": "3.5.5 <= v < 4.0.0",

diff --git a/web/public/favicon/android-icon-144x144.png b/web/public/favicon/android-icon-144x144.png
diff --git a/web/public/favicon/android-icon-192x192.png b/web/public/favicon/android-icon-192x192.png
diff --git a/web/public/favicon/android-icon-36x36.png b/web/public/favicon/android-icon-36x36.png
diff --git a/web/public/favicon/android-icon-48x48.png b/web/public/favicon/android-icon-48x48.png
diff --git a/web/public/favicon/android-icon-72x72.png b/web/public/favicon/android-icon-72x72.png
diff --git a/web/public/favicon/android-icon-96x96.png b/web/public/favicon/android-icon-96x96.png
diff --git a/web/public/favicon/apple-icon-114x114.png b/web/public/favicon/apple-icon-114x114.png
diff --git a/web/public/favicon/apple-icon-120x120.png b/web/public/favicon/apple-icon-120x120.png
diff --git a/web/public/favicon/apple-icon-144x144.png b/web/public/favicon/apple-icon-144x144.png
diff --git a/web/public/favicon/apple-icon-152x152.png b/web/public/favicon/apple-icon-152x152.png
diff --git a/web/public/favicon/apple-icon-180x180.png b/web/public/favicon/apple-icon-180x180.png
diff --git a/web/public/favicon/apple-icon-57x57.png b/web/public/favicon/apple-icon-57x57.png
diff --git a/web/public/favicon/apple-icon-60x60.png b/web/public/favicon/apple-icon-60x60.png
diff --git a/web/public/favicon/apple-icon-72x72.png b/web/public/favicon/apple-icon-72x72.png
diff --git a/web/public/favicon/apple-icon-76x76.png b/web/public/favicon/apple-icon-76x76.png
diff --git a/web/public/favicon/apple-icon-precomposed.png b/web/public/favicon/apple-icon-precomposed.png
diff --git a/web/public/favicon/apple-icon.png b/web/public/favicon/apple-icon.png
diff --git a/web/public/favicon/browserconfig.xml b/web/public/favicon/browserconfig.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig><msapplication><tile><square70x70logo src="/ms-icon-70x70.png"/><square150x150logo src="/ms-icon-150x150.png"/><square310x310logo src="/ms-icon-310x310.png"/><TileColor>#ffffff</TileColor></tile></msapplication></browserconfig>
diff --git a/web/public/favicon/favicon-16x16.png b/web/public/favicon/favicon-16x16.png
diff --git a/web/public/favicon/favicon-32x32.png b/web/public/favicon/favicon-32x32.png
diff --git a/web/public/favicon/favicon-96x96.png b/web/public/favicon/favicon-96x96.png
diff --git a/web/public/favicon/favicon.ico b/web/public/favicon/favicon.ico
diff --git a/web/public/favicon/manifest.json b/web/public/favicon/manifest.json
@@ -0,0 +1,41 @@
+{
+ "name": "App",
+ "icons": [
+  {
+   "src": "\/android-icon-36x36.png",
+   "sizes": "36x36",
+   "type": "image\/png",
+   "density": "0.75"
+  },
+  {
+   "src": "\/android-icon-48x48.png",
+   "sizes": "48x48",
+   "type": "image\/png",
+   "density": "1.0"
+  },
+  {
+   "src": "\/android-icon-72x72.png",
+   "sizes": "72x72",
+   "type": "image\/png",
+   "density": "1.5"
+  },
+  {
+   "src": "\/android-icon-96x96.png",
+   "sizes": "96x96",
+   "type": "image\/png",
+   "density": "2.0"
+  },
+  {
+   "src": "\/android-icon-144x144.png",
+   "sizes": "144x144",
+   "type": "image\/png",
+   "density": "3.0"
+  },
+  {
+   "src": "\/android-icon-192x192.png",
+   "sizes": "192x192",
+   "type": "image\/png",
+   "density": "4.0"
+  }
+ ]
+}
diff --git a/web/public/favicon/ms-icon-144x144.png b/web/public/favicon/ms-icon-144x144.png
diff --git a/web/public/favicon/ms-icon-150x150.png b/web/public/favicon/ms-icon-150x150.png
diff --git a/web/public/favicon/ms-icon-310x310.png b/web/public/favicon/ms-icon-310x310.png
diff --git a/web/public/favicon/ms-icon-70x70.png b/web/public/favicon/ms-icon-70x70.png
diff --git a/web/public/img/arrow-left.svg b/web/public/img/arrow-left.svg
diff --git a/web/public/img/arrow-right.svg b/web/public/img/arrow-right.svg
diff --git a/web/public/img/check.svg b/web/public/img/check.svg
diff --git a/web/public/img/marker.png b/web/public/img/marker.png
diff --git a/web/public/img/start-marker.png b/web/public/img/start-marker.png
diff --git a/web/public/img/strava_login.svg → web/public/img/strava-login.svg b/web/public/img/strava_login.svg → web/public/img/strava-login.svg
diff --git a/web/public/img/surface-quality-vert.png b/web/public/img/surface-quality-vert.png
diff --git a/web/public/img/traffic-safety-vert.png b/web/public/img/traffic-safety-vert.png
diff --git a/web/public/img/trifecta_mountains.png → web/public/img/trifecta-mountains.png b/web/public/img/trifecta_mountains.png → web/public/img/trifecta-mountains.png
diff --git a/web/public/img/user.png b/web/public/img/user.png
diff --git a/web/public/img/x.svg b/web/public/img/x.svg
diff --git a/web/public/javascripts/init.js b/web/public/javascripts/init.js
@@ -12,6 +12,7 @@ let cursorOverPoint = null;
 let isDragging = false;
 let viewOnly = true;
 let popup;
+let showingLayer;
 
   // STORE SESSION
 app.ports.storeSession.subscribe(function(session) {
@@ -39,7 +40,7 @@ app.ports.up.subscribe(function(authed) {
             container: "MainView",
             style: "mapbox://styles/mapbox/light-v9",
             center: [-79.412190, 43.667632],
-            zoom: 10
+            zoom: 12
         });
 
         canvas = map.getCanvasContainer();
@@ -50,27 +51,56 @@ app.ports.up.subscribe(function(authed) {
         map.on("mousedown", onMapMouseDown);
         map.on("mouseup", onMapMouseUp);
 
-        map.on('load', function () {
+        showingLayer = "SurfaceQuality";
+        map.on("load", function () {
             map.addLayer({
-                "id": "mini_segments",
+                "id": "SurfaceQuality",
                 "type": "line",
                 "source": {
-                    type: 'vector',
-                    tiles: ['https://tiles.roadquality.org/surface_quality/{z}/{x}/{y}.pbf']
+                    type: "vector",
+                    tiles: ["https://tiles.roadquality.org/surface_quality/{z}/{x}/{y}.pbf"]
                 },
                 "source-layer": "surface_mini_segments",
                 "paint": {
                     "line-color": {
-                          "type": "identity",
-                          "property": "colour"
+                        "type": "identity",
+                        "property": "colour"
                     },
-                    "line-width": 1.5
+                    "line-width": 2
                 }
             });
         });
     }, 100);
 });
 
+app.ports.setLayer.subscribe(function(layer) {
+    if (showingLayer === layer) {
+        return;
+    } else if (map.getLayer(layer)) {
+        map.setLayoutProperty(showingLayer, "visibility", "none");
+        map.setLayoutProperty(layer, "visibility", "visible");
+    } else if (layer === "TrafficSafety") {
+        map.setLayoutProperty(showingLayer, "visibility", "none");
+        map.addLayer({
+            "id": "TrafficSafety",
+            "type": "line",
+            "source": {
+                type: "vector",
+                tiles: ["https://tiles.roadquality.org/traffic/{z}/{x}/{y}.pbf"]
+            },
+            "source-layer": "traffic_mini_segments",
+            "paint": {
+                "line-color": {
+                    "type": "identity",
+                    "property": "colour"
+                },
+                "line-width": 2
+            }
+        });
+    }
+    showingLayer = layer;
+});
+
 app.ports.routeCreate.subscribe(function() {
     viewOnly = false;
     map.on("click", onMapClick);

diff --git a/web/src/Data/Map.elm b/web/src/Data/Map.elm
@@ -1,11 +1,18 @@
-module Data.Map exposing (CycleRoute, decodeCycleRoute, Point, decodePoint, encodePoint, SurfaceType(..), PathType(..), Segment, decodeSegment, CreateSegmentForm, encodeCreateSegmentForm)
+module Data.Map exposing (MapLayer(..), CycleRoute, decodeCycleRoute, Point, decodePoint, encodePoint, SurfaceType(..), PathType(..), Segment, decodeSegment, CreateSegmentForm, encodeCreateSegmentForm)
 
 import Json.Decode as Decode exposing (Decoder)
 import Json.Decode.Pipeline as Pipeline exposing (decode, required)
 import Json.Encode as Encode exposing (Value)
 import Util exposing ((=>))
 
 
+type MapLayer
+    = PlainMap
+    | SurfaceQuality
+    | TrafficSafety
+    | SegmentsView
+
+
 type alias CycleRoute =
     { distance : Float
     , polyline : String

diff --git a/web/src/Data/UserPhoto.elm b/web/src/Data/UserPhoto.elm
@@ -44,7 +44,7 @@ photoToUrl : UserPhoto -> String
 photoToUrl (UserPhoto maybeUrl) =
     case maybeUrl of
         Nothing ->
-            "https://static.productionready.io/images/smiley-cyrus.jpg"
+            "/assets/img/user.png"
 
         Just url ->
             url
diff --git a/web/src/Main.elm b/web/src/Main.elm
@@ -355,7 +355,7 @@ updatePage page msg model =
                                     }
                                         => Cmd.batch
                                             [ Ports.storeSession Nothing
-                                            , Route.modifyUrl Route.Home
+                                            , Route.modifyUrl Route.Login
                                             ]
 
                     cmd =
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		<?xml version="1.0" encoding="utf-8"?>
		<browserconfig><msapplication><tile><square70x70logo src="/ms-icon-70x70.png"/><square150x150logo src="/ms-icon-150x150.png"/><square310x310logo src="/ms-icon-310x310.png"/><TileColor>#ffffff</TileColor></tile></msapplication></browserconfig>