Updated examples to changes in leaflet maps

Examples/Applications/Incidone/Incidone/ContactPosition.icl

@@ -94,7 +94,7 @@ where
     eqBounds _ _ = False
 
 gDefault{|ContactMapPerspective|}
-    =  {ContactMapPerspective|center = (52.948300, 4.776007), zoom = 7, cursor = Nothing, bounds = Nothing} //(Full coast centered on Den Helder)
+    =  {ContactMapPerspective|center = (52.948300, 4.776007), zoom = 7, bounds = Nothing, cursor = Nothing} //(Full coast centered on Den Helder)
 
 
 contactToMapMarker :: Bool Bool Contact -> ContactMapMarker
@@ -142,8 +142,8 @@ where
 	tilesUrls layers = [url \\ {ContactMapLayer|def=CMTileLayer url} <- layers]
 
     convMarkers markers = [conv m \\ m=:{ContactMapMarker|position} <- markers | hasLatLng position]
-    conv {ContactMapMarker|markerId,title,position,heading,type,selected}
-        = Marker {LeafletMarker|markerId = markerId, title = title, position = pos position, icon = Nothing /* fmap (\t -> iconIndex heading t selected) type */, selected = selected, popup = Nothing}
+    conv {ContactMapMarker|markerId,title,position,heading,type}
+        = Marker {LeafletMarker|markerId = markerId, title = title, position = pos position, icon = Nothing /* fmap (\t -> iconIndex heading t selected) type */, popup = Nothing}
 
     pos (PositionLatLng (lat,lng)) = {LeafletLatLng|lat=lat,lng=lng}
     pos (PositionDescription _ (Just(lat,lng))) = {LeafletLatLng|lat=lat,lng=lng}
@@ -183,7 +183,7 @@ where
 
 toLeafletPerspective :: ContactMapPerspective -> LeafletPerspective
 toLeafletPerspective {ContactMapPerspective|center,zoom,cursor,bounds}
-    = {LeafletPerspective|center=toLeafletLatLng center,zoom=zoom,cursor=fmap toLeafletLatLng cursor,bounds=fmap toLeafletBounds bounds}
+    = {LeafletPerspective|center=toLeafletLatLng center,zoom=zoom,bounds=fmap toLeafletBounds bounds}
 
 toLeafletLatLng :: !(!Real,!Real) -> LeafletLatLng
 toLeafletLatLng (lat,lng) = {LeafletLatLng|lat=lat,lng=lng}
@@ -199,8 +199,8 @@ fromLeafletMap contactMap leafletMap
       }
 
 fromLeafletPerspective :: LeafletPerspective -> ContactMapPerspective
-fromLeafletPerspective {LeafletPerspective|center,cursor,zoom,bounds}
-    = {ContactMapPerspective|center=fromLeafletLatLng center,zoom=zoom,cursor=fmap fromLeafletLatLng cursor,bounds=fmap fromLeafletBounds bounds}
+fromLeafletPerspective {LeafletPerspective|center,zoom,bounds}
+    = {ContactMapPerspective|center=fromLeafletLatLng center,zoom=zoom,cursor=Nothing,bounds=fmap fromLeafletBounds bounds}
 
 /*
 fromLeafletLayer :: ContactMapLayer LeafletLayer -> ContactMapLayer
@@ -216,8 +216,8 @@ fromLeafletLayer cl ll = cl
 */
 
 selectionFromLeafletMap :: LeafletMap -> [LeafletObjectID]
-selectionFromLeafletMap {LeafletMap|objects} =
-    [markerId \\ Marker {LeafletMarker|markerId,selected} <- objects | selected]
+selectionFromLeafletMap {LeafletMap|objects} = []
+    //[markerId \\ Marker {LeafletMarker|markerId} <- objects | selected]
 
 fromLeafletLatLng :: !LeafletLatLng -> (!Real,!Real)
 fromLeafletLatLng {LeafletLatLng|lat,lng} = (lat,lng)

Examples/Applications/ShipAdventure/C2/Framework/Common.icl

