Merge branch 'master' of github.com:systemed/iD into update-attribution

This commit is contained in:
Ansis Brammanis
2013-01-08 12:23:08 -05:00
5 changed files with 26 additions and 14 deletions
+1
View File
@@ -46,6 +46,7 @@
<script src='js/id/ui/layerswitcher.js'></script>
<script src='js/id/ui/contributors.js'></script>
<script src='js/id/ui/geocoder.js'></script>
<script src='js/id/ui/geolocate.js'></script>
<script src='js/id/ui/notice.js'></script>
<script src='js/id/ui/tag_reference.js'></script>
+1 -1
View File
@@ -31,7 +31,7 @@ iD.actions.ReverseWay = function(wayId) {
var replacements = [
[/:right$/, ':left'], [/:left$/, ':right'],
[/:forward$/, ':backward'], [/:backward$/, ':forward']
], numeric = /^([+-]?)(?=[\d.])/;
], numeric = /^([+\-]?)(?=[\d.])/;
function reverseKey(key) {
for (var i = 0; i < replacements.length; ++i) {
+1 -12
View File
@@ -184,20 +184,9 @@ window.iD = function(container) {
return d[0] + ' icon';
});
function geolocateSuccess(position) {
map.center([position.coords.longitude, position.coords.latitude]);
}
function geolocateError() { }
if (navigator.geolocation) {
container.append('div')
.attr('class', 'geolocate-control map-control')
.append('button')
.attr('class', 'narrow')
.attr('title', 'Show My Location')
.text('G')
.on('click', function() {
navigator.geolocation.getCurrentPosition(geolocateSuccess, geolocateError);
});
.call(iD.geolocate(map));
}
var gc = container.append('div').attr('class', 'geocode-control map-control')
+1 -1
View File
@@ -59,7 +59,7 @@ iD.Style.styleClasses = function() {
selection.each(function(d) {
var classes, value = this.className;
if (value.baseVal != null) value = value.baseVal;
if (value.baseVal !== null) value = value.baseVal;
classes = value.trim().split(/\s+/).filter(function(name) {
return name.length && !tagClassRe.test(name);
+22
View File
@@ -0,0 +1,22 @@
iD.geolocate = function(map) {
function success(position) {
map.center([position.coords.longitude, position.coords.latitude]);
}
function error() { }
return function(selection) {
selection
.attr('class', 'geolocate-control map-control')
.append('button')
.attr('class', 'narrow')
.attr('title', 'Show My Location')
.text('G')
.on('click', function() {
navigator.geolocation.getCurrentPosition(
success, error);
});
};
};