summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKangho Hur <kangho.hur@samsung.com>2017-03-09 00:43:14 (GMT)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>2017-03-09 00:43:14 (GMT)
commit5a70a1cc23fece418fed790fc6c7f8ec2ea1839a (patch)
treec8458aa6c11172deb7e4980e6dcee8338221a16b
parent1da4caf85e15c91cb2dd6fd19e1a4a4453f0baf2 (diff)
parent0b5a46f6a92e90abced7e027cda276abfcd25bdc (diff)
downloadxamarin-forms-5a70a1cc23fece418fed790fc6c7f8ec2ea1839a.zip
xamarin-forms-5a70a1cc23fece418fed790fc6c7f8ec2ea1839a.tar.gz
xamarin-forms-5a70a1cc23fece418fed790fc6c7f8ec2ea1839a.tar.bz2
Merge "Update Pin and Marker to use default image" into tizen
-rwxr-xr-xXamarin.Forms.Maps.Tizen/MapRenderer.cs19
-rwxr-xr-x[-rw-r--r--]Xamarin.Forms.Maps.Tizen/Xamarin.Forms.Maps.Tizen.project.json2
2 files changed, 10 insertions, 11 deletions
diff --git a/Xamarin.Forms.Maps.Tizen/MapRenderer.cs b/Xamarin.Forms.Maps.Tizen/MapRenderer.cs
index d61f6a2..cf7ddf7 100755
--- a/Xamarin.Forms.Maps.Tizen/MapRenderer.cs
+++ b/Xamarin.Forms.Maps.Tizen/MapRenderer.cs
@@ -4,10 +4,10 @@ using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Collections.Specialized;
using System.ComponentModel;
-using ElmSharp;
using Tizen.Location;
using Tizen.Maps;
using Xamarin.Forms.Platform.Tizen;
+using TPin = Tizen.Maps.Pin;
namespace Xamarin.Forms.Maps.Tizen
{
@@ -16,7 +16,7 @@ namespace Xamarin.Forms.Maps.Tizen
const string MoveMessageName = "MapMoveToRegion";
bool _disposed;
- Overlay _marker;
+ Marker _marker;
bool _isLocatorStarted = false;
Lazy<Locator> _locator = new Lazy<Locator>(InitializeLocator);
Dictionary<Pin, MapObject> _pins = new Dictionary<Pin, MapObject>();
@@ -130,10 +130,11 @@ namespace Xamarin.Forms.Maps.Tizen
foreach (Pin pin in pins)
{
var coordinates = new Geocoordinates(pin.Position.Latitude, pin.Position.Longitude);
- var rectangle = new Background(Platform.Tizen.Forms.Context.MainWindow);
- // TODO: Need to change BubbleOverlay to default Marker
- // TODO: Need to handle Pin.Clicked event
- var nativePin = new BubbleOverlay(coordinates, rectangle);
+ var nativePin = new TPin(coordinates);
+ nativePin.Clicked += (s, e) =>
+ {
+ pin.SendTap();
+ };
Control.Add(nativePin);
_pins.Add(pin, nativePin);
}
@@ -178,16 +179,14 @@ namespace Xamarin.Forms.Maps.Tizen
void Dummy(object sender, MapGestureEventArgs e)
{
- //TODO: The implementation of Tizen.Maps needs to be changed to remove this method
+ // The implementation of Tizen.Maps needs to be changed to remove this method
}
void ApplyIsShowingUser(Geocoordinates coordinates)
{
if (_marker == null)
{
- var rectangle = new Background(Platform.Tizen.Forms.Context.MainWindow);
- // TODO: Need to change BubbleOverlay to Default Overlay
- _marker = new BubbleOverlay(coordinates, rectangle);
+ _marker = new Sticker(coordinates);
_marker.IsVisible = false;
Control.Add(_marker);
}
diff --git a/Xamarin.Forms.Maps.Tizen/Xamarin.Forms.Maps.Tizen.project.json b/Xamarin.Forms.Maps.Tizen/Xamarin.Forms.Maps.Tizen.project.json
index ebcac77..ccd5b6b 100644..100755
--- a/Xamarin.Forms.Maps.Tizen/Xamarin.Forms.Maps.Tizen.project.json
+++ b/Xamarin.Forms.Maps.Tizen/Xamarin.Forms.Maps.Tizen.project.json
@@ -4,7 +4,7 @@
"NETStandard.Library": "1.6.0",
"Tizen.Applications": "1.1.0",
"Tizen.Location": "1.0.5",
- "Tizen.Maps": "1.0.7"
+ "Tizen.Maps": "1.0.8"
},
"frameworks": {
"netstandard1.6": {