Better map.

[wolnelektury.git] / src / wolnelektury / static / js / book_text / references.js

diff --git a/src/wolnelektury/static/js/book_text/references.js b/src/wolnelektury/static/js/book_text/references.js
index 7c98763..4c72fe6 100644 (file)
--- a/src/wolnelektury/static/js/book_text/references.js
+++ b/src/wolnelektury/static/js/book_text/references.js
@@ -8,18 +8,18 @@
         $("#settings-references").css('display', 'block');
     }
 
         $("#settings-references").css('display', 'block');
     }
 

-    
-    

     var map_enabled = false;
     var map_enabled = false;

-    var marker = L.marker([0,0]);
+    var marker = L.circleMarker([0,0]);

     var map = null;
 
     function enable_map() {
     var map = null;
 
     function enable_map() {

+        $("#reference-map").show('slow');
+

         if (map_enabled) return;
 
         map = L.map('reference-map').setView([0, 0], 11);
         if (map_enabled) return;
 
         map = L.map('reference-map').setView([0, 0], 11);

-        L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
-            attribution: 'Map data &copy; <a href="http://openstreetmap.org/copyright">OpenStreetMap contributors</a>'
+        L.tileLayer('https://tile.thunderforest.com/cycle/{z}/{x}/{y}.png?apikey=a8a97f0ae5134403ac38c1a075b03e15', {
+            attribution: 'Maps © <a href="http://www.thunderforest.com">Thunderforest</a>, Data © <a href="http://www.openstreetmap.org/copyright">OpenStreetMap contributors</a>'

         }).addTo(map);
 
         map_enabled = true;
         }).addTo(map);
 
         map_enabled = true;


@@ -60,7 +60,6 @@
             enable_map();
 
             marker.setLatLng(ref.location);
             enable_map();
 
             marker.setLatLng(ref.location);

-            //marker.setContent(ref.label);

             marker.bindTooltip(ref.label).openTooltip();
             map.addLayer(marker);
             map.panTo(ref.location, {
             marker.bindTooltip(ref.label).openTooltip();
             map.addLayer(marker);
             map.panTo(ref.location, {


@@ -74,7 +73,7 @@
             }
         }
 
             }
         }
 

-        $("#reference-images img").remove();
+        $("#reference-images a").remove();

         if (ref.images) {
             $.each(ref.images, function(i, e) {
                 $i = $("<a target='_blank'><img></a>");
         if (ref.images) {
             $.each(ref.images, function(i, e) {
                 $i = $("<a target='_blank'><img></a>");