From 9a036ffed7e1b7aae37274f9963047c564db8be4 Mon Sep 17 00:00:00 2001
From: Michael Andreen <harv@ruin.nu>
Date: Tue, 29 Oct 2019 20:17:13 +0100
Subject: [PATCH] Show coords on raid view page

---
 lib/NDWeb/Controller/Raids.pm | 5 ++---
 root/src/raids/view.tt2       | 9 ++++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/NDWeb/Controller/Raids.pm b/lib/NDWeb/Controller/Raids.pm
index 781f4c1..a649259 100644
--- a/lib/NDWeb/Controller/Raids.pm
+++ b/lib/NDWeb/Controller/Raids.pm
@@ -106,7 +106,6 @@ sub view : Local {
 	$c->forward('findRaid');
 	$raid = $c->stash->{raid};
 
-	$c->stash(raid => $raid->{id});
 	my $planet;
 	if ($c->user->planet){
 		my $query = $dbh->prepare(q{SELECT value, score,x,y FROM current_planet_stats WHERE pid = ?});
@@ -188,9 +187,9 @@ ORDER BY name,tick DESC
 		$target->{claims} = \@claims;
 
 		my $num = pow(10,length($target->{score})-2);
-		$target->{score} = "Hidden"; #ceil($target->{score}/$num)*$num;
+		$target->{score} = "Hidden" unless $raid->{released_coords}; #ceil($target->{score}/$num)*$num;
 		$num = pow(10,length($target->{value})-2);
-		$target->{value} = "Hidden"; #ceil($target->{value}/$num)*$num;
+		$target->{value} = "Hidden" unless $raid->{released_coords}; #ceil($target->{value}/$num)*$num;
 		$num = pow(10,length($target->{size})-2);
 		$target->{size} = floor($target->{size}/$num)*$num;
 		$num = pow(10,length($target->{fleetvalue})-2);
diff --git a/root/src/raids/view.tt2 b/root/src/raids/view.tt2
index 94244af..826ac60 100644
--- a/root/src/raids/view.tt2
+++ b/root/src/raids/view.tt2
@@ -23,6 +23,9 @@
 <fieldset class="[% t.style %]"> <legend><a name="target[% t.id %]">Target: #[% t.id %]</a></legend>
 	<div class="leftinfo"><ul>
 		<li><a href="[% c.uri_for('targetcalc',t.id) %]" rel="external">Calc</a></li>
+		[% IF raid.released_coords %]
+		<li>Coords: [% t.x %]:[% t.y %]:[% t.z %]</li>
+		[% END %]
 		<li>Size: [% t.size %]</li>
 		<li class="[% t.scorebash %]">Score: [% t.score %]</li>
 		<li class="[% t.valuebash %]">Value: [% t.value %]</li>
@@ -124,15 +127,15 @@
 
 <script type="text/javascript">
 function update(){
-	$.get("/jsrpc/update/[% raid %]/"+modified,{},parseUpdate);
+	$.get("/jsrpc/update/[% raid.id %]/"+modified,{},parseUpdate);
 }
 
 function claim(target,wave,command){
-	$.get("/jsrpc/"+command+"/"+[% raid %]+"/"+modified+"/"+target+"/"+wave,{},parseUpdate);
+	$.get("/jsrpc/"+command+"/"+[% raid.id %]+"/"+modified+"/"+target+"/"+wave,{},parseUpdate);
 }
 
 function join(target,wave,joinable){
-	$.get("/jsrpc/joinable/"+[% raid %]+"/"+modified+"/"+target+"/"+wave+"/"+joinable,{},parseUpdate);
+	$.get("/jsrpc/joinable/"+[% raid.id %]+"/"+modified+"/"+target+"/"+wave+"/"+joinable,{},parseUpdate);
 }
 
 $(document).ready(function(){
-- 
2.39.2