Changes for page Homeopaths

Summary

• Page properties (1 modified, 0 added, 0 removed)
• Objects (1 modified, 0 added, 0 removed)
  • XWiki.JavaScriptExtension[0]

Details

Page properties

Content

...	...	@@ -9,8 +9,45 @@
9	9	{{html wiki="false" clean="false"}}
10	10	<p>
11	11	All about homeopaths.
	12	+ #set($query = $services.query.xwql("from doc.object('homeopaths.Code.homeopathsClass') as caseObj"))
	13	+ #set($result = $query.execute())
	14	+ #set($map = {})
	15	+ #foreach($item in $result)
	16	+ #set($result_doc = $xwiki.getDocument("${item}"))
	17	+ #set($result_obj = $result_doc.getObject("homeopaths.Code.homeopathsClass"))
	18	+ #set($discard = $map.put("${item}", $result_obj.getProperty("latlong").value))
	19	+ #end
	20	+ #if($objecttool.allNull($map))
	21	+ #set($output = {})
	22	+ #else
	23	+ #set($output = $jsontool.serialize(${map}))
	24	+ #end
	25	+$jsontool.parse($output)
12	12	</p>
13	13	<div id="homeopaths_map"></div>
	28	+
	29	+<script>/*
	30	+ var map = L.map('homeopaths_map').setView([18, 10], 2);
	31	+ L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
	32	+ maxZoom: 19,
	33	+ attribution: ''
	34	+ }).addTo(map);
	35	+ map.attributionControl.setPrefix('');
	36	+ var markers = [
	37	+ [ -0.1244324, 51.5006728, "Big Ben" ],
	38	+ [ -0.119623, 51.503308, "London Eye" ],
	39	+ [ -0.1279688, 51.5077286, "Nelson's Column<br><a href=\"https://en.wikipedia.org/wiki/Nelson's_Column\">wp</a>" ]
	40	+ ];
	41	+ for (var i=0; i<markers.length; i++) {
	42	+ let lon = markers[i][0],
	43	+ lat = markers[i][1],
	44	+ popupText = markers[i][2],
	45	+ markerLocation = new L.LatLng(lat, lon),
	46	+ marker = new L.Marker(markerLocation);
	47	+ map.addLayer(marker);
	48	+ marker.bindPopup(popupText);
	49	+ }
	50	+*/</script>
14	14	<h2>Add your practice to the map</h2>
15	15	#set($form_start = {
16	16	"id": "homeoworld_form",

XWiki.JavaScriptExtension[0]

Code

...	...	@@ -10,16 +10,8 @@
10	10	#set($map = {})
11	11	#foreach($item in $result)
12	12	#set($result_doc = $xwiki.getDocument("${item}"))
13		- #set($spaceReference = $services.model.resolveDocument('', 'default', $result_doc.documentReference.lastSpaceReference).parent)
14		- #set($spaceName = $spaceReference.getName())
15	15	#set($result_obj = $result_doc.getObject("homeopaths.Code.homeopathsClass"))
16		- #set($addressArray = $result_obj.getProperty("address").value).split(","))
17		- #set($address = "")
18		- #foreach($address_item in $addressArray)
19		- #set($address = "${address}<li>${address_item.trim()}</li>")
20		- #end
21		- #set($info = "<h4>${result_doc.getName()}</h4><ul>${address}</ul>")
22		- #set($discard = $map.put("${result_doc.getName()}", $result_obj.getProperty("latlong").value))
	14	+ #set($discard = $map.put("${item}", $result_obj.getProperty("latlong").value))
23	23	#end
24	24	#if($objecttool.allNull($map))
25	25	#set($mapJSON = {})
...	...	@@ -26,18 +26,19 @@
26	26	#else
27	27	#set($mapJSON = $jsontool.serialize(${map}))
28	28	#end
	21	+ #foreach($entry in $mymap.entrySet() )
	22	+ $set($entry_doc = $xwiki.getDocument("${entry.key}"))
	23	+## $set()
	24	+ $entry.value
	25	+ #end
	26	+$jsontool.parse($mapJSON)
	27	+ console.log($doc.getName());
29	29
30		- var mapJSON = $jsontool.parse($mapJSON),
31		- markers = [];
32		-
33		- for(const property in mapJSON) {
34		- let latlong = mapJSON[property].split("/"),
35		- lat = latlong[0],
36		- long = latlong[1],
37		- latlongArray = [long, lat, property];
38		- markers.push(latlongArray)
39		- }
40		-
	29	+ var markers = [
	30	+ [ -0.1244324, 51.5006728, "Big Ben" ],
	31	+ [ -0.119623, 51.503308, "London Eye" ],
	32	+ [ -0.1279688, 51.5077286, "Nelson's Column<br><a href=\"https://en.wikipedia.org/wiki/Nelson's_Column\">wp</a>" ]
	33	+ ];
41	41	for (var i=0; i<markers.length; i++) {
42	42	let lon = markers[i][0],
43	43	lat = markers[i][1],