@@ -96,9 +96,9 @@ mapView` currentUser es = (updateSharedInformation () [UpdateAs toMap fromMap] (
     # mid = toInt contactMarker.ContactMapMarker.markerId
     = case 'DIS'.get mid markers of
         Just m
-          # st = if contactMarker.ContactMapMarker.selected
-                   {st & selection = mid}
-                   st
+          //# st = if contactMarker.ContactMapMarker.selected
+           //        {st & selection = mid}
+            //       st
           //= ('DIS'.put mid {Entity | m & selected = contactMarker.ContactMapMarker.selected} markers, st) // TODO FIXME
           = (markers, st)
         _ = (markers, st)
@@ -120,9 +120,9 @@ mapView sh radarWorks currentUser es = (updateSharedInformation () [UpdateAs toM
     # mid = toInt contactMarker.ContactMapMarker.markerId
     = case 'DIS'.get mid markers of
         Just m
-          # st = if contactMarker.ContactMapMarker.selected
-                   {st & selection = mid}
-                   st
+          //# st = if contactMarker.ContactMapMarker.selected
+           //        {st & selection = mid}
+            //       st
           //= ('DIS'.put mid {Entity | m & selected = contactMarker.ContactMapMarker.selected} markers, st) TODO FIXME
           = (markers, st)
         _ = (markers, st)

Examples/Applications/ShipAdventure/C2/Framework/ContactPosition.icl

@@ -116,15 +116,15 @@ toLeafletMap {ContactMap|perspective,markers}
       }
 where
     convMarkers markers = [conv m \\ m=:{ContactMapMarker|position} <- markers]
-    conv {ContactMapMarker|markerId,title,position,heading,type,selected}
-        = Marker {LeafletMarker|markerId = LeafletObjectID markerId, title = title, position = toLeafletLatLng position, icon = fmap (\t -> LeafletIconID (iconIndex heading t selected)) type, selected = selected, popup = Nothing}
+    conv {ContactMapMarker|markerId,title,position,heading,type}
+        = Marker {LeafletMarker|markerId = LeafletObjectID markerId, title = title, position = toLeafletLatLng position, icon = fmap (\t -> LeafletIconID (iconIndex heading t False)) type,popup = Nothing}
 
 	icon i = {LeafletIcon|iconId=LeafletIconID (toString i),iconUrl ="/ship-icons/"+++toString i+++".png",iconSize=(24,24)}
     iconIndex heading type selected = toString (cat type + ( (maybe 24 (\d -> toInt d / 15) heading) + (if selected 25 0)) * 5)
 
 toLeafletPerspective :: ContactMapPerspective -> LeafletPerspective
 toLeafletPerspective {ContactMapPerspective|center,zoom,cursor}
-    = {LeafletPerspective|center=toLeafletLatLng center,zoom=zoom,cursor=fmap toLeafletLatLng cursor,bounds=Nothing}
+    = {LeafletPerspective|center=toLeafletLatLng center,zoom=zoom,bounds=Nothing}
 
 toLeafletLatLng :: !LatLng -> LeafletLatLng
 toLeafletLatLng (lat,lng) = {LeafletLatLng | lat = toDeg lat, lng = toDeg lng}
@@ -138,11 +138,11 @@ fromLeafletMap {LeafletMap|perspective,objects}
        ,markers=toMarkers objects}
 where
     toMarkers objects
-        = [{ContactMapMarker|markerId=markerId,title=Nothing,position = fromLeafletLatLng position, type=Nothing,heading=Nothing,selected=selected}
-          \\ Marker {LeafletMarker|markerId = LeafletObjectID markerId,position,selected} <- objects]
+        = [{ContactMapMarker|markerId=markerId,title=Nothing,position = fromLeafletLatLng position, type=Nothing,heading=Nothing,selected=False}
+          \\ Marker {LeafletMarker|markerId = LeafletObjectID markerId,position} <- objects]
 
 fromLeafletPerspective :: LeafletPerspective -> ContactMapPerspective
-fromLeafletPerspective {LeafletPerspective|center,cursor,zoom}
-    = {ContactMapPerspective|center=fromLeafletLatLng center,zoom=zoom,cursor=fmap fromLeafletLatLng cursor}
+fromLeafletPerspective {LeafletPerspective|center,zoom}
+    = {ContactMapPerspective|center=fromLeafletLatLng center,zoom=zoom,cursor=Nothing}