From 3069da030f66ccc2a806e02bd9471a93bbbe9e83 Mon Sep 17 00:00:00 2001
From: Nermin <nj2245@student.uni-lj.si>
Date: Tue, 18 Sep 2018 16:36:32 +0200
Subject: [PATCH] Uploaded missing updates in main view.

---
 sna/application/views/home/index_view.php  | 10 +++---
 sna/application/views/home/legend_view.php |  1 +
 sna/application/views/home/map_view.php    | 37 +++++++++++++++++-----
 3 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/sna/application/views/home/index_view.php b/sna/application/views/home/index_view.php
index b005437..d9ce5a4 100644
--- a/sna/application/views/home/index_view.php
+++ b/sna/application/views/home/index_view.php
@@ -139,7 +139,7 @@ Slovenski narečni atlas / Slovenian dialectal atlas
 
  	var id_word=$("#words option:selected").val();
 
- 	console.log(id_word);
+ 	//console.log(id_word);
 
 	$.ajax({
         type: "POST",
@@ -151,10 +151,10 @@ Slovenski narečni atlas / Slovenian dialectal atlas
         },
         dataType: "json",
         success: function(data){
-            console.log(data);
+            //console.log(data);
         	if(data.status=='ok')
         	{
-        	    console.log(data);
+        	    //console.log(data);
         		//update modals
         		$('#modals').html(data.view_modals);
 
@@ -279,7 +279,7 @@ Slovenski narečni atlas / Slovenian dialectal atlas
                     }
 
                     let name;
-                    console.log('star: ', transcription.star);
+                    //console.log('star: ', transcription.star);
                     if(transcription.star === '1'){
                         name = transcription.short_name + '*';
                     }
@@ -313,7 +313,7 @@ Slovenski narečni atlas / Slovenian dialectal atlas
         	}    
         },
         error: function(e){
-            console.log(e);
+            //console.log(e);
             alert('Prišlo je do napake pri nalaganju podatkov. Prosimo poskusite ponovno!');
         }
  	});
diff --git a/sna/application/views/home/legend_view.php b/sna/application/views/home/legend_view.php
index 5c05153..bb4666a 100644
--- a/sna/application/views/home/legend_view.php
+++ b/sna/application/views/home/legend_view.php
@@ -28,6 +28,7 @@ if(isset($legend) and $legend)
 	<div class="info-panel-image-borders legend">
 		<div class="legend_title text-left" style="font-size:10px">
 			<strong><span>Legenda</span></strong>
+			<span style="font-size: 20px">* - </span>
 		</div>
 		<table class="table" style="font-size:10px">
 		  <thead>
diff --git a/sna/application/views/home/map_view.php b/sna/application/views/home/map_view.php
index 36d9115..5b7f4f9 100644
--- a/sna/application/views/home/map_view.php
+++ b/sna/application/views/home/map_view.php
@@ -20,9 +20,13 @@ Slovenski narečni atlas / Slovenian dialectal atlas
 
 ?>
 
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="920px" height="530px" viewBox="0 0 1100 720" enable-background="new 0 0 1100 720"
-	 xml:space="preserve">
+<script src="//d3js.org/d3.v4.min.js"></script>
+<script src="//d3js.org/topojson.v1.min.js"></script>
+
+<svg style="border: 2px solid; border-color: #cbcbcb; margin: auto" version="1.1" class="img-responsive" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+     viewBox="0 0 1100 720" enable-background="new 0 0 1100 720"
+     xml:space="preserve">
+    <g id="main">
 	 <!-- width="1111.652px" height="719.964px" - originalna velikost-->
 <style type="text/css">
 #test {
@@ -11323,10 +11327,27 @@ Slovenski narečni atlas / Slovenian dialectal atlas
 		<use xlink:href="#pins1" x=381 y=370></use>
 		-->
 	</g>
+    </g>
 </svg>
 
-<div id="legend" style="width: 180px; height: 240px; position: absolute; top: 260px; right: 0px;"> 
-    <?
-    $this->load->view('home/legend_view.php');
-    ?>
-</div>
+
+
+<script>
+
+    var svg = d3.select("svg")
+        .attr("width", "90%");
+
+    var zoomLayer  = d3.select("#main");
+
+    var zoomed = function() {
+        zoomLayer.attr("transform", d3.event.transform);
+    }
+
+    svg.call(d3.zoom()
+        .scaleExtent([1, 6])
+        .translateExtent([[-300, -400], [1000, 800]])
+        .on("zoom", zoomed));
+
+
+</script>
+