Permalink
Browse files

icons!

  • Loading branch information...
1 parent 92b8abe commit c0711397937fcfe3087e6e86cf0a3edeebc07456 @bmcmahen committed Mar 27, 2013
@@ -23,7 +23,7 @@
this.type = doc.geometry.type;
this.coords = doc.geometry.coordinates;
if (doc.properties){
- this.markerSymbol = doc.properties.markerSymbol;
+ this.markerSymbol = doc.properties.sym;
this.markerSize = doc.properties.markerSize;
this.name = doc.properties.name;
}
@@ -52,7 +52,6 @@
// Create our Marker
createMarker: function(){
- console.log('create marker');
return L.marker(this.coords, {
icon: this.determineIcon(),
riseOnHover: true
@@ -90,6 +89,18 @@
iconAnchor: [15, 40]
}, iconProperties);
break;
+ case 'parking' :
+ iconProperties = _.defaults({
+ iconUrl: '/images/icons/parking-24.png',
+ iconSize: [24, 24]
+ });
+ break;
+ case 'triangle-stroked' :
+ iconProperties = _.defaults({
+ iconUrl: '/images/icons/triangle-stroked-24.png',
+ iconSize: [24, 24]
+ });
+ break;
}
return L.icon(iconProperties);
},
@@ -1686,7 +1686,7 @@ L.Map = L.Class.extend({
project: function (latlng, zoom) { // (LatLng[, Number]) -> Point
zoom = zoom === undefined ? this._zoom : zoom;
var toPoint = this.options.crs.latLngToPoint(L.latLng(latlng), zoom);
- return toPoint;
+ return toPoint;
},
unproject: function (point, zoom) { // (Point[, Number]) -> LatLng
@@ -1702,7 +1702,7 @@ L.Map = L.Class.extend({
latLngToLayerPoint: function (latlng) { // (LatLng)
var projectedPoint = this.project(L.latLng(latlng))._round();
var subtract = projectedPoint._subtract(this._initialTopLeftPoint);
- return subtract;
+ return subtract;
},
containerPointToLayerPoint: function (point) { // (Point)
@@ -5312,7 +5312,7 @@ L.CircleMarker = L.Circle.extend({
projectLatlngs: function () {
this._point = this._map.latLngToLayerPoint(this._latlng);
},
-
+
_updateStyle : function () {
L.Circle.prototype._updateStyle.call(this);
this.setRadius(this.options.radius);
@@ -7054,7 +7054,8 @@ L.Handler.PolyEdit = L.Handler.extend({
marker._prev._middleRight = null;
}
- this._poly.fire('edit');
+ console.log(marker);
+ this._poly.fire('edit', marker);
},
_updateIndexes: function (index, delta) {
Oops, something went wrong.

0 comments on commit c071139

Please sign in to comment.