final adjustments

vroland · Nov 10, 2019 · d548c66 · d548c66
1 parent 786abb7
commit d548c66
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 2 deletions.
diff --git a/obst/tspopt/optimize.py b/obst/tspopt/optimize.py
@@ -212,7 +212,7 @@ def time_callback(from_index, to_index):
     #routing.AddVariableMinimizedByFinalizer(time_dimension.CumulVar(routing.End(0)))
 
     # Allow to drop nodes.
-    penalty = 100
+    penalty = 10000
     for node in range(len(data['graph'].nodes)):
         if node != data['depot']:
             routing.AddDisjunction([manager.NodeToIndex(node)], penalty)

diff --git a/obst/ui/img/hiking-solid.svg b/obst/ui/img/hiking-solid.svg
diff --git a/obst/ui/index.html b/obst/ui/index.html
@@ -291,7 +291,7 @@
 
 <div style="-bottom:50px;" class="header">
   <img src="img/hiking-solid.svg" width=60 height=60 />
-  <h2  style="margin-bottom:30px;" >Obstsalat macht Geschichte</h2>
+  <h1  style="margin-bottom:30px;" ><i class="fas fa-apple-alt" style="font-size: 25px"></i> obstsalat</h1>
   <p style="font-family: sans-serif; font-size: 18px;">Entdecke deine Stadt auf neuen Wegen!</p>
 </div>
 
@@ -368,13 +368,21 @@ <h2  style="margin-bottom:30px;" >Obstsalat macht Geschichte</h2>
 // build map
 var mymap = L.map('mapid').setView([ 51.0504088, 13.7372621], 13);
 
+var Wikimedia = L.tileLayer('https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}{r}.png', {
+	attribution: '<a href="https://wikimediafoundation.org/wiki/Maps_Terms_of_Use">Wikimedia</a>',
+	minZoom: 1,
+	maxZoom: 19
+}).addTo(mymap);
+
+/*
 L.tileLayer('https://api.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token=pk.eyJ1IjoibWFwYm94IiwiYSI6ImNpejY4NXVycTA2emYycXBndHRqcmZ3N3gifQ.rJcFIG214AriISLbB6B5aw', {
   maxZoom: 18,
   attribution: 'Map data &copy; <a href="https://www.openstreetmap.org/">OpenStreetMap</a> contributors, ' +
     '<a href="https://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, ' +
     'Imagery © <a href="https://www.mapbox.com/">Mapbox</a>',
   id: 'mapbox.streets'
 }).addTo(mymap);
+*/
 
 function displayData(routeinfo) {