Update place query

js/query/managerQuery.js

@@ -306,13 +306,12 @@ var queryManager = {
             UNION { \
                 ?pc crm:P02_has_range ?uri . \
                 ?uri_event crm:P01_has_domain ?pc; \
-                crm:P7_took_place_at ?uri_place ; \
+                crm:P7_took_place_at ?place ; \
                 crm:P2_has_type ?uri_type . \
                 ?uri_type rdfs:label ?tipo . \
-                ?uri_place rdf:type crm:E53_Place ; \
+                ?place rdf:type crm:E53_Place ; \
                 rdfs:label ?label . \
-                ?place owl:sameAs ?uri_place ; \
-                crm:P168_place_is_defined_by ?coordinates . \
+                ?place crm:P168_place_is_defined_by ?coordinates .\
                 } \
             }",
 
@@ -723,9 +722,8 @@ var queryManager = {
             UNION \
             {?uri crm:P128_carries ?uri_doc } \
             ?uri_doc crm:P70_documents ?event . \
-            ?event crm:P7_took_place_at ?uri_location . \
-            ?uri_place owl:sameAs ?uri_location ; \
-            crm:P168_place_is_defined_by ?coords; \
+            ?event crm:P7_took_place_at ?uri_place . \
+            ?uri_place crm:P168_place_is_defined_by ?coords; \
             rdfs:label ?place .  \
             }",
 
@@ -804,8 +802,7 @@ var queryManager = {
             crm:P4_has_time-span ?uri_ts . \
             ?uri_ts rdfs:label ?time_span . } \
             } UNION { \
-            ?uri owl:sameAs ?place . \
-            ?event_gt crm:P7_took_place_at ?place . \
+            ?event_gt crm:P7_took_place_at ?uri . \
             ?document_inf crm:P70_documents ?event_gt . \
             ?document_uri crm:P128_carries ?document_inf ; \
             crm:P1_is_identified_by ?uriSegnatura ; \
@@ -816,7 +813,8 @@ var queryManager = {
 
             queryPersone : " SELECT DISTINCT ?role ?range SAMPLE(?name) AS ?label COUNT(?range) AS ?count \
             WHERE{ \
-            {?place owl:sameAs <{URI}> . \
+            VALUES ?uri {<{URI}>} \
+            {?place owl:sameAs ?uri . \
             ?event_to crm:P26_moved_to ?place ; \
             rdf:type crm:EL3_Receive_Letter ; \
             crm:P01_has_domain ?domain . \
@@ -826,7 +824,7 @@ var queryManager = {
             ?range rdfs:label ?lb ; \
             foaf:name ?name . \
             } UNION { \
-            ?place owl:sameAs <{URI}> . \
+            ?place owl:sameAs ?uri . \
             ?event_to crm:P27_moved_from ?place ; \
             rdf:type crm:EL2_Send_Letter ; \
             crm:P01_has_domain ?domain . \
@@ -836,8 +834,7 @@ var queryManager = {
             ?range rdfs:label ?lb ; \
             foaf:name ?name . \
             } UNION { \
-            <{URI}> owl:sameAs ?place . \
-            ?event_gt crm:P7_took_place_at ?place ; \
+            ?event_gt crm:P7_took_place_at ?uri ; \
             crm:P01_has_domain ?domain . \
             ?domain crm:P02_has_range ?range ; \
             crm:P14.1_in_the_role_of ?uri_role . \