leaflet-js 0.6.beta4 → 0.7.0

data/lib/leaflet/src/map/handler/Map.TouchZoom.js

@@ -3,7 +3,8 @@
  */
 
 L.Map.mergeOptions({
-	touchZoom: L.Browser.touch && !L.Browser.android23
+	touchZoom: L.Browser.touch && !L.Browser.android23,
+	bounceAtZoomLimits: true
 });
 
 L.Map.TouchZoom = L.Handler.extend({
@@ -56,6 +57,11 @@ L.Map.TouchZoom = L.Handler.extend({
 
 		if (this._scale === 1) { return; }
 
+		if (!map.options.bounceAtZoomLimits) {
+			if ((map.getZoom() === map.getMinZoom() && this._scale < 1) ||
+			    (map.getZoom() === map.getMaxZoom() && this._scale > 1)) { return; }
+		}
+
 		if (!this._moved) {
 			L.DomUtil.addClass(map._mapPane, 'leaflet-touching');
 
@@ -79,7 +85,7 @@ L.Map.TouchZoom = L.Handler.extend({
 		    center = map.layerPointToLatLng(origin),
 		    zoom = map.getScaleZoom(this._scale);
 
-		map._animateZoom(center, zoom, this._startCenter, this._scale, this._delta, true);
+		map._animateZoom(center, zoom, this._startCenter, this._scale, this._delta);
 	},
 
 	_onTouchEnd: function () {
@@ -109,7 +115,7 @@ L.Map.TouchZoom = L.Handler.extend({
 		    zoom = map._limitZoom(oldZoom + roundZoomDelta),
 		    scale = map.getZoomScale(zoom) / this._scale;
 
-		map._animateZoom(center, zoom, origin, scale, null, true);
+		map._animateZoom(center, zoom, origin, scale);
 	},
 
 	_getScaleOrigin: function () {

data/vendor/assets/javascripts/leaflet.draw.js

@@ -18,6 +18,7 @@
 
 // Extensions
 //=require ../../../lib/leaflet.draw/src/ext/LatLngUtil.js
+//=require ../../../lib/leaflet.draw/src/ext/GeometryUtil.js
 //=require ../../../lib/leaflet.draw/src/ext/LineUtil.Intersect.js
 //=require ../../../lib/leaflet.draw/src/ext/Polyline.Intersect.js
 //=require ../../../lib/leaflet.draw/src/ext/Polygon.Intersect.js
@@ -27,10 +28,7 @@
 //=require ../../../lib/leaflet.draw/src/Toolbar.js
 //=require ../../../lib/leaflet.draw/src/Tooltip.js
 
-// CommonUI
-//=require ../../../lib/leaflet.draw/src/draw/DrawToolbar.js
-
-// CommonUI
+// DrawUI
 //=require ../../../lib/leaflet.draw/src/draw/DrawToolbar.js
 
 // EditUI

data/vendor/assets/javascripts/leaflet.js

@@ -89,6 +89,7 @@
 //=require ../../../lib/leaflet/src/layer/vector/canvas/Polyline.Canvas.js
 //=require ../../../lib/leaflet/src/layer/vector/canvas/Polygon.Canvas.js
 //=require ../../../lib/leaflet/src/layer/vector/canvas/Circle.Canvas.js
+//=require ../../../lib/leaflet/src/layer/vector/canvas/CircleMarker.Canvas.js
 
 // GeoJSON
 //=require ../../../lib/leaflet/src/layer/GeoJSON.js
@@ -105,8 +106,9 @@
 
 // TouchZoom
 //=require ../../../lib/leaflet/src/dom/DomEvent.DoubleTap.js
-//=require ../../../lib/leaflet/src/dom/DomEvent.MsTouch.js
+//=require ../../../lib/leaflet/src/dom/DomEvent.Pointer.js
 //=require ../../../lib/leaflet/src/map/handler/Map.TouchZoom.js
+//=require ../../../lib/leaflet/src/map/handler/Map.Tap.js
 
 // BoxZoom
 //=require ../../../lib/leaflet/src/map/handler/Map.BoxZoom.js

data/vendor/assets/javascripts/leaflet.label.js

@@ -3,7 +3,9 @@
 
 // Label
 //=require ../../../lib/leaflet.label/src/Label.js
+//=require ../../../lib/leaflet.label/src/BaseMarkerMethods.js
 //=require ../../../lib/leaflet.label/src/Marker.Label.js
+//=require ../../../lib/leaflet.label/src/CircleMarker.Label.js
 //=require ../../../lib/leaflet.label/src/Path.Label.js
 //=require ../../../lib/leaflet.label/src/Map.Label.js
 //=require ../../../lib/leaflet.label/src/FeatureGroup.Label.js

data/vendor/assets/stylesheets/leaflet.css.erb

@@ -14,45 +14,49 @@
 .leaflet-zoom-box,
 .leaflet-image-layer,
 .leaflet-layer {
-  position: absolute;
-  left: 0;
-  top: 0;
-}
+	position: absolute;
+	left: 0;
+	top: 0;
+	}
 .leaflet-container {
-  overflow: hidden;
-  -ms-touch-action: none;
-}
+	overflow: hidden;
+	-ms-touch-action: none;
+	}
 .leaflet-tile,
 .leaflet-marker-icon,
 .leaflet-marker-shadow {
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  user-select: none;
-  -webkit-user-drag: none;
-}
+	-webkit-user-select: none;
+	   -moz-user-select: none;
+	        user-select: none;
+	-webkit-user-drag: none;
+	}
 .leaflet-marker-icon,
 .leaflet-marker-shadow {
-  display: block;
-}
-  /* map is broken in FF if you have max-width: 100% on tiles */
+	display: block;
+	}
+/* map is broken in FF if you have max-width: 100% on tiles */
 .leaflet-container img {
-  max-width: none !important;
-}
-  /* stupid Android 2 doesn't understand "max-width: none" properly */
+	max-width: none !important;
+	}
+/* stupid Android 2 doesn't understand "max-width: none" properly */
 .leaflet-container img.leaflet-image-layer {
-  max-width: 15000px !important;
-}
+	max-width: 15000px !important;
+	}
 .leaflet-tile {
-  filter: inherit;
-  visibility: hidden;
-}
+	filter: inherit;
+	visibility: hidden;
+	}
 .leaflet-tile-loaded {
-  visibility: inherit;
-}
+	visibility: inherit;
+	}
 .leaflet-zoom-box {
-  width: 0;
-  height: 0;
-}
+	width: 0;
+	height: 0;
+	}
+/* workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=888319 */
+.leaflet-overlay-pane svg {
+	-moz-user-select: none;
+	}
 
 .leaflet-tile-pane    { z-index: 2; }
 .leaflet-objects-pane { z-index: 3; }
