From e9e45e885b9a8aacb680007355d47b1acb9898ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5vard=20Ranum?= <havard.ranum@me.com>
Date: Tue, 30 Oct 2018 13:08:46 +0100
Subject: [PATCH] fix(cabin): fix map URLs

---
 client/app/components/leaflet-map.js | 43 ++++++++++++++++------------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/client/app/components/leaflet-map.js b/client/app/components/leaflet-map.js
index 67aaf48..e95ae68 100644
--- a/client/app/components/leaflet-map.js
+++ b/client/app/components/leaflet-map.js
@@ -29,7 +29,7 @@ export default Ember.Component.extend({
     this.mapLayers = this.createMapLayers();
 
     var mapOptions = {
-      layers: [this.mapLayers.baseLayerConf['Topo 2']],
+      layers: [this.mapLayers.baseLayerConf['Kartdata 2'], this.mapLayers.baseLayerConf['Topo 4']],
       scrollWheelZoom: false,
       center: this.get('centerLatLng'),
       zoom: this.get('zoom')
@@ -38,6 +38,10 @@ export default Ember.Component.extend({
     var view = this.$();
     this.map = L.map(view[0], mapOptions);
 
+    L.control.layers(this.mapLayers.baseLayerConf, this.mapLayers.overlayConf, {
+      position: 'topleft'
+    }).addTo(this.map);
+
     this.initMarker();
 
   }.on('didInsertElement'),
@@ -100,35 +104,38 @@ export default Ember.Component.extend({
     var kartdata, topo, summer, winter, cabin, baseLayerConf, overlayConf;
 
     kartdata =  L.tileLayer('https://opencache.statkart.no/gatekeeper/gk/gk.open_gmaps?layers=kartdata2&zoom={z}&x={x}&y={y}', {
-      maxZoom: 16,
-      attribution: '<a href="http://www.statkart.no/">Statens kartverk</a>'
+        maxZoom: 16,
+        attribution: '<a href="http://kartverket.no/">Kartverket</a>'
     });
 
-    topo =  L.tileLayer('https://opencache.statkart.no/gatekeeper/gk/gk.open_gmaps?layers=topo2&zoom={z}&x={x}&y={y}', {
-      maxZoom: 16,
-      attribution: '<a href="http://www.statkart.no/">Statens kartverk</a>'
+    topo =  L.tileLayer('https://opencache.statkart.no/gatekeeper/gk/gk.open_gmaps?layers=topo4&zoom={z}&x={x}&y={y}', {
+        maxZoom: 16,
+        attribution: '<a href="http://kartverket.no/">Kartverket</a>'
     });
 
-    summer = L.tileLayer('http://mt3.turistforeningen.no/prod/trail_summer/{z}/{x}/{y}.png', {
-      maxZoom: 16,
-      attribution: '<a href="http://www.turistforeningen.no/">DNT</a>'
+    summer = L.tileLayer.wms('https://wms.geonorge.no/skwms1/wms.friluftsruter2?', {
+        layers: 'Fotrute',
+        format: 'image/png',
+        transparent: true,
     });
 
-    winter = L.tileLayer('http://mt3.turistforeningen.no/prod/trail_winter/{z}/{x}/{y}.png', {
-      maxZoom: 16,
-      attribution: '<a href="http://www.turistforeningen.no/">DNT</a>'
+    winter = L.tileLayer.wms('https://wms.geonorge.no/skwms1/wms.friluftsruter2?', {
+        layers: 'Skiloype',
+        format: 'image/png',
+        transparent: true
     });
 
-    cabin = L.tileLayer('http://mt3.turistforeningen.no/prod/cabin/{z}/{x}/{y}.png', {
-      maxZoom: 16,
-      attribution: '<a href="http://www.turistforeningen.no/">DNT</a>'
-    });
+    // NOTE: Disabled, not working
+    // cabin = L.tileLayer('http://mt3.turistforeningen.no/prod/cabin/{z}/{x}/{y}.png', {
+    //   maxZoom: 16,
+    //   attribution: '<a href="http://www.turistforeningen.no/">DNT</a>'
+    // });
 
-    baseLayerConf = {'Kartdata 2': kartdata, 'Topo 2': topo};
+    baseLayerConf = {'Kartdata 2': kartdata, 'Topo 4': topo};
     overlayConf = {
       'DNTs merkede stier': summer,
       'DNTs merkede vinterruter': winter,
-      'DNTs turisthytter': cabin
+      // 'DNTs turisthytter': cabin
     };
 
     return {