|
@@ -289,6 +289,7 @@ export default {
|
|
|
extent: extent,
|
|
extent: extent,
|
|
|
maxZoom: 18.5
|
|
maxZoom: 18.5
|
|
|
}),
|
|
}),
|
|
|
|
|
+<<<<<<< HEAD
|
|
|
|
|
|
|
|
controls: control.defaults({
|
|
controls: control.defaults({
|
|
|
zoom: false
|
|
zoom: false
|
|
@@ -296,6 +297,14 @@ export default {
|
|
|
// controls: control.defaults().extend([
|
|
// controls: control.defaults().extend([
|
|
|
// new control.MousePosition()
|
|
// new control.MousePosition()
|
|
|
// ])
|
|
// ])
|
|
|
|
|
+=======
|
|
|
|
|
+ // controls: control.defaults({
|
|
|
|
|
+ // // zoom: false
|
|
|
|
|
+ // }),
|
|
|
|
|
+ controls: control.defaults().extend([
|
|
|
|
|
+ // new control.MousePosition()
|
|
|
|
|
+ ])
|
|
|
|
|
+>>>>>>> 19d9fc0c8fe457c51837e189f7721ce5e42e3f49
|
|
|
})
|
|
})
|
|
|
setTimeout(function () { map.updateSize() })
|
|
setTimeout(function () { map.updateSize() })
|
|
|
},
|
|
},
|