@@ -61,399 +65,414 @@
 .leaflet-marker-pane  { z-index: 6; }
 .leaflet-popup-pane   { z-index: 7; }
 
+.leaflet-vml-shape {
+	width: 1px;
+	height: 1px;
+	}
+.lvml {
+	behavior: url(#default#VML);
+	display: inline-block;
+	position: absolute;
+	}
 
-  /* control positioning */
+
+/* control positioning */
 
 .leaflet-control {
-  position: relative;
-  z-index: 7;
-  pointer-events: auto;
-}
+	position: relative;
+	z-index: 7;
+	pointer-events: auto;
+	}
 .leaflet-top,
 .leaflet-bottom {
-  position: absolute;
-  z-index: 1000;
-  pointer-events: none;
-}
+	position: absolute;
+	z-index: 1000;
+	pointer-events: none;
+	}
 .leaflet-top {
-  top: 0;
-}
+	top: 0;
+	}
 .leaflet-right {
-  right: 0;
-}
+	right: 0;
+	}
 .leaflet-bottom {
-  bottom: 0;
-}
+	bottom: 0;
+	}
 .leaflet-left {
-  left: 0;
-}
+	left: 0;
+	}
 .leaflet-control {
-  float: left;
-  clear: both;
-}
+	float: left;
+	clear: both;
+	}
 .leaflet-right .leaflet-control {
-  float: right;
-}
+	float: right;
+	}
 .leaflet-top .leaflet-control {
-  margin-top: 10px;
-}
+	margin-top: 10px;
+	}
 .leaflet-bottom .leaflet-control {
-  margin-bottom: 10px;
-}
+	margin-bottom: 10px;
+	}
 .leaflet-left .leaflet-control {
-  margin-left: 10px;
-}
+	margin-left: 10px;
+	}
 .leaflet-right .leaflet-control {
-  margin-right: 10px;
-}
+	margin-right: 10px;
+	}
 
 
-  /* zoom and fade animations */
+/* zoom and fade animations */
 
 .leaflet-fade-anim .leaflet-tile,
 .leaflet-fade-anim .leaflet-popup {
-  opacity: 0;
-  -webkit-transition: opacity 0.2s linear;
-  -moz-transition: opacity 0.2s linear;
-  -o-transition: opacity 0.2s linear;
-  transition: opacity 0.2s linear;
-}
+	opacity: 0;
+	-webkit-transition: opacity 0.2s linear;
+	   -moz-transition: opacity 0.2s linear;
+	     -o-transition: opacity 0.2s linear;
+	        transition: opacity 0.2s linear;
+	}
 .leaflet-fade-anim .leaflet-tile-loaded,
 .leaflet-fade-anim .leaflet-map-pane .leaflet-popup {
-  opacity: 1;
-}
+	opacity: 1;
+	}
 
 .leaflet-zoom-anim .leaflet-zoom-animated {
-  -webkit-transition: -webkit-transform 0.25s cubic-bezier(0,0,0.25,1);
-  -moz-transition:    -moz-transform 0.25s cubic-bezier(0,0,0.25,1);
-  -o-transition:      -o-transform 0.25s cubic-bezier(0,0,0.25,1);
-  transition:         transform 0.25s cubic-bezier(0,0,0.25,1);
-}
+	-webkit-transition: -webkit-transform 0.25s cubic-bezier(0,0,0.25,1);
+	   -moz-transition:    -moz-transform 0.25s cubic-bezier(0,0,0.25,1);
+	     -o-transition:      -o-transform 0.25s cubic-bezier(0,0,0.25,1);
+	        transition:         transform 0.25s cubic-bezier(0,0,0.25,1);
+	}
 .leaflet-zoom-anim .leaflet-tile,
 .leaflet-pan-anim .leaflet-tile,
 .leaflet-touching .leaflet-zoom-animated {
-  -webkit-transition: none;
-  -moz-transition: none;
-  -o-transition: none;
-  transition: none;
-}
+	-webkit-transition: none;
+	   -moz-transition: none;
+	     -o-transition: none;
+	        transition: none;
+	}
 
 .leaflet-zoom-anim .leaflet-zoom-hide {
-  visibility: hidden;
-}
+	visibility: hidden;
+	}
 
 
-  /* cursors */
+/* cursors */
 
 .leaflet-clickable {
-  cursor: pointer;
-}
+	cursor: pointer;
+	}
 .leaflet-container {
-  cursor: -webkit-grab;
-  cursor:    -moz-grab;
-}
+	cursor: -webkit-grab;
+	cursor:    -moz-grab;
+	}
 .leaflet-popup-pane,
 .leaflet-control {
-  cursor: auto;
-}
-.leaflet-dragging,
-.leaflet-dragging .leaflet-clickable,
-.leaflet-dragging .leaflet-container {
-  cursor: move;
-  cursor: -webkit-grabbing;
-  cursor:    -moz-grabbing;
-}
+	cursor: auto;
+	}
+.leaflet-dragging .leaflet-container,
+.leaflet-dragging .leaflet-clickable {
+	cursor: move;
+	cursor: -webkit-grabbing;
+	cursor:    -moz-grabbing;
+	}
 
 
-  /* visual tweaks */
+/* visual tweaks */
 
 .leaflet-container {
-  background: #ddd;
-  outline: 0;
-}
+	background: #ddd;
+	outline: 0;
+	}
 .leaflet-container a {
-  color: #0078A8;
-}
+	color: #0078A8;
+	}
 .leaflet-container a.leaflet-active {
-  outline: 2px solid orange;
-}
+	outline: 2px solid orange;
+	}
 .leaflet-zoom-box {
-  border: 2px dotted #05f;
-  background: white;
-  opacity: 0.5;
-}
+	border: 2px dotted #38f;
+	background: rgba(255,255,255,0.5);
+	}
 
 
-  /* general typography */
+/* general typography */
 .leaflet-container {
-  font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif;
-}
+	font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif;
+	}
 
 
-  /* general toolbar styles */
+/* general toolbar styles */
 
 .leaflet-bar {
-  box-shadow: 0 1px 7px rgba(0,0,0,0.65);
-  -webkit-border-radius: 4px;
-  border-radius: 4px;
-}
-.leaflet-bar a {
-  background-color: #fff;
-  border-bottom: 1px solid #ccc;
-  width: 26px;
-  height: 26px;
-  line-height: 26px;
-  display: block;
-  text-align: center;
-  text-decoration: none;
-  color: black;
-}
+	box-shadow: 0 1px 5px rgba(0,0,0,0.65);
+	border-radius: 4px;
+	}
+.leaflet-bar a,
+.leaflet-bar a:hover {
+	background-color: #fff;
+	border-bottom: 1px solid #ccc;
+	width: 26px;
+	height: 26px;
+	line-height: 26px;
+	display: block;
+	text-align: center;
+	text-decoration: none;
+	color: black;
+	}
 .leaflet-bar a,
 .leaflet-control-layers-toggle {
-  background-position: 50% 50%;
-  background-repeat: no-repeat;
-  display: block;
-}
+	background-position: 50% 50%;
+	background-repeat: no-repeat;
+	display: block;
+	}
 .leaflet-bar a:hover {
-  background-color: #f4f4f4;
-}
+	background-color: #f4f4f4;
+	}
 .leaflet-bar a:first-child {
-  -webkit-border-top-left-radius: 4px;
-  border-top-left-radius: 4px;
-  -webkit-border-top-right-radius: 4px;
-  border-top-right-radius: 4px;
-}
+	border-top-left-radius: 4px;
+	border-top-right-radius: 4px;
+	}
 .leaflet-bar a:last-child {
-  -webkit-border-bottom-left-radius: 4px;
-  border-bottom-left-radius: 4px;
-  -webkit-border-bottom-right-radius: 4px;
-  border-bottom-right-radius: 4px;
-  border-bottom: none;
-}
+	border-bottom-left-radius: 4px;
+	border-bottom-right-radius: 4px;
+	border-bottom: none;
+	}
 .leaflet-bar a.leaflet-disabled {
-  cursor: default;
-  background-color: #f4f4f4;
-  color: #bbb;
-}
+	cursor: default;
+	background-color: #f4f4f4;
+	color: #bbb;
+	}
 
