Merge branch 'fix/osm-https' of piernov/jm2l into master
|
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 696 B |
|
Before Width: | Height: | Size: 3.9 KiB After Width: | Height: | Size: 2.5 KiB |
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 797 B After Width: | Height: | Size: 618 B |
|
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 696 B |
|
Before Width: | Height: | Size: 3.9 KiB After Width: | Height: | Size: 2.5 KiB |
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 797 B After Width: | Height: | Size: 618 B |
|
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 2.3 KiB |
@@ -57,8 +57,8 @@
|
|||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
var map = L.map('map');
|
var map = L.map('map');
|
||||||
// create the tile layer with correct attribution
|
// create the tile layer with correct attribution
|
||||||
var osmUrl='http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
|
var osmUrl='//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
|
||||||
var osmAttrib='Map data © <a href="http://openstreetmap.org">OpenStreetMap</a> contributors';
|
var osmAttrib='Map data © <a href="//openstreetmap.org">OpenStreetMap</a> contributors';
|
||||||
var osm = new L.TileLayer(osmUrl, {minZoom: 8, maxZoom: 17, attribution: osmAttrib});
|
var osm = new L.TileLayer(osmUrl, {minZoom: 8, maxZoom: 17, attribution: osmAttrib});
|
||||||
map.addLayer(osm);
|
map.addLayer(osm);
|
||||||
var great_route = L.Routing.control({
|
var great_route = L.Routing.control({
|
||||||
|
|||||||
@@ -67,8 +67,8 @@
|
|||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
var map = L.map('come_map');
|
var map = L.map('come_map');
|
||||||
// create the tile layer with correct attribution
|
// create the tile layer with correct attribution
|
||||||
var osmUrl='http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
|
var osmUrl='//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
|
||||||
var osmAttrib='Map data © <a href="http://openstreetmap.org">OpenStreetMap</a> contributors';
|
var osmAttrib='Map data © <a href="//openstreetmap.org">OpenStreetMap</a> contributors';
|
||||||
var osm = new L.TileLayer(osmUrl, {minZoom: 7, maxZoom: 18, attribution: osmAttrib});
|
var osm = new L.TileLayer(osmUrl, {minZoom: 7, maxZoom: 18, attribution: osmAttrib});
|
||||||
map.setView(new L.LatLng(43.6137, 7.07502),16);
|
map.setView(new L.LatLng(43.6137, 7.07502),16);
|
||||||
marker = L.marker([43.61556, 7.07176], {
|
marker = L.marker([43.61556, 7.07176], {
|
||||||
|
|||||||
@@ -98,8 +98,8 @@
|
|||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
var map = L.map('map');
|
var map = L.map('map');
|
||||||
// create the tile layer with correct attribution
|
// create the tile layer with correct attribution
|
||||||
var osmUrl='http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
|
var osmUrl='//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
|
||||||
var osmAttrib='Map data © <a href="http://openstreetmap.org">OpenStreetMap</a> contributors';
|
var osmAttrib='Map data © <a href="//openstreetmap.org">OpenStreetMap</a> contributors';
|
||||||
var osm = new L.TileLayer(osmUrl, {minZoom: 8, maxZoom: 18, attribution: osmAttrib});
|
var osm = new L.TileLayer(osmUrl, {minZoom: 8, maxZoom: 18, attribution: osmAttrib});
|
||||||
// start the map on specified GPS Coords
|
// start the map on specified GPS Coords
|
||||||
map.setView(new L.LatLng(${form.gps_coord.data}),15);
|
map.setView(new L.LatLng(${form.gps_coord.data}),15);
|
||||||
|
|||||||