Changes for page Homeopaths

Last modified by Jip-jan Alunkel on March 14, 20:13
From version 8.32
edited by Jip-jan Alunkel
on December 08, 13:51
Change comment: Renamed from xwiki:practices.WebHome
To version 8.42
edited by Jip-jan Alunkel
on December 08, 15:04
Change comment: Renamed from xwiki:practices.WebHome

Summary

Details

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