cartodb/Leaflet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,363 Commits 13 Branches 25 Tags 44 MiB
43c2c6a4a0
Commit Graph

680 Commits

Author SHA1 Message Date
Vladimir Agafonkin
b1a31fa5e4 fix tilelayer anim glitch, close #1548 2013-04-18 15:19:38 +03:00
Vladimir Agafonkin
c4dc595490 more strict jshinting, enforce single quotes and camelCase for consistency 2013-04-11 12:45:52 +03:00
John Firebaugh
786faddc84 Permit layer stamping to be overridden 2013-04-10 12:28:27 -04:00
John Firebaugh
55edd44678 Add #toGeoJSON to various layer types (#712) 2013-04-04 09:46:18 -07:00
Vladimir Agafonkin
c247dfdb2c Merge pull request #1537 from dotCypress/master 
Popup close button fix
 2013-03-28 13:35:11 -07:00
Alexander frenzel
d904859ba3 fix enable/disable of marker dragging 2013-03-27 21:03:05 +01:00
Vitaly Domnikov
b1742194f4 Popup close button bugfix 2013-03-20 16:24:47 +02:00
malexeev
e110c7bbfe safer _getSubdomain 
Note that (tilePoint.x + tilePoint.y) might be negative in some cases (custom CRS with tiled WMS).
 2013-03-18 22:54:52 +02:00
Vladimir Agafonkin
81221ae4cd fix jshint 1.1.0 errors, update deps and build 2013-03-07 17:39:55 +02:00
Vladimir Agafonkin
b993f1fc4b Merge pull request #1471 from snkashis/drag_handling 
handle drag listeners properly to avoid errors on marker removal
 2013-02-28 03:25:04 -08:00