-.leaflet-touch .leaflet-bar {
-  -webkit-border-radius: 10px;
-  border-radius: 10px;
-}
 .leaflet-touch .leaflet-bar a {
-  width: 30px;
-  height: 30px;
-}
-.leaflet-touch .leaflet-bar a:first-child {
-  -webkit-border-top-left-radius: 7px;
-  border-top-left-radius: 7px;
-  -webkit-border-top-right-radius: 7px;
-  border-top-right-radius: 7px;
-}
-.leaflet-touch .leaflet-bar a:last-child {
-  -webkit-border-bottom-left-radius: 7px;
-  border-bottom-left-radius: 7px;
-  -webkit-border-bottom-right-radius: 7px;
-  border-bottom-right-radius: 7px;
-  border-bottom: none;
-}
-
-
-  /* zoom control */
-
-.leaflet-control-zoom-in {
-  font: bold 18px 'Lucida Console', Monaco, monospace;
-}
+	width: 30px;
+	height: 30px;
+	line-height: 30px;
+	}
+
+
+/* zoom control */
+
+.leaflet-control-zoom-in,
 .leaflet-control-zoom-out {
-  font: bold 22px 'Lucida Console', Monaco, monospace;
-}
+	font: bold 18px 'Lucida Console', Monaco, monospace;
+	text-indent: 1px;
+	}
+.leaflet-control-zoom-out {
+	font-size: 20px;
+	}
 
 .leaflet-touch .leaflet-control-zoom-in {
-  font-size: 22px;
-  line-height: 30px;
-}
+	font-size: 22px;
+	}
 .leaflet-touch .leaflet-control-zoom-out {
-  font-size: 28px;
-  line-height: 30px;
-}
+	font-size: 24px;
+	}
 
 
-  /* layers control */
+/* layers control */
 
 .leaflet-control-layers {
-  box-shadow: 0 1px 7px rgba(0,0,0,0.4);
-  background: #f8f8f9;
-  -webkit-border-radius: 8px;
-  border-radius: 8px;
-}
+	box-shadow: 0 1px 5px rgba(0,0,0,0.4);
+	background: #fff;
+	border-radius: 5px;
+	}
 .leaflet-control-layers-toggle {
-  background-image: url(<%= asset_path 'layers.png' %>);
-  width: 36px;
-  height: 36px;
-}
+	background-image: url(<%= asset_path 'layers.png' %>);
+	width: 36px;
+	height: 36px;
+	}
+.leaflet-retina .leaflet-control-layers-toggle {
+	background-image: url(<%= asset_path 'layers-2x.png' %>);
+	background-size: 26px 26px;
+	}
 .leaflet-touch .leaflet-control-layers-toggle {
-  width: 44px;
-  height: 44px;
-}
+	width: 44px;
+	height: 44px;
+	}
 .leaflet-control-layers .leaflet-control-layers-list,
 .leaflet-control-layers-expanded .leaflet-control-layers-toggle {
-  display: none;
-}
+	display: none;
+	}
 .leaflet-control-layers-expanded .leaflet-control-layers-list {
-  display: block;
-  position: relative;
-}
+	display: block;
+	position: relative;
+	}
 .leaflet-control-layers-expanded {
-  padding: 6px 10px 6px 6px;
-  color: #333;
-  background: #fff;
-}
+	padding: 6px 10px 6px 6px;
+	color: #333;
+	background: #fff;
+	}
 .leaflet-control-layers-selector {
-  margin-top: 2px;
-  position: relative;
-  top: 1px;
-}
+	margin-top: 2px;
+	position: relative;
+	top: 1px;
+	}
 .leaflet-control-layers label {
-  display: block;
-}
+	display: block;
+	}
 .leaflet-control-layers-separator {
-  height: 0;
-  border-top: 1px solid #ddd;
-  margin: 5px -10px 5px -6px;
-}
+	height: 0;
+	border-top: 1px solid #ddd;
+	margin: 5px -10px 5px -6px;
+	}
 
 
-  /* attribution and scale controls */
+/* attribution and scale controls */
 
 .leaflet-container .leaflet-control-attribution {
-  background-color: rgba(255, 255, 255, 0.7);
-  box-shadow: 0 0 5px #bbb;
-  margin: 0;
-}
+	background: #fff;
+	background: rgba(255, 255, 255, 0.7);
+	margin: 0;
+	}
 .leaflet-control-attribution,
 .leaflet-control-scale-line {
-  padding: 0 5px;
-  color: #333;
-}
+	padding: 0 5px;
+	color: #333;
+	}
+.leaflet-control-attribution a {
+	text-decoration: none;
+	}
+.leaflet-control-attribution a:hover {
+	text-decoration: underline;
+	}
 .leaflet-container .leaflet-control-attribution,
 .leaflet-container .leaflet-control-scale {
-  font-size: 11px;
-}
+	font-size: 11px;
+	}
 .leaflet-left .leaflet-control-scale {
-  margin-left: 5px;
-}
+	margin-left: 5px;
+	}
 .leaflet-bottom .leaflet-control-scale {
-  margin-bottom: 5px;
-}
+	margin-bottom: 5px;
+	}
 .leaflet-control-scale-line {
-  border: 2px solid #777;
-  border-top: none;
-  color: black;
-  line-height: 1.1;
-  padding: 2px 5px 1px;
-  font-size: 11px;
-  text-shadow: 1px 1px 1px #fff;
-  background-color: rgba(255, 255, 255, 0.5);
-  box-shadow: 0 -1px 5px rgba(0, 0, 0, 0.2);
-  white-space: nowrap;
-  overflow: hidden;
-}
+	border: 2px solid #777;
+	border-top: none;
+	line-height: 1.1;
+	padding: 2px 5px 1px;
+	font-size: 11px;
+	white-space: nowrap;
+	overflow: hidden;
+	-moz-box-sizing: content-box;
+	     box-sizing: content-box;
+
+	background: #fff;
+	background: rgba(255, 255, 255, 0.5);
+	}
 .leaflet-control-scale-line:not(:first-child) {
-  border-top: 2px solid #777;
-  border-bottom: none;
-  margin-top: -2px;
-  box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2);
-}
+	border-top: 2px solid #777;
+	border-bottom: none;
+	margin-top: -2px;
+	}
 .leaflet-control-scale-line:not(:first-child):not(:last-child) {
-  border-bottom: 2px solid #777;
-}
+	border-bottom: 2px solid #777;
+	}
 
 .leaflet-touch .leaflet-control-attribution,
 .leaflet-touch .leaflet-control-layers,
