From: John Firebaugh <john.firebaugh@gmail.com>
Date: Fri, 9 Nov 2012 21:30:29 +0000 (-0800)
Subject: Use nicer markers
X-Git-Tag: live~5223^2~14
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/f913b7d8a551dafbf5b0f478fe3731ad60aaef9d

Use nicer markers
---

diff --git a/app/assets/images/arrow.png b/app/assets/images/arrow.png
deleted file mode 100644
index aa9b58fc2..000000000
Binary files a/app/assets/images/arrow.png and /dev/null differ
diff --git a/app/assets/images/marker-blue.png b/app/assets/images/marker-blue.png
index f5b4efcfe..b5d592365 100644
Binary files a/app/assets/images/marker-blue.png and b/app/assets/images/marker-blue.png differ
diff --git a/app/assets/images/marker-green.png b/app/assets/images/marker-green.png
index c36b164b5..e599197a3 100644
Binary files a/app/assets/images/marker-green.png and b/app/assets/images/marker-green.png differ
diff --git a/app/assets/images/marker-red.png b/app/assets/images/marker-red.png
index ea3e59a56..bd134d929 100644
Binary files a/app/assets/images/marker-red.png and b/app/assets/images/marker-red.png differ
diff --git a/app/assets/images/marker-yellow.png b/app/assets/images/marker-yellow.png
new file mode 100644
index 000000000..5e56a4526
Binary files /dev/null and b/app/assets/images/marker-yellow.png differ
diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 28659a931..90c57f976 100644
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -60,7 +60,7 @@ $(document).ready(function () {
       map.removeLayer(marker);
     }
 
-    marker = L.marker(centre, {icon: getArrowIcon()}).addTo(map);
+    marker = L.marker(centre).addTo(map);
   });
 
   function updateLocation() {
diff --git a/app/assets/javascripts/map.js.erb b/app/assets/javascripts/map.js.erb
index e4392827e..6d15f1fdb 100644
--- a/app/assets/javascripts/map.js.erb
+++ b/app/assets/javascripts/map.js.erb
@@ -112,19 +112,11 @@ function createMap(divName, options) {
   return map;
 }
 
-function getArrowIcon() {
-  return L.icon({
-    iconUrl: <%= asset_path('arrow.png').to_json %>,
-    iconSize: [25, 22],
-    iconAnchor: [22, 20]
-  });
-}
-
 function getUserIcon(url) {
   return L.icon({
     iconUrl: url || <%= asset_path('marker-red.png').to_json %>,
-    iconSize: [21, 25],
-    iconAnchor: [12, 27]
+    iconSize: [19, 25],
+    iconAnchor: [11, 26]
   });
 }