snkashis
1df4c4a98f work with handlers in right place 2013-02-28 11:01:26 +00:00
snkashis
ed08a5b1dc call disable, not removeHooks 2013-02-28 10:46:54 +00:00
snkashis
95c73a3d77 handle drag handlers properly to avoid errors if moving while removed. 2013-02-28 10:38:27 +00:00
Tom MacWright
71d17180c8 Add layerGroup#getLayers and tests. Fixes #1460 2013-02-27 17:10:19 -05:00
John Firebaugh
5e7857cdff Normalize polygon holes (fixes #1459) 2013-02-27 08:12:18 -08:00
Vladimir Agafonkin
f4e8735547 clean up the canvas hovering code 2013-02-27 17:17:37 +02:00
Vladimir Agafonkin
6fff98435c Merge branch 'canvas_path_cursor' of github.com:snkashis/Leaflet into canvas-hover 
* 'canvas_path_cursor' of github.com:snkashis/Leaflet:
  mouseout firing
  mistaken, unneeded test file.
  don't perform if animatingZoom
  dupe of 50K vector test, for canvas.
  Hand cursor for canvas paths
 2013-02-27 16:13:50 +02:00
Vladimir Agafonkin
bba4f2ae1b return this in LayerGroup eachLayer, close #1452 2013-02-25 19:26:35 +02:00
Vladimir Agafonkin
0a83b83237 fix whitespace 2013-02-25 12:45:33 +02:00
Vladimir Agafonkin
a169b6cb86 Merge pull request #991 from adimitrov/overlay_bounds 
Add tileBounds option to limit tile loading to a given region
 2013-02-25 02:23:11 -08:00
Vladimir Agafonkin
3cc75db221 Merge pull request #1440 from danzel/zoom 
Fix building without zoom animations enabled
 2013-02-21 00:10:13 -08:00
Vladimir Agafonkin
9c9d4286a1 Merge pull request #1439 from danzel/convert_option 
Make Polyline/Polygon not overwrite the source array
 2013-02-21 00:08:48 -08:00
danzel
1681365040 Fix building without zoom animations enabled 2013-02-21 15:15:24 +13:00
Vladimir Agafonkin
97454596c6 fix whitespace, update build 2013-02-20 19:49:40 +02:00
Vladimir Agafonkin
36e59c2afb minor WMS cleanup after merge 2013-02-20 19:48:33 +02:00
Vladimir Agafonkin
3063fd9192 Merge pull request #1433 from tmcw/layer-container 
Add a public API for getContainer for TileLayer
 2013-02-20 09:48:19 -08:00
Vladimir Agafonkin
874ec60aae Merge pull request #1080 from brianhatchl/wms-tilesize-option-bug 
fixed bug where wms tilesize option was ignored
 2013-02-20 09:44:54 -08:00
Vladimir Agafonkin
40a824fc97 refactor TileLayer animation, fix #1140, #1437, #52, #1442 
Refactored TileLayer animation so that it happens for each tile layer
independently instead of animating the parent of all tile layers. Moved
TileLayer animation code into a separate file (TileLayer.Anim.js).
Fixes loads of bugs and makes the code easier to understand.
 2013-02-20 18:40:00 +02:00
Tom MacWright
8735b87980 Add public getContainer API to TileLayer, and test for it. 2013-02-19 20:05:44 -05:00
danzel
3afee7eb49 Allow overwriting the given array, for usage by spliceLatLngs. 2013-02-20 11:03:13 +13:00
snkashis
0fb7a13277 force new array 2013-02-20 10:38:44 +13:00
snkashis
57d42d1636 allow for no overwrite option in covertLatLngs 2013-02-20 10:38:43 +13:00
snkashis
382a9965ef mouseout firing 2013-02-17 21:25:11 -05:00
snkashis
d010d586d0 don't perform if animatingZoom 2013-02-17 14:57:32 -05:00
snkashis
baeeddb078 Hand cursor for canvas paths 2013-02-17 14:21:27 -05:00
snkashis
11195f4849 allow Path.bindPopup to take existing popups as well. 2013-02-17 13:31:27 -05:00
Vladimir Agafonkin
f12e7e65f3 Merge pull request #1400 from jfirebaugh/getTileUrl 
Enable cleaner overriding of TileLayer#getTileUrl
 2013-02-15 16:39:22 -08:00
Vladimir Agafonkin
26b026b1c3 Merge pull request #1399 from jfirebaugh/tabs_vs_spaces 
2 space indents -> tabs
 2013-02-15 16:31:22 -08:00
John Firebaugh
4f906246bf Enable cleaner overriding of TileLayer#getTileUrl 
Moved the called to _adjustTilePoint outside of getTileUrl,
and moved the call to _getZoomForUrl into _adjustTilePoint.
This allows getTileUrl to use x, y, z directly without any
calls to private methods.
 2013-02-15 16:29:20 -08:00
John Firebaugh
e52bbd0b3a 2 space indents -> tabs 2013-02-15 16:22:45 -08:00
Dave Leaver
acf3413d7c Merge pull request #1396 from danzel/oldie-fixes 
Fix TileLayer opacity in IE7/8
 2013-02-15 14:00:16 -08:00
danzel
aed9506ab0 TileLayer opacity fixes as per @javisantana in #1371. Fixes #1084 2013-02-16 10:57:25 +13:00
Vladimir Agafonkin
703f8a3a43 Merge pull request #1384 from snkashis/svg_clicks 
Allow clicks to pass thru non clickable paths
 2013-02-15 07:38:27 -08:00
Vladimir Agafonkin
3cef077128 Merge pull request #1385 from snkashis/bind_popup_option 
Allow previously created popups to be used with bindPopup
 2013-02-15 07:35:03 -08:00
Vladimir Agafonkin
b42559d816 Merge pull request #1386 from snkashis/click_while_open 
Don't fade in a currently shown popup when clicking marker again
 2013-02-15 07:31:35 -08:00
snkashis
1c38b896ba Don't fade in a currently shown marker popup 2013-02-14 23:27:21 -05:00
snkashis
ae07e792af Allow previously created popups to be used with bindPopup 2013-02-14 23:04:53 -05:00
snkashis
7472550087 Allow clicks to pass thru non clickable paths 2013-02-14 22:17:34 -05:00
snkashis
633e21d043 include conditional before trying to set content of popup 2013-02-13 14:08:45 -05:00
snkashis
dbd57c0b7b Allow popups that are bound to markers to have new content set 2013-02-13 14:06:48 -05:00
jacobtoye
e13d5faa80 Remove Polyline.Edit file. 2013-02-11 13:17:11 +13:00
danzel
513c6ca4cd Change _propagateEvent to be careful that it doesn't overwrite e.layer if it is already set. Allows markers to be in multiple FeatureGroups and have the events come through correctly. See the test for details. 
Fixes Leaflet.markercluster#128 ( https://github.com/Leaflet/Leaflet.markercluster/issues/128 )
 2013-02-08 14:44:28 +13:00
danzel
6b51780e79 Make setRadius and updateStyle({radius: 123 }) work. 2013-02-04 09:51:27 +13:00
danzel
ded525fb06 Fix #1297 CircleMarker setRadius not working if called before adding to map. 2013-02-03 15:35:12 +13:00
Vladimir Agafonkin
08f770fcc2 Merge pull request #1053 from inpursuit/enhancement/3 
Allow pointer-events to be set via options passed to shape
 2013-01-31 08:37:43 -08:00
Roemer Vlasveld
75fa5b087f Fix js typo 2013-01-21 22:46:18 +01:00
Roemer Vlasveld
82d4535180 Add hasLayer to LayerGroup 
Add the method hasLayer to LayerGroup, return false when not present or checking for a null layer.
 2013-01-21 22:36:24 +01:00
snkashis
5524db2816 condition on one line 2013-01-21 10:14:42 -05:00
snkashis
65aad99297 Revert "whitespace fix?" 
This reverts commit 9856a66864.
 2013-01-20 20:18:48 -05:00
Steve
9856a66864 whitespace fix? 2013-01-20 20:06:52 -05:00
Steve
c0210009df whitespace again 2013-01-20 19:39:01 -05:00
Steve
03a775c69b Trying to fix whitespace 2013-01-20 19:38:12 -05:00
Steve
52b445a36d Simplify features check 2013-01-20 19:35:18 -05:00
snkashis
c43e72da16 Handle arrays of feature collections 2013-01-20 19:13:43 -05:00
Calvin Metcalf
f26da9f9be only mention the path, and ternery 2013-01-18 13:35:07 -05:00
Calvin Metcalf
c3cb132463 we want it reletive not from the base 2013-01-18 12:46:16 -05:00
Calvin Metcalf
82869206e2 ie7 fix 2013-01-18 12:41:11 -05:00
Vladimir Agafonkin
292d2b3633 merge snkashis polygon fix 2013-01-18 17:43:31 +02:00
Vladimir Agafonkin
76f8d0762d Merge pull request #1287 from jieter/master 
TileLayer.Canvas now returns this.
 2013-01-18 07:25:37 -08:00
Yohan Boniface
44a7c6e0d8 Typo in Polyline docstring 2013-01-18 12:48:43 +01:00
Jan Pieter Waagmeester
12d04f5c59 TileLayer.Canvas.redraw() now returns this. 2013-01-17 09:39:06 +01:00
Vladimir Agafonkin
405bf0c05d Merge pull request #1279 from oslek/isArray 
Robust array type check for cross-frame support
 2013-01-14 15:11:41 -08:00
oslek
7dd7e4f699 Robust array type check for cross-frame support 
In a multi-frame DOM environment, if setView is called with an array for
the first parameter, a subsequent call to getBounds raises "Invalid
LatLng object" exception. This is the case if the array passed to
setView was created outside the iFrame that contains the map. It causes
the array test using "instanceof" in L.latLng to fail, and
_initialTopLeftPoint to not being properly initialized.

Thank you to Juriy Zaytsev for the full explaination:
http://perfectionkills.com/instanceof-considered-harmful-or-how-to-write-a-robust-isarray/
John Resig and Dean Edwards post comments and concur.
 2013-01-14 14:04:50 -08:00
danzel
365a5b3b02 Fix jshint unhappiness (Thanks @Guiswa) 2013-01-15 10:51:36 +13:00
Vladimir Agafonkin
dad3996d0e Merge pull request #1097 from calvinmetcalf/GeometryCollection 
GeoJSON GeometryCollection passes consisent params to pointToLayer
 2013-01-14 06:33:28 -08:00
Calvin Metcalf
0ebbd7553e fixed the whitespace and also removed the quotes in object keys 2013-01-14 07:25:34 -05:00
Vladimir Agafonkin
3f4e890b58 Merge pull request #1174 from danzel/master 
Add retina marker icon support and retina-ize the default icon
 2013-01-14 02:50:28 -08:00
mourner
333899ca51 add Popup zoomAnimation option, fix #999 2013-01-14 00:23:45 +02:00
mourner
5eb4f4686d fix a bug with FeatureGroup bindPopup not accepting options 2013-01-14 00:23:04 +02:00
snkashis
b3a7f2ffb7 Remove click handler with onRemove 2013-01-12 16:55:13 -05:00
Vladimir Agafonkin
116671fa55 Merge pull request #1013 from fdlk/set-radius-in-style 
radius is part of CircleMarker style so should be changeable in using setStyle();
 2013-01-11 08:43:18 -08:00
Vladimir Agafonkin
bc4104c708 fix TileLayer.brintToFront/Back on IE6-8, close #1168 2013-01-11 18:33:17 +02:00
Vladimir Agafonkin
80d0da1bdf fix iOS vectir zoom anim regression, close #1259 2013-01-08 12:18:10 +02:00
Vladimir Agafonkin
733666bcab Merge pull request #1240 from brianherbert/allow-null-geojson 
Allow null GeoJSON geometries.
 2012-12-28 04:49:31 -08:00
Brian Herbert
971e55b911 Simplifying condition for null geojson geometries. 
Used feedback from @mourner to make the change from the pull request
#1240
 2012-12-28 11:56:19 +09:00
Vladimir Agafonkin
e825b32cf8 Merge pull request #1244 from danzel/fix-events 
Change marker click tracking. Only care if the map has been dragged if we are not draggable.
 2012-12-27 13:53:55 -08:00
snkashis
b2e3f16b54 pass the clicked obj, not the map. 2012-12-27 15:37:57 -05:00
Vladimir Agafonkin
5109492a35 Merge pull request #1231 from snkashis/fix_wms_params 
handle existing query strings for WMS urls , #973
 2012-12-27 11:42:31 -08:00
Brian Herbert
2a38a809d3 Allow null GeoJSON geometries. 
This change checks if a geometry/ies in GeoJSON are set as null, in
which case it will skip it.
 2012-12-27 12:15:08 +09:00
Mehmet Alkanlar
f2b9a3a32e Fixed issue with Polyline.Edit remove hook. 2012-12-24 17:35:33 -08:00
snkashis
8c7c06431a handle existing query strings for WMS urls , #973 2012-12-22 17:47:38 -05:00
Yohan Boniface
952f9289c3 Eventlistener is Path._openPopup not Path.openPopup 2012-12-21 18:13:45 +01:00
danzel
73dd7371d0 Change marker click tracking. Only care if the map has been dragged if we are not draggable. 
If we are draggable and we get a possible click then we don't need to care if the map was dragged as we would have been handling the drag.

Fixes #1223
 2012-12-21 14:40:09 +13:00
Vladimir Agafonkin
b9727d9190 made up my mind about comment format, add some more comments 2012-12-20 12:37:40 +02:00
Vladimir Agafonkin
c6caf93c00 refactor build scripts, cleanup 2012-12-17 19:15:19 +02:00
Vladimir Agafonkin
6134a41554 jshint fixes and cleanup for uglifyjs2 2012-12-12 19:09:47 +02:00
Vladimir Agafonkin
5f467337f6 move editing stuff out of Polyline.js into Polyline.Edit.js 2012-12-12 18:24:44 +02:00
Vladimir Agafonkin
dea6a349c0 add Path add event 2012-12-12 18:24:05 +02:00
Vladimir Agafonkin
a089cd4337 fix regression in GeoJSON resetStyle, close #1112 2012-12-12 15:42:21 +02:00
Vladimir Agafonkin
9f50141e8a update build 2012-12-12 14:20:08 +02:00