-.leaflet-touch .leaflet-control-zoom {
-  box-shadow: none;
-}
+.leaflet-touch .leaflet-bar {
+	box-shadow: none;
+	}
 .leaflet-touch .leaflet-control-layers,
-.leaflet-touch .leaflet-control-zoom {
-  border: 4px solid rgba(0,0,0,0.3);
-}
+.leaflet-touch .leaflet-bar {
+	border: 2px solid rgba(0,0,0,0.2);
+	background-clip: padding-box;
+	}
 
 
-  /* popup */
+/* popup */
 
 .leaflet-popup {
-  position: absolute;
-  text-align: center;
-}
+	position: absolute;
+	text-align: center;
+	}
 .leaflet-popup-content-wrapper {
-  padding: 1px;
-  text-align: left;
-  -webkit-border-radius: 20px;
-  border-radius: 20px;
-}
+	padding: 1px;
+	text-align: left;
+	border-radius: 12px;
+	}
 .leaflet-popup-content {
-  margin: 14px 20px;
-  line-height: 1.4;
-}
+	margin: 13px 19px;
+	line-height: 1.4;
+	}
 .leaflet-popup-content p {
-  margin: 18px 0;
-}
+	margin: 18px 0;
+	}
 .leaflet-popup-tip-container {
-  margin: 0 auto;
-  width: 40px;
-  height: 20px;
-  position: relative;
-  overflow: hidden;
-}
+	margin: 0 auto;
+	width: 40px;
+	height: 20px;
+	position: relative;
+	overflow: hidden;
+	}
+.leaflet-popup-tip {
+	width: 17px;
+	height: 17px;
+	padding: 1px;
+
+	margin: -10px auto 0;
+
+	-webkit-transform: rotate(45deg);
+	   -moz-transform: rotate(45deg);
+	    -ms-transform: rotate(45deg);
+	     -o-transform: rotate(45deg);
+	        transform: rotate(45deg);
+	}
+.leaflet-popup-content-wrapper,
 .leaflet-popup-tip {
-  width: 15px;
-  height: 15px;
-  padding: 1px;
-
-  margin: -8px auto 0;
-
-  -webkit-transform: rotate(45deg);
-  -moz-transform: rotate(45deg);
-  -ms-transform: rotate(45deg);
-  -o-transform: rotate(45deg);
-  transform: rotate(45deg);
-}
-.leaflet-popup-content-wrapper, .leaflet-popup-tip {
-  background: white;
-
-  box-shadow: 0 3px 14px rgba(0,0,0,0.4);
-}
+	background: white;
+
+	box-shadow: 0 3px 14px rgba(0,0,0,0.4);
+	}
 .leaflet-container a.leaflet-popup-close-button {
-  position: absolute;
-  top: 0;
-  right: 0;
-  padding: 4px 5px 0 0;
-  text-align: center;
-  width: 18px;
-  height: 14px;
-  font: 16px/14px Tahoma, Verdana, sans-serif;
-  color: #c3c3c3;
-  text-decoration: none;
-  font-weight: bold;
-  background: transparent;
-}
+	position: absolute;
+	top: 0;
+	right: 0;
+	padding: 4px 4px 0 0;
+	text-align: center;
+	width: 18px;
+	height: 14px;
+	font: 16px/14px Tahoma, Verdana, sans-serif;
+	color: #c3c3c3;
+	text-decoration: none;
+	font-weight: bold;
+	background: transparent;
+	}
 .leaflet-container a.leaflet-popup-close-button:hover {
-  color: #999;
-}
+	color: #999;
+	}
 .leaflet-popup-scrolled {
-  overflow: auto;
-  border-bottom: 1px solid #ddd;
-  border-top: 1px solid #ddd;
-}
-
-
-  /* div icon */
+	overflow: auto;
+	border-bottom: 1px solid #ddd;
+	border-top: 1px solid #ddd;
+	}
+
+.leaflet-oldie .leaflet-popup-content-wrapper {
+	zoom: 1;
+	}
+.leaflet-oldie .leaflet-popup-tip {
+	width: 24px;
+	margin: 0 auto;
+
+	-ms-filter: "progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678)";
+	filter: progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678);
+	}
+.leaflet-oldie .leaflet-popup-tip-container {
+	margin-top: -1px;
+	}
+
+.leaflet-oldie .leaflet-control-zoom,
+.leaflet-oldie .leaflet-control-layers,
+.leaflet-oldie .leaflet-popup-content-wrapper,
+.leaflet-oldie .leaflet-popup-tip {
+	border: 1px solid #999;
+	}
+
+
+/* div icon */
 
 .leaflet-div-icon {
-  background: #fff;
-  border: 1px solid #666;
-}
-.leaflet-editing-icon {
-  -webkit-border-radius: 2px;
-  border-radius: 2px;
-}
+	background: #fff;
+	border: 1px solid #666;
+	}