From c41a779a213abb69c604df2875468b8c3f055534 Mon Sep 17 00:00:00 2001
From: situx <situx@users.noreply.github.com>
Date: Tue, 8 Oct 2024 19:27:24 +0000
Subject: [PATCH] =?UTF-8?q?Deploying=20to=20gh-pages=20from=20=20@=20334ec?=
 =?UTF-8?q?d8aa573b1304b9beb57cb28a9421e517168=20=F0=9F=9A=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 geopubbyjs/index.html | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/geopubbyjs/index.html b/geopubbyjs/index.html
index d39bf492..9db8abd5 100644
--- a/geopubbyjs/index.html
+++ b/geopubbyjs/index.html
@@ -852,14 +852,15 @@ <h3 id="relationtitle">Relationview</h3>
 	if(endp in endpointToProps){
 		typeproperty=endpointToProps[endp]["typeproperty"]
 	}
-	$('#relationtitle').html("<img width=\"25\" height=\"25\" src=\""+node.icon+"\" alt=\"Class\"/> <a href=\""+concept+"\" target=\"_blank\">"+shortenURI(concept)+"</a>")
+	thetitle="<img onclick=\"getClassRelationDialog($('#jstree').jstree(true).get_node('" + concept + "'))\" src=\""+node.icon+"\" height=\"25\" width=\"25\" alt=\"Class\"/><a href=\""+concept+"\">"+node.text+"</a>"
+	$('#relationtitle').html("<img width=\"25\" height=\"25\" src=\""+node.icon+"\" alt=\"Class\"/> <a href=\""+concept+"\" target=\"_blank\">"+node.text+"</a>")
 	$('#relationtablehead').html("<tr><th>Incoming Concept</th><th>Incoming Property</th><th>Concept</th><th>Outgoing Property</th><th>Outgoing Concept</th></tr>")
 	$('#relationtablebody').html("<tr><td colspan=3>Loading instance data....</td></tr>")
 	if(node.icon.includes("class.png")){
 		$('#relationtablebody').html("")
 		d3.sparql(endp, "SELECT DISTINCT ?rel ?relLabel ?val ?valLabel WHERE { ?con <"+typeproperty+"> <"+concept+ "> . ?con ?rel ?item . ?item  <"+typeproperty+"> ?val .  OPTIONAL{?val <http://www.w3.org/2000/01/rdf-schema#label> ?valLabel . FILTER(lang(?valLabel)=\"en\") } {?prop wikibase:directClaim ?rel . ?prop rdfs:label ?relLabel.  filter(lang(?relLabel) = \"en\").}UNION{?rel <http://www.w3.org/2000/01/rdf-schema#label> ?relLabel . FILTER(lang(?relLabel)=\"en\") }}").then((results)=>{
 			for(result in results){
-				toappend="<tr><td></td><td></td><td><img onclick=\"getClassRelationDialog($('#jstree').jstree(true).get_node('" + concept + "'))\" src=\""+baseurl+"icons/class.png\" height=\"25\" width=\"25\" alt=\"Class\"/><a href=\""+concept+"\">"+shortenURI(concept)+"</a></td>"
+				toappend="<tr><td></td><td></td><td>"+thetitle+"</td>"
 				if(results[result]["rel"]["value"] in geoproperties && geoproperties[results[result]["rel"]["value"]]=="ObjectProperty"){
 					toappend+="<td><img src=\""+baseurl+"icons/geoobjectproperty.png\" onclick=\"getPropRelationDialog('"+results[result]["rel"]["value"]+"','"+baseurl+"icons/objectproperty.png')\" height=\"25\" width=\"25\" alt=\"Geo Object Property\"/>"
 				}else{
@@ -910,7 +911,7 @@ <h3 id="relationtitle">Relationview</h3>
 					}else{
 						toappend+="<a href=\""+results[result]["rel"]["value"]+"\">"+shortenURI(results[result]["rel"]["value"])+"</a>"
 					}
-					toappend+="</td><td><img onclick=\"getClassRelationDialog($('#jstree').jstree(true).get_node('" + concept + "'))\" src=\""+baseurl+"icons/class.png\" height=\"25\" width=\"25\" alt=\"Class\"/><a href=\""+concept+"\">"+shortenURI(concept)+"</a></td><td></td><td></td></tr>"
+					toappend+="</td><td>"+thetitle+"</td><td></td><td></td></tr>"
 					$('#relationtablebody').append(toappend)
 				}
 				$('#relationtable').DataTable({"scrollX":true,"scrollY":true});
@@ -919,7 +920,7 @@ <h3 id="relationtitle">Relationview</h3>
 	}	
 }
 
-function getPropRelationDialog(uri,icon){
+function getPropRelationDialog(uri,icon,label=""){
 	concept=uri
 	document.getElementById("relationDialog").showModal()
 	try{
@@ -1104,7 +1105,7 @@ <h3 id="relationtitle">Relationview</h3>
 	if(endp in endpointToProps){
 		typeproperty=endpointToProps[endp]["typeproperty"]
 	}
-	d3.sparql(endp, "SELECT (COUNT(distinct ?con) AS ?countcon) (COUNT(?rel) AS ?countrel) ?rel ?relLabel ?valtype\n WHERE { ?con <"+typeproperty+"> <"+concept+"> . ?con ?rel ?val .\n BIND( datatype(?val) AS ?valtype ) {?prop wikibase:directClaim ?rel . ?prop rdfs:label ?relLabel.  filter(lang(?relLabel) = \"en\").}UNION{?rel <http://www.w3.org/2000/01/rdf-schema#label> ?relLabel . FILTER(lang(?relLabel)=\"en\") }}\n  GROUP BY ?rel ?valtype\n ORDER BY DESC(?countrel)").then((results)=>{
+	d3.sparql(endp, "SELECT (COUNT(distinct ?con) AS ?countcon) (COUNT(?rel) AS ?countrel) ?rel ?relLabel ?valtype\n WHERE { ?con <"+typeproperty+"> <"+concept+"> . ?con ?rel ?val .\n BIND( datatype(?val) AS ?valtype ) {?prop wikibase:directClaim ?rel . ?prop rdfs:label ?relLabel.  filter(lang(?relLabel) = \"en\").}UNION{?rel <http://www.w3.org/2000/01/rdf-schema#label> ?relLabel . FILTER(lang(?relLabel)=\"en\") }}\n  GROUP BY ?rel ?relLabel ?valtype\n ORDER BY DESC(?countrel)").then((results)=>{
 		result="";
 		maxcons=1
 		first=true
@@ -1118,7 +1119,7 @@ <h3 id="relationtitle">Relationview</h3>
 			console.log(results[res])
 			if(!("valtype" in results[res]) || typeof(results[res]["valtype"]["value"])=="undefined"){
 				if(results[res]["rel"]["value"] in geoproperties && geoproperties[results[res]["rel"]["value"]]=="ObjectProperty"){
-					result+="<td><img src=\""+baseurl+"icons/geoobjectproperty.png\" height=\"25\" width=\"25\" alt=\"Geo Object Property\"/>Geo Object Property <a href=\"#\" onclick=\"getPropRelationDialog('"+results[res]["rel"]["value"]+"','')\">[x]</a></td>"
+					result+="<td><img src=\""+baseurl+"icons/geoobjectproperty.png\" height=\"25\" width=\"25\" alt=\"Geo Object Property\"/>Geo Object Property <a href=\"#\" onclick=\"getPropRelationDialog('"+results[res]["rel"]["value"]+"','"+baseurl+"icons/geoobjectproperty.png')\">[x]</a></td>"
 				}else{
 					result+="<td><img src=\""+baseurl+"icons/objectproperty.png\" height=\"25\" width=\"25\" alt=\"Object Property\"/>Object Property <a href=\"#\" onclick=\"getPropRelationDialog('"+results[res]["rel"]["value"]+"','"+baseurl+"icons/objectproperty.png')\">[x]</a></td>"
 				}			
@@ -1136,7 +1137,16 @@ <h3 id="relationtitle">Relationview</h3>
 					result+="<td><img src=\""+baseurl+"icons/datatypeproperty.png\" height=\"25\" width=\"25\" alt=\"Datatype Property\"/>Datatype Property <a href=\"#\" onclick=\"getPropRelationDialog('"+results[res]["rel"]["value"]+"','"+baseurl+"icons/datatypeproperty.png')\">[x]</a></td>"
 				}
 			}
-			result+="<td><a href=\""+results[res]["rel"]["value"]+"\" target=\"_blank\">"+shortenURI(results[res]["rel"]["value"])+"</a> ["+((parseInt(results[res]["countrel"]["value"])/maxcons)*100).toFixed(2)+"%]</td>"
+			result+="<td>"
+			suri=shortenURI(results[res]["rel"]["value"])
+			if("relLabel" in results[res]){
+				result+="<a href=\""+results[res]["rel"]["value"]+"\">"+results[res]["relLabel"]["value"]
+				result+=" ("+shortenURI(results[res]["rel"]["value"])+")"
+				result+="</a>"
+			}else{
+				result+="<a href=\""+results[res]["rel"]["value"]+"\">"+shortenURI(results[res]["rel"]["value"])+"</a>"
+			}
+			result+=" ["+((parseInt(results[res]["countrel"]["value"])/maxcons)*100).toFixed(2)+"%]</td>"
 			if(!("valtype" in results[res]) || typeof(results[res]["valtype"])=="undefined"){
 				result+="<td id=\""+shortenURI(results[res]["rel"]["value"])+"\"><button onclick=\"loadSamples('"+concept+"','"+results[res]["rel"]["value"]+"','"+shortenURI(results[res]["rel"]["value"])+"')\">Click to load samples...</button> [<a href=\"http://www.w3.org/2001/XMLSchema#anyURI\" target=\"_blank\">xsd:anyURI</a>]</td></tr>"
 			}else{