Browse Source

Merge branch 'fix/osm-https' of piernov/jm2l into master

master
JM2L 3 years ago
committed by Gogs
parent
commit
f2d5bc7924
16 changed files with 9051 additions and 1161 deletions
  1. BIN
      jm2l/static/vendor/leaflet/css/images/layers-2x.png
  2. BIN
      jm2l/static/vendor/leaflet/css/images/layers.png
  3. BIN
      jm2l/static/vendor/leaflet/css/images/marker-icon-2x.png
  4. BIN
      jm2l/static/vendor/leaflet/css/images/marker-icon.png
  5. BIN
      jm2l/static/vendor/leaflet/css/images/marker-shadow.png
  6. BIN
      jm2l/static/vendor/leaflet/js/images/layers-2x.png
  7. BIN
      jm2l/static/vendor/leaflet/js/images/layers.png
  8. BIN
      jm2l/static/vendor/leaflet/js/images/marker-icon-2x.png
  9. BIN
      jm2l/static/vendor/leaflet/js/images/marker-icon.png
  10. BIN
      jm2l/static/vendor/leaflet/js/images/marker-shadow.png
  11. +9034
    -1151
      jm2l/static/vendor/leaflet/js/leaflet-routing-machine.js
  12. +11
    -4
      jm2l/static/vendor/leaflet/js/leaflet-routing-machine.min.js
  13. BIN
      jm2l/static/vendor/leaflet/leaflet.routing.icons.png
  14. +2
    -2
      jm2l/templates/Logistique/Dialog_Covoit.mako
  15. +2
    -2
      jm2l/templates/Public/Plan.mako
  16. +2
    -2
      jm2l/templates/modals.mako

BIN
jm2l/static/vendor/leaflet/css/images/layers-2x.png View File

Before After
Width: 52  |  Height: 52  |  Size: 2.8 KiB Width: 52  |  Height: 52  |  Size: 1.2 KiB

BIN
jm2l/static/vendor/leaflet/css/images/layers.png View File

Before After
Width: 26  |  Height: 26  |  Size: 1.5 KiB Width: 26  |  Height: 26  |  Size: 696 B

BIN
jm2l/static/vendor/leaflet/css/images/marker-icon-2x.png View File

Before After
Width: 50  |  Height: 82  |  Size: 3.9 KiB Width: 50  |  Height: 82  |  Size: 2.5 KiB

BIN
jm2l/static/vendor/leaflet/css/images/marker-icon.png View File

Before After
Width: 25  |  Height: 41  |  Size: 1.7 KiB Width: 25  |  Height: 41  |  Size: 1.4 KiB

BIN
jm2l/static/vendor/leaflet/css/images/marker-shadow.png View File

Before After
Width: 41  |  Height: 41  |  Size: 797 B Width: 41  |  Height: 41  |  Size: 618 B

BIN
jm2l/static/vendor/leaflet/js/images/layers-2x.png View File

Before After
Width: 52  |  Height: 52  |  Size: 2.8 KiB Width: 52  |  Height: 52  |  Size: 1.2 KiB

BIN
jm2l/static/vendor/leaflet/js/images/layers.png View File

Before After
Width: 26  |  Height: 26  |  Size: 1.5 KiB Width: 26  |  Height: 26  |  Size: 696 B

BIN
jm2l/static/vendor/leaflet/js/images/marker-icon-2x.png View File

Before After
Width: 50  |  Height: 82  |  Size: 3.9 KiB Width: 50  |  Height: 82  |  Size: 2.5 KiB

BIN
jm2l/static/vendor/leaflet/js/images/marker-icon.png View File

Before After
Width: 25  |  Height: 41  |  Size: 1.7 KiB Width: 25  |  Height: 41  |  Size: 1.4 KiB

BIN
jm2l/static/vendor/leaflet/js/images/marker-shadow.png View File

Before After
Width: 41  |  Height: 41  |  Size: 797 B Width: 41  |  Height: 41  |  Size: 618 B

+ 9034
- 1151
jm2l/static/vendor/leaflet/js/leaflet-routing-machine.js
File diff suppressed because it is too large
View File


+ 11
- 4
jm2l/static/vendor/leaflet/js/leaflet-routing-machine.min.js
File diff suppressed because it is too large
View File


BIN
jm2l/static/vendor/leaflet/leaflet.routing.icons.png View File

Before After
Width: 480  |  Height: 40  |  Size: 3.2 KiB Width: 480  |  Height: 40  |  Size: 2.3 KiB

+ 2
- 2
jm2l/templates/Logistique/Dialog_Covoit.mako View File

@@ -57,8 +57,8 @@
<script type="text/javascript">
var map = L.map('map');
// create the tile layer with correct attribution
var osmUrl='http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
var osmAttrib='Map data © <a href="http://openstreetmap.org">OpenStreetMap</a> contributors';
var osmUrl='//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
var osmAttrib='Map data © <a href="//openstreetmap.org">OpenStreetMap</a> contributors';
var osm = new L.TileLayer(osmUrl, {minZoom: 8, maxZoom: 17, attribution: osmAttrib});
map.addLayer(osm);
var great_route = L.Routing.control({


+ 2
- 2
jm2l/templates/Public/Plan.mako View File

@@ -67,8 +67,8 @@
<script type="text/javascript">
var map = L.map('come_map');
// create the tile layer with correct attribution
var osmUrl='http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
var osmAttrib='Map data © <a href="http://openstreetmap.org">OpenStreetMap</a> contributors';
var osmUrl='//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
var osmAttrib='Map data © <a href="//openstreetmap.org">OpenStreetMap</a> contributors';
var osm = new L.TileLayer(osmUrl, {minZoom: 7, maxZoom: 18, attribution: osmAttrib});
map.setView(new L.LatLng(43.6137, 7.07502),16);
marker = L.marker([43.61556, 7.07176], {


+ 2
- 2
jm2l/templates/modals.mako View File

@@ -98,8 +98,8 @@
<script type="text/javascript">
var map = L.map('map');
// create the tile layer with correct attribution
var osmUrl='http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
var osmAttrib='Map data © <a href="http://openstreetmap.org">OpenStreetMap</a> contributors';
var osmUrl='//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
var osmAttrib='Map data © <a href="//openstreetmap.org">OpenStreetMap</a> contributors';
var osm = new L.TileLayer(osmUrl, {minZoom: 8, maxZoom: 18, attribution: osmAttrib});
// start the map on specified GPS Coords
map.setView(new L.LatLng(${form.gps_coord.data}),15);


Loading…
Cancel
Save